summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-12-11 11:14:13 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-12-11 11:14:14 -0800
commit288fe0cfb61d52d8f35fea38076a6ceea74389a2 (patch)
treeea2285966a1f02ee046b5c7fed39eaed4e753d8c /Documentation/git-merge-file.txt
parentMerge branch 'rs/pop-commit' into maint (diff)
parentshow-branch: use argv_array for default arguments (diff)
downloadtgif-288fe0cfb61d52d8f35fea38076a6ceea74389a2.tar.xz
Merge branch 'rs/show-branch-argv-array' into maint
Code simplification. * rs/show-branch-argv-array: show-branch: use argv_array for default arguments
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions