summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-04-25 19:31:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-04-29 20:19:21 (GMT)
commit018b3fbc7e66439786492662b88cb34d7d000621 (patch)
treef9bf4575cc4295f2ec35a49f905a6731e33bb605 /.gitattributes
parent34349dbff8632c353f083959881e38e1c853abf8 (diff)
downloadgit-018b3fbc7e66439786492662b88cb34d7d000621.zip
git-018b3fbc7e66439786492662b88cb34d7d000621.tar.gz
git-018b3fbc7e66439786492662b88cb34d7d000621.tar.bz2
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 '.gitattributes')
0 files changed, 0 insertions, 0 deletions