Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | Merge branch 'es/contacts' | Junio C Hamano | 2013-07-24 | 2 | -0/+282 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | contrib: contacts: add documentationes/contacts | Eric Sunshine | 2013-07-21 | 1 | -0/+94 | |
| * | | | | | | | | | | | | | | | contrib: contacts: add mailmap support | Eric Sunshine | 2013-07-21 | 1 | -0/+18 | |
| * | | | | | | | | | | | | | | | contrib: contacts: interpret committish akin to format-patch | Eric Sunshine | 2013-07-21 | 1 | -1/+18 | |
| * | | | | | | | | | | | | | | | contrib: contacts: add ability to parse from committish | Eric Sunshine | 2013-07-21 | 1 | -6/+32 | |
| * | | | | | | | | | | | | | | | contrib: add git-contacts helper | Eric Sunshine | 2013-07-21 | 1 | -0/+127 | |
* | | | | | | | | | | | | | | | | Merge branch 'ml/cygwin-updates' | Junio C Hamano | 2013-07-24 | 1 | -6/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | cygwin: stop forcing core.filemode=falseml/cygwin-updates | Mark Levedahl | 2013-07-21 | 1 | -1/+0 | |
| * | | | | | | | | | | | | | | | | Cygwin 1.7 supports mmap | Mark Levedahl | 2013-07-21 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | | | Cygwin 1.7 has thread-safe pread | Mark Levedahl | 2013-07-21 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | Cygwin 1.7 needs compat/regex | Mark Levedahl | 2013-07-21 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | | | Merge branch 'rj/sparse' | Junio C Hamano | 2013-07-24 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Revert "compat/unsetenv.c: Fix a sparse warning"rj/sparse | Benoit Sigoure | 2013-07-21 | 1 | -0/+3 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'sb/traverse-trees-bitmask-variable-name' | Junio C Hamano | 2013-07-24 | 1 | -6/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | traverse_trees(): clarify return value of the callbacksb/traverse-trees-bitmask-variable-name | Stefan Beller | 2013-07-19 | 1 | -6/+5 | |
| | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/cat-file-batch-optim' | Junio C Hamano | 2013-07-24 | 6 | -71/+145 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Fix some sparse warnings | Ramsay Jones | 2013-07-18 | 2 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | sha1_object_info_extended: pass object_info to helpers | Jeff King | 2013-07-12 | 1 | -27/+22 | |
| * | | | | | | | | | | | | | | | | | sha1_object_info_extended: make type calculation optional | Jeff King | 2013-07-12 | 4 | -11/+19 | |
| * | | | | | | | | | | | | | | | | | packed_object_info: make type lookup optional | Jeff King | 2013-07-12 | 1 | -9/+16 | |
| * | | | | | | | | | | | | | | | | | packed_object_info: hoist delta type resolution to helper | Jeff King | 2013-07-12 | 1 | -40/+53 | |
| * | | | | | | | | | | | | | | | | | sha1_loose_object_info: make type lookup optional | Jeff King | 2013-07-12 | 1 | -5/+43 | |
| * | | | | | | | | | | | | | | | | | sha1_object_info_extended: rename "status" to "type" | Jeff King | 2013-07-12 | 1 | -10/+10 | |
| * | | | | | | | | | | | | | | | | | cat-file: disable object/refname ambiguity check for batch mode | Jeff King | 2013-07-12 | 4 | -6/+19 | |
| * | | | | | | | | | | | | | | | | | Merge branch 'nd/warn-ambiguous-object-name' into jk/cat-file-batch-optim | Junio C Hamano | 2013-07-12 | 4 | -2/+44 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ml/avoid-using-grep-on-crlf-files' | Junio C Hamano | 2013-07-24 | 3 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | test-lib.sh - define and use GREP_STRIPS_CRml/avoid-using-grep-on-crlf-files | Mark Levedahl | 2013-07-18 | 3 | -2/+4 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jm/doc-ref-prune' | Junio C Hamano | 2013-07-24 | 2 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Documentation: fix git-prune example usagejm/doc-ref-prune | Jonathon Mah | 2013-07-18 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | Documentation: remove --prune from pack-refs examples | Jonathon Mah | 2013-07-18 | 1 | -2/+2 | |
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'rh/template-updates' | Junio C Hamano | 2013-07-24 | 1 | -14/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | templates: spell ASCII in uppercase in pre-commit hookrh/template-updates | Richard Hartmann | 2013-07-15 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | templates: Reformat pre-commit hook's message | Richard Hartmann | 2013-07-15 | 1 | -4/+2 | |
| * | | | | | | | | | | | | | | | | | | | templates: Use heredoc in pre-commit hook | Richard Hartmann | 2013-07-15 | 1 | -12/+13 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/ref-races-optim-invalidate-cached' | Junio C Hamano | 2013-07-24 | 1 | -3/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | refs: do not invalidate the packed-refs cache unnecessarily | Michael Haggerty | 2013-06-20 | 1 | -3/+6 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/misc-fixes' | Junio C Hamano | 2013-07-24 | 3 | -5/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | diff.c: Do not initialize a variable, which gets reassigned anyway.sb/misc-fixes | Stefan Beller | 2013-07-15 | 1 | -3/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | commit: Fix a memory leak in determine_author_info | Stefan Beller | 2013-07-15 | 1 | -1/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | daemon.c:handle: Remove unneeded check for null pointer. | Stefan Beller | 2013-07-15 | 1 | -1/+1 | |
| | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/line-log' | Junio C Hamano | 2013-07-24 | 2 | -3/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges ...tr/line-log | Junio C Hamano | 2013-07-24 | 1 | -1/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/line-log-further-fixes' into tr/line-log | Junio C Hamano | 2013-07-23 | 3 | -7/+153 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | line-log: fix "log -LN" crash when N is last line of filees/line-log-further-fixes | Eric Sunshine | 2013-07-23 | 2 | -1/+2 | |
| | * | | | | | | | | | | | | | | | | | | | | | range-set: satisfy non-empty ranges invariant | Eric Sunshine | 2013-07-23 | 2 | -1/+4 | |
| | * | | | | | | | | | | | | | | | | | | | | | t4211: demonstrate crash when first -L encountered is empty range | Eric Sunshine | 2013-07-23 | 1 | -0/+5 | |
| | * | | | | | | | | | | | | | | | | | | | | | t4211: demonstrate empty -L range crash | Eric Sunshine | 2013-07-23 | 1 | -0/+8 | |
| | * | | | | | | | | | | | | | | | | | | | | | range-set: fix sort_and_merge_range_set() corner case bug | Eric Sunshine | 2013-07-23 | 1 | -3/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | | open_istream: remove unneeded check for null pointer | Stefan Beller | 2013-07-23 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mv/merge-ff-tristate' | Junio C Hamano | 2013-07-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |