summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mh/blame-worktree'Junio C Hamano2016-08-311-1/+2
|\
| * blame: fix segfault on untracked filesmh/blame-worktreeThomas Gummerer2016-08-291-1/+2
* | Merge branch 'js/no-html-bypass-on-windows'Junio C Hamano2016-08-251-7/+0
|\ \
| * | Revert "display HTML in default browser using Windows' shell API"js/no-html-bypass-on-windowsJohannes Schindelin2016-08-191-7/+0
* | | Merge branch 'sb/checkout-explit-detach-no-advice'Junio C Hamano2016-08-191-1/+2
|\ \ \
| * | | checkout: do not mention detach advice for explicit --detach optionsb/checkout-explit-detach-no-adviceStefan Beller2016-08-151-1/+2
| * | | Merge branch 'jk/reset-ident-time-per-commit' into maintJunio C Hamano2016-08-121-0/+2
| |\ \ \
| * \ \ \ Merge branch 'rs/use-strbuf-addstr' into maintJunio C Hamano2016-08-102-2/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'os/no-verify-skips-commit-msg-too' into maintJunio C Hamano2016-08-101-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/rm-strbuf-optim' into maintJunio C Hamano2016-08-101-2/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/parse-options-concat' into maintJunio C Hamano2016-08-101-9/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'pb/commit-editmsg-path' into maintJunio C Hamano2016-08-081-7/+8
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'nd/pack-ofs-4gb-limit' into maintJunio C Hamano2016-08-084-21/+27
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mh/blame-worktree' into maintJunio C Hamano2016-08-081-1/+9
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
* | | | | | | | | | | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-08-171-3/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | receive-pack: use FLEX_ALLOC_MEM in queue_command()René Scharfe2016-08-131-3/+1
* | | | | | | | | | | | Merge branch 'kw/patch-ids-optim'Junio C Hamano2016-08-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rebase: avoid computing unnecessary patch IDsKevin Willford2016-08-111-1/+1
* | | | | | | | | | | | | Merge branch 'js/mv-dir-to-new-directory'Junio C Hamano2016-08-121-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git mv: do not keep slash in `git mv dir non-existing-dir/`js/mv-dir-to-new-directoryJohannes Schindelin2016-08-081-4/+7
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'rs/use-strbuf-add-unique-abbrev'Junio C Hamano2016-08-121-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | use strbuf_add_unique_abbrev() for adding short hashesrs/use-strbuf-add-unique-abbrevRené Scharfe2016-08-061-2/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'rs/merge-add-strategies-simplification'Junio C Hamano2016-08-121-34/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | merge: use string_list_split() in add_strategies()rs/merge-add-strategies-simplificationRené Scharfe2016-08-051-34/+10
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'rs/child-process-init'Junio C Hamano2016-08-122-6/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | use CHILD_PROCESS_INIT to initialize automatic variablesrs/child-process-initRené Scharfe2016-08-052-6/+3
* | | | | | | | | | | | | | Merge branch 'sb/submodule-clone-retry'Junio C Hamano2016-08-121-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | submodule--helper: use parallel processor correctlysb/submodule-clone-retryStefan Beller2016-08-091-2/+6
* | | | | | | | | | | | | | | Merge branch 'sb/submodule-update-dot-branch'Junio C Hamano2016-08-101-2/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | submodule update: allow '.' for branch valueStefan Beller2016-08-031-0/+18
| * | | | | | | | | | | | | | | submodule--helper: add remote-branch helperStefan Beller2016-08-031-1/+35
| * | | | | | | | | | | | | | | submodule--helper: fix usage string for relative-pathStefan Beller2016-08-011-1/+1
* | | | | | | | | | | | | | | | Merge branch 'js/am-3-merge-recursive-direct'Junio C Hamano2016-08-105-43/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | merge_trees(): ensure that the callers release output bufferJohannes Schindelin2016-08-011-0/+1
| * | | | | | | | | | | | | | | | am -3: use merge_recursive() directly againJohannes Schindelin2016-07-261-40/+22
| * | | | | | | | | | | | | | | | prepare the builtins for a libified merge_recursive()Johannes Schindelin2016-07-262-1/+5
| * | | | | | | | | | | | | | | | die("bug"): report bugs consistentlyJohannes Schindelin2016-07-262-2/+3
* | | | | | | | | | | | | | | | | Merge branch 'js/commit-slab-decl-fix'Junio C Hamano2016-08-101-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | config.c: avoid duplicated global static variablesJohannes Sixt2016-08-091-1/+0
* | | | | | | | | | | | | | | | | | Merge branch 'jt/format-patch-from-config'Junio C Hamano2016-08-101-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | format-patch: format.from gives the default for --fromjt/format-patch-from-configJosh Triplett2016-08-011-1/+12
| | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/reset-ident-time-per-commit'Junio C Hamano2016-08-101-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am: reset cached ident date for each patchjk/reset-ident-time-per-commitJeff King2016-08-011-0/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/parseopt-string-list'Junio C Hamano2016-08-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | blame: drop strdup of string literaljk/parseopt-string-listEric Sunshine2016-08-031-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'rs/use-strbuf-addstr'Junio C Hamano2016-08-082-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | use strbuf_addstr() instead of strbuf_addf() with "%s"rs/use-strbuf-addstrRené Scharfe2016-08-051-1/+1
| * | | | | | | | | | | | | | | | | use strbuf_addstr() for adding constant strings to a strbufRené Scharfe2016-08-011-1/+1
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'dk/blame-move-no-reason-for-1-line-context' into maintJunio C Hamano2016-07-281-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maintJunio C Hamano2016-07-281-8/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \