Merge branch 'js/rebase-i-dedup-call-to-rerere'
"git rebase -i", after it fails to auto-resolve the conflict, had an unnecessary call to "git rerere" from its very early days, which was spotted recently; the call has been removed. * js/rebase-i-dedup-call-to-rerere: rebase -i: remove an unnecessary 'rerere' invocation
This commit is contained in:
commit
7267404dc5
@ -192,7 +192,6 @@ make_patch () {
|
||||
die_with_patch () {
|
||||
echo "$1" > "$state_dir"/stopped-sha
|
||||
make_patch "$1"
|
||||
git rerere
|
||||
die "$2"
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user