Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/push-cert' | Junio C Hamano | 2014-10-24 | 1 | -0/+44 |
|\ | |||||
| * | push: heed user.signingkey for signed pushes | Michael J Gruber | 2014-10-24 | 1 | -0/+44 |
* | | Merge branch 'wk/t1304-wo-USER' | Junio C Hamano | 2014-10-24 | 1 | -1/+1 |
|\ \ | |||||
| * | | t1304: Set LOGNAME even if USER is unset or nullwk/t1304-wo-USER | W. Trevor King | 2014-10-19 | 1 | -1/+1 |
* | | | Merge branch 'jk/pack-objects-no-bitmap-when-splitting' | Junio C Hamano | 2014-10-24 | 1 | -0/+9 |
|\ \ \ | |||||
| * | | | pack-objects: turn off bitmaps when we split packsjk/pack-objects-no-bitmap-when-splitting | Jeff King | 2014-10-19 | 1 | -0/+9 |
| |/ / | |||||
* | | | Merge branch 'da/mergetool-temporary-directory' | Junio C Hamano | 2014-10-21 | 1 | -0/+23 |
|\ \ \ | |||||
| * | | | t7610-mergetool: add test cases for mergetool.writeToTempda/mergetool-temporary-directory | David Aguilar | 2014-10-16 | 1 | -0/+23 |
* | | | | Merge branch 'da/mergetool-tool-help' | Junio C Hamano | 2014-10-21 | 1 | -6/+6 |
|\ \ \ \ | |||||
| * | | | | test-lib-functions: adjust style to match CodingGuidelines | David Aguilar | 2014-10-15 | 1 | -12/+18 |
| * | | | | t7610-mergetool: prefer test_config over git config | David Aguilar | 2014-10-15 | 1 | -11/+9 |
* | | | | | Merge branch 'da/mergetool-tests' | Junio C Hamano | 2014-10-21 | 2 | -471/+469 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | test-lib-functions: adjust style to match CodingGuidelinesda/mergetool-tests | David Aguilar | 2014-10-16 | 1 | -12/+18 |
| * | | | | t7610-mergetool: use test_config to isolate tests | David Aguilar | 2014-10-16 | 1 | -5/+3 |
| |/ / / | |||||
| * | | | t7610-mergetool: add missing && and remove commented-out code | David Aguilar | 2014-10-15 | 1 | -8/+2 |
| * | | | t7610-mergetool: use tabs instead of a mix of tabs and spaces | David Aguilar | 2014-10-15 | 1 | -459/+459 |
| |/ / | |||||
* | | | Merge branch 'rs/ref-transaction' | Junio C Hamano | 2014-10-21 | 6 | -71/+322 |
|\ \ \ | |||||
| * | | | refs.c: allow listing and deleting badly named refs | Ronnie Sahlberg | 2014-10-15 | 1 | -1/+124 |
| * | | | test: put tests for handling of bad ref names in one place | Ronnie Sahlberg | 2014-10-15 | 3 | -74/+84 |
| * | | | branch -d: avoid repeated symref resolution | Jonathan Nieder | 2014-10-15 | 2 | -0/+43 |
| * | | | reflog test: test interaction with detached HEAD | Junio C Hamano | 2014-10-15 | 1 | -0/+70 |
| * | | | mv test: recreate mod/ directory instead of relying on stale copy | Jonathan Nieder | 2014-10-15 | 1 | -5/+10 |
* | | | | Merge branch 'cc/interpret-trailers' | Junio C Hamano | 2014-10-20 | 1 | -0/+863 |
|\ \ \ \ | |||||
| * | | | | trailer: add tests for commands in config file | Christian Couder | 2014-10-13 | 1 | -0/+125 |
| * | | | | trailer: add tests for "git interpret-trailers" | Christian Couder | 2014-10-13 | 1 | -0/+738 |
* | | | | | Merge branch 'ta/config-set' | Junio C Hamano | 2014-10-20 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | t1308: fix broken here document in test scriptta/config-set | Junio C Hamano | 2014-10-13 | 1 | -2/+2 |
* | | | | | | Merge branch 'jk/test-shell-trace' | Junio C Hamano | 2014-10-20 | 4 | -35/+84 |
|\ \ \ \ \ \ | |||||
| * | | | | | | test-lib.sh: support -x option for shell-tracingjk/test-shell-trace | Jeff King | 2014-10-13 | 2 | -4/+44 |
| * | | | | | | t5304: use helper to report failure of "test foo = bar" | Jeff King | 2014-10-13 | 2 | -8/+17 |
| * | | | | | | t5304: use test_path_is_* instead of "test -f" | Jeff King | 2014-10-13 | 1 | -23/+23 |
* | | | | | | | Revert "archive: honor tar.umask even for pax headers" | Junio C Hamano | 2014-10-20 | 1 | -5/+0 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge branch 'rs/sha1-array-test' | Junio C Hamano | 2014-10-14 | 1 | -0/+94 |
|\ \ \ \ \ \ | |||||
| * | | | | | | sha1-lookup: handle duplicates in sha1_pos()rs/sha1-array-test | René Scharfe | 2014-10-01 | 1 | -0/+20 |
| * | | | | | | sha1-array: add test-sha1-array and basic tests | René Scharfe | 2014-10-01 | 1 | -0/+74 |
* | | | | | | | Merge branch 'sk/tag-contains-wo-recursion' | Junio C Hamano | 2014-10-14 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t7004: give the test a bit more stack spacesk/tag-contains-wo-recursion | Junio C Hamano | 2014-09-23 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'dt/cache-tree-repair' | Junio C Hamano | 2014-10-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | t0090: avoid passing empty string to printf %ddt/cache-tree-repair | René Scharfe | 2014-09-30 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'sp/stream-clean-filter' | Junio C Hamano | 2014-10-08 | 2 | -6/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | convert: stream from fd to required clean filter to reduce used address space | Steffen Prohaska | 2014-08-28 | 1 | -5/+19 |
| * | | | | | | | | memory_limit: use git_env_ulong() to parse GIT_ALLOC_LIMIT | Steffen Prohaska | 2014-08-28 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'bw/use-write-script-in-tests' | Junio C Hamano | 2014-10-08 | 1 | -3/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t/lib-credential: use write_scriptbw/use-write-script-in-tests | Ben Walton | 2014-09-29 | 1 | -3/+1 |
| * | | | | | | | | | Merge branch 'jk/prune-top-level-refs-after-packing' into maint | Junio C Hamano | 2014-09-19 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maint | Junio C Hamano | 2014-09-19 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/refresh-beyond-symlink' into maint | Junio C Hamano | 2014-09-19 | 1 | -0/+43 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'lf/bundle-exclusion' into maint | Junio C Hamano | 2014-09-19 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/apply-ws-prefix' into maint | Junio C Hamano | 2014-09-19 | 2 | -0/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/command-line-config-empty-string' into maint | Junio C Hamano | 2014-09-19 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |