Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/rev-list-no-bitmap-while-pruning' | Junio C Hamano | 2015-07-10 | 1 | -0/+6 |
|\ | |||||
| * | rev-list: disable --use-bitmap-index when pruning commitsjk/rev-list-no-bitmap-while-pruning | Jeff King | 2015-07-01 | 1 | -0/+6 |
* | | Merge branch 'rh/test-color-avoid-terminfo-in-original-home' | Junio C Hamano | 2015-07-10 | 1 | -52/+47 |
|\ \ | |||||
| * | | test-lib.sh: fix color support when tput needs ~/.terminforh/test-color-avoid-terminfo-in-original-home | Richard Hansen | 2015-06-17 | 1 | -29/+28 |
| * | | Revert "test-lib.sh: do tests for color support after changing HOME" | Richard Hansen | 2015-06-17 | 1 | -47/+43 |
* | | | Merge branch 'sb/p5310-and-chain' | Junio C Hamano | 2015-07-10 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | p5310: Fix broken && chain in performance testsb/p5310-and-chain | Stefan Beller | 2015-06-26 | 1 | -3/+3 |
| * | | | Merge branch 'jk/stash-require-clean-index' into maint | Junio C Hamano | 2015-06-25 | 1 | -7/+0 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jk/die-on-bogus-worktree-late' into maint | Junio C Hamano | 2015-06-25 | 1 | -8/+16 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maint | Junio C Hamano | 2015-06-25 | 1 | -0/+15 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'mm/rebase-i-post-rewrite-exec' into maint | Junio C Hamano | 2015-06-25 | 1 | -36/+53 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/http-backend-deadlock' into maint | Junio C Hamano | 2015-06-16 | 1 | -13/+36 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jh/filter-empty-contents' into maint | Junio C Hamano | 2015-06-16 | 1 | -0/+26 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/stash-options' into maint | Junio C Hamano | 2015-06-16 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/skip-http-tests-under-no-curl' into maint | Junio C Hamano | 2015-06-05 | 7 | -35/+12 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'pt/pull-log-n' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pt/pull-ff-vs-merge-ff' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/write-refs-sooner-2.4' into maint | Junio C Hamano | 2015-06-05 | 2 | -2/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/ref-directory-file' into maint | Junio C Hamano | 2015-06-05 | 2 | -7/+114 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/log-decorate-HEAD' into maint | Junio C Hamano | 2015-06-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/t1020-cleanup' into maint | Junio C Hamano | 2015-06-05 | 1 | -4/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/gitignore-precedence' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/connect-plink' into maint | Junio C Hamano | 2015-06-05 | 1 | -1/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ph/rebase-i-redo' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+47 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/add-e-kill-editor' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/blame-resurrect-convert-to-git' into maint | Junio C Hamano | 2015-06-05 | 1 | -3/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pt/xdg-config-path' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+114 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/hash-object' into maint | Junio C Hamano | 2015-05-26 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maint | Junio C Hamano | 2015-05-26 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/stash-require-clean-index' into maint | Junio C Hamano | 2015-05-26 | 1 | -7/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/t1509-chroot-test' into maint | Junio C Hamano | 2015-05-13 | 1 | -9/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/type-from-string-gently' into maint | Junio C Hamano | 2015-05-13 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ep/fix-test-lib-functions-report' into maint | Junio C Hamano | 2015-05-13 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cn/bom-in-gitignore' into maint | Junio C Hamano | 2015-05-13 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/dwim-wildcards-as-pathspecs' | Junio C Hamano | 2015-07-10 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for wildcard "path vs ref" disambiguation | Nguyễn Thái Ngọc Duy | 2015-07-01 | 1 | -0/+26 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-for-each-packed-object' | Junio C Hamano | 2015-07-09 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for_each_packed_object: automatically open pack indexjk/maint-for-each-packed-object | Jeff King | 2015-06-22 | 1 | -0/+1 |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync with 2.3.8 | Junio C Hamano | 2015-05-11 | 2 | -4/+38 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/diff-i-t-a' | Junio C Hamano | 2015-06-25 | 2 | -25/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "diff-lib.c: adjust position of i-t-a entries in diff"nd/diff-i-t-a | Junio C Hamano | 2015-06-23 | 2 | -25/+8 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/stash-require-clean-index' | Junio C Hamano | 2015-06-24 | 1 | -7/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "stash: require a clean index to apply"jk/stash-require-clean-index | Jeff King | 2015-06-15 | 1 | -7/+0 |
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pt/t0302-needs-sanity' | Junio C Hamano | 2015-06-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t0302: "unreadable" test needs SANITY prereqpt/t0302-needs-sanity | Paul Tan | 2015-06-12 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ld/p4-changes-block-size' | Junio C Hamano | 2015-06-24 | 2 | -9/+102 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: fixing --changes-block-size handlingld/p4-changes-block-size | Luke Diamand | 2015-06-10 | 1 | -6/+6 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: add tests for non-numeric revision range | Luke Diamand | 2015-06-10 | 1 | -0/+38 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: test with limited p4 server results | Luke Diamand | 2015-06-08 | 1 | -6/+23 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: additional testing of --changes-block-size | Luke Diamand | 2015-06-08 | 1 | -9/+47 |