From: Junio C Hamano <junkio@cox.net>
Date: Wed, 13 Dec 2006 19:08:35 +0000 (-0800)
Subject: Merge branch 'ew/rerere'
X-Git-Tag: v1.5.0-rc0~119
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d0085ade9598942077f12f22b16978411d15188a;p=git.git

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
---

d0085ade9598942077f12f22b16978411d15188a