summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* submodule: simplify decision tree whether to or not to fetchhv/fetch-moved-submodules-on-demandHeiko Voigt2017-10-171-37/+37
* implement fetching of moved submodulesHeiko Voigt2017-10-173-38/+138
* fetch: add test to make sure we stay backwards compatibleHeiko Voigt2017-10-081-1/+41
* Prepare for -rc1Junio C Hamano2017-10-071-3/+38
* Merge branch 'tb/ref-filter-empty-modifier'Junio C Hamano2017-10-072-1/+10
|\
| * ref-filter.c: pass empty-string as NULL to atom parserstb/ref-filter-empty-modifierTaylor Blau2017-10-052-1/+10
* | Merge branch 'ks/verify-filename-non-option-error-message-tweak'Junio C Hamano2017-10-071-1/+1
|\ \
| * | setup: update error message to be more meaningfulks/verify-filename-non-option-error-message-tweakKaartic Sivaraam2017-10-041-1/+1
| |/
* | Merge branch 'ks/branch-tweak-error-message-for-extra-args'Junio C Hamano2017-10-071-3/+3
|\ \
| * | branch: change the error messages to be more meaningfulks/branch-tweak-error-message-for-extra-argsKaartic Sivaraam2017-10-041-3/+3
| |/
* | Merge branch 'jk/ui-color-always-to-auto'Junio C Hamano2017-10-0719-113/+115
|\ \
| * \ Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-autojk/ui-color-always-to-autoJunio C Hamano2017-10-0419-99/+101
| |\ \
| | * | color: make "always" the same as "auto" in configJeff King2017-10-043-19/+28
| | * | provide --color option for all ref-filter usersJeff King2017-10-046-4/+16
| | * | t3205: use --color instead of color.branch=alwaysJeff King2017-10-041-3/+2
| | * | t3203: drop "always" color testJeff King2017-10-041-6/+0
| | * | t6006: drop "always" color config testsJeff King2017-10-041-15/+5
| | * | t7502: use diff.noprefix for --verbose testJeff King2017-10-041-2/+2
| | * | t7508: use test_terminal for color outputJeff King2017-10-041-20/+21
| | * | t3701: use test-terminal to collect color outputJeff King2017-10-041-5/+3
| | * | t4015: prefer --color to -c color.diff=alwaysJeff King2017-10-041-14/+14
| | * | test-terminal: set TERM=vt100Jeff King2017-10-047-10/+9
| * | | t7301: use test_terminal to check colorJeff King2017-10-041-2/+3
| * | | t4015: use --color with --color-movedJeff King2017-10-041-13/+12
* | | | Merge branch 'ma/builtin-unleak'Junio C Hamano2017-10-075-4/+11
|\ \ \ \
| * | | | builtin/: add UNLEAKsma/builtin-unleakMartin Ågren2017-10-025-4/+11
| | |_|/ | |/| |
* | | | Merge branch 'rb/compat-poll-fix'Junio C Hamano2017-10-071-0/+4
|\ \ \ \
| * | | | poll.c: always set revents, even if to zerorb/compat-poll-fixRandall S. Becker2017-09-291-0/+4
* | | | | Merge branch 'tg/memfixes'Junio C Hamano2017-10-073-8/+6
|\ \ \ \ \
| * | | | | sub-process: use child_process.args instead of child_process.argvtg/memfixesJohannes Sixt2017-10-041-2/+1
| * | | | | http-push: fix construction of hex value from pathThomas Gummerer2017-10-041-1/+1
| * | | | | path.c: fix uninitialized memory accessJeff King2017-10-041-5/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'sb/branch-avoid-repeated-strbuf-release'Junio C Hamano2017-10-071-2/+3
|\ \ \ \ \
| * | | | | branch: reset instead of release a strbufsb/branch-avoid-repeated-strbuf-releaseStefan Beller2017-10-041-2/+3
| |/ / / /
* | | | | Merge branch 'rs/qsort-s'Junio C Hamano2017-10-071-1/+1
|\ \ \ \ \
| * | | | | test-stringlist: avoid buffer underrun when sorting nothingrs/qsort-sRené Scharfe2017-10-041-1/+1
* | | | | | Merge branch 'jn/strbuf-doc-re-reuse'Junio C Hamano2017-10-071-2/+9
|\ \ \ \ \ \
| * | | | | | strbuf doc: reuse after strbuf_release is finejn/strbuf-doc-re-reuseJonathan Nieder2017-10-041-2/+9
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'tb/delimit-pretty-trailers-args-with-comma'Junio C Hamano2017-10-072-7/+30
|\ \ \ \ \ \
| * | | | | | pretty.c: delimit "%(trailers)" arguments with ","Taylor Blau2017-10-022-7/+30
* | | | | | | Git 2.15-rc0v2.15.0-rc0Junio C Hamano2017-10-052-1/+17
* | | | | | | Merge branch 'ar/request-pull-phrasofix'Junio C Hamano2017-10-052-3/+3
|\ \ \ \ \ \ \
| * | | | | | | request-pull: capitalise "Git" to make it a proper nounar/request-pull-phrasofixAnn T Ropea2017-10-032-3/+3
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'rs/run-command-use-alloc-array'Junio C Hamano2017-10-051-1/+1
|\ \ \ \ \ \ \
| * | | | | | | run-command: use ALLOC_ARRAYrs/run-command-use-alloc-arrayRené Scharfe2017-10-031-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'sb/git-clang-format'Junio C Hamano2017-10-051-1/+5
|\ \ \ \ \ \ \
| * | | | | | | clang-format: add a comment about the meaning/status of thesb/git-clang-formatStephan Beyer2017-10-021-1/+5
* | | | | | | | Merge branch 'rs/use-free-and-null'Junio C Hamano2017-10-051-18/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | repository: use FREE_AND_NULLrs/use-free-and-nullRené Scharfe2017-10-021-18/+9
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'rs/tag-null-pointer-arith-fix'Junio C Hamano2017-10-051-4/+4
|\ \ \ \ \ \ \ \
View Lorry Controller Status