summaryrefslogtreecommitdiffstats
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-18 07:19:14 +0200
committerJunio C Hamano <gitster@pobox.com>2017-10-18 07:19:14 +0200
commit4e4a0c6e794f1f37ba7fa65e5e774b9d6c168afc (patch)
treeddbaf3f794256cf89097d59177a218423a1a86ce /Documentation/git-merge.txt
parentMerge branch 'tb/complete-describe' into maint (diff)
parentcheckout doc: clarify command line args for "checkout paths" mode (diff)
downloadgit-4e4a0c6e794f1f37ba7fa65e5e774b9d6c168afc.tar.xz
git-4e4a0c6e794f1f37ba7fa65e5e774b9d6c168afc.zip
Merge branch 'jc/doc-checkout' into maint
Doc update. * jc/doc-checkout: checkout doc: clarify command line args for "checkout paths" mode
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions