Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kb/maint-submodule-savearg' | Junio C Hamano | 2010-11-17 | 1 | -0/+50 |
|\ | |||||
| * | submodule: only preserve flags across recursive status/update invocations | Kevin Ballard | 2010-11-03 | 1 | -0/+34 |
| * | submodule: preserve all arguments exactly when recursing | Kevin Ballard | 2010-11-03 | 1 | -0/+16 |
* | | Merge branch 'jk/missing-config' | Junio C Hamano | 2010-11-17 | 1 | -0/+29 |
|\ \ | |||||
| * | | config: treat non-existent config files as empty | Jeff King | 2010-10-21 | 1 | -0/+29 |
* | | | Merge branch 'kb/maint-diff-ws-check' | Junio C Hamano | 2010-11-17 | 3 | -44/+114 |
|\ \ \ | |||||
| * | | | diff: handle lines containing only whitespace and tabs better | Kevin Ballard | 2010-10-20 | 1 | -0/+37 |
| * | | | test-lib: extend test_decode_color to handle more color codes | Kevin Ballard | 2010-10-20 | 2 | -44/+77 |
| | |/ | |/| | |||||
* | | | Merge branch 'bg/maint-gitweb-test-lib' | Junio C Hamano | 2010-11-17 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | t/gitweb-lib: Don't pass constant to decode_utf8 | Brian Gernhardt | 2010-10-20 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'jm/mailmap' | Junio C Hamano | 2010-11-17 | 1 | -12/+55 |
|\ \ \ | |||||
| * | | | t4203: do not let "git shortlog" DWIM based on tty | Junio C Hamano | 2010-10-19 | 1 | -2/+2 |
| * | | | t4203 (mailmap): stop hardcoding commit ids and dates | Jonathan Nieder | 2010-10-18 | 1 | -9/+17 |
| * | | | mailmap: fix use of freed memory | Jim Meyering | 2010-10-13 | 1 | -3/+38 |
* | | | | Merge branch 'jk/maint-apply-no-binary' | Junio C Hamano | 2010-11-17 | 1 | -1/+26 |
|\ \ \ \ | |||||
| * | | | | apply: don't segfault on binary files with missing data | Jeff King | 2010-10-29 | 1 | -1/+26 |
* | | | | | Merge branch 'jk/push-progress' | Junio C Hamano | 2010-11-17 | 5 | -51/+107 |
|\ \ \ \ \ | |||||
| * | | | | | push: pass --progress down to git-pack-objects | Jeff King | 2010-10-18 | 1 | -2/+2 |
| * | | | | | t5523-push-upstream: test progress messages | Tay Ray Chuan | 2010-10-18 | 1 | -0/+38 |
| * | | | | | t5523-push-upstream: add function to ensure fresh upstream repo | Tay Ray Chuan | 2010-10-18 | 1 | -1/+5 |
| * | | | | | test_terminal: ensure redirections work reliably | Jonathan Nieder | 2010-10-18 | 1 | -28/+10 |
| * | | | | | test_terminal: catch use without TTY prerequisite | Jonathan Nieder | 2010-10-18 | 2 | -8/+12 |
| * | | | | | test-lib: allow test code to check the list of declared prerequisites | Jonathan Nieder | 2010-10-18 | 1 | -7/+19 |
| * | | | | | tests: test terminal output to both stdout and stderr | Jeff King | 2010-10-18 | 2 | -11/+28 |
| * | | | | | tests: factor out terminal handling from t7006 | Jeff King | 2010-10-18 | 3 | -30/+29 |
* | | | | | | Merge branch 'tr/maint-merge-file-subdir' | Junio C Hamano | 2010-11-17 | 1 | -0/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge-file: correctly find files when called in subdir | Thomas Rast | 2010-10-18 | 1 | -0/+8 |
* | | | | | | | Merge branch 'mg/make-prove' | Junio C Hamano | 2010-11-17 | 2 | -1/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | test: allow running the tests under "prove" | Michael J Gruber | 2010-10-26 | 2 | -1/+15 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'ak/submodule-sync' | Junio C Hamano | 2010-11-17 | 1 | -1/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | submodule sync: Update "submodule.<name>.url" for empty directories | Andreas Köhler | 2010-10-13 | 1 | -1/+11 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/maint-rev-list-nul' | Junio C Hamano | 2010-11-17 | 3 | -4/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rev-list: handle %x00 NUL in user format | Jeff King | 2010-10-13 | 3 | -4/+12 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'ks/no-textconv-symlink' | Junio C Hamano | 2010-11-17 | 2 | -12/+88 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664'' | Kirill Smelkov | 2010-09-29 | 2 | -8/+4 |
| * | | | | | | | blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks | Kirill Smelkov | 2010-09-29 | 2 | -0/+78 |
| * | | | | | | | blame,cat-file: Prepare --textconv tests for correctly-failing conversion pro... | Kirill Smelkov | 2010-09-29 | 2 | -12/+14 |
* | | | | | | | | Merge branch 'jn/gitweb-test' | Junio C Hamano | 2010-11-17 | 2 | -2/+23 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | gitweb/Makefile: Add 'test' and 'test-installed' targets | Jakub Narebski | 2010-09-30 | 1 | -0/+4 |
| * | | | | | | | | t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLED | Jakub Narebski | 2010-09-30 | 1 | -2/+19 |
* | | | | | | | | | Merge branch 'cb/diff-fname-optim' | Junio C Hamano | 2010-11-17 | 1 | -0/+109 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | add rebase patch id tests | Clemens Buchacher | 2010-09-23 | 1 | -0/+109 |
* | | | | | | | | | | Merge branch 'jk/no-textconv-symlink' | Junio C Hamano | 2010-11-17 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | diff: don't use pathname-based diff drivers for symlinks | Jeff King | 2010-09-23 | 1 | -0/+26 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-11-17 | 1 | -0/+21 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t3402: test "rebase -s<strategy> -X<opt>" | Junio C Hamano | 2010-11-11 | 1 | -0/+21 |
* | | | | | | | | | | tests: use test_cmp instead of piping to diff(1) | Ævar Arnfjörð Bjarmason | 2010-11-14 | 2 | -47/+94 |
* | | | | | | | | | | t7004-tag.sh: re-arrange git tag comment for clarity | Ævar Arnfjörð Bjarmason | 2010-11-14 | 1 | -5/+15 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-11-09 | 1 | -3/+7 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | dir.c: fix EXC_FLAG_MUSTBEDIR match in sparse checkout | Nguyễn Thái Ngọc Duy | 2010-11-08 | 1 | -3/+7 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | |