summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add: document the chmod optionet/add-chmod-xThomas Gummerer2016-09-121-1/+6
* add: add --chmod=+x / --chmod=-x optionsEdward Thomson2016-06-076-20/+68
* Git 2.9-rc1v2.9.0-rc1Junio C Hamano2016-05-312-40/+49
* Merge branch 'maint'Junio C Hamano2016-05-311-0/+28
|\
| * More topics for 2.8.4Junio C Hamano2016-05-311-0/+28
| * Merge branch 'sb/submodule-deinit-all' into maintJunio C Hamano2016-05-313-10/+48
| |\
| * \ Merge branch 'bn/http-cookiefile-config' into maintJunio C Hamano2016-05-312-3/+4
| |\ \
| * \ \ Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maintJunio C Hamano2016-05-312-3/+16
| |\ \ \
| * \ \ \ Merge branch 'js/name-rev-use-oldest-ref' into maintJunio C Hamano2016-05-312-7/+14
| |\ \ \ \
* | \ \ \ \ Merge branch 'es/t1500-modernize'Junio C Hamano2016-05-311-60/+63
|\ \ \ \ \ \
| * | | | | | t1500: avoid setting environment variables outside of testses/t1500-modernizeEric Sunshine2016-05-181-9/+15
| * | | | | | t1500: avoid setting configuration options outside of testsEric Sunshine2016-05-181-19/+20
| * | | | | | t1500: avoid changing working directory outside of testsEric Sunshine2016-05-181-19/+23
| * | | | | | t1500: test_rev_parse: facilitate future test enhancementsEric Sunshine2016-05-181-27/+17
| * | | | | | t1500: be considerate to future potential testsEric Sunshine2016-05-171-3/+5
* | | | | | | Merge branch 'jk/cat-file-buffered-batch-all'Junio C Hamano2016-05-311-1/+20
|\ \ \ \ \ \ \
| * | | | | | | cat-file: default to --buffer when --batch-all-objects is usedjk/cat-file-buffered-batch-allJeff King2016-05-181-0/+4
| * | | | | | | cat-file: avoid noop calls to sha1_object_info_extendedJeff King2016-05-181-1/+16
* | | | | | | | Merge branch 'fc/fast-import-broken-marks-file'Junio C Hamano2016-05-312-2/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | fast-import: do not truncate exported marks filefc/fast-import-broken-marks-fileFelipe Contreras2016-05-172-2/+20
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Final batch before 2.9-rc1Junio C Hamano2016-05-291-0/+11
* | | | | | | | Merge branch 'ak/t0008-ksh88-workaround'Junio C Hamano2016-05-291-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | t0008: 4 tests fail with ksh88ak/t0008-ksh88-workaroundArmin Kunaschik2016-05-201-2/+2
* | | | | | | | | Merge branch 'js/t6044-use-test-seq'Junio C Hamano2016-05-291-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t6044: replace seq by test_seqjs/t6044-use-test-seqJohannes Sixt2016-05-181-2/+2
* | | | | | | | | | Merge branch 'ak/t4204-shell-portability'Junio C Hamano2016-05-291-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t4204: do not let $name variable clobberedak/t4204-shell-portabilityJunio C Hamano2016-05-241-3/+3
* | | | | | | | | | | Merge branch 'rj/log-decorate-auto'Junio C Hamano2016-05-292-4/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | log: document the --decorate=auto optionrj/log-decorate-autoRamsay Jones2016-05-272-4/+9
* | | | | | | | | | | | Merge branch 'mr/send-email-doc-gmail-2fa'Junio C Hamano2016-05-291-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation: add instructions to help setup gmail 2FAMichael Rappazzo2016-05-271-0/+13
* | | | | | | | | | | | | Merge branch 'kb/msys2-tty'Junio C Hamano2016-05-292-5/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)kb/msys2-ttyKarsten Blees2016-05-262-5/+56
* | | | | | | | | | | | | Sync with maintJunio C Hamano2016-05-262-1/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | / / / / / | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Start preparing for 2.8.4Junio C Hamano2016-05-261-0/+27
| * | | | | | | | | | | Merge branch 'jc/linkgit-fix' into maintJunio C Hamano2016-05-268-10/+10
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/travis-build-doc' into maintJunio C Hamano2016-05-262-0/+29
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/fsck-nul-in-commit' into maintJunio C Hamano2016-05-262-3/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rebase-interative-eval-fix' into maintJunio C Hamano2016-05-261-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/windows-dotgit' into maintJunio C Hamano2016-05-268-3/+147
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kf/gpg-sig-verification-doc' into maintJunio C Hamano2016-05-262-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lp/typofixes' into maintJunio C Hamano2016-05-2612-14/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/z-is-gnutar-ism' into maintJunio C Hamano2016-05-262-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'va/i18n-misc-updates' into maintJunio C Hamano2016-05-268-61/+111
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bn/config-doc-tt-varnames' into maintJunio C Hamano2016-05-261-21/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/remote-plural-ours-plus-theirs' into maintJunio C Hamano2016-05-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/t4151-ls-files-could-be-empty' into maintJunio C Hamano2016-05-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/test-seq' into maintJunio C Hamano2016-05-261-15/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/t5601-sed-fix' into maintJunio C Hamano2016-05-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'va/i18n-remote-comment-to-align' into maintJunio C Hamano2016-05-261-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \