summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* config.mak.uname: add FREAD_READS_DIRECTORIES for NonStop platformRandall S. Becker2019-02-111-0/+1
* Fix typos in translatable strings for v2.21.0Jean-Noël Avila2019-02-113-4/+4
* Seventh batch for 2.21Junio C Hamano2019-02-081-1/+13
* Merge branch 'js/mingw-host-cpu'Junio C Hamano2019-02-081-0/+19
|\
| * mingw: fix CPU reporting in `git version --build-options`Johannes Schindelin2019-02-071-0/+19
* | Merge branch 'js/fuzz-commit-graph-update'Junio C Hamano2019-02-082-0/+5
|\ \
| * | object: fix leak of shallow_statJosh Steadmon2019-02-071-0/+2
| * | fuzz-commit-graph: initialize repo objectJosh Steadmon2019-02-071-0/+3
* | | Merge branch 'kl/pretty-doc-markup-fix'Junio C Hamano2019-02-081-1/+1
|\ \ \
| * | | doc: prevent overflowing <code> tag in rendered HTMLKatrin Leinweber2019-02-071-1/+1
| | |/ | |/|
* | | Merge branch 'sg/ci-parallel-build'Junio C Hamano2019-02-081-3/+6
|\ \ \
| * | | ci: clear and mark MAKEFLAGS exported just onceJunio C Hamano2019-02-071-3/+6
| * | | ci: make sure we build Git parallelSZEDER Gábor2019-02-071-1/+1
| | |/ | |/|
* | | Merge branch 'ld/git-p4-remove-flakey-test'Junio C Hamano2019-02-081-27/+0
|\ \ \
| * | | git-p4: remove ticket expiry testLuke Diamand2019-02-061-27/+0
| | |/ | |/|
* | | Merge branch 'js/rebase-i-redo-exec-fix'Junio C Hamano2019-02-084-36/+0
|\ \ \
| * | | Revert "rebase: introduce a shortcut for --reschedule-failed-exec"Johannes Schindelin2019-02-064-36/+0
* | | | Merge branch 'nd/checkout-noisy-unmerge'Junio C Hamano2019-02-081-7/+12
|\ \ \ \
| * | | | checkout: count and print -m paths separatelyNguyễn Thái Ngọc Duy2019-02-061-3/+8
| * | | | checkout: update count-checkouts messagesNguyễn Thái Ngọc Duy2019-02-061-4/+4
* | | | | Merge branch 'js/smart-http-detect-remote-error'Junio C Hamano2019-02-085-43/+70
|\ \ \ \ \
| * | | | | t5551: test server-side ERR packetJosh Steadmon2019-02-064-0/+13
| * | | | | remote-curl: tighten "version 2" check for smart-httpJeff King2019-02-061-1/+1
| * | | | | remote-curl: refactor smart-http discoveryJeff King2019-02-061-43/+57
* | | | | | Merge branch 'ds/coverage-prove'Junio C Hamano2019-02-081-0/+5
|\ \ \ \ \ \
| * | | | | | Makefile: add coverage-prove targetDerrick Stolee2019-01-291-0/+5
* | | | | | | Merge branch 'tz/gpg-test-fix'Junio C Hamano2019-02-081-2/+1
|\ \ \ \ \ \ \
| * | | | | | | t/lib-gpg: drop redundant killing of gpg-agentTodd Zullinger2019-02-081-1/+0
| * | | | | | | t/lib-gpg: quote path to ${GNUPGHOME}/trustlist.txtTodd Zullinger2019-02-081-1/+1
* | | | | | | | Merge branch 'os/rebase-runs-post-checkout-hook'Junio C Hamano2019-02-081-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | t5403: correct bash ambiguous redirect error in subtest 8 by quoting $GIT_DIRRandall S. Becker2019-02-081-1/+1
* | | | | | | | | .mailmap: map Clemens Buchacher's mail addressesJohannes Schindelin2019-02-081-0/+2
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Git 2.21-rc0v2.21.0-rc0Junio C Hamano2019-02-062-8/+105
* | | | | | | | Merge branch 'jk/add-ignore-errors-bit-assignment-fix'Junio C Hamano2019-02-061-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | add_to_index(): convert forgotten HASH_RENORMALIZE checkJeff King2019-02-061-1/+1
* | | | | | | | | Merge branch 'rj/sparse-flags'Junio C Hamano2019-02-062-6/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Makefile: improve SPARSE_FLAGS customisationRamsay Jones2019-02-051-5/+9
| * | | | | | | | | config.mak.uname: remove obsolete SPARSE_FLAGS settingRamsay Jones2019-02-051-1/+0
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'bc/fetch-pack-clear-alternate-shallow'Junio C Hamano2019-02-061-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fetch-pack: clear alternate shallow in one more placebrian m. carlson2019-02-061-0/+2
| * | | | | | | | | fetch-pack: clear alternate shallow when completebrian m. carlson2019-02-041-0/+3
* | | | | | | | | | Merge branch 'ma/doc-diff-usage-fix'Junio C Hamano2019-02-061-3/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | doc-diff: don't `cd_to_toplevel`Martin Ågren2019-02-041-3/+2
* | | | | | | | | | | Merge branch 'ab/diff-tree-doc-fix'Junio C Hamano2019-02-061-50/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | diff-tree doc: correct & remove wrong documentationÆvar Arnfjörð Bjarmason2019-02-041-50/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ss/describe-dirty-in-the-right-directory'Junio C Hamano2019-02-062-0/+40
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t6120: test for describe with a bare repositorySebastian Staudt2019-02-041-0/+6
| * | | | | | | | | | | describe: setup working tree for --dirtySebastian Staudt2019-02-042-0/+34
* | | | | | | | | | | | Merge branch 'sg/travis-osx-brew-breakage-workaround'Junio C Hamano2019-02-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | travis-ci: make the OSX build jobs' 'brew update' more quietSZEDER Gábor2019-02-041-1/+1
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |