Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ew/rerere'
author
Junio C Hamano
<junkio@cox.net>
Wed, 13 Dec 2006 19:08:35 +0000
(11:08 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 13 Dec 2006 19:08:35 +0000
(11:08 -0800)
* 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
1
2
git-rerere.perl
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
78ba004
f131dd4
)
diff --cc
git-rerere.perl
Simple merge