summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-08-06 15:37:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-08-06 15:37:09 -0700
commit809b2625433aef412a3e5b82729175309a35ba20 (patch)
tree3998a946feef1069cd4c8006f0f20993802a345c /Documentation/git-merge-one-file.txt
parentdoc: A few minor copy edits. (diff)
parentcommit: document a couple of options (diff)
downloadtgif-809b2625433aef412a3e5b82729175309a35ba20.tar.xz
Merge branch 'rr/doc-commit' into maint
* rr/doc-commit: commit: document a couple of options
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions