diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-18 03:02:49 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-18 03:02:49 +0300 |
| commit | eca8c62a50e033ce6a4f4e065bb507ca3d98e75c (patch) | |
| tree | f36173d168e17cd1ac0ce95daa3c7351db14260e /revision.h | |
| parent | e6ec620d8b2d576908889476eb7da716d2e4bda2 (diff) | |
| parent | 5fbb4bc1910f76b344fcb88df2544701b6030435 (diff) | |
Merge branch 'jk/log-fp-implies-m'
"git log --first-parent -p" showed patches only for single-parent
commits on the first-parent chain; the "--first-parent" option has
been made to imply "-m". Use "--no-diff-merges" to restore the
previous behaviour to omit patches for merge commits.
* jk/log-fp-implies-m:
doc/git-log: clarify handling of merge commit diffs
doc/git-log: move "-t" into diff-options list
doc/git-log: drop "-r" diff option
doc/git-log: move "Diff Formatting" from rev-list-options
log: enable "-m" automatically with "--first-parent"
revision: add "--no-diff-merges" option to counteract "-m"
log: drop "--cc implies -m" logic
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 889216c2d8..c1e5bcf139 100644 --- a/revision.h +++ b/revision.h @@ -190,11 +190,11 @@ struct rev_info { show_root_diff:1, no_commit_id:1, verbose_header:1, - ignore_merges:1, combine_merges:1, combined_all_paths:1, dense_combined_merges:1, always_show_header:1; + int ignore_merges:2; /* Format info */ int show_notes; |