summaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-13 19:08:35 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-13 19:08:35 (GMT)
commitd0085ade9598942077f12f22b16978411d15188a (patch)
tree27cc41e9eae9f3909aad1f940768d17cccee7abd /unpack-trees.c
parent78ba00407cf69c9f57f17e07d156336ce47c2b03 (diff)
parentf131dd492f098f9f565df93df13e35c734284590 (diff)
downloadgit-d0085ade9598942077f12f22b16978411d15188a.zip
git-d0085ade9598942077f12f22b16978411d15188a.tar.gz
git-d0085ade9598942077f12f22b16978411d15188a.tar.bz2
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
Diffstat (limited to 'unpack-trees.c')
0 files changed, 0 insertions, 0 deletions