diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-08 00:36:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-08 00:36:00 -0800 |
| commit | 493e433277ee72b200e72f7a17e08266ed9497c5 (patch) | |
| tree | 8db1b524e77ee9d24ed89d22f311f17ff50baf64 /Documentation/merge-strategies.txt | |
| parent | 6ae611fa8d1e15e918e59b7e20abf98643cd25e4 (diff) | |
| parent | 5256b006312e4d06e11b49a8b128e9e550e54f31 (diff) | |
| download | git-493e433277ee72b200e72f7a17e08266ed9497c5.tar.gz git-493e433277ee72b200e72f7a17e08266ed9497c5.tar.xz | |
Merge branch 'mm/mkstemps-mode-for-packfiles' into maint
* mm/mkstemps-mode-for-packfiles:
Use git_mkstemp_mode instead of plain mkstemp to create object files
git_mkstemps_mode: don't set errno to EINVAL on exit.
Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later.
git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument.
Move gitmkstemps to path.c
Add a testcase for ACL with restrictive umask.
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions