aboutsummaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-21 15:03:25 -0700
committerJunio C Hamano <gitster@pobox.com>2017-03-21 15:03:25 -0700
commit5c6bc96896525726a37b6f03642f8d5de034cee8 (patch)
treed818fd25bf1636c60a09d973e2fb7b8892e87ef6 /git-merge-octopus.sh
parentc157ae9c91535cf36ce58e75c1d008cea9e07a43 (diff)
parentb803ae4427f3e21f01b8da6933ed719909cacd69 (diff)
downloadgit-5c6bc96896525726a37b6f03642f8d5de034cee8.tar.gz
git-5c6bc96896525726a37b6f03642f8d5de034cee8.tar.xz
Merge branch 'ps/docs-diffcore' into maint
Doc update. * ps/docs-diffcore: docs/diffcore: unquote "Complete Rewrites" in headers docs/diffcore: fix grammar in diffcore-rename header
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions