aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jt/format-patch-base-info-above-sig' into maintJunio C Hamano2016-09-29
|\
| * format-patch: show base info before email signatureJosh Triplett2016-09-15
* | Merge branch 'rs/checkout-some-states-are-const' into maintJunio C Hamano2016-09-29
|\ \
| * | checkout: constify parameters of checkout_stage() and checkout_merged()René Scharfe2016-09-13
* | | Merge branch 'ah/misc-message-fixes' into maintJunio C Hamano2016-09-19
|\ \ \
| * | | cat-file: put spaces around pipes in usage stringAlex Henrie2016-09-08
| * | | am: put spaces around pipe in usage stringAlex Henrie2016-09-08
| | |/ | |/|
* | | Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maintJunio C Hamano2016-09-19
|\ \ \ | |/ / |/| |
| * | symbolic-ref -d: do not allow removal of HEADJunio C Hamano2016-09-02
* | | Merge branch 'mh/blame-worktree'Junio C Hamano2016-08-31
|\ \ \
| * | | blame: fix segfault on untracked filesThomas Gummerer2016-08-29
* | | | Merge branch 'js/no-html-bypass-on-windows'Junio C Hamano2016-08-25
|\ \ \ \
| * | | | Revert "display HTML in default browser using Windows' shell API"Johannes Schindelin2016-08-19
| | |_|/ | |/| |
* | | | Merge branch 'sb/checkout-explit-detach-no-advice'Junio C Hamano2016-08-19
|\ \ \ \
| * | | | checkout: do not mention detach advice for explicit --detach optionStefan Beller2016-08-15
| | |_|/ | |/| |
| * | | Merge branch 'jk/reset-ident-time-per-commit' into maintJunio C Hamano2016-08-12
| |\ \ \
| * \ \ \ Merge branch 'rs/use-strbuf-addstr' into maintJunio C Hamano2016-08-10
| |\ \ \ \
| * \ \ \ \ Merge branch 'os/no-verify-skips-commit-msg-too' into maintJunio C Hamano2016-08-10
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/rm-strbuf-optim' into maintJunio C Hamano2016-08-10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/parse-options-concat' into maintJunio C Hamano2016-08-10
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'pb/commit-editmsg-path' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'nd/pack-ofs-4gb-limit' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mh/blame-worktree' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
* | | | | | | | | | | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-08-17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | receive-pack: use FLEX_ALLOC_MEM in queue_command()René Scharfe2016-08-13
* | | | | | | | | | | | Merge branch 'kw/patch-ids-optim'Junio C Hamano2016-08-12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rebase: avoid computing unnecessary patch IDsKevin Willford2016-08-11
* | | | | | | | | | | | | Merge branch 'js/mv-dir-to-new-directory'Junio C Hamano2016-08-12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git mv: do not keep slash in `git mv dir non-existing-dir/`Johannes Schindelin2016-08-08
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'rs/use-strbuf-add-unique-abbrev'Junio C Hamano2016-08-12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | use strbuf_add_unique_abbrev() for adding short hashesRené Scharfe2016-08-06
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'rs/merge-add-strategies-simplification'Junio C Hamano2016-08-12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | merge: use string_list_split() in add_strategies()René Scharfe2016-08-05
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'rs/child-process-init'Junio C Hamano2016-08-12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | use CHILD_PROCESS_INIT to initialize automatic variablesRené Scharfe2016-08-05
* | | | | | | | | | | | | | Merge branch 'sb/submodule-clone-retry'Junio C Hamano2016-08-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | submodule--helper: use parallel processor correctlyStefan Beller2016-08-09
* | | | | | | | | | | | | | | Merge branch 'sb/submodule-update-dot-branch'Junio C Hamano2016-08-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | submodule update: allow '.' for branch valueStefan Beller2016-08-03
| * | | | | | | | | | | | | | | submodule--helper: add remote-branch helperStefan Beller2016-08-03
| * | | | | | | | | | | | | | | submodule--helper: fix usage string for relative-pathStefan Beller2016-08-01
* | | | | | | | | | | | | | | | Merge branch 'js/am-3-merge-recursive-direct'Junio C Hamano2016-08-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | merge_trees(): ensure that the callers release output bufferJohannes Schindelin2016-08-01
| * | | | | | | | | | | | | | | | am -3: use merge_recursive() directly againJohannes Schindelin2016-07-26
| * | | | | | | | | | | | | | | | prepare the builtins for a libified merge_recursive()Johannes Schindelin2016-07-26
| * | | | | | | | | | | | | | | | die("bug"): report bugs consistentlyJohannes Schindelin2016-07-26
* | | | | | | | | | | | | | | | | Merge branch 'js/commit-slab-decl-fix'Junio C Hamano2016-08-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | config.c: avoid duplicated global static variablesJohannes Sixt2016-08-09
* | | | | | | | | | | | | | | | | | Merge branch 'jt/format-patch-from-config'Junio C Hamano2016-08-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | format-patch: format.from gives the default for --fromJosh Triplett2016-08-01
| | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |