summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-26 13:14:45 -0700
committerJunio C Hamano <gitster@pobox.com>2013-03-26 13:14:45 -0700
commit7f95f2dce01e03532206d0998bca4cbdd8a660c7 (patch)
tree61acc75243b55689d3018777df7ea2f7b1feda48 /git-merge-one-file.sh
parent7632cd274464d693c3821205f72a54cda2b7d83b (diff)
parent3bbbf18d711eb8fe3390580963c1a071e03cbb38 (diff)
downloadgit-7f95f2dce01e03532206d0998bca4cbdd8a660c7.tar.gz
Merge branch 'maint'
* maint: More corrections for 1.8.2.1 Correct the docs about GIT_SSH.
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions