summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'maint-1.6.6' into maintJunio C Hamano2010-03-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6Junio C Hamano2010-03-072-0/+4
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/maint-push-sideband' into maint-1.6.6Junio C Hamano2010-03-0710-133/+371
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'hm/maint-imap-send-crlf' into maint-1.6.6Junio C Hamano2010-03-071-1/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gf/maint-sh-setup-nongit-ok' into maint-1.6.6Junio C Hamano2010-03-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6Junio C Hamano2010-03-072-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/optim-text-wrap' into maint-1.6.6Junio C Hamano2010-03-073-37/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/maint-cherry-pick-list' into maint-1.6.6Junio C Hamano2010-03-071-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/maint-bisect-paths' into maint-1.6.6Junio C Hamano2010-03-072-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | Git 1.7.0.2v1.7.0.2Junio C Hamano2010-03-073-8/+3
* | | | | | | | | | | | | | | | | | | | unset GREP_OPTIONS in test-lib.shBert Wesarg2010-03-071-0/+2
* | | | | | | | | | | | | | | | | | | | stash: suggest the correct command line for unknown options.Matthieu Moy2010-03-061-0/+1
* | | | | | | | | | | | | | | | | | | | t7406: Fix submodule init config testsStephen Boyd2010-03-061-8/+16
* | | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | gitweb: Die if there are parsing errors in config fileJakub Narebski2010-02-141-3/+6
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jn/maint-fix-pager' into maintJunio C Hamano2010-03-0410-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 'tr/maint-cherry-pick-list' into maintJunio C Hamano2010-03-041-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | cherry_pick_list: quit early if one side is emptyThomas Rast2010-02-201-0/+3
* | | | | | | | | | | | | | | | | | | | Merge branch 'ld/maint-diff-quiet-w' into maintJunio C Hamano2010-03-042-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | git-diff: add a test for git diff --quiet -wLarry D'Anna2010-02-211-0/+15
| * | | | | | | | | | | | | | | | | | | | git diff --quiet -w: check and report the statusLarry D'Anna2010-02-151-0/+23
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/optim-text-wrap' into maintJunio C Hamano2010-03-043-37/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()René Scharfe2010-02-201-6/+17
| * | | | | | | | | | | | | | | | | | | | utf8.c: remove strbuf_write()René Scharfe2010-02-201-13/+5
| * | | | | | | | | | | | | | | | | | | | utf8.c: remove print_spaces()René Scharfe2010-02-201-9/+6
| * | | | | | | | | | | | | | | | | | | | utf8.c: remove print_wrapped_text()René Scharfe2010-02-203-9/+14
* | | | | | | | | | | | | | | | | | | | | Merge branch 'dp/read-not-mmap-small-loose-object' into maintJunio C Hamano2010-03-041-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | hash-object: don't use mmap() for small filesDmitry Potapov2010-02-211-0/+10
| | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'np/compress-loose-object-memsave' into maintJunio C Hamano2010-03-041-14/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | sha1_file: be paranoid when creating loose objectsNicolas Pitre2010-02-211-0/+9
| * | | | | | | | | | | | | | | | | | | | | sha1_file: don't malloc the whole compressed result when writing out objectsNicolas Pitre2010-02-211-14/+10
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-status-preload' into maintJunio C Hamano2010-03-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | status: preload index to optimize lstat(2) callsJunio C Hamano2010-02-171-1/+1
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'gf/maint-sh-setup-nongit-ok' into maintJunio C Hamano2010-03-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | require_work_tree broken with NONGIT_OKGabriel Filion2010-02-171-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/maint-bisect-paths' into maintJunio C Hamano2010-03-042-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | bisect: error out when passing bad path parametersChristian Couder2010-03-012-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
| | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Start preparing for 1.7.0.2Junio C Hamano2010-03-022-1/+23