Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "git-svn: always initialize with core.autocrlf=false" | Erik Faye-Lund | 2010-03-05 | 1 | -1/+0 |
* | git-svn: support fetch with autocrlf on | Erik Faye-Lund | 2010-03-05 | 1 | -1/+1 |
* | hash-object: support --stdin-paths with --no-filters | Erik Faye-Lund | 2010-03-05 | 3 | -9/+19 |
* | Merge branch 'maint' | Junio C Hamano | 2010-03-04 | 2 | -2/+26 |
|\ | |||||
| * | Update draft release notes to 1.7.0.2 | Junio C Hamano | 2010-03-04 | 1 | -1/+25 |
| * | Merge branch 'jn/gitweb-config-error-die' into maint | Junio C Hamano | 2010-03-04 | 1 | -3/+6 |
| |\ | |||||
| * \ | Merge branch 'jn/maint-fix-pager' into maint | Junio C Hamano | 2010-03-04 | 10 | -15/+268 |
| |\ \ | |||||
| * \ \ | Merge branch 'tr/maint-cherry-pick-list' into maint | Junio C Hamano | 2010-03-04 | 1 | -0/+3 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ld/maint-diff-quiet-w' into maint | Junio C Hamano | 2010-03-04 | 2 | -0/+38 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'rs/optim-text-wrap' into maint | Junio C Hamano | 2010-03-04 | 3 | -37/+42 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'dp/read-not-mmap-small-loose-object' into maint | Junio C Hamano | 2010-03-04 | 1 | -0/+10 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'np/compress-loose-object-memsave' into maint | Junio C Hamano | 2010-03-04 | 1 | -14/+19 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jc/maint-status-preload' into maint | Junio C Hamano | 2010-03-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'gf/maint-sh-setup-nongit-ok' into maint | Junio C Hamano | 2010-03-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'cc/maint-bisect-paths' into maint | Junio C Hamano | 2010-03-04 | 2 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'maint-1.6.6' into maint | Junio C Hamano | 2010-03-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'maint-1.6.5' into maint-1.6.6 | Junio C Hamano | 2010-03-04 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | Remove extra '-' from git-am(1) | Michal Sojka | 2010-03-04 | 1 | -1/+1 |
* | | | | | | | | | | | | | | t9119-git-svn-info.sh: test with svn 1.6.* as well | Michael J Gruber | 2010-03-04 | 1 | -1/+2 |
* | | | | | | | | | | | | | | git-svn: req_svn when needed | Michael J Gruber | 2010-03-04 | 1 | -0/+1 |
* | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-03 | 1 | -0/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Start preparing for 1.7.0.2 | Junio C Hamano | 2010-03-02 | 2 | -1/+23 |
| * | | | | | | | | | | | | | Merge branch 'tc/maint-transport-ls-remote-with-void' into maint | Junio C Hamano | 2010-03-02 | 2 | -1/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'hm/maint-imap-send-crlf' into maint | Junio C Hamano | 2010-03-02 | 1 | -1/+39 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sp/maint-push-sideband' into maint | Junio C Hamano | 2010-03-02 | 10 | -134/+370 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-fix-test-perm' into maint | Junio C Hamano | 2010-03-02 | 2 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'np/fast-import-idx-v2' into maint | Junio C Hamano | 2010-03-02 | 2 | -95/+84 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jh/maint-submodule-status-in-void' (early part) | Junio C Hamano | 2010-03-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | submodule summary: do not shift a non-existent positional variable | Jeff King | 2010-03-03 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-02 | 3 | -9/+85 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | gitweb: Fix project-specific feature override behavior | Jakub Narebski | 2010-03-02 | 2 | -6/+21 |
| * | | | | | | | | | | | | | | | | | | | gitweb multiple project roots documentation | Sylvain Rabot | 2010-03-02 | 1 | -3/+64 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/maint-fix-pager' | Junio C Hamano | 2010-03-02 | 10 | -15/+268 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | tests: Fix race condition in t7006-pager | Jonathan Nieder | 2010-02-22 | 1 | -6/+6 |
| * | | | | | | | | | | | | | | | | | | | t7006-pager: if stdout is not a terminal, make a new one | Jonathan Nieder | 2010-02-21 | 2 | -11/+82 |
| * | | | | | | | | | | | | | | | | | | | tests: Add tests for automatic use of pager | Jonathan Nieder | 2010-02-20 | 1 | -0/+163 |
| * | | | | | | | | | | | | | | | | | | | am: Fix launching of pager | Jonathan Nieder | 2010-02-14 | 2 | -4/+14 |
| * | | | | | | | | | | | | | | | | | | | git svn: Fix launching of pager | Jonathan Nieder | 2010-02-14 | 1 | -2/+7 |
| * | | | | | | | | | | | | | | | | | | | git.1: Clarify the behavior of the --paginate option | Jonathan Nieder | 2010-02-14 | 1 | -2/+6 |
| * | | | | | | | | | | | | | | | | | | | Make 'git var GIT_PAGER' always print the configured pager | Jonathan Nieder | 2010-02-14 | 3 | -5/+5 |
| * | | | | | | | | | | | | | | | | | | | Fix 'git var' usage synopsis | Jonathan Nieder | 2010-02-14 | 2 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ml/encode-header-refactor' | Junio C Hamano | 2010-03-02 | 4 | -55/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | move encode_in_pack_object_header() to a better place | Nicolas Pitre | 2010-02-23 | 4 | -28/+28 |
| * | | | | | | | | | | | | | | | | | | | | refactor duplicated encode_header in pack-objects and fast-import | Michael Lukashov | 2010-02-17 | 4 | -55/+33 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/gitweb-config-error-die' | Junio C Hamano | 2010-03-02 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | gitweb: Die if there are parsing errors in config file | Jakub Narebski | 2010-02-14 | 1 | -3/+6 |
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/for-each-ref' | Junio C Hamano | 2010-03-02 | 1 | -18/+59 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | for-each-ref --format='%(flag)' | Junio C Hamano | 2010-02-13 | 1 | -0/+22 |
| * | | | | | | | | | | | | | | | | | | | | for-each-ref --format='%(symref) %(symref:short)' | Junio C Hamano | 2010-02-13 | 1 | -1/+19 |
| * | | | | | | | | | | | | | | | | | | | | builtin-for-each-ref.c: check if we need to peel onion while parsing the format | Junio C Hamano | 2010-02-13 | 1 | -7/+2 |