summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* notes: send "Automatic notes merge failed" messages to stderrtz/notes-error-to-stderrTodd Zullinger2017-11-151-4/+4
* Merge branch 'rs/update-hook-optim' into maintJunio C Hamano2017-03-281-8/+5
|\
| * receive-pack: simplify run_update_post_hook()rs/update-hook-optimRené Scharfe2017-03-181-8/+5
* | Merge branch 'rs/shortlog-cleanup' into maintJunio C Hamano2017-03-281-1/+0
|\ \
| * | shortlog: don't set after_subject to an empty stringrs/shortlog-cleanupRené Scharfe2017-03-181-1/+0
* | | Merge branch 'jk/pack-name-cleanups' into maintJunio C Hamano2017-03-281-16/+15
|\ \ \
| * | | index-pack: make pointer-alias fallbacks saferjk/pack-name-cleanupsJeff King2017-03-161-8/+12
| * | | replace snprintf with odb_pack_name()Jeff King2017-03-161-16/+11
| * | | odb_pack_keep(): stop generating keepfile nameJeff King2017-03-161-3/+3
* | | | Merge branch 'jk/rev-parse-cleanup' into maintJunio C Hamano2017-03-281-52/+57
|\ \ \ \
| * | | | rev-parse: simplify parsing of ref optionsjk/rev-parse-cleanupJeff King2017-03-151-29/+16
| * | | | rev-parse: add helper for parsing "--foo/--foo="Jeff King2017-03-151-10/+28
| * | | | rev-parse: use skip_prefix when parsing optionsJeff King2017-03-151-20/+20
| |/ / /
* | | | Merge branch 'rs/blame-code-cleanup' into maintJunio C Hamano2017-03-281-17/+8
|\ \ \ \
| * | | | blame: move blame_entry duplication to add_blame_entry()rs/blame-code-cleanupRené Scharfe2017-03-111-17/+8
| | |_|/ | |/| |
* | | | Merge branch 'mm/fetch-show-error-message-on-unadvertised-object' into maintJunio C Hamano2017-03-281-6/+1
|\ \ \ \
| * | | | fetch-pack: move code to report unmatched refs to a functionMatt McCutchen2017-03-021-6/+1
* | | | | Merge branch 'jk/interpret-branch-name' into maintJunio C Hamano2017-03-283-3/+6
|\ \ \ \ \
| * | | | | checkout: restrict @-expansions when finding branchjk/interpret-branch-nameJeff King2017-03-021-1/+1
| * | | | | branch: restrict @-expansions when deletingJeff King2017-03-021-1/+4
| * | | | | interpret_branch_name: allow callers to restrict expansionsJeff King2017-03-023-3/+3
| |/ / / /
* | | | | Merge branch 'jk/delta-chain-limit' into maintJunio C Hamano2017-03-281-23/+110
|\ \ \ \ \
| * | | | | pack-objects: convert recursion to iteration in break_delta_chain()jk/delta-chain-limitJeff King2017-01-271-30/+99
| * | | | | pack-objects: enforce --depth limit in reused deltasJeff King2017-01-271-0/+18
* | | | | | 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
| |\ \ \ \ \ \ \
View Lorry Controller Status