summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t0001: skip test with restrictive permissions if getpwd(3) respects themrs/obsd-getcwd-workaroundRené Scharfe2017-08-071-2/+28
* strbuf: support long paths w/o read rights in strbuf_getcwd() on FreeBSDrs/freebsd-getcwd-workaroundRené Scharfe2017-03-262-0/+25
* 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
|\
| * doc: change erroneous --[no]-whatever into --[no-]whateverab/doc-no-option-notation-fixÆvar Arnfjörð Bjarmason2017-03-202-2/+2
* | Merge branch 'ab/push-default-doc-fix' into maintJunio C Hamano2017-03-241-0/+2
|\ \
| * | push: mention "push.default=tracking" in the documentationab/push-default-doc-fixÆvar Arnfjörð Bjarmason2017-03-201-0/+2
| |/
* | Merge branch 'nd/commit-hook-doc-fix' into maintJunio C Hamano2017-03-241-1/+1
|\ \
| * | git-commit.txt: list post-rewrite in HOOKS sectionnd/commit-hook-doc-fixNguyễn Thái Ngọc Duy2017-03-201-1/+1
| |/
* | Merge branch 'jc/config-case-cmdline-take-2' into maintJunio C Hamano2017-03-242-97/+163
|\ \
| * | config: use git_config_parse_key() in git_config_parse_parameter()jc/config-case-cmdline-take-2Junio C Hamano2017-02-232-5/+71
| * | config: move a few helper functions upJunio C Hamano2017-02-231-92/+92
* | | Merge branch 'jk/grep-no-index-fix' into maintJunio C Hamano2017-03-242-27/+121
|\ \ \
| * | | grep: treat revs the same for --untracked as for --no-indexjk/grep-no-index-fixJeff King2017-02-142-6/+6
| * | | grep: do not diagnose misspelt revs with --no-indexJeff King2017-02-142-1/+6
| * | | grep: avoid resolving revision names in --no-index caseJeff King2017-02-142-0/+19
| * | | grep: fix "--" rev/pathspec disambiguationJeff King2017-02-142-5/+57
| * | | grep: re-order rev-parsing loopJeff King2017-02-141-9/+11
| * | | grep: do not unnecessarily query repo for "--"Jonathan Tan2017-02-142-4/+20
| * | | grep: move thread initialization a little lowerJeff King2017-02-141-14/+14
* | | | Merge branch 'jn/remote-helpers-with-git-dir' into maintJunio C Hamano2017-03-244-3/+22
|\ \ \ \
| * | | | remote helpers: avoid blind fall-back to ".git" when setting GIT_DIRjn/remote-helpers-with-git-dirJonathan Nieder2017-02-142-2/+12
| * | | | remote: avoid reading $GIT_DIR config in non-repoJeff King2017-02-142-1/+10
* | | | | Merge branch 'sb/submodule-config-parse-ignore-fix' into maintJunio C Hamano2017-03-241-1/+1
|\ \ \ \ \
| * | | | | submodule-config: correct error reporting for invalid ignore valuesb/submodule-config-parse-ignore-fixStefan Beller2017-03-151-1/+1
* | | | | | Merge branch 'jk/push-deadlock-regression-fix' into maintJunio C Hamano2017-03-242-11/+40
|\ \ \ \ \ \
| * | | | | | send-pack: report signal death of pack-objectsjk/push-deadlock-regression-fixJeff King2017-03-071-1/+14
| * | | | | | send-pack: read "unpack" status even on pack-objects failureJeff King2017-03-071-0/+8
| * | | | | | send-pack: improve unpack-status error messagesJeff King2017-03-071-2/+2
| * | | | | | send-pack: use skip_prefix for parsing unpack statusJeff King2017-03-071-3/+3
| * | | | | | send-pack: extract parsing of "unpack" responseJeff King2017-03-071-9/+14
| * | | | | | receive-pack: fix deadlock when we cannot create tmpdirJeff King2017-03-071-1/+4
* | | | | | | mailmap: use Michael J Gruber's new addressmg/mailmapMichael J Gruber2017-03-241-1/+2
* | | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | send-email: only allow one address per body tagjh/send-email-one-ccJohan Hovold2017-02-272-5/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/t6300-cleanup' into maintJunio C Hamano2017-03-211-1/+1
|\ \ \ \ \ \ \
| * | | | | | | t6300: avoid creating refs/heads/HEADjk/t6300-cleanupJeff King2017-02-271-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'rs/commit-parsing-optim' into maintJunio C Hamano2017-03-211-12/+10
|\ \ \ \ \ \ \
| * | | | | | | commit: don't check for space twice when looking for headerrs/commit-parsing-optimRené Scharfe2017-02-271-10/+8
| * | | | | | | commit: be more precise when searching for headersRené Scharfe2017-02-271-2/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | 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 'jk/tempfile-ferror-fclose-confusion' into maintJunio C Hamano2017-03-211-2/+7
|\ \ \ \ \ \ \
| * | | | | | | tempfile: set errno to a known value before calling ferror()jk/tempfile-ferror-fclose-confusionJeff King2017-02-171-2/+7
* | | | | | | | Merge branch 'rl/remote-allow-missing-branch-name-merge' into maintJunio C Hamano2017-03-212-1/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | remote: ignore failure to remove missing branch.<name>.mergerl/remote-allow-missing-branch-name-mergeRoss Lagerwall2017-02-212-1/+22
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'dt/gc-ignore-old-gc-logs' into maintJunio C Hamano2017-03-213-7/+71
|\ \ \ \ \ \ \ \
View Lorry Controller Status