summaryrefslogtreecommitdiff
path: root/Documentation/git-config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-04-25 12:31:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-04-29 13:19:21 -0700
commit018b3fbc7e66439786492662b88cb34d7d000621 (patch)
treef9bf4575cc4295f2ec35a49f905a6731e33bb605 /Documentation/git-config.txt
parentmerge: split reduce_parents() out of collect_parents() (diff)
downloadtgif-018b3fbc7e66439786492662b88cb34d7d000621.tar.xz
merge: narrow scope of merge_names
In order to pass the list of parents to fmt_merge_msg(), cmd_merge() uses this strbuf to create something that look like FETCH_HEAD that describes commits that are being merged. This is necessary only when we are creating the merge commit message ourselves, but was done unconditionally. Move the variable and the logic to populate it to confine them in a block that needs them. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-config.txt')
0 files changed, 0 insertions, 0 deletions