summaryrefslogtreecommitdiffstats
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-09 06:59:04 +0100
committerJunio C Hamano <gitster@pobox.com>2009-12-09 06:59:04 +0100
commitca83dc53916d485e6654c6cce701794dd3a1ed32 (patch)
tree2da96e1f2cca86a6544b27d8f3d4fcdd486be10f /git-merge-octopus.sh
parentRevert recent "git merge <msg> HEAD <commit>..." deprecation (diff)
parentgit-svn: set svn.authorsfile earlier when cloning (diff)
downloadgit-ca83dc53916d485e6654c6cce701794dd3a1ed32.tar.xz
git-ca83dc53916d485e6654c6cce701794dd3a1ed32.zip
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn: git-svn: set svn.authorsfile earlier when cloning git-svn: Set svn.authorsfile to an absolute path when cloning
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions