aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'ob/typofixes'Junio C Hamano2013-07-24
|\
| * typofix: in-code commentsOndřej Bílka2013-07-22
| * typofix: documentationOndřej Bílka2013-07-22
| * typofix: release notesOndřej Bílka2013-07-22
* | Merge branch 'es/contacts'Junio C Hamano2013-07-24
|\ \
| * | contrib: contacts: add documentationEric Sunshine2013-07-21
| * | contrib: contacts: add mailmap supportEric Sunshine2013-07-21
| * | contrib: contacts: interpret committish akin to format-patchEric Sunshine2013-07-21
| * | contrib: contacts: add ability to parse from committishEric Sunshine2013-07-21
| * | contrib: add git-contacts helperEric Sunshine2013-07-21
* | | Merge branch 'ml/cygwin-updates'Junio C Hamano2013-07-24
|\ \ \
| * | | cygwin: stop forcing core.filemode=falseMark Levedahl2013-07-21
| * | | Cygwin 1.7 supports mmapMark Levedahl2013-07-21
| * | | Cygwin 1.7 has thread-safe preadMark Levedahl2013-07-21
| * | | Cygwin 1.7 needs compat/regexMark Levedahl2013-07-21
* | | | Merge branch 'rj/sparse'Junio C Hamano2013-07-24
|\ \ \ \
| * | | | Revert "compat/unsetenv.c: Fix a sparse warning"Benoit Sigoure2013-07-21
* | | | | Merge branch 'sb/traverse-trees-bitmask-variable-name'Junio C Hamano2013-07-24
|\ \ \ \ \
| * | | | | traverse_trees(): clarify return value of the callbackStefan Beller2013-07-19
* | | | | | Merge branch 'jk/cat-file-batch-optim'Junio C Hamano2013-07-24
|\ \ \ \ \ \
| * | | | | | Fix some sparse warningsRamsay Jones2013-07-18
| * | | | | | sha1_object_info_extended: pass object_info to helpersJeff King2013-07-12
| * | | | | | sha1_object_info_extended: make type calculation optionalJeff King2013-07-12
| * | | | | | packed_object_info: make type lookup optionalJeff King2013-07-12
| * | | | | | packed_object_info: hoist delta type resolution to helperJeff King2013-07-12
| * | | | | | sha1_loose_object_info: make type lookup optionalJeff King2013-07-12
| * | | | | | sha1_object_info_extended: rename "status" to "type"Jeff King2013-07-12
| * | | | | | cat-file: disable object/refname ambiguity check for batch modeJeff King2013-07-12
| * | | | | | Merge branch 'nd/warn-ambiguous-object-name' into jk/cat-file-batch-optimJunio C Hamano2013-07-12
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'ml/avoid-using-grep-on-crlf-files'Junio C Hamano2013-07-24
|\ \ \ \ \ \ \ \
| * | | | | | | | test-lib.sh - define and use GREP_STRIPS_CRMark Levedahl2013-07-18
* | | | | | | | | Merge branch 'jm/doc-ref-prune'Junio C Hamano2013-07-24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: fix git-prune example usageJonathon Mah2013-07-18
| * | | | | | | | | Documentation: remove --prune from pack-refs examplesJonathon Mah2013-07-18
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rh/template-updates'Junio C Hamano2013-07-24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | templates: spell ASCII in uppercase in pre-commit hookRichard Hartmann2013-07-15
| * | | | | | | | | templates: Reformat pre-commit hook's messageRichard Hartmann2013-07-15
| * | | | | | | | | templates: Use heredoc in pre-commit hookRichard Hartmann2013-07-15
* | | | | | | | | | Merge branch 'mh/ref-races-optim-invalidate-cached'Junio C Hamano2013-07-24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | refs: do not invalidate the packed-refs cache unnecessarilyMichael Haggerty2013-06-20
* | | | | | | | | | | Merge branch 'sb/misc-fixes'Junio C Hamano2013-07-24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | diff.c: Do not initialize a variable, which gets reassigned anyway.Stefan Beller2013-07-15
| * | | | | | | | | | | commit: Fix a memory leak in determine_author_infoStefan Beller2013-07-15
| * | | | | | | | | | | daemon.c:handle: Remove unneeded check for null pointer.Stefan Beller2013-07-15
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'tr/line-log'Junio C Hamano2013-07-24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges ...Junio C Hamano2013-07-24
| * | | | | | | | | | | Merge branch 'es/line-log-further-fixes' into tr/line-logJunio C Hamano2013-07-23
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | line-log: fix "log -LN" crash when N is last line of fileEric Sunshine2013-07-23
| | * | | | | | | | | | | range-set: satisfy non-empty ranges invariantEric Sunshine2013-07-23
| | * | | | | | | | | | | t4211: demonstrate crash when first -L encountered is empty rangeEric Sunshine2013-07-23