summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* read_cache: roll back lock in `update_index_if_able()`ma/lockfile-fixesMartin Ågren2017-10-072-3/+6
* read-cache: leave lock in right state in `write_locked_index()`Martin Ågren2017-10-075-11/+13
* read-cache: drop explicit `CLOSE_LOCK`-flagMartin Ågren2017-10-073-14/+15
* cache.h: document `write_locked_index()`Martin Ågren2017-10-061-0/+16
* apply: remove `newfd` from `struct apply_state`Martin Ågren2017-10-062-13/+7
* apply: move lockfile into `apply_state`Martin Ågren2017-10-064-17/+9
* cache-tree: simplify locking logicMartin Ågren2017-10-061-8/+4
* checkout-index: simplify locking logicMartin Ågren2017-10-061-5/+3
* tempfile: fix documentation on `delete_tempfile()`Martin Ågren2017-10-061-4/+4
* lockfile: fix documentation on `close_lock_file_gently()`Martin Ågren2017-10-061-2/+2
* treewide: prefer lockfiles on the stackMartin Ågren2017-10-068-49/+42
* sha1_file: do not leak `lock_file`Martin Ågren2017-10-061-11/+8
* The eleventh batch for 2.15Junio C Hamano2017-09-291-0/+18
* Merge branch 'sb/doc-config-submodule-update'Junio C Hamano2017-09-291-4/+8
|\
| * Documentation/config: clarify the meaning of submodule.<name>.updatesb/doc-config-submodule-updateStefan Beller2017-09-241-4/+8
* | Merge branch 'ma/leakplugs'Junio C Hamano2017-09-2917-35/+75
|\ \
| * | pack-bitmap[-write]: use `object_array_clear()`, don't leakma/leakplugsMartin Ågren2017-09-242-10/+4
| * | object_array: add and use `object_array_pop()`Martin Ågren2017-09-246-10/+25
| * | object_array: use `object_array_clear()`, not `free()`Martin Ågren2017-09-244-7/+6
| * | leak_pending: use `object_array_clear()`, not `free()`Martin Ågren2017-09-244-3/+29
| * | commit: fix memory leak in `reduce_heads()`Martin Ågren2017-09-241-0/+1
| * | builtin/commit: fix memory leak in `prepare_index()`Martin Ågren2017-09-241-5/+10
* | | Merge branch 'rj/no-sign-compare'Junio C Hamano2017-09-2910-24/+25
|\ \ \
| * | | ALLOC_GROW: avoid -Wsign-compare warningsrj/no-sign-compareRamsay Jones2017-09-227-17/+16
| * | | cache.h: hex2chr() - avoid -Wsign-compare warningsRamsay Jones2017-09-221-2/+2
| * | | commit-slab.h: avoid -Wsign-compare warningsRamsay Jones2017-09-221-3/+3
| * | | git-compat-util.h: xsize_t() - avoid -Wsign-compare warningsRamsay Jones2017-09-221-2/+4
| |/ /
* | | Merge branch 'sb/merge-commit-msg-hook'Junio C Hamano2017-09-291-5/+4
|\ \ \
| * | | Documentation/githooks: mention merge in commit-msg hooksb/merge-commit-msg-hookStefan Beller2017-09-221-5/+4
* | | | Merge branch 'jt/fast-export-copy-modify-fix'Junio C Hamano2017-09-292-15/+51
|\ \ \ \
| * | | | fast-export: do not copy from modified filejt/fast-export-copy-modify-fixJonathan Tan2017-09-212-15/+51
* | | | | Merge branch 'mk/describe-match-with-all'Junio C Hamano2017-09-293-22/+58
|\ \ \ \ \
| * | | | | describe: teach --match to handle branches and remotesmk/describe-match-with-allMax Kirillov2017-09-203-22/+58
| * | | | | Merge branch 'jk/describe-omit-some-refs' into mk/describe-match-with-allJunio C Hamano2017-09-202-4/+11
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jm/status-ignored-directory-optim'Junio C Hamano2017-09-291-6/+41
|\ \ \ \ \ \ \
| * | | | | | | Improve performance of git status --ignoredjm/status-ignored-directory-optimJameson Miller2017-09-191-6/+41
| | |_|_|_|/ / | |/| | | | |
* | | | | | | The tenth batch for 2.15Junio C Hamano2017-09-281-0/+47
* | | | | | | Merge branch 'js/win32-lazyload-dll'Junio C Hamano2017-09-281-0/+57
|\ \ \ \ \ \ \
| * | | | | | | Win32: simplify loading of DLL functionsjs/win32-lazyload-dllJohannes Schindelin2017-09-261-0/+57
| |/ / / / / /
* | | | | | | Merge branch 'jc/merge-x-theirs-docfix'Junio C Hamano2017-09-281-1/+2
|\ \ \ \ \ \ \
| * | | | | | | merge-strategies: avoid implying that "-s theirs" existsjc/merge-x-theirs-docfixJunio C Hamano2017-09-251-1/+2
* | | | | | | | Merge branch 'ks/doc-use-camelcase-for-config-name'Junio C Hamano2017-09-282-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: camelCase the config variables to improve readabilityks/doc-use-camelcase-for-config-nameKaartic Sivaraam2017-09-252-3/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mk/diff-delta-avoid-large-offset'Junio C Hamano2017-09-281-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | diff-delta: do not allow delta offset truncationmk/diff-delta-avoid-large-offsetMartin Koegler2017-08-111-0/+3
* | | | | | | | | Merge branch 'mk/diff-delta-uint-may-be-shorter-than-ulong'Junio C Hamano2017-09-281-11/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff-delta: fix encoding size that would not fit in "unsigned int"mk/diff-delta-uint-may-be-shorter-than-ulongMartin Koegler2017-08-101-11/+13
| |/ / / / / / / /
* | | | | | | | | Merge branch 'rs/resolve-ref-optional-result'Junio C Hamano2017-09-2817-46/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | refs: pass NULL to resolve_ref_unsafe() if hash is not neededRené Scharfe2017-09-2414-38/+19
| * | | | | | | | | refs: pass NULL to refs_resolve_ref_unsafe() if hash is not neededRené Scharfe2017-09-242-4/+2
View Lorry Controller Status