]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: be427d7 ec00d6e)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sat, 9 May 2009 16:27:43 +0000 (09:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 9 May 2009 16:27:43 +0000 (09:27 -0700)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.