summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/finalize-temp-file'Junio C Hamano2015-08-195-15/+12
|\
| * sha1_file.c: rename move_temp_to_file() to finalize_object_file()jc/finalize-temp-fileJunio C Hamano2015-08-105-15/+12
* | Merge branch 'ps/guess-repo-name-at-root'Junio C Hamano2015-08-192-19/+61
|\ \
| * | clone: abort if no dir name could be guessedps/guess-repo-name-at-rootPatrick Steinhardt2015-08-101-0/+4
| * | clone: do not use port number as dir namePatrick Steinhardt2015-08-102-7/+24
| * | clone: do not include authentication data in guessed dirPatrick Steinhardt2015-08-102-12/+33
* | | Merge branch 'jk/guess-repo-name-regression-fix'Junio C Hamano2015-08-192-1/+108
|\ \ \ | |/ /
| * | clone: use computed length in guess_dir_namejk/guess-repo-name-regression-fixJeff King2015-08-102-7/+8
| * | clone: add tests for output directoryJeff King2015-08-101-0/+106
* | | Merge branch 'jk/negative-hiderefs'Junio C Hamano2015-08-193-22/+56
|\ \ \
| * | | refs: support negative transfer.hideRefsjk/negative-hiderefsJeff King2015-08-073-5/+41
| * | | docs/config.txt: reorder hideRefs configJeff King2015-07-281-17/+15
* | | | Merge branch 'jk/test-with-x'Junio C Hamano2015-08-191-2/+11
|\ \ \ \
| * | | | test-lib: disable trace when test is not verbosejk/test-with-xJeff King2015-08-071-2/+6
| * | | | test-lib: turn off "-x" tracing during chain-lint checkJeff King2015-08-071-0/+5
* | | | | Merge branch 'ps/t1509-chroot-test-fixup'Junio C Hamano2015-08-191-4/+4
|\ \ \ \ \
| * | | | | tests: fix cleanup after tests in t1509-root-worktreeps/t1509-chroot-test-fixupPatrick Steinhardt2015-08-051-1/+1
| * | | | | tests: fix broken && chains in t1509-root-worktreePatrick Steinhardt2015-08-051-4/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'sb/check-return-from-read-ref'Junio C Hamano2015-08-191-2/+6
|\ \ \ \ \
| * | | | | transport-helper: die on errors reading refs.sb/check-return-from-read-refStefan Beller2015-08-031-2/+6
* | | | | | Merge branch 'mm/pull-upload-pack'Junio C Hamano2015-08-191-1/+1
|\ \ \ \ \ \
| * | | | | | pull.sh: quote $upload_pack when passing it to git-fetchMatthieu Moy2015-07-301-1/+1
* | | | | | | Third batch for 2.6Junio C Hamano2015-08-171-0/+11
* | | | | | | Merge branch 'dt/untracked-sparse'Junio C Hamano2015-08-172-14/+122
|\ \ \ \ \ \ \
| * | | | | | | untracked-cache: support sparse checkoutDavid Turner2015-07-312-14/+122
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'ta/docfix-index-format-tech'Junio C Hamano2015-08-171-1/+1
|\ \ \ \ \ \ \
| * | | | | | | typofix for index-format.txtta/docfix-index-format-techThomas Ackermann2015-07-281-1/+1
* | | | | | | | Merge branch 'mh/get-remote-group-fix'Junio C Hamano2015-08-171-8/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | get_remote_group(): use skip_prefix()mh/get-remote-group-fixMichael Haggerty2015-07-281-2/+1
| * | | | | | | | get_remote_group(): eliminate superfluous call to strcspn()Michael Haggerty2015-07-281-2/+2
| * | | | | | | | get_remote_group(): rename local variable "space" to "wordlen"Michael Haggerty2015-07-281-5/+5
| * | | | | | | | get_remote_group(): handle remotes with single-character namesMichael Haggerty2015-07-281-2/+1
* | | | | | | | | Merge branch 'kd/pull-rebase-autostash'Junio C Hamano2015-08-172-1/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pull: allow dirty tree when rebase.autostash enabledkd/pull-rebase-autostashKevin Daudt2015-07-222-1/+17
* | | | | | | | | | Second batch for 2.6Junio C Hamano2015-08-121-0/+25
* | | | | | | | | | Merge branch 'sb/remove-unused-var-from-builtin-add'Junio C Hamano2015-08-121-2/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add: remove dead codesb/remove-unused-var-from-builtin-addStefan Beller2015-07-311-2/+0
* | | | | | | | | | | Merge branch 'sb/parse-options-codeformat'Junio C Hamano2015-08-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | parse-options: align curly braces for all optionssb/parse-options-codeformatStefan Beller2015-07-291-1/+1
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'dt/unpack-trees-cache-tree-revalidate'Junio C Hamano2015-08-122-0/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | unpack-trees: populate cache-tree on successful mergedt/unpack-trees-cache-tree-revalidateBrian Degenhardt2015-07-282-0/+32
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'dt/reflog-tests'Junio C Hamano2015-08-1211-46/+37
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | tests: remove some direct access to .git/logsdt/reflog-testsDavid Turner2015-07-2810-33/+37
| * | | | | | | | | | | t/t7509: remove unnecessary manipulation of reflogDavid Turner2015-07-281-13/+0
* | | | | | | | | | | | Merge branch 'es/worktree-add-cleanup'Junio C Hamano2015-08-127-126/+213
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation/git-worktree: fix duplicated 'from'Patrick Steinhardt2015-08-051-1/+1
| * | | | | | | | | | | | Documentation/config: mention "now" and "never" for 'expire' settingsEric Sunshine2015-07-281-5/+11
| * | | | | | | | | | | | Documentation/git-worktree: fix broken 'linkgit' invocationEric Sunshine2015-07-241-1/+1
| * | | | | | | | | | | | checkout: drop intimate knowledge of newly created worktreeEric Sunshine2015-07-201-7/+2
| * | | | | | | | | | | | worktree: populate via "git reset --hard" rather than "git checkout"Eric Sunshine2015-07-201-2/+1