summaryrefslogtreecommitdiff
path: root/t/t7602-merge-octopus-many.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-19 02:49:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-04-19 05:50:28 (GMT)
commit5802f81b1438fdbfab340c4e752e2be457c4a065 (patch)
tree5a1f4515eb7a7fdd81f5ed154fb86817744bd667 /t/t7602-merge-octopus-many.sh
parente78cbf8cbb61edfbdef5d33262f9b8cf02a3afca (diff)
downloadgit-5802f81b1438fdbfab340c4e752e2be457c4a065.zip
git-5802f81b1438fdbfab340c4e752e2be457c4a065.tar.gz
git-5802f81b1438fdbfab340c4e752e2be457c4a065.tar.bz2
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>
Diffstat (limited to 't/t7602-merge-octopus-many.sh')
0 files changed, 0 insertions, 0 deletions