]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0e5a4b c173dad)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Jul 2010 18:21:08 +0000 (11:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Jul 2010 18:21:08 +0000 (11:21 -0700)
* maint:
  update-server-info: Shorten read_pack_info_file()
  Documentation: Explain git-mergetool's use of temporary files


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