summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* read-cache: close index.lock in do_write_indexjh/close-index-before-statJeff Hostetler2017-04-281-4/+9
* Prepare for 2.12.3Junio C Hamano2017-03-282-1/+58
* Merge branch 'km/config-grammofix' into maintJunio C Hamano2017-03-281-3/+3
|\
| * doc/config: grammar fixes for core.{editor,commentChar}km/config-grammofixKyle Meyer2017-03-231-3/+3
* | Merge branch 'sb/t3600-rephrase' into maintJunio C Hamano2017-03-281-1/+1
|\ \
| * | t3600: rename test to describe its functionalitysb/t3600-rephraseStefan Beller2017-03-221-1/+1
* | | Merge branch 'sb/submodule-update-initial-runs-custom-script' into maintJunio C Hamano2017-03-281-3/+3
|\ \ \
| * | | t7406: correct test case for submodule-update initial populationsb/submodule-update-initial-runs-custom-scriptJunio C Hamano2017-03-221-3/+3
* | | | Merge branch 'jk/quote-env-path-list-component' into maintJunio C Hamano2017-03-281-0/+1
|\ \ \ \
| * | | | t5615: fix a here-doc syntax errorjk/quote-env-path-list-componentJunio C Hamano2017-03-221-0/+1
* | | | | 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 'rs/path-name-safety-cleanup' into maintJunio C Hamano2017-03-281-2/+0
|\ \ \ \ \ \
| * | | | | | revision: remove declaration of path_name()rs/path-name-safety-cleanupRené Scharfe2017-03-181-2/+0
* | | | | | | Merge branch 'rs/http-push-cleanup' into maintJunio C Hamano2017-03-281-5/+3
|\ \ \ \ \ \ \
| * | | | | | | http-push: don't check return value of lookup_unknown_object()rs/http-push-cleanupRené Scharfe2017-03-181-5/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'sb/wt-status-cleanup' into maintJunio C Hamano2017-03-281-15/+5
|\ \ \ \ \ \ \
| * | | | | | | wt-status: simplify by using for_each_string_list_itemsb/wt-status-cleanupStefan Beller2017-03-171-15/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/pack-name-cleanups' into maintJunio C Hamano2017-03-286-46/+57
|\ \ \ \ \ \ \
| * | | | | | | index-pack: make pointer-alias fallbacks saferjk/pack-name-cleanupsJeff King2017-03-161-8/+12
| * | | | | | | replace snprintf with odb_pack_name()Jeff King2017-03-162-31/+24
| * | | | | | | odb_pack_keep(): stop generating keepfile nameJeff King2017-03-164-12/+12
| * | | | | | | sha1_file.c: make pack-name helper globally accessibleJeff King2017-03-162-11/+15
| * | | | | | | move odb_* declarations out of git-compat-util.hJeff King2017-03-162-2/+12
* | | | | | | | 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 'st/verify-tag' into maintJunio C Hamano2017-03-282-14/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | t7004, t7030: fix here-doc syntax errorsst/verify-tagSantiago Torres2017-03-242-14/+10
* | | | | | | | | Merge branch 'js/regexec-buf' into maintJunio C Hamano2017-03-282-2/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pickaxe: fix segfault with '-S<...> --pickaxe-regex'js/regexec-bufSZEDER Gábor2017-03-182-2/+10
* | | | | | | | | | Merge branch 'jk/execv-dashed-external' into maintJunio C Hamano2017-03-281-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | run-command: fix segfault when cleaning forked async processjk/execv-dashed-externalJeff King2017-03-181-1/+1
* | | | | | | | | | | Merge branch 'ew/http-alternates-as-redirects-warning' into maintJunio C Hamano2017-03-281-3/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | http: release strbuf on disabled alternatesew/http-alternates-as-redirects-warningEric Wong2017-03-061-0/+2
| * | | | | | | | | | | http: inform about alternates-as-redirects behaviorEric Wong2017-03-061-3/+5
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'dp/filter-branch-prune-empty' into maintJunio C Hamano2017-03-284-8/+50
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | p7000: add test for filter-branch with --prune-emptydp/filter-branch-prune-emptyDevin J. Pohly2017-03-031-0/+5
| * | | | | | | | | | | filter-branch: fix --prune-empty on parentless commitsDevin J. Pohly2017-03-033-10/+10
| * | | | | | | | | | | t7003: ensure --prune-empty removes entire branch when applicableDevin J. Pohly2017-03-031-0/+7
| * | | | | | | | | | | t7003: ensure --prune-empty can prune root commitDevin J. Pohly2017-03-031-0/+30
* | | | | | | | | | | | Merge branch 'mm/fetch-show-error-message-on-unadvertised-object' into maintJunio C Hamano2017-03-287-30/+66
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fetch-pack: add specific error for fetching an unadvertised objectmm/fetch-show-error-message-on-unadvertised-objectMatt McCutchen2017-03-023-18/+35
| * | | | | | | | | | | | fetch_refs_via_pack: call report_unmatched_refsMatt McCutchen2017-03-022-6/+11
| * | | | | | | | | | | | fetch-pack: move code to report unmatched refs to a functionMatt McCutchen2017-03-024-9/+23
| |/ / / / / / / / / / /
View Lorry Controller Status