Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/finalize-temp-file' | Junio C Hamano | 2015-08-19 | 5 | -15/+12 |
|\ | |||||
| * | sha1_file.c: rename move_temp_to_file() to finalize_object_file()jc/finalize-temp-file | Junio C Hamano | 2015-08-10 | 5 | -15/+12 |
* | | Merge branch 'ps/guess-repo-name-at-root' | Junio C Hamano | 2015-08-19 | 2 | -19/+61 |
|\ \ | |||||
| * | | clone: abort if no dir name could be guessedps/guess-repo-name-at-root | Patrick Steinhardt | 2015-08-10 | 1 | -0/+4 |
| * | | clone: do not use port number as dir name | Patrick Steinhardt | 2015-08-10 | 2 | -7/+24 |
| * | | clone: do not include authentication data in guessed dir | Patrick Steinhardt | 2015-08-10 | 2 | -12/+33 |
* | | | Merge branch 'jk/guess-repo-name-regression-fix' | Junio C Hamano | 2015-08-19 | 2 | -1/+108 |
|\ \ \ | |/ / | |||||
| * | | clone: use computed length in guess_dir_namejk/guess-repo-name-regression-fix | Jeff King | 2015-08-10 | 2 | -7/+8 |
| * | | clone: add tests for output directory | Jeff King | 2015-08-10 | 1 | -0/+106 |
* | | | Merge branch 'jk/negative-hiderefs' | Junio C Hamano | 2015-08-19 | 3 | -22/+56 |
|\ \ \ | |||||
| * | | | refs: support negative transfer.hideRefsjk/negative-hiderefs | Jeff King | 2015-08-07 | 3 | -5/+41 |
| * | | | docs/config.txt: reorder hideRefs config | Jeff King | 2015-07-28 | 1 | -17/+15 |
* | | | | Merge branch 'jk/test-with-x' | Junio C Hamano | 2015-08-19 | 1 | -2/+11 |
|\ \ \ \ | |||||
| * | | | | test-lib: disable trace when test is not verbosejk/test-with-x | Jeff King | 2015-08-07 | 1 | -2/+6 |
| * | | | | test-lib: turn off "-x" tracing during chain-lint check | Jeff King | 2015-08-07 | 1 | -0/+5 |
* | | | | | Merge branch 'ps/t1509-chroot-test-fixup' | Junio C Hamano | 2015-08-19 | 1 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | tests: fix cleanup after tests in t1509-root-worktreeps/t1509-chroot-test-fixup | Patrick Steinhardt | 2015-08-05 | 1 | -1/+1 |
| * | | | | | tests: fix broken && chains in t1509-root-worktree | Patrick Steinhardt | 2015-08-05 | 1 | -4/+4 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'sb/check-return-from-read-ref' | Junio C Hamano | 2015-08-19 | 1 | -2/+6 |
|\ \ \ \ \ | |||||
| * | | | | | transport-helper: die on errors reading refs.sb/check-return-from-read-ref | Stefan Beller | 2015-08-03 | 1 | -2/+6 |
* | | | | | | Merge branch 'mm/pull-upload-pack' | Junio C Hamano | 2015-08-19 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pull.sh: quote $upload_pack when passing it to git-fetch | Matthieu Moy | 2015-07-30 | 1 | -1/+1 |
* | | | | | | | Third batch for 2.6 | Junio C Hamano | 2015-08-17 | 1 | -0/+11 |
* | | | | | | | Merge branch 'dt/untracked-sparse' | Junio C Hamano | 2015-08-17 | 2 | -14/+122 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | untracked-cache: support sparse checkout | David Turner | 2015-07-31 | 2 | -14/+122 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ta/docfix-index-format-tech' | Junio C Hamano | 2015-08-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | typofix for index-format.txtta/docfix-index-format-tech | Thomas Ackermann | 2015-07-28 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'mh/get-remote-group-fix' | Junio C Hamano | 2015-08-17 | 1 | -8/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | get_remote_group(): use skip_prefix()mh/get-remote-group-fix | Michael Haggerty | 2015-07-28 | 1 | -2/+1 |
| * | | | | | | | | get_remote_group(): eliminate superfluous call to strcspn() | Michael Haggerty | 2015-07-28 | 1 | -2/+2 |
| * | | | | | | | | get_remote_group(): rename local variable "space" to "wordlen" | Michael Haggerty | 2015-07-28 | 1 | -5/+5 |
| * | | | | | | | | get_remote_group(): handle remotes with single-character names | Michael Haggerty | 2015-07-28 | 1 | -2/+1 |
* | | | | | | | | | Merge branch 'kd/pull-rebase-autostash' | Junio C Hamano | 2015-08-17 | 2 | -1/+16 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | pull: allow dirty tree when rebase.autostash enabledkd/pull-rebase-autostash | Kevin Daudt | 2015-07-22 | 2 | -1/+17 |
* | | | | | | | | | | Second batch for 2.6 | Junio C Hamano | 2015-08-12 | 1 | -0/+25 |
* | | | | | | | | | | Merge branch 'sb/remove-unused-var-from-builtin-add' | Junio C Hamano | 2015-08-12 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | add: remove dead codesb/remove-unused-var-from-builtin-add | Stefan Beller | 2015-07-31 | 1 | -2/+0 |
* | | | | | | | | | | | Merge branch 'sb/parse-options-codeformat' | Junio C Hamano | 2015-08-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | parse-options: align curly braces for all optionssb/parse-options-codeformat | Stefan Beller | 2015-07-29 | 1 | -1/+1 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'dt/unpack-trees-cache-tree-revalidate' | Junio C Hamano | 2015-08-12 | 2 | -0/+32 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | unpack-trees: populate cache-tree on successful mergedt/unpack-trees-cache-tree-revalidate | Brian Degenhardt | 2015-07-28 | 2 | -0/+32 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'dt/reflog-tests' | Junio C Hamano | 2015-08-12 | 11 | -46/+37 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | tests: remove some direct access to .git/logsdt/reflog-tests | David Turner | 2015-07-28 | 10 | -33/+37 |
| * | | | | | | | | | | | t/t7509: remove unnecessary manipulation of reflog | David Turner | 2015-07-28 | 1 | -13/+0 |
* | | | | | | | | | | | | Merge branch 'es/worktree-add-cleanup' | Junio C Hamano | 2015-08-12 | 7 | -126/+213 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Documentation/git-worktree: fix duplicated 'from' | Patrick Steinhardt | 2015-08-05 | 1 | -1/+1 |
| * | | | | | | | | | | | | Documentation/config: mention "now" and "never" for 'expire' settings | Eric Sunshine | 2015-07-28 | 1 | -5/+11 |
| * | | | | | | | | | | | | Documentation/git-worktree: fix broken 'linkgit' invocation | Eric Sunshine | 2015-07-24 | 1 | -1/+1 |
| * | | | | | | | | | | | | checkout: drop intimate knowledge of newly created worktree | Eric Sunshine | 2015-07-20 | 1 | -7/+2 |
| * | | | | | | | | | | | | worktree: populate via "git reset --hard" rather than "git checkout" | Eric Sunshine | 2015-07-20 | 1 | -2/+1 |