| commit | 1a4269ff950ebbf9d2f86397071ce8774e72d8e2 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 30 May 2011 07:16:19 +0000 (30 00:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 30 May 2011 07:16:19 +0000 (30 00:16 -0700) | ||
| tree | d680a2238e77e5643bf5d926d14cf7abf83bddb5 | treesnapshot (tar.gz zip) |
| parent | d10669c288bf9206142fa7a4604166d58680388d | commitdiff |
| parent | fb674d767180354d9ad3e69f1d41bee98df6bfe9 | commitdiff |
Merge branch 'master' into next
* master:
git-grep: Fix problems with recently added tests
git-submodule.sh: separate parens by a space to avoid confusing some shells
Documentation/technical/api-diff.txt: correct name of diff_unmerge()
read_gitfile_gently: use ssize_t to hold read result
remove tests of always-false condition
rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'
* master:
git-grep: Fix problems with recently added tests
git-submodule.sh: separate parens by a space to avoid confusing some shells
Documentation/technical/api-diff.txt: correct name of diff_unmerge()
read_gitfile_gently: use ssize_t to hold read result
remove tests of always-false condition
rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'
| git-submodule.sh | diff1 | diff2 | blobhistory |