summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mh/tidy-ref-update-flags'Junio C Hamano2017-11-1516-163/+189
|\
| * refs: update some more docs to use "oid" rather than "sha1"mh/tidy-ref-update-flagsMichael Haggerty2017-11-066-27/+26
| * write_packed_entry(): take `object_id` argumentsMichael Haggerty2017-11-061-8/+8
| * refs: rename constant `REF_ISPRUNING` to `REF_IS_PRUNING`Michael Haggerty2017-11-061-9/+9
| * refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`Michael Haggerty2017-11-0612-40/+40
| * refs: tidy up and adjust visibility of the `ref_update` flagsMichael Haggerty2017-11-063-80/+99
| * ref_transaction_add_update(): remove a checkMichael Haggerty2017-11-062-4/+6
| * ref_transaction_update(): die on disallowed flagsMichael Haggerty2017-11-061-1/+2
| * prune_ref(): call `ref_transaction_add_update()` directlyMichael Haggerty2017-11-062-12/+17
| * files_transaction_prepare(): don't leak flags to packed transactionMichael Haggerty2017-11-061-2/+2
| * Merge branch 'bc/object-id' into baseMichael Haggerty2017-10-2870-554/+544
| |\
* | \ Merge branch 'sr/wrapper-quote-filenames'Junio C Hamano2017-11-153-6/+6
|\ \ \
| * | | wrapper.c: consistently quote filenames in error messagessr/wrapper-quote-filenamesSimon Ruderich2017-11-063-6/+6
* | | | Merge branch 'ma/bisect-leakfix'Junio C Hamano2017-11-153-19/+29
|\ \ \ \
| * | | | bisect: fix memory leak when returning best elementMartin Ågren2017-11-061-1/+5
| * | | | bisect: fix off-by-one error in `best_bisection_sorted()`Martin Ågren2017-11-061-3/+4
| * | | | bisect: fix memory leak in `find_bisection()`Martin Ågren2017-11-061-1/+3
| * | | | bisect: change calling-convention of `find_bisection()`Martin Ågren2017-11-063-14/+17
| |/ / /
* | | | Merge branch 'rs/sequencer-rewrite-file-cleanup'Junio C Hamano2017-11-151-29/+16
|\ \ \ \
| * | | | sequencer.c: check return value of close() in rewrite_file()rs/sequencer-rewrite-file-cleanupSimon Ruderich2017-11-021-1/+2
| * | | | sequencer: use O_TRUNC to truncate filesRené Scharfe2017-11-011-3/+1
| * | | | sequencer: factor out rewrite_file()René Scharfe2017-11-011-29/+17
| |/ / /
* | | | Merge branch 'ao/merge-verbosity-getenv-just-once'Junio C Hamano2017-11-151-3/+4
|\ \ \ \
| * | | | merge-recursive: check GIT_MERGE_VERBOSITY only onceao/merge-verbosity-getenv-just-onceAndrey Okoshkin2017-11-011-3/+4
* | | | | Merge branch 'mh/avoid-rewriting-packed-refs'Junio C Hamano2017-11-154-1/+238
|\ \ \ \ \
| * | | | | files-backend: don't rewrite the `packed-refs` file unnecessarilymh/avoid-rewriting-packed-refsMichael Haggerty2017-10-304-3/+122
| * | | | | t1409: check that `packed-refs` is not rewritten unnecessarilyMichael Haggerty2017-10-271-0/+118
* | | | | | Merge branch 'rs/imap-send-next-arg-fix'Junio C Hamano2017-11-151-2/+13
|\ \ \ \ \ \
| * | | | | | imap-send: handle missing response codes gracefullyrs/imap-send-next-arg-fixRené Scharfe2017-11-031-1/+1
| * | | | | | imap-send: handle NULL return of next_arg()René Scharfe2017-11-031-1/+12
* | | | | | | Merge branch 'ab/mediawiki-name-truncation'Junio C Hamano2017-11-151-1/+2
|\ \ \ \ \ \ \
| * | | | | | | remote-mediawiki: limit filenames to legalab/mediawiki-name-truncationAntoine Beaupré2017-11-011-1/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jm/status-ignored-files-list'Junio C Hamano2017-11-138-18/+360
|\ \ \ \ \ \ \
| * | | | | | | status: test ignored modesjm/status-ignored-files-listJameson Miller2017-10-311-0/+233
| * | | | | | | status: document options to show matching ignored filesJameson Miller2017-10-312-5/+43
| * | | | | | | status: report matching ignored and normal untrackedJameson Miller2017-10-311-2/+18
| * | | | | | | status: add option to show ignored files differentlyJameson Miller2017-10-315-11/+66
* | | | | | | | RelNotes: the third batch for 2.16Junio C Hamano2017-11-091-0/+40
* | | | | | | | Merge branch 'js/mingw-redirect-std-handles'Junio C Hamano2017-11-093-0/+88
|\ \ \ \ \ \ \ \
| * | | | | | | | mingw: document the standard handle redirectionjs/mingw-redirect-std-handlesJohannes Schindelin2017-11-021-0/+18
| * | | | | | | | mingw: optionally redirect stderr/stdout via the same handleJohannes Schindelin2017-11-022-1/+22
| * | | | | | | | mingw: add experimental feature to redirect standard handlesJohannes Schindelin2017-11-022-0/+49
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'js/wincred-empty-cred'Junio C Hamano2017-11-092-2/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | wincred: handle empty username/password correctlyjs/wincred-empty-credJakub Bereżański2017-11-011-2/+8
| * | | | | | | | t0302: check helper can handle empty credentialsJakub Bereżański2017-11-011-0/+19
| |/ / / / / / /
* | | | | | | | Merge branch 'js/mingw-full-version-in-resources'Junio C Hamano2017-11-092-3/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | mingw: include the full version information in the resourcesjs/mingw-full-version-in-resourcesJohannes Schindelin2017-11-012-3/+4
* | | | | | | | | Merge branch 'dk/libsecret-unlock-to-load-fix'Junio C Hamano2017-11-091-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | credential-libsecret: unlock locked secretsdk/libsecret-unlock-to-load-fixDennis Kaarsemaker2017-11-041-1/+1
* | | | | | | | | | Merge branch 'ks/mailmap'Junio C Hamano2017-11-091-0/+1
|\ \ \ \ \ \ \ \ \ \