| commit | 4ddf11ee58a442bbc7c1bfacf81c02ba0689909f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 11 Sep 2009 07:59:59 +0000 (11 00:59 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 11 Sep 2009 07:59:59 +0000 (11 00:59 -0700) | ||
| tree | 6599c30f06e8a37692f973cc7c548890fd26beaa | treesnapshot (tar.gz zip) |
| parent | 5f6b0ffff13f5cd762d0a5a4e1c4dede58e8a537 | commitdiff |
| parent | 434a6db7dcf8688fe08098e218113c18b7c9aeaf | commitdiff |
Merge branch 'master' into next
* master:
add documentation for mailinfo.scissors and '--no-scissors'
mailinfo: add '--scissors' to usage message
INSTALL: Describe dependency knobs from Makefile
INSTALL: Reorder dependencies, split shell and Perl
git-p4: Avoid modules deprecated in Python 2.6.
Makefile: Add NEEDS_CRYPTO_WITH_SSL
git.el: Use git-add-file for unmerged files, remove git-resolve-file
INSTALL: Update description of our SHA-1 code
* master:
add documentation for mailinfo.scissors and '--no-scissors'
mailinfo: add '--scissors' to usage message
INSTALL: Describe dependency knobs from Makefile
INSTALL: Reorder dependencies, split shell and Perl
git-p4: Avoid modules deprecated in Python 2.6.
Makefile: Add NEEDS_CRYPTO_WITH_SSL
git.el: Use git-add-file for unmerged files, remove git-resolve-file
INSTALL: Update description of our SHA-1 code
| Makefile | diff1 | diff2 | blobhistory |