projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e78cbf8) | patch
fmt-merge-msg: discard needless merge parents
authorJunio C Hamano <gitster@pobox.com>
Thu, 19 Apr 2012 02:49:08 +0000 (19:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Apr 2012 05:50:28 +0000 (22:50 -0700)
commit5802f81b1438fdbfab340c4e752e2be457c4a065
tree5a1f4515eb7a7fdd81f5ed154fb86817744bd667tree | snapshot
parente78cbf8cbb61edfbdef5d33262f9b8cf02a3afcacommit | diff
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>
builtin/fmt-merge-msg.c diff | blob | history
t/t7603-merge-reduce-heads.sh diff | blob | history
Git—the stupid content tracker