summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | l10n: git.pot: v2.20.0 round 1 (254 new, 27 removed)Jiang Xin2018-11-201-2969/+4032
* | | | | | | | | | Merge branch 'es/format-patch-range-diff-fix-fix'Junio C Hamano2018-12-043-9/+33
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | range-diff: always pass at least minimal diff optionsMartin Ågren2018-12-043-9/+33
* | | | | | | | | | | Merge branch 'en/rebase-consistency'Junio C Hamano2018-12-041-13/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rebase docs: fix incorrect format of the section Behavioral DifferencesJohannes Sixt2018-12-041-13/+17
* | | | | | | | | | | | RelNotes 2.20: drop spurious double quoteMartin Ågren2018-12-041-1/+1
* | | | | | | | | | | | RelNotes 2.20: clarify sentenceMartin Ågren2018-12-041-1/+1
* | | | | | | | | | | | RelNotes 2.20: move some items between sectionsMartin Ågren2018-12-041-13/+13
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Git 2.20-rc2v2.20.0-rc2Junio C Hamano2018-12-012-1/+20
* | | | | | | | | | | Merge branch 'gh/diff-raw-has-no-ellipses'Junio C Hamano2018-12-011-8/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | doc: update diff-format.txt for removed ellipses in --rawGreg Hurrell2018-11-261-8/+8
* | | | | | | | | | | | Merge branch 'ss/msvc-strcasecmp'Junio C Hamano2018-12-011-7/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | msvc: directly use MS version (_stricmp) of strcasecmpSven Strickroth2018-11-201-7/+1
* | | | | | | | | | | | | Merge branch 'sg/test-BUG'Junio C Hamano2018-12-017-23/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | tests: send "bug in the test script" errors to the script's stderrSZEDER Gábor2018-11-207-23/+26
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'sg/test-cmp-rev'Junio C Hamano2018-12-011-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | test-lib-functions: make 'test_cmp_rev' more informative on failureSZEDER Gábor2018-11-201-3/+17
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'ab/push-example-in-doc'Junio C Hamano2018-12-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | push: change needlessly ambiguous example in errorÆvar Arnfjörð Bjarmason2018-11-141-2/+2
* | | | | | | | | | | | | | Merge branch 'rt/rebase-in-c-message-fix'Junio C Hamano2018-12-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | builtin/rebase.c: remove superfluous space in messagesRalf Thielow2018-12-011-2/+2
* | | | | | | | | | | | | | | Merge branch 'sg/daemon-test-signal-fix'Junio C Hamano2018-12-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t/lib-git-daemon: fix signal checkingSZEDER Gábor2018-11-271-1/+1
* | | | | | | | | | | | | | | | Merge branch 'ma/reset-doc-rendering-fix'Junio C Hamano2018-12-011-130/+147
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git-reset.txt: render literal examples as monospaceMartin Ågren2018-11-291-65/+66
| * | | | | | | | | | | | | | | | git-reset.txt: render tables correctly under AsciidoctorMartin Ågren2018-11-291-62/+78
* | | | | | | | | | | | | | | | | Merge branch 'ab/replace-graft-with-replace-advice'Junio C Hamano2018-12-012-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | advice: don't pointlessly suggest --convert-graft-fileÆvar Arnfjörð Bjarmason2018-11-292-1/+5
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'js/rebase-stat-unrelated-fix'Junio C Hamano2018-12-013-8/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | rebase --stat: fix when rebasing to an unrelated historyJohannes Schindelin2018-11-303-8/+30
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'js/rebase-reflog-action-fix'Junio C Hamano2018-12-012-3/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | rebase: fix GIT_REFLOG_ACTION regressionJohannes Schindelin2018-11-302-3/+52
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'jc/format-patch-range-diff-fix'Junio C Hamano2018-12-015-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | / / / / / / / | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | format-patch: do not let its diff-options affect --range-diffJunio C Hamano2018-11-305-3/+17
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'ja/i18n-fix'Junio C Hamano2018-11-292-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | i18n: fix small typosJean-Noël Avila2018-11-292-2/+2
* | | | | | | | | | | | | | | | Merge branch 'nd/n18n-fix'Junio C Hamano2018-11-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | transport-helper.c: do not translate a string twiceNguyễn Thái Ngọc Duy2018-11-291-1/+1
* | | | | | | | | | | | | | | | Merge branch 'nd/per-worktree-ref-iteration'Junio C Hamano2018-11-261-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | files-backend.c: fix build error on SolarisNguyễn Thái Ngọc Duy2018-11-261-1/+2
* | | | | | | | | | | | | | | | | Merge branch 'tb/clone-case-smashing-warning-test'Junio C Hamano2018-11-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t5601-99: Enable colliding file detection for MINGWTorsten Bögershausen2018-11-241-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'jk/t5562-perl-path-fix'Junio C Hamano2018-11-262-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | t5562: fix perl pathJeff King2018-11-242-1/+1
* | | | | | | | | | | | | | | | | | Git 2.20-rc1v2.20.0-rc1Junio C Hamano2018-11-212-3/+8
* | | | | | | | | | | | | | | | | | Sync with 2.19.2Junio C Hamano2018-11-211-0/+108
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Git 2.19.2v2.19.2Junio C Hamano2018-11-213-2/+110
| * | | | | | | | | | | | | | | | | Merge branch 'sg/test-rebase-editor-fix' into maintJunio C Hamano2018-11-212-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/char-may-be-unsigned' into maintJunio C Hamano2018-11-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/uploadpack-packobjectshook-fix' into maintJunio C Hamano2018-11-211-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \