summaryrefslogtreecommitdiff
path: root/Documentation/git-remote.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-26 03:10:13 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-26 03:10:13 (GMT)
commit5569dad48e22e7b373ce3ffcc32758163bbd7b42 (patch)
tree1b263acc52608ae716096abfba527f8b58b3e750 /Documentation/git-remote.txt
parent6c09c451389ade6477d98b05d277aab0dd2f272e (diff)
parent0b1f6475570b915c56f380f2bd790ff94e606ef4 (diff)
downloadgit-5569dad48e22e7b373ce3ffcc32758163bbd7b42.zip
git-5569dad48e22e7b373ce3ffcc32758163bbd7b42.tar.gz
git-5569dad48e22e7b373ce3ffcc32758163bbd7b42.tar.bz2
Merge branch 'maint'
* maint: merge-recursive: fix longstanding bug in merging symlinks merge-index: fix longstanding bug in merging symlinks
Diffstat (limited to 'Documentation/git-remote.txt')
0 files changed, 0 insertions, 0 deletions