summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-am: add am.threeWay config variablerl/am-3way-configRemi Lespinet2015-06-044-2/+41
* t4150-am: refactor am -3 testsRemi Lespinet2015-06-041-15/+11
* git-am.sh: fix initialization of the threeway variableRemi Lespinet2015-06-041-0/+1
* Git 2.4v2.4.0Junio C Hamano2015-04-302-1/+6
* Merge branch 'mh/multimail-renewal'Junio C Hamano2015-04-282-24/+25
|\
| * Update git-multimail to version 1.0.2mh/multimail-renewalMichael Haggerty2015-04-282-24/+25
* | Merge branch 'mg/show-notes-doc'Junio C Hamano2015-04-281-2/+2
|\ \
| * | rev-list-options.txt: complete sentence about notes matchingmg/show-notes-docMichael J Gruber2015-04-171-2/+2
* | | Merge branch 'nd/versioncmp-prereleases'Junio C Hamano2015-04-281-4/+7
|\ \ \
| * | | git tag: mention versionsort.prereleaseSuffix in manpagend/versioncmp-prereleasesMichael Haggerty2015-04-231-4/+7
* | | | Merge branch 'mg/status-v-v'Junio C Hamano2015-04-281-0/+8
|\ \ \ \
| * | | | status: document the -v/--verbose optionmg/status-v-vMichael Haggerty2015-04-231-0/+8
* | | | | Sync with 2.3.7Junio C Hamano2015-04-272-1/+23
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Git 2.3.7v2.3.7Junio C Hamano2015-04-274-3/+25
| * | | | Merge branch 'tb/connect-ipv6-parse-fix' into maintJunio C Hamano2015-04-273-16/+24
| |\ \ \ \
| * \ \ \ \ Merge branch 'ma/bash-completion-leaking-x' into maintJunio C Hamano2015-04-271-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/push-cert' into maintJunio C Hamano2015-04-271-0/+23
| |\ \ \ \ \ \
* | | | | | | | RelNotes: wordsmithingMichael Haggerty2015-04-231-164/+172
* | | | | | | | RelNotes: refer to the rebase -i "todo list", not "insn sheet"Michael Haggerty2015-04-231-2/+2
* | | | | | | | RelNotes: correct name of versionsort.prereleaseSuffixMichael Haggerty2015-04-231-2/+2
* | | | | | | | Git 2.4.0-rc3v2.4.0-rc3Junio C Hamano2015-04-221-1/+1
* | | | | | | | Sync with maintJunio C Hamano2015-04-212-1/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Git 2.3.6v2.3.6Junio C Hamano2015-04-214-3/+17
| * | | | | | | Merge branch 'jk/colors' into maintJunio C Hamano2015-04-211-2/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/test-annoyances' into maintJunio C Hamano2015-04-215-15/+24
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'pt/enter-repo-comment-fix' into maintJunio C Hamano2015-04-211-8/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jz/gitweb-conf-doc-fix' into maintJunio C Hamano2015-04-211-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/cherry-pick-docfix' into maintJunio C Hamano2015-04-211-1/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'iu/fix-parse-options-h-comment' into maintJunio C Hamano2015-04-211-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jg/cguide-we-cannot-count' into maintJunio C Hamano2015-04-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-corruption-post-mortem' into maintJunio C Hamano2015-04-211-0/+237
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maintJunio C Hamano2015-04-211-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | RelNotes: "merge --quiet" change has been revertedJunio C Hamano2015-04-211-4/+0
* | | | | | | | | | | | | | | | | Hopefully the last batch for 2.4Junio C Hamano2015-04-201-1/+18
* | | | | | | | | | | | | | | | | Merge branch 'ps/grep-help-all-callback-arg'Junio C Hamano2015-04-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | grep: correctly initialize help-all optionps/grep-help-all-callback-argPatrick Steinhardt2015-04-121-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'tb/connect-ipv6-parse-fix'Junio C Hamano2015-04-203-16/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | connect.c: ignore extra colon after hostnametb/connect-ipv6-parse-fixTorsten Bögershausen2015-04-083-16/+24
* | | | | | | | | | | | | | | | | | Merge branch 'va/fix-git-p4-tests'Junio C Hamano2015-04-201-12/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t9814: guarantee only one source exists in git-p4 copy testsVitor Antunes2015-04-121-15/+31
| * | | | | | | | | | | | | | | | | | git-p4: fix copy detection testVitor Antunes2015-03-281-1/+4
| * | | | | | | | | | | | | | | | | | t9814: fix broken shell syntax in git-p4 rename testVitor Antunes2015-03-281-2/+2
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/push-cert'Junio C Hamano2015-04-201-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | push --signed: tighten what the receiving end can ask to signjc/push-certJunio C Hamano2015-04-021-0/+23
* | | | | | | | | | | | | | | | | | | Merge branch 'ma/bash-completion-leaking-x'Junio C Hamano2015-04-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | completion: fix global bash variable leak on __gitcompappendma/bash-completion-leaking-xMárcio Almada2015-04-121-1/+1
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-guiJunio C Hamano2015-04-1810-1773/+4690
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | git-gui: set version 0.20gitgui-0.20.0Pat Thoyts2015-04-181-1/+1
| * | | | | | | | | | | | | | | | | | git-gui: sv.po: Update Swedish translation (547t0f0u)Peter Krefting2015-04-181-1431/+1562
| * | | | | | | | | | | | | | | | | | git-gui i18n: Updated Bulgarian translation (547t,0f,0u)Alexander Shopov2015-04-181-1498/+1528