summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Provide some linguistic guidance for the documentation.mb/docs-favor-en-usMarc Branchaud2013-08-012-1/+22
* Rename advice.object_name_warning to objectNameWarningThomas Rast2013-07-312-2/+2
* Merge branch 'rr/rebase-autostash'Junio C Hamano2013-07-311-1/+1
|\
| * git-rebase: fix typorr/rebase-autostashRalf Thielow2013-07-291-1/+1
* | Merge branch 'rj/commit-slab-fix'Junio C Hamano2013-07-311-7/+6
|\ \
| * | commit-slab.h: Fix memory allocation and addressingrj/commit-slab-fixRamsay Jones2013-07-291-7/+6
* | | Merge branch 'jk/commit-how-to-abort-cherry-pick'Junio C Hamano2013-07-311-3/+22
|\ \ \
| * | | commit: tweak empty cherry pick advice for sequencerjk/commit-how-to-abort-cherry-pickJeff King2013-07-291-3/+22
* | | | Merge branch 'ds/doc-two-kinds-of-tags'Junio C Hamano2013-07-311-0/+11
|\ \ \ \
| * | | | docs/git-tag: explain lightweight versus annotated tagsds/doc-two-kinds-of-tagsDaniele Segato2013-07-291-0/+11
| |/ / /
* | | | Merge branch 'rr/maint-tilde-markup-in-doc'Junio C Hamano2013-07-311-12/+14
|\ \ \ \
| * | | | config doc: quote paths, fixing tilde-interpretationrr/maint-tilde-markup-in-docRamkumar Ramachandra2013-07-261-12/+14
* | | | | Merge branch 'mh/packed-refs-do-one-ref-recursion'Junio C Hamano2013-07-311-1/+5
|\ \ \ \ \
| * | | | | do_one_ref(): save and restore value of current_refmh/packed-refs-do-one-ref-recursionMichael Haggerty2013-07-171-1/+5
* | | | | | 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