summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-09 09:27:43 -0700
committerJunio C Hamano <gitster@pobox.com>2009-05-09 09:27:43 -0700
commit6345d7a0d151afc3d2a10ada3ecacf54c3fee2d0 (patch)
tree4d2814b43911594cf054a9c4613baf55f6e5b7a4 /Makefile
parentbe427d758b53343d31debb520c0bc251a62013a9 (diff)
parentec00d6e0038e030cf73182374e21025c2776cb23 (diff)
downloadgit-6345d7a0d151afc3d2a10ada3ecacf54c3fee2d0.tar.gz
Merge branch 'maint'
* maint: Documentation: cloning to empty directory is allowed Clarify kind of conflict in merge-one-file helper git config: clarify --add and --get-color archive-tar.c: squelch a type mismatch warning
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions