summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* quote: remove sq_quote_print()nd/sq-quote-bufRamkumar Ramachandra2013-07-302-19/+0
* tar-tree: remove dependency on sq_quote_print()Ramkumar Ramachandra2013-07-301-6/+5
* for-each-ref, quote: convert *_quote_print -> *_quote_bufNguyễn Thái Ngọc Duy2013-07-303-29/+34
* commit.h: drop redundant commentJeff King2013-07-251-2/+0
* Git 1.8.4-rc0v1.8.4-rc0Junio C Hamano2013-07-242-2/+10
* Merge branch 'mh/multimail'Junio C Hamano2013-07-247-4/+3411
|\
| * post-receive-email: deprecate script in favor of git-multimailMichael Haggerty2013-07-221-4/+13
| * git-multimail: an improved replacement for post-receive-emailMichael Haggerty2013-07-156-0/+3398
* | Merge branch 'ob/typofixes'Junio C Hamano2013-07-2422-38/+38
|\ \
| * | typofix: in-code commentsOndřej Bílka2013-07-229-23/+23
| * | typofix: documentationOndřej Bílka2013-07-227-7/+7
| * | typofix: release notesOndřej Bílka2013-07-226-8/+8
* | | Merge branch 'es/contacts'Junio C Hamano2013-07-242-0/+282
|\ \ \
| * | | contrib: contacts: add documentationes/contactsEric Sunshine2013-07-211-0/+94
| * | | contrib: contacts: add mailmap supportEric Sunshine2013-07-211-0/+18
| * | | contrib: contacts: interpret committish akin to format-patchEric Sunshine2013-07-211-1/+18
| * | | contrib: contacts: add ability to parse from committishEric Sunshine2013-07-211-6/+32
| * | | contrib: add git-contacts helperEric Sunshine2013-07-211-0/+127
* | | | Merge branch 'ml/cygwin-updates'Junio C Hamano2013-07-241-6/+7
|\ \ \ \
| * | | | cygwin: stop forcing core.filemode=falseml/cygwin-updatesMark Levedahl2013-07-211-1/+0
| * | | | Cygwin 1.7 supports mmapMark Levedahl2013-07-211-4/+4
| * | | | Cygwin 1.7 has thread-safe preadMark Levedahl2013-07-211-1/+1
| * | | | Cygwin 1.7 needs compat/regexMark Levedahl2013-07-211-0/+2
* | | | | Merge branch 'rj/sparse'Junio C Hamano2013-07-241-0/+3
|\ \ \ \ \
| * | | | | Revert "compat/unsetenv.c: Fix a sparse warning"rj/sparseBenoit Sigoure2013-07-211-0/+3
* | | | | | Merge branch 'sb/traverse-trees-bitmask-variable-name'Junio C Hamano2013-07-241-6/+5
|\ \ \ \ \ \
| * | | | | | traverse_trees(): clarify return value of the callbacksb/traverse-trees-bitmask-variable-nameStefan Beller2013-07-191-6/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jk/cat-file-batch-optim'Junio C Hamano2013-07-246-71/+145
|\ \ \ \ \ \
| * | | | | | Fix some sparse warningsRamsay Jones2013-07-182-2/+2
| * | | | | | sha1_object_info_extended: pass object_info to helpersJeff King2013-07-121-27/+22
| * | | | | | sha1_object_info_extended: make type calculation optionalJeff King2013-07-124-11/+19
| * | | | | | packed_object_info: make type lookup optionalJeff King2013-07-121-9/+16
| * | | | | | packed_object_info: hoist delta type resolution to helperJeff King2013-07-121-40/+53
| * | | | | | sha1_loose_object_info: make type lookup optionalJeff King2013-07-121-5/+43
| * | | | | | sha1_object_info_extended: rename "status" to "type"Jeff King2013-07-121-10/+10
| * | | | | | cat-file: disable object/refname ambiguity check for batch modeJeff King2013-07-124-6/+19
| * | | | | | Merge branch 'nd/warn-ambiguous-object-name' into jk/cat-file-batch-optimJunio C Hamano2013-07-124-2/+44
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'ml/avoid-using-grep-on-crlf-files'Junio C Hamano2013-07-243-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | test-lib.sh - define and use GREP_STRIPS_CRml/avoid-using-grep-on-crlf-filesMark Levedahl2013-07-183-2/+4
* | | | | | | | | Merge branch 'jm/doc-ref-prune'Junio C Hamano2013-07-242-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: fix git-prune example usagejm/doc-ref-pruneJonathon Mah2013-07-181-1/+1
| * | | | | | | | | Documentation: remove --prune from pack-refs examplesJonathon Mah2013-07-181-2/+2
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rh/template-updates'Junio C Hamano2013-07-241-14/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | templates: spell ASCII in uppercase in pre-commit hookrh/template-updatesRichard Hartmann2013-07-151-3/+3
| * | | | | | | | | templates: Reformat pre-commit hook's messageRichard Hartmann2013-07-151-4/+2
| * | | | | | | | | templates: Use heredoc in pre-commit hookRichard Hartmann2013-07-151-12/+13
* | | | | | | | | | Merge branch 'mh/ref-races-optim-invalidate-cached'Junio C Hamano2013-07-241-3/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | refs: do not invalidate the packed-refs cache unnecessarilyMichael Haggerty2013-06-201-3/+6
* | | | | | | | | | | Merge branch 'sb/misc-fixes'Junio C Hamano2013-07-243-5/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | diff.c: Do not initialize a variable, which gets reassigned anyway.sb/misc-fixesStefan Beller2013-07-151-3/+1