summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | builtin-for-each-ref.c: comment fixesJunio C Hamano2010-02-131-10/+16
| |/ /
* | | Merge branch 'ld/maint-diff-quiet-w'Junio C Hamano2010-03-022-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 'tr/maint-cherry-pick-list'Junio C Hamano2010-03-021-0/+3
|\ \ \ \
| * | | | cherry_pick_list: quit early if one side is emptyThomas Rast2010-02-201-0/+3
* | | | | Merge branch 'rs/optim-text-wrap'Junio C Hamano2010-03-023-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 'ml/send-pack-transport-refactor'Junio C Hamano2010-03-024-207/+37
|\ \ \ \ \ \
| * | | | | | refactor duplicated code in builtin-send-pack.c and transport.cMichael Lukashov2010-02-174-207/+37
* | | | | | | Merge branch 'ml/fill-mm-refactor'Junio C Hamano2010-03-024-41/+24
|\ \ \ \ \ \ \
| * | | | | | | refactor duplicated fill_mm() in checkout and merge-recursiveMichael Lukashov2010-02-174-41/+24
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'ml/connect-refactor'Junio C Hamano2010-03-021-54/+29
|\ \ \ \ \ \ \
| * | | | | | | connect.c: move duplicated code to a new function 'get_host_and_port'Michael Lukashov2010-02-171-54/+29
| |/ / / / / /
* | | | | | | Merge branch 'np/compress-loose-object-memsave'Junio C Hamano2010-03-021-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 'dp/read-not-mmap-small-loose-object'Junio C Hamano2010-03-021-0/+10
|\ \ \ \ \ \ \
| * | | | | | | hash-object: don't use mmap() for small filesDmitry Potapov2010-02-211-0/+10
| |/ / / / / /
* | | | | | | Merge branch 'jn/makedepend'Junio C Hamano2010-03-022-50/+182
|\ \ \ \ \ \ \
| * | | | | | | Makefile: clarify definition of TEST_OBJSJonathan Nieder2010-02-281-2/+1
| * | | | | | | Makefile: always remove .depend directories on 'make clean'Jonathan Nieder2010-01-311-1/+1
| * | | | | | | Makefile: tuck away generated makefile fragments in .dependJonathan Nieder2010-01-311-3/+3
| * | | | | | | Teach Makefile to check header dependenciesJonathan Nieder2010-01-271-15/+80
| * | | | | | | Makefile: list standalone program object files in PROGRAM_OBJSJonathan Nieder2010-01-271-12/+16
| * | | | | | | Makefile: lazily compute header dependenciesJonathan Nieder2010-01-262-5/+45
| * | | | | | | Makefile: list generated object files in OBJECTSJonathan Nieder2010-01-261-2/+7
| * | | | | | | Makefile: disable default implicit rulesJonathan Nieder2010-01-261-0/+2
| * | | | | | | Makefile: rearrange dependency rulesJonathan Nieder2010-01-261-24/+25