summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-01-27 10:44:00 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-01-27 10:44:00 -0800
commit6d73dba8f6ace2a6b794b75f4fc71bb8ab09eba2 (patch)
treec3b55c2b461e1463bdd182533715bffb9e14c976 /builtin/merge-file.c
parentMerge branch 'jk/complete-merge-base' (diff)
parentDocumentation: "git pull" does not have the "-m" option (diff)
downloadtgif-6d73dba8f6ace2a6b794b75f4fc71bb8ab09eba2.tar.xz
Merge branch 'jc/maint-pull-docfix'
* jc/maint-pull-docfix: Documentation: "git pull" does not have the "-m" option Documentation: exclude irrelevant options from "git pull"
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions