diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-10-03 15:42:47 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-03 15:42:47 +0900 |
| commit | 5f3108b7b6720ae3ce61caa1a3684b9fcac5c8db (patch) | |
| tree | 1757e6e355bf65e536355a51ee49f3a4f47bf85c /merge-recursive.h | |
| parent | The eleventh batch for 2.15 (diff) | |
| parent | rebase -i: rearrange fixup/squash lines using the rebase--helper (diff) | |
| download | tgif-5f3108b7b6720ae3ce61caa1a3684b9fcac5c8db.tar.xz | |
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
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions