summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/grep-no-index-fix' into maintJunio C Hamano2017-03-241-27/+55
|\
| * grep: treat revs the same for --untracked as for --no-indexjk/grep-no-index-fixJeff King2017-02-141-5/+5
| * grep: do not diagnose misspelt revs with --no-indexJeff King2017-02-141-1/+1
| * grep: avoid resolving revision names in --no-index caseJeff King2017-02-141-0/+6
| * grep: fix "--" rev/pathspec disambiguationJeff King2017-02-141-5/+24
| * grep: re-order rev-parsing loopJeff King2017-02-141-9/+11
| * grep: do not unnecessarily query repo for "--"Jonathan Tan2017-02-141-4/+5
| * grep: move thread initialization a little lowerJeff King2017-02-141-14/+14
* | Merge branch 'jk/push-deadlock-regression-fix' into maintJunio C Hamano2017-03-241-1/+4
|\ \
| * | receive-pack: fix deadlock when we cannot create tmpdirJeff King2017-03-071-1/+4
* | | Merge branch 'jk/show-branch-lift-name-len-limit' into maintJunio C Hamano2017-03-211-29/+13
|\ \ \
| * | | show-branch: use skip_prefix to drop magic numbersjk/show-branch-lift-name-len-limitJeff King2017-02-151-11/+8
| * | | show-branch: store resolved head in heap bufferJeff King2017-02-141-14/+5
| * | | show-branch: drop head_len variableJeff King2017-02-141-6/+2
* | | | Merge branch 'rl/remote-allow-missing-branch-name-merge' into maintJunio C Hamano2017-03-211-1/+3
|\ \ \ \
| * | | | remote: ignore failure to remove missing branch.<name>.mergerl/remote-allow-missing-branch-name-mergeRoss Lagerwall2017-02-211-1/+3
* | | | | Merge branch 'dt/gc-ignore-old-gc-logs' into maintJunio C Hamano2017-03-211-7/+50
|\ \ \ \ \
| * | | | | gc: ignore old gc.log filesDavid Turner2017-02-131-7/+50
| |/ / / /
* | | | | real_pathdup(): fix callsites that wanted it to die on errorjs/realpath-pathdup-fixJohannes Schindelin2017-03-081-3/+3
* | | | | Merge branch 'rs/strbuf-cleanup-in-rmdir-recursively'Junio C Hamano2017-02-161-3/+3
|\ \ \ \ \
| * | | | | rm: reuse strbuf for all remove_dir_recursively() calls, againrs/strbuf-cleanup-in-rmdir-recursivelyRené Scharfe2017-02-131-3/+3
* | | | | | Merge branch 'rs/ls-files-partial-optim'Junio C Hamano2017-02-161-10/+11
|\ \ \ \ \ \
| * | | | | | ls-files: move only kept cache entries in prune_cache()rs/ls-files-partial-optimRené Scharfe2017-02-131-5/+4
| * | | | | | ls-files: pass prefix length explicitly to prune_cache()René Scharfe2017-02-131-5/+7
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'jk/blame-fixes' into maintJunio C Hamano2017-01-311-10/+17
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dt/disable-bitmap-in-auto-gc' into maintJunio C Hamano2017-01-312-1/+17
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/compression-config' into maintJunio C Hamano2017-01-311-14/+0
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'rs/swap'Junio C Hamano2017-02-152-9/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | use SWAP macroRené Scharfe2017-01-302-9/+4
* | | | | | | | | Merge branch 'js/difftool-builtin'Junio C Hamano2017-02-101-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | difftool: fix bug when printing usageDavid Aguilar2017-02-061-4/+4
* | | | | | | | | | Merge branch 'ps/worktree-prune-help-fix'Junio C Hamano2017-02-101-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | worktree: fix option descriptions for `prune`ps/worktree-prune-help-fixPatrick Steinhardt2017-02-061-2/+2
* | | | | | | | | | | Merge branch 'cw/log-updates-for-all-refs-really'Junio C Hamano2017-02-032-5/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | refs: add option core.logAllRefUpdates = alwaysCornelius Weig2017-01-312-5/+8
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rs/object-id'Junio C Hamano2017-02-034-6/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | checkout: convert post_checkout_hook() to struct object_idRené Scharfe2017-01-301-2/+2
| * | | | | | | | | | | use oid_to_hex_r() for converting struct object_id hashes to hex stringsRené Scharfe2017-01-303-4/+4
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'sb/unpack-trees-super-prefix'Junio C Hamano2017-02-031-18/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | read-tree: use OPT_BOOL instead of OPT_SET_INTStefan Beller2017-01-111-18/+18
* | | | | | | | | | | | Merge branch 'ep/commit-static-buf-cleanup'Junio C Hamano2017-02-021-17/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | builtin/commit.c: switch to strbuf, instead of snprintf()ep/commit-static-buf-cleanupElia Pinto2017-01-311-6/+4
| * | | | | | | | | | | | builtin/commit.c: remove the PATH_MAX limitation via dynamic allocationElia Pinto2017-01-131-11/+10
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'rs/receive-pack-cleanup'Junio C Hamano2017-02-021-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | receive-pack: call string_list_clear() unconditionallyrs/receive-pack-cleanupRené Scharfe2017-01-301-2/+1
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'jt/fetch-no-redundant-tag-fetch-map' into maintJunio C Hamano2017-01-171-3/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/push-default-explicit' into maintJunio C Hamano2017-01-171-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/index-pack-wo-repo-from-stdin' into maintJunio C Hamano2017-01-171-4/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/sequencer-abort-safety' into maintJunio C Hamano2017-01-171-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/pull-rebase-ff' into maintJunio C Hamano2017-01-171-4/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status