summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* tag: use OPT_CMDMODEjc/parseopt-command-modesJunio C Hamano2013-07-301-15/+12
* parse-options: add OPT_CMDMODE()Junio C Hamano2013-07-302-5/+56
* Merge branch 'jk/capabilities-doc'Junio C Hamano2013-07-301-4/+36
|\
| * document 'allow-tip-sha1-in-want' capabilityjk/capabilities-docNguyễn Thái Ngọc Duy2013-07-261-0/+7
| * document 'quiet' receive-pack capabilityJeff King2013-07-241-1/+11
| * document 'agent' protocol capabilityJeff King2013-07-241-1/+16
| * docs: note that receive-pack knows side-band-64k capabilityJeff King2013-07-241-2/+2
| * docs: fix 'report-status' protocol capability thinkoJeff King2013-07-241-1/+1
* | Merge branch 'sb/mailmap-updates'Junio C Hamano2013-07-301-0/+4
|\ \
| * | .mailmap: combine more (email, name) to individual personsStefan Beller2013-07-241-0/+4
* | | Merge branch 'bc/completion-for-bash-3.0'Junio C Hamano2013-07-301-1/+1
|\ \ \
| * | | git-completion.bash: replace zsh notation that breaks bash 3.XBrandon Casey2013-07-241-1/+1
* | | | 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