Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fc/push-prune' | Junio C Hamano | 2012-02-26 | 1 | -0/+16 |
|\ | |||||
| * | push: add '--prune' optionfc/push-prune | Felipe Contreras | 2012-02-22 | 1 | -0/+16 |
* | | Merge branch 'jk/maint-avoid-streaming-filtered-contents' | Junio C Hamano | 2012-02-26 | 1 | -0/+86 |
|\ \ | |||||
| * | | do not stream large files to pack when filters are in usejk/maint-avoid-streaming-filtered-contents | Jeff King | 2012-02-24 | 1 | -0/+86 |
* | | | Merge branch 'maint' | Junio C Hamano | 2012-02-26 | 3 | -21/+174 |
|\ \ \ | |||||
| * \ \ | Merge branch 'jc/add-refresh-unmerged' into maint | Junio C Hamano | 2012-02-26 | 1 | -0/+15 |
| |\ \ \ | |||||
| * \ \ \ | Sync with 1.7.8.5 | Junio C Hamano | 2012-02-26 | 1 | -0/+10 |
| |\ \ \ \ | |||||
| | * | | | | am: don't infloop for an empty input file | Jim Meyering | 2012-02-26 | 1 | -0/+10 |
| | | |/ / | | |/| | | |||||
| * | | | | git-p4: remove bash-ism in t9800 | Pete Wyckoff | 2012-02-26 | 1 | -9/+15 |
| * | | | | git-p4: remove bash-ism in t9809 | Pete Wyckoff | 2012-02-26 | 1 | -1/+1 |
| * | | | | git-p4: fix submit regression with clientSpec and subdir clone | Pete Wyckoff | 2012-02-26 | 1 | -11/+131 |
| * | | | | git-p4: set useClientSpec variable on initial clone | Pete Wyckoff | 2012-02-26 | 1 | -0/+17 |
| * | | | | Merge branch 'cb/receive-pack-keep-errors' into maint | Junio C Hamano | 2012-02-21 | 1 | -4/+18 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'cb/transfer-no-progress' into maint | Junio C Hamano | 2012-02-21 | 1 | -1/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/git-dir-lookup' into maint | Junio C Hamano | 2012-02-21 | 1 | -0/+100 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'cb/maint-rev-list-verify-object' into maint | Junio C Hamano | 2012-02-21 | 1 | -0/+26 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'cb/maint-t5541-make-server-port-portable' into maint | Junio C Hamano | 2012-02-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/grep-binary-attribute' into maint | Junio C Hamano | 2012-02-21 | 1 | -0/+24 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'nd/diffstat-gramnum' into maint | Junio C Hamano | 2012-02-21 | 64 | -109/+109 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'ld/git-p4-expanded-keywords' | Junio C Hamano | 2012-02-23 | 1 | -0/+388 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git-p4: add initial support for RCS keywordsld/git-p4-expanded-keywords | Luke Diamand | 2012-02-23 | 1 | -0/+388 |
* | | | | | | | | | | | | | Merge branch 'jk/config-include' | Junio C Hamano | 2012-02-23 | 2 | -1/+160 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | config: add include directive | Jeff King | 2012-02-17 | 1 | -0/+134 |
| * | | | | | | | | | | | | | config: stop using config_exclusive_filename | Jeff King | 2012-02-17 | 1 | -0/+25 |
| * | | | | | | | | | | | | | t1300: add missing &&-chaining | Jeff King | 2012-02-17 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Merge branch 'jc/add-refresh-unmerged' | Junio C Hamano | 2012-02-23 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | refresh_index: do not show unmerged path that is outside pathspecjc/add-refresh-unmerged | Junio C Hamano | 2012-02-17 | 1 | -0/+15 |
* | | | | | | | | | | | | | | Merge branch 'tr/perftest' | Junio C Hamano | 2012-02-23 | 13 | -551/+1342 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Add a performance test for git-greptr/perftest | Thomas Rast | 2012-02-17 | 1 | -0/+23 |
| * | | | | | | | | | | | | | | Introduce a performance testing framework | Thomas Rast | 2012-02-17 | 11 | -4/+753 |
| * | | | | | | | | | | | | | | Move the user-facing test library to test-lib-functions.sh | Thomas Rast | 2012-02-17 | 2 | -549/+568 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | t9100: remove bogus " || test" after each test scriptlet | Junio C Hamano | 2012-02-21 | 1 | -5/+9 |
* | | | | | | | | | | | | | | Merge branch 'master' of git://bogomips.org/git-svn | Junio C Hamano | 2012-02-21 | 1 | -15/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | git-svn.perl: fix a false-positive in the "already exists" test | Steven Walter | 2012-02-21 | 1 | -15/+18 |
* | | | | | | | | | | | | | | | Merge branch 'jn/gitweb-unborn-head' | Junio C Hamano | 2012-02-21 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | gitweb: Fix "heads" view when there is no current branchjn/gitweb-unborn-head | Jakub Narebski | 2012-02-17 | 1 | -0/+9 |
* | | | | | | | | | | | | | | | Merge branch 'tg/tag-points-at' | Junio C Hamano | 2012-02-20 | 1 | -0/+39 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | tag: add --points-at list option | Tom Grennan | 2012-02-08 | 1 | -0/+39 |
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'cb/transfer-no-progress' | Junio C Hamano | 2012-02-20 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | push/fetch/clone --no-progress suppresses progress outputcb/transfer-no-progress | Clemens Buchacher | 2012-02-13 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | Merge branch 'cb/receive-pack-keep-errors' | Junio C Hamano | 2012-02-20 | 1 | -4/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | do not override receive-pack errorscb/receive-pack-keep-errors | Clemens Buchacher | 2012-02-13 | 1 | -4/+18 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'cb/maint-t5541-make-server-port-portable' | Junio C Hamano | 2012-02-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | t5541: check error message against the real port number usedcb/maint-t5541-make-server-port-portable | Clemens Buchacher | 2012-02-13 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Merge branch 'cb/maint-rev-list-verify-object' | Junio C Hamano | 2012-02-20 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | git rev-list: fix invalid typecastcb/maint-rev-list-verify-object | Clemens Buchacher | 2012-02-13 | 1 | -0/+26 |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2012-01-18 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | diff-index: enable recursive pathspec matching in unpack_trees | Nguyen Thai Ngoc Duy | 2012-01-18 | 1 | -0/+8 |
* | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-02-20 | 1 | -0/+39 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | / / / / | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | gitweb: Fix 'grep' search for multiple matches in file | Jakub Narebski | 2012-02-19 | 1 | -0/+39 |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |