diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 15:19:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-21 21:47:31 (GMT) |
| commit | 4f54544d736e286538ebef0d3120c164f80f04c1 (patch) | |
| tree | bb6b462b9853ce9fbd971d9365c44f1972062f04 /diff-merges.c | |
| parent | 7acf0d06f54043b3b79d5d388ed1c8fb66e2db5a (diff) | |
| download | git-4f54544d736e286538ebef0d3120c164f80f04c1.zip git-4f54544d736e286538ebef0d3120c164f80f04c1.tar.gz git-4f54544d736e286538ebef0d3120c164f80f04c1.tar.bz2 | |
diff-merges: rename diff_merges_default_to_enable() to match semantics
Rename diff_merges_default_to_enable() to
diff_merges_default_to_first_parent() to match its semantics.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-merges.c')
| -rw-r--r-- | diff-merges.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-merges.c b/diff-merges.c index a3bafa9..76c8045 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -56,7 +56,7 @@ void diff_merges_setup_revs(struct rev_info *revs) die("--combined-all-paths makes no sense without -c or --cc"); } -void diff_merges_default_to_enable(struct rev_info *revs) +void diff_merges_default_to_first_parent(struct rev_info *revs) { if (revs->ignore_merges < 0) /* No -m */ revs->ignore_merges = 0; |