diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-06-14 06:33:27 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-06-14 06:33:27 +0200 |
| commit | 8e444e66df45ee5bbe84af0d884c6625627219f3 (patch) | |
| tree | 49dfc39c29fa972df26bfe933d934fd8633038c7 /revision.h | |
| parent | Merge branch 'en/ort-perf-batch-11' (diff) | |
| parent | diff-merges: let "-m" imply "-p" (diff) | |
| download | git-8e444e66df45ee5bbe84af0d884c6625627219f3.tar.xz git-8e444e66df45ee5bbe84af0d884c6625627219f3.zip | |
Merge branch 'so/log-m-implies-p'
The "-m" option in "git log -m" that does not specify which format,
if any, of diff is desired did not have any visible effect; it now
implies some form of diff (by default "--patch") is produced.
* so/log-m-implies-p:
diff-merges: let "-m" imply "-p"
diff-merges: rename "combined_imply_patch" to "merges_imply_patch"
stash list: stop passing "-m" to "git log"
git-svn: stop passing "-m" to "git rev-list"
diff-merges: move specific diff-index "-m" handling to diff-index
t4013: test "git diff-index -m"
t4013: test "git diff-tree -m"
t4013: test "git log -m --stat"
t4013: test "git log -m --raw"
t4013: test that "-m" alone has no effect in "git log"
Diffstat (limited to 'revision.h')
| -rw-r--r-- | revision.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.h b/revision.h index 93aa012f51..17698cb51a 100644 --- a/revision.h +++ b/revision.h @@ -193,10 +193,10 @@ struct rev_info { /* Diff-merge flags */ explicit_diff_merges: 1, merges_need_diff: 1, + merges_imply_patch:1, separate_merges: 1, combine_merges:1, combined_all_paths:1, - combined_imply_patch:1, dense_combined_merges:1, first_parent_merges:1; |