aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* 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
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'jk/reset-ident-time-per-commit'Junio C Hamano2016-08-10
|\ \ \ \ \ \ \
| * | | | | | | am: reset cached ident date for each patchJeff King2016-08-01
* | | | | | | | Merge branch 'jk/parseopt-string-list'Junio C Hamano2016-08-08
|\ \ \ \ \ \ \ \
| * | | | | | | | blame: drop strdup of string literalEric Sunshine2016-08-03
* | | | | | | | | Merge branch 'rs/use-strbuf-addstr'Junio C Hamano2016-08-08
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use strbuf_addstr() instead of strbuf_addf() with "%s"René Scharfe2016-08-05
| * | | | | | | | | use strbuf_addstr() for adding constant strings to a strbufRené Scharfe2016-08-01
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'dk/blame-move-no-reason-for-1-line-context' into maintJunio C Hamano2016-07-28
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maintJunio C Hamano2016-07-28
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ew/gc-auto-pack-limit-fix' into maintJunio C Hamano2016-07-28
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/ita-cleanup' into maintJunio C Hamano2016-07-28
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maintJunio C Hamano2016-07-28
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-objects-optim'Junio C Hamano2016-08-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | pack-objects: compute local/ignore_pack_keep earlyJeff King2016-07-29
| * | | | | | | | | | | | | | pack-objects: break out of want_object loop earlyJeff King2016-07-29
* | | | | | | | | | | | | | | Merge branch 'va/i18n'Junio C Hamano2016-08-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | i18n: notes: mark comment for translationVasco Almeida2016-07-28
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/reflog-date'Junio C Hamano2016-08-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | date: add "unix" formatJeff King2016-07-27
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'sb/clone-shallow-passthru' into maintJunio C Hamano2016-07-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'km/fetch-do-not-free-remote-name' into maintJunio C Hamano2016-07-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/deref-tag' into maintJunio C Hamano2016-07-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'et/add-chmod-x' into maintJunio C Hamano2016-07-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-list-count-with-bitmap' into maintJunio C Hamano2016-06-27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-clone-retry'Junio C Hamano2016-08-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | submodule-helper: fix indexing in clone retry error reporting pathJohannes Sixt2016-07-22
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/push-progress'Junio C Hamano2016-08-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | receive-pack: send keepalives during quiet periodsJeff King2016-07-20
| * | | | | | | | | | | | | | | | | | | receive-pack: turn on connectivity progressJeff King2016-07-20
| * | | | | | | | | | | | | | | | | | | receive-pack: relay connectivity errors to sidebandJeff King2016-07-20
| * | | | | | | | | | | | | | | | | | | receive-pack: turn on index-pack resolving progressJeff King2016-07-20