Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add column layout skeleton and git-column | Nguyễn Thái Ngọc Duy | 2012-04-27 | 1 | -0/+45 |
* | test-lib: skip test with COLUMNS=1 under mksh | Zbigniew Jędrzejewski-Szmek | 2012-04-27 | 1 | -0/+1 |
* | 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 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'jc/checkout-out-of-unborn' into maint | Junio C Hamano | 2012-02-16 | 1 | -1/+10 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-commit-ignore-i-t-a' into maint | Junio C Hamano | 2012-02-16 | 1 | -3/+5 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'jk/maint-tag-show-fixes' into maint | Junio C Hamano | 2012-02-13 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jn/merge-no-edit-fix' into maint | Junio C Hamano | 2012-02-13 | 1 | -0/+12 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/git-dir-lookup' | Junio C Hamano | 2012-02-14 | 1 | -0/+100 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | standardize and improve lookup rules for external local reposjk/git-dir-lookup | Jeff King | 2012-02-02 | 1 | -0/+100 |
* | | | | | | | | | | | | Merge branch 'jk/grep-binary-attribute' | Junio C Hamano | 2012-02-14 | 1 | -0/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | grep: respect diff attributes for binary-ness | Jeff King | 2012-02-02 | 1 | -0/+24 |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'nd/pack-objects-parseopt' | Junio C Hamano | 2012-02-14 | 2 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | pack-objects: remove bogus comment | Nguyễn Thái Ngọc Duy | 2012-02-01 | 1 | -0/+4 |
| * | | | | | | | | | | | | pack-objects: do not accept "--index-version=version," | Nguyễn Thái Ngọc Duy | 2012-02-01 | 1 | -0/+4 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'mh/war-on-extra-refs' | Junio C Hamano | 2012-02-14 | 1 | -3/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | everything_local(): mark alternate refs as complete | Michael Haggerty | 2012-02-12 | 1 | -1/+1 |
| * | | | | | | | | | | | | t5700: document a failure of alternates to affect fetch | Michael Haggerty | 2012-02-12 | 1 | -3/+31 |
* | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2012-02-13 | 9 | -143/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'jc/parse-date-raw' into maint | Junio C Hamano | 2012-02-13 | 1 | -0/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maint | Junio C Hamano | 2012-02-13 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |