summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | Revert "cat-file: split --batch input lines on whitespace"Junio C Hamano2013-08-023-34/+3
* | | | | | | | | | Git 1.8.4-rc1v1.8.4-rc1Junio C Hamano2013-08-011-1/+1
* | | | | | | | | | Merge branch 'ob/typofixes'Junio C Hamano2013-08-0120-23/+23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | many small typofixesob/typofixesOndřej Bílka2013-07-2920-23/+23
* | | | | | | | | | | Merge branch 'ms/subtree-install-fix'Junio C Hamano2013-08-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | contrib/subtree: Fix make install targetms/subtree-install-fixMichal Sojka2013-07-301-0/+1
* | | | | | | | | | | | Merge branch 'jc/rm-submodule-error-message'Junio C Hamano2013-08-011-21/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | builtin/rm.c: consolidate error reporting for removing submodulesjc/rm-submodule-error-messageJunio C Hamano2013-07-251-21/+20
* | | | | | | | | | | | | Merge branch 'lf/echo-n-is-not-portable'Junio C Hamano2013-08-013-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Avoid using `echo -n` anywherelf/echo-n-is-not-portableLukas Fleischer2013-07-293-7/+7
* | | | | | | | | | | | | | Merge branch 'ma/hg-to-git'Junio C Hamano2013-08-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | hg-to-git: --allow-empty-message in git commitma/hg-to-gitMaurício C Antunes2013-07-231-1/+1
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jx/clean-interactive'Junio C Hamano2013-08-013-31/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-clean: implement partial matching for selectionJiang Xin2013-07-242-30/+90
| * | | | | | | | | | | | | | Documentation/git-clean: fix description for rangeJiang Xin2013-07-241-1/+1
* | | | | | | | | | | | | | | 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