summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/report-fail-to-read-objects-better' into maintJunio C Hamano2014-06-251-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mn/sideband-no-ansi' into maintJunio C Hamano2014-06-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'je/pager-do-not-recurse' into maintJunio C Hamano2014-06-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fifth batch for 2.1Junio C Hamano2014-06-251-2/+14
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jm/dedup-name-compare'Junio C Hamano2014-06-256-35/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanup duplicate name_compare() functionsjm/dedup-name-compareJeremiah Mahler2014-06-205-34/+15
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name-hash.c: replace cache_name_compare() with memcmp(3)Jeremiah Mahler2014-06-201-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ep/avoid-test-a-o'Junio C Hamano2014-06-2518-50/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-submodule.sh: avoid "echo" path-like valuesJunio C Hamano2014-06-191-8/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-submodule.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-191-12/+20
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-mergetool.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-bisect.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check_bindir: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/unicode-7.0-display-width'Junio C Hamano2014-06-251-7/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update of unicode_width.h to Unicode Version 7.0tb/unicode-7.0-display-widthTorsten Bögershausen2014-06-181-7/+42
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ye/doc-http-proto'Junio C Hamano2014-06-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616ye/doc-http-protoYi EungJun2014-06-161-1/+1
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/blame-refactor'Junio C Hamano2014-06-251-28/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blame: simplify prepare_lines()rs/blame-refactorRené Scharfe2014-06-131-13/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blame: factor out get_next_line()René Scharfe2014-06-131-18/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pb/trim-trailing-spaces'Junio C Hamano2014-06-251-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t0008: do not depend on 'echo' handling backslashes speciallypb/trim-trailing-spacesJunio C Hamano2014-06-131-6/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mc/doc-submodule-sync-recurse'Junio C Hamano2014-06-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule: document "sync --recursive"mc/doc-submodule-sync-recurseMatthew Chen2014-06-131-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sp/complete-ext-alias'Junio C Hamano2014-06-252-0/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliasessp/complete-ext-aliasSteffen Prohaska2014-06-132-0/+37
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mc/git-p4-prepare-p4-only'Junio C Hamano2014-06-251-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: fix submit in non --prepare-p4-only modemc/git-p4-prepare-p4-onlyMaxime Coste2014-06-131-6/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/repack-pack-writebitmaps-config'Junio C Hamano2014-06-256-20/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7700: drop explicit --no-pack-kept-objects from .keep testjk/repack-pack-writebitmaps-configJeff King2014-06-121-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | repack: introduce repack.writeBitmaps config optionJeff King2014-06-105-10/+17
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | repack: simplify handling of --write-bitmap-indexJeff King2014-06-101-5/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pack-objects: stop respecting pack.writebitmapsJeff King2014-06-101-4/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/init-restore-env'Junio C Hamano2014-06-252-6/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git potty: restore environments after alias expansionnd/init-restore-envNguyễn Thái Ngọc Duy2014-06-102-6/+51
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |