diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-07-31 08:18:47 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-07-31 12:24:07 -0700 |
| commit | e145d993478befd0db6999822aa31d422b283a3b (patch) | |
| tree | adf27954b5199a27cef653ba7fa2f7d5f5baa508 /t/lib-git-daemon.sh | |
| parent | t3427: fix another incorrect assumption (diff) | |
| download | tgif-e145d993478befd0db6999822aa31d422b283a3b.tar.xz | |
rebase -r: support merge strategies other than `recursive`
We already support merge strategies in the sequencer, but only for
`pick` commands.
With this commit, we now also support them in `merge` commands. The
approach is simple: if any merge strategy option is specified, or if any
merge strategy other than `recursive` is specified, we simply spawn the
`git merge` command. Otherwise, we handle the merge in-process just as
before.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-git-daemon.sh')
0 files changed, 0 insertions, 0 deletions