summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* builtin/commit.c: switch to strbuf, instead of snprintf()ep/commit-static-buf-cleanupElia Pinto2017-01-311-6/+4
* builtin/commit.c: remove the PATH_MAX limitation via dynamic allocationElia Pinto2017-01-131-11/+10
* Fifth batch 2.12Junio C Hamano2017-01-101-0/+45
* Merge branch 'sb/submodule-embed-gitdir'Junio C Hamano2017-01-1012-43/+399
|\
| * worktree: initialize return value for submodule_uses_worktreesStefan Beller2016-12-271-1/+1
| * submodule: add absorb-git-dir functionStefan Beller2016-12-128-1/+282
| * move connect_work_tree_and_git_dir to dir.hStefan Beller2016-12-124-26/+26
| * worktree: check if a submodule uses worktreesStefan Beller2016-12-122-0/+55
| * test-lib-functions.sh: teach test_commit -C <dir>Stefan Beller2016-12-091-5/+15
| * submodule helper: support super prefixStefan Beller2016-12-092-12/+21
| * submodule: use absolute path for computing relative path connectingStefan Beller2016-12-091-6/+7
* | Merge branch 'jc/retire-compaction-heuristics'Junio C Hamano2017-01-107-67/+8
|\ \
| * | diff: retire "compaction" heuristicsjc/retire-compaction-heuristicsJunio C Hamano2016-12-237-67/+8
* | | Merge branch 'nd/config-misc-fixes'Junio C Hamano2017-01-101-5/+15
|\ \ \
| * | | config.c: handle lock file in error case in git_config_rename_...nd/config-misc-fixesNguyễn Thái Ngọc Duy2016-12-221-1/+3
| * | | config.c: rename label unlock_and_outNguyễn Thái Ngọc Duy2016-12-201-2/+2
| * | | config.c: handle error case for fstat() callsNguyễn Thái Ngọc Duy2016-12-201-2/+10
* | | | Merge branch 'jc/abbrev-autoscale-config'Junio C Hamano2017-01-102-8/+15
|\ \ \ \
| * | | | config.abbrev: document the new default that auto-scalesjc/abbrev-autoscale-configJunio C Hamano2016-12-222-8/+15
| | |/ / | |/| |
* | | | Merge branch 'mh/fast-import-notes-fix-new'Junio C Hamano2017-01-102-3/+47
|\ \ \ \
| * | | | fast-import: properly fanout notes when tree is importedmh/fast-import-notes-fix-newMike Hommey2016-12-202-3/+47
* | | | | Merge branch 'jc/git-open-cloexec'Junio C Hamano2017-01-103-36/+22
|\ \ \ \ \
| * | | | | sha1_file: stop opening files with O_NOATIMEjc/git-open-cloexecJunio C Hamano2016-11-022-22/+1
| * | | | | git_open_cloexec(): use fcntl(2) w/ FD_CLOEXEC fallbackJunio C Hamano2016-11-021-5/+19
| * | | | | git_open(): untangle possible NOATIME and CLOEXEC interactionsJunio C Hamano2016-10-283-28/+21
* | | | | | Merge branch 'jc/compression-config'Junio C Hamano2017-01-109-31/+158
|\ \ \ \ \ \
| * | | | | | compression: unify pack.compression configuration parsingjc/compression-configJunio C Hamano2016-11-159-31/+158
* | | | | | | Merge branch 'dt/smart-http-detect-server-going-away'Junio C Hamano2017-01-105-4/+77
|\ \ \ \ \ \ \
| * | | | | | | upload-pack: optionally allow fetching any sha1dt/smart-http-detect-server-going-awayDavid Turner2016-11-184-4/+39
| * | | | | | | remote-curl: don't hang when a server dies before any outputDavid Turner2016-11-182-0/+38
| |/ / / / / /
* | | | | | | Merge branch 'mm/gc-safety-doc'Junio C Hamano2017-01-102-9/+29
|\ \ \ \ \ \ \
| * | | | | | | git-gc.txt: expand discussion of races with other processesmm/gc-safety-docMatt McCutchen2016-11-162-9/+29
* | | | | | | | Merge branch 'mm/push-social-engineering-attack-doc'Junio C Hamano2017-01-106-22/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: mention transfer data leaks in more placesmm/push-social-engineering-attack-docMatt McCutchen2016-11-146-22/+51
| |/ / / / / / /
* | | | | | | | Merge branch 'jt/fetch-no-redundant-tag-fetch-map'Junio C Hamano2017-01-101-3/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | fetch: do not redundantly calculate tag refmapjt/fetch-no-redundant-tag-fetch-mapJonathan Tan2016-11-111-3/+0
| |/ / / / / / /
* | | | | | | | Merge branch 'jc/latin-1'Junio C Hamano2017-01-101-11/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | utf8: accept "latin-1" as ISO-8859-1jc/latin-1Junio C Hamano2016-09-261-0/+7
| * | | | | | | | utf8: refactor code to decide fallback encodingJunio C Hamano2016-09-261-11/+18
| |/ / / / / / /
* | | | | | | | Fourth batch for 2.12Junio C Hamano2016-12-271-0/+42
* | | | | | | | Merge branch 'jc/lock-report-on-error'Junio C Hamano2016-12-271-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | lockfile: move REPORT_ON_ERROR bit elsewherejc/lock-report-on-errorJunio C Hamano2016-12-271-1/+1
* | | | | | | | | Merge branch 'js/mingw-isatty'Junio C Hamano2016-12-271-114/+84
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mingw: replace isatty() hackJeff Hostetler2016-12-221-107/+69
| * | | | | | | | | mingw: fix colourization on Cygwin pseudo terminalsAlan Davies2016-12-221-2/+6
| * | | | | | | | | mingw: adjust is_console() to work with stdinJohannes Schindelin2016-12-221-1/+5
* | | | | | | | | | Merge branch 'ls/p4-lfs'Junio C Hamano2016-12-272-14/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-p4: add diff/merge properties to .gitattributes for GitLFS filesls/p4-lfsLars Schneider2016-12-202-14/+14
* | | | | | | | | | | Merge branch 'va/i18n-even-more'Junio C Hamano2016-12-272-3/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | i18n: fix misconversion in shell scriptsva/i18n-even-moreJunio C Hamano2016-12-202-3/+4