summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-30 20:31:39 -0700
committerJunio C Hamano <gitster@pobox.com>2008-08-30 20:31:39 -0700
commit7df437e56b5a2c5ec7140dd097b517563db4972c (patch)
treea006f20b481d811ccb4846534ef6394be5bc78a8 /merge-recursive.h
parentff1e8bfcd69e5e0ee1a3167e80ef75b611f72123 (diff)
parentbbb896d8e10f736bfda8f587c0009c358c9a8599 (diff)
downloadgit-7df437e56b5a2c5ec7140dd097b517563db4972c.tar.gz
Merge branch 'maint'
* maint: gitattributes: -crlf is not binary git-apply: Loosen "match_beginning" logic Fix example in git-name-rev documentation shell: do not play duplicated definition games to shrink the executable Fix use of hardlinks in "make install" pack-objects: Allow missing base objects when creating thin packs
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions