projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: be3ac81 7063693)
Merge branch 'js/rebase-i-dedup-call-to-rerere'
authorJunio C Hamano <gitster@pobox.com>
Fri, 3 Jun 2016 21:38:01 +0000 (14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 Jun 2016 21:38:01 +0000 (14:38 -0700)
commit7267404dc5a84e7a4c81a55eb3bf22e14bcc7d1c
tree31100feaac30d0eba5831512e2dd6a259137354atree | snapshot
parentbe3ac81f0c73252b7df34522e4886c4427eb43aecommit | diff
parent7063693d51778815cfb9a4bc1e4e6d16f13589e7commit | diff
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--interactive.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.