summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-15 10:10:11 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-15 10:10:11 -0800
commit335c6e403d862913846661638af6e184055f6db5 (patch)
tree306a7ef7ebc572e76f479283efaab98c6c3eaa5d /Documentation/git-merge-file.txt
parentTest 'checkout -m -- path' (diff)
downloadtgif-335c6e403d862913846661638af6e184055f6db5.tar.xz
checkout_merged(): squelch false warning from some gcc
gcc 4.6.2 (there may be others) does not realize that the variable "mode" can never be used uninitialized in this function and issues a false warning under -Wuninitialized option. Squelch it with an unnecessary initialization; it is not like a single assignment matters to the performance in this codepath that writes out to the filesystem with checkout_entry() anyway. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions