undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/rebase-i-dedup-call-to-rerere'

Browse Source 
"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:
Junio C Hamano 2016-06-03 14:38:01 -07:00
commit 7267404dc5
1 changed files with 0 additions and 1 deletions

1
git-rebase--interactive.sh

@ -192,7 +192,6 @@ make_patch () {
die_with_patch () { die_with_patch () {
echo "$1" > "$state_dir"/stopped-sha echo "$1" > "$state_dir"/stopped-sha
make_patch "$1" make_patch "$1"
git rerere
die "$2" die "$2"
} }