Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | config: use git_config_parse_key() in git_config_parse_parameter()jc/config-case-cmdline-take-2 | Junio C Hamano | 2017-02-23 | 2 | -5/+71 | |
| * | | | | | | | | | | | | | config: move a few helper functions up | Junio C Hamano | 2017-02-23 | 1 | -92/+92 | |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/grep-no-index-fix' into maint | Junio C Hamano | 2017-03-24 | 2 | -27/+121 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | grep: treat revs the same for --untracked as for --no-indexjk/grep-no-index-fix | Jeff King | 2017-02-14 | 2 | -6/+6 | |
| * | | | | | | | | | | | | | grep: do not diagnose misspelt revs with --no-index | Jeff King | 2017-02-14 | 2 | -1/+6 | |
| * | | | | | | | | | | | | | grep: avoid resolving revision names in --no-index case | Jeff King | 2017-02-14 | 2 | -0/+19 | |
| * | | | | | | | | | | | | | grep: fix "--" rev/pathspec disambiguation | Jeff King | 2017-02-14 | 2 | -5/+57 | |
| * | | | | | | | | | | | | | grep: re-order rev-parsing loop | Jeff King | 2017-02-14 | 1 | -9/+11 | |
| * | | | | | | | | | | | | | grep: do not unnecessarily query repo for "--" | Jonathan Tan | 2017-02-14 | 2 | -4/+20 | |
| * | | | | | | | | | | | | | grep: move thread initialization a little lower | Jeff King | 2017-02-14 | 1 | -14/+14 | |
* | | | | | | | | | | | | | | Merge branch 'jn/remote-helpers-with-git-dir' into maint | Junio C Hamano | 2017-03-24 | 4 | -3/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | remote helpers: avoid blind fall-back to ".git" when setting GIT_DIRjn/remote-helpers-with-git-dir | Jonathan Nieder | 2017-02-14 | 2 | -2/+12 | |
| * | | | | | | | | | | | | | | remote: avoid reading $GIT_DIR config in non-repo | Jeff King | 2017-02-14 | 2 | -1/+10 | |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'sb/submodule-config-parse-ignore-fix' into maint | Junio C Hamano | 2017-03-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | submodule-config: correct error reporting for invalid ignore valuesb/submodule-config-parse-ignore-fix | Stefan Beller | 2017-03-15 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | Merge branch 'jk/push-deadlock-regression-fix' into maint | Junio C Hamano | 2017-03-24 | 2 | -11/+40 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | send-pack: report signal death of pack-objectsjk/push-deadlock-regression-fix | Jeff King | 2017-03-07 | 1 | -1/+14 | |
| * | | | | | | | | | | | | | | | send-pack: read "unpack" status even on pack-objects failure | Jeff King | 2017-03-07 | 1 | -0/+8 | |
| * | | | | | | | | | | | | | | | send-pack: improve unpack-status error messages | Jeff King | 2017-03-07 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | send-pack: use skip_prefix for parsing unpack status | Jeff King | 2017-03-07 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | send-pack: extract parsing of "unpack" response | Jeff King | 2017-03-07 | 1 | -9/+14 | |
| * | | | | | | | | | | | | | | | receive-pack: fix deadlock when we cannot create tmpdir | Jeff King | 2017-03-07 | 1 | -1/+4 | |
* | | | | | | | | | | | | | | | | mailmap: use Michael J Gruber's new addressmg/mailmap | Michael J Gruber | 2017-03-24 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | | | Prepare for 2.12.2 | Junio C Hamano | 2017-03-21 | 2 | -1/+62 | |
* | | | | | | | | | | | | | | | | Merge branch 'jh/send-email-one-cc' into maint | Junio C Hamano | 2017-03-21 | 2 | -5/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | send-email: only allow one address per body tagjh/send-email-one-cc | Johan Hovold | 2017-02-27 | 2 | -5/+4 | |
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'jk/t6300-cleanup' into maint | Junio C Hamano | 2017-03-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | t6300: avoid creating refs/heads/HEADjk/t6300-cleanup | Jeff King | 2017-02-27 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'rs/commit-parsing-optim' into maint | Junio C Hamano | 2017-03-21 | 1 | -12/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | commit: don't check for space twice when looking for headerrs/commit-parsing-optim | René Scharfe | 2017-02-27 | 1 | -10/+8 | |
| * | | | | | | | | | | | | | | | | commit: be more precise when searching for headers | René Scharfe | 2017-02-27 | 1 | -2/+2 | |
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'jk/show-branch-lift-name-len-limit' into maint | Junio C Hamano | 2017-03-21 | 1 | -29/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | show-branch: use skip_prefix to drop magic numbersjk/show-branch-lift-name-len-limit | Jeff King | 2017-02-15 | 1 | -11/+8 | |
| * | | | | | | | | | | | | | | | | show-branch: store resolved head in heap buffer | Jeff King | 2017-02-14 | 1 | -14/+5 | |
| * | | | | | | | | | | | | | | | | show-branch: drop head_len variable | Jeff King | 2017-02-14 | 1 | -6/+2 | |
| |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'jk/tempfile-ferror-fclose-confusion' into maint | Junio C Hamano | 2017-03-21 | 1 | -2/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | tempfile: set errno to a known value before calling ferror()jk/tempfile-ferror-fclose-confusion | Jeff King | 2017-02-17 | 1 | -2/+7 | |
* | | | | | | | | | | | | | | | | | Merge branch 'rl/remote-allow-missing-branch-name-merge' into maint | Junio C Hamano | 2017-03-21 | 2 | -1/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | remote: ignore failure to remove missing branch.<name>.mergerl/remote-allow-missing-branch-name-merge | Ross Lagerwall | 2017-02-21 | 2 | -1/+22 | |
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'dt/gc-ignore-old-gc-logs' into maint | Junio C Hamano | 2017-03-21 | 3 | -7/+71 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | gc: ignore old gc.log files | David Turner | 2017-02-13 | 3 | -7/+71 | |
| |/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'jt/upload-pack-error-report' into maint | Junio C Hamano | 2017-03-21 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | upload-pack: report "not our ref" to clientjt/upload-pack-error-report | Jonathan Tan | 2017-02-23 | 1 | -1/+5 | |
| |/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'rs/sha1-file-plug-fallback-base-leak' into maint | Junio C Hamano | 2017-03-21 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | sha1_file: release fallback base's memory in unpack_entry()rs/sha1-file-plug-fallback-base-leak | René Scharfe | 2017-02-27 | 1 | -0/+4 | |
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'ss/remote-bzr-hg-placeholder-wo-python' into maint | Junio C Hamano | 2017-03-21 | 2 | -18/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | contrib: git-remote-{bzr,hg} placeholders don't need Pythonss/remote-bzr-hg-placeholder-wo-python | Sebastian Schuberth | 2017-03-03 | 2 | -18/+14 | |
| | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'jc/diff-populate-filespec-size-only-fix' into maint | Junio C Hamano | 2017-03-21 | 2 | -1/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()jc/diff-populate-filespec-size-only-fix | Junio C Hamano | 2017-03-02 | 2 | -1/+27 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/http-walker-buffer-underflow-fix' into maint | Junio C Hamano | 2017-03-21 | 1 | -4/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |