Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | Merge branch 'ib/scripted-parse-opt-better-hint-string' into maint | Junio C Hamano | 2015-08-19 | 3 | -68/+92 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'se/doc-checkout-ours-theirs' into maint | Junio C Hamano | 2015-08-19 | 1 | -0/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/uname-in-untracked' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'as/sparse-checkout-removal' into maint | Junio C Hamano | 2015-08-19 | 2 | -0/+56 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'db/send-pack-user-signingkey' into maint | Junio C Hamano | 2015-08-19 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'da/subtree-date-confusion' into maint | Junio C Hamano | 2015-08-19 | 2 | -1/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Fourth batch for 2.6 | Junio C Hamano | 2015-08-19 | 1 | -1/+34 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/complete-rebase-i-edit-todo' | Junio C Hamano | 2015-08-19 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | completion: offer '--edit-todo' during interactive rebasetb/complete-rebase-i-edit-todo | Thomas Braun | 2015-08-05 | 1 | -1/+4 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/git-path' | Junio C Hamano | 2015-08-19 | 30 | -363/+465 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | memoize common git-path "constant" filesjk/git-path | Jeff King | 2015-08-10 | 17 | -119/+151 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | get_repo_path: refactor path-allocation | Jeff King | 2015-08-10 | 1 | -14/+29 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | find_hook: keep our own static buffer | Jeff King | 2015-08-10 | 2 | -4/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | refs.c: remove_empty_directories can take a strbuf | Jeff King | 2015-08-10 | 1 | -19/+15 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | refs.c: avoid git_path assignment in lock_ref_sha1_basic | Jeff King | 2015-08-10 | 1 | -13/+19 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | refs.c: avoid repeated git_path calls in rename_tmp_log | Jeff King | 2015-08-10 | 1 | -7/+14 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | refs.c: simplify strbufs in reflog setup and writing | Jeff King | 2015-08-10 | 1 | -23/+15 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | path.c: drop git_path_submodule | Jeff King | 2015-08-10 | 2 | -13/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | refs.c: remove extra git_path calls from read_loose_refs | Jeff King | 2015-08-10 | 1 | -10/+13 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | remote.c: drop extraneous local variable from migrate_file | Jeff King | 2015-08-10 | 1 | -5/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | prefer mkpathdup to mkpath in assignments | Jeff King | 2015-08-10 | 2 | -13/+17 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | prefer git_pathdup to git_path in some possibly-dangerous cases | Jeff King | 2015-08-10 | 6 | -11/+21 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | add_to_alternates_file: don't add duplicate entries | Jeff King | 2015-08-10 | 2 | -7/+45 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | t5700: modernize style | Jeff King | 2015-08-10 | 1 | -112/+81 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | cache.h: complete set of git_path_submodule helpers | Jeff King | 2015-08-10 | 2 | -5/+35 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | cache.h: clarify documentation for git_path, et al | Jeff King | 2015-08-10 | 1 | -5/+12 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | 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 |