Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/long-error-messages' | Junio C Hamano | 2015-08-25 | 3 | -29/+21 |
|\ | |||||
| * | vreportf: avoid intermediate bufferjk/long-error-messages | Jeff King | 2015-08-11 | 1 | -3/+12 |
| * | vreportf: report to arbitrary filehandles | Jeff King | 2015-08-11 | 3 | -29/+12 |
* | | Merge branch 'ee/clean-remove-dirs' | Junio C Hamano | 2015-08-25 | 1 | -1/+1 |
|\ \ | |||||
| * | | t7300-clean: require POSIXPERM for chmod 0 testee/clean-remove-dirs | Johannes Sixt | 2015-08-11 | 1 | -1/+1 |
* | | | Merge branch 'jh/strbuf-read-use-read-in-full' | Junio C Hamano | 2015-08-25 | 1 | -5/+5 |
|\ \ \ | |||||
| * | | | strbuf_read(): skip unnecessary strbuf_grow() at eofjh/strbuf-read-use-read-in-full | Jim Hill | 2015-08-10 | 1 | -5/+5 |
* | | | | Sync with maint | Junio C Hamano | 2015-08-19 | 1 | -0/+49 |
|\ \ \ \ | |||||
| * | | | | Start preparing for 2.5.1 | Junio C Hamano | 2015-08-19 | 2 | -1/+50 |
| * | | | | Merge branch 'ta/docfix-index-format-tech' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'sb/parse-options-codeformat' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'sb/remove-unused-var-from-builtin-add' into maint | Junio C Hamano | 2015-08-19 | 1 | -2/+0 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'kn/tag-doc-fix' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'es/doc-clean-outdated-tools' into maint | Junio C Hamano | 2015-08-19 | 2 | -117/+9 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'nd/export-worktree' into maint | Junio C Hamano | 2015-08-19 | 2 | -0/+19 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'mh/fast-import-optimize-current-from' into maint | Junio C Hamano | 2015-08-19 | 1 | -12/+17 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |