Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jt/format-patch-base-info-above-sig' into maint | Junio C Hamano | 2016-09-29 |
|\ | |||
| * | format-patch: show base info before email signature | Josh Triplett | 2016-09-15 |
* | | Merge branch 'rs/checkout-some-states-are-const' into maint | Junio C Hamano | 2016-09-29 |
|\ \ | |||
| * | | checkout: constify parameters of checkout_stage() and checkout_merged() | René Scharfe | 2016-09-13 |
* | | | Merge branch 'ah/misc-message-fixes' into maint | Junio C Hamano | 2016-09-19 |
|\ \ \ | |||
| * | | | cat-file: put spaces around pipes in usage string | Alex Henrie | 2016-09-08 |
| * | | | am: put spaces around pipe in usage string | Alex Henrie | 2016-09-08 |
| | |/ | |/| | |||
* | | | Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maint | Junio C Hamano | 2016-09-19 |
|\ \ \ | |/ / |/| | | |||
| * | | symbolic-ref -d: do not allow removal of HEAD | Junio C Hamano | 2016-09-02 |
* | | | Merge branch 'mh/blame-worktree' | Junio C Hamano | 2016-08-31 |
|\ \ \ | |||
| * | | | blame: fix segfault on untracked files | Thomas Gummerer | 2016-08-29 |
* | | | | Merge branch 'js/no-html-bypass-on-windows' | Junio C Hamano | 2016-08-25 |
|\ \ \ \ | |||
| * | | | | Revert "display HTML in default browser using Windows' shell API" | Johannes Schindelin | 2016-08-19 |
| | |_|/ | |/| | | |||
* | | | | Merge branch 'sb/checkout-explit-detach-no-advice' | Junio C Hamano | 2016-08-19 |
|\ \ \ \ | |||
| * | | | | checkout: do not mention detach advice for explicit --detach option | Stefan Beller | 2016-08-15 |
| | |_|/ | |/| | | |||
| * | | | Merge branch 'jk/reset-ident-time-per-commit' into maint | Junio C Hamano | 2016-08-12 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'rs/use-strbuf-addstr' into maint | Junio C Hamano | 2016-08-10 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'os/no-verify-skips-commit-msg-too' into maint | Junio C Hamano | 2016-08-10 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'rs/rm-strbuf-optim' into maint | Junio C Hamano | 2016-08-10 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'jk/parse-options-concat' into maint | Junio C Hamano | 2016-08-10 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'pb/commit-editmsg-path' into maint | Junio C Hamano | 2016-08-08 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'nd/pack-ofs-4gb-limit' into maint | Junio C Hamano | 2016-08-08 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'mh/blame-worktree' into maint | Junio C Hamano | 2016-08-08 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'jk/tighten-alloc' | Junio C Hamano | 2016-08-17 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | receive-pack: use FLEX_ALLOC_MEM in queue_command() | René Scharfe | 2016-08-13 |
* | | | | | | | | | | | | Merge branch 'kw/patch-ids-optim' | Junio C Hamano | 2016-08-12 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | rebase: avoid computing unnecessary patch IDs | Kevin Willford | 2016-08-11 |
* | | | | | | | | | | | | | Merge branch 'js/mv-dir-to-new-directory' | Junio C Hamano | 2016-08-12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | git mv: do not keep slash in `git mv dir non-existing-dir/` | Johannes Schindelin | 2016-08-08 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge branch 'rs/use-strbuf-add-unique-abbrev' | Junio C Hamano | 2016-08-12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | use strbuf_add_unique_abbrev() for adding short hashes | René Scharfe | 2016-08-06 |
| |/ / / / / / / / / / / / | |||
* | | | | | | | | | | | | | Merge branch 'rs/merge-add-strategies-simplification' | Junio C Hamano | 2016-08-12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | merge: use string_list_split() in add_strategies() | René Scharfe | 2016-08-05 |
| |/ / / / / / / / / / / / | |||
* | | | | | | | | | | | | | Merge branch 'rs/child-process-init' | Junio C Hamano | 2016-08-12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | use CHILD_PROCESS_INIT to initialize automatic variables | René Scharfe | 2016-08-05 |
* | | | | | | | | | | | | | | Merge branch 'sb/submodule-clone-retry' | Junio C Hamano | 2016-08-12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | submodule--helper: use parallel processor correctly | Stefan Beller | 2016-08-09 |
* | | | | | | | | | | | | | | | Merge branch 'sb/submodule-update-dot-branch' | Junio C Hamano | 2016-08-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | submodule update: allow '.' for branch value | Stefan Beller | 2016-08-03 |
| * | | | | | | | | | | | | | | | submodule--helper: add remote-branch helper | Stefan Beller | 2016-08-03 |
| * | | | | | | | | | | | | | | | submodule--helper: fix usage string for relative-path | Stefan Beller | 2016-08-01 |
* | | | | | | | | | | | | | | | | Merge branch 'js/am-3-merge-recursive-direct' | Junio C Hamano | 2016-08-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | merge_trees(): ensure that the callers release output buffer | Johannes Schindelin | 2016-08-01 |
| * | | | | | | | | | | | | | | | | am -3: use merge_recursive() directly again | Johannes Schindelin | 2016-07-26 |
| * | | | | | | | | | | | | | | | | prepare the builtins for a libified merge_recursive() | Johannes Schindelin | 2016-07-26 |
| * | | | | | | | | | | | | | | | | die("bug"): report bugs consistently | Johannes Schindelin | 2016-07-26 |
* | | | | | | | | | | | | | | | | | Merge branch 'js/commit-slab-decl-fix' | Junio C Hamano | 2016-08-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | config.c: avoid duplicated global static variables | Johannes Sixt | 2016-08-09 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jt/format-patch-from-config' | Junio C Hamano | 2016-08-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | format-patch: format.from gives the default for --from | Josh Triplett | 2016-08-01 |
| | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |