summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-07-01 16:22:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-07-01 16:22:42 -0700
commit5e707b28d9ea0bebfef5aff977e3ccebd53aa045 (patch)
tree866254290cfe6006a269386770b26936d718a5ae /Documentation/git-pull.txt
parentMerge branch 'js/apply-recount' (diff)
parentRemove the use of '--' in merge program invocation (diff)
downloadtgif-5e707b28d9ea0bebfef5aff977e3ccebd53aa045.tar.xz
Merge branch 'ph/mergetool'
* ph/mergetool: Remove the use of '--' in merge program invocation
Diffstat (limited to 'Documentation/git-pull.txt')
0 files changed, 0 insertions, 0 deletions