summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | | | | commit: Fix a memory leak in determine_author_infoStefan Beller2013-07-151-1/+0
| * | | | | | | | | | | | | | | | | | | | | daemon.c:handle: Remove unneeded check for null pointer.Stefan Beller2013-07-151-1/+1
| | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/line-log'Junio C Hamano2013-07-242-3/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges ...tr/line-logJunio C Hamano2013-07-241-1/+0
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'es/line-log-further-fixes' into tr/line-logJunio C Hamano2013-07-233-7/+153
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | line-log: fix "log -LN" crash when N is last line of filees/line-log-further-fixesEric Sunshine2013-07-232-1/+2
| | * | | | | | | | | | | | | | | | | | | | | range-set: satisfy non-empty ranges invariantEric Sunshine2013-07-232-1/+4
| | * | | | | | | | | | | | | | | | | | | | | t4211: demonstrate crash when first -L encountered is empty rangeEric Sunshine2013-07-231-0/+5
| | * | | | | | | | | | | | | | | | | | | | | t4211: demonstrate empty -L range crashEric Sunshine2013-07-231-0/+8
| | * | | | | | | | | | | | | | | | | | | | | range-set: fix sort_and_merge_range_set() corner case bugEric Sunshine2013-07-231-3/+3
* | | | | | | | | | | | | | | | | | | | | | | open_istream: remove unneeded check for null pointerStefan Beller2013-07-231-1/+1
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mv/merge-ff-tristate'Junio C Hamano2013-07-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |