From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 8 Mar 2008 06:34:26 +0000 (-0800)
Subject: Merge branch 'js/reflog-delete'
X-Git-Tag: v1.5.5-rc0~56
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d33046c1ed2182a4f73b741e47ab28b1570805c5;p=git.git

Merge branch 'js/reflog-delete'

* js/reflog-delete:
  t3903-stash.sh: Add tests for new stash commands drop and pop
  git-reflog.txt: Document new commands --updateref and --rewrite
  t3903-stash.sh: Add missing '&&' to body of testcase
  git-stash: add new 'pop' subcommand
  git-stash: add new 'drop' subcommand
  git-reflog: add option --updateref to write the last reflog sha1 into the ref
  refs.c: make close_ref() and commit_ref() non-static
  git-reflog: add option --rewrite to update reflog entries while expiring
  reflog-delete: parse standard reflog options
  builtin-reflog.c: fix typo that accesses an unset variable
  Teach "git reflog" a subcommand to delete single entries
---

d33046c1ed2182a4f73b741e47ab28b1570805c5