From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Oct 2017 06:42:47 +0000 (+0900)
Subject: Merge branch 'js/rebase-i-final'
X-Git-Tag: v2.15.0-rc0~26
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5f3108b7b6720ae3ce61caa1a3684b9fcac5c8db;p=git-core%2Fgit.git

Merge branch 'js/rebase-i-final'

The final batch to "git rebase -i" updates to move more code from
the shell script to C.

* js/rebase-i-final:
  rebase -i: rearrange fixup/squash lines using the rebase--helper
  t3415: test fixup with wrapped oneline
  rebase -i: skip unnecessary picks using the rebase--helper
  rebase -i: check for missing commits in the rebase--helper
  t3404: relax rebase.missingCommitsCheck tests
  rebase -i: also expand/collapse the SHA-1s via the rebase--helper
  rebase -i: do not invent onelines when expanding/collapsing SHA-1s
  rebase -i: remove useless indentation
  rebase -i: generate the script via rebase--helper
  t3415: verify that an empty instructionFormat is handled as before
---

5f3108b7b6720ae3ce61caa1a3684b9fcac5c8db