diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-06-03 14:38:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-03 14:38:01 -0700 |
| commit | 7267404dc5a84e7a4c81a55eb3bf22e14bcc7d1c (patch) | |
| tree | 31100feaac30d0eba5831512e2dd6a259137354a /mergetools/bc3 | |
| parent | Merge branch 'js/perf-rebase-i' (diff) | |
| parent | rebase -i: remove an unnecessary 'rerere' invocation (diff) | |
| download | tgif-7267404dc5a84e7a4c81a55eb3bf22e14bcc7d1c.tar.xz | |
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
Diffstat (limited to 'mergetools/bc3')
0 files changed, 0 insertions, 0 deletions