| commit | f131dd492f098f9f565df93df13e35c734284590 | |
| author | Eric Wong <normalperson@yhbt.net> | |
| Fri, 8 Dec 2006 21:29:56 +0000 (8 13:29 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 9 Dec 2006 19:13:36 +0000 (9 11:13 -0800) | ||
| tree | c120eff1e594acc4a6e5487b23e48a83c1f8060b | treesnapshot (tar.gz zip) |
| parent | cda2d3c112a03079af9019c7d6617e65ab88ae7e | commitdiff |
rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am
Data in rr-cache isn't valid after a patch application is
skipped or and aborted, so our next commit could be misrecorded
as a resolution of that skipped/failed commit, which is wrong.
git-am --skip, git-rebase --skip/--abort will automatically
invoke git-rerere clear to avoid this.
Also, since git-am --resolved indicates a resolution was
succesful, remember to run git-rerere to record the resolution
(and not surprise the user when the next commit is made).
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Data in rr-cache isn't valid after a patch application is
skipped or and aborted, so our next commit could be misrecorded
as a resolution of that skipped/failed commit, which is wrong.
git-am --skip, git-rebase --skip/--abort will automatically
invoke git-rerere clear to avoid this.
Also, since git-am --resolved indicates a resolution was
succesful, remember to run git-rerere to record the resolution
(and not surprise the user when the next commit is made).
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-am.sh | diffblobblamehistory | |
| git-rebase.sh | diffblobblamehistory |