summaryrefslogtreecommitdiff
path: root/builtin/rerere.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-04-18 19:49:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-18 22:50:28 -0700
commit5802f81b1438fdbfab340c4e752e2be457c4a065 (patch)
tree5a1f4515eb7a7fdd81f5ed154fb86817744bd667 /builtin/rerere.c
parentbuiltin/merge.c: reduce parents early (diff)
downloadtgif-5802f81b1438fdbfab340c4e752e2be457c4a065.tar.xz
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 'builtin/rerere.c')
0 files changed, 0 insertions, 0 deletions