summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "git-svn: always initialize with core.autocrlf=false"Erik Faye-Lund2010-03-051-1/+0
* git-svn: support fetch with autocrlf onErik Faye-Lund2010-03-051-1/+1
* hash-object: support --stdin-paths with --no-filtersErik Faye-Lund2010-03-053-9/+19
* Merge branch 'maint'Junio C Hamano2010-03-042-2/+26
|\
| * Update draft release notes to 1.7.0.2Junio C Hamano2010-03-041-1/+25
| * Merge branch 'jn/gitweb-config-error-die' into maintJunio C Hamano2010-03-041-3/+6
| |\
| * \ Merge branch 'jn/maint-fix-pager' into maintJunio C Hamano2010-03-0410-15/+268
| |\ \
| * \ \ Merge branch 'tr/maint-cherry-pick-list' into maintJunio C Hamano2010-03-041-0/+3
| |\ \ \
| * \ \ \ Merge branch 'ld/maint-diff-quiet-w' into maintJunio C Hamano2010-03-042-0/+38
| |\ \ \ \
| * \ \ \ \ Merge branch 'rs/optim-text-wrap' into maintJunio C Hamano2010-03-043-37/+42
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dp/read-not-mmap-small-loose-object' into maintJunio C Hamano2010-03-041-0/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'np/compress-loose-object-memsave' into maintJunio C Hamano2010-03-041-14/+19
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/maint-status-preload' into maintJunio C Hamano2010-03-041-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'gf/maint-sh-setup-nongit-ok' into maintJunio C Hamano2010-03-041-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'cc/maint-bisect-paths' into maintJunio C Hamano2010-03-042-0/+11
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.6' into maintJunio C Hamano2010-03-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.5' into maint-1.6.6Junio C Hamano2010-03-041-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Remove extra '-' from git-am(1)Michal Sojka2010-03-041-1/+1
* | | | | | | | | | | | | | t9119-git-svn-info.sh: test with svn 1.6.* as wellMichael J Gruber2010-03-041-1/+2
* | | | | | | | | | | | | | git-svn: req_svn when neededMichael J Gruber2010-03-041-0/+1
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-03-031-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Start preparing for 1.7.0.2Junio C Hamano2010-03-022-1/+23
| * | | | | | | | | | | | | Merge branch 'tc/maint-transport-ls-remote-with-void' into maintJunio C Hamano2010-03-022-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'hm/maint-imap-send-crlf' into maintJunio C Hamano2010-03-021-1/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/maint-push-sideband' into maintJunio C Hamano2010-03-0210-134/+370
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-fix-test-perm' into maintJunio C Hamano2010-03-022-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'np/fast-import-idx-v2' into maintJunio C Hamano2010-03-022-95/+84
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/maint-submodule-status-in-void' (early part)Junio C Hamano2010-03-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | submodule summary: do not shift a non-existent positional variableJeff King2010-03-031-1/+1
* | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-03-023-9/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | gitweb: Fix project-specific feature override behaviorJakub Narebski2010-03-022-6/+21
| * | | | | | | | | | | | | | | | | | | gitweb multiple project roots documentationSylvain Rabot2010-03-021-3/+64
* | | | | | | | | | | | | | | | | | | | Merge branch 'jn/maint-fix-pager'Junio C Hamano2010-03-0210-15/+268
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | tests: Fix race condition in t7006-pagerJonathan Nieder2010-02-221-6/+6
| * | | | | | | | | | | | | | | | | | | t7006-pager: if stdout is not a terminal, make a new oneJonathan Nieder2010-02-212-11/+82
| * | | | | | | | | | | | | | | | | | | tests: Add tests for automatic use of pagerJonathan Nieder2010-02-201-0/+163
| * | | | | | | | | | | | | | | | | | | am: Fix launching of pagerJonathan Nieder2010-02-142-4/+14
| * | | | | | | | | | | | | | | | | | | git svn: Fix launching of pagerJonathan Nieder2010-02-141-2/+7
| * | | | | | | | | | | | | | | | | | | git.1: Clarify the behavior of the --paginate optionJonathan Nieder2010-02-141-2/+6
| * | | | | | | | | | | | | | | | | | | Make 'git var GIT_PAGER' always print the configured pagerJonathan Nieder2010-02-143-5/+5
| * | | | | | | | | | | | | | | | | | | Fix 'git var' usage synopsisJonathan Nieder2010-02-142-2/+2
* | | | | | | | | | | | | | | | | | | | Merge branch 'ml/encode-header-refactor'Junio C Hamano2010-03-024-55/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | move encode_in_pack_object_header() to a better placeNicolas Pitre2010-02-234-28/+28
| * | | | | | | | | | | | | | | | | | | | refactor duplicated encode_header in pack-objects and fast-importMichael Lukashov2010-02-174-55/+33
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/gitweb-config-error-die'Junio C Hamano2010-03-021-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | gitweb: Die if there are parsing errors in config fileJakub Narebski2010-02-141-3/+6
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/for-each-ref'Junio C Hamano2010-03-021-18/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | for-each-ref --format='%(flag)'Junio C Hamano2010-02-131-0/+22
| * | | | | | | | | | | | | | | | | | | | for-each-ref --format='%(symref) %(symref:short)'Junio C Hamano2010-02-131-1/+19
| * | | | | | | | | | | | | | | | | | | | builtin-for-each-ref.c: check if we need to peel onion while parsing the formatJunio C Hamano2010-02-131-7/+2