diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2020-12-21 18:19:52 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-12-21 13:47:32 -0800 |
| commit | 5733b20f41ac0fecdacdf34a11acef2d03fac829 (patch) | |
| tree | bf8c83b19abbbb0b5cf129279cdbb97c0df1e5c3 /Documentation/howto/revert-a-faulty-merge.txt | |
| parent | diff-merges: implement new values for --diff-merges (diff) | |
| download | tgif-5733b20f41ac0fecdacdf34a11acef2d03fac829.tar.xz | |
diff-merges: do not imply -p for new options
Add 'combined_imply_patch' field and set it only for old --cc/-c
options, then imply -p if this flag is set instead of implying -p
whenever 'combined_merge' flag is set.
We don't want new --diff-merge options to imply -p, to make it
possible to enable output of diffs for merges independently from
non-merge commits. At the same time we want to preserve behavior of
old --c/-c/-m options and their interactions with --first-parent, to
stay backward-compatible.
This patch is first step in this direction: it separates old "--cc/-c
imply -p" logic from the rest of the options.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions