summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rev-parse: match @{upstream}, @{u} and @{push} case-insensitivelyab/case-insensitive-upstream-and-push-markerÆvar Arnfjörð Bjarmason2017-03-274-8/+23
* Sync with 2.12.2Junio C Hamano2017-03-243-2/+26
|\
| * Git 2.12.2v2.12.2Junio C Hamano2017-03-243-2/+25
| * Merge branch 'ab/doc-no-option-notation-fix' into maintJunio C Hamano2017-03-242-2/+2
| |\
| * \ Merge branch 'ab/push-default-doc-fix' into maintJunio C Hamano2017-03-241-0/+2
| |\ \
| * \ \ Merge branch 'nd/commit-hook-doc-fix' into maintJunio C Hamano2017-03-241-1/+1
| |\ \ \
| * \ \ \ Merge branch 'jc/config-case-cmdline-take-2' into maintJunio C Hamano2017-03-242-97/+163
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/grep-no-index-fix' into maintJunio C Hamano2017-03-242-27/+121
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jn/remote-helpers-with-git-dir' into maintJunio C Hamano2017-03-244-3/+22
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sb/submodule-config-parse-ignore-fix' into maintJunio C Hamano2017-03-241-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/push-deadlock-regression-fix' into maintJunio C Hamano2017-03-242-11/+40
| |\ \ \ \ \ \ \ \
| * | | | | | | | | mailmap: use Michael J Gruber's new addressmg/mailmapMichael J Gruber2017-03-241-1/+2
* | | | | | | | | | Seventh batch for 2.13Junio C Hamano2017-03-241-9/+29
* | | | | | | | | | Merge branch 'jk/sha1dc'Junio C Hamano2017-03-249-2/+2405
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Makefile: make DC_SHA1 the defaultJunio C Hamano2017-03-171-6/+10
| * | | | | | | | | | t0013: add a basic sha1 collision detection testJeff King2017-03-173-0/+20
| * | | | | | | | | | Makefile: add DC_SHA1 knobJeff King2017-03-174-0/+47
| * | | | | | | | | | sha1dc: disable safe_hash featureJeff King2017-03-161-1/+1
| * | | | | | | | | | sha1dc: adjust header includes for gitJeff King2017-03-164-13/+9
| * | | | | | | | | | sha1dc: add collision-detecting sha1 implementationJeff King2017-03-165-0/+2336
* | | | | | | | | | | Merge branch 'sg/test-with-stdin'Junio C Hamano2017-03-242-8/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | tests: make the 'test_pause' helper work in non-verbose modesg/test-with-stdinSZEDER Gábor2017-03-181-7/+2
| * | | | | | | | | | | tests: create an interactive gdb session with the 'debug' helperSZEDER Gábor2017-03-182-1/+2
* | | | | | | | | | | | Merge branch 'rs/update-hook-optim'Junio C Hamano2017-03-241-8/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | receive-pack: simplify run_update_post_hook()rs/update-hook-optimRené Scharfe2017-03-181-8/+5
* | | | | | | | | | | | | Merge branch 'rs/shortlog-cleanup'Junio C Hamano2017-03-241-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'Junio C Hamano2017-03-241-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | revision: remove declaration of path_name()rs/path-name-safety-cleanupRené Scharfe2017-03-181-2/+0
* | | | | | | | | | | | | | Merge branch 'rs/http-push-cleanup'Junio C Hamano2017-03-241-5/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | http-push: don't check return value of lookup_unknown_object()rs/http-push-cleanupRené Scharfe2017-03-181-5/+3
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'js/regexec-buf'Junio C Hamano2017-03-242-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | pickaxe: fix segfault with '-S<...> --pickaxe-regex'js/regexec-bufSZEDER Gábor2017-03-182-2/+10
* | | | | | | | | | | | | | | Merge branch 'jk/execv-dashed-external'Junio C Hamano2017-03-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | run-command: fix segfault when cleaning forked async processjk/execv-dashed-externalJeff King2017-03-181-1/+1
* | | | | | | | | | | | | | | | Merge branch 'dl/credential-cache-socket-in-xdg-cache'Junio C Hamano2017-03-245-5/+136
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | credential-cache: add tests for XDG functionalityDevin Lehmacher2017-03-171-0/+93
| * | | | | | | | | | | | | | | | credential-cache: use XDG_CACHE_HOME for socketDevin Lehmacher2017-03-172-5/+21
| * | | | | | | | | | | | | | | | path.c: add xdg_cache_homeDevin Lehmacher2017-03-132-0/+22
* | | | | | | | | | | | | | | | | Merge branch 'js/rebase-helper'Junio C Hamano2017-03-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | sequencer: fix missing newlinejs/rebase-helperBrandon Williams2017-03-231-1/+1
* | | | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2017-03-211-0/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Prepare for 2.12.2Junio C Hamano2017-03-212-1/+62
| * | | | | | | | | | | | | | | | | Merge branch 'jh/send-email-one-cc' into maintJunio C Hamano2017-03-212-5/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/t6300-cleanup' into maintJunio C Hamano2017-03-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/commit-parsing-optim' into maintJunio C Hamano2017-03-211-12/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/show-branch-lift-name-len-limit' into maintJunio C Hamano2017-03-211-29/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/tempfile-ferror-fclose-confusion' into maintJunio C Hamano2017-03-211-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rl/remote-allow-missing-branch-name-merge' into maintJunio C Hamano2017-03-212-1/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/gc-ignore-old-gc-logs' into maintJunio C Hamano2017-03-213-7/+71
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \