git/git-rebase--interactive.sh, branch v2.17.2

Merge branch 'nd/rebase-show-current-patch'

2018-03-06T22:54:02Z

The new "--show-current-patch" option gives an end-user facing way to get the diff being applied when "git rebase" (and "git am") stops with a conflict. * nd/rebase-show-current-patch: rebase: introduce and use pseudo-ref REBASE_HEAD rebase: add --show-current-patch am: add --show-current-patch

Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'

2018-02-27T18:33:54Z

"git rebase -p" mangled log messages of a merge commit, which is now fixed. * js/fix-merge-arg-quoting-in-rebase-p: rebase -p: fix incorrect commit message when calling `git merge`.

rebase: introduce and use pseudo-ref REBASE_HEAD

2018-02-12T22:07:59Z

The new command `git rebase --show-current-patch` is useful for seeing the commit related to the current rebase state. Some however may find the "git show" command behind it too limiting. You may want to increase context lines, do a diff that ignores whitespaces... For these advanced use cases, the user can execute any command they want with the new pseudo ref REBASE_HEAD. This also helps show where the stopped commit is from, which is hard to see from the previous patch which implements --show-current-patch. Helped-by: Tim Landscheidt Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

rebase: add --show-current-patch

2018-02-12T22:07:59Z

It is useful to see the full patch while resolving conflicts in a rebase. The only way to do it now is less .git/rebase-*/patch which could turn out to be a lot longer to type if you are in a linked worktree, or not at top-dir. On top of that, an ordinary user should not need to peek into .git directory. The new option is provided to examine the patch. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

rebase -p: fix incorrect commit message when calling `git merge`.

2018-02-08T22:31:57Z

Since commit dd6fb0053 ("rebase -p: fix quoting when calling `git merge`"), commit message of the merge commit being rebased is passed to the merge command using a subshell executing 'git rev-parse --sq-quote'. Double quotes are needed around this subshell so that, newlines are kept for the git merge command. Before this patch, following merge message: "Merge mybranch into mynewbranch Awesome commit." becomes: "Merge mybranch into mynewbranch Awesome commit." after a rebase -p. Fixes: "dd6fb0053 rebase -p: fix quoting when calling `git merge`" Reported-by: Jamie Iles Suggested-by: Vegard Nossum Suggested-by: Quentin Casasnovas Signed-off-by: Gregory Herrero Signed-off-by: Junio C Hamano

rebase: add --allow-empty-message option

2018-02-07T19:26:46Z

This option allows commits with empty commit messages to be rebased, matching the same option in git-commit and git-cherry-pick. While empty log messages are frowned upon, sometimes one finds them in older repositories (e.g. translated from another VCS [0]), or have other reasons for desiring them. The option is available in git-commit and git-cherry-pick, so it is natural to make other git tools play nicely with them. Adding this as an option allows the default to be "give the user a chance to fix", while not interrupting the user's workflow otherwise [1]. [0]: https://stackoverflow.com/q/8542304 [1]: https://public-inbox.org/git/7vd33afqjh.fsf@alter.siamese.dyndns.org/ To implement this, add a new --allow-empty-message flag. Then propagate it to all calls of 'git commit', 'git cherry-pick', and 'git rebase--helper' within the rebase scripts. Signed-off-by: Genki Sky Reviewed-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'

2018-01-10T22:01:24Z

"git rebase -p -X

rebase -p: fix quoting when calling `git merge`

2018-01-05T20:26:01Z

It has been reported that strategy arguments are not passed to `git merge` correctly when rebasing interactively, preserving merges. The reason is that the strategy arguments are already quoted, and then quoted again. This fixes https://github.com/git-for-windows/git/issues/1321 Original-patch-by: Kim Gybels Also-reported-by: Matwey V. Kornilov Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

rebase: do not continue when the todo list generation failed

2017-12-27T20:33:38Z

This is a *really* long-standing bug. As a matter of fact, this bug has been with us from the very beginning of `rebase -i`: 1b1dce4bae7 (Teach rebase an interactive mode, 2007-06-25), where the output of `rev-list` was piped to `sed` (and any failure of the `rev-list` process would go completely undetected). Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

rebase -i -x: add exec commands via the rebase--helper

2017-12-05T18:20:51Z

Recent work on `git-rebase--interactive` aims to convert shell code to C. Even if this is most likely not a big performance enhancement, let's convert it too since a coming change to abbreviate command names requires it to be updated. Signed-off-by: Liam Beguin Signed-off-by: Junio C Hamano