summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Eric Wong <normalperson@yhbt.net>2006-12-08 13:29:56 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-12-09 11:13:36 -0800
commitf131dd492f098f9f565df93df13e35c734284590 (patch)
treec120eff1e594acc4a6e5487b23e48a83c1f8060b /Documentation
parentgit-rerere: add 'gc' command. (diff)
downloadtgif-f131dd492f098f9f565df93df13e35c734284590.tar.xz
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>
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions