| commit | 7267404dc5a84e7a4c81a55eb3bf22e14bcc7d1c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 3 Jun 2016 21:38:01 +0000 (3 14:38 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 3 Jun 2016 21:38:01 +0000 (3 14:38 -0700) | ||
| tree | 31100feaac30d0eba5831512e2dd6a259137354a | treesnapshot (tar.gz zip) |
| parent | be3ac81f0c73252b7df34522e4886c4427eb43ae | commitdiff |
| parent | 7063693d51778815cfb9a4bc1e4e6d16f13589e7 | commitdiff |
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
"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
| git-rebase--interactive.sh | diff1 | diff2 | blobhistory |