Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | index: improve constness for reading blob databw/read-blob-data-does-not-modify-index-state | Brandon Williams | 2017-01-11 | 2 | -2/+3 |
* | Fifth batch 2.12 | Junio C Hamano | 2017-01-10 | 1 | -0/+45 |
* | Merge branch 'sb/submodule-embed-gitdir' | Junio C Hamano | 2017-01-10 | 12 | -43/+399 |
|\ | |||||
| * | worktree: initialize return value for submodule_uses_worktrees | Stefan Beller | 2016-12-27 | 1 | -1/+1 |
| * | submodule: add absorb-git-dir function | Stefan Beller | 2016-12-12 | 8 | -1/+282 |
| * | move connect_work_tree_and_git_dir to dir.h | Stefan Beller | 2016-12-12 | 4 | -26/+26 |
| * | worktree: check if a submodule uses worktrees | Stefan Beller | 2016-12-12 | 2 | -0/+55 |
| * | test-lib-functions.sh: teach test_commit -C <dir> | Stefan Beller | 2016-12-09 | 1 | -5/+15 |
| * | submodule helper: support super prefix | Stefan Beller | 2016-12-09 | 2 | -12/+21 |
| * | submodule: use absolute path for computing relative path connecting | Stefan Beller | 2016-12-09 | 1 | -6/+7 |
* | | Merge branch 'jc/retire-compaction-heuristics' | Junio C Hamano | 2017-01-10 | 7 | -67/+8 |
|\ \ | |||||
| * | | diff: retire "compaction" heuristicsjc/retire-compaction-heuristics | Junio C Hamano | 2016-12-23 | 7 | -67/+8 |
* | | | Merge branch 'nd/config-misc-fixes' | Junio C Hamano | 2017-01-10 | 1 | -5/+15 |
|\ \ \ | |||||
| * | | | config.c: handle lock file in error case in git_config_rename_...nd/config-misc-fixes | Nguyễn Thái Ngọc Duy | 2016-12-22 | 1 | -1/+3 |
| * | | | config.c: rename label unlock_and_out | Nguyễn Thái Ngọc Duy | 2016-12-20 | 1 | -2/+2 |
| * | | | config.c: handle error case for fstat() calls | Nguyễn Thái Ngọc Duy | 2016-12-20 | 1 | -2/+10 |
* | | | | Merge branch 'jc/abbrev-autoscale-config' | Junio C Hamano | 2017-01-10 | 2 | -8/+15 |
|\ \ \ \ | |||||
| * | | | | config.abbrev: document the new default that auto-scalesjc/abbrev-autoscale-config | Junio C Hamano | 2016-12-22 | 2 | -8/+15 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'mh/fast-import-notes-fix-new' | Junio C Hamano | 2017-01-10 | 2 | -3/+47 |
|\ \ \ \ | |||||
| * | | | | fast-import: properly fanout notes when tree is importedmh/fast-import-notes-fix-new | Mike Hommey | 2016-12-20 | 2 | -3/+47 |
* | | | | | Merge branch 'jc/git-open-cloexec' | Junio C Hamano | 2017-01-10 | 3 | -36/+22 |
|\ \ \ \ \ | |||||
| * | | | | | sha1_file: stop opening files with O_NOATIMEjc/git-open-cloexec | Junio C Hamano | 2016-11-02 | 2 | -22/+1 |
| * | | | | | git_open_cloexec(): use fcntl(2) w/ FD_CLOEXEC fallback | Junio C Hamano | 2016-11-02 | 1 | -5/+19 |
| * | | | | | git_open(): untangle possible NOATIME and CLOEXEC interactions | Junio C Hamano | 2016-10-28 | 3 | -28/+21 |
* | | | | | | Merge branch 'jc/compression-config' | Junio C Hamano | 2017-01-10 | 9 | -31/+158 |
|\ \ \ \ \ \ | |||||
| * | | | | | | compression: unify pack.compression configuration parsingjc/compression-config | Junio C Hamano | 2016-11-15 | 9 | -31/+158 |
* | | | | | | | Merge branch 'dt/smart-http-detect-server-going-away' | Junio C Hamano | 2017-01-10 | 5 | -4/+77 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | upload-pack: optionally allow fetching any sha1dt/smart-http-detect-server-going-away | David Turner | 2016-11-18 | 4 | -4/+39 |
| * | | | | | | | remote-curl: don't hang when a server dies before any output | David Turner | 2016-11-18 | 2 | -0/+38 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'mm/gc-safety-doc' | Junio C Hamano | 2017-01-10 | 2 | -9/+29 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-gc.txt: expand discussion of races with other processesmm/gc-safety-doc | Matt McCutchen | 2016-11-16 | 2 | -9/+29 |
* | | | | | | | | Merge branch 'mm/push-social-engineering-attack-doc' | Junio C Hamano | 2017-01-10 | 6 | -22/+51 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | doc: mention transfer data leaks in more placesmm/push-social-engineering-attack-doc | Matt McCutchen | 2016-11-14 | 6 | -22/+51 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jt/fetch-no-redundant-tag-fetch-map' | Junio C Hamano | 2017-01-10 | 1 | -3/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fetch: do not redundantly calculate tag refmapjt/fetch-no-redundant-tag-fetch-map | Jonathan Tan | 2016-11-11 | 1 | -3/+0 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jc/latin-1' | Junio C Hamano | 2017-01-10 | 1 | -11/+25 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | utf8: accept "latin-1" as ISO-8859-1jc/latin-1 | Junio C Hamano | 2016-09-26 | 1 | -0/+7 |
| * | | | | | | | | utf8: refactor code to decide fallback encoding | Junio C Hamano | 2016-09-26 | 1 | -11/+18 |
| |/ / / / / / / | |||||
* | | | | | | | | Fourth batch for 2.12 | Junio C Hamano | 2016-12-27 | 1 | -0/+42 |
* | | | | | | | | Merge branch 'jc/lock-report-on-error' | Junio C Hamano | 2016-12-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | lockfile: move REPORT_ON_ERROR bit elsewherejc/lock-report-on-error | Junio C Hamano | 2016-12-27 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'js/mingw-isatty' | Junio C Hamano | 2016-12-27 | 1 | -114/+84 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | mingw: replace isatty() hack | Jeff Hostetler | 2016-12-22 | 1 | -107/+69 |
| * | | | | | | | | | mingw: fix colourization on Cygwin pseudo terminals | Alan Davies | 2016-12-22 | 1 | -2/+6 |
| * | | | | | | | | | mingw: adjust is_console() to work with stdin | Johannes Schindelin | 2016-12-22 | 1 | -1/+5 |
* | | | | | | | | | | Merge branch 'ls/p4-lfs' | Junio C Hamano | 2016-12-27 | 2 | -14/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git-p4: add diff/merge properties to .gitattributes for GitLFS filesls/p4-lfs | Lars Schneider | 2016-12-20 | 2 | -14/+14 |
* | | | | | | | | | | | Merge branch 'va/i18n-even-more' | Junio C Hamano | 2016-12-27 | 2 | -3/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | i18n: fix misconversion in shell scriptsva/i18n-even-more | Junio C Hamano | 2016-12-20 | 2 | -3/+4 |
* | | | | | | | | | | | | Merge branch 'lt/shortlog-by-committer' | Junio C Hamano | 2016-12-27 | 4 | -3/+36 |
|\ \ \ \ \ \ \ \ \ \ \ \ |