summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-14 06:30:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-11-14 06:30:17 (GMT)
commita0d3ab9c277f1a198ec8e29432c0127d4cf719d2 (patch)
treef8993ba734754963c6b2d1c27aad7b646b4b43a9 /Documentation/merge-options.txt
parent59d8cb49fd969913820fa23d569acc23eeabc4b4 (diff)
parent6e5121f26e95af02d2bbd6a982e44f16e74a67ce (diff)
downloadgit-a0d3ab9c277f1a198ec8e29432c0127d4cf719d2.zip
git-a0d3ab9c277f1a198ec8e29432c0127d4cf719d2.tar.gz
git-a0d3ab9c277f1a198ec8e29432c0127d4cf719d2.tar.bz2
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn: git-svn: proper detection of bare repositories git-svn: respect i18n.commitencoding config git-svn: don't escape tilde ('~') for http(s) URLs
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions