summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | Merge branch 'rl/gitweb-blame-prev-fix'Junio C Hamano2019-10-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | gitweb: correctly store previous rev in javascript-actions modeRobert Luberda2019-10-281-1/+1
* | | | | | | | | | | | | | | | | | | Merge branch 'js/mingw-needs-hiding-fix'Junio C Hamano2019-10-301-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | mingw: avoid a buffer overrun in `needs_hiding()`Johannes Schindelin2019-10-281-0/+2
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Git 2.24-rc1v2.24.0-rc1Junio C Hamano2019-10-241-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'sg/ci-osx-gcc8-fix'Junio C Hamano2019-10-241-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | ci: fix GCC install in the Travis CI GCC OSX jobSZEDER Gábor2019-10-241-0/+1
* | | | | | | | | | | | | | | | | | | Merge branch 'ds/feature-macros'Junio C Hamano2019-10-242-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | repo-settings: read an int for index.versionDerrick Stolee2019-10-242-1/+5
* | | | | | | | | | | | | | | | | | | | Merge branch 'js/azure-ci-osx-fix'Junio C Hamano2019-10-241-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | ci(osx): use new location of the `perforce` caskJohannes Schindelin2019-10-231-0/+5
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'bw/format-patch-o-create-leading-dirs'Junio C Hamano2019-10-241-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | t4014: make output-directory tests self-containedBert Wesarg2019-10-231-5/+8
* | | | | | | | | | | | | | | | | | | | | Merge branch 'dl/submodule-set-branch'Junio C Hamano2019-10-241-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | t7419: change test_must_fail to ! for grepDenton Liu2019-10-231-3/+3
* | | | | | | | | | | | | | | | | | | | | Eleventh batchJunio C Hamano2019-10-231-0/+10
* | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/pcre2-chartables-leakfix'Junio C Hamano2019-10-233-3/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | grep: avoid leak of chartables in PCRE2Carlo Marcelo Arenas Belón2019-10-182-3/+5
| * | | | | | | | | | | | | | | | | | | | | grep: make PCRE2 aware of custom allocatorCarlo Marcelo Arenas Belón2019-10-183-1/+35
| * | | | | | | | | | | | | | | | | | | | | grep: make PCRE1 aware of custom allocatorCarlo Marcelo Arenas Belón2019-10-181-0/+8
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/smart-http-atomic-push'Junio C Hamano2019-10-235-3/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | remote-curl: pass on atomic capability to remote sidebrian m. carlson2019-10-175-3/+62
| | |_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'wb/fsmonitor-bitmap-fix'Junio C Hamano2019-10-233-5/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | fsmonitor: don't fill bitmap with entries to be removedWilliam Baker2019-10-123-5/+65
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/userdiff-dts'Junio C Hamano2019-10-235-2/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | userdiff: fix some corner cases in dts regexStephen Boyd2019-10-215-2/+33
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/progress-fix'Junio C Hamano2019-10-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | test-progress: fix test failures on big-endian systemsSZEDER Gábor2019-10-211-1/+1
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nr/diff-highlight-indent-fix'Junio C Hamano2019-10-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | diff-highlight: fix a whitespace nitNorman Rasmussen2019-10-151-1/+1
| | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mb/clarify-zsh-completion-doc'Junio C Hamano2019-10-231-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | completion: clarify installation instruction for zshMaxim Belsky2019-10-181-2/+3
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/azure-pipelines-msvc'Junio C Hamano2019-10-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | ci(visual-studio): actually run the tests in parallelJohannes Schindelin2019-10-231-1/+1
| * | | | | | | | | | | | | | | | | | | | | | ci(visual-studio): use strict compile flags, and optimizationJohannes Schindelin2019-10-231-1/+1
* | | | | | | | | | | | | | | | | | | | | | | Git 2.24-rc0v2.24.0-rc0Junio C Hamano2019-10-182-1/+18
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/remote-curl-use-argv-array'Junio C Hamano2019-10-181-13/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | remote-curl: use argv_array in parse_push()René Scharfe2019-10-151-13/+9
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/column-use-utf8-strnwidth'Junio C Hamano2019-10-181-12/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | column: use utf8_strnwidth() to strip out ANSI color escapesRené Scharfe2019-10-151-12/+1
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/http-push-simplify'Junio C Hamano2019-10-181-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | http-push: simplify deleting a list itemRené Scharfe2019-10-151-4/+4
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jj/stash-reset-only-toplevel'Junio C Hamano2019-10-183-3/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | stash: avoid recursive hard reset on submodulesJakob Jarmar2019-10-153-3/+43
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bw/format-patch-o-create-leading-dirs'Junio C Hamano2019-10-184-2/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | format-patch: create leading components of output directoryBert Wesarg2019-10-124-2/+42
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bb/compat-util-comment-fix'Junio C Hamano2019-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | git-compat-util: fix documentation syntaxBeat Bolli2019-10-121-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bb/utf8-wcwidth-cleanup'Junio C Hamano2019-10-181-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | utf8: use ARRAY_SIZE() in git_wcwidth()Beat Bolli2019-10-121-4/+2
| |/ / / / / / / / / / / / / / / / / / / / / /