diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-23 14:38:18 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 14:38:18 +0900 |
| commit | 4a3bf32b6c7e5d832e02f30a78ad23dc6ba15dcc (patch) | |
| tree | c1e06ca0d405814f0fc4c747abcf33316e704be2 /lockfile.h | |
| parent | Merge branch 'tg/worktree-add-existing-branch' (diff) | |
| parent | rebase --skip: clean up commit message after a failed fixup/squash (diff) | |
| download | tgif-4a3bf32b6c7e5d832e02f30a78ad23dc6ba15dcc.tar.xz | |
Merge branch 'js/rebase-i-clean-msg-after-fixup-continue'
"git rebase -i" sometimes left intermediate "# This is a
combination of N commits" message meant for the human consumption
inside an editor in the final result in certain corner cases, which
has been fixed.
* js/rebase-i-clean-msg-after-fixup-continue:
rebase --skip: clean up commit message after a failed fixup/squash
sequencer: always commit without editing when asked for
rebase -i: Handle "combination of <n> commits" with GETTEXT_POISON
rebase -i: demonstrate bugs with fixup!/squash! commit messages
Diffstat (limited to 'lockfile.h')
0 files changed, 0 insertions, 0 deletions