summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ew/gc-auto-pack-limit-fix' into maintJunio C Hamano2016-07-281-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'nd/ita-cleanup' into maintJunio C Hamano2016-07-281-2/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maintJunio C Hamano2016-07-282-2/+2
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-objects-optim'Junio C Hamano2016-08-081-0/+40
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pack-objects: compute local/ignore_pack_keep earlyjk/pack-objects-optimJeff King2016-07-291-1/+25
| * | | | | | | | | | | | pack-objects: break out of want_object loop earlyJeff King2016-07-291-0/+16
* | | | | | | | | | | | | Merge branch 'va/i18n'Junio C Hamano2016-08-081-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | i18n: notes: mark comment for translationVasco Almeida2016-07-281-2/+3
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/reflog-date'Junio C Hamano2016-08-081-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | date: add "unix" formatJeff King2016-07-271-0/+3
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'sb/clone-shallow-passthru' into maintJunio C Hamano2016-07-111-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'km/fetch-do-not-free-remote-name' into maintJunio C Hamano2016-07-111-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/deref-tag' into maintJunio C Hamano2016-07-061-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'et/add-chmod-x' into maintJunio C Hamano2016-07-063-11/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-list-count-with-bitmap' into maintJunio C Hamano2016-06-271-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-clone-retry'Junio C Hamano2016-08-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | submodule-helper: fix indexing in clone retry error reporting pathJohannes Sixt2016-07-221-1/+1
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/push-progress'Junio C Hamano2016-08-035-17/+128
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | receive-pack: send keepalives during quiet periodsjk/push-progressJeff King2016-07-202-1/+72
| * | | | | | | | | | | | | | | | | | | receive-pack: turn on connectivity progressJeff King2016-07-201-0/+1
| * | | | | | | | | | | | | | | | | | | receive-pack: relay connectivity errors to sidebandJeff King2016-07-201-1/+17
| * | | | | | | | | | | | | | | | | | | receive-pack: turn on index-pack resolving progressJeff King2016-07-201-0/+2
| * | | | | | | | | | | | | | | | | | | index-pack: add flag for showing delta-resolution progressJeff King2016-07-201-1/+4
| * | | | | | | | | | | | | | | | | | | clone: use a real progress meter for connectivity checkJeff King2016-07-201-4/+1
| * | | | | | | | | | | | | | | | | | | check_everything_connected: use a struct with named optionsJeff King2016-07-203-11/+15
| * | | | | | | | | | | | | | | | | | | rev-list: add optional progress reportingJeff King2016-07-201-0/+17
| | |_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/parse-options-concat'Junio C Hamano2016-08-031-9/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | parse_options: allocate a new array when concatenatingjk/parse-options-concatJeff King2016-07-061-9/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | |
View Lorry Controller Status