summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use "working tree" instead of "working directory" for git statuslv/status-say-working-tree-not-directoryLars Vogel2016-06-091-1/+1
* Git 2.9-rc2v2.9.0-rc2Junio C Hamano2016-06-062-26/+7
* Sync with 2.8.4Junio C Hamano2016-06-062-1/+16
|\
| * Git 2.8.4v2.8.4Junio C Hamano2016-06-064-3/+18
| * Merge branch 'kb/msys2-tty' into maintJunio C Hamano2016-06-062-5/+56
| |\
| * \ Merge branch 'da/difftool' into maintJunio C Hamano2016-06-062-2/+30
| |\ \
| * \ \ Merge branch 'tb/core-eol-fix' into maintJunio C Hamano2016-06-064-189/+141
| |\ \ \
| * \ \ \ Merge branch 'ar/diff-args-osx-precompose' into maintJunio C Hamano2016-06-065-0/+47
| |\ \ \ \
* | \ \ \ \ Merge branch 'sb/submodule-helper-relative-path'Junio C Hamano2016-06-062-43/+20
|\ \ \ \ \ \
| * | | | | | submodule: remove bashism from shell scriptsb/submodule-helper-relative-pathStefan Beller2016-06-012-43/+20
* | | | | | | Merge branch 'sb/submodule-helper-list-signal-unmatch-via-exit-status'Junio C Hamano2016-06-062-7/+17
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | submodule--helper: offer a consistent APIsb/submodule-helper-list-signal-unmatch-via-exit-statusStefan Beller2016-06-012-7/+17
* | | | | | | Almost ready for 2.9-rc2Junio C Hamano2016-06-031-0/+19
* | | | | | | Merge branch 'rs/apply-name-terminate'Junio C Hamano2016-06-031-2/+2
|\ \ \ \ \ \ \
| * | | | | | | apply: remove unused parameters from name_terminate()rs/apply-name-terminateRené Scharfe2016-05-291-2/+2
* | | | | | | | Merge branch 'rs/patch-id-use-skip-prefix'Junio C Hamano2016-06-031-13/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | patch-id: use starts_with() and skip_prefix()rs/patch-id-use-skip-prefixRené Scharfe2016-05-291-13/+10
| |/ / / / / / /
* | | | | | | | Merge branch 'bd/readme.markdown-more'Junio C Hamano2016-06-031-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | README.md: format CLI commands with code syntaxbd/readme.markdown-moreBenjamin Dopplinger2016-05-311-5/+5
* | | | | | | | | Merge branch 'mm/makefile-developer-can-be-in-config-mak'Junio C Hamano2016-06-031-8/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Makefile: add $(DEVELOPER_CFLAGS) variablemm/makefile-developer-can-be-in-config-makMatthieu Moy2016-06-011-9/+10
| * | | | | | | | | Makefile: move 'ifdef DEVELOPER' after config.mak* inclusionMatthieu Moy2016-05-311-12/+12
* | | | | | | | | | Merge branch 'em/man-bold-literal'Junio C Hamano2016-06-031-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation: bold literals in manem/man-bold-literalErwan Mathoniere2016-05-311-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'pa/cherry-pick-doc-typo'Junio C Hamano2016-06-031-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-cherry-pick.txt: correct a small typopa/cherry-pick-doc-typoPablo Santiago Blum de Aguiar2016-05-291-1/+1
* | | | | | | | | | | Merge branch 'mr/send-email-doc-gmail-2fa'Junio C Hamano2016-06-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation/git-send-email: fix typo in gmail 2FA sectionmr/send-email-doc-gmail-2faSZEDER Gábor2016-06-011-1/+1
* | | | | | | | | | | | Merge branch 'js/rebase-i-dedup-call-to-rerere'Junio C Hamano2016-06-031-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rebase -i: remove an unnecessary 'rerere' invocationjs/rebase-i-dedup-call-to-rerereJohannes Sixt2016-05-311-1/+0
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'js/perf-rebase-i'Junio C Hamano2016-06-031-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | perf: make the tests work without a worktreejs/perf-rebase-iRené Scharfe2016-05-311-1/+4
* | | | | | | | | | | | 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
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |