diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-07-21 01:42:17 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-07-20 21:43:12 -0700 |
| commit | be19c5ca3e28cb16d55623de2e5aa1d45bd5b5ba (patch) | |
| tree | 3c10bcff037cc3057828065e8e157b845bbb8775 /Documentation/git-diff-index.txt | |
| parent | The fourth batch (diff) | |
| download | tgif-be19c5ca3e28cb16d55623de2e5aa1d45bd5b5ba.tar.xz | |
t7601: test interaction of merge/rebase/fast-forward flags and options
The interaction of rebase and merge flags and options was not well
tested. Add several tests to check for correct behavior from the
following rules:
* --ff-only vs. --[no-]rebase
(and the related pull.ff=only vs. pull.rebase)
* --rebase[=!false] vs. --no-ff and --ff
(and the related pull.rebase=!false overrides pull.ff=!only)
* command line flags take precedence over config, except:
* --no-rebase heeds pull.ff=!only
* pull.rebase=!false vs --no-ff and --ff
For more details behind these rules and a larger table of individual
cases, refer to https://lore.kernel.org/git/xmqqwnpqot4m.fsf@gitster.g/
and the links found therein.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-diff-index.txt')
0 files changed, 0 insertions, 0 deletions