summaryrefslogtreecommitdiff
path: root/xdiff/xmacros.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-09-23 14:21:39 -0700
committerJunio C Hamano <gitster@pobox.com>2011-09-23 14:21:39 -0700
commit406c1c4dd4a8f0fac3fddce1e7bb3b66af835e6a (patch)
treefdf9a1740fb73a40c0aee0f23d79792ea171f289 /xdiff/xmacros.h
parentbe5acb3b63af077db05788235a1d845d511e4561 (diff)
parent9b0ebc722cfc12bd14934aab5cf77ebe654e36e6 (diff)
downloadgit-406c1c4dd4a8f0fac3fddce1e7bb3b66af835e6a.tar.gz
Merge branch 'nd/maint-clone-gitdir' into maint
* nd/maint-clone-gitdir: clone: allow to clone from .git file read_gitfile_gently(): rename misnamed function to read_gitfile()
Diffstat (limited to 'xdiff/xmacros.h')
0 files changed, 0 insertions, 0 deletions