| commit | 999d068dc6d471d462f3b8d7c7772fb1a0474dba | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 18 Jun 2009 17:40:25 +0000 (18 10:40 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 18 Jun 2009 17:40:25 +0000 (18 10:40 -0700) | ||
| tree | 930c15137f3ee535528a061049e7fafc8c059e3f | treesnapshot (tar.gz zip) |
| parent | d6a466e528119011d512379f7f9dfac26deb7fd9 | commitdiff |
| parent | da4e4a65a27ca912c3f48289acf9ff7a67476c3f | commitdiff |
Merge branch 'master' into next
* master:
Add -k option to cvsexportcommit to revert expanded CVS keywords in CVS working tree before applying commit patch
http.c: fix compiling with libcurl 7.9.2
import-tars: support symlinks
pull, rebase: simplify to use die()
* master:
Add -k option to cvsexportcommit to revert expanded CVS keywords in CVS working tree before applying commit patch
http.c: fix compiling with libcurl 7.9.2
import-tars: support symlinks
pull, rebase: simplify to use die()
| git-pull.sh | diff1 | diff2 | blobhistory |