| commit | 8a4e3c501d75d9ee7ac53dde2e73ab3422233e70 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 17 Mar 2011 00:16:29 +0000 (16 17:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 17 Mar 2011 00:16:29 +0000 (16 17:16 -0700) | ||
| tree | da5d24f5f66e79231e87067cacffbfc355c0b225 | treesnapshot (tar.gz zip) |
| parent | 5aa4db0b8880b08be34e551daa4a200e00edb271 | commitdiff |
| parent | a3ca9b0fbe21d7a2525877fe0c008b61c56f7104 | commitdiff |
Merge branch 'master' into next
* master:
RelNotes/1.7.5.txt: typo and language fixes
Prepare draft release notes to 1.7.4.2
gitweb: highlight: replace tabs with spaces
make_absolute_path: return the input path if it points to our buffer
valgrind: ignore SSE-based strlen invalid reads
vcs-svn: remove spurious semicolons
diff --submodule: split into bite-sized pieces
cherry: split off function to print output lines
branch: split off function that writes tracking info and commit subject
standardize brace placement in struct definitions
compat: make gcc bswap an inline function
enums: omit trailing comma for portability
declare 1-bit bitfields to be unsigned
* master:
RelNotes/1.7.5.txt: typo and language fixes
Prepare draft release notes to 1.7.4.2
gitweb: highlight: replace tabs with spaces
make_absolute_path: return the input path if it points to our buffer
valgrind: ignore SSE-based strlen invalid reads
vcs-svn: remove spurious semicolons
diff --submodule: split into bite-sized pieces
cherry: split off function to print output lines
branch: split off function that writes tracking info and commit subject
standardize brace placement in struct definitions
compat: make gcc bswap an inline function
enums: omit trailing comma for portability
declare 1-bit bitfields to be unsigned
| builtin/log.c | diff1 | diff2 | blobhistory |
| cache.h | diff1 | diff2 | blobhistory |
| diff.c | diff1 | diff2 | blobhistory |
| merge-recursive.c | diff1 | diff2 | blobhistory |