Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/branch-desc-typoavoidance' into maint | Junio C Hamano | 2012-02-13 | 2 | -4/+46 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | t: use sane_unset instead of unset | Ævar Arnfjörð Bjarmason | 2012-02-13 | 6 | -10/+10 |
| * | | | | | | | | | | | | | | Remove Git's support for smoke testing | Ævar Arnfjörð Bjarmason | 2012-02-13 | 3 | -133/+1 |
| * | | | | | | | | | | | | | | Merge branch 'jc/maint-request-pull-for-tag' into maint | Junio C Hamano | 2012-02-10 | 1 | -5/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tr/grep-l-with-decoration' into maint | Junio C Hamano | 2012-02-10 | 1 | -0/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jl/submodule-re-add' into maint | Junio C Hamano | 2012-02-10 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'da/maint-mergetool-twoway' into maint | Junio C Hamano | 2012-02-10 | 1 | -1/+27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sp/smart-http-failure-to-push' into maint | Junio C Hamano | 2012-02-05 | 1 | -0/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-log-first-parent-pathspec' into maint | Junio C Hamano | 2012-02-05 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/push-quiet' into maint | Junio C Hamano | 2012-02-05 | 2 | -0/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/checkout-out-of-unborn' | Junio C Hamano | 2012-02-12 | 1 | -1/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | git checkout -b: allow switching out of an unborn branchjc/checkout-out-of-unborn | Junio C Hamano | 2012-02-06 | 1 | -1/+10 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/diffstat-gramnum' | Junio C Hamano | 2012-02-12 | 64 | -109/+109 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | Use correct grammar in diffstat summary linend/diffstat-gramnum | Nguyễn Thái Ngọc Duy | 2012-02-03 | 64 | -109/+109 |
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-commit-ignore-i-t-a' | Junio C Hamano | 2012-02-12 | 1 | -3/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | commit: ignore intent-to-add entries instead of refusingjc/maint-commit-ignore-i-t-a | Junio C Hamano | 2012-02-07 | 1 | -3/+5 |
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-tag-show-fixes' | Junio C Hamano | 2012-02-12 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | tag: do not show non-tag contents with "-n"jk/maint-tag-show-fixes | Junio C Hamano | 2012-02-08 | 1 | -0/+13 |
| |/ / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jn/merge-no-edit-fix' | Junio C Hamano | 2012-02-12 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | merge: do not launch an editor on "--no-edit $tag"jn/merge-no-edit-fix | Junio C Hamano | 2012-02-09 | 1 | -0/+12 |
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'jc/parse-date-raw' | Junio C Hamano | 2012-02-10 | 1 | -0/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | parse_date(): '@' prefix forces git-timestampjc/parse-date-raw | Junio C Hamano | 2012-02-03 | 1 | -0/+23 |
* | | | | | | | | | | | | | | | | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' | Junio C Hamano | 2012-02-10 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |