![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 30 May 2011 07:09:55 +0000 (00:09 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 30 May 2011 07:09:55 +0000 (00:09 -0700) | ||
| commit | fb674d767180354d9ad3e69f1d41bee98df6bfe9 | |
| tree | cc96e4d45a06efacd978939e898713f9ede9db0b | tree | snapshot |
| parent | be653d6cb87d17c1d70d31cb7cfcb004d48def7b | commit | diff |
| parent | 5b42477b59886a85d4b49a60313f9b9d4a0d576f | commit | diff |
Merge branch 'maint'
* maint:
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'
* maint:
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 | | blob | history |
| rerere.c | diff1 | | diff2 | | blob | history |
| setup.c | diff1 | | diff2 | | blob | history |
| transport.c | diff1 | | diff2 | | blob | history |