| commit | 5802f81b1438fdbfab340c4e752e2be457c4a065 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 19 Apr 2012 02:49:08 +0000 (18 19:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 19 Apr 2012 05:50:28 +0000 (18 22:50 -0700) | ||
| tree | 5a1f4515eb7a7fdd81f5ed154fb86817744bd667 | treesnapshot (tar.gz zip) |
| parent | e78cbf8cbb61edfbdef5d33262f9b8cf02a3afca | commitdiff |
fmt-merge-msg: discard needless merge parents
This is used by "git pull" to construct a merge message from list of
remote refs. When pulling redundant set of refs, however, it did not
filter them even though the merge itself discards them as unnecessary.
Teach the command to do the same for consistency.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This is used by "git pull" to construct a merge message from list of
remote refs. When pulling redundant set of refs, however, it did not
filter them even though the merge itself discards them as unnecessary.
Teach the command to do the same for consistency.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/fmt-merge-msg.c | diffblobblamehistory | |
| t/t7603-merge-reduce-heads.sh | diffblobblamehistory |