Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | streaming: make stream_blob_to_fd take struct object_id | brian m. carlson | 2016-09-07 | 3 | -6/+6 |
* | builtin: convert textconv_object to use struct object_id | brian m. carlson | 2016-09-07 | 3 | -8/+8 |
* | builtin/cat-file: convert some static functions to struct object_id | brian m. carlson | 2016-09-07 | 1 | -25/+25 |
* | builtin/cat-file: convert struct expand_data to use struct object_id | brian m. carlson | 2016-09-07 | 1 | -10/+12 |
* | builtin/log: convert some static functions to use struct object_id | brian m. carlson | 2016-09-07 | 1 | -22/+22 |
* | builtin/blame: convert struct origin to use struct object_id | brian m. carlson | 2016-09-07 | 1 | -20/+20 |
* | builtin/apply: convert static functions to struct object_id | brian m. carlson | 2016-09-07 | 1 | -48/+48 |
* | cache: convert struct cache_entry to use struct object_id | brian m. carlson | 2016-09-07 | 11 | -22/+24 |
* | Merge branch 'mh/blame-worktree' | Junio C Hamano | 2016-08-31 | 1 | -1/+2 |
|\ | |||||
| * | blame: fix segfault on untracked filesmh/blame-worktree | Thomas Gummerer | 2016-08-29 | 1 | -1/+2 |
* | | Merge branch 'js/no-html-bypass-on-windows' | Junio C Hamano | 2016-08-25 | 1 | -7/+0 |
|\ \ | |||||
| * | | Revert "display HTML in default browser using Windows' shell API"js/no-html-bypass-on-windows | Johannes Schindelin | 2016-08-19 | 1 | -7/+0 |
* | | | Merge branch 'sb/checkout-explit-detach-no-advice' | Junio C Hamano | 2016-08-19 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | checkout: do not mention detach advice for explicit --detach optionsb/checkout-explit-detach-no-advice | Stefan Beller | 2016-08-15 | 1 | -1/+2 |
| * | | | Merge branch 'jk/reset-ident-time-per-commit' into maint | Junio C Hamano | 2016-08-12 | 1 | -0/+2 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'rs/use-strbuf-addstr' into maint | Junio C Hamano | 2016-08-10 | 2 | -2/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'os/no-verify-skips-commit-msg-too' into maint | Junio C Hamano | 2016-08-10 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'rs/rm-strbuf-optim' into maint | Junio C Hamano | 2016-08-10 | 1 | -2/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/parse-options-concat' into maint | Junio C Hamano | 2016-08-10 | 1 | -9/+4 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'pb/commit-editmsg-path' into maint | Junio C Hamano | 2016-08-08 | 1 | -7/+8 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'nd/pack-ofs-4gb-limit' into maint | Junio C Hamano | 2016-08-08 | 4 | -21/+27 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'mh/blame-worktree' into maint | Junio C Hamano | 2016-08-08 | 1 | -1/+9 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/tighten-alloc' | Junio C Hamano | 2016-08-17 | 1 | -3/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | receive-pack: use FLEX_ALLOC_MEM in queue_command() | René Scharfe | 2016-08-13 | 1 | -3/+1 |
* | | | | | | | | | | | | Merge branch 'kw/patch-ids-optim' | Junio C Hamano | 2016-08-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | rebase: avoid computing unnecessary patch IDs | Kevin Willford | 2016-08-11 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'js/mv-dir-to-new-directory' | Junio C Hamano | 2016-08-12 | 1 | -4/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | git mv: do not keep slash in `git mv dir non-existing-dir/`js/mv-dir-to-new-directory | Johannes Schindelin | 2016-08-08 | 1 | -4/+7 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'rs/use-strbuf-add-unique-abbrev' | Junio C Hamano | 2016-08-12 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | use strbuf_add_unique_abbrev() for adding short hashesrs/use-strbuf-add-unique-abbrev | René Scharfe | 2016-08-06 | 1 | -2/+1 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'rs/merge-add-strategies-simplification' | Junio C Hamano | 2016-08-12 | 1 | -34/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | merge: use string_list_split() in add_strategies()rs/merge-add-strategies-simplification | René Scharfe | 2016-08-05 | 1 | -34/+10 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'rs/child-process-init' | Junio C Hamano | 2016-08-12 | 2 | -6/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | use CHILD_PROCESS_INIT to initialize automatic variablesrs/child-process-init | René Scharfe | 2016-08-05 | 2 | -6/+3 |
* | | | | | | | | | | | | | | Merge branch 'sb/submodule-clone-retry' | Junio C Hamano | 2016-08-12 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | submodule--helper: use parallel processor correctlysb/submodule-clone-retry | Stefan Beller | 2016-08-09 | 1 | -2/+6 |
* | | | | | | | | | | | | | | | Merge branch 'sb/submodule-update-dot-branch' | Junio C Hamano | 2016-08-10 | 1 | -2/+54 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | submodule update: allow '.' for branch value | Stefan Beller | 2016-08-03 | 1 | -0/+18 |
| * | | | | | | | | | | | | | | | submodule--helper: add remote-branch helper | Stefan Beller | 2016-08-03 | 1 | -1/+35 |
| * | | | | | | | | | | | | | | | submodule--helper: fix usage string for relative-path | Stefan Beller | 2016-08-01 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Merge branch 'js/am-3-merge-recursive-direct' | Junio C Hamano | 2016-08-10 | 5 | -43/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | merge_trees(): ensure that the callers release output buffer | Johannes Schindelin | 2016-08-01 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | am -3: use merge_recursive() directly again | Johannes Schindelin | 2016-07-26 | 1 | -40/+22 |
| * | | | | | | | | | | | | | | | | prepare the builtins for a libified merge_recursive() | Johannes Schindelin | 2016-07-26 | 2 | -1/+5 |
| * | | | | | | | | | | | | | | | | die("bug"): report bugs consistently | Johannes Schindelin | 2016-07-26 | 2 | -2/+3 |
* | | | | | | | | | | | | | | | | | Merge branch 'js/commit-slab-decl-fix' | Junio C Hamano | 2016-08-10 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | config.c: avoid duplicated global static variables | Johannes Sixt | 2016-08-09 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jt/format-patch-from-config' | Junio C Hamano | 2016-08-10 | 1 | -1/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | format-patch: format.from gives the default for --fromjt/format-patch-from-config | Josh Triplett | 2016-08-01 | 1 | -1/+12 |
| | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/reset-ident-time-per-commit' | Junio C Hamano | 2016-08-10 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |