| commit | 74293ad901ac2211271d646f89b3a4640f9a905e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Jul 2009 04:58:02 +0000 (22 21:58 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Jul 2009 04:58:02 +0000 (22 21:58 -0700) | ||
| tree | 19120a6c05b91e5958bcc655caa638ecb263f0c8 | treesnapshot (tar.gz zip) |
| parent | 9f628b22044fd7f51e00f54e264129cfddf8d108 | commitdiff |
| parent | 0ad8ff2cd185e84fd49dd961370411e379681f10 | commitdiff |
Merge branch 'master' into next
* master:
configure.ac: properly unset NEEDS_SSL_WITH_CRYPTO when sha1 func is missing
janitor: useless checks before free
janitor: add DIV_ROUND_UP and use it.
refactor: use bitsizeof() instead of 8 * sizeof()
janitor: use NULL and not 0 for pointers.
git stash: modernize use of "dashed" git-XXX calls
Improve doc for format-patch threading options.
List send-email config options in config.txt.
configure.ac: rework/fix the NEEDS_RESOLV and NEEDS_LIBGEN tests
Trailing whitespace and no newline fix
diff --cc: a lost line at the beginning of the file is shown incorrectly
combine-diff.c: fix performance problem when folding common deleted lines
* master:
configure.ac: properly unset NEEDS_SSL_WITH_CRYPTO when sha1 func is missing
janitor: useless checks before free
janitor: add DIV_ROUND_UP and use it.
refactor: use bitsizeof() instead of 8 * sizeof()
janitor: use NULL and not 0 for pointers.
git stash: modernize use of "dashed" git-XXX calls
Improve doc for format-patch threading options.
List send-email config options in config.txt.
configure.ac: rework/fix the NEEDS_RESOLV and NEEDS_LIBGEN tests
Trailing whitespace and no newline fix
diff --cc: a lost line at the beginning of the file is shown incorrectly
combine-diff.c: fix performance problem when folding common deleted lines
| Documentation/config.txt | diff1 | diff2 | blobhistory |
| sha1_file.c | diff1 | diff2 | blobhistory |