summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* object-name: explicitly handle OBJ_BAD in show_ambiguous_object()Ævar Arnfjörð Bjarmason2022-01-272-3/+13
* object-name tests: add tests for ambiguous object blind spotsÆvar Arnfjörð Bjarmason2022-01-271-0/+82
* Sync with 2.34.1Junio C Hamano2021-11-241-0/+23
|\
| * Git 2.34.1v2.34.1Junio C Hamano2021-11-243-2/+25
| * Merge branch 'jc/save-restore-terminal-revert' into maintJunio C Hamano2021-11-231-8/+0
| |\
| * \ Merge branch 'ds/add-rm-with-sparse-index' into maintJunio C Hamano2021-11-232-49/+22
| |\ \
| * \ \ Merge branch 'ab/update-submitting-patches' into maintJunio C Hamano2021-11-231-2/+2
| |\ \ \
| * \ \ \ Merge branch 'ev/pull-already-up-to-date-is-noop' into maintJunio C Hamano2021-11-232-2/+10
| |\ \ \ \
| * \ \ \ \ Merge branch 'hm/paint-hits-in-log-grep' into maintJunio C Hamano2021-11-232-52/+2
| |\ \ \ \ \
* | | | | | | A bit more regression fixesJunio C Hamano2021-11-231-0/+9
* | | | | | | Merge branch 'jc/save-restore-terminal-revert'Junio C Hamano2021-11-231-8/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Revert "editor: save and reset terminal after calling EDITOR"Junio C Hamano2021-11-231-8/+0
* | | | | | | Merge branch 'ds/add-rm-with-sparse-index'Junio C Hamano2021-11-232-49/+22
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | dir: revert "dir: select directories correctly"Derrick Stolee2021-11-222-49/+22
* | | | | | | 0th batch for early fixesJunio C Hamano2021-11-223-2/+27
* | | | | | | Merge branch 'ab/update-submitting-patches'Junio C Hamano2021-11-221-2/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | SubmittingPatches: fix Asciidoc syntax in "GitHub CI" sectionPhilippe Blain2021-11-141-2/+2
* | | | | | | Merge branch 'ev/pull-already-up-to-date-is-noop'Junio C Hamano2021-11-222-2/+10
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | pull: should be noop when already-up-to-dateErwin Villejo2021-11-182-2/+10
* | | | | | | Merge branch 'hm/paint-hits-in-log-grep'Junio C Hamano2021-11-222-52/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Revert "grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data"Junio C Hamano2021-11-192-52/+2
* | | | | | Git 2.34v2.34.0Junio C Hamano2021-11-152-5/+3
* | | | | | Merge tag 'l10n-2.34.0-rnd3.1' of git://github.com/git-l10n/git-poJunio C Hamano2021-11-1517-61128/+63643
|\ \ \ \ \ \
| * | | | | | l10n: pl: 2.34.0 round 3Arusekk2021-11-141-92/+96
| * | | | | | l10n: it: fix typos found by git-po-helperJiang Xin2021-11-141-3/+3
| * | | | | | l10n: ko: fix typos found by git-po-helperJiang Xin2021-11-141-5/+5
| * | | | | | l10n: Update Catalan translationJordi Mas2021-11-131-52/+41
| * | | | | | Merge branch 'po-id' of github.com:bagasme/git-poJiang Xin2021-11-131-307/+196
| |\ \ \ \ \ \
| | * | | | | | l10n: po-id for 2.34 (round 3)Bagas Sanjaya2021-11-131-307/+196
| * | | | | | | Merge branch 'master' of github.com:ruester/git-po-deJiang Xin2021-11-131-4264/+4119
| |\ \ \ \ \ \ \
| | * | | | | | | l10n: de.po: Update German translation for Git v2.34.0Matthias Rüster2021-11-121-4264/+4119
| * | | | | | | | l10n: bg.po: Updated Bulgarian translation (5211t)Alexander Shopov2021-11-121-101/+104
| |/ / / / / / /
| * | | | | | | l10n: sv.po: Update Swedish translation (5211t0f0)Peter Krefting2021-11-111-93/+97
| * | | | | | | l10n: vi(5211t): Translation for v2.34.0 rd3Tran Ngoc Quan2021-11-111-101/+107
| * | | | | | | Merge branch 'l10n/zh_TW/211111' of github.com:l10n-tw/git-poJiang Xin2021-11-111-93/+97
| |\ \ \ \ \ \ \
| | * | | | | | | l10n: zh_TW.po: v2.34.0 round 3 (0 untranslated)Yi-Jyun Pan2021-11-101-93/+97
| | |/ / / / / /
| * | | | | | | Merge branch 'fr_v2.34.0_rnd3' of github.com:jnavila/gitJiang Xin2021-11-111-93/+97
| |\ \ \ \ \ \ \
| | * | | | | | | l10n: fr: v2.34.0 rnd 3Jean-Noël Avila2021-11-101-93/+97
| | |/ / / / / /
| * | | | | | | Merge branch 'tr-2-34-r3' of github.com:bitigchi/git-poJiang Xin2021-11-111-93/+97
| |\ \ \ \ \ \ \
| | * | | | | | | l10n: tr: v2.34.0 round 3Emir Sarı2021-11-101-93/+97
| | |/ / / / / /
| * / / / / / / l10n: zh_CN: v2.34.0 round 3Fangyi Zhou2021-11-101-94/+98
| |/ / / / / /
| * | | | | | Merge branch 'master' of github.com:alshopov/git-poJiang Xin2021-11-101-4218/+4107
| |\ \ \ \ \ \
| | * | | | | | l10n: bg.po: Updated Bulgarian translation (5210t)Alexander Shopov2021-11-061-4218/+4107
| * | | | | | | l10n: git.pot: v2.34.0 round 3 (1 new)Jiang Xin2021-11-101-92/+96
| * | | | | | | Merge branch 'master' of github.com:git/gitJiang Xin2021-11-1012-20/+65
| |\ \ \ \ \ \ \
| * | | | | | | | l10n: pl: 2.34.0 round 2Arusekk2021-11-091-254/+251
| * | | | | | | | l10n: vi(5210t): Translation for v2.34.0 rd2Tran Ngoc Quan2021-11-081-4239/+4588
| * | | | | | | | l10n: es: 2.34.0 round 2Christopher Diaz Riveros2021-11-081-4579/+5004
| * | | | | | | | l10n: Update Catalan translationJordi Mas2021-11-061-6/+6
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'pt-PT' of github.com:git-l10n-pt-PT/git-poJiang Xin2021-11-061-2189/+1528
| |\ \ \ \ \ \ \