Merge branch 'ew/rerere'
authorJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 19:08:35 +0000 (11:08 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 19:08:35 +0000 (11:08 -0800)
commitd0085ade9598942077f12f22b16978411d15188a
tree27cc41e9eae9f3909aad1f940768d17cccee7abd
parent78ba00407cf69c9f57f17e07d156336ce47c2b03
parentf131dd492f098f9f565df93df13e35c734284590
Merge branch 'ew/rerere'

* ew/rerere:
  rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am
  git-rerere: add 'gc' command.
  rerere: add clear, diff, and status commands
git-rerere.perl