summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-08-28 21:20:28 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-28 21:20:28 -0700
commit2730f55527143d3476c159cebbdb63d5e6a5c2a8 (patch)
treec57fde5c543baa16074b1167dbd4d646734e5b8c /Documentation/git-mergetool.txt
parentMerge branch 'ci/forbid-unwanted-current-branch-update' (diff)
parentclone: allow to clone from .git file (diff)
downloadtgif-2730f55527143d3476c159cebbdb63d5e6a5c2a8.tar.xz
Merge branch 'nd/maint-clone-gitdir'
* nd/maint-clone-gitdir: clone: allow to clone from .git file read_gitfile_gently(): rename misnamed function to read_gitfile()
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions