2020-01-12 00:36:56 +01:00
|
|
|
# SOME DESCRIPTIVE TITLE.
|
|
|
|
|
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
|
|
|
|
# This file is distributed under the same license as the PACKAGE package.
|
|
|
|
|
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
|
|
|
|
#
|
|
|
|
|
#, fuzzy
|
|
|
|
|
msgid ""
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Project-Id-Version: PACKAGE VERSION\n"
|
|
|
|
|
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
2020-11-21 19:20:35 +01:00
|
|
|
"POT-Creation-Date: 2020-10-10 09:32+0800\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
|
|
|
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
|
|
|
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
|
|
|
|
"Language: \n"
|
|
|
|
|
"MIME-Version: 1.0\n"
|
|
|
|
|
"Content-Type: text/plain; charset=CHARSET\n"
|
|
|
|
|
"Content-Transfer-Encoding: 8bit\n"
|
|
|
|
|
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: add-interactive.c:368
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Huh (%s)?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250
|
|
|
|
|
#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526
|
|
|
|
|
#: builtin/rebase.c:1944
|
|
|
|
|
msgid "could not read index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:576 git-add--interactive.perl:269
|
|
|
|
|
#: git-add--interactive.perl:294
|
|
|
|
|
msgid "binary"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:634 git-add--interactive.perl:278
|
|
|
|
|
#: git-add--interactive.perl:332
|
|
|
|
|
msgid "nothing"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:635 git-add--interactive.perl:314
|
|
|
|
|
#: git-add--interactive.perl:329
|
|
|
|
|
msgid "unchanged"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:672 git-add--interactive.perl:643
|
|
|
|
|
msgid "Update"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:689 add-interactive.c:877
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not stage '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444
|
|
|
|
|
msgid "could not write index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:698 git-add--interactive.perl:628
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "updated %d path\n"
|
|
|
|
|
msgid_plural "updated %d paths\n"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:716 git-add--interactive.perl:678
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "note: %s is untracked now.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:721 apply.c:4127 builtin/checkout.c:295
|
|
|
|
|
#: builtin/reset.c:145
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "make_cache_entry failed for path '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:751 git-add--interactive.perl:655
|
|
|
|
|
msgid "Revert"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:767
|
|
|
|
|
msgid "Could not parse HEAD^{tree}"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:805 git-add--interactive.perl:631
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "reverted %d path\n"
|
|
|
|
|
msgid_plural "reverted %d paths\n"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:856 git-add--interactive.perl:695
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "No untracked files.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:860 git-add--interactive.perl:689
|
|
|
|
|
msgid "Add untracked"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:887 git-add--interactive.perl:625
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "added %d path\n"
|
|
|
|
|
msgid_plural "added %d paths\n"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:917
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "ignoring unmerged: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Only binary files changed.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "No changes.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:935 git-add--interactive.perl:1381
|
|
|
|
|
msgid "Patch update"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:974 git-add--interactive.perl:1794
|
|
|
|
|
msgid "Review diff"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1002
|
|
|
|
|
msgid "show paths with changes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1004
|
|
|
|
|
msgid "add working tree state to the staged set of changes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1006
|
|
|
|
|
msgid "revert staged set of changes back to the HEAD version"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1008
|
|
|
|
|
msgid "pick hunks and update selectively"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1010
|
|
|
|
|
msgid "view diff between HEAD and index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1012
|
|
|
|
|
msgid "add contents of untracked files to the staged set of changes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1020 add-interactive.c:1069
|
|
|
|
|
msgid "Prompt help:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1022
|
|
|
|
|
msgid "select a single item"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1024
|
|
|
|
|
msgid "select a range of items"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1026
|
|
|
|
|
msgid "select multiple ranges"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1028 add-interactive.c:1073
|
|
|
|
|
msgid "select item based on unique prefix"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1030
|
|
|
|
|
msgid "unselect specified items"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1032
|
|
|
|
|
msgid "choose all items"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1034
|
|
|
|
|
msgid "(empty) finish selecting"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1071
|
|
|
|
|
msgid "select a numbered item"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1075
|
|
|
|
|
msgid "(empty) select nothing"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891
|
|
|
|
|
msgid "*** Commands ***"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888
|
|
|
|
|
msgid "What now"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1136 git-add--interactive.perl:213
|
|
|
|
|
msgid "staged"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1136 git-add--interactive.perl:213
|
|
|
|
|
msgid "unstaged"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270
|
|
|
|
|
#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123
|
|
|
|
|
#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190
|
|
|
|
|
#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818
|
|
|
|
|
#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
|
|
|
|
|
#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
|
|
|
|
|
#: git-add--interactive.perl:213
|
|
|
|
|
msgid "path"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1143
|
|
|
|
|
msgid "could not refresh index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Bye.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:34 git-add--interactive.perl:1433
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Stage mode change [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:35 git-add--interactive.perl:1434
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Stage deletion [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:36 git-add--interactive.perl:1435
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Stage addition [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:37 git-add--interactive.perl:1436
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:39
|
|
|
|
|
msgid ""
|
|
|
|
|
"If the patch applies cleanly, the edited hunk will immediately be marked for "
|
|
|
|
|
"staging."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:42
|
|
|
|
|
msgid ""
|
|
|
|
|
"y - stage this hunk\n"
|
|
|
|
|
"n - do not stage this hunk\n"
|
|
|
|
|
"q - quit; do not stage this hunk or any of the remaining ones\n"
|
|
|
|
|
"a - stage this hunk and all later hunks in the file\n"
|
|
|
|
|
"d - do not stage this hunk or any of the later hunks in the file\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:56 git-add--interactive.perl:1439
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Stash mode change [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:57 git-add--interactive.perl:1440
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Stash deletion [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:58 git-add--interactive.perl:1441
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Stash addition [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:59 git-add--interactive.perl:1442
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:61
|
|
|
|
|
msgid ""
|
|
|
|
|
"If the patch applies cleanly, the edited hunk will immediately be marked for "
|
|
|
|
|
"stashing."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:64
|
|
|
|
|
msgid ""
|
|
|
|
|
"y - stash this hunk\n"
|
|
|
|
|
"n - do not stash this hunk\n"
|
|
|
|
|
"q - quit; do not stash this hunk or any of the remaining ones\n"
|
|
|
|
|
"a - stash this hunk and all later hunks in the file\n"
|
|
|
|
|
"d - do not stash this hunk or any of the later hunks in the file\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:80 git-add--interactive.perl:1445
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:81 git-add--interactive.perl:1446
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:82 git-add--interactive.perl:1447
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Unstage addition [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:83 git-add--interactive.perl:1448
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:85
|
|
|
|
|
msgid ""
|
|
|
|
|
"If the patch applies cleanly, the edited hunk will immediately be marked for "
|
|
|
|
|
"unstaging."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:88
|
|
|
|
|
msgid ""
|
|
|
|
|
"y - unstage this hunk\n"
|
|
|
|
|
"n - do not unstage this hunk\n"
|
|
|
|
|
"q - quit; do not unstage this hunk or any of the remaining ones\n"
|
|
|
|
|
"a - unstage this hunk and all later hunks in the file\n"
|
|
|
|
|
"d - do not unstage this hunk or any of the later hunks in the file\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:103 git-add--interactive.perl:1451
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:104 git-add--interactive.perl:1452
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:105 git-add--interactive.perl:1453
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:106 git-add--interactive.perl:1454
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:108 add-patch.c:176 add-patch.c:221
|
|
|
|
|
msgid ""
|
|
|
|
|
"If the patch applies cleanly, the edited hunk will immediately be marked for "
|
|
|
|
|
"applying."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:111
|
|
|
|
|
msgid ""
|
|
|
|
|
"y - apply this hunk to index\n"
|
|
|
|
|
"n - do not apply this hunk to index\n"
|
|
|
|
|
"q - quit; do not apply this hunk or any of the remaining ones\n"
|
|
|
|
|
"a - apply this hunk and all later hunks in the file\n"
|
|
|
|
|
"d - do not apply this hunk or any of the later hunks in the file\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:126 git-add--interactive.perl:1457
|
|
|
|
|
#: git-add--interactive.perl:1475
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:127 git-add--interactive.perl:1458
|
|
|
|
|
#: git-add--interactive.perl:1476
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:128 git-add--interactive.perl:1459
|
|
|
|
|
#: git-add--interactive.perl:1477
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:129 git-add--interactive.perl:1460
|
|
|
|
|
#: git-add--interactive.perl:1478
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:131 add-patch.c:154 add-patch.c:199
|
|
|
|
|
msgid ""
|
|
|
|
|
"If the patch applies cleanly, the edited hunk will immediately be marked for "
|
|
|
|
|
"discarding."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:134 add-patch.c:202
|
|
|
|
|
msgid ""
|
|
|
|
|
"y - discard this hunk from worktree\n"
|
|
|
|
|
"n - do not discard this hunk from worktree\n"
|
|
|
|
|
"q - quit; do not discard this hunk or any of the remaining ones\n"
|
|
|
|
|
"a - discard this hunk and all later hunks in the file\n"
|
|
|
|
|
"d - do not discard this hunk or any of the later hunks in the file\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:157
|
|
|
|
|
msgid ""
|
|
|
|
|
"y - discard this hunk from index and worktree\n"
|
|
|
|
|
"n - do not discard this hunk from index and worktree\n"
|
|
|
|
|
"q - quit; do not discard this hunk or any of the remaining ones\n"
|
|
|
|
|
"a - discard this hunk and all later hunks in the file\n"
|
|
|
|
|
"d - do not discard this hunk or any of the later hunks in the file\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
|
|
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:179
|
|
|
|
|
msgid ""
|
|
|
|
|
"y - apply this hunk to index and worktree\n"
|
|
|
|
|
"n - do not apply this hunk to index and worktree\n"
|
|
|
|
|
"q - quit; do not apply this hunk or any of the remaining ones\n"
|
|
|
|
|
"a - apply this hunk and all later hunks in the file\n"
|
|
|
|
|
"d - do not apply this hunk or any of the later hunks in the file\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:224
|
|
|
|
|
msgid ""
|
|
|
|
|
"y - apply this hunk to worktree\n"
|
|
|
|
|
"n - do not apply this hunk to worktree\n"
|
|
|
|
|
"q - quit; do not apply this hunk or any of the remaining ones\n"
|
|
|
|
|
"a - apply this hunk and all later hunks in the file\n"
|
|
|
|
|
"d - do not apply this hunk or any of the later hunks in the file\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:342
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not parse hunk header '%.*s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:361 add-patch.c:365
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not parse colored hunk header '%.*s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:419
|
|
|
|
|
msgid "could not parse diff"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:438
|
|
|
|
|
msgid "could not parse colored diff"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:452
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to run '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:611
|
|
|
|
|
msgid "mismatched output from interactive.diffFilter"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:612
|
|
|
|
|
msgid ""
|
|
|
|
|
"Your filter must maintain a one-to-one correspondence\n"
|
|
|
|
|
"between its input and output lines."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:785
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"expected context line #%d in\n"
|
|
|
|
|
"%.*s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:800
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"hunks do not overlap:\n"
|
|
|
|
|
"%.*s\n"
|
|
|
|
|
"\tdoes not end with:\n"
|
|
|
|
|
"%.*s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1076 git-add--interactive.perl:1117
|
|
|
|
|
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1080
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"---\n"
|
|
|
|
|
"To remove '%c' lines, make them ' ' lines (context).\n"
|
|
|
|
|
"To remove '%c' lines, delete them.\n"
|
|
|
|
|
"Lines starting with %c will be removed.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
|
|
|
|
|
#: add-patch.c:1094 git-add--interactive.perl:1131
|
|
|
|
|
msgid ""
|
|
|
|
|
"If it does not apply cleanly, you will be given an opportunity to\n"
|
|
|
|
|
"edit again. If all lines of the hunk are removed, then the edit is\n"
|
|
|
|
|
"aborted and the hunk is left unchanged.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1127
|
|
|
|
|
msgid "could not parse hunk header"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1172
|
|
|
|
|
msgid "'git apply --cached' failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: do not translate [y/n]
|
|
|
|
|
#. The program will only accept that input at this point.
|
|
|
|
|
#. Consider translating (saying "no" discards!) as
|
|
|
|
|
#. (saying "n" for "no" discards!) if the translation
|
|
|
|
|
#. of the word "no" does not start with n.
|
|
|
|
|
#.
|
|
|
|
|
#. TRANSLATORS: do not translate [y/n]
|
|
|
|
|
#. The program will only accept that input
|
|
|
|
|
#. at this point.
|
|
|
|
|
#. Consider translating (saying "no" discards!) as
|
|
|
|
|
#. (saying "n" for "no" discards!) if the translation
|
|
|
|
|
#. of the word "no" does not start with n.
|
|
|
|
|
#: add-patch.c:1241 git-add--interactive.perl:1244
|
|
|
|
|
msgid ""
|
|
|
|
|
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1284
|
|
|
|
|
msgid "The selected hunks do not apply to the index!"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1285 git-add--interactive.perl:1348
|
|
|
|
|
msgid "Apply them to the worktree anyway? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1292 git-add--interactive.perl:1351
|
|
|
|
|
msgid "Nothing was applied.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1349
|
|
|
|
|
msgid ""
|
|
|
|
|
"j - leave this hunk undecided, see next undecided hunk\n"
|
|
|
|
|
"J - leave this hunk undecided, see next hunk\n"
|
|
|
|
|
"k - leave this hunk undecided, see previous undecided hunk\n"
|
|
|
|
|
"K - leave this hunk undecided, see previous hunk\n"
|
|
|
|
|
"g - select a hunk to go to\n"
|
|
|
|
|
"/ - search for a hunk matching the given regex\n"
|
|
|
|
|
"s - split the current hunk into smaller hunks\n"
|
|
|
|
|
"e - manually edit the current hunk\n"
|
|
|
|
|
"? - print help\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1511 add-patch.c:1521
|
|
|
|
|
msgid "No previous hunk"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1516 add-patch.c:1526
|
|
|
|
|
msgid "No next hunk"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1532
|
|
|
|
|
msgid "No other hunks to goto"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1543 git-add--interactive.perl:1608
|
|
|
|
|
msgid "go to which hunk (<ret> to see more)? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1544 git-add--interactive.perl:1610
|
|
|
|
|
msgid "go to which hunk? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1555
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid number: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1560
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Sorry, only %d hunk available."
|
|
|
|
|
msgid_plural "Sorry, only %d hunks available."
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1569
|
|
|
|
|
msgid "No other hunks to search"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1575 git-add--interactive.perl:1663
|
|
|
|
|
msgid "search for regex? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1590
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Malformed search regexp %s: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1607
|
|
|
|
|
msgid "No hunk matches the given pattern"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1614
|
|
|
|
|
msgid "Sorry, cannot split this hunk"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1618
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Split into %d hunks."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1622
|
|
|
|
|
msgid "Sorry, cannot edit this hunk"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: add-patch.c:1674
|
|
|
|
|
msgid "'git apply' failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: advice.c:140
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Disable this message with \"git config advice.%s false\""
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: advice.c:156
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%shint: %.*s%s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: advice.c:247
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Cherry-picking is not possible because you have unmerged files."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: advice.c:249
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Committing is not possible because you have unmerged files."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: advice.c:251
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Merging is not possible because you have unmerged files."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: advice.c:253
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Pulling is not possible because you have unmerged files."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: advice.c:255
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Reverting is not possible because you have unmerged files."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: advice.c:257
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "It is not possible to %s because you have unmerged files."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: advice.c:265
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
|
|
|
|
|
"as appropriate to mark resolution and make a commit."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: advice.c:273
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Exiting because of an unresolved conflict."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: advice.c:278 builtin/merge.c:1349
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You have not concluded your merge (MERGE_HEAD exists)."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: advice.c:280
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Please, commit your changes before merging."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: advice.c:281
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Exiting because of unfinished merge."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: advice.c:287
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Note: switching to '%s'.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"You are in 'detached HEAD' state. You can look around, make experimental\n"
|
|
|
|
|
"changes and commit them, and you can discard any commits you make in this\n"
|
|
|
|
|
"state without impacting any branches by switching back to a branch.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"If you want to create a new branch to retain commits you create, you may\n"
|
|
|
|
|
"do so (now or later) by using -c with the switch command. Example:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git switch -c <new-branch-name>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Or undo this operation with:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git switch -\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Turn off this advice by setting config variable advice.detachedHead to "
|
|
|
|
|
"false\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: alias.c:50
|
|
|
|
|
msgid "cmdline ends with \\"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: alias.c:51
|
|
|
|
|
msgid "unclosed quote"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: apply.c:69
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized whitespace option '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: apply.c:85
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized whitespace ignore option '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: apply.c:135
|
|
|
|
|
msgid "--reject and --3way cannot be used together."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: apply.c:137
|
|
|
|
|
msgid "--cached and --3way cannot be used together."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: apply.c:140
|
|
|
|
|
msgid "--3way outside a repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: apply.c:151
|
|
|
|
|
msgid "--index outside a repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: apply.c:154
|
|
|
|
|
msgid "--cached outside a repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: apply.c:801
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot prepare timestamp regexp %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: apply.c:810
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "regexec returned %d for input: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: apply.c:884
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to find filename in patch at line %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: apply.c:922
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: apply.c:928
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: apply.c:929
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: apply.c:934
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git apply: bad git-diff - expected /dev/null on line %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96
af6b65d45e Git 2.26.2
7397ca3373 Git 2.25.4
b86a4be245 Git 2.24.3
f2771efd07 Git 2.23.3
c9808fa014 Git 2.22.4
9206d27eb5 Git 2.21.3
041bc65923 Git 2.20.4
76b54ee9b9 Git 2.19.5
ba6f0905fd Git 2.18.4
df5be6dc3f Git 2.17.5
1a3609e402 fsck: reject URL with empty host in .gitmodules
e7fab62b73 credential: treat URL with empty scheme as invalid
c44088ecc4 credential: treat URL without scheme as invalid
fe29a9b7b0 credential: die() when parsing invalid urls
a2b26ffb1a fsck: convert gitmodules url to URL passed to curl
8ba8ed568e credential: refuse to operate when missing host or protocol
24036686c4 credential: parse URL without host as empty host, not unset
73aafe9bc2 t0300: use more realistic inputs
a88dbd2f8c t0300: make "quit" helper more realistic
de49261b05 Git 2.26.1
274b9cc253 Git 2.26
55a7568606 Merge branch 'en/rebase-backend'
c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git
1557364fb4 l10n: tr.po: change file mode to 644
2da1b05674 t3419: prevent failure when run with EXPENSIVE
1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0
5804c6ec40 l10n: de.po: add missing space
98cedd0233 Merge https://github.com/prati0100/git-gui
4914ba4bcf l10n: tr: Fix a couple of ambiguities
a5728022e0 Merge branch 'py/remove-tcloo'
7fcb965970 RelNotes/2.26.0: fix various typos
f0c03bcf95 l10n: Update Catalan translation
67b0a24910 Git 2.25.3
be8661a328 Sync with Git 2.25.2
0822e66b5d Git 2.25.2
65588b0b2e unicode: update the width tables to Unicode 13.0
7be274b0ff Merge branch 'js/ci-windows-update' into maint
9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint
221887a492 Merge branch 'jk/doc-credential-helper' into maint
32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint
fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint
618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint
50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint
fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint
41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint
2d7247af6f Merge branch 'am/mingw-poll-fix' into maint
4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint
76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint
569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint
16a4bf1035 Merge branch 'en/check-ignore' into maint
3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint
56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint
1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint
7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint
fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint
a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint
93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint
dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint
758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint
f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint
506223f9c5 Git 2.24.2
17a02783d8 Git 2.23.2
69fab82147 Git 2.22.3
fe22686494 Git 2.21.2
d1259ce117 Git 2.20.3
a5979d7009 Git 2.19.4
21a3e5016b Git 2.18.3
c42c0f1297 Git 2.17.4
d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u)
3891a84ccd git-gui: create a new namespace for chord script evaluation
8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5
440e7442d1 l10n: zh_CN: Revise v2.26.0 translation
2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2
6c85aac65f Git 2.26-rc2
74f172e39e Merge branch 'en/test-cleanup'
e96327c947 Merge branch 'es/outside-repo-errmsg-hints'
ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0
15fa8d9667 l10n: vi: fix translation + grammar
5c20398699 prefix_path: show gitdir if worktree unavailable
1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated)
c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated)
a4a2f64642 Merge branch 'js/askpass-coerce-utf8'
850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows
d769dcc5cd Merge branch 'py/blame-status-error'
70e24186c0 t6022, t6046: fix flaky files-are-updated checks
30e9940356 Hopefully the final batch before -rc2
b4f0038525 Merge branch 'en/rebase-backend'
25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master
07259e74ec fsck: detect gitmodules URLs with embedded newlines
c716fe4bd9 credential: detect unrepresentable values when parsing urls
17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr
9a6bbee800 credential: avoid writing values with newlines
17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2
1afe18a3bb l10n: es: 2.26.0 round#2
5ab9217a3c Merge branch of github.com:alshopov/git-po into master
c6713676d6 Merge branch of github.com:bitigchi/git-po into master
b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t)
2713dec02d l10n: tr: v2.26.0 round 2
c9ef57cc3a l10n: fr : v2.26.0 rnd 2
120b1eb731 git-rebase.txt: highlight backend differences with commit rewording
9a1b7474d6 sequencer: clear state upon dropping a become-empty commit
937d143630 i18n: unmark a message in rebase.c
a56d361f66 Merge branch 'ds/sparse-add'
5fa9169ced Merge branch 'dr/push-remote-ref-update'
cdef998b46 Merge branch 'jc/doc-single-h-is-for-help'
051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed)
52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master
9643441983 l10n: tr: Add glossary for Turkish translations
438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv
fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git
2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u)
dd2c269652 l10n: tr: Add Turkish translations
8f4f099f8b l10n: tr: Add Turkish translation team info
b4374e96c8 Git 2.26-rc1
4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch'
3658d77f8e Merge branch 'hd/show-one-mergetag-fix'
6125104b88 Merge branch 'rt/format-zero-length-fix'
1ac37deba2 Merge branch 'am/mingw-poll-fix'
cf372dc815 Merge branch 'en/test-cleanup'
d1075adfdf Merge branch 'en/merge-path-collision'
a4fd114ffc Merge branch 'kk/complete-diff-color-moved'
a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file'
0e0d717537 Merge branch 'pb/am-show-current-patch'
9b7f726dfc Merge branch 'am/pathspec-f-f-more'
4605a73073 t1091: don't grep for `strerror()` string
4d9c2902a1 l10n: fr v2.26.0 rnd1
ad182bee3f Merge branch of github.com:alshopov/git-po into master
23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1
98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t)
f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed)
76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po
076cbdcd73 Git 2.26-rc0
0d65f3fb1a t5537: adjust test_oid label
e63cefb024 Merge branch 'hi/gpg-use-check-signature'
5da7329e29 Merge branch 'rs/commit-graph-code-simplification'
0108fc1b46 Merge branch 'js/ci-windows-update'
f3ccd9f0d9 Merge branch 'be/describe-multiroot'
a6b4709302 Merge branch 'ag/rebase-remove-redundant-code'
b22db265d6 Merge branch 'es/recursive-single-branch-clone'
e8e71848ea Merge branch 'jk/nth-packed-object-id'
a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'
4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere'
49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix'
2cbb058669 Merge branch 'bc/wildcard-credential'
25063e2530 Merge branch 'mr/bisect-in-c-1'
f4d7dfce4d Merge branch 'ds/sparse-add'
4d864895a2 t2402: test worktree path when called in .git directory
af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch()
7655b4119d remote-curl: show progress for fetches over dumb HTTP
2f268890c2 The eighth batch for 2.26
aa5a7e02ad Merge branch 'ma/test-cleanup'
58595e713c Merge branch 'rs/blame-typefix-for-fingerprint'
ff41848e99 Merge branch 'rs/micro-cleanups'
4cbf1a0e22 Merge branch 'es/worktree-cleanup'
46703057c1 Merge branch 'ak/test-log-graph'
777815f5f9 Merge branch 'jk/run-command-formatfix'
444cff61b4 Merge branch 'ds/partial-clone-fixes'
48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure'
8c22bd9ff9 Merge branch 'en/rebase-backend'
cb2f5a8e97 Merge branch 'en/check-ignore'
0df82d99da Merge branch 'jk/object-filter-with-bitmap'
80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix'
29b09c518c Merge branch 'jk/doc-diff-parallel'
237a28173f show_one_mergetag: print non-parent in hex form.
5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context"
6d1210e133 l10n: Update Catalan translation
0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification"
7329d94be7 config.mak.dev: re-enable -Wformat-zero-length
7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings
94f4d01932 mingw: workaround for hangs when sending STDIN
1ff466c018 Documentation: clarify that `-h` alone stands for `help`
65bf820d0e t6020: new test with interleaved lexicographic ordering of directories
9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it
d5bb92eced t3035: prefer test_must_fail to bash negation for git commands
b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions
42d180dd01 t602[1236], t6034: modernize test formatting
802050400a merge-recursive: apply collision handling unification to recursive case
7f487ce062 Azure Pipeline: switch to the latest agent pools
5ed9fc3fc8 ci: prevent `perforce` from being quarantined
eafff6e41e t/lib-httpd: avoid using macOS' sed
d68ce906c7 commit-graph: use progress title directly
30b1c7ad9d describe: don't abort too early when searching tags
240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to'
2d2118b814 The seventh batch for 2.26
325eb66830 Merge branch 'es/doc-mentoring'
87f17d790d Merge branch 'es/bright-colors'
d0038f4b31 Merge branch 'bw/remote-rename-update-config'
132f600b06 clone: pass --single-branch during --recurse-submodules
47319576f1 submodule--helper: use C99 named initializer
ffe005576a lib-log-graph: consolidate colored graph cmp logic
989eea958b lib-log-graph: consolidate test_cmp_graph logic
bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching
bb4995fc3f worktree: add utility to find worktree by pathname
a80c4c2214 worktree: improve find_worktree() documentation
2fecc48cad packfile: drop nth_packed_object_sha1()
6ac9760a30 packed_object_info(): use object_id internally for delta base
b99b6bcc57 packed_object_info(): use object_id for returning delta base
63f4a7fc01 pack-check: push oid lookup into loop
e31c71083a pack-check: convert "internal error" die to a BUG()
500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps
f66d4e0250 pack-objects: use object_id struct in pack-reuse code
a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id
3f83fd5e44 pack-objects: read delta base oid into object_id struct
0763671b8e nth_packed_object_oid(): use customary integer return
02bbbe9df9 worktree: drop unused code from get_main_worktree()
27f182b3fc blame: provide type of fingerprints pointer
b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere
df126ca142 t3400: make test clean up after itself
3c29e21eb0 t: drop debug `cat` calls
cac439b56d t9810: drop debug `cat` call
91de82adc9 t4117: check for files using `test_path_is_file`
4ef346482d receive.denyCurrentBranch: respect all worktrees
f8692114db t5509: use a bare repository for test push target
45f274fbb1 get_main_worktree(): allow it to be called in the Git directory
fd0bc17557 completion: add diff --color-moved[-ws]
2ce6d075fa use strpbrk(3) to search for characters from a given set
2b3c430bce quote: use isalnum() to check for alphanumeric characters
a51d9e8f07 t1050: replace test -f with test_path_is_file
3e96c66805 partial-clone: avoid fetching when looking for objects
d0badf8797 partial-clone: demonstrate bugs in partial fetch
539052f42f run-command.h: fix mis-indented struct member
6c11c6a124 sparse-checkout: allow one-character directories in cone mode
aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch
f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch
e8ef1e8d6e am: convert "resume" variable to a struct
bc8620b440 parse-options: convert "command mode" to a flag
62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE()
46fd7b3900 credential: allow wildcard patterns when matching config
82eb249853 credential: use the last matching username in the config
588c70e10f t0300: add tests for some additional cases
732f934408 t1300: add test for urlmatch with multiple wildcards
3fa0e04667 mailmap: add an additional email address for brian m. carlson
8a98758a8d stash push: support the --pathspec-from-file option
8c3713cede stash: eliminate crude option parsing
3f3d8068f5 doc: stash: synchronize <pathspec> description
b22909144c doc: stash: document more options
0093abc286 doc: stash: split options from description (2)
2b7460d167 doc: stash: split options from description (1)
5f393dc3aa rm: support the --pathspec-from-file option
fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags
73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure
6c69f22233 bisect: libify `bisect_next_all`
9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents
45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents
cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents
e8e3ce6718 bisect: libify `bisect_checkout`
ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents
7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()`
680e8a01e5 bisect: add enum to represent bisect returning codes
bfacfce7d9 bisect--helper: introduce new `decide_next()` function
b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0
292731c4c2 bisect--helper: change `retval` to `res`
16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays
7ec8125fba check-ignore: fix documentation and implementation to match
2607d39da3 doc-diff: use single-colon rule in rendering Makefile
0aa6ce3094 doc/config/push: use longer "--" line for preformatted example
20a5fd881a rev-list --count: comment on the use of count_right++
63a58457e0 Merge branch 'py/missing-bracket'
51ebf55b93 The sixth batch for 2.26
f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints'
123538444f Merge branch 'jk/doc-credential-helper'
e154451a2f Merge branch 'js/mingw-open-in-gdb'
fc25a19265 Merge branch 'js/test-unc-fetch'
6365058605 Merge branch 'js/test-avoid-pipe'
966b69f02f Merge branch 'js/test-write-junit-xml-fix'
d880c3de23 Merge branch 'jk/mailinfo-cleanup'
5d55554b1d Merge branch 'mr/show-config-scope'
9f3f38769d Merge branch 'rs/strbuf-insertstr'
cbecc168d4 Merge branch 'rs/parse-options-concat-dup'
5af345a438 Merge branch 'bc/hash-independent-tests-part-8'
0460c109c3 Merge branch 'rs/name-rev-memsave'
6b9919c0a2 git-gui: add missing close bracket
5897e5ac96 Merge branch 'cs/german-translation'
cf85a32eb6 git-gui: update German translation
5096e51c54 git-gui: extend translation glossary template with more terms
8b85bb1b70 git-gui: update pot template and German translation to current source code
e68e29171c Sync with 2.25.1
c522f061d5 Git 2.25.1
10cdb9f38a rebase: rename the two primary rebase backends
2ac0d6273f rebase: change the default backend from "am" to "merge"
8295ed690b rebase: make the backend configurable via config setting
76340c8107 rebase tests: repeat some tests using the merge backend instead of am
980b482d28 rebase tests: mark tests specific to the am-backend with --am
c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases
6d04ce75c4 git-prompt: change the prompt for interactive-based rebases
52eb738d6b rebase: add an --am option
8af14f0859 rebase: move incompatibility checks between backend options a bit earlier
be50c938df git-rebase.txt: add more details about behavioral differences of backends
befb89ce7c rebase: allow more types of rebases to fast-forward
9a70f3d4ae t3432: make these tests work with either am or merge backends
93122c985a rebase: fix handling of restrict_revision
55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer
8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling
7db00f0b3b t3406: simplify an already simple test
e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty
d48e5e21da rebase (interactive-backend): make --keep-empty the default
e0020b2f82 prefix_path: show gitdir when arg is outside repo
cc4f2eb828 doc: move credential helper info into gitcredentials(7)
bfdd66e72f Sync with maint
7ae7e234c7 The fifth batch for 2.26
53c3be2c29 Merge branch 'tb/commit-graph-object-dir'
7b029ebaef Merge branch 'jk/index-pack-dupfix'
aa21cc97bd Merge branch 'jk/alloc-cleanups'
883326077a Merge branch 'jh/notes-fanout-fix'
f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule'
78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs'
df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'
433b8aac2e Merge branch 'ds/sparse-checkout-harden'
4a77434bc8 Merge branch 'ld/p4-cleanup-processes'
8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone'
09e48400a3 Merge branch 'jk/get-oid-error-message-i18n'
4dbeecba27 Merge branch 'ag/edit-todo-drop-check'
f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2'
d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout'
251187084d Merge branch 'js/rebase-i-with-colliding-hash'
c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix'
56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store'
0da63da794 Merge branch 'jn/promote-proto2-to-default'
a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup'
daef1b300b Merge branch 'hw/advice-add-nothing'
6141e0cc00 Merge branch 'js/convert-typofix' into maint
4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint
5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint
b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint
7137d6089b Merge branch 'ms/doc-bundle-format' into maint
52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint
0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint
1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint
cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint
153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint
8857657cc9 Merge branch 'jt/t5616-robustify' into maint
1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint
f468972671 Merge branch 'bc/misconception-doc' into maint
6e69042e26 Merge branch 'bc/author-committer-doc' into maint
650ed395be Merge branch 'ds/refmap-doc' into maint
80b806f1a8 Merge branch 'bc/actualmente' into maint
eceff4ba12 Merge branch 'rt/submodule-i18n' into maint
8a17eb7972 Merge branch 'jk/test-fixes' into maint
54bbadaeca Merge branch 'jk/asan-build-fix' into maint
8dbeba198e Merge branch 'ds/sparse-cone' into maint
e361f36f61 Merge branch 'nd/switch-and-restore' into maint
4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint
ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint
5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint
c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint
d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint
9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint
3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint
3ab3185f99 pack-objects: support filters with bitmaps
84243da129 pack-bitmap: implement BLOB_LIMIT filtering
4f3bd5606a pack-bitmap: implement BLOB_NONE filtering
cc4aa28506 bitmap: add bitmap_unset() function
2aaeb9ac41 rev-list: use bitmap filters for traversal
6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure
4eb707ebd6 rev-list: allow commit-only bitmap traversals
ea047a8eb4 t5310: factor out bitmap traversal comparison
608d9c9365 rev-list: allow bitmaps when counting objects
55cb10f9b5 rev-list: make --count work with --objects
792f811998 rev-list: factor out bitmap-optimized routines
d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs
08809c09aa mingw: add a helper function to attach GDB to the current process
bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths
de26f02db1 t9001, t9116: avoid pipes
a2dc43414c MyFirstContribution: rephrase contact info
e03f928e2a rev-list: fallback to non-bitmap traversal when filtering
acac50dd8c pack-bitmap: fix leak of haves/wants object lists
551cf8b655 pack-bitmap: factor out type iterator initialization
d8437c57fa The fourth batch for 2.26
a3dcf84df0 Merge branch 'js/convert-typofix'
0de2d1409b Merge branch 'js/ci-squelch-doc-warning'
0410c2ba31 Merge branch 'jb/multi-pack-index-docfix'
0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example'
e99c325bb4 Merge branch 'ms/doc-bundle-format'
afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix'
db72f8c940 Merge branch 'jb/parse-options-message-fix'
3d2471ba85 Merge branch 'ma/filter-branch-doc-caret'
b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path'
44cba9c4b3 Merge branch 'jc/skip-prefix'
556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index'
17e4a1b141 Merge branch 'hw/doc-git-dir'
4cf7f48891 Merge branch 'jk/push-default-doc'
b783391018 Merge branch 'jk/clang-sanitizer-fixes'
a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache'
3f7553acf5 Merge branch 'jt/t5616-robustify'
341f8a6476 Merge branch 'jk/escaped-wildcard-dwim'
b486d2ee81 Merge branch 'jn/pretend-object-doc'
076ee3e8a2 tests: fix --write-junit-xml with subshells
2b0f19fa7a convert: fix typo
c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors
1751b09a92 color.c: support bright aixterm colors
4a28eb0ae4 color.c: refactor color_output arguments
f696a2b1c8 mailinfo: factor out some repeated header handling
ffbea1816d mailinfo: be more liberal with header whitespace
f447d0293e mailinfo: simplify parsing of header values
b6537d83ee mailinfo: treat header values as C strings
ef07659926 sparse-checkout: work with Windows paths
2631dc879d sparse-checkout: create 'add' subcommand
4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand
6fb705abcb sparse-checkout: extract add_patterns_from_input()
b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config
f2a2327a4a config: provide access to the current line number
923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values
ceff1a1308 remote: clean-up config callback
1a83068c26 remote: clean-up by returning early to avoid one indentation
88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types
145d59f482 config: add '--show-scope' to print the scope of a config value
9a83d088ee submodule-config: add subomdule config scope
e37efa40e1 config: teach git_config_source to remember its scope
5c105a842e config: preserve scope in do_git_config_sequence
6766e41b8a config: clarify meaning of command line scoping
6dc905d974 config: split repo scope to local and worktree
a5cb4204b6 config: make scope_name non-static and rename it
30183894ea ci: ignore rubygems warning in the "Documentation" job
7a9f8ca805 parse-options: simplify parse_options_dup()
c84078573e parse-options: const parse_options_concat() parameters
f904f9025f parse-options: factor out parse_options_count()
a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat()
517b60564e mailinfo: don't insert header prefix for handle_content_type()
a91cc7fad0 strbuf: add and use strbuf_insertstr()
eb31044ff7 pack-format: correct multi-pack-index description
9299f84921 diff-options.txt: avoid "regex" overload in example
7378ec90e1 doc: describe Git bundle format
f3037657e8 t6024: update for SHA-256
edf04243b2 t6006: make hash size independent
5db24dcffd t6000: abstract away SHA-1-specific constants
d341e0805d t5703: make test work with SHA-256
88ed241a7e t5607: make hash size independent
48c10cc0e6 t5318: update for SHA-256
f7ae8e69b6 t5515: make test hash independent
e70649bb66 t5321: make test hash independent
a30f93b143 t5313: make test hash independent
a79eec220b t5309: make test hash independent
796d1383a3 t5302: make hash size independent
417e45e5e3 t4060: make test work with SHA-256
dfa5f53e78 t4211: add test cases for SHA-256
f743e8f5b3 t4211: move SHA-1-specific test cases into a directory
72f936b120 t4013: make test hash independent
5df0f11f07 t3311: make test work with SHA-256
07877f393c t3310: make test work with SHA-256
6025e898d6 t3309: make test work with SHA-256
7b1a1822fe t3308: make test work with SHA-256
94db7e3e93 t3206: make hash size independent
db12505c2c t/lib-pack: support SHA-256
303b3c1c46 submodule: add newline on invalid submodule error
887a0fd573 add: change advice config variables used by the add API
de93cc14ab The third batch for 2.26
ea46d9097b Merge branch 'mt/sparse-checkout-doc-update'
ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix'
b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend'
7ab963e122 Merge branch 'en/fill-directory-fixes-more'
f52ab33616 Merge branch 'bc/hash-independent-tests-part-7'
25794d6ce9 Merge branch 'km/submodule-add-errmsg'
d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity'
76c57fedfa Merge branch 'js/add-p-leftover-bits'
9a5315edfd Merge branch 'js/patch-mode-in-others-in-c'
381e8e9de1 Merge branch 'dl/test-must-fail-fixes'
395518cf7a parse-options: lose an unnecessary space in an error message
079f970971 name-rev: sort tip names before applying
2d53975488 name-rev: release unused name strings
977dc1912b name-rev: generate name strings only if they are better
1c56fc2084 name-rev: pre-size buffer in get_parent_name()
ddc42ec786 name-rev: factor out get_parent_name()
f13ca7cef5 name-rev: put struct rev_name into commit slab
d689d6d82f name-rev: don't _peek() in create_or_update_name()
15a4205d96 name-rev: don't leak path copy in name_ref()
36d2419c9a name-rev: respect const qualifier
71620ca86c name-rev: remove unused typedef
3e2feb0d64 name-rev: rewrite create_or_update_name()
a21781011f index-pack: downgrade twice-resolved REF_DELTA to die()
dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout
e1c5253951 t3305: check notes fanout more carefully and robustly
e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks
a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st'
ad2dd5bb63 commit-graph.c: remove path normalization, comparison
13c2499249 commit-graph.h: store object directory in 'struct commit_graph'
0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context'
f38c92452d t7400: testcase for submodule status on unregistered inner git repos
5290d45134 tree-walk.c: break circular dependency with unpack-trees
f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch
d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode
e53ffe2704 sparse-checkout: escape all glob characters on write
e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand
bd64de42de sparse-checkout: unquote C-style strings over --stdin
d585f0e799 sparse-checkout: write escaped patterns in cone mode
4f52c2ce6c sparse-checkout: properly match escaped characters
9abc60f801 sparse-checkout: warn on globs in cone patterns
145136a95a C: use skip_prefix() to avoid hardcoded string length
04e5b3f0b4 submodule foreach: replace $path with $sm_path in example
1793280e91 t5318: don't pass non-object directory to '--object-dir'
da8063522f diff: move diff.wsErrorHighlight to "basic" config
b98d188581 sha1-file: allow check_object_signature() to handle any repo
2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file()
7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare()
c8123e72f6 streaming: allow open_istream() to handle any repo
5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile()
a651946730 cache-tree: use given repo's hash_algo at verify_one()
eb999b3295 diff: make diff_populate_filespec() honor its repo argument
5b0ca878e0 Sync with maint
344ee18728 The second batch
53a83299c7 Merge branch 'bc/misconception-doc'
c9ccf9d09b Merge branch 'bc/author-committer-doc'
0d0fa20c40 Merge branch 'ss/t6025-modernize'
7050624abc Merge branch 'lh/bool-to-type-bool'
4b69f29271 Merge branch 'ds/refmap-doc'
aff812ce3c Merge branch 'bc/actualmente'
38fb56e92a Merge branch 'rt/submodule-i18n'
f0940743fa Merge branch 'js/builtin-add-i-cmds'
0afeb3fdf4 Merge branch 'jk/test-fixes'
808dab2b58 Merge branch 'jk/asan-build-fix'
fec1ff97c2 Merge branch 'sg/completion-worktree'
c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function'
11ad30b887 Merge branch 'hi/gpg-mintrustlevel'
96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases'
d52adee779 Merge branch 'ds/graph-horizontal-edges'
6909474491 Merge branch 'am/update-pathspec-f-f-tests'
043426c8fd Merge branch 'ds/sparse-cone'
34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig'
8dd40c0472 traverse_trees(): use stack array for name entries
667b76ec58 walker_fetch(): avoid raw array length computation
9734b74a8f normalize_path_copy(): document "dst" size expectations
43f33e492a git-p4: avoid leak of file handle when cloning
19fa5ac333 git-p4: check for access to remote host earlier
6026aff5bb git-p4: cleanup better on error exit
ca5b5cce62 git-p4: create helper function importRevisions()
4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable
5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce
837b3a6376 git-p4: make closeStreams() idempotent
b0418303b1 sha1-name: mark get_oid() error messages for translation
2df1aa239c fetch: forgo full connectivity check if --filter
50033772d5 connected: verify promisor-ness of partial clone
d82ad54945 git: update documentation for --git-dir
0ad7144999 .mailmap: map Yi-Jyun Pan's email
c56c48dd07 grep: ignore --recurse-submodules if --no-index is given
8b2a1928f0 doc: drop "explicitly given" from push.default description
cf82bff73f obstack: avoid computing offsets from NULL pointer
3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer
d20bc01a51 avoid computing zero offsets from NULL pointer
7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero
bc3f657f71 t1506: drop space after redirection operator
e5d7b2f65c t1400: avoid "test" string comparisons
5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c
c7a6207591 Sync with maint
7210ca4ee5 .mailmap: fix GGG authoship screwup
37a63faae5 t4124: only mark git command with test_must_fail
a8c663cf65 t3507: use test_path_is_missing()
2def7f017c t3507: fix indentation
e8a1c686ae t3504: do check for conflict marker after failed cherry-pick
1c9fd32fd2 t3419: stop losing return code of git command
c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}()
a781cd6fef t3415: stop losing return codes of git commands
86ce6e0dd1 t3310: extract common notes_merge_files_gone()
245b9ba0ba t3030: use test_path_is_missing()
4a6f11fd7b t2018: replace "sha" with "oid"
62e80fcb48 t2018: don't lose return code of git commands
30c0367668 t2018: teach do_checkout() to accept `!` arg
40caa5366a t2018: be more discerning when checking for expected exit codes
b54128bb0b t5616: make robust to delta base change
4c616c2ba1 merge-recursive: use subtraction to flip stage
ee798742bd merge-recursive: silence -Wxor-used-as-pow warning
39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule
a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin
3b2885ec9b submodule: fix status of initialized but not cloned submodules
ace912bfb8 t7400: add a testcase for submodule status on empty dirs
4bb4fd4290 MyFirstContribution: add avenues for getting help
9e6d3e6417 sparse-checkout: detect short patterns
41de0c6fbc sparse-checkout: cone mode does not recognize "**"
7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone
47dbf10d8a clone: fix --sparse option with URLs
3c754067a1 sparse-checkout: create leading directories
d622c34396 t1091: improve here-docs
522e641748 t1091: use check_files to reduce boilerplate
417be08d02 t1300: create custom config file without special characters
3de7ee369b t1300: fix over-indented HERE-DOCs
329e6ec397 config: fix typo in variable name
767a9c417e rebase -i: stop checking out the tip of the branch to rebase
dfaed02862 fsmonitor: update documentation for hook version and watchman hooks
e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2
d031049da3 completion: add support for sparse-checkout
a402723e48 doc: sparse-checkout: mention --cone option
26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck
b6992261de rebase -i: re-fix short SHA-1 collision
d859dcad94 parse_insn_line(): improve error message when parsing failed
d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects
92fb0db94c pack-objects: add checks for duplicate objects
bb514de356 pack-objects: improve partial packfile reuse
ff483026a9 builtin/pack-objects: introduce obj_is_packed()
e704fc7978 pack-objects: introduce pack.allowPackReuse
2f4af77699 csum-file: introduce hashfile_total()
8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting()
59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile
40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains()
14fbd26044 ewah/bitmap: introduce bitmap_word_alloc()
bc7a3d4dc0 The first batch post 2.25 cycle
09e393d913 Merge branch 'nd/switch-and-restore'
45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport'
0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout'
36da2a8635 Merge branch 'es/unpack-trees-oob-fix'
42096c778d Merge branch 'bc/run-command-nullness-after-free-fix'
1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted'
a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees'
e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached'
9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting'
237a83a943 Merge branch 'dl/credential-netrc'
a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir()
129510a067 t2405: clarify test descriptions and simplify test
4eaadc8493 t2405: use git -C and test_commit -C instead of subshells
773c60a45e t7410: rename to t2405-worktree-submodule.sh
7a2dc95cbc docs: mention when increasing http.postBuffer is valuable
1b13e9032f doc: dissuade users from trying to ignore tracked files
69e104d70e doc: provide guidance on user.name format
813f6025a5 docs: expand on possible and recommended user config options
bc94e5862a doc: move author and committer information to git-commit(1)
7979dfe1d4 l10n: Update Catalan translation
81e3db42f3 templates: fix deprecated type option `--bool`
c513a958b6 t6025: use helpers to replace test -f <path>
70789843bd t6025: modernize style
6a7aca6f01 doc: rm: synchronize <pathspec> description
856249c62a docs: use "currently" for the present time
b40a50264a fetch: document and test --refmap=""
a9ae8fde2e t3404: directly test the behavior of interest
22a69fda19 git-rebase.txt: update description of --allow-empty-message
f1928f04b2 grep: use no. of cores as the default no. of threads
70a9fef240 grep: move driver pre-load out of critical section
1184a95ea2 grep: re-enable threads in non-worktree case
6c307626f1 grep: protect packed_git [re-]initialization
c441ea4edc grep: allow submodule functions to run in parallel
d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules()
1d1729caeb grep: replace grep_read_mutex by internal obj read lock
31877c9aec object-store: allow threaded access to object reading
b1fc9da1c8 replace-object: make replace operations thread-safe
d5b0bac528 grep: fix racy calls in grep_objects()
faf123c730 grep: fix race conditions at grep_submodule()
c3a5bb31c1 grep: fix race conditions on userdiff calls
0222540827 fetch: emphasize failure during submodule fetch
232378479e Sync with maint
e4837b4406 t7800: don't rely on reuse_worktree_file()
fbce03d329 t4018: drop "debugging" cat from hunk-header tests
f65d07fffa Makefile: use compat regex with SANITIZE=address
849e43cc18 built-in add -i: accept open-ended ranges again
d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files
a4ffbbbb99 submodule.c: mark more strings for translation
0cbb60574e dir: point treat_leading_path() warning to the right place
ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent
22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2
f365bf40a0 clean: demonstrate a bug with pathspecs
b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x
277eb5af7c t5604: make hash independent
44b6c05b43 t5601: switch into repository to hash object
7a868c51c2 t5562: use $ZERO_OID
1b8f39fb0d t5540: make hash size independent
a8c17e3bd6 t5537: make hash size independent
832072219c t5530: compute results based on object length
74ad99b1d8 t5512: abstract away SHA-1-specific constants
ba1be1ab45 t5510: make hash size independent
cba472d3ad t5504: make hash algorithm independent
82d5aeb1e6 t5324: make hash size independent
3c5e65cac1 t5319: make test work with SHA-256
235d3cddb8 t5319: change invalid offset for SHA-256 compatibility
1d86c8f0ce t5318: update for SHA-256
525a7f1769 t4300: abstract away SHA-1-specific constants
7a1bcb251b t4204: make hash size independent
cb78f4f0fe t4202: abstract away SHA-1-specific constants
717c939d8f t4200: make hash size independent
08a9dd891c t4134: compute appropriate length constant
215b60bf07 t4066: compute index line in diffs
194264c185 t4054: make hash-size independent
7d5ecd775d completion: list paths and refs for 'git worktree add'
3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands
3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options
367efd54b3 completion: return the index of found word from __git_find_on_cmdline()
d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function
2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper
54887b4689 gpg-interface: add minTrustLevel as a configuration option
684ceae32d fetch: default to protocol version 2
33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION
8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate
b9ab170752 config doc: protocol.version is not experimental
07ef3c6604 fetch test: use more robust test for filtered objects
d6509da620 fetch test: mark test of "skipping" haves as v0-only
a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too
c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function
bf66db37f1 add: use advise function to display hints
c958d3bd0a graph: fix collapse of multiple edges
8588932e20 graph: add test to demonstrate horizontal line bug
d0d0a357a1 t: directly test parse_pathspec_file()
568cabb2fe t: fix quotes tests for --pathspec-from-file
f94f7bd00d t: add tests for error conditions with --pathspec-from-file
b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job
12acdf573a built-in add -p: handle Escape sequences more efficiently
e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode
04f816b125 built-in add -p: respect the `interactive.singlekey` config setting
a5e46e6b01 terminal: add a new function to read a single keystroke
9ea416cb51 terminal: accommodate Git for Windows' default terminal
94ac3c31f7 terminal: make the code of disable_echo() reusable
08b1ea4c39 built-in add -p: handle diff.algorithm
180f48df69 built-in add -p: support interactive.diffFilter
1e4ffc765d t3701: adjust difffilter test
c81638541c submodule add: show 'add --dry-run' stderr when aborting
8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token
56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token
d0654dc308 Git 2.25
b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po
4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'"
ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1
e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master
1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
d78a1968c5 Merge branch 'ma/config-advice-markup-fix'
a20ae3ee29 l10n: Update Catalan translation
49e268e23e mingw: safeguard better against backslashes in file names
4c6c7971e0 unpack-trees: correctly compute result count
63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1
75449c1b39 l10n: de.po: Reword generation numbers
6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t)
3901d2c6bd config/advice.txt: fix description list separator
7a6a90c6ec Git 2.25-rc2
1f5f3ffe5c Merge branch 'ds/graph-assert-fix'
a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix'
202f68b252 Merge branch 'pm/am-in-body-header-doc-update'
7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix'
c5dc20638b Merge branch 'do/gitweb-typofix-in-comments'
fe47c9cb5f Merge https://github.com/prati0100/git-gui
a1087c9367 graph: fix lack of color in horizontal lines
0d251c3291 graph: drop assert() for merge with two collapsing parents
4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper
573117dfa5 unpack-trees: watch for out-of-range index position
e701bab3e9 restore: invalidate cache-tree when removing entries with --staged
1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command
fa74180d08 checkout: don't revert file on ambiguous tracking branches
2957709bd4 parse_branchname_arg(): extract part as new function
5020f6806a t2018: improve style of if-statement
7ffb54618b t2018: add space between function name and ()
63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH
065027ee1a string-list: note in docs that callers can specify sorting function
26f924d50e unpack-trees: exit check_updates() early if updates are not wanted
042ed3e048 The final batch before -rc2
0f1930cd1b Merge branch 'ds/sparse-cone'
037f067587 Merge branch 'ds/commit-graph-set-size-mult'
f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify'
c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode'
a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
c4117fcb97 Merge branch 'pb/clarify-line-log-doc'
556f0258df Merge branch 'ew/packfile-syscall-optim'
5814d44d9b doc: submodule: fix typo for command absorbgitdirs
7047f75f22 editorconfig: indent text files with tabs
60440d72db sha1-file: document how to use pretend_object_file
7fdc5f296f l10n: es: 2.25.0 round #1
f8740c586b am: document that Date: can appear as an in-body header
4e2c4c0d4f gitweb: fix a couple spelling errors in comments
421c0ffb02 multi-pack-index: correct configuration in documentation
757ff352bd Documentation/git-sparse-checkout.txt: fix a typo
0d2116c644 Merge branch 'zs/open-current-file'
9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u)
3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master
4c5081614c l10n: fr.po v2.25.0 rnd 1
5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0
63020f175f commit-graph: prefer default size_mult when given zero
224c7d70fa mingw: only test index entries for backslashes, not tree entries
9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED
8679ef24ed Git 2.25-rc1
a82027e9e6 Merge branch 'js/use-test-tool-on-path'
13432fc6dd Merge branch 'js/mingw-reserved-filenames'
e0e1ac5db0 Merge branch 'en/rebase-signoff-fix'
b76a244c9d Merge branch 'em/freebsd-cirrus-ci'
bc855232bc Merge branch 'bk/p4-misc-usability'
763a59e71c merge-recursive: remove unnecessary oid_eq function
44143583b7 sparse-checkout: use extern for global variables
d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master
13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1
786f4d2405 git-gui: allow opening currently selected file in default app
4fd683b6a3 sparse-checkout: document interactions with submodules
de11951b03 sparse-checkout: list directories in cone mode
0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0
578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed)
173fff68da Merge tag 'v2.25.0-rc0' into git-po-master
f1842ff531 t2018: remove trailing space from test description
20a67e8ce9 t3008: find test-tool through path lookup
9e341f62ca l10n: Update Catalan translation
4e61b2214d packfile: replace lseek+read with pread
ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision
2be45868a8 doc: log, gitk: document accepted line-log diff formats
280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD
0a76bd7381 mailmap: mask accentless variant for Công Danh
99c33bed56 Git 2.25-rc0
d2189a721c Merge branch 'en/fill-directory-fixes'
8be0a428d6 Merge branch 'rs/test-cleanup'
65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string'
c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
45b96a6fa1 Merge branch 'js/add-p-in-c'
ccc292e862 Merge branch 'jc/drop-gen-hdrs'
dfee504bee Merge branch 'ja/doc-markup-cleanup'
87cbb1ca66 Merge branch 'rs/ref-read-cleanup'
20aa6d88b7 Merge branch 'rb/p4-lfs'
fcd5b55f56 Merge branch 'pb/submodule-doc-xref'
4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free'
ba6b66281e Merge branch 'ln/userdiff-elixir'
bd72a08d6c Merge branch 'ds/sparse-cone'
f3c520e17f Merge branch 'sg/name-rev-wo-recursion'
6514ad40a1 Merge branch 'ra/t5150-depends-on-perl'
17066bea38 Merge branch 'dl/format-patch-notes-config-fixup'
135365dd99 Merge branch 'am/pathspec-f-f-checkout'
ff0cb70d45 Merge branch 'am/pathspec-from-file'
4dc42c6c18 mingw: refuse paths containing reserved names
98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16
c480eeb574 commit --interactive: make it work with the built-in `add -i`
cee6cb7300 built-in add -p: implement the "worktree" patch modes
52628f94fc built-in add -p: implement the "checkout" patch modes
6610e4628a built-in stash: use the built-in `git add -p` if so configured
90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting
36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes
d2a233cb8b built-in add -p: prepare for patch modes other than "stage"
761e3d26bb sparse-checkout: improve OS ls compatibility
6579d93a97 contrib/credential/netrc: work outside a repo
1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable
b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI
b441717256 t1507: inline full_name()
9291e6329e t1507: run commands within test_expect_success
5236fce6b4 t1507: stop losing return codes of git commands
10812c2337 t1501: remove use of `test_might_fail cp`
62d58cda69 t1409: use test_path_is_missing()
b87b02cfe6 t1409: let sed open its own input file
9b92070e52 t1307: reorder `nongit test_must_fail`
3595d10c26 t1306: convert `test_might_fail rm` to `rm -f`
f511bc02ed t0020: use ! check_packed_refs_marked
f6041abdcd t0020: don't use `test_must_fail has_cr`
f46c243e66 t0003: don't use `test_must_fail attr_check`
99c049bc4c t0003: use test_must_be_empty()
3738439c77 t0003: use named parameters in attr_check()
7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err()
b8afb908c2 t/lib-git-p4: use test_path_is_missing()
4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases
6836d2fe06 dir.c: use st_add3() for allocation size
c847dfafee dir: consolidate similar code in treat_directory()
777b420347 dir: synchronize treat_leading_path() and read_directory_recursive()
b9670c1f5e dir: fix checks on common prefix directory
5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit
23cbe427c4 Merge branch 'py/console-close-esc'
124a895811 t4015: improve coverage of function context test
509efef789 commit: forbid --pathspec-from-file --all
12029dc57d t3434: mark successful test as such
e0f9095aaa notes.h: fix typos in comment
675ef6bab8 t6030: don't create unused file
01ed17dc8c t5580: don't create unused file
f670adb49b t3501: don't create unused file
1e1ccbfdd3 git-gui: allow closing console window with Escape
7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays.
b02fd2acca The sixth batch
59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex'
e3b72391d1 Merge branch 'rs/commit-export-env-simplify'
43bf44e23a Merge branch 'rs/archive-zip-code-cleanup'
4438a1a59f Merge branch 'js/t3404-indent-fix'
3a44db2ed2 Merge branch 'dr/branch-usage-casefix'
8bc481f4f6 Merge branch 'sg/t9300-robustify'
011fc2e88e Merge branch 'js/add-i-a-bit-more-tests'
d1c0fe8d9b Merge branch 'dl/range-diff-with-notes'
26c816a67d Merge branch 'hw/doc-in-header'
f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
71a7de7a99 Merge branch 'dl/rebase-with-autobase'
c9f5fc9114 Merge branch 'dl/test-cleanup'
6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap'
3beff388b2 Merge branch 'js/builtin-add-i-cmds'
4755a34c47 Merge branch 'dd/time-reentrancy'
37c2619d91 Merge branch 'ag/sequencer-todo-updates'
608e380502 git-p4: show detailed help when parsing options fail
e2aed5fd5b git-p4: yes/no prompts should sanitize user text
571fb96573 fix-typo: consecutive-word duplications
f371984613 Makefile: drop GEN_HDRS
2e4083198d built-in add -p: show helpful hint when nothing can be staged
54d9d9b2ee built-in add -p: only show the applicable parts of the help text
ade246efed built-in add -p: implement the 'q' ("quit") command
d6cf873340 built-in add -p: implement the '/' ("search regex") command
9254bdfb4f built-in add -p: implement the 'g' ("goto") command
bcdd297b78 built-in add -p: implement hunk editing
b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf"
11f2c0dae8 built-in add -p: coalesce hunks after splitting them
510aeca199 built-in add -p: implement the hunk splitting feature
0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions
5906d5de77 built-in app -p: allow selecting a mode change as a "hunk"
47dc4fd5eb built-in add -p: handle deleted empty files
80399aec5a built-in add -p: support multi-file diffs
7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed
12c24cf850 built-in add -p: color the prompt and the help text
25ea47af49 built-in add -p: adjust hunk headers as needed
e3bd11b4eb built-in add -p: show colored hunks by default
1942ee44e8 built-in add -i: wire up the new C code for the `patch` command
f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C
d1b1384d61 userdiff: remove empty subexpression from elixir regex
df5be01669 doc: indent multi-line items in list
fd5041e127 doc: remove non pure ASCII characters
190a65f9db sparse-checkout: respect core.ignoreCase in cone mode
1d7297513d notes: break set_display_notes() into smaller functions
66f79ee23d config/format.txt: clarify behavior of multiple format.notes
cc2bd5c45d gitmodules: link to gitsubmodules guide
99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed
e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed
8c02fe6060 t7004: don't create unused file
cb05d6a5ed t4256: don't create unused file
c5c4eddd56 dir: break part of read_directory_recursive() out for reuse
072a231016 dir: exit before wildcard fall-through if there is no wildcard
2f5d3847d4 dir: remove stray quote character in comment
a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories"
452efd11fb t3011: demonstrate directory traversal failures
ea94b16fb8 git-p4: honor lfs.storage configuration variable
51a0a4ed95 bisect--helper: avoid use-after-free
d32e065a91 Merge branch 'kk/branch-name-encoding'
ad05a3d8e5 The fifth batch
7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix'
b089e5e6cb Merge branch 'em/test-skip-regex-illseq'
930078ba39 Merge branch 'hi/gpg-use-check-signature'
08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode'
7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk'
55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm'
41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress'
5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise'
dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix'
d37cfe3b5c Merge branch 'dl/pretty-reference'
99c4ff1bda Merge branch 'dl/submodule-set-url'
55d607d85b Merge branch 'js/mingw-inherit-only-std-handles'
c58ae96fc4 Merge branch 'am/pathspec-from-file'
7c88714262 Merge branch 'po/bundle-doc-clonable'
5d9324e0f4 Merge branch 'ra/rebase-i-more-options'
7034cd094b Sync with Git 2.24.1
09ac67a183 format-patch: move git_config() before repo_init_revisions()
8164c961e1 format-patch: use --notes behavior for format.notes
452538c358 notes: extract logic into set_display_notes()
e6e230eeae notes: create init_display_notes() helper
1e6ed5441a notes: rename to load_display_notes()
2866fd284c name-rev: cleanup name_ref()
49f7a2fde9 name-rev: eliminate recursion in name_rev()
fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name'
e05e8cf074 archive-zip: use enum for compression method
39acfa3d22 git gui: fix branch name encoding error
11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description
8cf8f9b4aa t3404: fix indentation
4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs
147ee35558 commit: use strbuf_add() to add a length-limited string
559c6fc317 The fourth batch
56e6c16394 Merge branch 'dl/lore-is-the-archive'
3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive'
7cb0d37f6d Merge branch 'tg/perf-remove-stale-result'
403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick'
f0cf2fee5d Merge branch 'hi/grep-do-not-return-void'
391fb22ac7 Merge branch 'rs/use-skip-prefix-more'
92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd'
4ba74ca901 Merge branch 'rs/test-cleanup'
f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick'
ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9'
8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters
3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances
dd432a6ecf name-rev: restructure parsing commits and applying date cutoff
dd090a8a37 name-rev: pull out deref handling from the recursion
766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper
d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev()
bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation
e0c4da6f2a name-rev: avoid unnecessary cast in name_ref()
c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name()
c593a26348 t6120-describe: modernize the 'check_describe' helper
abcf857300 range-diff: clear `other_arg` at end of function
f8675343d7 range-diff: mark pointers as const
828765dfe0 t3206: fix incorrect test name
0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early
21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile
b4bbbbd5a2 apply --allow-overlap: fix a corner case
89c8559367 git add -p: use non-zero exit code when the diff generation failed
e91162be9c t3701: verify that the diff.algorithm config setting is handled
0c3222c4f3 t3701: verify the shown messages when nothing can be added
24be352d52 t3701: add a test for the different `add -p` prompts
8539b46534 t3701: avoid depending on the TTY prerequisite
0f0fba2cc8 t3701: add a test for advanced split-hunk editing
53a06cf39b Git 2.24.1
67af91c47a Sync with 2.23.1
a7312d1a28 Git 2.23.1
7fd9fd94fb Sync with 2.22.2
d9589d4051 Git 2.22.2
5421ddd8d0 Sync with 2.21.1
367f12b7e9 Git 2.21.1
20c71bcf67 Merge branch 'fix-msys2-quoting-bugs'
7d8b676992 mingw: sh arguments need quoting in more circumstances
d9061ed9da t7415: drop v2.20.x-specific work-around
04522edbd4 mingw: fix quoting of empty arguments for `sh`
49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts
e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly
fc346cb292 Sync with 2.20.2
4cd1cf31ef Git 2.20.2
c154745074 submodule: defend against submodule.update = !command in .gitmodules
4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x
d851d94151 Sync with 2.19.3
caccc527ca Git 2.19.3
7c9fbda6e2 Sync with 2.18.2
9877106b01 Git 2.18.2
14af7ed5a9 Sync with 2.17.3
a5ab8d0317 Git 2.17.3
bb92255ebe fsck: reject submodule.update = !command in .gitmodules
bdfef0492c Sync with 2.16.6
eb288bc455 Git 2.16.6
68440496c7 test-drop-caches: use `has_dos_drive_prefix()`
9ac92fed5b Sync with 2.15.4
7cdafcaacf Git 2.15.4
e904deb89d submodule: reject submodule.update = !command in .gitmodules
d3ac8c3f27 Sync with 2.14.6
66d2a6159f Git 2.14.6
083378cc35 The third batch
88bd37a2d0 Merge branch 'js/pkt-line-h-typofix'
473b431410 Merge branch 'us/unpack-trees-fsmonitor'
e0f9ec9027 Merge branch 'sg/test-bool-env'
fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset'
e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere'
88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory'
8feb47e882 Merge branch 'dl/t5520-cleanup'
6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree'
57d46bc602 Merge branch 'mg/doc-submodule-status-cached'
75bd003c7b Merge branch 'js/git-svn-use-rebase-merges'
f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix'
c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'
36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree'
cf91c31688 Merge branch 'sg/unpack-progress-throughput'
ef6104581d Merge branch 'pb/submodule-update-fetches'
7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix'
f3c7bfdde2 Merge branch 'dl/range-diff-with-notes'
9502b616f1 Merge branch 'jh/userdiff-python-async'
76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2'
995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label'
f7998d9793 Merge branch 'js/builtin-add-i'
917d0d6234 Merge branch 'js/rebase-r-safer-label'
56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers'
2763530048 Merge branch 'jg/revert-untracked'
fa38ab68b0 git-gui: revert untracked files by deleting them
d9c6469f38 git-gui: update status bar to track operations
29a9366052 git-gui: consolidate naming conventions
0bb313a552 xdiff: unignore changes in function context
2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names'
65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods'
5532ebdeb7 Merge branch 'fix-mingw-quoting-bug'
76a681ce9c Merge branch 'dubiously-nested-submodules'
dd53ea7220 Merge branch 'turn-on-protectntfs-by-default'
f82a97eb91 mingw: handle `subst`-ed "DOS drives"
7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams'
d2c84dad1c mingw: refuse to access paths with trailing spaces or periods
379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh
817ddd64c2 mingw: refuse to access paths with illegal characters
cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors
7530a6287e quote-stress-test: allow skipping some trials
35edce2056 t6130/t9350: prepare for stringent Win32 path validation
55953c77c0 quote-stress-test: accept arguments to test via the command-line
ad15592529 tests: add a helper to stress test argument quoting
a8dee3ca61 Disallow dubiously-nested submodule git directories
9102f958ee protect_ntfs: turn on NTFS protection by default
91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams
6d8684161e mingw: fix quoting of arguments
3a85dc7d53 is_ntfs_dotgit(): speed it up
7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses
288a74bcd2 is_ntfs_dotgit(): only verify the leading segment
a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark
cae0bc09ab rebase: fix format.useAutoBase breakage
945dc55dda format-patch: teach --no-base
700e006c5d t4014: use test_config()
a749d01e1d format-patch: fix indentation
0c47e06176 t3400: demonstrate failure with format.useAutoBase
d9b31db2c4 t7700: stop losing return codes of git commands
3699d69df0 t7700: make references to SHA-1 generic
dcf9a748ca t7700: replace egrep with grep
cfe5eda02a t7700: consolidate code into test_has_duplicate_object()
ae475afc0f t7700: consolidate code into test_no_missing_in_packs()
14b7664df8 doc: replace LKML link with lore.kernel.org
d23f9c8e04 RelNotes: replace Gmane with real Message-IDs
dcee037228 doc: replace MARC links with lore.kernel.org
a9aecc7abb checkout, restore: support the --pathspec-from-file option
cfd9376c1d doc: restore: synchronize <pathspec> description
8ea1189eac doc: checkout: synchronize <pathspec> description
6fdc9ad259 doc: checkout: fix broken text reference
1d022bb43f doc: checkout: remove duplicate synopsis
bebb5d6d6b add: support the --pathspec-from-file option
21bb3083c3 cmd_add: prepare for next patch
4778452597 Merge branch 'prevent-name-squatting-on-windows'
a7b1ad3b05 Merge branch 'jk/fast-import-unsafe'
525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()`
e1d911dd4c mingw: disallow backslash characters in tree objects' file names
0060fd1511 clone --recurse-submodules: prevent name squatting on Windows
a52ed76142 fast-import: disallow "feature import-marks" by default
68061e3470 fast-import: disallow "feature export-marks" by default
019683025f fast-import: delay creating leading directories for export-marks
e075dba372 fast-import: stop creating leading directories for import-marks
11e934d56e fast-import: tighten parsing of boolean command line options
816f806786 t9300: create marks files for double-import-marks test
f94804c1f2 t9300: drop some useless uses of cat
4f3e57ef13 submodule--helper: advise on fatal alternate error
10c64a0b3c Doc: explain submodule.alternateErrorStrategy
ec48540fe8 packfile.c: speed up loading lots of packfiles
3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value
a4fb016ba1 pkt-line: fix a typo
0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r
e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data
228f53135a The second batch
6c630f237e Merge branch 'jk/gitweb-anti-xss'
3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell'
4775e02a5c Merge branch 'ma/t7004'
a6c6f8d02a Merge branch 'js/complete-svn-recursive'
3ae8defaf9 Merge branch 'jk/send-pack-remote-failure'
aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix'
4ab9616c76 Merge branch 'sg/skip-skipped-prereq'
723a8adba5 Merge branch 'ds/test-read-graph'
9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation'
406ca29e0d Merge branch 'rs/parse-options-dup-null-fix'
fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging'
8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion'
ef8f621045 Merge branch 'dl/complete-rebase-onto'
3c3e5d0ea2 Merge branch 'tg/stash-refresh-index'
43c5fe1c1d Merge branch 'nn/doc-rebase-merges'
6511cb33c9 Merge branch 'dd/sequencer-utf8'
f165457618 Merge branch 'jk/remove-sha1-to-hex'
a774064fb0 Merge branch 'dj/typofix-merge-strat'
ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates'
d2489ce92c Merge branch 'rs/skip-iprefix'
376e7309e1 Merge branch 'ln/userdiff-elixir'
9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log'
d3096d2ba6 Merge branch 'en/doc-typofix'
26f20fa3fc Merge branch 'ns/test-desc-typofix'
ffd130a363 Merge branch 'en/t6024-style'
5149902ff9 Merge branch 'en/misc-doc-fixes'
bcb06e204c Merge branch 'js/fetch-multi-lockfix'
d08daec001 Merge branch 'rs/trace2-dots'
fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix'
bad5ed39cd Merge branch 'cb/curl-use-xmalloc'
7ab2088255 Merge branch 'rt/fetch-message-fix'
f089ddd56a Merge branch 'es/myfirstcontrib-updates'
3c90710c0c Merge branch 'hw/config-doc-in-header'
d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code'
5444d52866 Merge branch 'js/vreportf-wo-buffering'
05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add'
ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides'
532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default'
dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists'
fac9ab1419 Merge branch 'ma/bisect-doc-sample-update'
a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix'
0be5caf97c Merge branch 'jc/log-graph-simplify'
0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck'
2e697ced9d built-in add -i: offer the `quit` command
d7633578b5 built-in add -i: re-implement the `diff` command
8746e07277 built-in add -i: implement the `patch` command
ab1e1cccaf built-in add -i: re-implement `add-untracked` in C
c54ef5e424 built-in add -i: re-implement `revert` in C
a8c45be939 built-in add -i: implement the `update` command
f37c226454 built-in add -i: prepare for multi-selection commands
c08171d156 built-in add -i: allow filtering the modified files list
0c3944a628 add-interactive: make sure to release `rev.prune_data`
4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance
867fc7f310 grep: don't return an expression from pcre2_free()
c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables
72b006f4bf gpg-interface: prefer check_signature() for GPG verification
7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD
b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r
ccd469450a date.c: switch to reentrant {gm,local}time_r
271c351b2f t7811: don't create unused file
65efb42862 t9300: don't create unused file
f6b9413baf sequencer: fix a memory leak in sequencer_continue()
3eae30e464 doc: replace public-inbox links with lore.kernel.org
46c67492aa doc: recommend lore.kernel.org over public-inbox.org
5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects
17a4ae92ea t7700: s/test -f/test_path_is_file/
d2eee32a89 t7700: move keywords onto their own line
7a1c8c2346 t7700: remove spaces after redirect operators
09279086e8 t7700: drop redirections to /dev/null
756ee7fc9f t7501: stop losing return codes of git commands
38c1aa01de t7501: remove spaces after redirect operators
763b47bafa t5703: stop losing return codes of git commands
eacaa1c180 t5703: simplify one-time-sed generation logic
a29b2429e5 t5317: use ! grep to check for no matching lines
6c37f3ec1b t5317: stop losing return codes of git commands
b66e0a1773 t4138: stop losing return codes of git commands
afd43c9905 t4015: use test_write_lines()
946d2353a3 t4015: stop losing return codes of git commands
50cd31c652 t3600: comment on inducing SIGPIPE in `git rm`
3b737381d8 t3600: stop losing return codes of git commands
0d913dfa7e t3600: use test_line_count() where possible
29a40b5a67 t3301: stop losing return codes of git commands
9b5a9fa60a t0090: stop losing return codes of git commands
17aa9d9c1a t0014: remove git command upstream of pipe
77a946be98 apply-one-time-sed.sh: modernize style
176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job
ed254710ee test: use test_must_be_empty F instead of test_cmp empty F
c74b3cbb83 t7812: add missing redirects
213dabf49d test: use test_must_be_empty F instead of test -z $(cat F)
c93a5aaec8 t1400: use test_must_be_empty
6e4826ea75 t1410: use test_line_count
a5d04a3ef9 t1512: use test_line_count
54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd()
2059e79c0d name-rev: use skip_prefix() instead of starts_with()
1768aaf01d push: use skip_prefix() instead of starts_with()
ec6ee0c07a shell: use skip_prefix() instead of starts_with()
7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with()
a6293f5d28 fetch: use skip_prefix() instead of starts_with()
13ca8fb79e t5150: skip request-pull test if Perl is disabled
ecc0869080 commit-graph: use start_delayed_progress()
44a4693bfc progress: create GIT_PROGRESS_DELAY
528d9e6d01 t/perf: don't depend on Git.pm
b8dcc45387 perf-lib: use a single filename for all measurement types
fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk'
d82dfa7f5b rebase -i: finishing touches to --reset-author-date
1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory
393adf7a6f sequencer: directly call pick_commits() from complete_action()
a2dd67f105 rebase: fill `squash_onto' in get_replay_opts()
3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function
34065541e3 sequencer: update `done_nr' when skipping commands in a todo list
8638114e06 sequencer: update `total_nr' when adding an item to a todo list
0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk
ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk
ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions
9917eca794 l10n: zh_TW: add translation for v2.24.0
0a8e3036a3 reset: parse rev as tree-ish in patch mode
f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits
8d483c8408 doc: document 'git submodule status --cached'
befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick
ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later
9a780a384d mingw: spawned processes need to inherit only standard handles
c5a03b1e29 mingw: work around incorrect standard handles
eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes
a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool
43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values
2d05ef2778 sequencer: fix empty commit check when amending
ea8b7be147 git svn: stop using `rebase --preserve-merges`
67a6ea6300 gpg-interface: limit search for primary key fingerprint
392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern
cff4e9138d sparse-checkout: check for dirty status
416adc8711 sparse-checkout: update working directory in-process for 'init'
f75a69f880 sparse-checkout: cone mode should not interact with .gitignore
fb10ca5b54 sparse-checkout: write using lockfile
99dfa6f970 sparse-checkout: use in-process update for disable subcommand
e091228e17 sparse-checkout: update working directory in-process
e9de487aa3 sparse-checkout: sanitize for nested folders
4dcd4def3c unpack-trees: add progress to clear_ce_flags()
eb42feca97 unpack-trees: hash less in cone mode
af09ce24a9 sparse-checkout: init and set in cone mode
96cc8ab531 sparse-checkout: use hashmaps for cone patterns
879321eb0b sparse-checkout: add 'cone' mode
e6152e35ff trace2: add region in clear_ce_flags
72918c1ad9 sparse-checkout: create 'disable' subcommand
7bffca95ea sparse-checkout: add '--stdin' option to set subcommand
f6039a9423 sparse-checkout: 'set' subcommand
d89f09c828 clone: add --sparse mode
bab3c35908 sparse-checkout: create 'init' subcommand
94c0956b60 sparse-checkout: create builtin with 'list' subcommand
679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files
df6d3d6802 lib-bash.sh: move `then` onto its own line
2a02262078 t5520: replace `! git` with `test_must_fail git`
c245e58bb6 t5520: remove redundant lines in test cases
a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp
e959a18ee7 t5520: don't put git in upstream of pipe
5540ed27bc t5520: test single-line files by git with test_cmp
dd0f1e767b t5520: use test_cmp_rev where possible
979f8891cc t5520: replace test -{n,z} with test-lib functions
3037d3db90 t5520: use test_line_count where possible
93a9bf876b t5520: remove spaces after redirect operator
ceeef863de t5520: replace test -f with test-lib functions
4c8b046f82 t5520: let sed open its own input
53c62b9810 t5520: use sq for test case names
e8d1eaf9b4 t5520: improve test style
2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals
8cb7980382 t0000: test multiple local assignment
5b583e6a09 format-patch: pass notes configuration to range-diff
bd36191886 range-diff: pass through --notes to `git log`
9f726e1b87 range-diff: output `## Notes ##` header
3bdbdfb7a5 t3206: range-diff compares logs with commit notes
75c5aa0701 t3206: s/expected/expect/
79f3950d02 t3206: disable parameter substitution in heredoc
3a6e48e9f7 t3206: remove spaces after redirect operators
26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish
077a1fda82 userdiff: support Python async functions
3798149a74 SubmittingPatches: use `--pretty=reference`
1f0fc1db85 pretty: implement 'reference' format
618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type
0df621172d pretty: provide short date format
ac52d9410e t4205: cover `git log --reflog -z` blindspot
3e8ed3b93e pretty.c: inline initalize format_context
4982516451 revision: make get_revision_mark() return const pointer
f0f9de2bd7 completion: complete `tformat:` pretty format
fb2ffa77a6 SubmittingPatches: remove dq from commit reference
bae74c9dfb pretty-formats.txt: use generic terms for hash
bd00717eab SubmittingPatches: use generic terms for hash
9d45ac4cbf rev-list-options.txt: remove reference to --show-notes
828e829b9e argv-array: add space after `while`
e440fc5888 commit: support the --pathspec-from-file option
66a25a7242 doc: commit: synchronize <pathspec> description
64bac8df97 reset: support the `--pathspec-from-file` option
d137b50756 doc: reset: synchronize <pathspec> description
24e4750c96 pathspec: add new function to parse file
0dbc4a0edf ci(osx): update homebrew-cask repository with less noise
e02058a729 sequencer: handle rebase-merges for "onto" message
bae60ba7e9 builtin/unpack-objects.c: show throughput progress
2d92ab32fd rev-parse: make --show-toplevel without a worktree an error
9e5afdf997 fetch: add trace2 instrumentation
4c4066d95d run-command: move doc to run-command.h
6c51cb525d trace2: move doc to trace2.h
7db0305438 parse-options: add link to doc file in parse-options.h
d95a77d059 submodule-config: move doc to submodule-config.h
f3b9055624 credential: move doc to credential.h
bbcfa3002a tree-walk: move doc to tree-walk.h
971b1f24a2 argv-array: move doc to argv-array.h
f1ecbe0f53 trace: move doc to trace.h
13aa9c8b70 cache: move doc to cache.h
c0be43f898 sigchain: move doc to sigchain.h
19ef3ddd36 pathspec: move doc to pathspec.h
301d595e72 revision: move doc to revision.h
3a1b3415d9 attr: move doc to attr.h
126c1ccefb refs: move doc to refs.h
d27eb356bf remote: move doc to remote.h and refspec.h
405c6b1fbc sha1-array: move doc to sha1-array.h
d3d7172e40 merge: move doc to ll-merge.h
3f1480b745 graph: move doc to graph.h and graph.c
266f03eccd dir: move doc to dir.h
13c4d7eb22 diff: move doc to diff.h and diffcore.h
cd5522271f rebase -r: let `label` generate safer labels
867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()`
8c15904462 built-in add -i: implement the `help` command
3d965c7674 built-in add -i: use color in the main loop
68db1cbf8e built-in add -i: support `?` (prompt help)
76b743234c built-in add -i: show unique prefixes of the commands
6348bfba58 built-in add -i: implement the main loop
a376e37b2c gitweb: escape URLs generated by href()
b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI
f28bceca75 t/gitweb-lib.sh: drop confusing quotes
0eba60c9b7 t9502: pass along all arguments in xss helper
932757b0cc INSTALL: use existing shell scripts as example
b018719927 t7004: check existence of correct tag
1daaebcaa5 built-in add -i: color the header in the `status` command
5e82b9e4d2 built-in add -i: implement the `status` command
e4cb659ebd diff: export diffstat interface
f83dff60a7 Start to implement a built-in version of `git add --interactive`
df53c80822 stash: make sure we have a valid index before writing it
ad7a403268 send-pack: check remote ref status on pack-objects failure
d91ce887c9 t6120-describe: correct test repo history graph in comment
1f9247a3bd completion: tab-complete "git svn --recursive"
603960b50e promisor-remote: remove fetch_if_missing=0
e362fadcd0 clone: remove fetch_if_missing=0
169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL
51bd6be32d mingw: use COPY_ARRAY for copying array
4bd0593e0f test-tool: use 'read-graph' helper
e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway
d784d978f6 t4215: use helper function to check output
61eea521fe fsmonitor: do not compare bitmap size with size of split index
b19f3fe9dd hex: drop sha1_to_hex()
c1ce9c06d0 completion: learn to complete `git rebase --onto=`
f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls
d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase
aa6d7f93ed hex: drop sha1_to_hex_r()
52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch
5772b0c745 sequencer: reencode old merge-commit message
e0eba649e8 bundle-verify: add --quiet
79862b6b77 bundle-create: progress output control
73c3253d75 bundle: framework for options before bundle file
68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in"
b375744274 sequencer: reencode squashing commit's message
019a9d8362 sequencer: reencode revert/cherry-pick's todo list
0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list
e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding
1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary
d9f6f3b619 The first batch post 2.24 cycle
28014c1084 Merge branch 'bc/hash-independent-tests-part-6'
57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree'
c22f63c40f Merge branch 'pb/pretty-email-without-domain-part'
5731ca3657 Merge branch 'hw/remove-api-docs-placeholder'
14b58c62bc Merge branch 'sg/commit-graph-usage-fix'
eff313f8a7 Merge branch 'dl/apply-3way-diff3'
db806d7064 Merge branch 'sg/dir-trie-fixes'
f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix'
8f1119b988 Merge branch 'wb/midx-progress'
d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes'
0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges'
8f40d89783 Merge branch 'hv/bitshift-constants-in-blame'
d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head'
5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer'
b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc'
15d9f3dc66 Merge branch 'es/walken-tutorial'
026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor'
ed28358833 convert: use skip_iprefix() in validate_encoding()
89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding()
03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules
ae821ffe83 multimail: fix a few simple spelling errors
557c5895c2 sha1dc: fix trivial comment spelling error
aa74be316a Fix spelling errors in test commands
96c0caf5e3 Fix spelling errors in messages shown to users
4dc8b1c114 Fix spelling errors in names of tests
7a40cf1553 Fix spelling errors in comments of testcases
15beaaa3d1 Fix spelling errors in code comments
a807200f67 userdiff: add Elixir to supported userdiff languages
461caf3e8a git-shortlog.txt: include commit limiting options
6462d5eb9a fetch: remove fetch_if_missing=0
46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion
99b2ba35f5 t0028: eliminate non-standard usage of printf
add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul`
14c4776d75 t: fix typo in test descriptions
270de6acbe t6024: modernize style
77363a51fb name-hash.c: remove duplicate word in comment
c92faa4d22 hashmap: fix documentation misuses of -> versus .
a6d39f2efb git-filter-branch.txt: correct argument name typo
4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators
8915297925 Fix spelling errors in documentation outside of Documentation/
031fd4b93b Documentation: fix a bunch of typos, both old and new
dd0b61f577 fsmonitor: fix watchman integration
5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare()
7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph
c14e6e7903 fetch: add the command-line option `--write-commit-graph`
da72936f54 Git 2.24
1d34d425d4 Merge branch 'bc/doc-use-docbook-5'
dac1d83c91 Merge branch 'ds/commit-graph-on-fetch'
c32ca691c2 Merge branch 'jt/delay-fetch-if-missing'
ab6b50e4c8 Merge https://github.com/prati0100/git-gui
93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po
a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2
fe28ad8520 rebase: add --reset-author-date
08187b4cba rebase -i: support --ignore-date
0185c683c9 sequencer: rename amend_author to author_to_rename
cbd8db17ac rebase -i: support --committer-date-is-author-date
c068bcc59b sequencer: allow callers of read_author_script() to ignore fields
ba51d2fb24 rebase -i: add --ignore-whitespace flag
3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower
3ada78de3f myfirstcontrib: add dependency installation step
4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt
4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly
8dfb04ae96 update-index: optionally leave skip-worktree entries alone
116d1fa6c6 vreportf(): avoid relying on stdio buffering
efd5444238 RelNotes/2.24.0: fix self-contradictory note
391c7e40b5 fetch.c: fix typo in a warning message
55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template
849e43680d RelNotes/2.24.0: typofix
0115e5d929 git-diff.txt: document return code of `--no-index`
798d66e35d l10n: de.po: Update German translation
c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u)
f21f8f5d35 Git 2.24-rc2
8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix'
0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix'
f2db52c46b Merge branch 'js/mingw-needs-hiding-fix'
5b7594abdc Merge branch 'master' of github.com:vnwildman/git
034d33653a Merge branch 'next' of github.com:ChrisADR/git-po
26b061007c submodule: teach set-url subcommand
460782b7be t7519-status-fsmonitor: improve comments
d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses
4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config
1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694)
f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0
762d5b4f46 help: add gitsubmodules to the list of guides
76a53d640f git_path(): handle `.lock` files correctly
3ce47211a6 t1400: wrap setup code in test case
44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string
6c02042139 clone: rename static function `dir_exists()`.
8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command
77200e9332 l10n: es: 2.24.0 round 2
e42df36b42 Merge branch 'l10n/it/update-italian-translation'
5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2
51728480fe l10n: fr v2.24.0 rnd2
045a548698 l10n: git.pot: v2.24.0 round 2 (1 new)
468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master
b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree()
c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit()
103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag()
f648ee7088 fsck: rename vague "oid" local variables
cc579000bf fsck: don't require an object struct in verify_headers()
7854399366 fsck: don't require an object struct for fsck_ident()
b8b00f1693 fsck: drop blob struct from fsck_finish()
6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob()
38370253fd fsck: don't require an object struct for report()
f59793763d fsck: only require an oid for skiplist functions
5afc4b1dc6 fsck: only provide oid/type in fsck_error callback
82ef89b318 fsck: don't require object structs for display functions
733902905d fsck: use oids rather than objects for object_name API
d40bbc109b fsck_describe_object(): build on our get_object_name() primitive
a59cfb3230 fsck: unify object-name code
23a173a761 fsck: require an actual buffer for non-blobs
2175a0c601 fsck: stop checking tag->tagged
ec65231571 fsck: stop checking commit->parent counts
1de6007d85 fsck: stop checking commit->tree value
228c78fbd4 commit, tag: don't set parsed bit for parse failures
60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()`
8b656572ca builtin/commit-graph.c: remove subcommand-less usage string
fa26d5ede6 t4048: abstract away SHA-1-specific constants
cf02be8486 t4045: make hash-size independent
38ee26b2a3 t4044: update test to work with SHA-256
37ab8ebef1 t4039: abstract away SHA-1-specific constants
0370b35414 t4038: abstract away SHA-1 specific constants
0253e126a2 t4034: abstract away SHA-1-specific constants
45e2ef2b1d t4027: make hash-size independent
79b0edc1a0 t4015: abstract away SHA-1-specific constants
840624ff55 t4011: abstract away SHA-1-specific constants
32a6707267 t4010: abstract away SHA-1-specific constants
440bf91dfa t3429: remove SHA1 annotation
0b408ca2bd t1305: avoid comparing extensions
2eabd38313 rev-parse: add a --show-object-format option
52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode
45e206f0d8 t4203: use test-lib.sh definitions
2ae4944aac t6006: use test-lib.sh definitions
cb99a34e23 commit-graph: fix writing first commit-graph during fetch
e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug
7b4fb434b4 documentation: remove empty doc files
566a1439f6 Git 2.24-rc1
04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix'
4d6fb2beeb Merge branch 'ds/feature-macros'
5f0b6ed907 Merge branch 'js/azure-ci-osx-fix'
c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs'
1b4f85285f Merge branch 'dl/submodule-set-branch'
c7aadccba0 fetch: delay fetch_if_missing=0 until after config
c11e9966cb repo-settings: read an int for index.version
091489d068 apply: respect merge.conflictStyle in --3way
aa76ae4905 t4108: demonstrate bug in apply
95806205cd t4108: use `test_config` instead of `git config`
b0069684d4 t4108: remove git command upstream of pipe
fa87b81385 t4108: replace create_file with test_write_lines
7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job
6c96630cb0 config: move documentation to config.h
d81542e6f3 Eleventh batch
e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix'
d45d771978 Merge branch 'bc/smart-http-atomic-push'
22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix'
2e215b7959 Merge branch 'sb/userdiff-dts'
e3cf08361a Merge branch 'sg/progress-fix'
b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix'
c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc'
f45f88b2e4 path.c: don't call the match function without value in trie_find()
c72fc40d09 path.c: clarify two field names in 'struct common_dir'
8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file
7cb8c929d7 path.c: clarify trie_find()'s in-code comment
e536b1fedf Documentation: mention more worktree-specific exceptions
680cba2c2b multi-pack-index: add [--[no-]progress] option.
64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack
ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file
8dc18f8937 midx: add progress to expire_midx_packs
840cef0c70 midx: add progress to write_midx_file
efbc3aee08 midx: add MIDX_PROGRESS flag
0eb3671ed9 ci(osx): use new location of the `perforce` cask
da1e295e00 t604[236]: do not run setup in separate tests
49b8133a9e merge-recursive: fix merging a subdirectory into the root directory
d3eebaad5e merge-recursive: clean up get_renamed_dir_portion()
80736d7c5e doc: am --show-current-patch gives an entire e-mail message
a8e2c0eadc t7419: change test_must_fail to ! for grep
19c29e538e t4014: make output-directory tests self-contained
12a4aeaad8 Merge branch 'js/azure-pipelines-msvc'
399c23c046 ci(visual-studio): actually run the tests in parallel
711cd6d15c ci(visual-studio): use strict compile flags, and optimization
370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0
cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master
907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master
13bcea8c7f l10n: fr 2.24.0 rnd 1
135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master
3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed)
8da56a4848 userdiff: fix some corner cases in dts regex
86795774bb builtin/blame.c: constants into bit shift format
feebd2d256 rebase: hide --preserve-merges option
0e40a73a4c Doc: Bundle file usage
78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error
12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error
c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error
2b6f6ea1bd test-progress: fix test failures on big-endian systems
f757409e36 l10n: bg.po: Updated Bulgarian translation (4693)
176f5adfdb completion: clarify installation instruction for zsh
d966095db0 Git 2.24-rc0
90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array'
3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth'
d0258d0944 Merge branch 'rs/http-push-simplify'
bb52def6da Merge branch 'jj/stash-reset-only-toplevel'
f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs'
e5fca6b573 Merge branch 'bb/compat-util-comment-fix'
43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup'
07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely'
2d74d28ee0 Merge branch 'dl/compat-cleanup'
9b83a94829 Merge branch 'ta/t1308-typofix'
376012c919 Merge branch 'js/doc-stash-save'
10da030ab7 grep: avoid leak of chartables in PCRE2
513f2b0bbd grep: make PCRE2 aware of custom allocator
57d4660468 grep: make PCRE1 aware of custom allocator
d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand
8af69cf3e2 t3301: test diagnose messages for too few/many paramters
6f1194246a remote-curl: pass on atomic capability to remote side
bbb13e8188 graph: fix coloring of octopus dashes
92beecc136 graph: flatten edges that fuse with their right neighbor
479db18bc0 graph: smooth appearance of collapsing edges on commit lines
0195285b95 graph: rename `new_mapping` to `old_mapping`
d62893ecc1 graph: commit and post-merge lines for left-skewed merges
0f0f389f12 graph: tidy up display of left-skewed merges
458152cce1 graph: example of graph output that can be simplified
ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state
46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()`
a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()`
9157a2a032 graph: reuse `find_new_column_by_commit()`
210179a20d graph: handle line padding in `graph_next_line()`
fbccf255f9 graph: automatically track display width of graph lines
5374a290aa fetch-pack: write fetched refs to .promisor
4627bc777e sequencer: run post-commit hook
49697cb721 move run_commit_hook() to libgit and use it there
12bb7a540a sequencer.h fix placement of #endif
6a619ca03c t3404: remove uneeded calls to set_fake_editor
b2dbacbddf t3404: set $EDITOR in subshell
88a92b6c73 t3404: remove unnecessary subshell
bf8e65b30b format-patch: teach --cover-from-description option
a92331df18 format-patch: use enum variables
46273df7bf format-patch: replace erroneous and condition
3b3c79f6c9 diff-highlight: fix a whitespace nit
108b97dc37 Ninth batch
cbe8cdd3a0 Merge branch 'jk/coc'
3b9ec27919 Merge branch 'js/trace2-fetch-push'
c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch'
1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup'
eb3de5b823 Merge branch 'js/xdiffi-comment-updates'
4e8371ec26 Merge branch 'dl/t0000-skip-test-test'
b6d712fa4e Merge branch 'tg/range-diff-output-update'
77458870a5 Merge branch 'gs/sq-quote-buf-pretty'
5efabc7ed9 Merge branch 'ew/hashmap'
d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files'
6ed610b968 Merge branch 'am/t0028-utf16-tests'
5b900fb812 Merge branch 'dl/octopus-graph-bug'
16d9d7184b Merge branch 'en/fast-imexport-nested-tags'
6d5291be45 Merge branch 'js/azure-pipelines-msvc'
ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd'
d96e31e390 Merge branch 'js/fetch-jobs'
280bd44551 Merge branch 'en/merge-recursive-cleanup'
062a309d36 remote-curl: use argv_array in parse_push()
a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes
5cc6a4be11 http-push: simplify deleting a list item
556895d0c8 stash: avoid recursive hard reset on submodules
b524f6b399 Merge branch 'ka/japanese-translation'
f6f3824b4e git-gui: improve Japanese translation
61f4b407d3 Merge branch 'py/readme'
1e6880fd06 git-gui: add a readme
edefc31873 format-patch: create leading components of output directory
68b69211b2 git-compat-util: fix documentation syntax
fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth()
e0479fa073 documentation: add tutorial for object walking
3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed
4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target
9cad1c4488 pthread.h: manually align parameter lists
8c1cfd58e3 t1308-config-set: fix a test that has a typo
57d8f4b4c7 doc(stash): clarify the description of `save`
08da6496b6 Eighth batch
07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup'
f0d407e6ae Merge branch 'kt/add-i-progress'
66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree'
a4c5d9f66e Merge branch 'rs/dedup-includes'
159cdabd87 Merge branch 'js/range-diff-noprefix'
93424f1f7d Merge branch 'cb/pcre1-cleanup'
a73f91774c Merge branch 'ab/pcre-jit-fixes'
4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword'
020011f2cb Merge branch 'tk/git-svn-trim-author-name'
676278f8ea Merge branch 'bc/object-id-part17'
aafb75452b Merge branch 'en/clean-nested-with-ignored'
3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails
5cdf2301d4 add a Code of Conduct document
70bf0b755a Seventh batch
9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat'
2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary'
d17f54947d Merge branch 'rs/convert-fix-utf-without-dash'
82c80f98e6 Merge branch 'py/git-gui-has-maintainer'
6e12570822 Merge branch 'ah/cleanups'
772cad0afb Merge branch 'js/diff-rename-force-stable-sort'
424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path'
678a9ca629 Merge branch 'as/shallow-slab-use-fix'
0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix'
042a54d251 Merge branch 'am/visual-studio-config-fix'
03d3b1297c xdiffi: fix typos and touch up comments
b05b40930e t0000: cover GIT_SKIP_TESTS blindspots
d8bc1a518a send-pack: never fetch when checking exclusions
756fb0dedb t4014: treat rev-list output as the expected value
2b6a9b13ca range-diff: don't segfault with mode-only changes
360c7ba330 transport: push codepath can take arbitrary repository
ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments
b657047719 merge-recursive: fix the fix to the diff3 common ancestor label
b744c3af07 Sixth batch
417056578a Merge branch 'bw/submodule-helper-usage-fix'
9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check'
1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a'
59b19bcd9f Merge branch 'cc/multi-promisor'
1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way'
5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort'
eb35c18e42 Merge branch 'sg/travis-help-debug'
cabb145fe3 Merge branch 'rs/alias-use-copy-array'
56c7ab0f4e Merge branch 'sg/t-helper-gitignore'
e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang'
583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules'
337e3f2b49 Merge branch 'rs/nth-switch-code-simplification'
8f53fe1733 Merge branch 'hb/hg-to-git-py3'
ef93bfbd45 Merge branch 'sg/progress-fix'
980351d1ac Merge branch 'js/doc-patch-text'
80693e3f09 Merge branch 'tb/commit-graph-harden'
ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge'
3f84633563 Merge branch 'dl/cocci-everywhere'
caf150ce7d Merge branch 'gs/commit-graph-progress'
1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim'
1398171378 Merge branch 'rs/commit-graph-use-list-count'
773521df26 Merge branch 'rs/nth-parent-parse'
7f17913161 Merge branch 'dl/submodule-set-branch'
cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix'
bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees'
098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack'
37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc'
e392382f95 Merge branch 'dl/complete-rebase-and-archive'
cda8faa37e Merge branch 'jk/commit-graph-cleanup'
36d2fca82b Merge branch 'ss/get-time-cleanup'
ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude'
ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob'
ba2d451122 Merge branch 'tg/stash-refresh-index'
e2b5038d87 hashmap_entry: remove first member requirement from docs
404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry
23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators
c8e424c9c9 hashmap: introduce hashmap_free_entries
8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry *
87571c3f71 hashmap: use *_entry APIs for iteration
939af16eac hashmap_cmp_fn takes hashmap_entry params
f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *"
f0e63c4113 hashmap: use *_entry APIs to wrap container_of
6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *"
973d5eea74 introduce container_of macro
26b455f21e hashmap_put takes "struct hashmap_entry *"
28ee794128 hashmap_remove takes "const struct hashmap_entry *"
b6c5241606 hashmap_get takes "const struct hashmap_entry *"
b94e5c1df6 hashmap_add takes "struct hashmap_entry *"
f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *"
d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *"
d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry
12878c8351 coccicheck: detect hashmap_entry.hash assignment
e010a41216 diff: use hashmap_entry_init on moved_entry.ent
f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo"
de5abb5f7a git-p4: auto-delete named temporary file
c90b652afd Fifth batch
f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1'
b0f8aed48f Merge branch 'ma/user-manual-markup-update'
faf5576a8d Merge branch 'bc/doc-use-docbook-5'
314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes'
70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo'
847650798b Merge branch 'am/mailmap-andrey-mazo'
1a155f2e66 Merge branch 'jc/git-gui-has-maintainer'
1bcef51204 t/oid-info: add empty tree and empty blob values
ecde49bb8a t/oid-info: allow looking up hash algorithm name
11a3d3aadd git-rev-list.txt: prune options in synopsis
7d2f003ee4 Documentation: update the location of the git-gui repo
b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding()
46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines
b35304bf95 ci: really use shallow clones on Azure Pipelines
ab7d854aba tests: let --immediate and --write-junit-xml play well together
be5d88e112 test-tool run-command: learn to run (parts of) the testsuite
5d65ad17a9 vcxproj: include more generated files
030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built
61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable()
e4347c9434 msvc: handle DEVELOPER=1
ed712ef8d5 msvc: ignore some libraries when linking
5b8f9e2417 compat/win32/path-utils.h: add #include guards
41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning
c097b95a26 msvc: avoid using minus operator on unsigned types
dfd557c978 stash apply: report status correctly even in a worktree's subdirectory
d54dea77db fetch: let --jobs=<n> parallelize --multiple, too
87db61a436 trace2: write discard message to sentinel files
83e57b04e6 trace2: discard new traces if target directory has too many files
11c21f22de t4214: demonstrate octopus graph coloring failure
25eb905e14 t4214: explicitly list tags in log
63be8c8dd7 t4214: generate expect in their own test cases
a7a5590c6e t4214: use test_merge
94ba151300 test-lib: let test_merge() perform octopus merges
22541013d0 docs: clarify trace2 version invariants
3d4548e7e2 docs: mention trace2 target-dir mode in git-config
2fe44394c8 treewide: remove duplicate #include directives
dbcd970c27 push: do not pretend to return `int` from `die_push_simple()`
941790d7de fast-export: handle nested tags
8d7d33c1ce t9350: add tests for tags of things other than a commit
a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags
208d69246e fast-export: add support for --import-marks-if-exists
b8f50e5b60 fast-import: add support for new 'alias' command
f73b2aba05 fast-import: allow tags to be identified by mark labels
3164e6bd24 fast-import: fix handling of deleted tags
8085050ab4 add -i: show progress counter in the prompt
69fdb922ad Merge branch 'bw/diff3-conflict-style'
b436825b9b git-gui: support for diff3 conflict style
937b76ed49 range-diff: internally force `diff.noprefix=true`
411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job
25e4b8099c push: add trace2 instrumentation
5fc31180d8 fetch: add trace2 instrumentation
53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value
c3b57dc2a0 git-gui: use existing interface to query a path's attribute
45ab460d4a Merge branch 'js/git-bash-if-available'
0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command
71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only)
54a80a9ad8 wrapper: use a loop instead of repetitive statements
baed6bbb5b diffcore-break: use a goto instead of a redundant if statement
8da02ce62a commit-graph: remove a duplicate assignment
ddb3c856f3 shallow.c: don't free unallocated slabs
8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits
65904b8b2b promisor-remote: skip move_to_tail when no-op
2049b8dc65 diffcore_rename(): use a stable sort
97fff61012 Move git_sort(), a stable sort, into into libgit.a
69f272b922 dir: special case check for the possibility that pathspec is NULL
6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available
bc12974a89 Fourth batch
5a5350940b Merge branch 'ds/commit-graph-on-fetch'
974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch'
9755f70fe6 Merge branch 'ds/include-exclude'
93fc8760e7 Merge branch 'jh/trace2-pretty-output'
640f9cd599 Merge branch 'dl/rebase-i-keep-base'
026428c35e Merge branch 'sg/clean-nested-repo-with-ignored'
21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip'
d693345518 Merge branch 'dl/use-sq-from-test-lib'
d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes'
2be6ccc01a Merge branch 'sg/git-test-boolean'
cf861cd7a0 Merge branch 'rs/get-tagged-oid'
91243b019d Merge branch 'en/filter-branch-deprecation'
9bc67b6658 Merge branch 'en/merge-options-ff-and-friends'
fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden'
cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option'
8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return'
3ff6af7753 Merge branch 'nd/switch-and-restore'
aadac067aa Merge branch 'tb/file-url-to-unc-path'
b57a88a5f1 Merge branch 'js/gitdir-at-unc-root'
6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path'
430439536b Merge branch 'rs/parse-tree-indirect'
991fd97b9a Merge branch 'jk/fast-import-history-bugfix'
74a39b9bcc Merge branch 'mh/notes-duplicate-entries'
37801f0665 Merge branch 'tb/banned-vsprintf-namefix'
21ce0b48f3 Merge branch 'mh/release-commit-memory-fix'
f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup'
bf6136cab8 Merge branch 'rs/strbuf-detach'
a2e22bb3ad Merge branch 'rs/trace2-dst-warning'
1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup'
0281733483 Merge branch 'bc/hash-independent-tests-part-5'
f06fb376ed Merge branch 'jc/test-cleanup'
00bb74453d Merge branch 'dl/compat-cleanup'
59438be06c Merge branch 'js/visual-studio'
cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone'
af2abd870b fast-export: fix exporting a tag and nothing else
c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor
dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit
fd5b820d9c user-manual.txt: change header notation
e79b34533a user-manual.txt: add missing section label
b503a2d515 Makefile: emulate compile in $(HCO) target better
af26e2a9d2 pack-bitmap.h: remove magic number
b06fdead04 promisor-remote.h: include missing header
97b989ee3a apply.h: include missing header
4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name
d928a8388a t0028: add more tests
0b63fd6965 t0028: fix test for UTF-16-LE-BOM
fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration
2e09c01232 name-rev: avoid cutoff timestamp underflow
8464f94aeb promisor-remote.h: drop extern from function declaration
75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp
24c681794f doc: MyFirstContribution: fix cmd placement instructions
c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode
60c60b627e Merge branch 'py/git-git-extra-stuff'
faf420e05a treewide: correct several "up-to-date" to "up to date"
b71c6c3b64 Fix build with core.autocrlf=true
16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff
26e3d1cbea .mailmap: update email address of Andrey Mazo
27ea41c0b4 t/helper: ignore only executable files
7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()
83e3ad3b12 merge-recursive: symlink's descendants not in way
34933d0eff stash: make sure to write refreshed cache
e080b34540 merge: use refresh_and_write_cache
22184497a3 factor out refresh_and_write_cache function
7371612255 commit-graph: add --[no-]progress to write and verify
47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW
253bfe49bd SubmittingPatches: git-gui has a new maintainer
d17ae00c97 hg-to-git: make it compatible with both python3 and python2
4c86140027 Third batch
f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http'
627b826834 Merge branch 'md/list-objects-filter-combo'
b9ac6c59b8 Merge branch 'cc/multi-promisor'
de67293e74 Merge branch 'sg/line-log-tree-diff-optim'
95486229e3 Merge branch 'sg/complete-configuration-variables'
f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook'
a2e524ecf3 Merge branch 'cb/curl-use-xmalloc'
128666753b Merge branch 'jk/drop-release-pack-memory'
917a319ea5 Merge branch 'js/rebase-r-strategy'
7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui
4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout()
0d4304c124 doc: fix reference to --ignore-submodules
af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py
8a3a6817e2 Merge gitk to pick up emergency build fix
2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po
9027af58e2 Makefile: run coccicheck on more source files
43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES)
5dedf7de53 Makefile: define THIRD_PARTY_SOURCES
902b90cf42 clean: fix theoretical path corruption
ca8b5390db clean: rewrap overly long line
09487f2cba clean: avoid removing untracked files in a nested git repository
e86bbcf987 clean: disambiguate the definition of -d
3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run
29b577b960 dir: add commentary explaining match_pathspec_item's return value
89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it
a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case
404ebceda0 dir: also check directories for matching pathspecs
a5e916c745 dir: fix off-by-one error in match_pathspec_item
bbbb6b0b89 dir: fix typo in comment
7541cc5302 t7300: add testcases showing failure to clean specified pathspecs
0eb7c37a8a diff, log doc: small grammer, format, and language fixes
6fae6bd518 diff, log doc: say "patch text" instead of "patches"
2bb74b53a4 Test the progress display
bbf47568ad Revert "progress: use term_clear_line()"
cf6a2d2557 Makefile: strip leading ./ in $(LIB_H)
b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup
689a146c91 commit-graph: use commit_list_count()
59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N"
a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N"
a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base"
cf34337f98 list-objects-filter: give a more specific error sparse parsing error
4c96a77594 list-objects-filter: delay parsing of sparse oid
72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter
83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer
7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>`
226daba280 Doc/Makefile: give mansource/-version/-manual attributes
40e747e89d git-submodule.txt: fix AsciiDoc formatting error
f6461b82b9 Documentation: fix build with Asciidoctor 2
3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
f7a8834ba4 Merge branch 'bp/amend-toggle-bind'
ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit"
9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes
d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog
beffae768a gitk: Add Chinese (zh_CN) translation
56d9cbe68b packfile: expose get_delta_base()
bab28d9f97 builtin/pack-objects: report reused packfile objects
6c8ec8c30a Merge branch 'bw/commit-scrollbuffer'
acfa495519 Merge branch 'bw/amend-checkbutton'
da08d559b7 git-gui: add horizontal scrollbar to commit buffer
ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton
aeeb978ba6 completion: teach archive to use __gitcomp_builtin
2b9bd488ae completion: teach rebase to use __gitcomp_builtin
d49dffde9a completion: add missing completions for log, diff, show
6abada1880 upload-pack: disable commit graph more gently for shallow traversal
fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time
72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set
4fd39c76e6 doc: minor formatting fix
29f4332e66 Quit passing 'now' to date code
c77abf0460 Merge branch 'py/revert-hunks-lines'
5a2bb62180 Merge branch 'bp/widget-focus-hotkeys'
e07446ed5f git-gui: add hotkeys to set widget focus
f981ec18cf cache-tree: do not lazy-fetch tentative tree
f1d4a28250 Second batch
c8ada15456 Merge branch 'bc/reread-attributes-during-rebase'
8f3ba423e7 Merge branch 'tg/t0021-racefix'
a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email'
d49c2c3466 Merge branch 'sb/userdiff-dts'
2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe'
4c49dd042d Merge branch 'nd/diff-parseopt'
d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix'
8ce8a63b46 Merge branch 'ds/midx-expire-repack'
9437394661 Merge branch 'cb/fetch-set-upstream'
af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix'
fa9e7934c7 Merge branch 'bm/repository-layout-typofix'
d1a251a1fa Merge branch 'en/checkout-mismerge-fix'
e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental'
f4f8dfe127 Merge branch 'ds/feature-macros'
4a12f89865 Merge branch 'jk/eoo'
b4a1eec332 Merge branch 'jk/repo-init-cleanup'
70336bd50a Merge branch 'py/git-gui-do-quit'
ad7c543e3b grep: skip UTF8 checks explicitly
0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration()
b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration
4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor
b7e1ba5649 git-merge-index.txt: wrap shell listing in "----"
38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----"
5371813768 git-ls-remote.txt: wrap shell listing in "----"
1925fe0c8a Documentation: wrap config listings in "----"
922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor
2017956a19 Documentation: wrap blocks with "--"
dd2e50a84e commit-graph: turn off save_commit_buffer
67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits
806278dead commit-graph.c: handle corrupt/missing trees
16749b8dd2 commit-graph.c: handle commit parsing errors
23424ea759 t/t5318: introduce failing 'git commit-graph write' tests
bf1e28e0ad builtin/rebase.c: Remove pointless message
d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing
bd482d6e33 t: use common $SQ variable
3a37876b5d pack-objects: drop packlist index_pos optimization
7e6b96c73b test-read-cache: drop namelen variable
e4b369069e diff-delta: set size out-parameter to 0 for NULL delta
7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint
f1cbd033e2 pack-objects: use object_id in packlist_alloc()
0dfed92dfd git-am: handle missing "author" when parsing commit
3960290675 ci: restore running httpd tests
6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests
c77722b3ea use get_tagged_oid()
dad3f0607b tag: factor out get_tagged_oid()
468ce99b77 unpack-trees: rename 'is_excluded_from_list()'
65edd96aec treewide: rename 'exclude' methods to 'pattern'
4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_'
caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list'
ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern'
483e861111 t9902: use a non-deprecated command for testing
9df53c5de6 Recommend git-filter-repo instead of git-filter-branch
7b6ad97939 t6006: simplify, fix, and optimize empty message test
50094ca45f config/format.txt: specify default value of format.coverLetter
c1a6f21cd4 Doc: add more detail for git-format-patch
854b5cb46a t4014: stop losing return codes of git commands
dd2b6b6860 t4014: remove confusing pipe in check_threading()
6bd26f58ea t4014: use test_line_count() where possible
c6ec6dadba t4014: let sed open its own files
f2e2fa8f60 t4014: drop redirections to /dev/null
460609cbd5 t4014: use indentable here-docs
92014b69bb t4014: remove spaces after redirect operators
0ab74e979c t4014: use sq for test case names
cb46c40662 t4014: move closing sq onto its own line
b562a54c01 t4014: s/expected/expect/
e770fbfeff t3005: remove unused variable
da280f5f1a t: use LF variable defined in the test harness
7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch
552fc5016f mingw: apply array.cocci rule
476998d05b t3427: accelerate this test by using fast-export and fast-import
aac6ff7b5b .gitignore: stop ignoring `.manifest` files
2c65d90f75 am: reload .gitattributes after patching it
1577dc0f7c tree: simplify parse_tree_indirect()
50f26bd035 fetch: add fetch.writeCommitGraph config setting
8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set
27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options
0a8bc7068f clarify documentation for remote helpers
80e3658647 help: make help_unknown_ref() NORETURN
313677627a checkout: add simple check for 'git checkout -b'
3441de5b9c gitk: Make web links clickable
a4fa2f0a4c git-gui: allow undoing last revert
414d924beb rebase: teach rebase --keep-base
6330209d7d rebase tests: test linear branch topology
4effc5bc96 rebase: fast-forward --fork-point in more cases
c0efb4c1dd rebase: fast-forward --onto in more cases
2b318aa6c3 rebase: refactor can_fast_forward into goto tower
c9efc21683 t3432: test for --no-ff's interaction with fast-forward
1ebec8dfc1 fast-import: duplicate into history rather than passing ownership
9756082b3c fast-import: duplicate parsed encoding string
86ae43da6a status: mention --skip for revert and cherry-pick
b1b16bba96 completion: add --skip for cherry-pick and revert
deaa65a754 completion: merge options for cherry-pick and revert
4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
793ac7e309 t3432: test rebase fast-forward behavior
359ecebc34 t3431: add rebase --fork-point tests
502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage
ff61681b46 grep: refactor and simplify PCRE1 support
8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1
1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning()
fd99c2dd9b grep: use return value of strbuf_detach()
82f51af345 log-tree: always use return value of strbuf_detach()
7e92756751 http: don't leak urlmatch_config.vars
9784f97321 commit: free the right buffer in release_commit_memory
ce17feb1b3 path: add a function to check for path suffix
60d198d022 banned.h: fix vsprintf()'s ban message
60fe477a0b notes: avoid potential use-after-free during insertion
779ad6641b notes: avoid leaking duplicate entries
4e1a641ee3 mingw: fix launching of externals from Unicode paths
5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly
e2683d51d9 Fix .git/ discovery at the root of UNC shares
d17f2124a7 setup_git_directory(): handle UNC paths correctly
ebb8d2c90f mingw: support UNC in git clone file://server/share/repo
0c37c41d13 t4009: make hash size independent
c1f3dfcc23 t4002: make hash independent
8cc5ff83c3 t4000: make hash size independent
c784815073 t3903: abstract away SHA-1-specific constants
2ccdfb1c78 git-gui: return early when patch fails to apply
62bd99934b git-gui: allow reverting selected hunk
5f0a516de9 git-gui: allow reverting selected lines
fddf2ebe38 transport: teach all vtables to allow fetch first
ac3fda82bf transport-helper: skip ls-refs if unnecessary
745f681289 First batch after Git 2.23
d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg'
22e86e85cb Merge branch 'en/fast-import-merge-doc'
9c7573581c Merge branch 'jk/perf-no-dups'
4336fdb2ef Merge branch 'rs/nedalloc-fixlets'
8ae7a46c4d Merge branch 'sg/show-failed-test-names'
6ba06b582b Merge branch 'sg/commit-graph-validate'
072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix'
207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix'
77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests'
1b01cdbf2e Merge branch 'jk/tree-walk-overflow'
8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix'
307179732d Merge branch 'mt/grep-submodules-working-tree'
58166c2e9d t0021: make sure clean filter runs
8b3f33ef11 ref-filter: initialize empty name or email fields
3c81760bc6 userdiff: add a builtin pattern for dts files
fe49814409 t4014: drop unnecessary blank lines from test cases
a2bb801f6a line-log: avoid unnecessary full tree diffs
eef5204190 line-log: extract pathspec parsing from line ranges into a helper function
a63694f523 diff: skip GITLINK when lazy fetching missing objs
7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe
19800bdc3f parseopt: move definition of enum parse_opt_result up
415b770b88 packfile.h: drop extern from function declaration
acb49d1cc8 t3800: make hash-size independent
ca6ba94200 t3600: make hash size independent
19ce5496c2 t3506: make hash independent
9a6738c061 t3430: avoid hard-coded object IDs
4dd1b5f90f t3404: abstract away SHA-1-specific constants
b99bfc7a6c t3306: abstract away SHA-1-specific constants
e3e9d02e35 t3305: make hash size independent
b408cf8cf6 t3301: abstract away SHA-1-specific constants
b561edd213 t3206: abstract away hash size constants
a5f61c7d13 t3201: abstract away SHA-1-specific constants
1c24a54ea4 repository-layout.txt: correct pluralization of 'object'
b0a3186140 sequencer: simplify root commit creation
a47ba3c777 rebase -i: check for updated todo after squash and reword
450efe2d53 rebase -i: always update HEAD before rewording
c581e4a749 grep: under --debug, show whether PCRE JIT is enabled
aaa95dfa05 midx: switch to using the_hash_algo
be8e172e9f builtin/show-index: replace sha1_to_hex
3f34d70d40 rerere: replace sha1_to_hex
fc06be3b7f builtin/receive-pack: replace sha1_to_hex
69fa337060 builtin/index-pack: replace sha1_to_hex
3a4d7aa5ae packfile: replace sha1_to_hex
e0cb7cdb89 wt-status: convert struct wt_status to object_id
8d4d86b0f0 cache: remove null_sha1
f6ca67d673 builtin/worktree: switch null_sha1 to null_oid
dd336a5511 builtin/repack: write object IDs of the proper length
894c0f66bb pack-write: use hash_to_hex when writing checksums
4439c7a360 sequencer: convert to use the_hash_algo
95518faac1 bisect: switch to using the_hash_algo
e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo
fe9fec45f6 config: use the_hash_algo in abbrev comparison
976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
703d2d4193 bundle: switch to use the_hash_algo
9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo
7962e046ff show-index: switch hard-coded constants to the_hash_algo
fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ
7e0d029f18 builtin/rev-parse: switch to use the_hash_algo
319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo
fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo
f6af19a9ad fetch-pack: use parse_oid_hex
36261e42ec patch-id: convert to use the_hash_algo
28ba1830d0 builtin/replace: make hash size independent
24bc1a1292 pull, fetch: add --set-upstream option
71d41ff651 archive-tar: turn length miscalculation warning into BUG
17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header()
82a46af13e archive-tar: fix pax extended header length calculation
4060c1990a archive-tar: report wrong pax extended header length
4615a8cb5b merge-recursive: alphabetize include list
45ef16f77a merge-recursive: add sanity checks for relevant merge_options
f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
5bf7e5779e merge-recursive: split internal fields into a separate struct
e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output
a779fb829b merge-recursive: comment and reorder the merge_options fields
8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options
7c0a6c8e47 merge-recursive: move some definitions around to clean up the header
c749ab1da8 merge-recursive: rename merge_options argument to opt in header
bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity
ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list
4d7101e25c merge-recursive: fix some overly long lines
724dd767b2 cache-tree: share code between functions writing an index as a tree
345480d1ed merge-recursive: don't force external callers to do our logging
b4db8a2b76 merge-recursive: remove useless parameter in merge_trees()
98a1d3d888 merge-recursive: exit early if index != head
9822175d2b Ensure index matches head before invoking merge machinery, round N
10f751c06b merge-recursive: remove another implicit dependency on the_repository
f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks
8e01251694 merge-recursive: introduce an enum for detect_directory_renames values
743474cbfa merge-recursive: provide a better label for diff3 common ancestor
51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u)
5bace62582 l10n: Update Catalan translation
139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()
65c01c6442 checkout: provide better conflict hunk description with detached HEAD
d8523ca1b9 merge-recursive: be consistent with assert
acb7da05ac checkout: remove duplicate code
93b980e58f http: use xmalloc with cURL
64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental
aaf633c2ad repo-settings: create feature.experimental setting
c6cc4c5afd repo-settings: create feature.manyFiles setting
ad0fb65999 repo-settings: parse core.untrackedCache
31b1de6a09 commit-graph: turn on commit-graph by default
b068d9a250 t6501: use 'git gc' in quiet mode
7211b9e753 repo-settings: consolidate some config settings
507e5470a0 worktree remove: clarify error message on dirty worktree
5af9d5f6c8 completion: complete config variables and values for 'git clone --config='
88cd790d6a completion: complete config variables names and values for 'git clone -c'
dd33472831 completion: complete values of configuration variables after 'git -c var='
e1e00089da completion: complete configuration sections and variable names for 'git -c'
42d0efec59 completion: split _git_config()
d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp()
2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names
d9438873c4 completion: deduplicate configuration sections
7a09a8f093 completion: add tests for 'git config' completion
840d7e5b3c completion: complete more values of more 'color.*' configuration variables
08a12175d8 completion: fix a typo in a comment
9827d4c185 packfile: drop release_pack_memory()
d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed
362f8b280c t/perf: rename duplicate-numbered test script
742ed63345 trace2: cleanup whitespace in perf format
e34430556c trace2: cleanup whitespace in normal format
c2b890aca5 quote: add sq_append_quote_argv_pretty()
ad43e37839 trace2: trim trailing whitespace in normal format error message
04f10d332f trace2: remove dead code in maybe_add_string_va()
da4589ce7e trace2: trim whitespace in region messages in perf target format
0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit
5440eb0ea2 git-gui: call do_quit before destroying the main window
bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook
6098817fd7 git-merge: honor pre-merge-commit hook
a1f3dd7eb3 merge: do no-verify like commit
f78f6c7e0c t7503: verify proper hook execution
70597e8386 nedmalloc: avoid compiler warning about unused value
c9b9c09dae nedmalloc: do assignments only after the declaration section
22932d9169 config: stop checking whether the_repository is NULL
5732f2b1ef common-main: delay trace2 initialization
58ebccb478 t1309: use short branch name in includeIf.onbranch test
67feca3b1c gitcli: document --end-of-options
51b4594b40 parse-options: allow --end-of-options as a synonym for "--"
19e8789b23 revision: allow --end-of-options to end option parsing
ffe1afe67c tests: show the test name and number at the start of verbose output
96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests
7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits'
39d8831856 commit-graph: turn a group of write-related macro flags into an enum
9916073be5 t5318-commit-graph: use 'test_expect_code'
620c09e1b6 restore: add test for deleted ita files
ecd72042de checkout.c: unstage empty deleted ita files
a613d4f817 pack-refs: always refresh after taking the lock file
decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd'
371df1bea9 trace2: cleanup column alignment in perf target format
5aa02f9868 tree-walk: harden make_traverse_path() length computations
c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path()
b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len()
37806080d7 tree-walk: use size_t consistently
7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh'
12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh'
9055384710 tree-walk: drop oid from traverse_info
947208b725 setup_traverse_info(): stop copying oid
e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
a63f990d92 t3418: test `rebase -r` with merge strategies
5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges`
e145d99347 rebase -r: support merge strategies other than `recursive`
4e6023b13a t3427: fix another incorrect assumption
f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced
a9c71073da t3427: fix erroneous assumption
b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three
d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case
c248d32cdb t3427: simplify the `setup` test case significantly
8c1e24048a t3427: add a clarifying comment
5efed0ecf9 rebase: fold git-rebase--common into the -p backend
68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone
2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive`
6180b20239 t3400: stop referring to the scripted rebase
d5b581f228 Drop unused git-rebase--am.sh
814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation
6a289d45c0 grep: fix worktree case in submodules
870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching
8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data
09872f6418 grep: create a "is_fixed" member in "grep_pat"
8a35b540a9 grep: consistently use "p->fixed" in compile_regexp()
685668faaa grep: stop using a custom JIT stack with PCRE v1
34489239d0 grep: stop "using" a custom JIT stack with PCRE v2
04bef50c01 grep: remove overly paranoid BUG(...) code
b65abcafc7 grep: use PCRE v2 for optimized fixed-string search
48de2a768c grep: remove the kwset optimization
45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern>
25754125ce grep: make the behavior for NUL-byte in patterns sane
d316af059d grep tests: move binary pattern tests into their own file
471dac5d2c grep tests: move "grep binary" alongside the rest
f463beb805 grep: inline the return value of a function call used only once
b14cf112e2 t4210: skip more command-line encoding tests on MinGW
44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
4e2443b181 log tests: test regex backends in "--encode=<enc>" tests
90d21f9ebf list-objects-filter-options: make parser void
5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW
489fc9ee71 list-objects-filter-options: allow mult. --filter
c2694952e3 strbuf: give URL-encoding API a char predicate fn
cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list
f56f764279 list-objects-filter-options: move error check up
e987df5fe6 list-objects-filter: implement composite filters
842b00516a list-objects-filter-options: always supply *errbuf
7a7c7f4a6d list-objects-filter: put omits set in filter struct
9430147ca0 list-objects-filter: encapsulate filter components
4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c
60b7a92d84 Move repository_format_partial_clone to promisor-remote.c
db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
75de085211 remote: add promisor and partial clone config to the doc
7e154badc0 partial-clone: add multiple remotes in the doc
9a4c507886 t0410: test fetching from many promisor remotes
5e46139376 builtin/fetch: remove unique promisor remote limitation
fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter
b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote()
faf2abf496 promisor-remote: use repository_format_partial_clone
9cfebc1f3b promisor-remote: add promisor_remote_reinit()
9e27beaa23 promisor-remote: implement promisor_remote_get_direct()
48de315817 Add initial support for many promisor remotes
2e860675b6 fetch-object: make functions return an error code
c59c7c879e t0410: remove pipes after git commands
git-subtree-dir: third_party/git
git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
2020-05-22 18:46:45 +02:00
|
|
|
#: apply.c:963
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96
af6b65d45e Git 2.26.2
7397ca3373 Git 2.25.4
b86a4be245 Git 2.24.3
f2771efd07 Git 2.23.3
c9808fa014 Git 2.22.4
9206d27eb5 Git 2.21.3
041bc65923 Git 2.20.4
76b54ee9b9 Git 2.19.5
ba6f0905fd Git 2.18.4
df5be6dc3f Git 2.17.5
1a3609e402 fsck: reject URL with empty host in .gitmodules
e7fab62b73 credential: treat URL with empty scheme as invalid
c44088ecc4 credential: treat URL without scheme as invalid
fe29a9b7b0 credential: die() when parsing invalid urls
a2b26ffb1a fsck: convert gitmodules url to URL passed to curl
8ba8ed568e credential: refuse to operate when missing host or protocol
24036686c4 credential: parse URL without host as empty host, not unset
73aafe9bc2 t0300: use more realistic inputs
a88dbd2f8c t0300: make "quit" helper more realistic
de49261b05 Git 2.26.1
274b9cc253 Git 2.26
55a7568606 Merge branch 'en/rebase-backend'
c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git
1557364fb4 l10n: tr.po: change file mode to 644
2da1b05674 t3419: prevent failure when run with EXPENSIVE
1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0
5804c6ec40 l10n: de.po: add missing space
98cedd0233 Merge https://github.com/prati0100/git-gui
4914ba4bcf l10n: tr: Fix a couple of ambiguities
a5728022e0 Merge branch 'py/remove-tcloo'
7fcb965970 RelNotes/2.26.0: fix various typos
f0c03bcf95 l10n: Update Catalan translation
67b0a24910 Git 2.25.3
be8661a328 Sync with Git 2.25.2
0822e66b5d Git 2.25.2
65588b0b2e unicode: update the width tables to Unicode 13.0
7be274b0ff Merge branch 'js/ci-windows-update' into maint
9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint
221887a492 Merge branch 'jk/doc-credential-helper' into maint
32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint
fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint
618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint
50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint
fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint
41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint
2d7247af6f Merge branch 'am/mingw-poll-fix' into maint
4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint
76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint
569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint
16a4bf1035 Merge branch 'en/check-ignore' into maint
3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint
56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint
1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint
7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint
fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint
a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint
93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint
dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint
758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint
f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint
506223f9c5 Git 2.24.2
17a02783d8 Git 2.23.2
69fab82147 Git 2.22.3
fe22686494 Git 2.21.2
d1259ce117 Git 2.20.3
a5979d7009 Git 2.19.4
21a3e5016b Git 2.18.3
c42c0f1297 Git 2.17.4
d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u)
3891a84ccd git-gui: create a new namespace for chord script evaluation
8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5
440e7442d1 l10n: zh_CN: Revise v2.26.0 translation
2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2
6c85aac65f Git 2.26-rc2
74f172e39e Merge branch 'en/test-cleanup'
e96327c947 Merge branch 'es/outside-repo-errmsg-hints'
ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0
15fa8d9667 l10n: vi: fix translation + grammar
5c20398699 prefix_path: show gitdir if worktree unavailable
1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated)
c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated)
a4a2f64642 Merge branch 'js/askpass-coerce-utf8'
850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows
d769dcc5cd Merge branch 'py/blame-status-error'
70e24186c0 t6022, t6046: fix flaky files-are-updated checks
30e9940356 Hopefully the final batch before -rc2
b4f0038525 Merge branch 'en/rebase-backend'
25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master
07259e74ec fsck: detect gitmodules URLs with embedded newlines
c716fe4bd9 credential: detect unrepresentable values when parsing urls
17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr
9a6bbee800 credential: avoid writing values with newlines
17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2
1afe18a3bb l10n: es: 2.26.0 round#2
5ab9217a3c Merge branch of github.com:alshopov/git-po into master
c6713676d6 Merge branch of github.com:bitigchi/git-po into master
b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t)
2713dec02d l10n: tr: v2.26.0 round 2
c9ef57cc3a l10n: fr : v2.26.0 rnd 2
120b1eb731 git-rebase.txt: highlight backend differences with commit rewording
9a1b7474d6 sequencer: clear state upon dropping a become-empty commit
937d143630 i18n: unmark a message in rebase.c
a56d361f66 Merge branch 'ds/sparse-add'
5fa9169ced Merge branch 'dr/push-remote-ref-update'
cdef998b46 Merge branch 'jc/doc-single-h-is-for-help'
051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed)
52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master
9643441983 l10n: tr: Add glossary for Turkish translations
438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv
fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git
2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u)
dd2c269652 l10n: tr: Add Turkish translations
8f4f099f8b l10n: tr: Add Turkish translation team info
b4374e96c8 Git 2.26-rc1
4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch'
3658d77f8e Merge branch 'hd/show-one-mergetag-fix'
6125104b88 Merge branch 'rt/format-zero-length-fix'
1ac37deba2 Merge branch 'am/mingw-poll-fix'
cf372dc815 Merge branch 'en/test-cleanup'
d1075adfdf Merge branch 'en/merge-path-collision'
a4fd114ffc Merge branch 'kk/complete-diff-color-moved'
a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file'
0e0d717537 Merge branch 'pb/am-show-current-patch'
9b7f726dfc Merge branch 'am/pathspec-f-f-more'
4605a73073 t1091: don't grep for `strerror()` string
4d9c2902a1 l10n: fr v2.26.0 rnd1
ad182bee3f Merge branch of github.com:alshopov/git-po into master
23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1
98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t)
f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed)
76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po
076cbdcd73 Git 2.26-rc0
0d65f3fb1a t5537: adjust test_oid label
e63cefb024 Merge branch 'hi/gpg-use-check-signature'
5da7329e29 Merge branch 'rs/commit-graph-code-simplification'
0108fc1b46 Merge branch 'js/ci-windows-update'
f3ccd9f0d9 Merge branch 'be/describe-multiroot'
a6b4709302 Merge branch 'ag/rebase-remove-redundant-code'
b22db265d6 Merge branch 'es/recursive-single-branch-clone'
e8e71848ea Merge branch 'jk/nth-packed-object-id'
a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'
4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere'
49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix'
2cbb058669 Merge branch 'bc/wildcard-credential'
25063e2530 Merge branch 'mr/bisect-in-c-1'
f4d7dfce4d Merge branch 'ds/sparse-add'
4d864895a2 t2402: test worktree path when called in .git directory
af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch()
7655b4119d remote-curl: show progress for fetches over dumb HTTP
2f268890c2 The eighth batch for 2.26
aa5a7e02ad Merge branch 'ma/test-cleanup'
58595e713c Merge branch 'rs/blame-typefix-for-fingerprint'
ff41848e99 Merge branch 'rs/micro-cleanups'
4cbf1a0e22 Merge branch 'es/worktree-cleanup'
46703057c1 Merge branch 'ak/test-log-graph'
777815f5f9 Merge branch 'jk/run-command-formatfix'
444cff61b4 Merge branch 'ds/partial-clone-fixes'
48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure'
8c22bd9ff9 Merge branch 'en/rebase-backend'
cb2f5a8e97 Merge branch 'en/check-ignore'
0df82d99da Merge branch 'jk/object-filter-with-bitmap'
80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix'
29b09c518c Merge branch 'jk/doc-diff-parallel'
237a28173f show_one_mergetag: print non-parent in hex form.
5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context"
6d1210e133 l10n: Update Catalan translation
0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification"
7329d94be7 config.mak.dev: re-enable -Wformat-zero-length
7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings
94f4d01932 mingw: workaround for hangs when sending STDIN
1ff466c018 Documentation: clarify that `-h` alone stands for `help`
65bf820d0e t6020: new test with interleaved lexicographic ordering of directories
9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it
d5bb92eced t3035: prefer test_must_fail to bash negation for git commands
b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions
42d180dd01 t602[1236], t6034: modernize test formatting
802050400a merge-recursive: apply collision handling unification to recursive case
7f487ce062 Azure Pipeline: switch to the latest agent pools
5ed9fc3fc8 ci: prevent `perforce` from being quarantined
eafff6e41e t/lib-httpd: avoid using macOS' sed
d68ce906c7 commit-graph: use progress title directly
30b1c7ad9d describe: don't abort too early when searching tags
240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to'
2d2118b814 The seventh batch for 2.26
325eb66830 Merge branch 'es/doc-mentoring'
87f17d790d Merge branch 'es/bright-colors'
d0038f4b31 Merge branch 'bw/remote-rename-update-config'
132f600b06 clone: pass --single-branch during --recurse-submodules
47319576f1 submodule--helper: use C99 named initializer
ffe005576a lib-log-graph: consolidate colored graph cmp logic
989eea958b lib-log-graph: consolidate test_cmp_graph logic
bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching
bb4995fc3f worktree: add utility to find worktree by pathname
a80c4c2214 worktree: improve find_worktree() documentation
2fecc48cad packfile: drop nth_packed_object_sha1()
6ac9760a30 packed_object_info(): use object_id internally for delta base
b99b6bcc57 packed_object_info(): use object_id for returning delta base
63f4a7fc01 pack-check: push oid lookup into loop
e31c71083a pack-check: convert "internal error" die to a BUG()
500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps
f66d4e0250 pack-objects: use object_id struct in pack-reuse code
a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id
3f83fd5e44 pack-objects: read delta base oid into object_id struct
0763671b8e nth_packed_object_oid(): use customary integer return
02bbbe9df9 worktree: drop unused code from get_main_worktree()
27f182b3fc blame: provide type of fingerprints pointer
b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere
df126ca142 t3400: make test clean up after itself
3c29e21eb0 t: drop debug `cat` calls
cac439b56d t9810: drop debug `cat` call
91de82adc9 t4117: check for files using `test_path_is_file`
4ef346482d receive.denyCurrentBranch: respect all worktrees
f8692114db t5509: use a bare repository for test push target
45f274fbb1 get_main_worktree(): allow it to be called in the Git directory
fd0bc17557 completion: add diff --color-moved[-ws]
2ce6d075fa use strpbrk(3) to search for characters from a given set
2b3c430bce quote: use isalnum() to check for alphanumeric characters
a51d9e8f07 t1050: replace test -f with test_path_is_file
3e96c66805 partial-clone: avoid fetching when looking for objects
d0badf8797 partial-clone: demonstrate bugs in partial fetch
539052f42f run-command.h: fix mis-indented struct member
6c11c6a124 sparse-checkout: allow one-character directories in cone mode
aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch
f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch
e8ef1e8d6e am: convert "resume" variable to a struct
bc8620b440 parse-options: convert "command mode" to a flag
62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE()
46fd7b3900 credential: allow wildcard patterns when matching config
82eb249853 credential: use the last matching username in the config
588c70e10f t0300: add tests for some additional cases
732f934408 t1300: add test for urlmatch with multiple wildcards
3fa0e04667 mailmap: add an additional email address for brian m. carlson
8a98758a8d stash push: support the --pathspec-from-file option
8c3713cede stash: eliminate crude option parsing
3f3d8068f5 doc: stash: synchronize <pathspec> description
b22909144c doc: stash: document more options
0093abc286 doc: stash: split options from description (2)
2b7460d167 doc: stash: split options from description (1)
5f393dc3aa rm: support the --pathspec-from-file option
fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags
73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure
6c69f22233 bisect: libify `bisect_next_all`
9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents
45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents
cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents
e8e3ce6718 bisect: libify `bisect_checkout`
ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents
7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()`
680e8a01e5 bisect: add enum to represent bisect returning codes
bfacfce7d9 bisect--helper: introduce new `decide_next()` function
b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0
292731c4c2 bisect--helper: change `retval` to `res`
16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays
7ec8125fba check-ignore: fix documentation and implementation to match
2607d39da3 doc-diff: use single-colon rule in rendering Makefile
0aa6ce3094 doc/config/push: use longer "--" line for preformatted example
20a5fd881a rev-list --count: comment on the use of count_right++
63a58457e0 Merge branch 'py/missing-bracket'
51ebf55b93 The sixth batch for 2.26
f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints'
123538444f Merge branch 'jk/doc-credential-helper'
e154451a2f Merge branch 'js/mingw-open-in-gdb'
fc25a19265 Merge branch 'js/test-unc-fetch'
6365058605 Merge branch 'js/test-avoid-pipe'
966b69f02f Merge branch 'js/test-write-junit-xml-fix'
d880c3de23 Merge branch 'jk/mailinfo-cleanup'
5d55554b1d Merge branch 'mr/show-config-scope'
9f3f38769d Merge branch 'rs/strbuf-insertstr'
cbecc168d4 Merge branch 'rs/parse-options-concat-dup'
5af345a438 Merge branch 'bc/hash-independent-tests-part-8'
0460c109c3 Merge branch 'rs/name-rev-memsave'
6b9919c0a2 git-gui: add missing close bracket
5897e5ac96 Merge branch 'cs/german-translation'
cf85a32eb6 git-gui: update German translation
5096e51c54 git-gui: extend translation glossary template with more terms
8b85bb1b70 git-gui: update pot template and German translation to current source code
e68e29171c Sync with 2.25.1
c522f061d5 Git 2.25.1
10cdb9f38a rebase: rename the two primary rebase backends
2ac0d6273f rebase: change the default backend from "am" to "merge"
8295ed690b rebase: make the backend configurable via config setting
76340c8107 rebase tests: repeat some tests using the merge backend instead of am
980b482d28 rebase tests: mark tests specific to the am-backend with --am
c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases
6d04ce75c4 git-prompt: change the prompt for interactive-based rebases
52eb738d6b rebase: add an --am option
8af14f0859 rebase: move incompatibility checks between backend options a bit earlier
be50c938df git-rebase.txt: add more details about behavioral differences of backends
befb89ce7c rebase: allow more types of rebases to fast-forward
9a70f3d4ae t3432: make these tests work with either am or merge backends
93122c985a rebase: fix handling of restrict_revision
55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer
8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling
7db00f0b3b t3406: simplify an already simple test
e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty
d48e5e21da rebase (interactive-backend): make --keep-empty the default
e0020b2f82 prefix_path: show gitdir when arg is outside repo
cc4f2eb828 doc: move credential helper info into gitcredentials(7)
bfdd66e72f Sync with maint
7ae7e234c7 The fifth batch for 2.26
53c3be2c29 Merge branch 'tb/commit-graph-object-dir'
7b029ebaef Merge branch 'jk/index-pack-dupfix'
aa21cc97bd Merge branch 'jk/alloc-cleanups'
883326077a Merge branch 'jh/notes-fanout-fix'
f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule'
78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs'
df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'
433b8aac2e Merge branch 'ds/sparse-checkout-harden'
4a77434bc8 Merge branch 'ld/p4-cleanup-processes'
8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone'
09e48400a3 Merge branch 'jk/get-oid-error-message-i18n'
4dbeecba27 Merge branch 'ag/edit-todo-drop-check'
f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2'
d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout'
251187084d Merge branch 'js/rebase-i-with-colliding-hash'
c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix'
56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store'
0da63da794 Merge branch 'jn/promote-proto2-to-default'
a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup'
daef1b300b Merge branch 'hw/advice-add-nothing'
6141e0cc00 Merge branch 'js/convert-typofix' into maint
4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint
5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint
b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint
7137d6089b Merge branch 'ms/doc-bundle-format' into maint
52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint
0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint
1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint
cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint
153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint
8857657cc9 Merge branch 'jt/t5616-robustify' into maint
1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint
f468972671 Merge branch 'bc/misconception-doc' into maint
6e69042e26 Merge branch 'bc/author-committer-doc' into maint
650ed395be Merge branch 'ds/refmap-doc' into maint
80b806f1a8 Merge branch 'bc/actualmente' into maint
eceff4ba12 Merge branch 'rt/submodule-i18n' into maint
8a17eb7972 Merge branch 'jk/test-fixes' into maint
54bbadaeca Merge branch 'jk/asan-build-fix' into maint
8dbeba198e Merge branch 'ds/sparse-cone' into maint
e361f36f61 Merge branch 'nd/switch-and-restore' into maint
4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint
ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint
5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint
c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint
d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint
9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint
3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint
3ab3185f99 pack-objects: support filters with bitmaps
84243da129 pack-bitmap: implement BLOB_LIMIT filtering
4f3bd5606a pack-bitmap: implement BLOB_NONE filtering
cc4aa28506 bitmap: add bitmap_unset() function
2aaeb9ac41 rev-list: use bitmap filters for traversal
6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure
4eb707ebd6 rev-list: allow commit-only bitmap traversals
ea047a8eb4 t5310: factor out bitmap traversal comparison
608d9c9365 rev-list: allow bitmaps when counting objects
55cb10f9b5 rev-list: make --count work with --objects
792f811998 rev-list: factor out bitmap-optimized routines
d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs
08809c09aa mingw: add a helper function to attach GDB to the current process
bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths
de26f02db1 t9001, t9116: avoid pipes
a2dc43414c MyFirstContribution: rephrase contact info
e03f928e2a rev-list: fallback to non-bitmap traversal when filtering
acac50dd8c pack-bitmap: fix leak of haves/wants object lists
551cf8b655 pack-bitmap: factor out type iterator initialization
d8437c57fa The fourth batch for 2.26
a3dcf84df0 Merge branch 'js/convert-typofix'
0de2d1409b Merge branch 'js/ci-squelch-doc-warning'
0410c2ba31 Merge branch 'jb/multi-pack-index-docfix'
0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example'
e99c325bb4 Merge branch 'ms/doc-bundle-format'
afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix'
db72f8c940 Merge branch 'jb/parse-options-message-fix'
3d2471ba85 Merge branch 'ma/filter-branch-doc-caret'
b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path'
44cba9c4b3 Merge branch 'jc/skip-prefix'
556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index'
17e4a1b141 Merge branch 'hw/doc-git-dir'
4cf7f48891 Merge branch 'jk/push-default-doc'
b783391018 Merge branch 'jk/clang-sanitizer-fixes'
a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache'
3f7553acf5 Merge branch 'jt/t5616-robustify'
341f8a6476 Merge branch 'jk/escaped-wildcard-dwim'
b486d2ee81 Merge branch 'jn/pretend-object-doc'
076ee3e8a2 tests: fix --write-junit-xml with subshells
2b0f19fa7a convert: fix typo
c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors
1751b09a92 color.c: support bright aixterm colors
4a28eb0ae4 color.c: refactor color_output arguments
f696a2b1c8 mailinfo: factor out some repeated header handling
ffbea1816d mailinfo: be more liberal with header whitespace
f447d0293e mailinfo: simplify parsing of header values
b6537d83ee mailinfo: treat header values as C strings
ef07659926 sparse-checkout: work with Windows paths
2631dc879d sparse-checkout: create 'add' subcommand
4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand
6fb705abcb sparse-checkout: extract add_patterns_from_input()
b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config
f2a2327a4a config: provide access to the current line number
923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values
ceff1a1308 remote: clean-up config callback
1a83068c26 remote: clean-up by returning early to avoid one indentation
88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types
145d59f482 config: add '--show-scope' to print the scope of a config value
9a83d088ee submodule-config: add subomdule config scope
e37efa40e1 config: teach git_config_source to remember its scope
5c105a842e config: preserve scope in do_git_config_sequence
6766e41b8a config: clarify meaning of command line scoping
6dc905d974 config: split repo scope to local and worktree
a5cb4204b6 config: make scope_name non-static and rename it
30183894ea ci: ignore rubygems warning in the "Documentation" job
7a9f8ca805 parse-options: simplify parse_options_dup()
c84078573e parse-options: const parse_options_concat() parameters
f904f9025f parse-options: factor out parse_options_count()
a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat()
517b60564e mailinfo: don't insert header prefix for handle_content_type()
a91cc7fad0 strbuf: add and use strbuf_insertstr()
eb31044ff7 pack-format: correct multi-pack-index description
9299f84921 diff-options.txt: avoid "regex" overload in example
7378ec90e1 doc: describe Git bundle format
f3037657e8 t6024: update for SHA-256
edf04243b2 t6006: make hash size independent
5db24dcffd t6000: abstract away SHA-1-specific constants
d341e0805d t5703: make test work with SHA-256
88ed241a7e t5607: make hash size independent
48c10cc0e6 t5318: update for SHA-256
f7ae8e69b6 t5515: make test hash independent
e70649bb66 t5321: make test hash independent
a30f93b143 t5313: make test hash independent
a79eec220b t5309: make test hash independent
796d1383a3 t5302: make hash size independent
417e45e5e3 t4060: make test work with SHA-256
dfa5f53e78 t4211: add test cases for SHA-256
f743e8f5b3 t4211: move SHA-1-specific test cases into a directory
72f936b120 t4013: make test hash independent
5df0f11f07 t3311: make test work with SHA-256
07877f393c t3310: make test work with SHA-256
6025e898d6 t3309: make test work with SHA-256
7b1a1822fe t3308: make test work with SHA-256
94db7e3e93 t3206: make hash size independent
db12505c2c t/lib-pack: support SHA-256
303b3c1c46 submodule: add newline on invalid submodule error
887a0fd573 add: change advice config variables used by the add API
de93cc14ab The third batch for 2.26
ea46d9097b Merge branch 'mt/sparse-checkout-doc-update'
ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix'
b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend'
7ab963e122 Merge branch 'en/fill-directory-fixes-more'
f52ab33616 Merge branch 'bc/hash-independent-tests-part-7'
25794d6ce9 Merge branch 'km/submodule-add-errmsg'
d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity'
76c57fedfa Merge branch 'js/add-p-leftover-bits'
9a5315edfd Merge branch 'js/patch-mode-in-others-in-c'
381e8e9de1 Merge branch 'dl/test-must-fail-fixes'
395518cf7a parse-options: lose an unnecessary space in an error message
079f970971 name-rev: sort tip names before applying
2d53975488 name-rev: release unused name strings
977dc1912b name-rev: generate name strings only if they are better
1c56fc2084 name-rev: pre-size buffer in get_parent_name()
ddc42ec786 name-rev: factor out get_parent_name()
f13ca7cef5 name-rev: put struct rev_name into commit slab
d689d6d82f name-rev: don't _peek() in create_or_update_name()
15a4205d96 name-rev: don't leak path copy in name_ref()
36d2419c9a name-rev: respect const qualifier
71620ca86c name-rev: remove unused typedef
3e2feb0d64 name-rev: rewrite create_or_update_name()
a21781011f index-pack: downgrade twice-resolved REF_DELTA to die()
dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout
e1c5253951 t3305: check notes fanout more carefully and robustly
e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks
a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st'
ad2dd5bb63 commit-graph.c: remove path normalization, comparison
13c2499249 commit-graph.h: store object directory in 'struct commit_graph'
0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context'
f38c92452d t7400: testcase for submodule status on unregistered inner git repos
5290d45134 tree-walk.c: break circular dependency with unpack-trees
f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch
d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode
e53ffe2704 sparse-checkout: escape all glob characters on write
e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand
bd64de42de sparse-checkout: unquote C-style strings over --stdin
d585f0e799 sparse-checkout: write escaped patterns in cone mode
4f52c2ce6c sparse-checkout: properly match escaped characters
9abc60f801 sparse-checkout: warn on globs in cone patterns
145136a95a C: use skip_prefix() to avoid hardcoded string length
04e5b3f0b4 submodule foreach: replace $path with $sm_path in example
1793280e91 t5318: don't pass non-object directory to '--object-dir'
da8063522f diff: move diff.wsErrorHighlight to "basic" config
b98d188581 sha1-file: allow check_object_signature() to handle any repo
2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file()
7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare()
c8123e72f6 streaming: allow open_istream() to handle any repo
5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile()
a651946730 cache-tree: use given repo's hash_algo at verify_one()
eb999b3295 diff: make diff_populate_filespec() honor its repo argument
5b0ca878e0 Sync with maint
344ee18728 The second batch
53a83299c7 Merge branch 'bc/misconception-doc'
c9ccf9d09b Merge branch 'bc/author-committer-doc'
0d0fa20c40 Merge branch 'ss/t6025-modernize'
7050624abc Merge branch 'lh/bool-to-type-bool'
4b69f29271 Merge branch 'ds/refmap-doc'
aff812ce3c Merge branch 'bc/actualmente'
38fb56e92a Merge branch 'rt/submodule-i18n'
f0940743fa Merge branch 'js/builtin-add-i-cmds'
0afeb3fdf4 Merge branch 'jk/test-fixes'
808dab2b58 Merge branch 'jk/asan-build-fix'
fec1ff97c2 Merge branch 'sg/completion-worktree'
c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function'
11ad30b887 Merge branch 'hi/gpg-mintrustlevel'
96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases'
d52adee779 Merge branch 'ds/graph-horizontal-edges'
6909474491 Merge branch 'am/update-pathspec-f-f-tests'
043426c8fd Merge branch 'ds/sparse-cone'
34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig'
8dd40c0472 traverse_trees(): use stack array for name entries
667b76ec58 walker_fetch(): avoid raw array length computation
9734b74a8f normalize_path_copy(): document "dst" size expectations
43f33e492a git-p4: avoid leak of file handle when cloning
19fa5ac333 git-p4: check for access to remote host earlier
6026aff5bb git-p4: cleanup better on error exit
ca5b5cce62 git-p4: create helper function importRevisions()
4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable
5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce
837b3a6376 git-p4: make closeStreams() idempotent
b0418303b1 sha1-name: mark get_oid() error messages for translation
2df1aa239c fetch: forgo full connectivity check if --filter
50033772d5 connected: verify promisor-ness of partial clone
d82ad54945 git: update documentation for --git-dir
0ad7144999 .mailmap: map Yi-Jyun Pan's email
c56c48dd07 grep: ignore --recurse-submodules if --no-index is given
8b2a1928f0 doc: drop "explicitly given" from push.default description
cf82bff73f obstack: avoid computing offsets from NULL pointer
3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer
d20bc01a51 avoid computing zero offsets from NULL pointer
7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero
bc3f657f71 t1506: drop space after redirection operator
e5d7b2f65c t1400: avoid "test" string comparisons
5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c
c7a6207591 Sync with maint
7210ca4ee5 .mailmap: fix GGG authoship screwup
37a63faae5 t4124: only mark git command with test_must_fail
a8c663cf65 t3507: use test_path_is_missing()
2def7f017c t3507: fix indentation
e8a1c686ae t3504: do check for conflict marker after failed cherry-pick
1c9fd32fd2 t3419: stop losing return code of git command
c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}()
a781cd6fef t3415: stop losing return codes of git commands
86ce6e0dd1 t3310: extract common notes_merge_files_gone()
245b9ba0ba t3030: use test_path_is_missing()
4a6f11fd7b t2018: replace "sha" with "oid"
62e80fcb48 t2018: don't lose return code of git commands
30c0367668 t2018: teach do_checkout() to accept `!` arg
40caa5366a t2018: be more discerning when checking for expected exit codes
b54128bb0b t5616: make robust to delta base change
4c616c2ba1 merge-recursive: use subtraction to flip stage
ee798742bd merge-recursive: silence -Wxor-used-as-pow warning
39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule
a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin
3b2885ec9b submodule: fix status of initialized but not cloned submodules
ace912bfb8 t7400: add a testcase for submodule status on empty dirs
4bb4fd4290 MyFirstContribution: add avenues for getting help
9e6d3e6417 sparse-checkout: detect short patterns
41de0c6fbc sparse-checkout: cone mode does not recognize "**"
7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone
47dbf10d8a clone: fix --sparse option with URLs
3c754067a1 sparse-checkout: create leading directories
d622c34396 t1091: improve here-docs
522e641748 t1091: use check_files to reduce boilerplate
417be08d02 t1300: create custom config file without special characters
3de7ee369b t1300: fix over-indented HERE-DOCs
329e6ec397 config: fix typo in variable name
767a9c417e rebase -i: stop checking out the tip of the branch to rebase
dfaed02862 fsmonitor: update documentation for hook version and watchman hooks
e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2
d031049da3 completion: add support for sparse-checkout
a402723e48 doc: sparse-checkout: mention --cone option
26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck
b6992261de rebase -i: re-fix short SHA-1 collision
d859dcad94 parse_insn_line(): improve error message when parsing failed
d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects
92fb0db94c pack-objects: add checks for duplicate objects
bb514de356 pack-objects: improve partial packfile reuse
ff483026a9 builtin/pack-objects: introduce obj_is_packed()
e704fc7978 pack-objects: introduce pack.allowPackReuse
2f4af77699 csum-file: introduce hashfile_total()
8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting()
59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile
40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains()
14fbd26044 ewah/bitmap: introduce bitmap_word_alloc()
bc7a3d4dc0 The first batch post 2.25 cycle
09e393d913 Merge branch 'nd/switch-and-restore'
45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport'
0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout'
36da2a8635 Merge branch 'es/unpack-trees-oob-fix'
42096c778d Merge branch 'bc/run-command-nullness-after-free-fix'
1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted'
a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees'
e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached'
9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting'
237a83a943 Merge branch 'dl/credential-netrc'
a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir()
129510a067 t2405: clarify test descriptions and simplify test
4eaadc8493 t2405: use git -C and test_commit -C instead of subshells
773c60a45e t7410: rename to t2405-worktree-submodule.sh
7a2dc95cbc docs: mention when increasing http.postBuffer is valuable
1b13e9032f doc: dissuade users from trying to ignore tracked files
69e104d70e doc: provide guidance on user.name format
813f6025a5 docs: expand on possible and recommended user config options
bc94e5862a doc: move author and committer information to git-commit(1)
7979dfe1d4 l10n: Update Catalan translation
81e3db42f3 templates: fix deprecated type option `--bool`
c513a958b6 t6025: use helpers to replace test -f <path>
70789843bd t6025: modernize style
6a7aca6f01 doc: rm: synchronize <pathspec> description
856249c62a docs: use "currently" for the present time
b40a50264a fetch: document and test --refmap=""
a9ae8fde2e t3404: directly test the behavior of interest
22a69fda19 git-rebase.txt: update description of --allow-empty-message
f1928f04b2 grep: use no. of cores as the default no. of threads
70a9fef240 grep: move driver pre-load out of critical section
1184a95ea2 grep: re-enable threads in non-worktree case
6c307626f1 grep: protect packed_git [re-]initialization
c441ea4edc grep: allow submodule functions to run in parallel
d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules()
1d1729caeb grep: replace grep_read_mutex by internal obj read lock
31877c9aec object-store: allow threaded access to object reading
b1fc9da1c8 replace-object: make replace operations thread-safe
d5b0bac528 grep: fix racy calls in grep_objects()
faf123c730 grep: fix race conditions at grep_submodule()
c3a5bb31c1 grep: fix race conditions on userdiff calls
0222540827 fetch: emphasize failure during submodule fetch
232378479e Sync with maint
e4837b4406 t7800: don't rely on reuse_worktree_file()
fbce03d329 t4018: drop "debugging" cat from hunk-header tests
f65d07fffa Makefile: use compat regex with SANITIZE=address
849e43cc18 built-in add -i: accept open-ended ranges again
d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files
a4ffbbbb99 submodule.c: mark more strings for translation
0cbb60574e dir: point treat_leading_path() warning to the right place
ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent
22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2
f365bf40a0 clean: demonstrate a bug with pathspecs
b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x
277eb5af7c t5604: make hash independent
44b6c05b43 t5601: switch into repository to hash object
7a868c51c2 t5562: use $ZERO_OID
1b8f39fb0d t5540: make hash size independent
a8c17e3bd6 t5537: make hash size independent
832072219c t5530: compute results based on object length
74ad99b1d8 t5512: abstract away SHA-1-specific constants
ba1be1ab45 t5510: make hash size independent
cba472d3ad t5504: make hash algorithm independent
82d5aeb1e6 t5324: make hash size independent
3c5e65cac1 t5319: make test work with SHA-256
235d3cddb8 t5319: change invalid offset for SHA-256 compatibility
1d86c8f0ce t5318: update for SHA-256
525a7f1769 t4300: abstract away SHA-1-specific constants
7a1bcb251b t4204: make hash size independent
cb78f4f0fe t4202: abstract away SHA-1-specific constants
717c939d8f t4200: make hash size independent
08a9dd891c t4134: compute appropriate length constant
215b60bf07 t4066: compute index line in diffs
194264c185 t4054: make hash-size independent
7d5ecd775d completion: list paths and refs for 'git worktree add'
3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands
3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options
367efd54b3 completion: return the index of found word from __git_find_on_cmdline()
d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function
2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper
54887b4689 gpg-interface: add minTrustLevel as a configuration option
684ceae32d fetch: default to protocol version 2
33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION
8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate
b9ab170752 config doc: protocol.version is not experimental
07ef3c6604 fetch test: use more robust test for filtered objects
d6509da620 fetch test: mark test of "skipping" haves as v0-only
a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too
c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function
bf66db37f1 add: use advise function to display hints
c958d3bd0a graph: fix collapse of multiple edges
8588932e20 graph: add test to demonstrate horizontal line bug
d0d0a357a1 t: directly test parse_pathspec_file()
568cabb2fe t: fix quotes tests for --pathspec-from-file
f94f7bd00d t: add tests for error conditions with --pathspec-from-file
b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job
12acdf573a built-in add -p: handle Escape sequences more efficiently
e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode
04f816b125 built-in add -p: respect the `interactive.singlekey` config setting
a5e46e6b01 terminal: add a new function to read a single keystroke
9ea416cb51 terminal: accommodate Git for Windows' default terminal
94ac3c31f7 terminal: make the code of disable_echo() reusable
08b1ea4c39 built-in add -p: handle diff.algorithm
180f48df69 built-in add -p: support interactive.diffFilter
1e4ffc765d t3701: adjust difffilter test
c81638541c submodule add: show 'add --dry-run' stderr when aborting
8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token
56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token
d0654dc308 Git 2.25
b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po
4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'"
ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1
e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master
1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
d78a1968c5 Merge branch 'ma/config-advice-markup-fix'
a20ae3ee29 l10n: Update Catalan translation
49e268e23e mingw: safeguard better against backslashes in file names
4c6c7971e0 unpack-trees: correctly compute result count
63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1
75449c1b39 l10n: de.po: Reword generation numbers
6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t)
3901d2c6bd config/advice.txt: fix description list separator
7a6a90c6ec Git 2.25-rc2
1f5f3ffe5c Merge branch 'ds/graph-assert-fix'
a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix'
202f68b252 Merge branch 'pm/am-in-body-header-doc-update'
7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix'
c5dc20638b Merge branch 'do/gitweb-typofix-in-comments'
fe47c9cb5f Merge https://github.com/prati0100/git-gui
a1087c9367 graph: fix lack of color in horizontal lines
0d251c3291 graph: drop assert() for merge with two collapsing parents
4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper
573117dfa5 unpack-trees: watch for out-of-range index position
e701bab3e9 restore: invalidate cache-tree when removing entries with --staged
1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command
fa74180d08 checkout: don't revert file on ambiguous tracking branches
2957709bd4 parse_branchname_arg(): extract part as new function
5020f6806a t2018: improve style of if-statement
7ffb54618b t2018: add space between function name and ()
63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH
065027ee1a string-list: note in docs that callers can specify sorting function
26f924d50e unpack-trees: exit check_updates() early if updates are not wanted
042ed3e048 The final batch before -rc2
0f1930cd1b Merge branch 'ds/sparse-cone'
037f067587 Merge branch 'ds/commit-graph-set-size-mult'
f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify'
c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode'
a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
c4117fcb97 Merge branch 'pb/clarify-line-log-doc'
556f0258df Merge branch 'ew/packfile-syscall-optim'
5814d44d9b doc: submodule: fix typo for command absorbgitdirs
7047f75f22 editorconfig: indent text files with tabs
60440d72db sha1-file: document how to use pretend_object_file
7fdc5f296f l10n: es: 2.25.0 round #1
f8740c586b am: document that Date: can appear as an in-body header
4e2c4c0d4f gitweb: fix a couple spelling errors in comments
421c0ffb02 multi-pack-index: correct configuration in documentation
757ff352bd Documentation/git-sparse-checkout.txt: fix a typo
0d2116c644 Merge branch 'zs/open-current-file'
9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u)
3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master
4c5081614c l10n: fr.po v2.25.0 rnd 1
5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0
63020f175f commit-graph: prefer default size_mult when given zero
224c7d70fa mingw: only test index entries for backslashes, not tree entries
9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED
8679ef24ed Git 2.25-rc1
a82027e9e6 Merge branch 'js/use-test-tool-on-path'
13432fc6dd Merge branch 'js/mingw-reserved-filenames'
e0e1ac5db0 Merge branch 'en/rebase-signoff-fix'
b76a244c9d Merge branch 'em/freebsd-cirrus-ci'
bc855232bc Merge branch 'bk/p4-misc-usability'
763a59e71c merge-recursive: remove unnecessary oid_eq function
44143583b7 sparse-checkout: use extern for global variables
d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master
13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1
786f4d2405 git-gui: allow opening currently selected file in default app
4fd683b6a3 sparse-checkout: document interactions with submodules
de11951b03 sparse-checkout: list directories in cone mode
0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0
578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed)
173fff68da Merge tag 'v2.25.0-rc0' into git-po-master
f1842ff531 t2018: remove trailing space from test description
20a67e8ce9 t3008: find test-tool through path lookup
9e341f62ca l10n: Update Catalan translation
4e61b2214d packfile: replace lseek+read with pread
ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision
2be45868a8 doc: log, gitk: document accepted line-log diff formats
280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD
0a76bd7381 mailmap: mask accentless variant for Công Danh
99c33bed56 Git 2.25-rc0
d2189a721c Merge branch 'en/fill-directory-fixes'
8be0a428d6 Merge branch 'rs/test-cleanup'
65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string'
c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
45b96a6fa1 Merge branch 'js/add-p-in-c'
ccc292e862 Merge branch 'jc/drop-gen-hdrs'
dfee504bee Merge branch 'ja/doc-markup-cleanup'
87cbb1ca66 Merge branch 'rs/ref-read-cleanup'
20aa6d88b7 Merge branch 'rb/p4-lfs'
fcd5b55f56 Merge branch 'pb/submodule-doc-xref'
4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free'
ba6b66281e Merge branch 'ln/userdiff-elixir'
bd72a08d6c Merge branch 'ds/sparse-cone'
f3c520e17f Merge branch 'sg/name-rev-wo-recursion'
6514ad40a1 Merge branch 'ra/t5150-depends-on-perl'
17066bea38 Merge branch 'dl/format-patch-notes-config-fixup'
135365dd99 Merge branch 'am/pathspec-f-f-checkout'
ff0cb70d45 Merge branch 'am/pathspec-from-file'
4dc42c6c18 mingw: refuse paths containing reserved names
98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16
c480eeb574 commit --interactive: make it work with the built-in `add -i`
cee6cb7300 built-in add -p: implement the "worktree" patch modes
52628f94fc built-in add -p: implement the "checkout" patch modes
6610e4628a built-in stash: use the built-in `git add -p` if so configured
90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting
36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes
d2a233cb8b built-in add -p: prepare for patch modes other than "stage"
761e3d26bb sparse-checkout: improve OS ls compatibility
6579d93a97 contrib/credential/netrc: work outside a repo
1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable
b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI
b441717256 t1507: inline full_name()
9291e6329e t1507: run commands within test_expect_success
5236fce6b4 t1507: stop losing return codes of git commands
10812c2337 t1501: remove use of `test_might_fail cp`
62d58cda69 t1409: use test_path_is_missing()
b87b02cfe6 t1409: let sed open its own input file
9b92070e52 t1307: reorder `nongit test_must_fail`
3595d10c26 t1306: convert `test_might_fail rm` to `rm -f`
f511bc02ed t0020: use ! check_packed_refs_marked
f6041abdcd t0020: don't use `test_must_fail has_cr`
f46c243e66 t0003: don't use `test_must_fail attr_check`
99c049bc4c t0003: use test_must_be_empty()
3738439c77 t0003: use named parameters in attr_check()
7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err()
b8afb908c2 t/lib-git-p4: use test_path_is_missing()
4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases
6836d2fe06 dir.c: use st_add3() for allocation size
c847dfafee dir: consolidate similar code in treat_directory()
777b420347 dir: synchronize treat_leading_path() and read_directory_recursive()
b9670c1f5e dir: fix checks on common prefix directory
5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit
23cbe427c4 Merge branch 'py/console-close-esc'
124a895811 t4015: improve coverage of function context test
509efef789 commit: forbid --pathspec-from-file --all
12029dc57d t3434: mark successful test as such
e0f9095aaa notes.h: fix typos in comment
675ef6bab8 t6030: don't create unused file
01ed17dc8c t5580: don't create unused file
f670adb49b t3501: don't create unused file
1e1ccbfdd3 git-gui: allow closing console window with Escape
7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays.
b02fd2acca The sixth batch
59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex'
e3b72391d1 Merge branch 'rs/commit-export-env-simplify'
43bf44e23a Merge branch 'rs/archive-zip-code-cleanup'
4438a1a59f Merge branch 'js/t3404-indent-fix'
3a44db2ed2 Merge branch 'dr/branch-usage-casefix'
8bc481f4f6 Merge branch 'sg/t9300-robustify'
011fc2e88e Merge branch 'js/add-i-a-bit-more-tests'
d1c0fe8d9b Merge branch 'dl/range-diff-with-notes'
26c816a67d Merge branch 'hw/doc-in-header'
f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
71a7de7a99 Merge branch 'dl/rebase-with-autobase'
c9f5fc9114 Merge branch 'dl/test-cleanup'
6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap'
3beff388b2 Merge branch 'js/builtin-add-i-cmds'
4755a34c47 Merge branch 'dd/time-reentrancy'
37c2619d91 Merge branch 'ag/sequencer-todo-updates'
608e380502 git-p4: show detailed help when parsing options fail
e2aed5fd5b git-p4: yes/no prompts should sanitize user text
571fb96573 fix-typo: consecutive-word duplications
f371984613 Makefile: drop GEN_HDRS
2e4083198d built-in add -p: show helpful hint when nothing can be staged
54d9d9b2ee built-in add -p: only show the applicable parts of the help text
ade246efed built-in add -p: implement the 'q' ("quit") command
d6cf873340 built-in add -p: implement the '/' ("search regex") command
9254bdfb4f built-in add -p: implement the 'g' ("goto") command
bcdd297b78 built-in add -p: implement hunk editing
b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf"
11f2c0dae8 built-in add -p: coalesce hunks after splitting them
510aeca199 built-in add -p: implement the hunk splitting feature
0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions
5906d5de77 built-in app -p: allow selecting a mode change as a "hunk"
47dc4fd5eb built-in add -p: handle deleted empty files
80399aec5a built-in add -p: support multi-file diffs
7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed
12c24cf850 built-in add -p: color the prompt and the help text
25ea47af49 built-in add -p: adjust hunk headers as needed
e3bd11b4eb built-in add -p: show colored hunks by default
1942ee44e8 built-in add -i: wire up the new C code for the `patch` command
f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C
d1b1384d61 userdiff: remove empty subexpression from elixir regex
df5be01669 doc: indent multi-line items in list
fd5041e127 doc: remove non pure ASCII characters
190a65f9db sparse-checkout: respect core.ignoreCase in cone mode
1d7297513d notes: break set_display_notes() into smaller functions
66f79ee23d config/format.txt: clarify behavior of multiple format.notes
cc2bd5c45d gitmodules: link to gitsubmodules guide
99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed
e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed
8c02fe6060 t7004: don't create unused file
cb05d6a5ed t4256: don't create unused file
c5c4eddd56 dir: break part of read_directory_recursive() out for reuse
072a231016 dir: exit before wildcard fall-through if there is no wildcard
2f5d3847d4 dir: remove stray quote character in comment
a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories"
452efd11fb t3011: demonstrate directory traversal failures
ea94b16fb8 git-p4: honor lfs.storage configuration variable
51a0a4ed95 bisect--helper: avoid use-after-free
d32e065a91 Merge branch 'kk/branch-name-encoding'
ad05a3d8e5 The fifth batch
7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix'
b089e5e6cb Merge branch 'em/test-skip-regex-illseq'
930078ba39 Merge branch 'hi/gpg-use-check-signature'
08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode'
7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk'
55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm'
41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress'
5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise'
dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix'
d37cfe3b5c Merge branch 'dl/pretty-reference'
99c4ff1bda Merge branch 'dl/submodule-set-url'
55d607d85b Merge branch 'js/mingw-inherit-only-std-handles'
c58ae96fc4 Merge branch 'am/pathspec-from-file'
7c88714262 Merge branch 'po/bundle-doc-clonable'
5d9324e0f4 Merge branch 'ra/rebase-i-more-options'
7034cd094b Sync with Git 2.24.1
09ac67a183 format-patch: move git_config() before repo_init_revisions()
8164c961e1 format-patch: use --notes behavior for format.notes
452538c358 notes: extract logic into set_display_notes()
e6e230eeae notes: create init_display_notes() helper
1e6ed5441a notes: rename to load_display_notes()
2866fd284c name-rev: cleanup name_ref()
49f7a2fde9 name-rev: eliminate recursion in name_rev()
fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name'
e05e8cf074 archive-zip: use enum for compression method
39acfa3d22 git gui: fix branch name encoding error
11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description
8cf8f9b4aa t3404: fix indentation
4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs
147ee35558 commit: use strbuf_add() to add a length-limited string
559c6fc317 The fourth batch
56e6c16394 Merge branch 'dl/lore-is-the-archive'
3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive'
7cb0d37f6d Merge branch 'tg/perf-remove-stale-result'
403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick'
f0cf2fee5d Merge branch 'hi/grep-do-not-return-void'
391fb22ac7 Merge branch 'rs/use-skip-prefix-more'
92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd'
4ba74ca901 Merge branch 'rs/test-cleanup'
f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick'
ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9'
8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters
3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances
dd432a6ecf name-rev: restructure parsing commits and applying date cutoff
dd090a8a37 name-rev: pull out deref handling from the recursion
766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper
d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev()
bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation
e0c4da6f2a name-rev: avoid unnecessary cast in name_ref()
c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name()
c593a26348 t6120-describe: modernize the 'check_describe' helper
abcf857300 range-diff: clear `other_arg` at end of function
f8675343d7 range-diff: mark pointers as const
828765dfe0 t3206: fix incorrect test name
0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early
21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile
b4bbbbd5a2 apply --allow-overlap: fix a corner case
89c8559367 git add -p: use non-zero exit code when the diff generation failed
e91162be9c t3701: verify that the diff.algorithm config setting is handled
0c3222c4f3 t3701: verify the shown messages when nothing can be added
24be352d52 t3701: add a test for the different `add -p` prompts
8539b46534 t3701: avoid depending on the TTY prerequisite
0f0fba2cc8 t3701: add a test for advanced split-hunk editing
53a06cf39b Git 2.24.1
67af91c47a Sync with 2.23.1
a7312d1a28 Git 2.23.1
7fd9fd94fb Sync with 2.22.2
d9589d4051 Git 2.22.2
5421ddd8d0 Sync with 2.21.1
367f12b7e9 Git 2.21.1
20c71bcf67 Merge branch 'fix-msys2-quoting-bugs'
7d8b676992 mingw: sh arguments need quoting in more circumstances
d9061ed9da t7415: drop v2.20.x-specific work-around
04522edbd4 mingw: fix quoting of empty arguments for `sh`
49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts
e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly
fc346cb292 Sync with 2.20.2
4cd1cf31ef Git 2.20.2
c154745074 submodule: defend against submodule.update = !command in .gitmodules
4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x
d851d94151 Sync with 2.19.3
caccc527ca Git 2.19.3
7c9fbda6e2 Sync with 2.18.2
9877106b01 Git 2.18.2
14af7ed5a9 Sync with 2.17.3
a5ab8d0317 Git 2.17.3
bb92255ebe fsck: reject submodule.update = !command in .gitmodules
bdfef0492c Sync with 2.16.6
eb288bc455 Git 2.16.6
68440496c7 test-drop-caches: use `has_dos_drive_prefix()`
9ac92fed5b Sync with 2.15.4
7cdafcaacf Git 2.15.4
e904deb89d submodule: reject submodule.update = !command in .gitmodules
d3ac8c3f27 Sync with 2.14.6
66d2a6159f Git 2.14.6
083378cc35 The third batch
88bd37a2d0 Merge branch 'js/pkt-line-h-typofix'
473b431410 Merge branch 'us/unpack-trees-fsmonitor'
e0f9ec9027 Merge branch 'sg/test-bool-env'
fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset'
e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere'
88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory'
8feb47e882 Merge branch 'dl/t5520-cleanup'
6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree'
57d46bc602 Merge branch 'mg/doc-submodule-status-cached'
75bd003c7b Merge branch 'js/git-svn-use-rebase-merges'
f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix'
c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'
36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree'
cf91c31688 Merge branch 'sg/unpack-progress-throughput'
ef6104581d Merge branch 'pb/submodule-update-fetches'
7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix'
f3c7bfdde2 Merge branch 'dl/range-diff-with-notes'
9502b616f1 Merge branch 'jh/userdiff-python-async'
76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2'
995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label'
f7998d9793 Merge branch 'js/builtin-add-i'
917d0d6234 Merge branch 'js/rebase-r-safer-label'
56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers'
2763530048 Merge branch 'jg/revert-untracked'
fa38ab68b0 git-gui: revert untracked files by deleting them
d9c6469f38 git-gui: update status bar to track operations
29a9366052 git-gui: consolidate naming conventions
0bb313a552 xdiff: unignore changes in function context
2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names'
65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods'
5532ebdeb7 Merge branch 'fix-mingw-quoting-bug'
76a681ce9c Merge branch 'dubiously-nested-submodules'
dd53ea7220 Merge branch 'turn-on-protectntfs-by-default'
f82a97eb91 mingw: handle `subst`-ed "DOS drives"
7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams'
d2c84dad1c mingw: refuse to access paths with trailing spaces or periods
379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh
817ddd64c2 mingw: refuse to access paths with illegal characters
cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors
7530a6287e quote-stress-test: allow skipping some trials
35edce2056 t6130/t9350: prepare for stringent Win32 path validation
55953c77c0 quote-stress-test: accept arguments to test via the command-line
ad15592529 tests: add a helper to stress test argument quoting
a8dee3ca61 Disallow dubiously-nested submodule git directories
9102f958ee protect_ntfs: turn on NTFS protection by default
91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams
6d8684161e mingw: fix quoting of arguments
3a85dc7d53 is_ntfs_dotgit(): speed it up
7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses
288a74bcd2 is_ntfs_dotgit(): only verify the leading segment
a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark
cae0bc09ab rebase: fix format.useAutoBase breakage
945dc55dda format-patch: teach --no-base
700e006c5d t4014: use test_config()
a749d01e1d format-patch: fix indentation
0c47e06176 t3400: demonstrate failure with format.useAutoBase
d9b31db2c4 t7700: stop losing return codes of git commands
3699d69df0 t7700: make references to SHA-1 generic
dcf9a748ca t7700: replace egrep with grep
cfe5eda02a t7700: consolidate code into test_has_duplicate_object()
ae475afc0f t7700: consolidate code into test_no_missing_in_packs()
14b7664df8 doc: replace LKML link with lore.kernel.org
d23f9c8e04 RelNotes: replace Gmane with real Message-IDs
dcee037228 doc: replace MARC links with lore.kernel.org
a9aecc7abb checkout, restore: support the --pathspec-from-file option
cfd9376c1d doc: restore: synchronize <pathspec> description
8ea1189eac doc: checkout: synchronize <pathspec> description
6fdc9ad259 doc: checkout: fix broken text reference
1d022bb43f doc: checkout: remove duplicate synopsis
bebb5d6d6b add: support the --pathspec-from-file option
21bb3083c3 cmd_add: prepare for next patch
4778452597 Merge branch 'prevent-name-squatting-on-windows'
a7b1ad3b05 Merge branch 'jk/fast-import-unsafe'
525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()`
e1d911dd4c mingw: disallow backslash characters in tree objects' file names
0060fd1511 clone --recurse-submodules: prevent name squatting on Windows
a52ed76142 fast-import: disallow "feature import-marks" by default
68061e3470 fast-import: disallow "feature export-marks" by default
019683025f fast-import: delay creating leading directories for export-marks
e075dba372 fast-import: stop creating leading directories for import-marks
11e934d56e fast-import: tighten parsing of boolean command line options
816f806786 t9300: create marks files for double-import-marks test
f94804c1f2 t9300: drop some useless uses of cat
4f3e57ef13 submodule--helper: advise on fatal alternate error
10c64a0b3c Doc: explain submodule.alternateErrorStrategy
ec48540fe8 packfile.c: speed up loading lots of packfiles
3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value
a4fb016ba1 pkt-line: fix a typo
0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r
e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data
228f53135a The second batch
6c630f237e Merge branch 'jk/gitweb-anti-xss'
3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell'
4775e02a5c Merge branch 'ma/t7004'
a6c6f8d02a Merge branch 'js/complete-svn-recursive'
3ae8defaf9 Merge branch 'jk/send-pack-remote-failure'
aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix'
4ab9616c76 Merge branch 'sg/skip-skipped-prereq'
723a8adba5 Merge branch 'ds/test-read-graph'
9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation'
406ca29e0d Merge branch 'rs/parse-options-dup-null-fix'
fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging'
8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion'
ef8f621045 Merge branch 'dl/complete-rebase-onto'
3c3e5d0ea2 Merge branch 'tg/stash-refresh-index'
43c5fe1c1d Merge branch 'nn/doc-rebase-merges'
6511cb33c9 Merge branch 'dd/sequencer-utf8'
f165457618 Merge branch 'jk/remove-sha1-to-hex'
a774064fb0 Merge branch 'dj/typofix-merge-strat'
ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates'
d2489ce92c Merge branch 'rs/skip-iprefix'
376e7309e1 Merge branch 'ln/userdiff-elixir'
9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log'
d3096d2ba6 Merge branch 'en/doc-typofix'
26f20fa3fc Merge branch 'ns/test-desc-typofix'
ffd130a363 Merge branch 'en/t6024-style'
5149902ff9 Merge branch 'en/misc-doc-fixes'
bcb06e204c Merge branch 'js/fetch-multi-lockfix'
d08daec001 Merge branch 'rs/trace2-dots'
fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix'
bad5ed39cd Merge branch 'cb/curl-use-xmalloc'
7ab2088255 Merge branch 'rt/fetch-message-fix'
f089ddd56a Merge branch 'es/myfirstcontrib-updates'
3c90710c0c Merge branch 'hw/config-doc-in-header'
d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code'
5444d52866 Merge branch 'js/vreportf-wo-buffering'
05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add'
ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides'
532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default'
dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists'
fac9ab1419 Merge branch 'ma/bisect-doc-sample-update'
a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix'
0be5caf97c Merge branch 'jc/log-graph-simplify'
0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck'
2e697ced9d built-in add -i: offer the `quit` command
d7633578b5 built-in add -i: re-implement the `diff` command
8746e07277 built-in add -i: implement the `patch` command
ab1e1cccaf built-in add -i: re-implement `add-untracked` in C
c54ef5e424 built-in add -i: re-implement `revert` in C
a8c45be939 built-in add -i: implement the `update` command
f37c226454 built-in add -i: prepare for multi-selection commands
c08171d156 built-in add -i: allow filtering the modified files list
0c3944a628 add-interactive: make sure to release `rev.prune_data`
4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance
867fc7f310 grep: don't return an expression from pcre2_free()
c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables
72b006f4bf gpg-interface: prefer check_signature() for GPG verification
7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD
b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r
ccd469450a date.c: switch to reentrant {gm,local}time_r
271c351b2f t7811: don't create unused file
65efb42862 t9300: don't create unused file
f6b9413baf sequencer: fix a memory leak in sequencer_continue()
3eae30e464 doc: replace public-inbox links with lore.kernel.org
46c67492aa doc: recommend lore.kernel.org over public-inbox.org
5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects
17a4ae92ea t7700: s/test -f/test_path_is_file/
d2eee32a89 t7700: move keywords onto their own line
7a1c8c2346 t7700: remove spaces after redirect operators
09279086e8 t7700: drop redirections to /dev/null
756ee7fc9f t7501: stop losing return codes of git commands
38c1aa01de t7501: remove spaces after redirect operators
763b47bafa t5703: stop losing return codes of git commands
eacaa1c180 t5703: simplify one-time-sed generation logic
a29b2429e5 t5317: use ! grep to check for no matching lines
6c37f3ec1b t5317: stop losing return codes of git commands
b66e0a1773 t4138: stop losing return codes of git commands
afd43c9905 t4015: use test_write_lines()
946d2353a3 t4015: stop losing return codes of git commands
50cd31c652 t3600: comment on inducing SIGPIPE in `git rm`
3b737381d8 t3600: stop losing return codes of git commands
0d913dfa7e t3600: use test_line_count() where possible
29a40b5a67 t3301: stop losing return codes of git commands
9b5a9fa60a t0090: stop losing return codes of git commands
17aa9d9c1a t0014: remove git command upstream of pipe
77a946be98 apply-one-time-sed.sh: modernize style
176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job
ed254710ee test: use test_must_be_empty F instead of test_cmp empty F
c74b3cbb83 t7812: add missing redirects
213dabf49d test: use test_must_be_empty F instead of test -z $(cat F)
c93a5aaec8 t1400: use test_must_be_empty
6e4826ea75 t1410: use test_line_count
a5d04a3ef9 t1512: use test_line_count
54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd()
2059e79c0d name-rev: use skip_prefix() instead of starts_with()
1768aaf01d push: use skip_prefix() instead of starts_with()
ec6ee0c07a shell: use skip_prefix() instead of starts_with()
7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with()
a6293f5d28 fetch: use skip_prefix() instead of starts_with()
13ca8fb79e t5150: skip request-pull test if Perl is disabled
ecc0869080 commit-graph: use start_delayed_progress()
44a4693bfc progress: create GIT_PROGRESS_DELAY
528d9e6d01 t/perf: don't depend on Git.pm
b8dcc45387 perf-lib: use a single filename for all measurement types
fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk'
d82dfa7f5b rebase -i: finishing touches to --reset-author-date
1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory
393adf7a6f sequencer: directly call pick_commits() from complete_action()
a2dd67f105 rebase: fill `squash_onto' in get_replay_opts()
3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function
34065541e3 sequencer: update `done_nr' when skipping commands in a todo list
8638114e06 sequencer: update `total_nr' when adding an item to a todo list
0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk
ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk
ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions
9917eca794 l10n: zh_TW: add translation for v2.24.0
0a8e3036a3 reset: parse rev as tree-ish in patch mode
f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits
8d483c8408 doc: document 'git submodule status --cached'
befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick
ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later
9a780a384d mingw: spawned processes need to inherit only standard handles
c5a03b1e29 mingw: work around incorrect standard handles
eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes
a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool
43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values
2d05ef2778 sequencer: fix empty commit check when amending
ea8b7be147 git svn: stop using `rebase --preserve-merges`
67a6ea6300 gpg-interface: limit search for primary key fingerprint
392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern
cff4e9138d sparse-checkout: check for dirty status
416adc8711 sparse-checkout: update working directory in-process for 'init'
f75a69f880 sparse-checkout: cone mode should not interact with .gitignore
fb10ca5b54 sparse-checkout: write using lockfile
99dfa6f970 sparse-checkout: use in-process update for disable subcommand
e091228e17 sparse-checkout: update working directory in-process
e9de487aa3 sparse-checkout: sanitize for nested folders
4dcd4def3c unpack-trees: add progress to clear_ce_flags()
eb42feca97 unpack-trees: hash less in cone mode
af09ce24a9 sparse-checkout: init and set in cone mode
96cc8ab531 sparse-checkout: use hashmaps for cone patterns
879321eb0b sparse-checkout: add 'cone' mode
e6152e35ff trace2: add region in clear_ce_flags
72918c1ad9 sparse-checkout: create 'disable' subcommand
7bffca95ea sparse-checkout: add '--stdin' option to set subcommand
f6039a9423 sparse-checkout: 'set' subcommand
d89f09c828 clone: add --sparse mode
bab3c35908 sparse-checkout: create 'init' subcommand
94c0956b60 sparse-checkout: create builtin with 'list' subcommand
679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files
df6d3d6802 lib-bash.sh: move `then` onto its own line
2a02262078 t5520: replace `! git` with `test_must_fail git`
c245e58bb6 t5520: remove redundant lines in test cases
a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp
e959a18ee7 t5520: don't put git in upstream of pipe
5540ed27bc t5520: test single-line files by git with test_cmp
dd0f1e767b t5520: use test_cmp_rev where possible
979f8891cc t5520: replace test -{n,z} with test-lib functions
3037d3db90 t5520: use test_line_count where possible
93a9bf876b t5520: remove spaces after redirect operator
ceeef863de t5520: replace test -f with test-lib functions
4c8b046f82 t5520: let sed open its own input
53c62b9810 t5520: use sq for test case names
e8d1eaf9b4 t5520: improve test style
2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals
8cb7980382 t0000: test multiple local assignment
5b583e6a09 format-patch: pass notes configuration to range-diff
bd36191886 range-diff: pass through --notes to `git log`
9f726e1b87 range-diff: output `## Notes ##` header
3bdbdfb7a5 t3206: range-diff compares logs with commit notes
75c5aa0701 t3206: s/expected/expect/
79f3950d02 t3206: disable parameter substitution in heredoc
3a6e48e9f7 t3206: remove spaces after redirect operators
26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish
077a1fda82 userdiff: support Python async functions
3798149a74 SubmittingPatches: use `--pretty=reference`
1f0fc1db85 pretty: implement 'reference' format
618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type
0df621172d pretty: provide short date format
ac52d9410e t4205: cover `git log --reflog -z` blindspot
3e8ed3b93e pretty.c: inline initalize format_context
4982516451 revision: make get_revision_mark() return const pointer
f0f9de2bd7 completion: complete `tformat:` pretty format
fb2ffa77a6 SubmittingPatches: remove dq from commit reference
bae74c9dfb pretty-formats.txt: use generic terms for hash
bd00717eab SubmittingPatches: use generic terms for hash
9d45ac4cbf rev-list-options.txt: remove reference to --show-notes
828e829b9e argv-array: add space after `while`
e440fc5888 commit: support the --pathspec-from-file option
66a25a7242 doc: commit: synchronize <pathspec> description
64bac8df97 reset: support the `--pathspec-from-file` option
d137b50756 doc: reset: synchronize <pathspec> description
24e4750c96 pathspec: add new function to parse file
0dbc4a0edf ci(osx): update homebrew-cask repository with less noise
e02058a729 sequencer: handle rebase-merges for "onto" message
bae60ba7e9 builtin/unpack-objects.c: show throughput progress
2d92ab32fd rev-parse: make --show-toplevel without a worktree an error
9e5afdf997 fetch: add trace2 instrumentation
4c4066d95d run-command: move doc to run-command.h
6c51cb525d trace2: move doc to trace2.h
7db0305438 parse-options: add link to doc file in parse-options.h
d95a77d059 submodule-config: move doc to submodule-config.h
f3b9055624 credential: move doc to credential.h
bbcfa3002a tree-walk: move doc to tree-walk.h
971b1f24a2 argv-array: move doc to argv-array.h
f1ecbe0f53 trace: move doc to trace.h
13aa9c8b70 cache: move doc to cache.h
c0be43f898 sigchain: move doc to sigchain.h
19ef3ddd36 pathspec: move doc to pathspec.h
301d595e72 revision: move doc to revision.h
3a1b3415d9 attr: move doc to attr.h
126c1ccefb refs: move doc to refs.h
d27eb356bf remote: move doc to remote.h and refspec.h
405c6b1fbc sha1-array: move doc to sha1-array.h
d3d7172e40 merge: move doc to ll-merge.h
3f1480b745 graph: move doc to graph.h and graph.c
266f03eccd dir: move doc to dir.h
13c4d7eb22 diff: move doc to diff.h and diffcore.h
cd5522271f rebase -r: let `label` generate safer labels
867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()`
8c15904462 built-in add -i: implement the `help` command
3d965c7674 built-in add -i: use color in the main loop
68db1cbf8e built-in add -i: support `?` (prompt help)
76b743234c built-in add -i: show unique prefixes of the commands
6348bfba58 built-in add -i: implement the main loop
a376e37b2c gitweb: escape URLs generated by href()
b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI
f28bceca75 t/gitweb-lib.sh: drop confusing quotes
0eba60c9b7 t9502: pass along all arguments in xss helper
932757b0cc INSTALL: use existing shell scripts as example
b018719927 t7004: check existence of correct tag
1daaebcaa5 built-in add -i: color the header in the `status` command
5e82b9e4d2 built-in add -i: implement the `status` command
e4cb659ebd diff: export diffstat interface
f83dff60a7 Start to implement a built-in version of `git add --interactive`
df53c80822 stash: make sure we have a valid index before writing it
ad7a403268 send-pack: check remote ref status on pack-objects failure
d91ce887c9 t6120-describe: correct test repo history graph in comment
1f9247a3bd completion: tab-complete "git svn --recursive"
603960b50e promisor-remote: remove fetch_if_missing=0
e362fadcd0 clone: remove fetch_if_missing=0
169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL
51bd6be32d mingw: use COPY_ARRAY for copying array
4bd0593e0f test-tool: use 'read-graph' helper
e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway
d784d978f6 t4215: use helper function to check output
61eea521fe fsmonitor: do not compare bitmap size with size of split index
b19f3fe9dd hex: drop sha1_to_hex()
c1ce9c06d0 completion: learn to complete `git rebase --onto=`
f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls
d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase
aa6d7f93ed hex: drop sha1_to_hex_r()
52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch
5772b0c745 sequencer: reencode old merge-commit message
e0eba649e8 bundle-verify: add --quiet
79862b6b77 bundle-create: progress output control
73c3253d75 bundle: framework for options before bundle file
68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in"
b375744274 sequencer: reencode squashing commit's message
019a9d8362 sequencer: reencode revert/cherry-pick's todo list
0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list
e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding
1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary
d9f6f3b619 The first batch post 2.24 cycle
28014c1084 Merge branch 'bc/hash-independent-tests-part-6'
57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree'
c22f63c40f Merge branch 'pb/pretty-email-without-domain-part'
5731ca3657 Merge branch 'hw/remove-api-docs-placeholder'
14b58c62bc Merge branch 'sg/commit-graph-usage-fix'
eff313f8a7 Merge branch 'dl/apply-3way-diff3'
db806d7064 Merge branch 'sg/dir-trie-fixes'
f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix'
8f1119b988 Merge branch 'wb/midx-progress'
d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes'
0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges'
8f40d89783 Merge branch 'hv/bitshift-constants-in-blame'
d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head'
5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer'
b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc'
15d9f3dc66 Merge branch 'es/walken-tutorial'
026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor'
ed28358833 convert: use skip_iprefix() in validate_encoding()
89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding()
03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules
ae821ffe83 multimail: fix a few simple spelling errors
557c5895c2 sha1dc: fix trivial comment spelling error
aa74be316a Fix spelling errors in test commands
96c0caf5e3 Fix spelling errors in messages shown to users
4dc8b1c114 Fix spelling errors in names of tests
7a40cf1553 Fix spelling errors in comments of testcases
15beaaa3d1 Fix spelling errors in code comments
a807200f67 userdiff: add Elixir to supported userdiff languages
461caf3e8a git-shortlog.txt: include commit limiting options
6462d5eb9a fetch: remove fetch_if_missing=0
46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion
99b2ba35f5 t0028: eliminate non-standard usage of printf
add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul`
14c4776d75 t: fix typo in test descriptions
270de6acbe t6024: modernize style
77363a51fb name-hash.c: remove duplicate word in comment
c92faa4d22 hashmap: fix documentation misuses of -> versus .
a6d39f2efb git-filter-branch.txt: correct argument name typo
4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators
8915297925 Fix spelling errors in documentation outside of Documentation/
031fd4b93b Documentation: fix a bunch of typos, both old and new
dd0b61f577 fsmonitor: fix watchman integration
5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare()
7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph
c14e6e7903 fetch: add the command-line option `--write-commit-graph`
da72936f54 Git 2.24
1d34d425d4 Merge branch 'bc/doc-use-docbook-5'
dac1d83c91 Merge branch 'ds/commit-graph-on-fetch'
c32ca691c2 Merge branch 'jt/delay-fetch-if-missing'
ab6b50e4c8 Merge https://github.com/prati0100/git-gui
93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po
a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2
fe28ad8520 rebase: add --reset-author-date
08187b4cba rebase -i: support --ignore-date
0185c683c9 sequencer: rename amend_author to author_to_rename
cbd8db17ac rebase -i: support --committer-date-is-author-date
c068bcc59b sequencer: allow callers of read_author_script() to ignore fields
ba51d2fb24 rebase -i: add --ignore-whitespace flag
3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower
3ada78de3f myfirstcontrib: add dependency installation step
4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt
4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly
8dfb04ae96 update-index: optionally leave skip-worktree entries alone
116d1fa6c6 vreportf(): avoid relying on stdio buffering
efd5444238 RelNotes/2.24.0: fix self-contradictory note
391c7e40b5 fetch.c: fix typo in a warning message
55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template
849e43680d RelNotes/2.24.0: typofix
0115e5d929 git-diff.txt: document return code of `--no-index`
798d66e35d l10n: de.po: Update German translation
c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u)
f21f8f5d35 Git 2.24-rc2
8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix'
0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix'
f2db52c46b Merge branch 'js/mingw-needs-hiding-fix'
5b7594abdc Merge branch 'master' of github.com:vnwildman/git
034d33653a Merge branch 'next' of github.com:ChrisADR/git-po
26b061007c submodule: teach set-url subcommand
460782b7be t7519-status-fsmonitor: improve comments
d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses
4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config
1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694)
f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0
762d5b4f46 help: add gitsubmodules to the list of guides
76a53d640f git_path(): handle `.lock` files correctly
3ce47211a6 t1400: wrap setup code in test case
44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string
6c02042139 clone: rename static function `dir_exists()`.
8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command
77200e9332 l10n: es: 2.24.0 round 2
e42df36b42 Merge branch 'l10n/it/update-italian-translation'
5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2
51728480fe l10n: fr v2.24.0 rnd2
045a548698 l10n: git.pot: v2.24.0 round 2 (1 new)
468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master
b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree()
c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit()
103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag()
f648ee7088 fsck: rename vague "oid" local variables
cc579000bf fsck: don't require an object struct in verify_headers()
7854399366 fsck: don't require an object struct for fsck_ident()
b8b00f1693 fsck: drop blob struct from fsck_finish()
6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob()
38370253fd fsck: don't require an object struct for report()
f59793763d fsck: only require an oid for skiplist functions
5afc4b1dc6 fsck: only provide oid/type in fsck_error callback
82ef89b318 fsck: don't require object structs for display functions
733902905d fsck: use oids rather than objects for object_name API
d40bbc109b fsck_describe_object(): build on our get_object_name() primitive
a59cfb3230 fsck: unify object-name code
23a173a761 fsck: require an actual buffer for non-blobs
2175a0c601 fsck: stop checking tag->tagged
ec65231571 fsck: stop checking commit->parent counts
1de6007d85 fsck: stop checking commit->tree value
228c78fbd4 commit, tag: don't set parsed bit for parse failures
60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()`
8b656572ca builtin/commit-graph.c: remove subcommand-less usage string
fa26d5ede6 t4048: abstract away SHA-1-specific constants
cf02be8486 t4045: make hash-size independent
38ee26b2a3 t4044: update test to work with SHA-256
37ab8ebef1 t4039: abstract away SHA-1-specific constants
0370b35414 t4038: abstract away SHA-1 specific constants
0253e126a2 t4034: abstract away SHA-1-specific constants
45e2ef2b1d t4027: make hash-size independent
79b0edc1a0 t4015: abstract away SHA-1-specific constants
840624ff55 t4011: abstract away SHA-1-specific constants
32a6707267 t4010: abstract away SHA-1-specific constants
440bf91dfa t3429: remove SHA1 annotation
0b408ca2bd t1305: avoid comparing extensions
2eabd38313 rev-parse: add a --show-object-format option
52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode
45e206f0d8 t4203: use test-lib.sh definitions
2ae4944aac t6006: use test-lib.sh definitions
cb99a34e23 commit-graph: fix writing first commit-graph during fetch
e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug
7b4fb434b4 documentation: remove empty doc files
566a1439f6 Git 2.24-rc1
04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix'
4d6fb2beeb Merge branch 'ds/feature-macros'
5f0b6ed907 Merge branch 'js/azure-ci-osx-fix'
c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs'
1b4f85285f Merge branch 'dl/submodule-set-branch'
c7aadccba0 fetch: delay fetch_if_missing=0 until after config
c11e9966cb repo-settings: read an int for index.version
091489d068 apply: respect merge.conflictStyle in --3way
aa76ae4905 t4108: demonstrate bug in apply
95806205cd t4108: use `test_config` instead of `git config`
b0069684d4 t4108: remove git command upstream of pipe
fa87b81385 t4108: replace create_file with test_write_lines
7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job
6c96630cb0 config: move documentation to config.h
d81542e6f3 Eleventh batch
e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix'
d45d771978 Merge branch 'bc/smart-http-atomic-push'
22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix'
2e215b7959 Merge branch 'sb/userdiff-dts'
e3cf08361a Merge branch 'sg/progress-fix'
b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix'
c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc'
f45f88b2e4 path.c: don't call the match function without value in trie_find()
c72fc40d09 path.c: clarify two field names in 'struct common_dir'
8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file
7cb8c929d7 path.c: clarify trie_find()'s in-code comment
e536b1fedf Documentation: mention more worktree-specific exceptions
680cba2c2b multi-pack-index: add [--[no-]progress] option.
64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack
ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file
8dc18f8937 midx: add progress to expire_midx_packs
840cef0c70 midx: add progress to write_midx_file
efbc3aee08 midx: add MIDX_PROGRESS flag
0eb3671ed9 ci(osx): use new location of the `perforce` cask
da1e295e00 t604[236]: do not run setup in separate tests
49b8133a9e merge-recursive: fix merging a subdirectory into the root directory
d3eebaad5e merge-recursive: clean up get_renamed_dir_portion()
80736d7c5e doc: am --show-current-patch gives an entire e-mail message
a8e2c0eadc t7419: change test_must_fail to ! for grep
19c29e538e t4014: make output-directory tests self-contained
12a4aeaad8 Merge branch 'js/azure-pipelines-msvc'
399c23c046 ci(visual-studio): actually run the tests in parallel
711cd6d15c ci(visual-studio): use strict compile flags, and optimization
370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0
cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master
907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master
13bcea8c7f l10n: fr 2.24.0 rnd 1
135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master
3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed)
8da56a4848 userdiff: fix some corner cases in dts regex
86795774bb builtin/blame.c: constants into bit shift format
feebd2d256 rebase: hide --preserve-merges option
0e40a73a4c Doc: Bundle file usage
78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error
12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error
c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error
2b6f6ea1bd test-progress: fix test failures on big-endian systems
f757409e36 l10n: bg.po: Updated Bulgarian translation (4693)
176f5adfdb completion: clarify installation instruction for zsh
d966095db0 Git 2.24-rc0
90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array'
3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth'
d0258d0944 Merge branch 'rs/http-push-simplify'
bb52def6da Merge branch 'jj/stash-reset-only-toplevel'
f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs'
e5fca6b573 Merge branch 'bb/compat-util-comment-fix'
43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup'
07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely'
2d74d28ee0 Merge branch 'dl/compat-cleanup'
9b83a94829 Merge branch 'ta/t1308-typofix'
376012c919 Merge branch 'js/doc-stash-save'
10da030ab7 grep: avoid leak of chartables in PCRE2
513f2b0bbd grep: make PCRE2 aware of custom allocator
57d4660468 grep: make PCRE1 aware of custom allocator
d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand
8af69cf3e2 t3301: test diagnose messages for too few/many paramters
6f1194246a remote-curl: pass on atomic capability to remote side
bbb13e8188 graph: fix coloring of octopus dashes
92beecc136 graph: flatten edges that fuse with their right neighbor
479db18bc0 graph: smooth appearance of collapsing edges on commit lines
0195285b95 graph: rename `new_mapping` to `old_mapping`
d62893ecc1 graph: commit and post-merge lines for left-skewed merges
0f0f389f12 graph: tidy up display of left-skewed merges
458152cce1 graph: example of graph output that can be simplified
ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state
46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()`
a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()`
9157a2a032 graph: reuse `find_new_column_by_commit()`
210179a20d graph: handle line padding in `graph_next_line()`
fbccf255f9 graph: automatically track display width of graph lines
5374a290aa fetch-pack: write fetched refs to .promisor
4627bc777e sequencer: run post-commit hook
49697cb721 move run_commit_hook() to libgit and use it there
12bb7a540a sequencer.h fix placement of #endif
6a619ca03c t3404: remove uneeded calls to set_fake_editor
b2dbacbddf t3404: set $EDITOR in subshell
88a92b6c73 t3404: remove unnecessary subshell
bf8e65b30b format-patch: teach --cover-from-description option
a92331df18 format-patch: use enum variables
46273df7bf format-patch: replace erroneous and condition
3b3c79f6c9 diff-highlight: fix a whitespace nit
108b97dc37 Ninth batch
cbe8cdd3a0 Merge branch 'jk/coc'
3b9ec27919 Merge branch 'js/trace2-fetch-push'
c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch'
1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup'
eb3de5b823 Merge branch 'js/xdiffi-comment-updates'
4e8371ec26 Merge branch 'dl/t0000-skip-test-test'
b6d712fa4e Merge branch 'tg/range-diff-output-update'
77458870a5 Merge branch 'gs/sq-quote-buf-pretty'
5efabc7ed9 Merge branch 'ew/hashmap'
d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files'
6ed610b968 Merge branch 'am/t0028-utf16-tests'
5b900fb812 Merge branch 'dl/octopus-graph-bug'
16d9d7184b Merge branch 'en/fast-imexport-nested-tags'
6d5291be45 Merge branch 'js/azure-pipelines-msvc'
ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd'
d96e31e390 Merge branch 'js/fetch-jobs'
280bd44551 Merge branch 'en/merge-recursive-cleanup'
062a309d36 remote-curl: use argv_array in parse_push()
a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes
5cc6a4be11 http-push: simplify deleting a list item
556895d0c8 stash: avoid recursive hard reset on submodules
b524f6b399 Merge branch 'ka/japanese-translation'
f6f3824b4e git-gui: improve Japanese translation
61f4b407d3 Merge branch 'py/readme'
1e6880fd06 git-gui: add a readme
edefc31873 format-patch: create leading components of output directory
68b69211b2 git-compat-util: fix documentation syntax
fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth()
e0479fa073 documentation: add tutorial for object walking
3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed
4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target
9cad1c4488 pthread.h: manually align parameter lists
8c1cfd58e3 t1308-config-set: fix a test that has a typo
57d8f4b4c7 doc(stash): clarify the description of `save`
08da6496b6 Eighth batch
07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup'
f0d407e6ae Merge branch 'kt/add-i-progress'
66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree'
a4c5d9f66e Merge branch 'rs/dedup-includes'
159cdabd87 Merge branch 'js/range-diff-noprefix'
93424f1f7d Merge branch 'cb/pcre1-cleanup'
a73f91774c Merge branch 'ab/pcre-jit-fixes'
4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword'
020011f2cb Merge branch 'tk/git-svn-trim-author-name'
676278f8ea Merge branch 'bc/object-id-part17'
aafb75452b Merge branch 'en/clean-nested-with-ignored'
3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails
5cdf2301d4 add a Code of Conduct document
70bf0b755a Seventh batch
9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat'
2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary'
d17f54947d Merge branch 'rs/convert-fix-utf-without-dash'
82c80f98e6 Merge branch 'py/git-gui-has-maintainer'
6e12570822 Merge branch 'ah/cleanups'
772cad0afb Merge branch 'js/diff-rename-force-stable-sort'
424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path'
678a9ca629 Merge branch 'as/shallow-slab-use-fix'
0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix'
042a54d251 Merge branch 'am/visual-studio-config-fix'
03d3b1297c xdiffi: fix typos and touch up comments
b05b40930e t0000: cover GIT_SKIP_TESTS blindspots
d8bc1a518a send-pack: never fetch when checking exclusions
756fb0dedb t4014: treat rev-list output as the expected value
2b6a9b13ca range-diff: don't segfault with mode-only changes
360c7ba330 transport: push codepath can take arbitrary repository
ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments
b657047719 merge-recursive: fix the fix to the diff3 common ancestor label
b744c3af07 Sixth batch
417056578a Merge branch 'bw/submodule-helper-usage-fix'
9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check'
1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a'
59b19bcd9f Merge branch 'cc/multi-promisor'
1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way'
5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort'
eb35c18e42 Merge branch 'sg/travis-help-debug'
cabb145fe3 Merge branch 'rs/alias-use-copy-array'
56c7ab0f4e Merge branch 'sg/t-helper-gitignore'
e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang'
583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules'
337e3f2b49 Merge branch 'rs/nth-switch-code-simplification'
8f53fe1733 Merge branch 'hb/hg-to-git-py3'
ef93bfbd45 Merge branch 'sg/progress-fix'
980351d1ac Merge branch 'js/doc-patch-text'
80693e3f09 Merge branch 'tb/commit-graph-harden'
ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge'
3f84633563 Merge branch 'dl/cocci-everywhere'
caf150ce7d Merge branch 'gs/commit-graph-progress'
1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim'
1398171378 Merge branch 'rs/commit-graph-use-list-count'
773521df26 Merge branch 'rs/nth-parent-parse'
7f17913161 Merge branch 'dl/submodule-set-branch'
cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix'
bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees'
098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack'
37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc'
e392382f95 Merge branch 'dl/complete-rebase-and-archive'
cda8faa37e Merge branch 'jk/commit-graph-cleanup'
36d2fca82b Merge branch 'ss/get-time-cleanup'
ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude'
ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob'
ba2d451122 Merge branch 'tg/stash-refresh-index'
e2b5038d87 hashmap_entry: remove first member requirement from docs
404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry
23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators
c8e424c9c9 hashmap: introduce hashmap_free_entries
8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry *
87571c3f71 hashmap: use *_entry APIs for iteration
939af16eac hashmap_cmp_fn takes hashmap_entry params
f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *"
f0e63c4113 hashmap: use *_entry APIs to wrap container_of
6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *"
973d5eea74 introduce container_of macro
26b455f21e hashmap_put takes "struct hashmap_entry *"
28ee794128 hashmap_remove takes "const struct hashmap_entry *"
b6c5241606 hashmap_get takes "const struct hashmap_entry *"
b94e5c1df6 hashmap_add takes "struct hashmap_entry *"
f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *"
d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *"
d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry
12878c8351 coccicheck: detect hashmap_entry.hash assignment
e010a41216 diff: use hashmap_entry_init on moved_entry.ent
f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo"
de5abb5f7a git-p4: auto-delete named temporary file
c90b652afd Fifth batch
f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1'
b0f8aed48f Merge branch 'ma/user-manual-markup-update'
faf5576a8d Merge branch 'bc/doc-use-docbook-5'
314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes'
70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo'
847650798b Merge branch 'am/mailmap-andrey-mazo'
1a155f2e66 Merge branch 'jc/git-gui-has-maintainer'
1bcef51204 t/oid-info: add empty tree and empty blob values
ecde49bb8a t/oid-info: allow looking up hash algorithm name
11a3d3aadd git-rev-list.txt: prune options in synopsis
7d2f003ee4 Documentation: update the location of the git-gui repo
b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding()
46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines
b35304bf95 ci: really use shallow clones on Azure Pipelines
ab7d854aba tests: let --immediate and --write-junit-xml play well together
be5d88e112 test-tool run-command: learn to run (parts of) the testsuite
5d65ad17a9 vcxproj: include more generated files
030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built
61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable()
e4347c9434 msvc: handle DEVELOPER=1
ed712ef8d5 msvc: ignore some libraries when linking
5b8f9e2417 compat/win32/path-utils.h: add #include guards
41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning
c097b95a26 msvc: avoid using minus operator on unsigned types
dfd557c978 stash apply: report status correctly even in a worktree's subdirectory
d54dea77db fetch: let --jobs=<n> parallelize --multiple, too
87db61a436 trace2: write discard message to sentinel files
83e57b04e6 trace2: discard new traces if target directory has too many files
11c21f22de t4214: demonstrate octopus graph coloring failure
25eb905e14 t4214: explicitly list tags in log
63be8c8dd7 t4214: generate expect in their own test cases
a7a5590c6e t4214: use test_merge
94ba151300 test-lib: let test_merge() perform octopus merges
22541013d0 docs: clarify trace2 version invariants
3d4548e7e2 docs: mention trace2 target-dir mode in git-config
2fe44394c8 treewide: remove duplicate #include directives
dbcd970c27 push: do not pretend to return `int` from `die_push_simple()`
941790d7de fast-export: handle nested tags
8d7d33c1ce t9350: add tests for tags of things other than a commit
a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags
208d69246e fast-export: add support for --import-marks-if-exists
b8f50e5b60 fast-import: add support for new 'alias' command
f73b2aba05 fast-import: allow tags to be identified by mark labels
3164e6bd24 fast-import: fix handling of deleted tags
8085050ab4 add -i: show progress counter in the prompt
69fdb922ad Merge branch 'bw/diff3-conflict-style'
b436825b9b git-gui: support for diff3 conflict style
937b76ed49 range-diff: internally force `diff.noprefix=true`
411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job
25e4b8099c push: add trace2 instrumentation
5fc31180d8 fetch: add trace2 instrumentation
53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value
c3b57dc2a0 git-gui: use existing interface to query a path's attribute
45ab460d4a Merge branch 'js/git-bash-if-available'
0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command
71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only)
54a80a9ad8 wrapper: use a loop instead of repetitive statements
baed6bbb5b diffcore-break: use a goto instead of a redundant if statement
8da02ce62a commit-graph: remove a duplicate assignment
ddb3c856f3 shallow.c: don't free unallocated slabs
8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits
65904b8b2b promisor-remote: skip move_to_tail when no-op
2049b8dc65 diffcore_rename(): use a stable sort
97fff61012 Move git_sort(), a stable sort, into into libgit.a
69f272b922 dir: special case check for the possibility that pathspec is NULL
6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available
bc12974a89 Fourth batch
5a5350940b Merge branch 'ds/commit-graph-on-fetch'
974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch'
9755f70fe6 Merge branch 'ds/include-exclude'
93fc8760e7 Merge branch 'jh/trace2-pretty-output'
640f9cd599 Merge branch 'dl/rebase-i-keep-base'
026428c35e Merge branch 'sg/clean-nested-repo-with-ignored'
21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip'
d693345518 Merge branch 'dl/use-sq-from-test-lib'
d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes'
2be6ccc01a Merge branch 'sg/git-test-boolean'
cf861cd7a0 Merge branch 'rs/get-tagged-oid'
91243b019d Merge branch 'en/filter-branch-deprecation'
9bc67b6658 Merge branch 'en/merge-options-ff-and-friends'
fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden'
cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option'
8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return'
3ff6af7753 Merge branch 'nd/switch-and-restore'
aadac067aa Merge branch 'tb/file-url-to-unc-path'
b57a88a5f1 Merge branch 'js/gitdir-at-unc-root'
6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path'
430439536b Merge branch 'rs/parse-tree-indirect'
991fd97b9a Merge branch 'jk/fast-import-history-bugfix'
74a39b9bcc Merge branch 'mh/notes-duplicate-entries'
37801f0665 Merge branch 'tb/banned-vsprintf-namefix'
21ce0b48f3 Merge branch 'mh/release-commit-memory-fix'
f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup'
bf6136cab8 Merge branch 'rs/strbuf-detach'
a2e22bb3ad Merge branch 'rs/trace2-dst-warning'
1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup'
0281733483 Merge branch 'bc/hash-independent-tests-part-5'
f06fb376ed Merge branch 'jc/test-cleanup'
00bb74453d Merge branch 'dl/compat-cleanup'
59438be06c Merge branch 'js/visual-studio'
cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone'
af2abd870b fast-export: fix exporting a tag and nothing else
c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor
dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit
fd5b820d9c user-manual.txt: change header notation
e79b34533a user-manual.txt: add missing section label
b503a2d515 Makefile: emulate compile in $(HCO) target better
af26e2a9d2 pack-bitmap.h: remove magic number
b06fdead04 promisor-remote.h: include missing header
97b989ee3a apply.h: include missing header
4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name
d928a8388a t0028: add more tests
0b63fd6965 t0028: fix test for UTF-16-LE-BOM
fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration
2e09c01232 name-rev: avoid cutoff timestamp underflow
8464f94aeb promisor-remote.h: drop extern from function declaration
75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp
24c681794f doc: MyFirstContribution: fix cmd placement instructions
c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode
60c60b627e Merge branch 'py/git-git-extra-stuff'
faf420e05a treewide: correct several "up-to-date" to "up to date"
b71c6c3b64 Fix build with core.autocrlf=true
16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff
26e3d1cbea .mailmap: update email address of Andrey Mazo
27ea41c0b4 t/helper: ignore only executable files
7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()
83e3ad3b12 merge-recursive: symlink's descendants not in way
34933d0eff stash: make sure to write refreshed cache
e080b34540 merge: use refresh_and_write_cache
22184497a3 factor out refresh_and_write_cache function
7371612255 commit-graph: add --[no-]progress to write and verify
47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW
253bfe49bd SubmittingPatches: git-gui has a new maintainer
d17ae00c97 hg-to-git: make it compatible with both python3 and python2
4c86140027 Third batch
f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http'
627b826834 Merge branch 'md/list-objects-filter-combo'
b9ac6c59b8 Merge branch 'cc/multi-promisor'
de67293e74 Merge branch 'sg/line-log-tree-diff-optim'
95486229e3 Merge branch 'sg/complete-configuration-variables'
f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook'
a2e524ecf3 Merge branch 'cb/curl-use-xmalloc'
128666753b Merge branch 'jk/drop-release-pack-memory'
917a319ea5 Merge branch 'js/rebase-r-strategy'
7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui
4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout()
0d4304c124 doc: fix reference to --ignore-submodules
af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py
8a3a6817e2 Merge gitk to pick up emergency build fix
2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po
9027af58e2 Makefile: run coccicheck on more source files
43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES)
5dedf7de53 Makefile: define THIRD_PARTY_SOURCES
902b90cf42 clean: fix theoretical path corruption
ca8b5390db clean: rewrap overly long line
09487f2cba clean: avoid removing untracked files in a nested git repository
e86bbcf987 clean: disambiguate the definition of -d
3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run
29b577b960 dir: add commentary explaining match_pathspec_item's return value
89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it
a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case
404ebceda0 dir: also check directories for matching pathspecs
a5e916c745 dir: fix off-by-one error in match_pathspec_item
bbbb6b0b89 dir: fix typo in comment
7541cc5302 t7300: add testcases showing failure to clean specified pathspecs
0eb7c37a8a diff, log doc: small grammer, format, and language fixes
6fae6bd518 diff, log doc: say "patch text" instead of "patches"
2bb74b53a4 Test the progress display
bbf47568ad Revert "progress: use term_clear_line()"
cf6a2d2557 Makefile: strip leading ./ in $(LIB_H)
b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup
689a146c91 commit-graph: use commit_list_count()
59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N"
a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N"
a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base"
cf34337f98 list-objects-filter: give a more specific error sparse parsing error
4c96a77594 list-objects-filter: delay parsing of sparse oid
72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter
83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer
7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>`
226daba280 Doc/Makefile: give mansource/-version/-manual attributes
40e747e89d git-submodule.txt: fix AsciiDoc formatting error
f6461b82b9 Documentation: fix build with Asciidoctor 2
3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
f7a8834ba4 Merge branch 'bp/amend-toggle-bind'
ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit"
9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes
d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog
beffae768a gitk: Add Chinese (zh_CN) translation
56d9cbe68b packfile: expose get_delta_base()
bab28d9f97 builtin/pack-objects: report reused packfile objects
6c8ec8c30a Merge branch 'bw/commit-scrollbuffer'
acfa495519 Merge branch 'bw/amend-checkbutton'
da08d559b7 git-gui: add horizontal scrollbar to commit buffer
ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton
aeeb978ba6 completion: teach archive to use __gitcomp_builtin
2b9bd488ae completion: teach rebase to use __gitcomp_builtin
d49dffde9a completion: add missing completions for log, diff, show
6abada1880 upload-pack: disable commit graph more gently for shallow traversal
fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time
72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set
4fd39c76e6 doc: minor formatting fix
29f4332e66 Quit passing 'now' to date code
c77abf0460 Merge branch 'py/revert-hunks-lines'
5a2bb62180 Merge branch 'bp/widget-focus-hotkeys'
e07446ed5f git-gui: add hotkeys to set widget focus
f981ec18cf cache-tree: do not lazy-fetch tentative tree
f1d4a28250 Second batch
c8ada15456 Merge branch 'bc/reread-attributes-during-rebase'
8f3ba423e7 Merge branch 'tg/t0021-racefix'
a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email'
d49c2c3466 Merge branch 'sb/userdiff-dts'
2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe'
4c49dd042d Merge branch 'nd/diff-parseopt'
d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix'
8ce8a63b46 Merge branch 'ds/midx-expire-repack'
9437394661 Merge branch 'cb/fetch-set-upstream'
af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix'
fa9e7934c7 Merge branch 'bm/repository-layout-typofix'
d1a251a1fa Merge branch 'en/checkout-mismerge-fix'
e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental'
f4f8dfe127 Merge branch 'ds/feature-macros'
4a12f89865 Merge branch 'jk/eoo'
b4a1eec332 Merge branch 'jk/repo-init-cleanup'
70336bd50a Merge branch 'py/git-gui-do-quit'
ad7c543e3b grep: skip UTF8 checks explicitly
0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration()
b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration
4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor
b7e1ba5649 git-merge-index.txt: wrap shell listing in "----"
38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----"
5371813768 git-ls-remote.txt: wrap shell listing in "----"
1925fe0c8a Documentation: wrap config listings in "----"
922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor
2017956a19 Documentation: wrap blocks with "--"
dd2e50a84e commit-graph: turn off save_commit_buffer
67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits
806278dead commit-graph.c: handle corrupt/missing trees
16749b8dd2 commit-graph.c: handle commit parsing errors
23424ea759 t/t5318: introduce failing 'git commit-graph write' tests
bf1e28e0ad builtin/rebase.c: Remove pointless message
d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing
bd482d6e33 t: use common $SQ variable
3a37876b5d pack-objects: drop packlist index_pos optimization
7e6b96c73b test-read-cache: drop namelen variable
e4b369069e diff-delta: set size out-parameter to 0 for NULL delta
7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint
f1cbd033e2 pack-objects: use object_id in packlist_alloc()
0dfed92dfd git-am: handle missing "author" when parsing commit
3960290675 ci: restore running httpd tests
6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests
c77722b3ea use get_tagged_oid()
dad3f0607b tag: factor out get_tagged_oid()
468ce99b77 unpack-trees: rename 'is_excluded_from_list()'
65edd96aec treewide: rename 'exclude' methods to 'pattern'
4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_'
caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list'
ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern'
483e861111 t9902: use a non-deprecated command for testing
9df53c5de6 Recommend git-filter-repo instead of git-filter-branch
7b6ad97939 t6006: simplify, fix, and optimize empty message test
50094ca45f config/format.txt: specify default value of format.coverLetter
c1a6f21cd4 Doc: add more detail for git-format-patch
854b5cb46a t4014: stop losing return codes of git commands
dd2b6b6860 t4014: remove confusing pipe in check_threading()
6bd26f58ea t4014: use test_line_count() where possible
c6ec6dadba t4014: let sed open its own files
f2e2fa8f60 t4014: drop redirections to /dev/null
460609cbd5 t4014: use indentable here-docs
92014b69bb t4014: remove spaces after redirect operators
0ab74e979c t4014: use sq for test case names
cb46c40662 t4014: move closing sq onto its own line
b562a54c01 t4014: s/expected/expect/
e770fbfeff t3005: remove unused variable
da280f5f1a t: use LF variable defined in the test harness
7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch
552fc5016f mingw: apply array.cocci rule
476998d05b t3427: accelerate this test by using fast-export and fast-import
aac6ff7b5b .gitignore: stop ignoring `.manifest` files
2c65d90f75 am: reload .gitattributes after patching it
1577dc0f7c tree: simplify parse_tree_indirect()
50f26bd035 fetch: add fetch.writeCommitGraph config setting
8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set
27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options
0a8bc7068f clarify documentation for remote helpers
80e3658647 help: make help_unknown_ref() NORETURN
313677627a checkout: add simple check for 'git checkout -b'
3441de5b9c gitk: Make web links clickable
a4fa2f0a4c git-gui: allow undoing last revert
414d924beb rebase: teach rebase --keep-base
6330209d7d rebase tests: test linear branch topology
4effc5bc96 rebase: fast-forward --fork-point in more cases
c0efb4c1dd rebase: fast-forward --onto in more cases
2b318aa6c3 rebase: refactor can_fast_forward into goto tower
c9efc21683 t3432: test for --no-ff's interaction with fast-forward
1ebec8dfc1 fast-import: duplicate into history rather than passing ownership
9756082b3c fast-import: duplicate parsed encoding string
86ae43da6a status: mention --skip for revert and cherry-pick
b1b16bba96 completion: add --skip for cherry-pick and revert
deaa65a754 completion: merge options for cherry-pick and revert
4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
793ac7e309 t3432: test rebase fast-forward behavior
359ecebc34 t3431: add rebase --fork-point tests
502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage
ff61681b46 grep: refactor and simplify PCRE1 support
8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1
1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning()
fd99c2dd9b grep: use return value of strbuf_detach()
82f51af345 log-tree: always use return value of strbuf_detach()
7e92756751 http: don't leak urlmatch_config.vars
9784f97321 commit: free the right buffer in release_commit_memory
ce17feb1b3 path: add a function to check for path suffix
60d198d022 banned.h: fix vsprintf()'s ban message
60fe477a0b notes: avoid potential use-after-free during insertion
779ad6641b notes: avoid leaking duplicate entries
4e1a641ee3 mingw: fix launching of externals from Unicode paths
5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly
e2683d51d9 Fix .git/ discovery at the root of UNC shares
d17f2124a7 setup_git_directory(): handle UNC paths correctly
ebb8d2c90f mingw: support UNC in git clone file://server/share/repo
0c37c41d13 t4009: make hash size independent
c1f3dfcc23 t4002: make hash independent
8cc5ff83c3 t4000: make hash size independent
c784815073 t3903: abstract away SHA-1-specific constants
2ccdfb1c78 git-gui: return early when patch fails to apply
62bd99934b git-gui: allow reverting selected hunk
5f0a516de9 git-gui: allow reverting selected lines
fddf2ebe38 transport: teach all vtables to allow fetch first
ac3fda82bf transport-helper: skip ls-refs if unnecessary
745f681289 First batch after Git 2.23
d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg'
22e86e85cb Merge branch 'en/fast-import-merge-doc'
9c7573581c Merge branch 'jk/perf-no-dups'
4336fdb2ef Merge branch 'rs/nedalloc-fixlets'
8ae7a46c4d Merge branch 'sg/show-failed-test-names'
6ba06b582b Merge branch 'sg/commit-graph-validate'
072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix'
207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix'
77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests'
1b01cdbf2e Merge branch 'jk/tree-walk-overflow'
8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix'
307179732d Merge branch 'mt/grep-submodules-working-tree'
58166c2e9d t0021: make sure clean filter runs
8b3f33ef11 ref-filter: initialize empty name or email fields
3c81760bc6 userdiff: add a builtin pattern for dts files
fe49814409 t4014: drop unnecessary blank lines from test cases
a2bb801f6a line-log: avoid unnecessary full tree diffs
eef5204190 line-log: extract pathspec parsing from line ranges into a helper function
a63694f523 diff: skip GITLINK when lazy fetching missing objs
7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe
19800bdc3f parseopt: move definition of enum parse_opt_result up
415b770b88 packfile.h: drop extern from function declaration
acb49d1cc8 t3800: make hash-size independent
ca6ba94200 t3600: make hash size independent
19ce5496c2 t3506: make hash independent
9a6738c061 t3430: avoid hard-coded object IDs
4dd1b5f90f t3404: abstract away SHA-1-specific constants
b99bfc7a6c t3306: abstract away SHA-1-specific constants
e3e9d02e35 t3305: make hash size independent
b408cf8cf6 t3301: abstract away SHA-1-specific constants
b561edd213 t3206: abstract away hash size constants
a5f61c7d13 t3201: abstract away SHA-1-specific constants
1c24a54ea4 repository-layout.txt: correct pluralization of 'object'
b0a3186140 sequencer: simplify root commit creation
a47ba3c777 rebase -i: check for updated todo after squash and reword
450efe2d53 rebase -i: always update HEAD before rewording
c581e4a749 grep: under --debug, show whether PCRE JIT is enabled
aaa95dfa05 midx: switch to using the_hash_algo
be8e172e9f builtin/show-index: replace sha1_to_hex
3f34d70d40 rerere: replace sha1_to_hex
fc06be3b7f builtin/receive-pack: replace sha1_to_hex
69fa337060 builtin/index-pack: replace sha1_to_hex
3a4d7aa5ae packfile: replace sha1_to_hex
e0cb7cdb89 wt-status: convert struct wt_status to object_id
8d4d86b0f0 cache: remove null_sha1
f6ca67d673 builtin/worktree: switch null_sha1 to null_oid
dd336a5511 builtin/repack: write object IDs of the proper length
894c0f66bb pack-write: use hash_to_hex when writing checksums
4439c7a360 sequencer: convert to use the_hash_algo
95518faac1 bisect: switch to using the_hash_algo
e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo
fe9fec45f6 config: use the_hash_algo in abbrev comparison
976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
703d2d4193 bundle: switch to use the_hash_algo
9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo
7962e046ff show-index: switch hard-coded constants to the_hash_algo
fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ
7e0d029f18 builtin/rev-parse: switch to use the_hash_algo
319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo
fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo
f6af19a9ad fetch-pack: use parse_oid_hex
36261e42ec patch-id: convert to use the_hash_algo
28ba1830d0 builtin/replace: make hash size independent
24bc1a1292 pull, fetch: add --set-upstream option
71d41ff651 archive-tar: turn length miscalculation warning into BUG
17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header()
82a46af13e archive-tar: fix pax extended header length calculation
4060c1990a archive-tar: report wrong pax extended header length
4615a8cb5b merge-recursive: alphabetize include list
45ef16f77a merge-recursive: add sanity checks for relevant merge_options
f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
5bf7e5779e merge-recursive: split internal fields into a separate struct
e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output
a779fb829b merge-recursive: comment and reorder the merge_options fields
8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options
7c0a6c8e47 merge-recursive: move some definitions around to clean up the header
c749ab1da8 merge-recursive: rename merge_options argument to opt in header
bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity
ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list
4d7101e25c merge-recursive: fix some overly long lines
724dd767b2 cache-tree: share code between functions writing an index as a tree
345480d1ed merge-recursive: don't force external callers to do our logging
b4db8a2b76 merge-recursive: remove useless parameter in merge_trees()
98a1d3d888 merge-recursive: exit early if index != head
9822175d2b Ensure index matches head before invoking merge machinery, round N
10f751c06b merge-recursive: remove another implicit dependency on the_repository
f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks
8e01251694 merge-recursive: introduce an enum for detect_directory_renames values
743474cbfa merge-recursive: provide a better label for diff3 common ancestor
51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u)
5bace62582 l10n: Update Catalan translation
139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()
65c01c6442 checkout: provide better conflict hunk description with detached HEAD
d8523ca1b9 merge-recursive: be consistent with assert
acb7da05ac checkout: remove duplicate code
93b980e58f http: use xmalloc with cURL
64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental
aaf633c2ad repo-settings: create feature.experimental setting
c6cc4c5afd repo-settings: create feature.manyFiles setting
ad0fb65999 repo-settings: parse core.untrackedCache
31b1de6a09 commit-graph: turn on commit-graph by default
b068d9a250 t6501: use 'git gc' in quiet mode
7211b9e753 repo-settings: consolidate some config settings
507e5470a0 worktree remove: clarify error message on dirty worktree
5af9d5f6c8 completion: complete config variables and values for 'git clone --config='
88cd790d6a completion: complete config variables names and values for 'git clone -c'
dd33472831 completion: complete values of configuration variables after 'git -c var='
e1e00089da completion: complete configuration sections and variable names for 'git -c'
42d0efec59 completion: split _git_config()
d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp()
2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names
d9438873c4 completion: deduplicate configuration sections
7a09a8f093 completion: add tests for 'git config' completion
840d7e5b3c completion: complete more values of more 'color.*' configuration variables
08a12175d8 completion: fix a typo in a comment
9827d4c185 packfile: drop release_pack_memory()
d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed
362f8b280c t/perf: rename duplicate-numbered test script
742ed63345 trace2: cleanup whitespace in perf format
e34430556c trace2: cleanup whitespace in normal format
c2b890aca5 quote: add sq_append_quote_argv_pretty()
ad43e37839 trace2: trim trailing whitespace in normal format error message
04f10d332f trace2: remove dead code in maybe_add_string_va()
da4589ce7e trace2: trim whitespace in region messages in perf target format
0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit
5440eb0ea2 git-gui: call do_quit before destroying the main window
bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook
6098817fd7 git-merge: honor pre-merge-commit hook
a1f3dd7eb3 merge: do no-verify like commit
f78f6c7e0c t7503: verify proper hook execution
70597e8386 nedmalloc: avoid compiler warning about unused value
c9b9c09dae nedmalloc: do assignments only after the declaration section
22932d9169 config: stop checking whether the_repository is NULL
5732f2b1ef common-main: delay trace2 initialization
58ebccb478 t1309: use short branch name in includeIf.onbranch test
67feca3b1c gitcli: document --end-of-options
51b4594b40 parse-options: allow --end-of-options as a synonym for "--"
19e8789b23 revision: allow --end-of-options to end option parsing
ffe1afe67c tests: show the test name and number at the start of verbose output
96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests
7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits'
39d8831856 commit-graph: turn a group of write-related macro flags into an enum
9916073be5 t5318-commit-graph: use 'test_expect_code'
620c09e1b6 restore: add test for deleted ita files
ecd72042de checkout.c: unstage empty deleted ita files
a613d4f817 pack-refs: always refresh after taking the lock file
decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd'
371df1bea9 trace2: cleanup column alignment in perf target format
5aa02f9868 tree-walk: harden make_traverse_path() length computations
c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path()
b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len()
37806080d7 tree-walk: use size_t consistently
7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh'
12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh'
9055384710 tree-walk: drop oid from traverse_info
947208b725 setup_traverse_info(): stop copying oid
e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
a63f990d92 t3418: test `rebase -r` with merge strategies
5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges`
e145d99347 rebase -r: support merge strategies other than `recursive`
4e6023b13a t3427: fix another incorrect assumption
f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced
a9c71073da t3427: fix erroneous assumption
b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three
d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case
c248d32cdb t3427: simplify the `setup` test case significantly
8c1e24048a t3427: add a clarifying comment
5efed0ecf9 rebase: fold git-rebase--common into the -p backend
68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone
2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive`
6180b20239 t3400: stop referring to the scripted rebase
d5b581f228 Drop unused git-rebase--am.sh
814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation
6a289d45c0 grep: fix worktree case in submodules
870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching
8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data
09872f6418 grep: create a "is_fixed" member in "grep_pat"
8a35b540a9 grep: consistently use "p->fixed" in compile_regexp()
685668faaa grep: stop using a custom JIT stack with PCRE v1
34489239d0 grep: stop "using" a custom JIT stack with PCRE v2
04bef50c01 grep: remove overly paranoid BUG(...) code
b65abcafc7 grep: use PCRE v2 for optimized fixed-string search
48de2a768c grep: remove the kwset optimization
45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern>
25754125ce grep: make the behavior for NUL-byte in patterns sane
d316af059d grep tests: move binary pattern tests into their own file
471dac5d2c grep tests: move "grep binary" alongside the rest
f463beb805 grep: inline the return value of a function call used only once
b14cf112e2 t4210: skip more command-line encoding tests on MinGW
44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
4e2443b181 log tests: test regex backends in "--encode=<enc>" tests
90d21f9ebf list-objects-filter-options: make parser void
5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW
489fc9ee71 list-objects-filter-options: allow mult. --filter
c2694952e3 strbuf: give URL-encoding API a char predicate fn
cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list
f56f764279 list-objects-filter-options: move error check up
e987df5fe6 list-objects-filter: implement composite filters
842b00516a list-objects-filter-options: always supply *errbuf
7a7c7f4a6d list-objects-filter: put omits set in filter struct
9430147ca0 list-objects-filter: encapsulate filter components
4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c
60b7a92d84 Move repository_format_partial_clone to promisor-remote.c
db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
75de085211 remote: add promisor and partial clone config to the doc
7e154badc0 partial-clone: add multiple remotes in the doc
9a4c507886 t0410: test fetching from many promisor remotes
5e46139376 builtin/fetch: remove unique promisor remote limitation
fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter
b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote()
faf2abf496 promisor-remote: use repository_format_partial_clone
9cfebc1f3b promisor-remote: add promisor_remote_reinit()
9e27beaa23 promisor-remote: implement promisor_remote_get_direct()
48de315817 Add initial support for many promisor remotes
2e860675b6 fetch-object: make functions return an error code
c59c7c879e t0410: remove pipes after git commands
git-subtree-dir: third_party/git
git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
2020-05-22 18:46:45 +02:00
|
|
|
msgid "invalid mode on line %d: %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96
af6b65d45e Git 2.26.2
7397ca3373 Git 2.25.4
b86a4be245 Git 2.24.3
f2771efd07 Git 2.23.3
c9808fa014 Git 2.22.4
9206d27eb5 Git 2.21.3
041bc65923 Git 2.20.4
76b54ee9b9 Git 2.19.5
ba6f0905fd Git 2.18.4
df5be6dc3f Git 2.17.5
1a3609e402 fsck: reject URL with empty host in .gitmodules
e7fab62b73 credential: treat URL with empty scheme as invalid
c44088ecc4 credential: treat URL without scheme as invalid
fe29a9b7b0 credential: die() when parsing invalid urls
a2b26ffb1a fsck: convert gitmodules url to URL passed to curl
8ba8ed568e credential: refuse to operate when missing host or protocol
24036686c4 credential: parse URL without host as empty host, not unset
73aafe9bc2 t0300: use more realistic inputs
a88dbd2f8c t0300: make "quit" helper more realistic
de49261b05 Git 2.26.1
274b9cc253 Git 2.26
55a7568606 Merge branch 'en/rebase-backend'
c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git
1557364fb4 l10n: tr.po: change file mode to 644
2da1b05674 t3419: prevent failure when run with EXPENSIVE
1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0
5804c6ec40 l10n: de.po: add missing space
98cedd0233 Merge https://github.com/prati0100/git-gui
4914ba4bcf l10n: tr: Fix a couple of ambiguities
a5728022e0 Merge branch 'py/remove-tcloo'
7fcb965970 RelNotes/2.26.0: fix various typos
f0c03bcf95 l10n: Update Catalan translation
67b0a24910 Git 2.25.3
be8661a328 Sync with Git 2.25.2
0822e66b5d Git 2.25.2
65588b0b2e unicode: update the width tables to Unicode 13.0
7be274b0ff Merge branch 'js/ci-windows-update' into maint
9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint
221887a492 Merge branch 'jk/doc-credential-helper' into maint
32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint
fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint
618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint
50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint
fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint
41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint
2d7247af6f Merge branch 'am/mingw-poll-fix' into maint
4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint
76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint
569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint
16a4bf1035 Merge branch 'en/check-ignore' into maint
3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint
56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint
1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint
7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint
fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint
a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint
93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint
dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint
758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint
f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint
506223f9c5 Git 2.24.2
17a02783d8 Git 2.23.2
69fab82147 Git 2.22.3
fe22686494 Git 2.21.2
d1259ce117 Git 2.20.3
a5979d7009 Git 2.19.4
21a3e5016b Git 2.18.3
c42c0f1297 Git 2.17.4
d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u)
3891a84ccd git-gui: create a new namespace for chord script evaluation
8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5
440e7442d1 l10n: zh_CN: Revise v2.26.0 translation
2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2
6c85aac65f Git 2.26-rc2
74f172e39e Merge branch 'en/test-cleanup'
e96327c947 Merge branch 'es/outside-repo-errmsg-hints'
ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0
15fa8d9667 l10n: vi: fix translation + grammar
5c20398699 prefix_path: show gitdir if worktree unavailable
1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated)
c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated)
a4a2f64642 Merge branch 'js/askpass-coerce-utf8'
850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows
d769dcc5cd Merge branch 'py/blame-status-error'
70e24186c0 t6022, t6046: fix flaky files-are-updated checks
30e9940356 Hopefully the final batch before -rc2
b4f0038525 Merge branch 'en/rebase-backend'
25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master
07259e74ec fsck: detect gitmodules URLs with embedded newlines
c716fe4bd9 credential: detect unrepresentable values when parsing urls
17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr
9a6bbee800 credential: avoid writing values with newlines
17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2
1afe18a3bb l10n: es: 2.26.0 round#2
5ab9217a3c Merge branch of github.com:alshopov/git-po into master
c6713676d6 Merge branch of github.com:bitigchi/git-po into master
b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t)
2713dec02d l10n: tr: v2.26.0 round 2
c9ef57cc3a l10n: fr : v2.26.0 rnd 2
120b1eb731 git-rebase.txt: highlight backend differences with commit rewording
9a1b7474d6 sequencer: clear state upon dropping a become-empty commit
937d143630 i18n: unmark a message in rebase.c
a56d361f66 Merge branch 'ds/sparse-add'
5fa9169ced Merge branch 'dr/push-remote-ref-update'
cdef998b46 Merge branch 'jc/doc-single-h-is-for-help'
051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed)
52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master
9643441983 l10n: tr: Add glossary for Turkish translations
438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv
fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git
2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u)
dd2c269652 l10n: tr: Add Turkish translations
8f4f099f8b l10n: tr: Add Turkish translation team info
b4374e96c8 Git 2.26-rc1
4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch'
3658d77f8e Merge branch 'hd/show-one-mergetag-fix'
6125104b88 Merge branch 'rt/format-zero-length-fix'
1ac37deba2 Merge branch 'am/mingw-poll-fix'
cf372dc815 Merge branch 'en/test-cleanup'
d1075adfdf Merge branch 'en/merge-path-collision'
a4fd114ffc Merge branch 'kk/complete-diff-color-moved'
a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file'
0e0d717537 Merge branch 'pb/am-show-current-patch'
9b7f726dfc Merge branch 'am/pathspec-f-f-more'
4605a73073 t1091: don't grep for `strerror()` string
4d9c2902a1 l10n: fr v2.26.0 rnd1
ad182bee3f Merge branch of github.com:alshopov/git-po into master
23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1
98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t)
f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed)
76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po
076cbdcd73 Git 2.26-rc0
0d65f3fb1a t5537: adjust test_oid label
e63cefb024 Merge branch 'hi/gpg-use-check-signature'
5da7329e29 Merge branch 'rs/commit-graph-code-simplification'
0108fc1b46 Merge branch 'js/ci-windows-update'
f3ccd9f0d9 Merge branch 'be/describe-multiroot'
a6b4709302 Merge branch 'ag/rebase-remove-redundant-code'
b22db265d6 Merge branch 'es/recursive-single-branch-clone'
e8e71848ea Merge branch 'jk/nth-packed-object-id'
a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'
4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere'
49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix'
2cbb058669 Merge branch 'bc/wildcard-credential'
25063e2530 Merge branch 'mr/bisect-in-c-1'
f4d7dfce4d Merge branch 'ds/sparse-add'
4d864895a2 t2402: test worktree path when called in .git directory
af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch()
7655b4119d remote-curl: show progress for fetches over dumb HTTP
2f268890c2 The eighth batch for 2.26
aa5a7e02ad Merge branch 'ma/test-cleanup'
58595e713c Merge branch 'rs/blame-typefix-for-fingerprint'
ff41848e99 Merge branch 'rs/micro-cleanups'
4cbf1a0e22 Merge branch 'es/worktree-cleanup'
46703057c1 Merge branch 'ak/test-log-graph'
777815f5f9 Merge branch 'jk/run-command-formatfix'
444cff61b4 Merge branch 'ds/partial-clone-fixes'
48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure'
8c22bd9ff9 Merge branch 'en/rebase-backend'
cb2f5a8e97 Merge branch 'en/check-ignore'
0df82d99da Merge branch 'jk/object-filter-with-bitmap'
80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix'
29b09c518c Merge branch 'jk/doc-diff-parallel'
237a28173f show_one_mergetag: print non-parent in hex form.
5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context"
6d1210e133 l10n: Update Catalan translation
0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification"
7329d94be7 config.mak.dev: re-enable -Wformat-zero-length
7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings
94f4d01932 mingw: workaround for hangs when sending STDIN
1ff466c018 Documentation: clarify that `-h` alone stands for `help`
65bf820d0e t6020: new test with interleaved lexicographic ordering of directories
9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it
d5bb92eced t3035: prefer test_must_fail to bash negation for git commands
b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions
42d180dd01 t602[1236], t6034: modernize test formatting
802050400a merge-recursive: apply collision handling unification to recursive case
7f487ce062 Azure Pipeline: switch to the latest agent pools
5ed9fc3fc8 ci: prevent `perforce` from being quarantined
eafff6e41e t/lib-httpd: avoid using macOS' sed
d68ce906c7 commit-graph: use progress title directly
30b1c7ad9d describe: don't abort too early when searching tags
240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to'
2d2118b814 The seventh batch for 2.26
325eb66830 Merge branch 'es/doc-mentoring'
87f17d790d Merge branch 'es/bright-colors'
d0038f4b31 Merge branch 'bw/remote-rename-update-config'
132f600b06 clone: pass --single-branch during --recurse-submodules
47319576f1 submodule--helper: use C99 named initializer
ffe005576a lib-log-graph: consolidate colored graph cmp logic
989eea958b lib-log-graph: consolidate test_cmp_graph logic
bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching
bb4995fc3f worktree: add utility to find worktree by pathname
a80c4c2214 worktree: improve find_worktree() documentation
2fecc48cad packfile: drop nth_packed_object_sha1()
6ac9760a30 packed_object_info(): use object_id internally for delta base
b99b6bcc57 packed_object_info(): use object_id for returning delta base
63f4a7fc01 pack-check: push oid lookup into loop
e31c71083a pack-check: convert "internal error" die to a BUG()
500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps
f66d4e0250 pack-objects: use object_id struct in pack-reuse code
a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id
3f83fd5e44 pack-objects: read delta base oid into object_id struct
0763671b8e nth_packed_object_oid(): use customary integer return
02bbbe9df9 worktree: drop unused code from get_main_worktree()
27f182b3fc blame: provide type of fingerprints pointer
b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere
df126ca142 t3400: make test clean up after itself
3c29e21eb0 t: drop debug `cat` calls
cac439b56d t9810: drop debug `cat` call
91de82adc9 t4117: check for files using `test_path_is_file`
4ef346482d receive.denyCurrentBranch: respect all worktrees
f8692114db t5509: use a bare repository for test push target
45f274fbb1 get_main_worktree(): allow it to be called in the Git directory
fd0bc17557 completion: add diff --color-moved[-ws]
2ce6d075fa use strpbrk(3) to search for characters from a given set
2b3c430bce quote: use isalnum() to check for alphanumeric characters
a51d9e8f07 t1050: replace test -f with test_path_is_file
3e96c66805 partial-clone: avoid fetching when looking for objects
d0badf8797 partial-clone: demonstrate bugs in partial fetch
539052f42f run-command.h: fix mis-indented struct member
6c11c6a124 sparse-checkout: allow one-character directories in cone mode
aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch
f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch
e8ef1e8d6e am: convert "resume" variable to a struct
bc8620b440 parse-options: convert "command mode" to a flag
62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE()
46fd7b3900 credential: allow wildcard patterns when matching config
82eb249853 credential: use the last matching username in the config
588c70e10f t0300: add tests for some additional cases
732f934408 t1300: add test for urlmatch with multiple wildcards
3fa0e04667 mailmap: add an additional email address for brian m. carlson
8a98758a8d stash push: support the --pathspec-from-file option
8c3713cede stash: eliminate crude option parsing
3f3d8068f5 doc: stash: synchronize <pathspec> description
b22909144c doc: stash: document more options
0093abc286 doc: stash: split options from description (2)
2b7460d167 doc: stash: split options from description (1)
5f393dc3aa rm: support the --pathspec-from-file option
fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags
73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure
6c69f22233 bisect: libify `bisect_next_all`
9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents
45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents
cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents
e8e3ce6718 bisect: libify `bisect_checkout`
ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents
7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()`
680e8a01e5 bisect: add enum to represent bisect returning codes
bfacfce7d9 bisect--helper: introduce new `decide_next()` function
b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0
292731c4c2 bisect--helper: change `retval` to `res`
16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays
7ec8125fba check-ignore: fix documentation and implementation to match
2607d39da3 doc-diff: use single-colon rule in rendering Makefile
0aa6ce3094 doc/config/push: use longer "--" line for preformatted example
20a5fd881a rev-list --count: comment on the use of count_right++
63a58457e0 Merge branch 'py/missing-bracket'
51ebf55b93 The sixth batch for 2.26
f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints'
123538444f Merge branch 'jk/doc-credential-helper'
e154451a2f Merge branch 'js/mingw-open-in-gdb'
fc25a19265 Merge branch 'js/test-unc-fetch'
6365058605 Merge branch 'js/test-avoid-pipe'
966b69f02f Merge branch 'js/test-write-junit-xml-fix'
d880c3de23 Merge branch 'jk/mailinfo-cleanup'
5d55554b1d Merge branch 'mr/show-config-scope'
9f3f38769d Merge branch 'rs/strbuf-insertstr'
cbecc168d4 Merge branch 'rs/parse-options-concat-dup'
5af345a438 Merge branch 'bc/hash-independent-tests-part-8'
0460c109c3 Merge branch 'rs/name-rev-memsave'
6b9919c0a2 git-gui: add missing close bracket
5897e5ac96 Merge branch 'cs/german-translation'
cf85a32eb6 git-gui: update German translation
5096e51c54 git-gui: extend translation glossary template with more terms
8b85bb1b70 git-gui: update pot template and German translation to current source code
e68e29171c Sync with 2.25.1
c522f061d5 Git 2.25.1
10cdb9f38a rebase: rename the two primary rebase backends
2ac0d6273f rebase: change the default backend from "am" to "merge"
8295ed690b rebase: make the backend configurable via config setting
76340c8107 rebase tests: repeat some tests using the merge backend instead of am
980b482d28 rebase tests: mark tests specific to the am-backend with --am
c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases
6d04ce75c4 git-prompt: change the prompt for interactive-based rebases
52eb738d6b rebase: add an --am option
8af14f0859 rebase: move incompatibility checks between backend options a bit earlier
be50c938df git-rebase.txt: add more details about behavioral differences of backends
befb89ce7c rebase: allow more types of rebases to fast-forward
9a70f3d4ae t3432: make these tests work with either am or merge backends
93122c985a rebase: fix handling of restrict_revision
55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer
8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling
7db00f0b3b t3406: simplify an already simple test
e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty
d48e5e21da rebase (interactive-backend): make --keep-empty the default
e0020b2f82 prefix_path: show gitdir when arg is outside repo
cc4f2eb828 doc: move credential helper info into gitcredentials(7)
bfdd66e72f Sync with maint
7ae7e234c7 The fifth batch for 2.26
53c3be2c29 Merge branch 'tb/commit-graph-object-dir'
7b029ebaef Merge branch 'jk/index-pack-dupfix'
aa21cc97bd Merge branch 'jk/alloc-cleanups'
883326077a Merge branch 'jh/notes-fanout-fix'
f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule'
78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs'
df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'
433b8aac2e Merge branch 'ds/sparse-checkout-harden'
4a77434bc8 Merge branch 'ld/p4-cleanup-processes'
8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone'
09e48400a3 Merge branch 'jk/get-oid-error-message-i18n'
4dbeecba27 Merge branch 'ag/edit-todo-drop-check'
f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2'
d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout'
251187084d Merge branch 'js/rebase-i-with-colliding-hash'
c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix'
56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store'
0da63da794 Merge branch 'jn/promote-proto2-to-default'
a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup'
daef1b300b Merge branch 'hw/advice-add-nothing'
6141e0cc00 Merge branch 'js/convert-typofix' into maint
4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint
5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint
b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint
7137d6089b Merge branch 'ms/doc-bundle-format' into maint
52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint
0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint
1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint
cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint
153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint
8857657cc9 Merge branch 'jt/t5616-robustify' into maint
1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint
f468972671 Merge branch 'bc/misconception-doc' into maint
6e69042e26 Merge branch 'bc/author-committer-doc' into maint
650ed395be Merge branch 'ds/refmap-doc' into maint
80b806f1a8 Merge branch 'bc/actualmente' into maint
eceff4ba12 Merge branch 'rt/submodule-i18n' into maint
8a17eb7972 Merge branch 'jk/test-fixes' into maint
54bbadaeca Merge branch 'jk/asan-build-fix' into maint
8dbeba198e Merge branch 'ds/sparse-cone' into maint
e361f36f61 Merge branch 'nd/switch-and-restore' into maint
4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint
ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint
5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint
c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint
d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint
9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint
3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint
3ab3185f99 pack-objects: support filters with bitmaps
84243da129 pack-bitmap: implement BLOB_LIMIT filtering
4f3bd5606a pack-bitmap: implement BLOB_NONE filtering
cc4aa28506 bitmap: add bitmap_unset() function
2aaeb9ac41 rev-list: use bitmap filters for traversal
6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure
4eb707ebd6 rev-list: allow commit-only bitmap traversals
ea047a8eb4 t5310: factor out bitmap traversal comparison
608d9c9365 rev-list: allow bitmaps when counting objects
55cb10f9b5 rev-list: make --count work with --objects
792f811998 rev-list: factor out bitmap-optimized routines
d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs
08809c09aa mingw: add a helper function to attach GDB to the current process
bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths
de26f02db1 t9001, t9116: avoid pipes
a2dc43414c MyFirstContribution: rephrase contact info
e03f928e2a rev-list: fallback to non-bitmap traversal when filtering
acac50dd8c pack-bitmap: fix leak of haves/wants object lists
551cf8b655 pack-bitmap: factor out type iterator initialization
d8437c57fa The fourth batch for 2.26
a3dcf84df0 Merge branch 'js/convert-typofix'
0de2d1409b Merge branch 'js/ci-squelch-doc-warning'
0410c2ba31 Merge branch 'jb/multi-pack-index-docfix'
0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example'
e99c325bb4 Merge branch 'ms/doc-bundle-format'
afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix'
db72f8c940 Merge branch 'jb/parse-options-message-fix'
3d2471ba85 Merge branch 'ma/filter-branch-doc-caret'
b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path'
44cba9c4b3 Merge branch 'jc/skip-prefix'
556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index'
17e4a1b141 Merge branch 'hw/doc-git-dir'
4cf7f48891 Merge branch 'jk/push-default-doc'
b783391018 Merge branch 'jk/clang-sanitizer-fixes'
a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache'
3f7553acf5 Merge branch 'jt/t5616-robustify'
341f8a6476 Merge branch 'jk/escaped-wildcard-dwim'
b486d2ee81 Merge branch 'jn/pretend-object-doc'
076ee3e8a2 tests: fix --write-junit-xml with subshells
2b0f19fa7a convert: fix typo
c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors
1751b09a92 color.c: support bright aixterm colors
4a28eb0ae4 color.c: refactor color_output arguments
f696a2b1c8 mailinfo: factor out some repeated header handling
ffbea1816d mailinfo: be more liberal with header whitespace
f447d0293e mailinfo: simplify parsing of header values
b6537d83ee mailinfo: treat header values as C strings
ef07659926 sparse-checkout: work with Windows paths
2631dc879d sparse-checkout: create 'add' subcommand
4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand
6fb705abcb sparse-checkout: extract add_patterns_from_input()
b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config
f2a2327a4a config: provide access to the current line number
923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values
ceff1a1308 remote: clean-up config callback
1a83068c26 remote: clean-up by returning early to avoid one indentation
88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types
145d59f482 config: add '--show-scope' to print the scope of a config value
9a83d088ee submodule-config: add subomdule config scope
e37efa40e1 config: teach git_config_source to remember its scope
5c105a842e config: preserve scope in do_git_config_sequence
6766e41b8a config: clarify meaning of command line scoping
6dc905d974 config: split repo scope to local and worktree
a5cb4204b6 config: make scope_name non-static and rename it
30183894ea ci: ignore rubygems warning in the "Documentation" job
7a9f8ca805 parse-options: simplify parse_options_dup()
c84078573e parse-options: const parse_options_concat() parameters
f904f9025f parse-options: factor out parse_options_count()
a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat()
517b60564e mailinfo: don't insert header prefix for handle_content_type()
a91cc7fad0 strbuf: add and use strbuf_insertstr()
eb31044ff7 pack-format: correct multi-pack-index description
9299f84921 diff-options.txt: avoid "regex" overload in example
7378ec90e1 doc: describe Git bundle format
f3037657e8 t6024: update for SHA-256
edf04243b2 t6006: make hash size independent
5db24dcffd t6000: abstract away SHA-1-specific constants
d341e0805d t5703: make test work with SHA-256
88ed241a7e t5607: make hash size independent
48c10cc0e6 t5318: update for SHA-256
f7ae8e69b6 t5515: make test hash independent
e70649bb66 t5321: make test hash independent
a30f93b143 t5313: make test hash independent
a79eec220b t5309: make test hash independent
796d1383a3 t5302: make hash size independent
417e45e5e3 t4060: make test work with SHA-256
dfa5f53e78 t4211: add test cases for SHA-256
f743e8f5b3 t4211: move SHA-1-specific test cases into a directory
72f936b120 t4013: make test hash independent
5df0f11f07 t3311: make test work with SHA-256
07877f393c t3310: make test work with SHA-256
6025e898d6 t3309: make test work with SHA-256
7b1a1822fe t3308: make test work with SHA-256
94db7e3e93 t3206: make hash size independent
db12505c2c t/lib-pack: support SHA-256
303b3c1c46 submodule: add newline on invalid submodule error
887a0fd573 add: change advice config variables used by the add API
de93cc14ab The third batch for 2.26
ea46d9097b Merge branch 'mt/sparse-checkout-doc-update'
ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix'
b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend'
7ab963e122 Merge branch 'en/fill-directory-fixes-more'
f52ab33616 Merge branch 'bc/hash-independent-tests-part-7'
25794d6ce9 Merge branch 'km/submodule-add-errmsg'
d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity'
76c57fedfa Merge branch 'js/add-p-leftover-bits'
9a5315edfd Merge branch 'js/patch-mode-in-others-in-c'
381e8e9de1 Merge branch 'dl/test-must-fail-fixes'
395518cf7a parse-options: lose an unnecessary space in an error message
079f970971 name-rev: sort tip names before applying
2d53975488 name-rev: release unused name strings
977dc1912b name-rev: generate name strings only if they are better
1c56fc2084 name-rev: pre-size buffer in get_parent_name()
ddc42ec786 name-rev: factor out get_parent_name()
f13ca7cef5 name-rev: put struct rev_name into commit slab
d689d6d82f name-rev: don't _peek() in create_or_update_name()
15a4205d96 name-rev: don't leak path copy in name_ref()
36d2419c9a name-rev: respect const qualifier
71620ca86c name-rev: remove unused typedef
3e2feb0d64 name-rev: rewrite create_or_update_name()
a21781011f index-pack: downgrade twice-resolved REF_DELTA to die()
dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout
e1c5253951 t3305: check notes fanout more carefully and robustly
e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks
a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st'
ad2dd5bb63 commit-graph.c: remove path normalization, comparison
13c2499249 commit-graph.h: store object directory in 'struct commit_graph'
0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context'
f38c92452d t7400: testcase for submodule status on unregistered inner git repos
5290d45134 tree-walk.c: break circular dependency with unpack-trees
f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch
d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode
e53ffe2704 sparse-checkout: escape all glob characters on write
e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand
bd64de42de sparse-checkout: unquote C-style strings over --stdin
d585f0e799 sparse-checkout: write escaped patterns in cone mode
4f52c2ce6c sparse-checkout: properly match escaped characters
9abc60f801 sparse-checkout: warn on globs in cone patterns
145136a95a C: use skip_prefix() to avoid hardcoded string length
04e5b3f0b4 submodule foreach: replace $path with $sm_path in example
1793280e91 t5318: don't pass non-object directory to '--object-dir'
da8063522f diff: move diff.wsErrorHighlight to "basic" config
b98d188581 sha1-file: allow check_object_signature() to handle any repo
2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file()
7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare()
c8123e72f6 streaming: allow open_istream() to handle any repo
5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile()
a651946730 cache-tree: use given repo's hash_algo at verify_one()
eb999b3295 diff: make diff_populate_filespec() honor its repo argument
5b0ca878e0 Sync with maint
344ee18728 The second batch
53a83299c7 Merge branch 'bc/misconception-doc'
c9ccf9d09b Merge branch 'bc/author-committer-doc'
0d0fa20c40 Merge branch 'ss/t6025-modernize'
7050624abc Merge branch 'lh/bool-to-type-bool'
4b69f29271 Merge branch 'ds/refmap-doc'
aff812ce3c Merge branch 'bc/actualmente'
38fb56e92a Merge branch 'rt/submodule-i18n'
f0940743fa Merge branch 'js/builtin-add-i-cmds'
0afeb3fdf4 Merge branch 'jk/test-fixes'
808dab2b58 Merge branch 'jk/asan-build-fix'
fec1ff97c2 Merge branch 'sg/completion-worktree'
c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function'
11ad30b887 Merge branch 'hi/gpg-mintrustlevel'
96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases'
d52adee779 Merge branch 'ds/graph-horizontal-edges'
6909474491 Merge branch 'am/update-pathspec-f-f-tests'
043426c8fd Merge branch 'ds/sparse-cone'
34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig'
8dd40c0472 traverse_trees(): use stack array for name entries
667b76ec58 walker_fetch(): avoid raw array length computation
9734b74a8f normalize_path_copy(): document "dst" size expectations
43f33e492a git-p4: avoid leak of file handle when cloning
19fa5ac333 git-p4: check for access to remote host earlier
6026aff5bb git-p4: cleanup better on error exit
ca5b5cce62 git-p4: create helper function importRevisions()
4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable
5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce
837b3a6376 git-p4: make closeStreams() idempotent
b0418303b1 sha1-name: mark get_oid() error messages for translation
2df1aa239c fetch: forgo full connectivity check if --filter
50033772d5 connected: verify promisor-ness of partial clone
d82ad54945 git: update documentation for --git-dir
0ad7144999 .mailmap: map Yi-Jyun Pan's email
c56c48dd07 grep: ignore --recurse-submodules if --no-index is given
8b2a1928f0 doc: drop "explicitly given" from push.default description
cf82bff73f obstack: avoid computing offsets from NULL pointer
3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer
d20bc01a51 avoid computing zero offsets from NULL pointer
7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero
bc3f657f71 t1506: drop space after redirection operator
e5d7b2f65c t1400: avoid "test" string comparisons
5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c
c7a6207591 Sync with maint
7210ca4ee5 .mailmap: fix GGG authoship screwup
37a63faae5 t4124: only mark git command with test_must_fail
a8c663cf65 t3507: use test_path_is_missing()
2def7f017c t3507: fix indentation
e8a1c686ae t3504: do check for conflict marker after failed cherry-pick
1c9fd32fd2 t3419: stop losing return code of git command
c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}()
a781cd6fef t3415: stop losing return codes of git commands
86ce6e0dd1 t3310: extract common notes_merge_files_gone()
245b9ba0ba t3030: use test_path_is_missing()
4a6f11fd7b t2018: replace "sha" with "oid"
62e80fcb48 t2018: don't lose return code of git commands
30c0367668 t2018: teach do_checkout() to accept `!` arg
40caa5366a t2018: be more discerning when checking for expected exit codes
b54128bb0b t5616: make robust to delta base change
4c616c2ba1 merge-recursive: use subtraction to flip stage
ee798742bd merge-recursive: silence -Wxor-used-as-pow warning
39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule
a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin
3b2885ec9b submodule: fix status of initialized but not cloned submodules
ace912bfb8 t7400: add a testcase for submodule status on empty dirs
4bb4fd4290 MyFirstContribution: add avenues for getting help
9e6d3e6417 sparse-checkout: detect short patterns
41de0c6fbc sparse-checkout: cone mode does not recognize "**"
7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone
47dbf10d8a clone: fix --sparse option with URLs
3c754067a1 sparse-checkout: create leading directories
d622c34396 t1091: improve here-docs
522e641748 t1091: use check_files to reduce boilerplate
417be08d02 t1300: create custom config file without special characters
3de7ee369b t1300: fix over-indented HERE-DOCs
329e6ec397 config: fix typo in variable name
767a9c417e rebase -i: stop checking out the tip of the branch to rebase
dfaed02862 fsmonitor: update documentation for hook version and watchman hooks
e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2
d031049da3 completion: add support for sparse-checkout
a402723e48 doc: sparse-checkout: mention --cone option
26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck
b6992261de rebase -i: re-fix short SHA-1 collision
d859dcad94 parse_insn_line(): improve error message when parsing failed
d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects
92fb0db94c pack-objects: add checks for duplicate objects
bb514de356 pack-objects: improve partial packfile reuse
ff483026a9 builtin/pack-objects: introduce obj_is_packed()
e704fc7978 pack-objects: introduce pack.allowPackReuse
2f4af77699 csum-file: introduce hashfile_total()
8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting()
59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile
40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains()
14fbd26044 ewah/bitmap: introduce bitmap_word_alloc()
bc7a3d4dc0 The first batch post 2.25 cycle
09e393d913 Merge branch 'nd/switch-and-restore'
45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport'
0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout'
36da2a8635 Merge branch 'es/unpack-trees-oob-fix'
42096c778d Merge branch 'bc/run-command-nullness-after-free-fix'
1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted'
a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees'
e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached'
9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting'
237a83a943 Merge branch 'dl/credential-netrc'
a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir()
129510a067 t2405: clarify test descriptions and simplify test
4eaadc8493 t2405: use git -C and test_commit -C instead of subshells
773c60a45e t7410: rename to t2405-worktree-submodule.sh
7a2dc95cbc docs: mention when increasing http.postBuffer is valuable
1b13e9032f doc: dissuade users from trying to ignore tracked files
69e104d70e doc: provide guidance on user.name format
813f6025a5 docs: expand on possible and recommended user config options
bc94e5862a doc: move author and committer information to git-commit(1)
7979dfe1d4 l10n: Update Catalan translation
81e3db42f3 templates: fix deprecated type option `--bool`
c513a958b6 t6025: use helpers to replace test -f <path>
70789843bd t6025: modernize style
6a7aca6f01 doc: rm: synchronize <pathspec> description
856249c62a docs: use "currently" for the present time
b40a50264a fetch: document and test --refmap=""
a9ae8fde2e t3404: directly test the behavior of interest
22a69fda19 git-rebase.txt: update description of --allow-empty-message
f1928f04b2 grep: use no. of cores as the default no. of threads
70a9fef240 grep: move driver pre-load out of critical section
1184a95ea2 grep: re-enable threads in non-worktree case
6c307626f1 grep: protect packed_git [re-]initialization
c441ea4edc grep: allow submodule functions to run in parallel
d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules()
1d1729caeb grep: replace grep_read_mutex by internal obj read lock
31877c9aec object-store: allow threaded access to object reading
b1fc9da1c8 replace-object: make replace operations thread-safe
d5b0bac528 grep: fix racy calls in grep_objects()
faf123c730 grep: fix race conditions at grep_submodule()
c3a5bb31c1 grep: fix race conditions on userdiff calls
0222540827 fetch: emphasize failure during submodule fetch
232378479e Sync with maint
e4837b4406 t7800: don't rely on reuse_worktree_file()
fbce03d329 t4018: drop "debugging" cat from hunk-header tests
f65d07fffa Makefile: use compat regex with SANITIZE=address
849e43cc18 built-in add -i: accept open-ended ranges again
d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files
a4ffbbbb99 submodule.c: mark more strings for translation
0cbb60574e dir: point treat_leading_path() warning to the right place
ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent
22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2
f365bf40a0 clean: demonstrate a bug with pathspecs
b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x
277eb5af7c t5604: make hash independent
44b6c05b43 t5601: switch into repository to hash object
7a868c51c2 t5562: use $ZERO_OID
1b8f39fb0d t5540: make hash size independent
a8c17e3bd6 t5537: make hash size independent
832072219c t5530: compute results based on object length
74ad99b1d8 t5512: abstract away SHA-1-specific constants
ba1be1ab45 t5510: make hash size independent
cba472d3ad t5504: make hash algorithm independent
82d5aeb1e6 t5324: make hash size independent
3c5e65cac1 t5319: make test work with SHA-256
235d3cddb8 t5319: change invalid offset for SHA-256 compatibility
1d86c8f0ce t5318: update for SHA-256
525a7f1769 t4300: abstract away SHA-1-specific constants
7a1bcb251b t4204: make hash size independent
cb78f4f0fe t4202: abstract away SHA-1-specific constants
717c939d8f t4200: make hash size independent
08a9dd891c t4134: compute appropriate length constant
215b60bf07 t4066: compute index line in diffs
194264c185 t4054: make hash-size independent
7d5ecd775d completion: list paths and refs for 'git worktree add'
3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands
3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options
367efd54b3 completion: return the index of found word from __git_find_on_cmdline()
d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function
2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper
54887b4689 gpg-interface: add minTrustLevel as a configuration option
684ceae32d fetch: default to protocol version 2
33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION
8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate
b9ab170752 config doc: protocol.version is not experimental
07ef3c6604 fetch test: use more robust test for filtered objects
d6509da620 fetch test: mark test of "skipping" haves as v0-only
a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too
c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function
bf66db37f1 add: use advise function to display hints
c958d3bd0a graph: fix collapse of multiple edges
8588932e20 graph: add test to demonstrate horizontal line bug
d0d0a357a1 t: directly test parse_pathspec_file()
568cabb2fe t: fix quotes tests for --pathspec-from-file
f94f7bd00d t: add tests for error conditions with --pathspec-from-file
b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job
12acdf573a built-in add -p: handle Escape sequences more efficiently
e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode
04f816b125 built-in add -p: respect the `interactive.singlekey` config setting
a5e46e6b01 terminal: add a new function to read a single keystroke
9ea416cb51 terminal: accommodate Git for Windows' default terminal
94ac3c31f7 terminal: make the code of disable_echo() reusable
08b1ea4c39 built-in add -p: handle diff.algorithm
180f48df69 built-in add -p: support interactive.diffFilter
1e4ffc765d t3701: adjust difffilter test
c81638541c submodule add: show 'add --dry-run' stderr when aborting
8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token
56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token
d0654dc308 Git 2.25
b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po
4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'"
ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1
e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master
1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
d78a1968c5 Merge branch 'ma/config-advice-markup-fix'
a20ae3ee29 l10n: Update Catalan translation
49e268e23e mingw: safeguard better against backslashes in file names
4c6c7971e0 unpack-trees: correctly compute result count
63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1
75449c1b39 l10n: de.po: Reword generation numbers
6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t)
3901d2c6bd config/advice.txt: fix description list separator
7a6a90c6ec Git 2.25-rc2
1f5f3ffe5c Merge branch 'ds/graph-assert-fix'
a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix'
202f68b252 Merge branch 'pm/am-in-body-header-doc-update'
7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix'
c5dc20638b Merge branch 'do/gitweb-typofix-in-comments'
fe47c9cb5f Merge https://github.com/prati0100/git-gui
a1087c9367 graph: fix lack of color in horizontal lines
0d251c3291 graph: drop assert() for merge with two collapsing parents
4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper
573117dfa5 unpack-trees: watch for out-of-range index position
e701bab3e9 restore: invalidate cache-tree when removing entries with --staged
1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command
fa74180d08 checkout: don't revert file on ambiguous tracking branches
2957709bd4 parse_branchname_arg(): extract part as new function
5020f6806a t2018: improve style of if-statement
7ffb54618b t2018: add space between function name and ()
63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH
065027ee1a string-list: note in docs that callers can specify sorting function
26f924d50e unpack-trees: exit check_updates() early if updates are not wanted
042ed3e048 The final batch before -rc2
0f1930cd1b Merge branch 'ds/sparse-cone'
037f067587 Merge branch 'ds/commit-graph-set-size-mult'
f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify'
c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode'
a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
c4117fcb97 Merge branch 'pb/clarify-line-log-doc'
556f0258df Merge branch 'ew/packfile-syscall-optim'
5814d44d9b doc: submodule: fix typo for command absorbgitdirs
7047f75f22 editorconfig: indent text files with tabs
60440d72db sha1-file: document how to use pretend_object_file
7fdc5f296f l10n: es: 2.25.0 round #1
f8740c586b am: document that Date: can appear as an in-body header
4e2c4c0d4f gitweb: fix a couple spelling errors in comments
421c0ffb02 multi-pack-index: correct configuration in documentation
757ff352bd Documentation/git-sparse-checkout.txt: fix a typo
0d2116c644 Merge branch 'zs/open-current-file'
9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u)
3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master
4c5081614c l10n: fr.po v2.25.0 rnd 1
5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0
63020f175f commit-graph: prefer default size_mult when given zero
224c7d70fa mingw: only test index entries for backslashes, not tree entries
9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED
8679ef24ed Git 2.25-rc1
a82027e9e6 Merge branch 'js/use-test-tool-on-path'
13432fc6dd Merge branch 'js/mingw-reserved-filenames'
e0e1ac5db0 Merge branch 'en/rebase-signoff-fix'
b76a244c9d Merge branch 'em/freebsd-cirrus-ci'
bc855232bc Merge branch 'bk/p4-misc-usability'
763a59e71c merge-recursive: remove unnecessary oid_eq function
44143583b7 sparse-checkout: use extern for global variables
d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master
13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1
786f4d2405 git-gui: allow opening currently selected file in default app
4fd683b6a3 sparse-checkout: document interactions with submodules
de11951b03 sparse-checkout: list directories in cone mode
0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0
578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed)
173fff68da Merge tag 'v2.25.0-rc0' into git-po-master
f1842ff531 t2018: remove trailing space from test description
20a67e8ce9 t3008: find test-tool through path lookup
9e341f62ca l10n: Update Catalan translation
4e61b2214d packfile: replace lseek+read with pread
ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision
2be45868a8 doc: log, gitk: document accepted line-log diff formats
280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD
0a76bd7381 mailmap: mask accentless variant for Công Danh
99c33bed56 Git 2.25-rc0
d2189a721c Merge branch 'en/fill-directory-fixes'
8be0a428d6 Merge branch 'rs/test-cleanup'
65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string'
c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
45b96a6fa1 Merge branch 'js/add-p-in-c'
ccc292e862 Merge branch 'jc/drop-gen-hdrs'
dfee504bee Merge branch 'ja/doc-markup-cleanup'
87cbb1ca66 Merge branch 'rs/ref-read-cleanup'
20aa6d88b7 Merge branch 'rb/p4-lfs'
fcd5b55f56 Merge branch 'pb/submodule-doc-xref'
4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free'
ba6b66281e Merge branch 'ln/userdiff-elixir'
bd72a08d6c Merge branch 'ds/sparse-cone'
f3c520e17f Merge branch 'sg/name-rev-wo-recursion'
6514ad40a1 Merge branch 'ra/t5150-depends-on-perl'
17066bea38 Merge branch 'dl/format-patch-notes-config-fixup'
135365dd99 Merge branch 'am/pathspec-f-f-checkout'
ff0cb70d45 Merge branch 'am/pathspec-from-file'
4dc42c6c18 mingw: refuse paths containing reserved names
98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16
c480eeb574 commit --interactive: make it work with the built-in `add -i`
cee6cb7300 built-in add -p: implement the "worktree" patch modes
52628f94fc built-in add -p: implement the "checkout" patch modes
6610e4628a built-in stash: use the built-in `git add -p` if so configured
90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting
36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes
d2a233cb8b built-in add -p: prepare for patch modes other than "stage"
761e3d26bb sparse-checkout: improve OS ls compatibility
6579d93a97 contrib/credential/netrc: work outside a repo
1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable
b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI
b441717256 t1507: inline full_name()
9291e6329e t1507: run commands within test_expect_success
5236fce6b4 t1507: stop losing return codes of git commands
10812c2337 t1501: remove use of `test_might_fail cp`
62d58cda69 t1409: use test_path_is_missing()
b87b02cfe6 t1409: let sed open its own input file
9b92070e52 t1307: reorder `nongit test_must_fail`
3595d10c26 t1306: convert `test_might_fail rm` to `rm -f`
f511bc02ed t0020: use ! check_packed_refs_marked
f6041abdcd t0020: don't use `test_must_fail has_cr`
f46c243e66 t0003: don't use `test_must_fail attr_check`
99c049bc4c t0003: use test_must_be_empty()
3738439c77 t0003: use named parameters in attr_check()
7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err()
b8afb908c2 t/lib-git-p4: use test_path_is_missing()
4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases
6836d2fe06 dir.c: use st_add3() for allocation size
c847dfafee dir: consolidate similar code in treat_directory()
777b420347 dir: synchronize treat_leading_path() and read_directory_recursive()
b9670c1f5e dir: fix checks on common prefix directory
5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit
23cbe427c4 Merge branch 'py/console-close-esc'
124a895811 t4015: improve coverage of function context test
509efef789 commit: forbid --pathspec-from-file --all
12029dc57d t3434: mark successful test as such
e0f9095aaa notes.h: fix typos in comment
675ef6bab8 t6030: don't create unused file
01ed17dc8c t5580: don't create unused file
f670adb49b t3501: don't create unused file
1e1ccbfdd3 git-gui: allow closing console window with Escape
7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays.
b02fd2acca The sixth batch
59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex'
e3b72391d1 Merge branch 'rs/commit-export-env-simplify'
43bf44e23a Merge branch 'rs/archive-zip-code-cleanup'
4438a1a59f Merge branch 'js/t3404-indent-fix'
3a44db2ed2 Merge branch 'dr/branch-usage-casefix'
8bc481f4f6 Merge branch 'sg/t9300-robustify'
011fc2e88e Merge branch 'js/add-i-a-bit-more-tests'
d1c0fe8d9b Merge branch 'dl/range-diff-with-notes'
26c816a67d Merge branch 'hw/doc-in-header'
f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
71a7de7a99 Merge branch 'dl/rebase-with-autobase'
c9f5fc9114 Merge branch 'dl/test-cleanup'
6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap'
3beff388b2 Merge branch 'js/builtin-add-i-cmds'
4755a34c47 Merge branch 'dd/time-reentrancy'
37c2619d91 Merge branch 'ag/sequencer-todo-updates'
608e380502 git-p4: show detailed help when parsing options fail
e2aed5fd5b git-p4: yes/no prompts should sanitize user text
571fb96573 fix-typo: consecutive-word duplications
f371984613 Makefile: drop GEN_HDRS
2e4083198d built-in add -p: show helpful hint when nothing can be staged
54d9d9b2ee built-in add -p: only show the applicable parts of the help text
ade246efed built-in add -p: implement the 'q' ("quit") command
d6cf873340 built-in add -p: implement the '/' ("search regex") command
9254bdfb4f built-in add -p: implement the 'g' ("goto") command
bcdd297b78 built-in add -p: implement hunk editing
b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf"
11f2c0dae8 built-in add -p: coalesce hunks after splitting them
510aeca199 built-in add -p: implement the hunk splitting feature
0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions
5906d5de77 built-in app -p: allow selecting a mode change as a "hunk"
47dc4fd5eb built-in add -p: handle deleted empty files
80399aec5a built-in add -p: support multi-file diffs
7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed
12c24cf850 built-in add -p: color the prompt and the help text
25ea47af49 built-in add -p: adjust hunk headers as needed
e3bd11b4eb built-in add -p: show colored hunks by default
1942ee44e8 built-in add -i: wire up the new C code for the `patch` command
f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C
d1b1384d61 userdiff: remove empty subexpression from elixir regex
df5be01669 doc: indent multi-line items in list
fd5041e127 doc: remove non pure ASCII characters
190a65f9db sparse-checkout: respect core.ignoreCase in cone mode
1d7297513d notes: break set_display_notes() into smaller functions
66f79ee23d config/format.txt: clarify behavior of multiple format.notes
cc2bd5c45d gitmodules: link to gitsubmodules guide
99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed
e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed
8c02fe6060 t7004: don't create unused file
cb05d6a5ed t4256: don't create unused file
c5c4eddd56 dir: break part of read_directory_recursive() out for reuse
072a231016 dir: exit before wildcard fall-through if there is no wildcard
2f5d3847d4 dir: remove stray quote character in comment
a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories"
452efd11fb t3011: demonstrate directory traversal failures
ea94b16fb8 git-p4: honor lfs.storage configuration variable
51a0a4ed95 bisect--helper: avoid use-after-free
d32e065a91 Merge branch 'kk/branch-name-encoding'
ad05a3d8e5 The fifth batch
7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix'
b089e5e6cb Merge branch 'em/test-skip-regex-illseq'
930078ba39 Merge branch 'hi/gpg-use-check-signature'
08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode'
7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk'
55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm'
41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress'
5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise'
dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix'
d37cfe3b5c Merge branch 'dl/pretty-reference'
99c4ff1bda Merge branch 'dl/submodule-set-url'
55d607d85b Merge branch 'js/mingw-inherit-only-std-handles'
c58ae96fc4 Merge branch 'am/pathspec-from-file'
7c88714262 Merge branch 'po/bundle-doc-clonable'
5d9324e0f4 Merge branch 'ra/rebase-i-more-options'
7034cd094b Sync with Git 2.24.1
09ac67a183 format-patch: move git_config() before repo_init_revisions()
8164c961e1 format-patch: use --notes behavior for format.notes
452538c358 notes: extract logic into set_display_notes()
e6e230eeae notes: create init_display_notes() helper
1e6ed5441a notes: rename to load_display_notes()
2866fd284c name-rev: cleanup name_ref()
49f7a2fde9 name-rev: eliminate recursion in name_rev()
fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name'
e05e8cf074 archive-zip: use enum for compression method
39acfa3d22 git gui: fix branch name encoding error
11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description
8cf8f9b4aa t3404: fix indentation
4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs
147ee35558 commit: use strbuf_add() to add a length-limited string
559c6fc317 The fourth batch
56e6c16394 Merge branch 'dl/lore-is-the-archive'
3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive'
7cb0d37f6d Merge branch 'tg/perf-remove-stale-result'
403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick'
f0cf2fee5d Merge branch 'hi/grep-do-not-return-void'
391fb22ac7 Merge branch 'rs/use-skip-prefix-more'
92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd'
4ba74ca901 Merge branch 'rs/test-cleanup'
f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick'
ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9'
8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters
3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances
dd432a6ecf name-rev: restructure parsing commits and applying date cutoff
dd090a8a37 name-rev: pull out deref handling from the recursion
766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper
d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev()
bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation
e0c4da6f2a name-rev: avoid unnecessary cast in name_ref()
c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name()
c593a26348 t6120-describe: modernize the 'check_describe' helper
abcf857300 range-diff: clear `other_arg` at end of function
f8675343d7 range-diff: mark pointers as const
828765dfe0 t3206: fix incorrect test name
0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early
21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile
b4bbbbd5a2 apply --allow-overlap: fix a corner case
89c8559367 git add -p: use non-zero exit code when the diff generation failed
e91162be9c t3701: verify that the diff.algorithm config setting is handled
0c3222c4f3 t3701: verify the shown messages when nothing can be added
24be352d52 t3701: add a test for the different `add -p` prompts
8539b46534 t3701: avoid depending on the TTY prerequisite
0f0fba2cc8 t3701: add a test for advanced split-hunk editing
53a06cf39b Git 2.24.1
67af91c47a Sync with 2.23.1
a7312d1a28 Git 2.23.1
7fd9fd94fb Sync with 2.22.2
d9589d4051 Git 2.22.2
5421ddd8d0 Sync with 2.21.1
367f12b7e9 Git 2.21.1
20c71bcf67 Merge branch 'fix-msys2-quoting-bugs'
7d8b676992 mingw: sh arguments need quoting in more circumstances
d9061ed9da t7415: drop v2.20.x-specific work-around
04522edbd4 mingw: fix quoting of empty arguments for `sh`
49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts
e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly
fc346cb292 Sync with 2.20.2
4cd1cf31ef Git 2.20.2
c154745074 submodule: defend against submodule.update = !command in .gitmodules
4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x
d851d94151 Sync with 2.19.3
caccc527ca Git 2.19.3
7c9fbda6e2 Sync with 2.18.2
9877106b01 Git 2.18.2
14af7ed5a9 Sync with 2.17.3
a5ab8d0317 Git 2.17.3
bb92255ebe fsck: reject submodule.update = !command in .gitmodules
bdfef0492c Sync with 2.16.6
eb288bc455 Git 2.16.6
68440496c7 test-drop-caches: use `has_dos_drive_prefix()`
9ac92fed5b Sync with 2.15.4
7cdafcaacf Git 2.15.4
e904deb89d submodule: reject submodule.update = !command in .gitmodules
d3ac8c3f27 Sync with 2.14.6
66d2a6159f Git 2.14.6
083378cc35 The third batch
88bd37a2d0 Merge branch 'js/pkt-line-h-typofix'
473b431410 Merge branch 'us/unpack-trees-fsmonitor'
e0f9ec9027 Merge branch 'sg/test-bool-env'
fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset'
e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere'
88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory'
8feb47e882 Merge branch 'dl/t5520-cleanup'
6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree'
57d46bc602 Merge branch 'mg/doc-submodule-status-cached'
75bd003c7b Merge branch 'js/git-svn-use-rebase-merges'
f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix'
c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'
36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree'
cf91c31688 Merge branch 'sg/unpack-progress-throughput'
ef6104581d Merge branch 'pb/submodule-update-fetches'
7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix'
f3c7bfdde2 Merge branch 'dl/range-diff-with-notes'
9502b616f1 Merge branch 'jh/userdiff-python-async'
76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2'
995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label'
f7998d9793 Merge branch 'js/builtin-add-i'
917d0d6234 Merge branch 'js/rebase-r-safer-label'
56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers'
2763530048 Merge branch 'jg/revert-untracked'
fa38ab68b0 git-gui: revert untracked files by deleting them
d9c6469f38 git-gui: update status bar to track operations
29a9366052 git-gui: consolidate naming conventions
0bb313a552 xdiff: unignore changes in function context
2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names'
65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods'
5532ebdeb7 Merge branch 'fix-mingw-quoting-bug'
76a681ce9c Merge branch 'dubiously-nested-submodules'
dd53ea7220 Merge branch 'turn-on-protectntfs-by-default'
f82a97eb91 mingw: handle `subst`-ed "DOS drives"
7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams'
d2c84dad1c mingw: refuse to access paths with trailing spaces or periods
379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh
817ddd64c2 mingw: refuse to access paths with illegal characters
cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors
7530a6287e quote-stress-test: allow skipping some trials
35edce2056 t6130/t9350: prepare for stringent Win32 path validation
55953c77c0 quote-stress-test: accept arguments to test via the command-line
ad15592529 tests: add a helper to stress test argument quoting
a8dee3ca61 Disallow dubiously-nested submodule git directories
9102f958ee protect_ntfs: turn on NTFS protection by default
91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams
6d8684161e mingw: fix quoting of arguments
3a85dc7d53 is_ntfs_dotgit(): speed it up
7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses
288a74bcd2 is_ntfs_dotgit(): only verify the leading segment
a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark
cae0bc09ab rebase: fix format.useAutoBase breakage
945dc55dda format-patch: teach --no-base
700e006c5d t4014: use test_config()
a749d01e1d format-patch: fix indentation
0c47e06176 t3400: demonstrate failure with format.useAutoBase
d9b31db2c4 t7700: stop losing return codes of git commands
3699d69df0 t7700: make references to SHA-1 generic
dcf9a748ca t7700: replace egrep with grep
cfe5eda02a t7700: consolidate code into test_has_duplicate_object()
ae475afc0f t7700: consolidate code into test_no_missing_in_packs()
14b7664df8 doc: replace LKML link with lore.kernel.org
d23f9c8e04 RelNotes: replace Gmane with real Message-IDs
dcee037228 doc: replace MARC links with lore.kernel.org
a9aecc7abb checkout, restore: support the --pathspec-from-file option
cfd9376c1d doc: restore: synchronize <pathspec> description
8ea1189eac doc: checkout: synchronize <pathspec> description
6fdc9ad259 doc: checkout: fix broken text reference
1d022bb43f doc: checkout: remove duplicate synopsis
bebb5d6d6b add: support the --pathspec-from-file option
21bb3083c3 cmd_add: prepare for next patch
4778452597 Merge branch 'prevent-name-squatting-on-windows'
a7b1ad3b05 Merge branch 'jk/fast-import-unsafe'
525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()`
e1d911dd4c mingw: disallow backslash characters in tree objects' file names
0060fd1511 clone --recurse-submodules: prevent name squatting on Windows
a52ed76142 fast-import: disallow "feature import-marks" by default
68061e3470 fast-import: disallow "feature export-marks" by default
019683025f fast-import: delay creating leading directories for export-marks
e075dba372 fast-import: stop creating leading directories for import-marks
11e934d56e fast-import: tighten parsing of boolean command line options
816f806786 t9300: create marks files for double-import-marks test
f94804c1f2 t9300: drop some useless uses of cat
4f3e57ef13 submodule--helper: advise on fatal alternate error
10c64a0b3c Doc: explain submodule.alternateErrorStrategy
ec48540fe8 packfile.c: speed up loading lots of packfiles
3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value
a4fb016ba1 pkt-line: fix a typo
0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r
e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data
228f53135a The second batch
6c630f237e Merge branch 'jk/gitweb-anti-xss'
3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell'
4775e02a5c Merge branch 'ma/t7004'
a6c6f8d02a Merge branch 'js/complete-svn-recursive'
3ae8defaf9 Merge branch 'jk/send-pack-remote-failure'
aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix'
4ab9616c76 Merge branch 'sg/skip-skipped-prereq'
723a8adba5 Merge branch 'ds/test-read-graph'
9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation'
406ca29e0d Merge branch 'rs/parse-options-dup-null-fix'
fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging'
8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion'
ef8f621045 Merge branch 'dl/complete-rebase-onto'
3c3e5d0ea2 Merge branch 'tg/stash-refresh-index'
43c5fe1c1d Merge branch 'nn/doc-rebase-merges'
6511cb33c9 Merge branch 'dd/sequencer-utf8'
f165457618 Merge branch 'jk/remove-sha1-to-hex'
a774064fb0 Merge branch 'dj/typofix-merge-strat'
ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates'
d2489ce92c Merge branch 'rs/skip-iprefix'
376e7309e1 Merge branch 'ln/userdiff-elixir'
9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log'
d3096d2ba6 Merge branch 'en/doc-typofix'
26f20fa3fc Merge branch 'ns/test-desc-typofix'
ffd130a363 Merge branch 'en/t6024-style'
5149902ff9 Merge branch 'en/misc-doc-fixes'
bcb06e204c Merge branch 'js/fetch-multi-lockfix'
d08daec001 Merge branch 'rs/trace2-dots'
fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix'
bad5ed39cd Merge branch 'cb/curl-use-xmalloc'
7ab2088255 Merge branch 'rt/fetch-message-fix'
f089ddd56a Merge branch 'es/myfirstcontrib-updates'
3c90710c0c Merge branch 'hw/config-doc-in-header'
d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code'
5444d52866 Merge branch 'js/vreportf-wo-buffering'
05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add'
ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides'
532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default'
dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists'
fac9ab1419 Merge branch 'ma/bisect-doc-sample-update'
a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix'
0be5caf97c Merge branch 'jc/log-graph-simplify'
0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck'
2e697ced9d built-in add -i: offer the `quit` command
d7633578b5 built-in add -i: re-implement the `diff` command
8746e07277 built-in add -i: implement the `patch` command
ab1e1cccaf built-in add -i: re-implement `add-untracked` in C
c54ef5e424 built-in add -i: re-implement `revert` in C
a8c45be939 built-in add -i: implement the `update` command
f37c226454 built-in add -i: prepare for multi-selection commands
c08171d156 built-in add -i: allow filtering the modified files list
0c3944a628 add-interactive: make sure to release `rev.prune_data`
4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance
867fc7f310 grep: don't return an expression from pcre2_free()
c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables
72b006f4bf gpg-interface: prefer check_signature() for GPG verification
7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD
b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r
ccd469450a date.c: switch to reentrant {gm,local}time_r
271c351b2f t7811: don't create unused file
65efb42862 t9300: don't create unused file
f6b9413baf sequencer: fix a memory leak in sequencer_continue()
3eae30e464 doc: replace public-inbox links with lore.kernel.org
46c67492aa doc: recommend lore.kernel.org over public-inbox.org
5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects
17a4ae92ea t7700: s/test -f/test_path_is_file/
d2eee32a89 t7700: move keywords onto their own line
7a1c8c2346 t7700: remove spaces after redirect operators
09279086e8 t7700: drop redirections to /dev/null
756ee7fc9f t7501: stop losing return codes of git commands
38c1aa01de t7501: remove spaces after redirect operators
763b47bafa t5703: stop losing return codes of git commands
eacaa1c180 t5703: simplify one-time-sed generation logic
a29b2429e5 t5317: use ! grep to check for no matching lines
6c37f3ec1b t5317: stop losing return codes of git commands
b66e0a1773 t4138: stop losing return codes of git commands
afd43c9905 t4015: use test_write_lines()
946d2353a3 t4015: stop losing return codes of git commands
50cd31c652 t3600: comment on inducing SIGPIPE in `git rm`
3b737381d8 t3600: stop losing return codes of git commands
0d913dfa7e t3600: use test_line_count() where possible
29a40b5a67 t3301: stop losing return codes of git commands
9b5a9fa60a t0090: stop losing return codes of git commands
17aa9d9c1a t0014: remove git command upstream of pipe
77a946be98 apply-one-time-sed.sh: modernize style
176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job
ed254710ee test: use test_must_be_empty F instead of test_cmp empty F
c74b3cbb83 t7812: add missing redirects
213dabf49d test: use test_must_be_empty F instead of test -z $(cat F)
c93a5aaec8 t1400: use test_must_be_empty
6e4826ea75 t1410: use test_line_count
a5d04a3ef9 t1512: use test_line_count
54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd()
2059e79c0d name-rev: use skip_prefix() instead of starts_with()
1768aaf01d push: use skip_prefix() instead of starts_with()
ec6ee0c07a shell: use skip_prefix() instead of starts_with()
7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with()
a6293f5d28 fetch: use skip_prefix() instead of starts_with()
13ca8fb79e t5150: skip request-pull test if Perl is disabled
ecc0869080 commit-graph: use start_delayed_progress()
44a4693bfc progress: create GIT_PROGRESS_DELAY
528d9e6d01 t/perf: don't depend on Git.pm
b8dcc45387 perf-lib: use a single filename for all measurement types
fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk'
d82dfa7f5b rebase -i: finishing touches to --reset-author-date
1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory
393adf7a6f sequencer: directly call pick_commits() from complete_action()
a2dd67f105 rebase: fill `squash_onto' in get_replay_opts()
3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function
34065541e3 sequencer: update `done_nr' when skipping commands in a todo list
8638114e06 sequencer: update `total_nr' when adding an item to a todo list
0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk
ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk
ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions
9917eca794 l10n: zh_TW: add translation for v2.24.0
0a8e3036a3 reset: parse rev as tree-ish in patch mode
f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits
8d483c8408 doc: document 'git submodule status --cached'
befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick
ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later
9a780a384d mingw: spawned processes need to inherit only standard handles
c5a03b1e29 mingw: work around incorrect standard handles
eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes
a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool
43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values
2d05ef2778 sequencer: fix empty commit check when amending
ea8b7be147 git svn: stop using `rebase --preserve-merges`
67a6ea6300 gpg-interface: limit search for primary key fingerprint
392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern
cff4e9138d sparse-checkout: check for dirty status
416adc8711 sparse-checkout: update working directory in-process for 'init'
f75a69f880 sparse-checkout: cone mode should not interact with .gitignore
fb10ca5b54 sparse-checkout: write using lockfile
99dfa6f970 sparse-checkout: use in-process update for disable subcommand
e091228e17 sparse-checkout: update working directory in-process
e9de487aa3 sparse-checkout: sanitize for nested folders
4dcd4def3c unpack-trees: add progress to clear_ce_flags()
eb42feca97 unpack-trees: hash less in cone mode
af09ce24a9 sparse-checkout: init and set in cone mode
96cc8ab531 sparse-checkout: use hashmaps for cone patterns
879321eb0b sparse-checkout: add 'cone' mode
e6152e35ff trace2: add region in clear_ce_flags
72918c1ad9 sparse-checkout: create 'disable' subcommand
7bffca95ea sparse-checkout: add '--stdin' option to set subcommand
f6039a9423 sparse-checkout: 'set' subcommand
d89f09c828 clone: add --sparse mode
bab3c35908 sparse-checkout: create 'init' subcommand
94c0956b60 sparse-checkout: create builtin with 'list' subcommand
679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files
df6d3d6802 lib-bash.sh: move `then` onto its own line
2a02262078 t5520: replace `! git` with `test_must_fail git`
c245e58bb6 t5520: remove redundant lines in test cases
a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp
e959a18ee7 t5520: don't put git in upstream of pipe
5540ed27bc t5520: test single-line files by git with test_cmp
dd0f1e767b t5520: use test_cmp_rev where possible
979f8891cc t5520: replace test -{n,z} with test-lib functions
3037d3db90 t5520: use test_line_count where possible
93a9bf876b t5520: remove spaces after redirect operator
ceeef863de t5520: replace test -f with test-lib functions
4c8b046f82 t5520: let sed open its own input
53c62b9810 t5520: use sq for test case names
e8d1eaf9b4 t5520: improve test style
2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals
8cb7980382 t0000: test multiple local assignment
5b583e6a09 format-patch: pass notes configuration to range-diff
bd36191886 range-diff: pass through --notes to `git log`
9f726e1b87 range-diff: output `## Notes ##` header
3bdbdfb7a5 t3206: range-diff compares logs with commit notes
75c5aa0701 t3206: s/expected/expect/
79f3950d02 t3206: disable parameter substitution in heredoc
3a6e48e9f7 t3206: remove spaces after redirect operators
26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish
077a1fda82 userdiff: support Python async functions
3798149a74 SubmittingPatches: use `--pretty=reference`
1f0fc1db85 pretty: implement 'reference' format
618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type
0df621172d pretty: provide short date format
ac52d9410e t4205: cover `git log --reflog -z` blindspot
3e8ed3b93e pretty.c: inline initalize format_context
4982516451 revision: make get_revision_mark() return const pointer
f0f9de2bd7 completion: complete `tformat:` pretty format
fb2ffa77a6 SubmittingPatches: remove dq from commit reference
bae74c9dfb pretty-formats.txt: use generic terms for hash
bd00717eab SubmittingPatches: use generic terms for hash
9d45ac4cbf rev-list-options.txt: remove reference to --show-notes
828e829b9e argv-array: add space after `while`
e440fc5888 commit: support the --pathspec-from-file option
66a25a7242 doc: commit: synchronize <pathspec> description
64bac8df97 reset: support the `--pathspec-from-file` option
d137b50756 doc: reset: synchronize <pathspec> description
24e4750c96 pathspec: add new function to parse file
0dbc4a0edf ci(osx): update homebrew-cask repository with less noise
e02058a729 sequencer: handle rebase-merges for "onto" message
bae60ba7e9 builtin/unpack-objects.c: show throughput progress
2d92ab32fd rev-parse: make --show-toplevel without a worktree an error
9e5afdf997 fetch: add trace2 instrumentation
4c4066d95d run-command: move doc to run-command.h
6c51cb525d trace2: move doc to trace2.h
7db0305438 parse-options: add link to doc file in parse-options.h
d95a77d059 submodule-config: move doc to submodule-config.h
f3b9055624 credential: move doc to credential.h
bbcfa3002a tree-walk: move doc to tree-walk.h
971b1f24a2 argv-array: move doc to argv-array.h
f1ecbe0f53 trace: move doc to trace.h
13aa9c8b70 cache: move doc to cache.h
c0be43f898 sigchain: move doc to sigchain.h
19ef3ddd36 pathspec: move doc to pathspec.h
301d595e72 revision: move doc to revision.h
3a1b3415d9 attr: move doc to attr.h
126c1ccefb refs: move doc to refs.h
d27eb356bf remote: move doc to remote.h and refspec.h
405c6b1fbc sha1-array: move doc to sha1-array.h
d3d7172e40 merge: move doc to ll-merge.h
3f1480b745 graph: move doc to graph.h and graph.c
266f03eccd dir: move doc to dir.h
13c4d7eb22 diff: move doc to diff.h and diffcore.h
cd5522271f rebase -r: let `label` generate safer labels
867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()`
8c15904462 built-in add -i: implement the `help` command
3d965c7674 built-in add -i: use color in the main loop
68db1cbf8e built-in add -i: support `?` (prompt help)
76b743234c built-in add -i: show unique prefixes of the commands
6348bfba58 built-in add -i: implement the main loop
a376e37b2c gitweb: escape URLs generated by href()
b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI
f28bceca75 t/gitweb-lib.sh: drop confusing quotes
0eba60c9b7 t9502: pass along all arguments in xss helper
932757b0cc INSTALL: use existing shell scripts as example
b018719927 t7004: check existence of correct tag
1daaebcaa5 built-in add -i: color the header in the `status` command
5e82b9e4d2 built-in add -i: implement the `status` command
e4cb659ebd diff: export diffstat interface
f83dff60a7 Start to implement a built-in version of `git add --interactive`
df53c80822 stash: make sure we have a valid index before writing it
ad7a403268 send-pack: check remote ref status on pack-objects failure
d91ce887c9 t6120-describe: correct test repo history graph in comment
1f9247a3bd completion: tab-complete "git svn --recursive"
603960b50e promisor-remote: remove fetch_if_missing=0
e362fadcd0 clone: remove fetch_if_missing=0
169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL
51bd6be32d mingw: use COPY_ARRAY for copying array
4bd0593e0f test-tool: use 'read-graph' helper
e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway
d784d978f6 t4215: use helper function to check output
61eea521fe fsmonitor: do not compare bitmap size with size of split index
b19f3fe9dd hex: drop sha1_to_hex()
c1ce9c06d0 completion: learn to complete `git rebase --onto=`
f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls
d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase
aa6d7f93ed hex: drop sha1_to_hex_r()
52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch
5772b0c745 sequencer: reencode old merge-commit message
e0eba649e8 bundle-verify: add --quiet
79862b6b77 bundle-create: progress output control
73c3253d75 bundle: framework for options before bundle file
68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in"
b375744274 sequencer: reencode squashing commit's message
019a9d8362 sequencer: reencode revert/cherry-pick's todo list
0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list
e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding
1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary
d9f6f3b619 The first batch post 2.24 cycle
28014c1084 Merge branch 'bc/hash-independent-tests-part-6'
57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree'
c22f63c40f Merge branch 'pb/pretty-email-without-domain-part'
5731ca3657 Merge branch 'hw/remove-api-docs-placeholder'
14b58c62bc Merge branch 'sg/commit-graph-usage-fix'
eff313f8a7 Merge branch 'dl/apply-3way-diff3'
db806d7064 Merge branch 'sg/dir-trie-fixes'
f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix'
8f1119b988 Merge branch 'wb/midx-progress'
d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes'
0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges'
8f40d89783 Merge branch 'hv/bitshift-constants-in-blame'
d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head'
5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer'
b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc'
15d9f3dc66 Merge branch 'es/walken-tutorial'
026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor'
ed28358833 convert: use skip_iprefix() in validate_encoding()
89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding()
03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules
ae821ffe83 multimail: fix a few simple spelling errors
557c5895c2 sha1dc: fix trivial comment spelling error
aa74be316a Fix spelling errors in test commands
96c0caf5e3 Fix spelling errors in messages shown to users
4dc8b1c114 Fix spelling errors in names of tests
7a40cf1553 Fix spelling errors in comments of testcases
15beaaa3d1 Fix spelling errors in code comments
a807200f67 userdiff: add Elixir to supported userdiff languages
461caf3e8a git-shortlog.txt: include commit limiting options
6462d5eb9a fetch: remove fetch_if_missing=0
46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion
99b2ba35f5 t0028: eliminate non-standard usage of printf
add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul`
14c4776d75 t: fix typo in test descriptions
270de6acbe t6024: modernize style
77363a51fb name-hash.c: remove duplicate word in comment
c92faa4d22 hashmap: fix documentation misuses of -> versus .
a6d39f2efb git-filter-branch.txt: correct argument name typo
4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators
8915297925 Fix spelling errors in documentation outside of Documentation/
031fd4b93b Documentation: fix a bunch of typos, both old and new
dd0b61f577 fsmonitor: fix watchman integration
5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare()
7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph
c14e6e7903 fetch: add the command-line option `--write-commit-graph`
da72936f54 Git 2.24
1d34d425d4 Merge branch 'bc/doc-use-docbook-5'
dac1d83c91 Merge branch 'ds/commit-graph-on-fetch'
c32ca691c2 Merge branch 'jt/delay-fetch-if-missing'
ab6b50e4c8 Merge https://github.com/prati0100/git-gui
93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po
a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2
fe28ad8520 rebase: add --reset-author-date
08187b4cba rebase -i: support --ignore-date
0185c683c9 sequencer: rename amend_author to author_to_rename
cbd8db17ac rebase -i: support --committer-date-is-author-date
c068bcc59b sequencer: allow callers of read_author_script() to ignore fields
ba51d2fb24 rebase -i: add --ignore-whitespace flag
3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower
3ada78de3f myfirstcontrib: add dependency installation step
4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt
4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly
8dfb04ae96 update-index: optionally leave skip-worktree entries alone
116d1fa6c6 vreportf(): avoid relying on stdio buffering
efd5444238 RelNotes/2.24.0: fix self-contradictory note
391c7e40b5 fetch.c: fix typo in a warning message
55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template
849e43680d RelNotes/2.24.0: typofix
0115e5d929 git-diff.txt: document return code of `--no-index`
798d66e35d l10n: de.po: Update German translation
c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u)
f21f8f5d35 Git 2.24-rc2
8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix'
0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix'
f2db52c46b Merge branch 'js/mingw-needs-hiding-fix'
5b7594abdc Merge branch 'master' of github.com:vnwildman/git
034d33653a Merge branch 'next' of github.com:ChrisADR/git-po
26b061007c submodule: teach set-url subcommand
460782b7be t7519-status-fsmonitor: improve comments
d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses
4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config
1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694)
f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0
762d5b4f46 help: add gitsubmodules to the list of guides
76a53d640f git_path(): handle `.lock` files correctly
3ce47211a6 t1400: wrap setup code in test case
44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string
6c02042139 clone: rename static function `dir_exists()`.
8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command
77200e9332 l10n: es: 2.24.0 round 2
e42df36b42 Merge branch 'l10n/it/update-italian-translation'
5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2
51728480fe l10n: fr v2.24.0 rnd2
045a548698 l10n: git.pot: v2.24.0 round 2 (1 new)
468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master
b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree()
c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit()
103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag()
f648ee7088 fsck: rename vague "oid" local variables
cc579000bf fsck: don't require an object struct in verify_headers()
7854399366 fsck: don't require an object struct for fsck_ident()
b8b00f1693 fsck: drop blob struct from fsck_finish()
6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob()
38370253fd fsck: don't require an object struct for report()
f59793763d fsck: only require an oid for skiplist functions
5afc4b1dc6 fsck: only provide oid/type in fsck_error callback
82ef89b318 fsck: don't require object structs for display functions
733902905d fsck: use oids rather than objects for object_name API
d40bbc109b fsck_describe_object(): build on our get_object_name() primitive
a59cfb3230 fsck: unify object-name code
23a173a761 fsck: require an actual buffer for non-blobs
2175a0c601 fsck: stop checking tag->tagged
ec65231571 fsck: stop checking commit->parent counts
1de6007d85 fsck: stop checking commit->tree value
228c78fbd4 commit, tag: don't set parsed bit for parse failures
60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()`
8b656572ca builtin/commit-graph.c: remove subcommand-less usage string
fa26d5ede6 t4048: abstract away SHA-1-specific constants
cf02be8486 t4045: make hash-size independent
38ee26b2a3 t4044: update test to work with SHA-256
37ab8ebef1 t4039: abstract away SHA-1-specific constants
0370b35414 t4038: abstract away SHA-1 specific constants
0253e126a2 t4034: abstract away SHA-1-specific constants
45e2ef2b1d t4027: make hash-size independent
79b0edc1a0 t4015: abstract away SHA-1-specific constants
840624ff55 t4011: abstract away SHA-1-specific constants
32a6707267 t4010: abstract away SHA-1-specific constants
440bf91dfa t3429: remove SHA1 annotation
0b408ca2bd t1305: avoid comparing extensions
2eabd38313 rev-parse: add a --show-object-format option
52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode
45e206f0d8 t4203: use test-lib.sh definitions
2ae4944aac t6006: use test-lib.sh definitions
cb99a34e23 commit-graph: fix writing first commit-graph during fetch
e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug
7b4fb434b4 documentation: remove empty doc files
566a1439f6 Git 2.24-rc1
04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix'
4d6fb2beeb Merge branch 'ds/feature-macros'
5f0b6ed907 Merge branch 'js/azure-ci-osx-fix'
c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs'
1b4f85285f Merge branch 'dl/submodule-set-branch'
c7aadccba0 fetch: delay fetch_if_missing=0 until after config
c11e9966cb repo-settings: read an int for index.version
091489d068 apply: respect merge.conflictStyle in --3way
aa76ae4905 t4108: demonstrate bug in apply
95806205cd t4108: use `test_config` instead of `git config`
b0069684d4 t4108: remove git command upstream of pipe
fa87b81385 t4108: replace create_file with test_write_lines
7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job
6c96630cb0 config: move documentation to config.h
d81542e6f3 Eleventh batch
e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix'
d45d771978 Merge branch 'bc/smart-http-atomic-push'
22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix'
2e215b7959 Merge branch 'sb/userdiff-dts'
e3cf08361a Merge branch 'sg/progress-fix'
b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix'
c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc'
f45f88b2e4 path.c: don't call the match function without value in trie_find()
c72fc40d09 path.c: clarify two field names in 'struct common_dir'
8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file
7cb8c929d7 path.c: clarify trie_find()'s in-code comment
e536b1fedf Documentation: mention more worktree-specific exceptions
680cba2c2b multi-pack-index: add [--[no-]progress] option.
64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack
ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file
8dc18f8937 midx: add progress to expire_midx_packs
840cef0c70 midx: add progress to write_midx_file
efbc3aee08 midx: add MIDX_PROGRESS flag
0eb3671ed9 ci(osx): use new location of the `perforce` cask
da1e295e00 t604[236]: do not run setup in separate tests
49b8133a9e merge-recursive: fix merging a subdirectory into the root directory
d3eebaad5e merge-recursive: clean up get_renamed_dir_portion()
80736d7c5e doc: am --show-current-patch gives an entire e-mail message
a8e2c0eadc t7419: change test_must_fail to ! for grep
19c29e538e t4014: make output-directory tests self-contained
12a4aeaad8 Merge branch 'js/azure-pipelines-msvc'
399c23c046 ci(visual-studio): actually run the tests in parallel
711cd6d15c ci(visual-studio): use strict compile flags, and optimization
370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0
cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master
907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master
13bcea8c7f l10n: fr 2.24.0 rnd 1
135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master
3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed)
8da56a4848 userdiff: fix some corner cases in dts regex
86795774bb builtin/blame.c: constants into bit shift format
feebd2d256 rebase: hide --preserve-merges option
0e40a73a4c Doc: Bundle file usage
78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error
12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error
c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error
2b6f6ea1bd test-progress: fix test failures on big-endian systems
f757409e36 l10n: bg.po: Updated Bulgarian translation (4693)
176f5adfdb completion: clarify installation instruction for zsh
d966095db0 Git 2.24-rc0
90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array'
3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth'
d0258d0944 Merge branch 'rs/http-push-simplify'
bb52def6da Merge branch 'jj/stash-reset-only-toplevel'
f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs'
e5fca6b573 Merge branch 'bb/compat-util-comment-fix'
43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup'
07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely'
2d74d28ee0 Merge branch 'dl/compat-cleanup'
9b83a94829 Merge branch 'ta/t1308-typofix'
376012c919 Merge branch 'js/doc-stash-save'
10da030ab7 grep: avoid leak of chartables in PCRE2
513f2b0bbd grep: make PCRE2 aware of custom allocator
57d4660468 grep: make PCRE1 aware of custom allocator
d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand
8af69cf3e2 t3301: test diagnose messages for too few/many paramters
6f1194246a remote-curl: pass on atomic capability to remote side
bbb13e8188 graph: fix coloring of octopus dashes
92beecc136 graph: flatten edges that fuse with their right neighbor
479db18bc0 graph: smooth appearance of collapsing edges on commit lines
0195285b95 graph: rename `new_mapping` to `old_mapping`
d62893ecc1 graph: commit and post-merge lines for left-skewed merges
0f0f389f12 graph: tidy up display of left-skewed merges
458152cce1 graph: example of graph output that can be simplified
ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state
46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()`
a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()`
9157a2a032 graph: reuse `find_new_column_by_commit()`
210179a20d graph: handle line padding in `graph_next_line()`
fbccf255f9 graph: automatically track display width of graph lines
5374a290aa fetch-pack: write fetched refs to .promisor
4627bc777e sequencer: run post-commit hook
49697cb721 move run_commit_hook() to libgit and use it there
12bb7a540a sequencer.h fix placement of #endif
6a619ca03c t3404: remove uneeded calls to set_fake_editor
b2dbacbddf t3404: set $EDITOR in subshell
88a92b6c73 t3404: remove unnecessary subshell
bf8e65b30b format-patch: teach --cover-from-description option
a92331df18 format-patch: use enum variables
46273df7bf format-patch: replace erroneous and condition
3b3c79f6c9 diff-highlight: fix a whitespace nit
108b97dc37 Ninth batch
cbe8cdd3a0 Merge branch 'jk/coc'
3b9ec27919 Merge branch 'js/trace2-fetch-push'
c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch'
1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup'
eb3de5b823 Merge branch 'js/xdiffi-comment-updates'
4e8371ec26 Merge branch 'dl/t0000-skip-test-test'
b6d712fa4e Merge branch 'tg/range-diff-output-update'
77458870a5 Merge branch 'gs/sq-quote-buf-pretty'
5efabc7ed9 Merge branch 'ew/hashmap'
d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files'
6ed610b968 Merge branch 'am/t0028-utf16-tests'
5b900fb812 Merge branch 'dl/octopus-graph-bug'
16d9d7184b Merge branch 'en/fast-imexport-nested-tags'
6d5291be45 Merge branch 'js/azure-pipelines-msvc'
ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd'
d96e31e390 Merge branch 'js/fetch-jobs'
280bd44551 Merge branch 'en/merge-recursive-cleanup'
062a309d36 remote-curl: use argv_array in parse_push()
a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes
5cc6a4be11 http-push: simplify deleting a list item
556895d0c8 stash: avoid recursive hard reset on submodules
b524f6b399 Merge branch 'ka/japanese-translation'
f6f3824b4e git-gui: improve Japanese translation
61f4b407d3 Merge branch 'py/readme'
1e6880fd06 git-gui: add a readme
edefc31873 format-patch: create leading components of output directory
68b69211b2 git-compat-util: fix documentation syntax
fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth()
e0479fa073 documentation: add tutorial for object walking
3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed
4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target
9cad1c4488 pthread.h: manually align parameter lists
8c1cfd58e3 t1308-config-set: fix a test that has a typo
57d8f4b4c7 doc(stash): clarify the description of `save`
08da6496b6 Eighth batch
07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup'
f0d407e6ae Merge branch 'kt/add-i-progress'
66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree'
a4c5d9f66e Merge branch 'rs/dedup-includes'
159cdabd87 Merge branch 'js/range-diff-noprefix'
93424f1f7d Merge branch 'cb/pcre1-cleanup'
a73f91774c Merge branch 'ab/pcre-jit-fixes'
4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword'
020011f2cb Merge branch 'tk/git-svn-trim-author-name'
676278f8ea Merge branch 'bc/object-id-part17'
aafb75452b Merge branch 'en/clean-nested-with-ignored'
3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails
5cdf2301d4 add a Code of Conduct document
70bf0b755a Seventh batch
9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat'
2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary'
d17f54947d Merge branch 'rs/convert-fix-utf-without-dash'
82c80f98e6 Merge branch 'py/git-gui-has-maintainer'
6e12570822 Merge branch 'ah/cleanups'
772cad0afb Merge branch 'js/diff-rename-force-stable-sort'
424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path'
678a9ca629 Merge branch 'as/shallow-slab-use-fix'
0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix'
042a54d251 Merge branch 'am/visual-studio-config-fix'
03d3b1297c xdiffi: fix typos and touch up comments
b05b40930e t0000: cover GIT_SKIP_TESTS blindspots
d8bc1a518a send-pack: never fetch when checking exclusions
756fb0dedb t4014: treat rev-list output as the expected value
2b6a9b13ca range-diff: don't segfault with mode-only changes
360c7ba330 transport: push codepath can take arbitrary repository
ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments
b657047719 merge-recursive: fix the fix to the diff3 common ancestor label
b744c3af07 Sixth batch
417056578a Merge branch 'bw/submodule-helper-usage-fix'
9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check'
1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a'
59b19bcd9f Merge branch 'cc/multi-promisor'
1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way'
5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort'
eb35c18e42 Merge branch 'sg/travis-help-debug'
cabb145fe3 Merge branch 'rs/alias-use-copy-array'
56c7ab0f4e Merge branch 'sg/t-helper-gitignore'
e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang'
583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules'
337e3f2b49 Merge branch 'rs/nth-switch-code-simplification'
8f53fe1733 Merge branch 'hb/hg-to-git-py3'
ef93bfbd45 Merge branch 'sg/progress-fix'
980351d1ac Merge branch 'js/doc-patch-text'
80693e3f09 Merge branch 'tb/commit-graph-harden'
ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge'
3f84633563 Merge branch 'dl/cocci-everywhere'
caf150ce7d Merge branch 'gs/commit-graph-progress'
1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim'
1398171378 Merge branch 'rs/commit-graph-use-list-count'
773521df26 Merge branch 'rs/nth-parent-parse'
7f17913161 Merge branch 'dl/submodule-set-branch'
cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix'
bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees'
098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack'
37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc'
e392382f95 Merge branch 'dl/complete-rebase-and-archive'
cda8faa37e Merge branch 'jk/commit-graph-cleanup'
36d2fca82b Merge branch 'ss/get-time-cleanup'
ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude'
ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob'
ba2d451122 Merge branch 'tg/stash-refresh-index'
e2b5038d87 hashmap_entry: remove first member requirement from docs
404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry
23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators
c8e424c9c9 hashmap: introduce hashmap_free_entries
8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry *
87571c3f71 hashmap: use *_entry APIs for iteration
939af16eac hashmap_cmp_fn takes hashmap_entry params
f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *"
f0e63c4113 hashmap: use *_entry APIs to wrap container_of
6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *"
973d5eea74 introduce container_of macro
26b455f21e hashmap_put takes "struct hashmap_entry *"
28ee794128 hashmap_remove takes "const struct hashmap_entry *"
b6c5241606 hashmap_get takes "const struct hashmap_entry *"
b94e5c1df6 hashmap_add takes "struct hashmap_entry *"
f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *"
d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *"
d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry
12878c8351 coccicheck: detect hashmap_entry.hash assignment
e010a41216 diff: use hashmap_entry_init on moved_entry.ent
f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo"
de5abb5f7a git-p4: auto-delete named temporary file
c90b652afd Fifth batch
f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1'
b0f8aed48f Merge branch 'ma/user-manual-markup-update'
faf5576a8d Merge branch 'bc/doc-use-docbook-5'
314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes'
70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo'
847650798b Merge branch 'am/mailmap-andrey-mazo'
1a155f2e66 Merge branch 'jc/git-gui-has-maintainer'
1bcef51204 t/oid-info: add empty tree and empty blob values
ecde49bb8a t/oid-info: allow looking up hash algorithm name
11a3d3aadd git-rev-list.txt: prune options in synopsis
7d2f003ee4 Documentation: update the location of the git-gui repo
b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding()
46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines
b35304bf95 ci: really use shallow clones on Azure Pipelines
ab7d854aba tests: let --immediate and --write-junit-xml play well together
be5d88e112 test-tool run-command: learn to run (parts of) the testsuite
5d65ad17a9 vcxproj: include more generated files
030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built
61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable()
e4347c9434 msvc: handle DEVELOPER=1
ed712ef8d5 msvc: ignore some libraries when linking
5b8f9e2417 compat/win32/path-utils.h: add #include guards
41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning
c097b95a26 msvc: avoid using minus operator on unsigned types
dfd557c978 stash apply: report status correctly even in a worktree's subdirectory
d54dea77db fetch: let --jobs=<n> parallelize --multiple, too
87db61a436 trace2: write discard message to sentinel files
83e57b04e6 trace2: discard new traces if target directory has too many files
11c21f22de t4214: demonstrate octopus graph coloring failure
25eb905e14 t4214: explicitly list tags in log
63be8c8dd7 t4214: generate expect in their own test cases
a7a5590c6e t4214: use test_merge
94ba151300 test-lib: let test_merge() perform octopus merges
22541013d0 docs: clarify trace2 version invariants
3d4548e7e2 docs: mention trace2 target-dir mode in git-config
2fe44394c8 treewide: remove duplicate #include directives
dbcd970c27 push: do not pretend to return `int` from `die_push_simple()`
941790d7de fast-export: handle nested tags
8d7d33c1ce t9350: add tests for tags of things other than a commit
a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags
208d69246e fast-export: add support for --import-marks-if-exists
b8f50e5b60 fast-import: add support for new 'alias' command
f73b2aba05 fast-import: allow tags to be identified by mark labels
3164e6bd24 fast-import: fix handling of deleted tags
8085050ab4 add -i: show progress counter in the prompt
69fdb922ad Merge branch 'bw/diff3-conflict-style'
b436825b9b git-gui: support for diff3 conflict style
937b76ed49 range-diff: internally force `diff.noprefix=true`
411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job
25e4b8099c push: add trace2 instrumentation
5fc31180d8 fetch: add trace2 instrumentation
53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value
c3b57dc2a0 git-gui: use existing interface to query a path's attribute
45ab460d4a Merge branch 'js/git-bash-if-available'
0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command
71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only)
54a80a9ad8 wrapper: use a loop instead of repetitive statements
baed6bbb5b diffcore-break: use a goto instead of a redundant if statement
8da02ce62a commit-graph: remove a duplicate assignment
ddb3c856f3 shallow.c: don't free unallocated slabs
8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits
65904b8b2b promisor-remote: skip move_to_tail when no-op
2049b8dc65 diffcore_rename(): use a stable sort
97fff61012 Move git_sort(), a stable sort, into into libgit.a
69f272b922 dir: special case check for the possibility that pathspec is NULL
6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available
bc12974a89 Fourth batch
5a5350940b Merge branch 'ds/commit-graph-on-fetch'
974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch'
9755f70fe6 Merge branch 'ds/include-exclude'
93fc8760e7 Merge branch 'jh/trace2-pretty-output'
640f9cd599 Merge branch 'dl/rebase-i-keep-base'
026428c35e Merge branch 'sg/clean-nested-repo-with-ignored'
21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip'
d693345518 Merge branch 'dl/use-sq-from-test-lib'
d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes'
2be6ccc01a Merge branch 'sg/git-test-boolean'
cf861cd7a0 Merge branch 'rs/get-tagged-oid'
91243b019d Merge branch 'en/filter-branch-deprecation'
9bc67b6658 Merge branch 'en/merge-options-ff-and-friends'
fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden'
cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option'
8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return'
3ff6af7753 Merge branch 'nd/switch-and-restore'
aadac067aa Merge branch 'tb/file-url-to-unc-path'
b57a88a5f1 Merge branch 'js/gitdir-at-unc-root'
6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path'
430439536b Merge branch 'rs/parse-tree-indirect'
991fd97b9a Merge branch 'jk/fast-import-history-bugfix'
74a39b9bcc Merge branch 'mh/notes-duplicate-entries'
37801f0665 Merge branch 'tb/banned-vsprintf-namefix'
21ce0b48f3 Merge branch 'mh/release-commit-memory-fix'
f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup'
bf6136cab8 Merge branch 'rs/strbuf-detach'
a2e22bb3ad Merge branch 'rs/trace2-dst-warning'
1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup'
0281733483 Merge branch 'bc/hash-independent-tests-part-5'
f06fb376ed Merge branch 'jc/test-cleanup'
00bb74453d Merge branch 'dl/compat-cleanup'
59438be06c Merge branch 'js/visual-studio'
cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone'
af2abd870b fast-export: fix exporting a tag and nothing else
c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor
dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit
fd5b820d9c user-manual.txt: change header notation
e79b34533a user-manual.txt: add missing section label
b503a2d515 Makefile: emulate compile in $(HCO) target better
af26e2a9d2 pack-bitmap.h: remove magic number
b06fdead04 promisor-remote.h: include missing header
97b989ee3a apply.h: include missing header
4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name
d928a8388a t0028: add more tests
0b63fd6965 t0028: fix test for UTF-16-LE-BOM
fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration
2e09c01232 name-rev: avoid cutoff timestamp underflow
8464f94aeb promisor-remote.h: drop extern from function declaration
75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp
24c681794f doc: MyFirstContribution: fix cmd placement instructions
c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode
60c60b627e Merge branch 'py/git-git-extra-stuff'
faf420e05a treewide: correct several "up-to-date" to "up to date"
b71c6c3b64 Fix build with core.autocrlf=true
16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff
26e3d1cbea .mailmap: update email address of Andrey Mazo
27ea41c0b4 t/helper: ignore only executable files
7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()
83e3ad3b12 merge-recursive: symlink's descendants not in way
34933d0eff stash: make sure to write refreshed cache
e080b34540 merge: use refresh_and_write_cache
22184497a3 factor out refresh_and_write_cache function
7371612255 commit-graph: add --[no-]progress to write and verify
47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW
253bfe49bd SubmittingPatches: git-gui has a new maintainer
d17ae00c97 hg-to-git: make it compatible with both python3 and python2
4c86140027 Third batch
f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http'
627b826834 Merge branch 'md/list-objects-filter-combo'
b9ac6c59b8 Merge branch 'cc/multi-promisor'
de67293e74 Merge branch 'sg/line-log-tree-diff-optim'
95486229e3 Merge branch 'sg/complete-configuration-variables'
f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook'
a2e524ecf3 Merge branch 'cb/curl-use-xmalloc'
128666753b Merge branch 'jk/drop-release-pack-memory'
917a319ea5 Merge branch 'js/rebase-r-strategy'
7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui
4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout()
0d4304c124 doc: fix reference to --ignore-submodules
af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py
8a3a6817e2 Merge gitk to pick up emergency build fix
2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po
9027af58e2 Makefile: run coccicheck on more source files
43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES)
5dedf7de53 Makefile: define THIRD_PARTY_SOURCES
902b90cf42 clean: fix theoretical path corruption
ca8b5390db clean: rewrap overly long line
09487f2cba clean: avoid removing untracked files in a nested git repository
e86bbcf987 clean: disambiguate the definition of -d
3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run
29b577b960 dir: add commentary explaining match_pathspec_item's return value
89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it
a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case
404ebceda0 dir: also check directories for matching pathspecs
a5e916c745 dir: fix off-by-one error in match_pathspec_item
bbbb6b0b89 dir: fix typo in comment
7541cc5302 t7300: add testcases showing failure to clean specified pathspecs
0eb7c37a8a diff, log doc: small grammer, format, and language fixes
6fae6bd518 diff, log doc: say "patch text" instead of "patches"
2bb74b53a4 Test the progress display
bbf47568ad Revert "progress: use term_clear_line()"
cf6a2d2557 Makefile: strip leading ./ in $(LIB_H)
b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup
689a146c91 commit-graph: use commit_list_count()
59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N"
a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N"
a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base"
cf34337f98 list-objects-filter: give a more specific error sparse parsing error
4c96a77594 list-objects-filter: delay parsing of sparse oid
72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter
83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer
7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>`
226daba280 Doc/Makefile: give mansource/-version/-manual attributes
40e747e89d git-submodule.txt: fix AsciiDoc formatting error
f6461b82b9 Documentation: fix build with Asciidoctor 2
3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
f7a8834ba4 Merge branch 'bp/amend-toggle-bind'
ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit"
9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes
d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog
beffae768a gitk: Add Chinese (zh_CN) translation
56d9cbe68b packfile: expose get_delta_base()
bab28d9f97 builtin/pack-objects: report reused packfile objects
6c8ec8c30a Merge branch 'bw/commit-scrollbuffer'
acfa495519 Merge branch 'bw/amend-checkbutton'
da08d559b7 git-gui: add horizontal scrollbar to commit buffer
ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton
aeeb978ba6 completion: teach archive to use __gitcomp_builtin
2b9bd488ae completion: teach rebase to use __gitcomp_builtin
d49dffde9a completion: add missing completions for log, diff, show
6abada1880 upload-pack: disable commit graph more gently for shallow traversal
fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time
72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set
4fd39c76e6 doc: minor formatting fix
29f4332e66 Quit passing 'now' to date code
c77abf0460 Merge branch 'py/revert-hunks-lines'
5a2bb62180 Merge branch 'bp/widget-focus-hotkeys'
e07446ed5f git-gui: add hotkeys to set widget focus
f981ec18cf cache-tree: do not lazy-fetch tentative tree
f1d4a28250 Second batch
c8ada15456 Merge branch 'bc/reread-attributes-during-rebase'
8f3ba423e7 Merge branch 'tg/t0021-racefix'
a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email'
d49c2c3466 Merge branch 'sb/userdiff-dts'
2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe'
4c49dd042d Merge branch 'nd/diff-parseopt'
d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix'
8ce8a63b46 Merge branch 'ds/midx-expire-repack'
9437394661 Merge branch 'cb/fetch-set-upstream'
af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix'
fa9e7934c7 Merge branch 'bm/repository-layout-typofix'
d1a251a1fa Merge branch 'en/checkout-mismerge-fix'
e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental'
f4f8dfe127 Merge branch 'ds/feature-macros'
4a12f89865 Merge branch 'jk/eoo'
b4a1eec332 Merge branch 'jk/repo-init-cleanup'
70336bd50a Merge branch 'py/git-gui-do-quit'
ad7c543e3b grep: skip UTF8 checks explicitly
0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration()
b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration
4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor
b7e1ba5649 git-merge-index.txt: wrap shell listing in "----"
38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----"
5371813768 git-ls-remote.txt: wrap shell listing in "----"
1925fe0c8a Documentation: wrap config listings in "----"
922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor
2017956a19 Documentation: wrap blocks with "--"
dd2e50a84e commit-graph: turn off save_commit_buffer
67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits
806278dead commit-graph.c: handle corrupt/missing trees
16749b8dd2 commit-graph.c: handle commit parsing errors
23424ea759 t/t5318: introduce failing 'git commit-graph write' tests
bf1e28e0ad builtin/rebase.c: Remove pointless message
d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing
bd482d6e33 t: use common $SQ variable
3a37876b5d pack-objects: drop packlist index_pos optimization
7e6b96c73b test-read-cache: drop namelen variable
e4b369069e diff-delta: set size out-parameter to 0 for NULL delta
7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint
f1cbd033e2 pack-objects: use object_id in packlist_alloc()
0dfed92dfd git-am: handle missing "author" when parsing commit
3960290675 ci: restore running httpd tests
6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests
c77722b3ea use get_tagged_oid()
dad3f0607b tag: factor out get_tagged_oid()
468ce99b77 unpack-trees: rename 'is_excluded_from_list()'
65edd96aec treewide: rename 'exclude' methods to 'pattern'
4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_'
caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list'
ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern'
483e861111 t9902: use a non-deprecated command for testing
9df53c5de6 Recommend git-filter-repo instead of git-filter-branch
7b6ad97939 t6006: simplify, fix, and optimize empty message test
50094ca45f config/format.txt: specify default value of format.coverLetter
c1a6f21cd4 Doc: add more detail for git-format-patch
854b5cb46a t4014: stop losing return codes of git commands
dd2b6b6860 t4014: remove confusing pipe in check_threading()
6bd26f58ea t4014: use test_line_count() where possible
c6ec6dadba t4014: let sed open its own files
f2e2fa8f60 t4014: drop redirections to /dev/null
460609cbd5 t4014: use indentable here-docs
92014b69bb t4014: remove spaces after redirect operators
0ab74e979c t4014: use sq for test case names
cb46c40662 t4014: move closing sq onto its own line
b562a54c01 t4014: s/expected/expect/
e770fbfeff t3005: remove unused variable
da280f5f1a t: use LF variable defined in the test harness
7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch
552fc5016f mingw: apply array.cocci rule
476998d05b t3427: accelerate this test by using fast-export and fast-import
aac6ff7b5b .gitignore: stop ignoring `.manifest` files
2c65d90f75 am: reload .gitattributes after patching it
1577dc0f7c tree: simplify parse_tree_indirect()
50f26bd035 fetch: add fetch.writeCommitGraph config setting
8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set
27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options
0a8bc7068f clarify documentation for remote helpers
80e3658647 help: make help_unknown_ref() NORETURN
313677627a checkout: add simple check for 'git checkout -b'
3441de5b9c gitk: Make web links clickable
a4fa2f0a4c git-gui: allow undoing last revert
414d924beb rebase: teach rebase --keep-base
6330209d7d rebase tests: test linear branch topology
4effc5bc96 rebase: fast-forward --fork-point in more cases
c0efb4c1dd rebase: fast-forward --onto in more cases
2b318aa6c3 rebase: refactor can_fast_forward into goto tower
c9efc21683 t3432: test for --no-ff's interaction with fast-forward
1ebec8dfc1 fast-import: duplicate into history rather than passing ownership
9756082b3c fast-import: duplicate parsed encoding string
86ae43da6a status: mention --skip for revert and cherry-pick
b1b16bba96 completion: add --skip for cherry-pick and revert
deaa65a754 completion: merge options for cherry-pick and revert
4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
793ac7e309 t3432: test rebase fast-forward behavior
359ecebc34 t3431: add rebase --fork-point tests
502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage
ff61681b46 grep: refactor and simplify PCRE1 support
8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1
1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning()
fd99c2dd9b grep: use return value of strbuf_detach()
82f51af345 log-tree: always use return value of strbuf_detach()
7e92756751 http: don't leak urlmatch_config.vars
9784f97321 commit: free the right buffer in release_commit_memory
ce17feb1b3 path: add a function to check for path suffix
60d198d022 banned.h: fix vsprintf()'s ban message
60fe477a0b notes: avoid potential use-after-free during insertion
779ad6641b notes: avoid leaking duplicate entries
4e1a641ee3 mingw: fix launching of externals from Unicode paths
5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly
e2683d51d9 Fix .git/ discovery at the root of UNC shares
d17f2124a7 setup_git_directory(): handle UNC paths correctly
ebb8d2c90f mingw: support UNC in git clone file://server/share/repo
0c37c41d13 t4009: make hash size independent
c1f3dfcc23 t4002: make hash independent
8cc5ff83c3 t4000: make hash size independent
c784815073 t3903: abstract away SHA-1-specific constants
2ccdfb1c78 git-gui: return early when patch fails to apply
62bd99934b git-gui: allow reverting selected hunk
5f0a516de9 git-gui: allow reverting selected lines
fddf2ebe38 transport: teach all vtables to allow fetch first
ac3fda82bf transport-helper: skip ls-refs if unnecessary
745f681289 First batch after Git 2.23
d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg'
22e86e85cb Merge branch 'en/fast-import-merge-doc'
9c7573581c Merge branch 'jk/perf-no-dups'
4336fdb2ef Merge branch 'rs/nedalloc-fixlets'
8ae7a46c4d Merge branch 'sg/show-failed-test-names'
6ba06b582b Merge branch 'sg/commit-graph-validate'
072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix'
207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix'
77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests'
1b01cdbf2e Merge branch 'jk/tree-walk-overflow'
8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix'
307179732d Merge branch 'mt/grep-submodules-working-tree'
58166c2e9d t0021: make sure clean filter runs
8b3f33ef11 ref-filter: initialize empty name or email fields
3c81760bc6 userdiff: add a builtin pattern for dts files
fe49814409 t4014: drop unnecessary blank lines from test cases
a2bb801f6a line-log: avoid unnecessary full tree diffs
eef5204190 line-log: extract pathspec parsing from line ranges into a helper function
a63694f523 diff: skip GITLINK when lazy fetching missing objs
7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe
19800bdc3f parseopt: move definition of enum parse_opt_result up
415b770b88 packfile.h: drop extern from function declaration
acb49d1cc8 t3800: make hash-size independent
ca6ba94200 t3600: make hash size independent
19ce5496c2 t3506: make hash independent
9a6738c061 t3430: avoid hard-coded object IDs
4dd1b5f90f t3404: abstract away SHA-1-specific constants
b99bfc7a6c t3306: abstract away SHA-1-specific constants
e3e9d02e35 t3305: make hash size independent
b408cf8cf6 t3301: abstract away SHA-1-specific constants
b561edd213 t3206: abstract away hash size constants
a5f61c7d13 t3201: abstract away SHA-1-specific constants
1c24a54ea4 repository-layout.txt: correct pluralization of 'object'
b0a3186140 sequencer: simplify root commit creation
a47ba3c777 rebase -i: check for updated todo after squash and reword
450efe2d53 rebase -i: always update HEAD before rewording
c581e4a749 grep: under --debug, show whether PCRE JIT is enabled
aaa95dfa05 midx: switch to using the_hash_algo
be8e172e9f builtin/show-index: replace sha1_to_hex
3f34d70d40 rerere: replace sha1_to_hex
fc06be3b7f builtin/receive-pack: replace sha1_to_hex
69fa337060 builtin/index-pack: replace sha1_to_hex
3a4d7aa5ae packfile: replace sha1_to_hex
e0cb7cdb89 wt-status: convert struct wt_status to object_id
8d4d86b0f0 cache: remove null_sha1
f6ca67d673 builtin/worktree: switch null_sha1 to null_oid
dd336a5511 builtin/repack: write object IDs of the proper length
894c0f66bb pack-write: use hash_to_hex when writing checksums
4439c7a360 sequencer: convert to use the_hash_algo
95518faac1 bisect: switch to using the_hash_algo
e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo
fe9fec45f6 config: use the_hash_algo in abbrev comparison
976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
703d2d4193 bundle: switch to use the_hash_algo
9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo
7962e046ff show-index: switch hard-coded constants to the_hash_algo
fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ
7e0d029f18 builtin/rev-parse: switch to use the_hash_algo
319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo
fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo
f6af19a9ad fetch-pack: use parse_oid_hex
36261e42ec patch-id: convert to use the_hash_algo
28ba1830d0 builtin/replace: make hash size independent
24bc1a1292 pull, fetch: add --set-upstream option
71d41ff651 archive-tar: turn length miscalculation warning into BUG
17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header()
82a46af13e archive-tar: fix pax extended header length calculation
4060c1990a archive-tar: report wrong pax extended header length
4615a8cb5b merge-recursive: alphabetize include list
45ef16f77a merge-recursive: add sanity checks for relevant merge_options
f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
5bf7e5779e merge-recursive: split internal fields into a separate struct
e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output
a779fb829b merge-recursive: comment and reorder the merge_options fields
8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options
7c0a6c8e47 merge-recursive: move some definitions around to clean up the header
c749ab1da8 merge-recursive: rename merge_options argument to opt in header
bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity
ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list
4d7101e25c merge-recursive: fix some overly long lines
724dd767b2 cache-tree: share code between functions writing an index as a tree
345480d1ed merge-recursive: don't force external callers to do our logging
b4db8a2b76 merge-recursive: remove useless parameter in merge_trees()
98a1d3d888 merge-recursive: exit early if index != head
9822175d2b Ensure index matches head before invoking merge machinery, round N
10f751c06b merge-recursive: remove another implicit dependency on the_repository
f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks
8e01251694 merge-recursive: introduce an enum for detect_directory_renames values
743474cbfa merge-recursive: provide a better label for diff3 common ancestor
51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u)
5bace62582 l10n: Update Catalan translation
139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()
65c01c6442 checkout: provide better conflict hunk description with detached HEAD
d8523ca1b9 merge-recursive: be consistent with assert
acb7da05ac checkout: remove duplicate code
93b980e58f http: use xmalloc with cURL
64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental
aaf633c2ad repo-settings: create feature.experimental setting
c6cc4c5afd repo-settings: create feature.manyFiles setting
ad0fb65999 repo-settings: parse core.untrackedCache
31b1de6a09 commit-graph: turn on commit-graph by default
b068d9a250 t6501: use 'git gc' in quiet mode
7211b9e753 repo-settings: consolidate some config settings
507e5470a0 worktree remove: clarify error message on dirty worktree
5af9d5f6c8 completion: complete config variables and values for 'git clone --config='
88cd790d6a completion: complete config variables names and values for 'git clone -c'
dd33472831 completion: complete values of configuration variables after 'git -c var='
e1e00089da completion: complete configuration sections and variable names for 'git -c'
42d0efec59 completion: split _git_config()
d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp()
2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names
d9438873c4 completion: deduplicate configuration sections
7a09a8f093 completion: add tests for 'git config' completion
840d7e5b3c completion: complete more values of more 'color.*' configuration variables
08a12175d8 completion: fix a typo in a comment
9827d4c185 packfile: drop release_pack_memory()
d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed
362f8b280c t/perf: rename duplicate-numbered test script
742ed63345 trace2: cleanup whitespace in perf format
e34430556c trace2: cleanup whitespace in normal format
c2b890aca5 quote: add sq_append_quote_argv_pretty()
ad43e37839 trace2: trim trailing whitespace in normal format error message
04f10d332f trace2: remove dead code in maybe_add_string_va()
da4589ce7e trace2: trim whitespace in region messages in perf target format
0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit
5440eb0ea2 git-gui: call do_quit before destroying the main window
bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook
6098817fd7 git-merge: honor pre-merge-commit hook
a1f3dd7eb3 merge: do no-verify like commit
f78f6c7e0c t7503: verify proper hook execution
70597e8386 nedmalloc: avoid compiler warning about unused value
c9b9c09dae nedmalloc: do assignments only after the declaration section
22932d9169 config: stop checking whether the_repository is NULL
5732f2b1ef common-main: delay trace2 initialization
58ebccb478 t1309: use short branch name in includeIf.onbranch test
67feca3b1c gitcli: document --end-of-options
51b4594b40 parse-options: allow --end-of-options as a synonym for "--"
19e8789b23 revision: allow --end-of-options to end option parsing
ffe1afe67c tests: show the test name and number at the start of verbose output
96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests
7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits'
39d8831856 commit-graph: turn a group of write-related macro flags into an enum
9916073be5 t5318-commit-graph: use 'test_expect_code'
620c09e1b6 restore: add test for deleted ita files
ecd72042de checkout.c: unstage empty deleted ita files
a613d4f817 pack-refs: always refresh after taking the lock file
decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd'
371df1bea9 trace2: cleanup column alignment in perf target format
5aa02f9868 tree-walk: harden make_traverse_path() length computations
c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path()
b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len()
37806080d7 tree-walk: use size_t consistently
7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh'
12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh'
9055384710 tree-walk: drop oid from traverse_info
947208b725 setup_traverse_info(): stop copying oid
e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
a63f990d92 t3418: test `rebase -r` with merge strategies
5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges`
e145d99347 rebase -r: support merge strategies other than `recursive`
4e6023b13a t3427: fix another incorrect assumption
f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced
a9c71073da t3427: fix erroneous assumption
b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three
d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case
c248d32cdb t3427: simplify the `setup` test case significantly
8c1e24048a t3427: add a clarifying comment
5efed0ecf9 rebase: fold git-rebase--common into the -p backend
68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone
2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive`
6180b20239 t3400: stop referring to the scripted rebase
d5b581f228 Drop unused git-rebase--am.sh
814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation
6a289d45c0 grep: fix worktree case in submodules
870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching
8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data
09872f6418 grep: create a "is_fixed" member in "grep_pat"
8a35b540a9 grep: consistently use "p->fixed" in compile_regexp()
685668faaa grep: stop using a custom JIT stack with PCRE v1
34489239d0 grep: stop "using" a custom JIT stack with PCRE v2
04bef50c01 grep: remove overly paranoid BUG(...) code
b65abcafc7 grep: use PCRE v2 for optimized fixed-string search
48de2a768c grep: remove the kwset optimization
45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern>
25754125ce grep: make the behavior for NUL-byte in patterns sane
d316af059d grep tests: move binary pattern tests into their own file
471dac5d2c grep tests: move "grep binary" alongside the rest
f463beb805 grep: inline the return value of a function call used only once
b14cf112e2 t4210: skip more command-line encoding tests on MinGW
44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
4e2443b181 log tests: test regex backends in "--encode=<enc>" tests
90d21f9ebf list-objects-filter-options: make parser void
5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW
489fc9ee71 list-objects-filter-options: allow mult. --filter
c2694952e3 strbuf: give URL-encoding API a char predicate fn
cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list
f56f764279 list-objects-filter-options: move error check up
e987df5fe6 list-objects-filter: implement composite filters
842b00516a list-objects-filter-options: always supply *errbuf
7a7c7f4a6d list-objects-filter: put omits set in filter struct
9430147ca0 list-objects-filter: encapsulate filter components
4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c
60b7a92d84 Move repository_format_partial_clone to promisor-remote.c
db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
75de085211 remote: add promisor and partial clone config to the doc
7e154badc0 partial-clone: add multiple remotes in the doc
9a4c507886 t0410: test fetching from many promisor remotes
5e46139376 builtin/fetch: remove unique promisor remote limitation
fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter
b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote()
faf2abf496 promisor-remote: use repository_format_partial_clone
9cfebc1f3b promisor-remote: add promisor_remote_reinit()
9e27beaa23 promisor-remote: implement promisor_remote_get_direct()
48de315817 Add initial support for many promisor remotes
2e860675b6 fetch-object: make functions return an error code
c59c7c879e t0410: remove pipes after git commands
git-subtree-dir: third_party/git
git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
2020-05-22 18:46:45 +02:00
|
|
|
#: apply.c:1282
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96
af6b65d45e Git 2.26.2
7397ca3373 Git 2.25.4
b86a4be245 Git 2.24.3
f2771efd07 Git 2.23.3
c9808fa014 Git 2.22.4
9206d27eb5 Git 2.21.3
041bc65923 Git 2.20.4
76b54ee9b9 Git 2.19.5
ba6f0905fd Git 2.18.4
df5be6dc3f Git 2.17.5
1a3609e402 fsck: reject URL with empty host in .gitmodules
e7fab62b73 credential: treat URL with empty scheme as invalid
c44088ecc4 credential: treat URL without scheme as invalid
fe29a9b7b0 credential: die() when parsing invalid urls
a2b26ffb1a fsck: convert gitmodules url to URL passed to curl
8ba8ed568e credential: refuse to operate when missing host or protocol
24036686c4 credential: parse URL without host as empty host, not unset
73aafe9bc2 t0300: use more realistic inputs
a88dbd2f8c t0300: make "quit" helper more realistic
de49261b05 Git 2.26.1
274b9cc253 Git 2.26
55a7568606 Merge branch 'en/rebase-backend'
c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git
1557364fb4 l10n: tr.po: change file mode to 644
2da1b05674 t3419: prevent failure when run with EXPENSIVE
1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0
5804c6ec40 l10n: de.po: add missing space
98cedd0233 Merge https://github.com/prati0100/git-gui
4914ba4bcf l10n: tr: Fix a couple of ambiguities
a5728022e0 Merge branch 'py/remove-tcloo'
7fcb965970 RelNotes/2.26.0: fix various typos
f0c03bcf95 l10n: Update Catalan translation
67b0a24910 Git 2.25.3
be8661a328 Sync with Git 2.25.2
0822e66b5d Git 2.25.2
65588b0b2e unicode: update the width tables to Unicode 13.0
7be274b0ff Merge branch 'js/ci-windows-update' into maint
9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint
221887a492 Merge branch 'jk/doc-credential-helper' into maint
32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint
fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint
618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint
50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint
fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint
41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint
2d7247af6f Merge branch 'am/mingw-poll-fix' into maint
4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint
76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint
569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint
16a4bf1035 Merge branch 'en/check-ignore' into maint
3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint
56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint
1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint
7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint
fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint
a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint
93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint
dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint
758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint
f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint
506223f9c5 Git 2.24.2
17a02783d8 Git 2.23.2
69fab82147 Git 2.22.3
fe22686494 Git 2.21.2
d1259ce117 Git 2.20.3
a5979d7009 Git 2.19.4
21a3e5016b Git 2.18.3
c42c0f1297 Git 2.17.4
d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u)
3891a84ccd git-gui: create a new namespace for chord script evaluation
8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5
440e7442d1 l10n: zh_CN: Revise v2.26.0 translation
2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2
6c85aac65f Git 2.26-rc2
74f172e39e Merge branch 'en/test-cleanup'
e96327c947 Merge branch 'es/outside-repo-errmsg-hints'
ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0
15fa8d9667 l10n: vi: fix translation + grammar
5c20398699 prefix_path: show gitdir if worktree unavailable
1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated)
c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated)
a4a2f64642 Merge branch 'js/askpass-coerce-utf8'
850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows
d769dcc5cd Merge branch 'py/blame-status-error'
70e24186c0 t6022, t6046: fix flaky files-are-updated checks
30e9940356 Hopefully the final batch before -rc2
b4f0038525 Merge branch 'en/rebase-backend'
25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master
07259e74ec fsck: detect gitmodules URLs with embedded newlines
c716fe4bd9 credential: detect unrepresentable values when parsing urls
17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr
9a6bbee800 credential: avoid writing values with newlines
17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2
1afe18a3bb l10n: es: 2.26.0 round#2
5ab9217a3c Merge branch of github.com:alshopov/git-po into master
c6713676d6 Merge branch of github.com:bitigchi/git-po into master
b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t)
2713dec02d l10n: tr: v2.26.0 round 2
c9ef57cc3a l10n: fr : v2.26.0 rnd 2
120b1eb731 git-rebase.txt: highlight backend differences with commit rewording
9a1b7474d6 sequencer: clear state upon dropping a become-empty commit
937d143630 i18n: unmark a message in rebase.c
a56d361f66 Merge branch 'ds/sparse-add'
5fa9169ced Merge branch 'dr/push-remote-ref-update'
cdef998b46 Merge branch 'jc/doc-single-h-is-for-help'
051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed)
52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master
9643441983 l10n: tr: Add glossary for Turkish translations
438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv
fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git
2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u)
dd2c269652 l10n: tr: Add Turkish translations
8f4f099f8b l10n: tr: Add Turkish translation team info
b4374e96c8 Git 2.26-rc1
4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch'
3658d77f8e Merge branch 'hd/show-one-mergetag-fix'
6125104b88 Merge branch 'rt/format-zero-length-fix'
1ac37deba2 Merge branch 'am/mingw-poll-fix'
cf372dc815 Merge branch 'en/test-cleanup'
d1075adfdf Merge branch 'en/merge-path-collision'
a4fd114ffc Merge branch 'kk/complete-diff-color-moved'
a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file'
0e0d717537 Merge branch 'pb/am-show-current-patch'
9b7f726dfc Merge branch 'am/pathspec-f-f-more'
4605a73073 t1091: don't grep for `strerror()` string
4d9c2902a1 l10n: fr v2.26.0 rnd1
ad182bee3f Merge branch of github.com:alshopov/git-po into master
23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1
98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t)
f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed)
76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po
076cbdcd73 Git 2.26-rc0
0d65f3fb1a t5537: adjust test_oid label
e63cefb024 Merge branch 'hi/gpg-use-check-signature'
5da7329e29 Merge branch 'rs/commit-graph-code-simplification'
0108fc1b46 Merge branch 'js/ci-windows-update'
f3ccd9f0d9 Merge branch 'be/describe-multiroot'
a6b4709302 Merge branch 'ag/rebase-remove-redundant-code'
b22db265d6 Merge branch 'es/recursive-single-branch-clone'
e8e71848ea Merge branch 'jk/nth-packed-object-id'
a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'
4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere'
49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix'
2cbb058669 Merge branch 'bc/wildcard-credential'
25063e2530 Merge branch 'mr/bisect-in-c-1'
f4d7dfce4d Merge branch 'ds/sparse-add'
4d864895a2 t2402: test worktree path when called in .git directory
af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch()
7655b4119d remote-curl: show progress for fetches over dumb HTTP
2f268890c2 The eighth batch for 2.26
aa5a7e02ad Merge branch 'ma/test-cleanup'
58595e713c Merge branch 'rs/blame-typefix-for-fingerprint'
ff41848e99 Merge branch 'rs/micro-cleanups'
4cbf1a0e22 Merge branch 'es/worktree-cleanup'
46703057c1 Merge branch 'ak/test-log-graph'
777815f5f9 Merge branch 'jk/run-command-formatfix'
444cff61b4 Merge branch 'ds/partial-clone-fixes'
48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure'
8c22bd9ff9 Merge branch 'en/rebase-backend'
cb2f5a8e97 Merge branch 'en/check-ignore'
0df82d99da Merge branch 'jk/object-filter-with-bitmap'
80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix'
29b09c518c Merge branch 'jk/doc-diff-parallel'
237a28173f show_one_mergetag: print non-parent in hex form.
5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context"
6d1210e133 l10n: Update Catalan translation
0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification"
7329d94be7 config.mak.dev: re-enable -Wformat-zero-length
7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings
94f4d01932 mingw: workaround for hangs when sending STDIN
1ff466c018 Documentation: clarify that `-h` alone stands for `help`
65bf820d0e t6020: new test with interleaved lexicographic ordering of directories
9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it
d5bb92eced t3035: prefer test_must_fail to bash negation for git commands
b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions
42d180dd01 t602[1236], t6034: modernize test formatting
802050400a merge-recursive: apply collision handling unification to recursive case
7f487ce062 Azure Pipeline: switch to the latest agent pools
5ed9fc3fc8 ci: prevent `perforce` from being quarantined
eafff6e41e t/lib-httpd: avoid using macOS' sed
d68ce906c7 commit-graph: use progress title directly
30b1c7ad9d describe: don't abort too early when searching tags
240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to'
2d2118b814 The seventh batch for 2.26
325eb66830 Merge branch 'es/doc-mentoring'
87f17d790d Merge branch 'es/bright-colors'
d0038f4b31 Merge branch 'bw/remote-rename-update-config'
132f600b06 clone: pass --single-branch during --recurse-submodules
47319576f1 submodule--helper: use C99 named initializer
ffe005576a lib-log-graph: consolidate colored graph cmp logic
989eea958b lib-log-graph: consolidate test_cmp_graph logic
bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching
bb4995fc3f worktree: add utility to find worktree by pathname
a80c4c2214 worktree: improve find_worktree() documentation
2fecc48cad packfile: drop nth_packed_object_sha1()
6ac9760a30 packed_object_info(): use object_id internally for delta base
b99b6bcc57 packed_object_info(): use object_id for returning delta base
63f4a7fc01 pack-check: push oid lookup into loop
e31c71083a pack-check: convert "internal error" die to a BUG()
500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps
f66d4e0250 pack-objects: use object_id struct in pack-reuse code
a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id
3f83fd5e44 pack-objects: read delta base oid into object_id struct
0763671b8e nth_packed_object_oid(): use customary integer return
02bbbe9df9 worktree: drop unused code from get_main_worktree()
27f182b3fc blame: provide type of fingerprints pointer
b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere
df126ca142 t3400: make test clean up after itself
3c29e21eb0 t: drop debug `cat` calls
cac439b56d t9810: drop debug `cat` call
91de82adc9 t4117: check for files using `test_path_is_file`
4ef346482d receive.denyCurrentBranch: respect all worktrees
f8692114db t5509: use a bare repository for test push target
45f274fbb1 get_main_worktree(): allow it to be called in the Git directory
fd0bc17557 completion: add diff --color-moved[-ws]
2ce6d075fa use strpbrk(3) to search for characters from a given set
2b3c430bce quote: use isalnum() to check for alphanumeric characters
a51d9e8f07 t1050: replace test -f with test_path_is_file
3e96c66805 partial-clone: avoid fetching when looking for objects
d0badf8797 partial-clone: demonstrate bugs in partial fetch
539052f42f run-command.h: fix mis-indented struct member
6c11c6a124 sparse-checkout: allow one-character directories in cone mode
aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch
f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch
e8ef1e8d6e am: convert "resume" variable to a struct
bc8620b440 parse-options: convert "command mode" to a flag
62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE()
46fd7b3900 credential: allow wildcard patterns when matching config
82eb249853 credential: use the last matching username in the config
588c70e10f t0300: add tests for some additional cases
732f934408 t1300: add test for urlmatch with multiple wildcards
3fa0e04667 mailmap: add an additional email address for brian m. carlson
8a98758a8d stash push: support the --pathspec-from-file option
8c3713cede stash: eliminate crude option parsing
3f3d8068f5 doc: stash: synchronize <pathspec> description
b22909144c doc: stash: document more options
0093abc286 doc: stash: split options from description (2)
2b7460d167 doc: stash: split options from description (1)
5f393dc3aa rm: support the --pathspec-from-file option
fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags
73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure
6c69f22233 bisect: libify `bisect_next_all`
9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents
45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents
cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents
e8e3ce6718 bisect: libify `bisect_checkout`
ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents
7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()`
680e8a01e5 bisect: add enum to represent bisect returning codes
bfacfce7d9 bisect--helper: introduce new `decide_next()` function
b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0
292731c4c2 bisect--helper: change `retval` to `res`
16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays
7ec8125fba check-ignore: fix documentation and implementation to match
2607d39da3 doc-diff: use single-colon rule in rendering Makefile
0aa6ce3094 doc/config/push: use longer "--" line for preformatted example
20a5fd881a rev-list --count: comment on the use of count_right++
63a58457e0 Merge branch 'py/missing-bracket'
51ebf55b93 The sixth batch for 2.26
f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints'
123538444f Merge branch 'jk/doc-credential-helper'
e154451a2f Merge branch 'js/mingw-open-in-gdb'
fc25a19265 Merge branch 'js/test-unc-fetch'
6365058605 Merge branch 'js/test-avoid-pipe'
966b69f02f Merge branch 'js/test-write-junit-xml-fix'
d880c3de23 Merge branch 'jk/mailinfo-cleanup'
5d55554b1d Merge branch 'mr/show-config-scope'
9f3f38769d Merge branch 'rs/strbuf-insertstr'
cbecc168d4 Merge branch 'rs/parse-options-concat-dup'
5af345a438 Merge branch 'bc/hash-independent-tests-part-8'
0460c109c3 Merge branch 'rs/name-rev-memsave'
6b9919c0a2 git-gui: add missing close bracket
5897e5ac96 Merge branch 'cs/german-translation'
cf85a32eb6 git-gui: update German translation
5096e51c54 git-gui: extend translation glossary template with more terms
8b85bb1b70 git-gui: update pot template and German translation to current source code
e68e29171c Sync with 2.25.1
c522f061d5 Git 2.25.1
10cdb9f38a rebase: rename the two primary rebase backends
2ac0d6273f rebase: change the default backend from "am" to "merge"
8295ed690b rebase: make the backend configurable via config setting
76340c8107 rebase tests: repeat some tests using the merge backend instead of am
980b482d28 rebase tests: mark tests specific to the am-backend with --am
c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases
6d04ce75c4 git-prompt: change the prompt for interactive-based rebases
52eb738d6b rebase: add an --am option
8af14f0859 rebase: move incompatibility checks between backend options a bit earlier
be50c938df git-rebase.txt: add more details about behavioral differences of backends
befb89ce7c rebase: allow more types of rebases to fast-forward
9a70f3d4ae t3432: make these tests work with either am or merge backends
93122c985a rebase: fix handling of restrict_revision
55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer
8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling
7db00f0b3b t3406: simplify an already simple test
e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty
d48e5e21da rebase (interactive-backend): make --keep-empty the default
e0020b2f82 prefix_path: show gitdir when arg is outside repo
cc4f2eb828 doc: move credential helper info into gitcredentials(7)
bfdd66e72f Sync with maint
7ae7e234c7 The fifth batch for 2.26
53c3be2c29 Merge branch 'tb/commit-graph-object-dir'
7b029ebaef Merge branch 'jk/index-pack-dupfix'
aa21cc97bd Merge branch 'jk/alloc-cleanups'
883326077a Merge branch 'jh/notes-fanout-fix'
f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule'
78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs'
df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'
433b8aac2e Merge branch 'ds/sparse-checkout-harden'
4a77434bc8 Merge branch 'ld/p4-cleanup-processes'
8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone'
09e48400a3 Merge branch 'jk/get-oid-error-message-i18n'
4dbeecba27 Merge branch 'ag/edit-todo-drop-check'
f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2'
d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout'
251187084d Merge branch 'js/rebase-i-with-colliding-hash'
c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix'
56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store'
0da63da794 Merge branch 'jn/promote-proto2-to-default'
a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup'
daef1b300b Merge branch 'hw/advice-add-nothing'
6141e0cc00 Merge branch 'js/convert-typofix' into maint
4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint
5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint
b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint
7137d6089b Merge branch 'ms/doc-bundle-format' into maint
52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint
0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint
1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint
cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint
153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint
8857657cc9 Merge branch 'jt/t5616-robustify' into maint
1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint
f468972671 Merge branch 'bc/misconception-doc' into maint
6e69042e26 Merge branch 'bc/author-committer-doc' into maint
650ed395be Merge branch 'ds/refmap-doc' into maint
80b806f1a8 Merge branch 'bc/actualmente' into maint
eceff4ba12 Merge branch 'rt/submodule-i18n' into maint
8a17eb7972 Merge branch 'jk/test-fixes' into maint
54bbadaeca Merge branch 'jk/asan-build-fix' into maint
8dbeba198e Merge branch 'ds/sparse-cone' into maint
e361f36f61 Merge branch 'nd/switch-and-restore' into maint
4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint
ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint
5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint
c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint
d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint
9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint
3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint
3ab3185f99 pack-objects: support filters with bitmaps
84243da129 pack-bitmap: implement BLOB_LIMIT filtering
4f3bd5606a pack-bitmap: implement BLOB_NONE filtering
cc4aa28506 bitmap: add bitmap_unset() function
2aaeb9ac41 rev-list: use bitmap filters for traversal
6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure
4eb707ebd6 rev-list: allow commit-only bitmap traversals
ea047a8eb4 t5310: factor out bitmap traversal comparison
608d9c9365 rev-list: allow bitmaps when counting objects
55cb10f9b5 rev-list: make --count work with --objects
792f811998 rev-list: factor out bitmap-optimized routines
d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs
08809c09aa mingw: add a helper function to attach GDB to the current process
bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths
de26f02db1 t9001, t9116: avoid pipes
a2dc43414c MyFirstContribution: rephrase contact info
e03f928e2a rev-list: fallback to non-bitmap traversal when filtering
acac50dd8c pack-bitmap: fix leak of haves/wants object lists
551cf8b655 pack-bitmap: factor out type iterator initialization
d8437c57fa The fourth batch for 2.26
a3dcf84df0 Merge branch 'js/convert-typofix'
0de2d1409b Merge branch 'js/ci-squelch-doc-warning'
0410c2ba31 Merge branch 'jb/multi-pack-index-docfix'
0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example'
e99c325bb4 Merge branch 'ms/doc-bundle-format'
afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix'
db72f8c940 Merge branch 'jb/parse-options-message-fix'
3d2471ba85 Merge branch 'ma/filter-branch-doc-caret'
b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path'
44cba9c4b3 Merge branch 'jc/skip-prefix'
556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index'
17e4a1b141 Merge branch 'hw/doc-git-dir'
4cf7f48891 Merge branch 'jk/push-default-doc'
b783391018 Merge branch 'jk/clang-sanitizer-fixes'
a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache'
3f7553acf5 Merge branch 'jt/t5616-robustify'
341f8a6476 Merge branch 'jk/escaped-wildcard-dwim'
b486d2ee81 Merge branch 'jn/pretend-object-doc'
076ee3e8a2 tests: fix --write-junit-xml with subshells
2b0f19fa7a convert: fix typo
c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors
1751b09a92 color.c: support bright aixterm colors
4a28eb0ae4 color.c: refactor color_output arguments
f696a2b1c8 mailinfo: factor out some repeated header handling
ffbea1816d mailinfo: be more liberal with header whitespace
f447d0293e mailinfo: simplify parsing of header values
b6537d83ee mailinfo: treat header values as C strings
ef07659926 sparse-checkout: work with Windows paths
2631dc879d sparse-checkout: create 'add' subcommand
4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand
6fb705abcb sparse-checkout: extract add_patterns_from_input()
b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config
f2a2327a4a config: provide access to the current line number
923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values
ceff1a1308 remote: clean-up config callback
1a83068c26 remote: clean-up by returning early to avoid one indentation
88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types
145d59f482 config: add '--show-scope' to print the scope of a config value
9a83d088ee submodule-config: add subomdule config scope
e37efa40e1 config: teach git_config_source to remember its scope
5c105a842e config: preserve scope in do_git_config_sequence
6766e41b8a config: clarify meaning of command line scoping
6dc905d974 config: split repo scope to local and worktree
a5cb4204b6 config: make scope_name non-static and rename it
30183894ea ci: ignore rubygems warning in the "Documentation" job
7a9f8ca805 parse-options: simplify parse_options_dup()
c84078573e parse-options: const parse_options_concat() parameters
f904f9025f parse-options: factor out parse_options_count()
a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat()
517b60564e mailinfo: don't insert header prefix for handle_content_type()
a91cc7fad0 strbuf: add and use strbuf_insertstr()
eb31044ff7 pack-format: correct multi-pack-index description
9299f84921 diff-options.txt: avoid "regex" overload in example
7378ec90e1 doc: describe Git bundle format
f3037657e8 t6024: update for SHA-256
edf04243b2 t6006: make hash size independent
5db24dcffd t6000: abstract away SHA-1-specific constants
d341e0805d t5703: make test work with SHA-256
88ed241a7e t5607: make hash size independent
48c10cc0e6 t5318: update for SHA-256
f7ae8e69b6 t5515: make test hash independent
e70649bb66 t5321: make test hash independent
a30f93b143 t5313: make test hash independent
a79eec220b t5309: make test hash independent
796d1383a3 t5302: make hash size independent
417e45e5e3 t4060: make test work with SHA-256
dfa5f53e78 t4211: add test cases for SHA-256
f743e8f5b3 t4211: move SHA-1-specific test cases into a directory
72f936b120 t4013: make test hash independent
5df0f11f07 t3311: make test work with SHA-256
07877f393c t3310: make test work with SHA-256
6025e898d6 t3309: make test work with SHA-256
7b1a1822fe t3308: make test work with SHA-256
94db7e3e93 t3206: make hash size independent
db12505c2c t/lib-pack: support SHA-256
303b3c1c46 submodule: add newline on invalid submodule error
887a0fd573 add: change advice config variables used by the add API
de93cc14ab The third batch for 2.26
ea46d9097b Merge branch 'mt/sparse-checkout-doc-update'
ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix'
b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend'
7ab963e122 Merge branch 'en/fill-directory-fixes-more'
f52ab33616 Merge branch 'bc/hash-independent-tests-part-7'
25794d6ce9 Merge branch 'km/submodule-add-errmsg'
d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity'
76c57fedfa Merge branch 'js/add-p-leftover-bits'
9a5315edfd Merge branch 'js/patch-mode-in-others-in-c'
381e8e9de1 Merge branch 'dl/test-must-fail-fixes'
395518cf7a parse-options: lose an unnecessary space in an error message
079f970971 name-rev: sort tip names before applying
2d53975488 name-rev: release unused name strings
977dc1912b name-rev: generate name strings only if they are better
1c56fc2084 name-rev: pre-size buffer in get_parent_name()
ddc42ec786 name-rev: factor out get_parent_name()
f13ca7cef5 name-rev: put struct rev_name into commit slab
d689d6d82f name-rev: don't _peek() in create_or_update_name()
15a4205d96 name-rev: don't leak path copy in name_ref()
36d2419c9a name-rev: respect const qualifier
71620ca86c name-rev: remove unused typedef
3e2feb0d64 name-rev: rewrite create_or_update_name()
a21781011f index-pack: downgrade twice-resolved REF_DELTA to die()
dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout
e1c5253951 t3305: check notes fanout more carefully and robustly
e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks
a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st'
ad2dd5bb63 commit-graph.c: remove path normalization, comparison
13c2499249 commit-graph.h: store object directory in 'struct commit_graph'
0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context'
f38c92452d t7400: testcase for submodule status on unregistered inner git repos
5290d45134 tree-walk.c: break circular dependency with unpack-trees
f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch
d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode
e53ffe2704 sparse-checkout: escape all glob characters on write
e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand
bd64de42de sparse-checkout: unquote C-style strings over --stdin
d585f0e799 sparse-checkout: write escaped patterns in cone mode
4f52c2ce6c sparse-checkout: properly match escaped characters
9abc60f801 sparse-checkout: warn on globs in cone patterns
145136a95a C: use skip_prefix() to avoid hardcoded string length
04e5b3f0b4 submodule foreach: replace $path with $sm_path in example
1793280e91 t5318: don't pass non-object directory to '--object-dir'
da8063522f diff: move diff.wsErrorHighlight to "basic" config
b98d188581 sha1-file: allow check_object_signature() to handle any repo
2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file()
7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare()
c8123e72f6 streaming: allow open_istream() to handle any repo
5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile()
a651946730 cache-tree: use given repo's hash_algo at verify_one()
eb999b3295 diff: make diff_populate_filespec() honor its repo argument
5b0ca878e0 Sync with maint
344ee18728 The second batch
53a83299c7 Merge branch 'bc/misconception-doc'
c9ccf9d09b Merge branch 'bc/author-committer-doc'
0d0fa20c40 Merge branch 'ss/t6025-modernize'
7050624abc Merge branch 'lh/bool-to-type-bool'
4b69f29271 Merge branch 'ds/refmap-doc'
aff812ce3c Merge branch 'bc/actualmente'
38fb56e92a Merge branch 'rt/submodule-i18n'
f0940743fa Merge branch 'js/builtin-add-i-cmds'
0afeb3fdf4 Merge branch 'jk/test-fixes'
808dab2b58 Merge branch 'jk/asan-build-fix'
fec1ff97c2 Merge branch 'sg/completion-worktree'
c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function'
11ad30b887 Merge branch 'hi/gpg-mintrustlevel'
96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases'
d52adee779 Merge branch 'ds/graph-horizontal-edges'
6909474491 Merge branch 'am/update-pathspec-f-f-tests'
043426c8fd Merge branch 'ds/sparse-cone'
34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig'
8dd40c0472 traverse_trees(): use stack array for name entries
667b76ec58 walker_fetch(): avoid raw array length computation
9734b74a8f normalize_path_copy(): document "dst" size expectations
43f33e492a git-p4: avoid leak of file handle when cloning
19fa5ac333 git-p4: check for access to remote host earlier
6026aff5bb git-p4: cleanup better on error exit
ca5b5cce62 git-p4: create helper function importRevisions()
4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable
5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce
837b3a6376 git-p4: make closeStreams() idempotent
b0418303b1 sha1-name: mark get_oid() error messages for translation
2df1aa239c fetch: forgo full connectivity check if --filter
50033772d5 connected: verify promisor-ness of partial clone
d82ad54945 git: update documentation for --git-dir
0ad7144999 .mailmap: map Yi-Jyun Pan's email
c56c48dd07 grep: ignore --recurse-submodules if --no-index is given
8b2a1928f0 doc: drop "explicitly given" from push.default description
cf82bff73f obstack: avoid computing offsets from NULL pointer
3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer
d20bc01a51 avoid computing zero offsets from NULL pointer
7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero
bc3f657f71 t1506: drop space after redirection operator
e5d7b2f65c t1400: avoid "test" string comparisons
5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c
c7a6207591 Sync with maint
7210ca4ee5 .mailmap: fix GGG authoship screwup
37a63faae5 t4124: only mark git command with test_must_fail
a8c663cf65 t3507: use test_path_is_missing()
2def7f017c t3507: fix indentation
e8a1c686ae t3504: do check for conflict marker after failed cherry-pick
1c9fd32fd2 t3419: stop losing return code of git command
c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}()
a781cd6fef t3415: stop losing return codes of git commands
86ce6e0dd1 t3310: extract common notes_merge_files_gone()
245b9ba0ba t3030: use test_path_is_missing()
4a6f11fd7b t2018: replace "sha" with "oid"
62e80fcb48 t2018: don't lose return code of git commands
30c0367668 t2018: teach do_checkout() to accept `!` arg
40caa5366a t2018: be more discerning when checking for expected exit codes
b54128bb0b t5616: make robust to delta base change
4c616c2ba1 merge-recursive: use subtraction to flip stage
ee798742bd merge-recursive: silence -Wxor-used-as-pow warning
39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule
a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin
3b2885ec9b submodule: fix status of initialized but not cloned submodules
ace912bfb8 t7400: add a testcase for submodule status on empty dirs
4bb4fd4290 MyFirstContribution: add avenues for getting help
9e6d3e6417 sparse-checkout: detect short patterns
41de0c6fbc sparse-checkout: cone mode does not recognize "**"
7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone
47dbf10d8a clone: fix --sparse option with URLs
3c754067a1 sparse-checkout: create leading directories
d622c34396 t1091: improve here-docs
522e641748 t1091: use check_files to reduce boilerplate
417be08d02 t1300: create custom config file without special characters
3de7ee369b t1300: fix over-indented HERE-DOCs
329e6ec397 config: fix typo in variable name
767a9c417e rebase -i: stop checking out the tip of the branch to rebase
dfaed02862 fsmonitor: update documentation for hook version and watchman hooks
e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2
d031049da3 completion: add support for sparse-checkout
a402723e48 doc: sparse-checkout: mention --cone option
26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck
b6992261de rebase -i: re-fix short SHA-1 collision
d859dcad94 parse_insn_line(): improve error message when parsing failed
d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects
92fb0db94c pack-objects: add checks for duplicate objects
bb514de356 pack-objects: improve partial packfile reuse
ff483026a9 builtin/pack-objects: introduce obj_is_packed()
e704fc7978 pack-objects: introduce pack.allowPackReuse
2f4af77699 csum-file: introduce hashfile_total()
8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting()
59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile
40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains()
14fbd26044 ewah/bitmap: introduce bitmap_word_alloc()
bc7a3d4dc0 The first batch post 2.25 cycle
09e393d913 Merge branch 'nd/switch-and-restore'
45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport'
0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout'
36da2a8635 Merge branch 'es/unpack-trees-oob-fix'
42096c778d Merge branch 'bc/run-command-nullness-after-free-fix'
1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted'
a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees'
e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached'
9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting'
237a83a943 Merge branch 'dl/credential-netrc'
a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir()
129510a067 t2405: clarify test descriptions and simplify test
4eaadc8493 t2405: use git -C and test_commit -C instead of subshells
773c60a45e t7410: rename to t2405-worktree-submodule.sh
7a2dc95cbc docs: mention when increasing http.postBuffer is valuable
1b13e9032f doc: dissuade users from trying to ignore tracked files
69e104d70e doc: provide guidance on user.name format
813f6025a5 docs: expand on possible and recommended user config options
bc94e5862a doc: move author and committer information to git-commit(1)
7979dfe1d4 l10n: Update Catalan translation
81e3db42f3 templates: fix deprecated type option `--bool`
c513a958b6 t6025: use helpers to replace test -f <path>
70789843bd t6025: modernize style
6a7aca6f01 doc: rm: synchronize <pathspec> description
856249c62a docs: use "currently" for the present time
b40a50264a fetch: document and test --refmap=""
a9ae8fde2e t3404: directly test the behavior of interest
22a69fda19 git-rebase.txt: update description of --allow-empty-message
f1928f04b2 grep: use no. of cores as the default no. of threads
70a9fef240 grep: move driver pre-load out of critical section
1184a95ea2 grep: re-enable threads in non-worktree case
6c307626f1 grep: protect packed_git [re-]initialization
c441ea4edc grep: allow submodule functions to run in parallel
d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules()
1d1729caeb grep: replace grep_read_mutex by internal obj read lock
31877c9aec object-store: allow threaded access to object reading
b1fc9da1c8 replace-object: make replace operations thread-safe
d5b0bac528 grep: fix racy calls in grep_objects()
faf123c730 grep: fix race conditions at grep_submodule()
c3a5bb31c1 grep: fix race conditions on userdiff calls
0222540827 fetch: emphasize failure during submodule fetch
232378479e Sync with maint
e4837b4406 t7800: don't rely on reuse_worktree_file()
fbce03d329 t4018: drop "debugging" cat from hunk-header tests
f65d07fffa Makefile: use compat regex with SANITIZE=address
849e43cc18 built-in add -i: accept open-ended ranges again
d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files
a4ffbbbb99 submodule.c: mark more strings for translation
0cbb60574e dir: point treat_leading_path() warning to the right place
ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent
22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2
f365bf40a0 clean: demonstrate a bug with pathspecs
b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x
277eb5af7c t5604: make hash independent
44b6c05b43 t5601: switch into repository to hash object
7a868c51c2 t5562: use $ZERO_OID
1b8f39fb0d t5540: make hash size independent
a8c17e3bd6 t5537: make hash size independent
832072219c t5530: compute results based on object length
74ad99b1d8 t5512: abstract away SHA-1-specific constants
ba1be1ab45 t5510: make hash size independent
cba472d3ad t5504: make hash algorithm independent
82d5aeb1e6 t5324: make hash size independent
3c5e65cac1 t5319: make test work with SHA-256
235d3cddb8 t5319: change invalid offset for SHA-256 compatibility
1d86c8f0ce t5318: update for SHA-256
525a7f1769 t4300: abstract away SHA-1-specific constants
7a1bcb251b t4204: make hash size independent
cb78f4f0fe t4202: abstract away SHA-1-specific constants
717c939d8f t4200: make hash size independent
08a9dd891c t4134: compute appropriate length constant
215b60bf07 t4066: compute index line in diffs
194264c185 t4054: make hash-size independent
7d5ecd775d completion: list paths and refs for 'git worktree add'
3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands
3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options
367efd54b3 completion: return the index of found word from __git_find_on_cmdline()
d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function
2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper
54887b4689 gpg-interface: add minTrustLevel as a configuration option
684ceae32d fetch: default to protocol version 2
33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION
8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate
b9ab170752 config doc: protocol.version is not experimental
07ef3c6604 fetch test: use more robust test for filtered objects
d6509da620 fetch test: mark test of "skipping" haves as v0-only
a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too
c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function
bf66db37f1 add: use advise function to display hints
c958d3bd0a graph: fix collapse of multiple edges
8588932e20 graph: add test to demonstrate horizontal line bug
d0d0a357a1 t: directly test parse_pathspec_file()
568cabb2fe t: fix quotes tests for --pathspec-from-file
f94f7bd00d t: add tests for error conditions with --pathspec-from-file
b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job
12acdf573a built-in add -p: handle Escape sequences more efficiently
e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode
04f816b125 built-in add -p: respect the `interactive.singlekey` config setting
a5e46e6b01 terminal: add a new function to read a single keystroke
9ea416cb51 terminal: accommodate Git for Windows' default terminal
94ac3c31f7 terminal: make the code of disable_echo() reusable
08b1ea4c39 built-in add -p: handle diff.algorithm
180f48df69 built-in add -p: support interactive.diffFilter
1e4ffc765d t3701: adjust difffilter test
c81638541c submodule add: show 'add --dry-run' stderr when aborting
8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token
56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token
d0654dc308 Git 2.25
b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po
4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'"
ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1
e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master
1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
d78a1968c5 Merge branch 'ma/config-advice-markup-fix'
a20ae3ee29 l10n: Update Catalan translation
49e268e23e mingw: safeguard better against backslashes in file names
4c6c7971e0 unpack-trees: correctly compute result count
63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1
75449c1b39 l10n: de.po: Reword generation numbers
6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t)
3901d2c6bd config/advice.txt: fix description list separator
7a6a90c6ec Git 2.25-rc2
1f5f3ffe5c Merge branch 'ds/graph-assert-fix'
a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix'
202f68b252 Merge branch 'pm/am-in-body-header-doc-update'
7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix'
c5dc20638b Merge branch 'do/gitweb-typofix-in-comments'
fe47c9cb5f Merge https://github.com/prati0100/git-gui
a1087c9367 graph: fix lack of color in horizontal lines
0d251c3291 graph: drop assert() for merge with two collapsing parents
4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper
573117dfa5 unpack-trees: watch for out-of-range index position
e701bab3e9 restore: invalidate cache-tree when removing entries with --staged
1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command
fa74180d08 checkout: don't revert file on ambiguous tracking branches
2957709bd4 parse_branchname_arg(): extract part as new function
5020f6806a t2018: improve style of if-statement
7ffb54618b t2018: add space between function name and ()
63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH
065027ee1a string-list: note in docs that callers can specify sorting function
26f924d50e unpack-trees: exit check_updates() early if updates are not wanted
042ed3e048 The final batch before -rc2
0f1930cd1b Merge branch 'ds/sparse-cone'
037f067587 Merge branch 'ds/commit-graph-set-size-mult'
f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify'
c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode'
a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
c4117fcb97 Merge branch 'pb/clarify-line-log-doc'
556f0258df Merge branch 'ew/packfile-syscall-optim'
5814d44d9b doc: submodule: fix typo for command absorbgitdirs
7047f75f22 editorconfig: indent text files with tabs
60440d72db sha1-file: document how to use pretend_object_file
7fdc5f296f l10n: es: 2.25.0 round #1
f8740c586b am: document that Date: can appear as an in-body header
4e2c4c0d4f gitweb: fix a couple spelling errors in comments
421c0ffb02 multi-pack-index: correct configuration in documentation
757ff352bd Documentation/git-sparse-checkout.txt: fix a typo
0d2116c644 Merge branch 'zs/open-current-file'
9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u)
3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master
4c5081614c l10n: fr.po v2.25.0 rnd 1
5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0
63020f175f commit-graph: prefer default size_mult when given zero
224c7d70fa mingw: only test index entries for backslashes, not tree entries
9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED
8679ef24ed Git 2.25-rc1
a82027e9e6 Merge branch 'js/use-test-tool-on-path'
13432fc6dd Merge branch 'js/mingw-reserved-filenames'
e0e1ac5db0 Merge branch 'en/rebase-signoff-fix'
b76a244c9d Merge branch 'em/freebsd-cirrus-ci'
bc855232bc Merge branch 'bk/p4-misc-usability'
763a59e71c merge-recursive: remove unnecessary oid_eq function
44143583b7 sparse-checkout: use extern for global variables
d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master
13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1
786f4d2405 git-gui: allow opening currently selected file in default app
4fd683b6a3 sparse-checkout: document interactions with submodules
de11951b03 sparse-checkout: list directories in cone mode
0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0
578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed)
173fff68da Merge tag 'v2.25.0-rc0' into git-po-master
f1842ff531 t2018: remove trailing space from test description
20a67e8ce9 t3008: find test-tool through path lookup
9e341f62ca l10n: Update Catalan translation
4e61b2214d packfile: replace lseek+read with pread
ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision
2be45868a8 doc: log, gitk: document accepted line-log diff formats
280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD
0a76bd7381 mailmap: mask accentless variant for Công Danh
99c33bed56 Git 2.25-rc0
d2189a721c Merge branch 'en/fill-directory-fixes'
8be0a428d6 Merge branch 'rs/test-cleanup'
65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string'
c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
45b96a6fa1 Merge branch 'js/add-p-in-c'
ccc292e862 Merge branch 'jc/drop-gen-hdrs'
dfee504bee Merge branch 'ja/doc-markup-cleanup'
87cbb1ca66 Merge branch 'rs/ref-read-cleanup'
20aa6d88b7 Merge branch 'rb/p4-lfs'
fcd5b55f56 Merge branch 'pb/submodule-doc-xref'
4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free'
ba6b66281e Merge branch 'ln/userdiff-elixir'
bd72a08d6c Merge branch 'ds/sparse-cone'
f3c520e17f Merge branch 'sg/name-rev-wo-recursion'
6514ad40a1 Merge branch 'ra/t5150-depends-on-perl'
17066bea38 Merge branch 'dl/format-patch-notes-config-fixup'
135365dd99 Merge branch 'am/pathspec-f-f-checkout'
ff0cb70d45 Merge branch 'am/pathspec-from-file'
4dc42c6c18 mingw: refuse paths containing reserved names
98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16
c480eeb574 commit --interactive: make it work with the built-in `add -i`
cee6cb7300 built-in add -p: implement the "worktree" patch modes
52628f94fc built-in add -p: implement the "checkout" patch modes
6610e4628a built-in stash: use the built-in `git add -p` if so configured
90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting
36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes
d2a233cb8b built-in add -p: prepare for patch modes other than "stage"
761e3d26bb sparse-checkout: improve OS ls compatibility
6579d93a97 contrib/credential/netrc: work outside a repo
1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable
b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI
b441717256 t1507: inline full_name()
9291e6329e t1507: run commands within test_expect_success
5236fce6b4 t1507: stop losing return codes of git commands
10812c2337 t1501: remove use of `test_might_fail cp`
62d58cda69 t1409: use test_path_is_missing()
b87b02cfe6 t1409: let sed open its own input file
9b92070e52 t1307: reorder `nongit test_must_fail`
3595d10c26 t1306: convert `test_might_fail rm` to `rm -f`
f511bc02ed t0020: use ! check_packed_refs_marked
f6041abdcd t0020: don't use `test_must_fail has_cr`
f46c243e66 t0003: don't use `test_must_fail attr_check`
99c049bc4c t0003: use test_must_be_empty()
3738439c77 t0003: use named parameters in attr_check()
7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err()
b8afb908c2 t/lib-git-p4: use test_path_is_missing()
4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases
6836d2fe06 dir.c: use st_add3() for allocation size
c847dfafee dir: consolidate similar code in treat_directory()
777b420347 dir: synchronize treat_leading_path() and read_directory_recursive()
b9670c1f5e dir: fix checks on common prefix directory
5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit
23cbe427c4 Merge branch 'py/console-close-esc'
124a895811 t4015: improve coverage of function context test
509efef789 commit: forbid --pathspec-from-file --all
12029dc57d t3434: mark successful test as such
e0f9095aaa notes.h: fix typos in comment
675ef6bab8 t6030: don't create unused file
01ed17dc8c t5580: don't create unused file
f670adb49b t3501: don't create unused file
1e1ccbfdd3 git-gui: allow closing console window with Escape
7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays.
b02fd2acca The sixth batch
59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex'
e3b72391d1 Merge branch 'rs/commit-export-env-simplify'
43bf44e23a Merge branch 'rs/archive-zip-code-cleanup'
4438a1a59f Merge branch 'js/t3404-indent-fix'
3a44db2ed2 Merge branch 'dr/branch-usage-casefix'
8bc481f4f6 Merge branch 'sg/t9300-robustify'
011fc2e88e Merge branch 'js/add-i-a-bit-more-tests'
d1c0fe8d9b Merge branch 'dl/range-diff-with-notes'
26c816a67d Merge branch 'hw/doc-in-header'
f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
71a7de7a99 Merge branch 'dl/rebase-with-autobase'
c9f5fc9114 Merge branch 'dl/test-cleanup'
6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap'
3beff388b2 Merge branch 'js/builtin-add-i-cmds'
4755a34c47 Merge branch 'dd/time-reentrancy'
37c2619d91 Merge branch 'ag/sequencer-todo-updates'
608e380502 git-p4: show detailed help when parsing options fail
e2aed5fd5b git-p4: yes/no prompts should sanitize user text
571fb96573 fix-typo: consecutive-word duplications
f371984613 Makefile: drop GEN_HDRS
2e4083198d built-in add -p: show helpful hint when nothing can be staged
54d9d9b2ee built-in add -p: only show the applicable parts of the help text
ade246efed built-in add -p: implement the 'q' ("quit") command
d6cf873340 built-in add -p: implement the '/' ("search regex") command
9254bdfb4f built-in add -p: implement the 'g' ("goto") command
bcdd297b78 built-in add -p: implement hunk editing
b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf"
11f2c0dae8 built-in add -p: coalesce hunks after splitting them
510aeca199 built-in add -p: implement the hunk splitting feature
0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions
5906d5de77 built-in app -p: allow selecting a mode change as a "hunk"
47dc4fd5eb built-in add -p: handle deleted empty files
80399aec5a built-in add -p: support multi-file diffs
7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed
12c24cf850 built-in add -p: color the prompt and the help text
25ea47af49 built-in add -p: adjust hunk headers as needed
e3bd11b4eb built-in add -p: show colored hunks by default
1942ee44e8 built-in add -i: wire up the new C code for the `patch` command
f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C
d1b1384d61 userdiff: remove empty subexpression from elixir regex
df5be01669 doc: indent multi-line items in list
fd5041e127 doc: remove non pure ASCII characters
190a65f9db sparse-checkout: respect core.ignoreCase in cone mode
1d7297513d notes: break set_display_notes() into smaller functions
66f79ee23d config/format.txt: clarify behavior of multiple format.notes
cc2bd5c45d gitmodules: link to gitsubmodules guide
99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed
e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed
8c02fe6060 t7004: don't create unused file
cb05d6a5ed t4256: don't create unused file
c5c4eddd56 dir: break part of read_directory_recursive() out for reuse
072a231016 dir: exit before wildcard fall-through if there is no wildcard
2f5d3847d4 dir: remove stray quote character in comment
a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories"
452efd11fb t3011: demonstrate directory traversal failures
ea94b16fb8 git-p4: honor lfs.storage configuration variable
51a0a4ed95 bisect--helper: avoid use-after-free
d32e065a91 Merge branch 'kk/branch-name-encoding'
ad05a3d8e5 The fifth batch
7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix'
b089e5e6cb Merge branch 'em/test-skip-regex-illseq'
930078ba39 Merge branch 'hi/gpg-use-check-signature'
08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode'
7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk'
55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm'
41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress'
5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise'
dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix'
d37cfe3b5c Merge branch 'dl/pretty-reference'
99c4ff1bda Merge branch 'dl/submodule-set-url'
55d607d85b Merge branch 'js/mingw-inherit-only-std-handles'
c58ae96fc4 Merge branch 'am/pathspec-from-file'
7c88714262 Merge branch 'po/bundle-doc-clonable'
5d9324e0f4 Merge branch 'ra/rebase-i-more-options'
7034cd094b Sync with Git 2.24.1
09ac67a183 format-patch: move git_config() before repo_init_revisions()
8164c961e1 format-patch: use --notes behavior for format.notes
452538c358 notes: extract logic into set_display_notes()
e6e230eeae notes: create init_display_notes() helper
1e6ed5441a notes: rename to load_display_notes()
2866fd284c name-rev: cleanup name_ref()
49f7a2fde9 name-rev: eliminate recursion in name_rev()
fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name'
e05e8cf074 archive-zip: use enum for compression method
39acfa3d22 git gui: fix branch name encoding error
11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description
8cf8f9b4aa t3404: fix indentation
4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs
147ee35558 commit: use strbuf_add() to add a length-limited string
559c6fc317 The fourth batch
56e6c16394 Merge branch 'dl/lore-is-the-archive'
3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive'
7cb0d37f6d Merge branch 'tg/perf-remove-stale-result'
403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick'
f0cf2fee5d Merge branch 'hi/grep-do-not-return-void'
391fb22ac7 Merge branch 'rs/use-skip-prefix-more'
92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd'
4ba74ca901 Merge branch 'rs/test-cleanup'
f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick'
ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9'
8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters
3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances
dd432a6ecf name-rev: restructure parsing commits and applying date cutoff
dd090a8a37 name-rev: pull out deref handling from the recursion
766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper
d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev()
bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation
e0c4da6f2a name-rev: avoid unnecessary cast in name_ref()
c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name()
c593a26348 t6120-describe: modernize the 'check_describe' helper
abcf857300 range-diff: clear `other_arg` at end of function
f8675343d7 range-diff: mark pointers as const
828765dfe0 t3206: fix incorrect test name
0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early
21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile
b4bbbbd5a2 apply --allow-overlap: fix a corner case
89c8559367 git add -p: use non-zero exit code when the diff generation failed
e91162be9c t3701: verify that the diff.algorithm config setting is handled
0c3222c4f3 t3701: verify the shown messages when nothing can be added
24be352d52 t3701: add a test for the different `add -p` prompts
8539b46534 t3701: avoid depending on the TTY prerequisite
0f0fba2cc8 t3701: add a test for advanced split-hunk editing
53a06cf39b Git 2.24.1
67af91c47a Sync with 2.23.1
a7312d1a28 Git 2.23.1
7fd9fd94fb Sync with 2.22.2
d9589d4051 Git 2.22.2
5421ddd8d0 Sync with 2.21.1
367f12b7e9 Git 2.21.1
20c71bcf67 Merge branch 'fix-msys2-quoting-bugs'
7d8b676992 mingw: sh arguments need quoting in more circumstances
d9061ed9da t7415: drop v2.20.x-specific work-around
04522edbd4 mingw: fix quoting of empty arguments for `sh`
49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts
e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly
fc346cb292 Sync with 2.20.2
4cd1cf31ef Git 2.20.2
c154745074 submodule: defend against submodule.update = !command in .gitmodules
4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x
d851d94151 Sync with 2.19.3
caccc527ca Git 2.19.3
7c9fbda6e2 Sync with 2.18.2
9877106b01 Git 2.18.2
14af7ed5a9 Sync with 2.17.3
a5ab8d0317 Git 2.17.3
bb92255ebe fsck: reject submodule.update = !command in .gitmodules
bdfef0492c Sync with 2.16.6
eb288bc455 Git 2.16.6
68440496c7 test-drop-caches: use `has_dos_drive_prefix()`
9ac92fed5b Sync with 2.15.4
7cdafcaacf Git 2.15.4
e904deb89d submodule: reject submodule.update = !command in .gitmodules
d3ac8c3f27 Sync with 2.14.6
66d2a6159f Git 2.14.6
083378cc35 The third batch
88bd37a2d0 Merge branch 'js/pkt-line-h-typofix'
473b431410 Merge branch 'us/unpack-trees-fsmonitor'
e0f9ec9027 Merge branch 'sg/test-bool-env'
fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset'
e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere'
88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory'
8feb47e882 Merge branch 'dl/t5520-cleanup'
6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree'
57d46bc602 Merge branch 'mg/doc-submodule-status-cached'
75bd003c7b Merge branch 'js/git-svn-use-rebase-merges'
f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix'
c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'
36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree'
cf91c31688 Merge branch 'sg/unpack-progress-throughput'
ef6104581d Merge branch 'pb/submodule-update-fetches'
7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix'
f3c7bfdde2 Merge branch 'dl/range-diff-with-notes'
9502b616f1 Merge branch 'jh/userdiff-python-async'
76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2'
995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label'
f7998d9793 Merge branch 'js/builtin-add-i'
917d0d6234 Merge branch 'js/rebase-r-safer-label'
56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers'
2763530048 Merge branch 'jg/revert-untracked'
fa38ab68b0 git-gui: revert untracked files by deleting them
d9c6469f38 git-gui: update status bar to track operations
29a9366052 git-gui: consolidate naming conventions
0bb313a552 xdiff: unignore changes in function context
2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names'
65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods'
5532ebdeb7 Merge branch 'fix-mingw-quoting-bug'
76a681ce9c Merge branch 'dubiously-nested-submodules'
dd53ea7220 Merge branch 'turn-on-protectntfs-by-default'
f82a97eb91 mingw: handle `subst`-ed "DOS drives"
7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams'
d2c84dad1c mingw: refuse to access paths with trailing spaces or periods
379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh
817ddd64c2 mingw: refuse to access paths with illegal characters
cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors
7530a6287e quote-stress-test: allow skipping some trials
35edce2056 t6130/t9350: prepare for stringent Win32 path validation
55953c77c0 quote-stress-test: accept arguments to test via the command-line
ad15592529 tests: add a helper to stress test argument quoting
a8dee3ca61 Disallow dubiously-nested submodule git directories
9102f958ee protect_ntfs: turn on NTFS protection by default
91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams
6d8684161e mingw: fix quoting of arguments
3a85dc7d53 is_ntfs_dotgit(): speed it up
7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses
288a74bcd2 is_ntfs_dotgit(): only verify the leading segment
a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark
cae0bc09ab rebase: fix format.useAutoBase breakage
945dc55dda format-patch: teach --no-base
700e006c5d t4014: use test_config()
a749d01e1d format-patch: fix indentation
0c47e06176 t3400: demonstrate failure with format.useAutoBase
d9b31db2c4 t7700: stop losing return codes of git commands
3699d69df0 t7700: make references to SHA-1 generic
dcf9a748ca t7700: replace egrep with grep
cfe5eda02a t7700: consolidate code into test_has_duplicate_object()
ae475afc0f t7700: consolidate code into test_no_missing_in_packs()
14b7664df8 doc: replace LKML link with lore.kernel.org
d23f9c8e04 RelNotes: replace Gmane with real Message-IDs
dcee037228 doc: replace MARC links with lore.kernel.org
a9aecc7abb checkout, restore: support the --pathspec-from-file option
cfd9376c1d doc: restore: synchronize <pathspec> description
8ea1189eac doc: checkout: synchronize <pathspec> description
6fdc9ad259 doc: checkout: fix broken text reference
1d022bb43f doc: checkout: remove duplicate synopsis
bebb5d6d6b add: support the --pathspec-from-file option
21bb3083c3 cmd_add: prepare for next patch
4778452597 Merge branch 'prevent-name-squatting-on-windows'
a7b1ad3b05 Merge branch 'jk/fast-import-unsafe'
525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()`
e1d911dd4c mingw: disallow backslash characters in tree objects' file names
0060fd1511 clone --recurse-submodules: prevent name squatting on Windows
a52ed76142 fast-import: disallow "feature import-marks" by default
68061e3470 fast-import: disallow "feature export-marks" by default
019683025f fast-import: delay creating leading directories for export-marks
e075dba372 fast-import: stop creating leading directories for import-marks
11e934d56e fast-import: tighten parsing of boolean command line options
816f806786 t9300: create marks files for double-import-marks test
f94804c1f2 t9300: drop some useless uses of cat
4f3e57ef13 submodule--helper: advise on fatal alternate error
10c64a0b3c Doc: explain submodule.alternateErrorStrategy
ec48540fe8 packfile.c: speed up loading lots of packfiles
3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value
a4fb016ba1 pkt-line: fix a typo
0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r
e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data
228f53135a The second batch
6c630f237e Merge branch 'jk/gitweb-anti-xss'
3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell'
4775e02a5c Merge branch 'ma/t7004'
a6c6f8d02a Merge branch 'js/complete-svn-recursive'
3ae8defaf9 Merge branch 'jk/send-pack-remote-failure'
aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix'
4ab9616c76 Merge branch 'sg/skip-skipped-prereq'
723a8adba5 Merge branch 'ds/test-read-graph'
9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation'
406ca29e0d Merge branch 'rs/parse-options-dup-null-fix'
fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging'
8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion'
ef8f621045 Merge branch 'dl/complete-rebase-onto'
3c3e5d0ea2 Merge branch 'tg/stash-refresh-index'
43c5fe1c1d Merge branch 'nn/doc-rebase-merges'
6511cb33c9 Merge branch 'dd/sequencer-utf8'
f165457618 Merge branch 'jk/remove-sha1-to-hex'
a774064fb0 Merge branch 'dj/typofix-merge-strat'
ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates'
d2489ce92c Merge branch 'rs/skip-iprefix'
376e7309e1 Merge branch 'ln/userdiff-elixir'
9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log'
d3096d2ba6 Merge branch 'en/doc-typofix'
26f20fa3fc Merge branch 'ns/test-desc-typofix'
ffd130a363 Merge branch 'en/t6024-style'
5149902ff9 Merge branch 'en/misc-doc-fixes'
bcb06e204c Merge branch 'js/fetch-multi-lockfix'
d08daec001 Merge branch 'rs/trace2-dots'
fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix'
bad5ed39cd Merge branch 'cb/curl-use-xmalloc'
7ab2088255 Merge branch 'rt/fetch-message-fix'
f089ddd56a Merge branch 'es/myfirstcontrib-updates'
3c90710c0c Merge branch 'hw/config-doc-in-header'
d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code'
5444d52866 Merge branch 'js/vreportf-wo-buffering'
05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add'
ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides'
532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default'
dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists'
fac9ab1419 Merge branch 'ma/bisect-doc-sample-update'
a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix'
0be5caf97c Merge branch 'jc/log-graph-simplify'
0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck'
2e697ced9d built-in add -i: offer the `quit` command
d7633578b5 built-in add -i: re-implement the `diff` command
8746e07277 built-in add -i: implement the `patch` command
ab1e1cccaf built-in add -i: re-implement `add-untracked` in C
c54ef5e424 built-in add -i: re-implement `revert` in C
a8c45be939 built-in add -i: implement the `update` command
f37c226454 built-in add -i: prepare for multi-selection commands
c08171d156 built-in add -i: allow filtering the modified files list
0c3944a628 add-interactive: make sure to release `rev.prune_data`
4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance
867fc7f310 grep: don't return an expression from pcre2_free()
c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables
72b006f4bf gpg-interface: prefer check_signature() for GPG verification
7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD
b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r
ccd469450a date.c: switch to reentrant {gm,local}time_r
271c351b2f t7811: don't create unused file
65efb42862 t9300: don't create unused file
f6b9413baf sequencer: fix a memory leak in sequencer_continue()
3eae30e464 doc: replace public-inbox links with lore.kernel.org
46c67492aa doc: recommend lore.kernel.org over public-inbox.org
5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects
17a4ae92ea t7700: s/test -f/test_path_is_file/
d2eee32a89 t7700: move keywords onto their own line
7a1c8c2346 t7700: remove spaces after redirect operators
09279086e8 t7700: drop redirections to /dev/null
756ee7fc9f t7501: stop losing return codes of git commands
38c1aa01de t7501: remove spaces after redirect operators
763b47bafa t5703: stop losing return codes of git commands
eacaa1c180 t5703: simplify one-time-sed generation logic
a29b2429e5 t5317: use ! grep to check for no matching lines
6c37f3ec1b t5317: stop losing return codes of git commands
b66e0a1773 t4138: stop losing return codes of git commands
afd43c9905 t4015: use test_write_lines()
946d2353a3 t4015: stop losing return codes of git commands
50cd31c652 t3600: comment on inducing SIGPIPE in `git rm`
3b737381d8 t3600: stop losing return codes of git commands
0d913dfa7e t3600: use test_line_count() where possible
29a40b5a67 t3301: stop losing return codes of git commands
9b5a9fa60a t0090: stop losing return codes of git commands
17aa9d9c1a t0014: remove git command upstream of pipe
77a946be98 apply-one-time-sed.sh: modernize style
176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job
ed254710ee test: use test_must_be_empty F instead of test_cmp empty F
c74b3cbb83 t7812: add missing redirects
213dabf49d test: use test_must_be_empty F instead of test -z $(cat F)
c93a5aaec8 t1400: use test_must_be_empty
6e4826ea75 t1410: use test_line_count
a5d04a3ef9 t1512: use test_line_count
54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd()
2059e79c0d name-rev: use skip_prefix() instead of starts_with()
1768aaf01d push: use skip_prefix() instead of starts_with()
ec6ee0c07a shell: use skip_prefix() instead of starts_with()
7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with()
a6293f5d28 fetch: use skip_prefix() instead of starts_with()
13ca8fb79e t5150: skip request-pull test if Perl is disabled
ecc0869080 commit-graph: use start_delayed_progress()
44a4693bfc progress: create GIT_PROGRESS_DELAY
528d9e6d01 t/perf: don't depend on Git.pm
b8dcc45387 perf-lib: use a single filename for all measurement types
fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk'
d82dfa7f5b rebase -i: finishing touches to --reset-author-date
1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory
393adf7a6f sequencer: directly call pick_commits() from complete_action()
a2dd67f105 rebase: fill `squash_onto' in get_replay_opts()
3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function
34065541e3 sequencer: update `done_nr' when skipping commands in a todo list
8638114e06 sequencer: update `total_nr' when adding an item to a todo list
0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk
ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk
ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions
9917eca794 l10n: zh_TW: add translation for v2.24.0
0a8e3036a3 reset: parse rev as tree-ish in patch mode
f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits
8d483c8408 doc: document 'git submodule status --cached'
befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick
ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later
9a780a384d mingw: spawned processes need to inherit only standard handles
c5a03b1e29 mingw: work around incorrect standard handles
eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes
a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool
43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values
2d05ef2778 sequencer: fix empty commit check when amending
ea8b7be147 git svn: stop using `rebase --preserve-merges`
67a6ea6300 gpg-interface: limit search for primary key fingerprint
392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern
cff4e9138d sparse-checkout: check for dirty status
416adc8711 sparse-checkout: update working directory in-process for 'init'
f75a69f880 sparse-checkout: cone mode should not interact with .gitignore
fb10ca5b54 sparse-checkout: write using lockfile
99dfa6f970 sparse-checkout: use in-process update for disable subcommand
e091228e17 sparse-checkout: update working directory in-process
e9de487aa3 sparse-checkout: sanitize for nested folders
4dcd4def3c unpack-trees: add progress to clear_ce_flags()
eb42feca97 unpack-trees: hash less in cone mode
af09ce24a9 sparse-checkout: init and set in cone mode
96cc8ab531 sparse-checkout: use hashmaps for cone patterns
879321eb0b sparse-checkout: add 'cone' mode
e6152e35ff trace2: add region in clear_ce_flags
72918c1ad9 sparse-checkout: create 'disable' subcommand
7bffca95ea sparse-checkout: add '--stdin' option to set subcommand
f6039a9423 sparse-checkout: 'set' subcommand
d89f09c828 clone: add --sparse mode
bab3c35908 sparse-checkout: create 'init' subcommand
94c0956b60 sparse-checkout: create builtin with 'list' subcommand
679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files
df6d3d6802 lib-bash.sh: move `then` onto its own line
2a02262078 t5520: replace `! git` with `test_must_fail git`
c245e58bb6 t5520: remove redundant lines in test cases
a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp
e959a18ee7 t5520: don't put git in upstream of pipe
5540ed27bc t5520: test single-line files by git with test_cmp
dd0f1e767b t5520: use test_cmp_rev where possible
979f8891cc t5520: replace test -{n,z} with test-lib functions
3037d3db90 t5520: use test_line_count where possible
93a9bf876b t5520: remove spaces after redirect operator
ceeef863de t5520: replace test -f with test-lib functions
4c8b046f82 t5520: let sed open its own input
53c62b9810 t5520: use sq for test case names
e8d1eaf9b4 t5520: improve test style
2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals
8cb7980382 t0000: test multiple local assignment
5b583e6a09 format-patch: pass notes configuration to range-diff
bd36191886 range-diff: pass through --notes to `git log`
9f726e1b87 range-diff: output `## Notes ##` header
3bdbdfb7a5 t3206: range-diff compares logs with commit notes
75c5aa0701 t3206: s/expected/expect/
79f3950d02 t3206: disable parameter substitution in heredoc
3a6e48e9f7 t3206: remove spaces after redirect operators
26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish
077a1fda82 userdiff: support Python async functions
3798149a74 SubmittingPatches: use `--pretty=reference`
1f0fc1db85 pretty: implement 'reference' format
618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type
0df621172d pretty: provide short date format
ac52d9410e t4205: cover `git log --reflog -z` blindspot
3e8ed3b93e pretty.c: inline initalize format_context
4982516451 revision: make get_revision_mark() return const pointer
f0f9de2bd7 completion: complete `tformat:` pretty format
fb2ffa77a6 SubmittingPatches: remove dq from commit reference
bae74c9dfb pretty-formats.txt: use generic terms for hash
bd00717eab SubmittingPatches: use generic terms for hash
9d45ac4cbf rev-list-options.txt: remove reference to --show-notes
828e829b9e argv-array: add space after `while`
e440fc5888 commit: support the --pathspec-from-file option
66a25a7242 doc: commit: synchronize <pathspec> description
64bac8df97 reset: support the `--pathspec-from-file` option
d137b50756 doc: reset: synchronize <pathspec> description
24e4750c96 pathspec: add new function to parse file
0dbc4a0edf ci(osx): update homebrew-cask repository with less noise
e02058a729 sequencer: handle rebase-merges for "onto" message
bae60ba7e9 builtin/unpack-objects.c: show throughput progress
2d92ab32fd rev-parse: make --show-toplevel without a worktree an error
9e5afdf997 fetch: add trace2 instrumentation
4c4066d95d run-command: move doc to run-command.h
6c51cb525d trace2: move doc to trace2.h
7db0305438 parse-options: add link to doc file in parse-options.h
d95a77d059 submodule-config: move doc to submodule-config.h
f3b9055624 credential: move doc to credential.h
bbcfa3002a tree-walk: move doc to tree-walk.h
971b1f24a2 argv-array: move doc to argv-array.h
f1ecbe0f53 trace: move doc to trace.h
13aa9c8b70 cache: move doc to cache.h
c0be43f898 sigchain: move doc to sigchain.h
19ef3ddd36 pathspec: move doc to pathspec.h
301d595e72 revision: move doc to revision.h
3a1b3415d9 attr: move doc to attr.h
126c1ccefb refs: move doc to refs.h
d27eb356bf remote: move doc to remote.h and refspec.h
405c6b1fbc sha1-array: move doc to sha1-array.h
d3d7172e40 merge: move doc to ll-merge.h
3f1480b745 graph: move doc to graph.h and graph.c
266f03eccd dir: move doc to dir.h
13c4d7eb22 diff: move doc to diff.h and diffcore.h
cd5522271f rebase -r: let `label` generate safer labels
867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()`
8c15904462 built-in add -i: implement the `help` command
3d965c7674 built-in add -i: use color in the main loop
68db1cbf8e built-in add -i: support `?` (prompt help)
76b743234c built-in add -i: show unique prefixes of the commands
6348bfba58 built-in add -i: implement the main loop
a376e37b2c gitweb: escape URLs generated by href()
b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI
f28bceca75 t/gitweb-lib.sh: drop confusing quotes
0eba60c9b7 t9502: pass along all arguments in xss helper
932757b0cc INSTALL: use existing shell scripts as example
b018719927 t7004: check existence of correct tag
1daaebcaa5 built-in add -i: color the header in the `status` command
5e82b9e4d2 built-in add -i: implement the `status` command
e4cb659ebd diff: export diffstat interface
f83dff60a7 Start to implement a built-in version of `git add --interactive`
df53c80822 stash: make sure we have a valid index before writing it
ad7a403268 send-pack: check remote ref status on pack-objects failure
d91ce887c9 t6120-describe: correct test repo history graph in comment
1f9247a3bd completion: tab-complete "git svn --recursive"
603960b50e promisor-remote: remove fetch_if_missing=0
e362fadcd0 clone: remove fetch_if_missing=0
169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL
51bd6be32d mingw: use COPY_ARRAY for copying array
4bd0593e0f test-tool: use 'read-graph' helper
e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway
d784d978f6 t4215: use helper function to check output
61eea521fe fsmonitor: do not compare bitmap size with size of split index
b19f3fe9dd hex: drop sha1_to_hex()
c1ce9c06d0 completion: learn to complete `git rebase --onto=`
f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls
d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase
aa6d7f93ed hex: drop sha1_to_hex_r()
52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch
5772b0c745 sequencer: reencode old merge-commit message
e0eba649e8 bundle-verify: add --quiet
79862b6b77 bundle-create: progress output control
73c3253d75 bundle: framework for options before bundle file
68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in"
b375744274 sequencer: reencode squashing commit's message
019a9d8362 sequencer: reencode revert/cherry-pick's todo list
0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list
e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding
1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary
d9f6f3b619 The first batch post 2.24 cycle
28014c1084 Merge branch 'bc/hash-independent-tests-part-6'
57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree'
c22f63c40f Merge branch 'pb/pretty-email-without-domain-part'
5731ca3657 Merge branch 'hw/remove-api-docs-placeholder'
14b58c62bc Merge branch 'sg/commit-graph-usage-fix'
eff313f8a7 Merge branch 'dl/apply-3way-diff3'
db806d7064 Merge branch 'sg/dir-trie-fixes'
f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix'
8f1119b988 Merge branch 'wb/midx-progress'
d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes'
0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges'
8f40d89783 Merge branch 'hv/bitshift-constants-in-blame'
d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head'
5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer'
b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc'
15d9f3dc66 Merge branch 'es/walken-tutorial'
026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor'
ed28358833 convert: use skip_iprefix() in validate_encoding()
89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding()
03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules
ae821ffe83 multimail: fix a few simple spelling errors
557c5895c2 sha1dc: fix trivial comment spelling error
aa74be316a Fix spelling errors in test commands
96c0caf5e3 Fix spelling errors in messages shown to users
4dc8b1c114 Fix spelling errors in names of tests
7a40cf1553 Fix spelling errors in comments of testcases
15beaaa3d1 Fix spelling errors in code comments
a807200f67 userdiff: add Elixir to supported userdiff languages
461caf3e8a git-shortlog.txt: include commit limiting options
6462d5eb9a fetch: remove fetch_if_missing=0
46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion
99b2ba35f5 t0028: eliminate non-standard usage of printf
add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul`
14c4776d75 t: fix typo in test descriptions
270de6acbe t6024: modernize style
77363a51fb name-hash.c: remove duplicate word in comment
c92faa4d22 hashmap: fix documentation misuses of -> versus .
a6d39f2efb git-filter-branch.txt: correct argument name typo
4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators
8915297925 Fix spelling errors in documentation outside of Documentation/
031fd4b93b Documentation: fix a bunch of typos, both old and new
dd0b61f577 fsmonitor: fix watchman integration
5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare()
7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph
c14e6e7903 fetch: add the command-line option `--write-commit-graph`
da72936f54 Git 2.24
1d34d425d4 Merge branch 'bc/doc-use-docbook-5'
dac1d83c91 Merge branch 'ds/commit-graph-on-fetch'
c32ca691c2 Merge branch 'jt/delay-fetch-if-missing'
ab6b50e4c8 Merge https://github.com/prati0100/git-gui
93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po
a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2
fe28ad8520 rebase: add --reset-author-date
08187b4cba rebase -i: support --ignore-date
0185c683c9 sequencer: rename amend_author to author_to_rename
cbd8db17ac rebase -i: support --committer-date-is-author-date
c068bcc59b sequencer: allow callers of read_author_script() to ignore fields
ba51d2fb24 rebase -i: add --ignore-whitespace flag
3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower
3ada78de3f myfirstcontrib: add dependency installation step
4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt
4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly
8dfb04ae96 update-index: optionally leave skip-worktree entries alone
116d1fa6c6 vreportf(): avoid relying on stdio buffering
efd5444238 RelNotes/2.24.0: fix self-contradictory note
391c7e40b5 fetch.c: fix typo in a warning message
55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template
849e43680d RelNotes/2.24.0: typofix
0115e5d929 git-diff.txt: document return code of `--no-index`
798d66e35d l10n: de.po: Update German translation
c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u)
f21f8f5d35 Git 2.24-rc2
8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix'
0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix'
f2db52c46b Merge branch 'js/mingw-needs-hiding-fix'
5b7594abdc Merge branch 'master' of github.com:vnwildman/git
034d33653a Merge branch 'next' of github.com:ChrisADR/git-po
26b061007c submodule: teach set-url subcommand
460782b7be t7519-status-fsmonitor: improve comments
d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses
4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config
1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694)
f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0
762d5b4f46 help: add gitsubmodules to the list of guides
76a53d640f git_path(): handle `.lock` files correctly
3ce47211a6 t1400: wrap setup code in test case
44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string
6c02042139 clone: rename static function `dir_exists()`.
8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command
77200e9332 l10n: es: 2.24.0 round 2
e42df36b42 Merge branch 'l10n/it/update-italian-translation'
5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2
51728480fe l10n: fr v2.24.0 rnd2
045a548698 l10n: git.pot: v2.24.0 round 2 (1 new)
468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master
b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree()
c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit()
103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag()
f648ee7088 fsck: rename vague "oid" local variables
cc579000bf fsck: don't require an object struct in verify_headers()
7854399366 fsck: don't require an object struct for fsck_ident()
b8b00f1693 fsck: drop blob struct from fsck_finish()
6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob()
38370253fd fsck: don't require an object struct for report()
f59793763d fsck: only require an oid for skiplist functions
5afc4b1dc6 fsck: only provide oid/type in fsck_error callback
82ef89b318 fsck: don't require object structs for display functions
733902905d fsck: use oids rather than objects for object_name API
d40bbc109b fsck_describe_object(): build on our get_object_name() primitive
a59cfb3230 fsck: unify object-name code
23a173a761 fsck: require an actual buffer for non-blobs
2175a0c601 fsck: stop checking tag->tagged
ec65231571 fsck: stop checking commit->parent counts
1de6007d85 fsck: stop checking commit->tree value
228c78fbd4 commit, tag: don't set parsed bit for parse failures
60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()`
8b656572ca builtin/commit-graph.c: remove subcommand-less usage string
fa26d5ede6 t4048: abstract away SHA-1-specific constants
cf02be8486 t4045: make hash-size independent
38ee26b2a3 t4044: update test to work with SHA-256
37ab8ebef1 t4039: abstract away SHA-1-specific constants
0370b35414 t4038: abstract away SHA-1 specific constants
0253e126a2 t4034: abstract away SHA-1-specific constants
45e2ef2b1d t4027: make hash-size independent
79b0edc1a0 t4015: abstract away SHA-1-specific constants
840624ff55 t4011: abstract away SHA-1-specific constants
32a6707267 t4010: abstract away SHA-1-specific constants
440bf91dfa t3429: remove SHA1 annotation
0b408ca2bd t1305: avoid comparing extensions
2eabd38313 rev-parse: add a --show-object-format option
52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode
45e206f0d8 t4203: use test-lib.sh definitions
2ae4944aac t6006: use test-lib.sh definitions
cb99a34e23 commit-graph: fix writing first commit-graph during fetch
e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug
7b4fb434b4 documentation: remove empty doc files
566a1439f6 Git 2.24-rc1
04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix'
4d6fb2beeb Merge branch 'ds/feature-macros'
5f0b6ed907 Merge branch 'js/azure-ci-osx-fix'
c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs'
1b4f85285f Merge branch 'dl/submodule-set-branch'
c7aadccba0 fetch: delay fetch_if_missing=0 until after config
c11e9966cb repo-settings: read an int for index.version
091489d068 apply: respect merge.conflictStyle in --3way
aa76ae4905 t4108: demonstrate bug in apply
95806205cd t4108: use `test_config` instead of `git config`
b0069684d4 t4108: remove git command upstream of pipe
fa87b81385 t4108: replace create_file with test_write_lines
7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job
6c96630cb0 config: move documentation to config.h
d81542e6f3 Eleventh batch
e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix'
d45d771978 Merge branch 'bc/smart-http-atomic-push'
22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix'
2e215b7959 Merge branch 'sb/userdiff-dts'
e3cf08361a Merge branch 'sg/progress-fix'
b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix'
c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc'
f45f88b2e4 path.c: don't call the match function without value in trie_find()
c72fc40d09 path.c: clarify two field names in 'struct common_dir'
8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file
7cb8c929d7 path.c: clarify trie_find()'s in-code comment
e536b1fedf Documentation: mention more worktree-specific exceptions
680cba2c2b multi-pack-index: add [--[no-]progress] option.
64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack
ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file
8dc18f8937 midx: add progress to expire_midx_packs
840cef0c70 midx: add progress to write_midx_file
efbc3aee08 midx: add MIDX_PROGRESS flag
0eb3671ed9 ci(osx): use new location of the `perforce` cask
da1e295e00 t604[236]: do not run setup in separate tests
49b8133a9e merge-recursive: fix merging a subdirectory into the root directory
d3eebaad5e merge-recursive: clean up get_renamed_dir_portion()
80736d7c5e doc: am --show-current-patch gives an entire e-mail message
a8e2c0eadc t7419: change test_must_fail to ! for grep
19c29e538e t4014: make output-directory tests self-contained
12a4aeaad8 Merge branch 'js/azure-pipelines-msvc'
399c23c046 ci(visual-studio): actually run the tests in parallel
711cd6d15c ci(visual-studio): use strict compile flags, and optimization
370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0
cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master
907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master
13bcea8c7f l10n: fr 2.24.0 rnd 1
135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master
3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed)
8da56a4848 userdiff: fix some corner cases in dts regex
86795774bb builtin/blame.c: constants into bit shift format
feebd2d256 rebase: hide --preserve-merges option
0e40a73a4c Doc: Bundle file usage
78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error
12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error
c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error
2b6f6ea1bd test-progress: fix test failures on big-endian systems
f757409e36 l10n: bg.po: Updated Bulgarian translation (4693)
176f5adfdb completion: clarify installation instruction for zsh
d966095db0 Git 2.24-rc0
90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array'
3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth'
d0258d0944 Merge branch 'rs/http-push-simplify'
bb52def6da Merge branch 'jj/stash-reset-only-toplevel'
f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs'
e5fca6b573 Merge branch 'bb/compat-util-comment-fix'
43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup'
07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely'
2d74d28ee0 Merge branch 'dl/compat-cleanup'
9b83a94829 Merge branch 'ta/t1308-typofix'
376012c919 Merge branch 'js/doc-stash-save'
10da030ab7 grep: avoid leak of chartables in PCRE2
513f2b0bbd grep: make PCRE2 aware of custom allocator
57d4660468 grep: make PCRE1 aware of custom allocator
d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand
8af69cf3e2 t3301: test diagnose messages for too few/many paramters
6f1194246a remote-curl: pass on atomic capability to remote side
bbb13e8188 graph: fix coloring of octopus dashes
92beecc136 graph: flatten edges that fuse with their right neighbor
479db18bc0 graph: smooth appearance of collapsing edges on commit lines
0195285b95 graph: rename `new_mapping` to `old_mapping`
d62893ecc1 graph: commit and post-merge lines for left-skewed merges
0f0f389f12 graph: tidy up display of left-skewed merges
458152cce1 graph: example of graph output that can be simplified
ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state
46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()`
a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()`
9157a2a032 graph: reuse `find_new_column_by_commit()`
210179a20d graph: handle line padding in `graph_next_line()`
fbccf255f9 graph: automatically track display width of graph lines
5374a290aa fetch-pack: write fetched refs to .promisor
4627bc777e sequencer: run post-commit hook
49697cb721 move run_commit_hook() to libgit and use it there
12bb7a540a sequencer.h fix placement of #endif
6a619ca03c t3404: remove uneeded calls to set_fake_editor
b2dbacbddf t3404: set $EDITOR in subshell
88a92b6c73 t3404: remove unnecessary subshell
bf8e65b30b format-patch: teach --cover-from-description option
a92331df18 format-patch: use enum variables
46273df7bf format-patch: replace erroneous and condition
3b3c79f6c9 diff-highlight: fix a whitespace nit
108b97dc37 Ninth batch
cbe8cdd3a0 Merge branch 'jk/coc'
3b9ec27919 Merge branch 'js/trace2-fetch-push'
c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch'
1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup'
eb3de5b823 Merge branch 'js/xdiffi-comment-updates'
4e8371ec26 Merge branch 'dl/t0000-skip-test-test'
b6d712fa4e Merge branch 'tg/range-diff-output-update'
77458870a5 Merge branch 'gs/sq-quote-buf-pretty'
5efabc7ed9 Merge branch 'ew/hashmap'
d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files'
6ed610b968 Merge branch 'am/t0028-utf16-tests'
5b900fb812 Merge branch 'dl/octopus-graph-bug'
16d9d7184b Merge branch 'en/fast-imexport-nested-tags'
6d5291be45 Merge branch 'js/azure-pipelines-msvc'
ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd'
d96e31e390 Merge branch 'js/fetch-jobs'
280bd44551 Merge branch 'en/merge-recursive-cleanup'
062a309d36 remote-curl: use argv_array in parse_push()
a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes
5cc6a4be11 http-push: simplify deleting a list item
556895d0c8 stash: avoid recursive hard reset on submodules
b524f6b399 Merge branch 'ka/japanese-translation'
f6f3824b4e git-gui: improve Japanese translation
61f4b407d3 Merge branch 'py/readme'
1e6880fd06 git-gui: add a readme
edefc31873 format-patch: create leading components of output directory
68b69211b2 git-compat-util: fix documentation syntax
fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth()
e0479fa073 documentation: add tutorial for object walking
3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed
4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target
9cad1c4488 pthread.h: manually align parameter lists
8c1cfd58e3 t1308-config-set: fix a test that has a typo
57d8f4b4c7 doc(stash): clarify the description of `save`
08da6496b6 Eighth batch
07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup'
f0d407e6ae Merge branch 'kt/add-i-progress'
66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree'
a4c5d9f66e Merge branch 'rs/dedup-includes'
159cdabd87 Merge branch 'js/range-diff-noprefix'
93424f1f7d Merge branch 'cb/pcre1-cleanup'
a73f91774c Merge branch 'ab/pcre-jit-fixes'
4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword'
020011f2cb Merge branch 'tk/git-svn-trim-author-name'
676278f8ea Merge branch 'bc/object-id-part17'
aafb75452b Merge branch 'en/clean-nested-with-ignored'
3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails
5cdf2301d4 add a Code of Conduct document
70bf0b755a Seventh batch
9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat'
2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary'
d17f54947d Merge branch 'rs/convert-fix-utf-without-dash'
82c80f98e6 Merge branch 'py/git-gui-has-maintainer'
6e12570822 Merge branch 'ah/cleanups'
772cad0afb Merge branch 'js/diff-rename-force-stable-sort'
424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path'
678a9ca629 Merge branch 'as/shallow-slab-use-fix'
0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix'
042a54d251 Merge branch 'am/visual-studio-config-fix'
03d3b1297c xdiffi: fix typos and touch up comments
b05b40930e t0000: cover GIT_SKIP_TESTS blindspots
d8bc1a518a send-pack: never fetch when checking exclusions
756fb0dedb t4014: treat rev-list output as the expected value
2b6a9b13ca range-diff: don't segfault with mode-only changes
360c7ba330 transport: push codepath can take arbitrary repository
ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments
b657047719 merge-recursive: fix the fix to the diff3 common ancestor label
b744c3af07 Sixth batch
417056578a Merge branch 'bw/submodule-helper-usage-fix'
9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check'
1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a'
59b19bcd9f Merge branch 'cc/multi-promisor'
1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way'
5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort'
eb35c18e42 Merge branch 'sg/travis-help-debug'
cabb145fe3 Merge branch 'rs/alias-use-copy-array'
56c7ab0f4e Merge branch 'sg/t-helper-gitignore'
e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang'
583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules'
337e3f2b49 Merge branch 'rs/nth-switch-code-simplification'
8f53fe1733 Merge branch 'hb/hg-to-git-py3'
ef93bfbd45 Merge branch 'sg/progress-fix'
980351d1ac Merge branch 'js/doc-patch-text'
80693e3f09 Merge branch 'tb/commit-graph-harden'
ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge'
3f84633563 Merge branch 'dl/cocci-everywhere'
caf150ce7d Merge branch 'gs/commit-graph-progress'
1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim'
1398171378 Merge branch 'rs/commit-graph-use-list-count'
773521df26 Merge branch 'rs/nth-parent-parse'
7f17913161 Merge branch 'dl/submodule-set-branch'
cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix'
bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees'
098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack'
37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc'
e392382f95 Merge branch 'dl/complete-rebase-and-archive'
cda8faa37e Merge branch 'jk/commit-graph-cleanup'
36d2fca82b Merge branch 'ss/get-time-cleanup'
ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude'
ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob'
ba2d451122 Merge branch 'tg/stash-refresh-index'
e2b5038d87 hashmap_entry: remove first member requirement from docs
404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry
23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators
c8e424c9c9 hashmap: introduce hashmap_free_entries
8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry *
87571c3f71 hashmap: use *_entry APIs for iteration
939af16eac hashmap_cmp_fn takes hashmap_entry params
f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *"
f0e63c4113 hashmap: use *_entry APIs to wrap container_of
6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *"
973d5eea74 introduce container_of macro
26b455f21e hashmap_put takes "struct hashmap_entry *"
28ee794128 hashmap_remove takes "const struct hashmap_entry *"
b6c5241606 hashmap_get takes "const struct hashmap_entry *"
b94e5c1df6 hashmap_add takes "struct hashmap_entry *"
f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *"
d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *"
d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry
12878c8351 coccicheck: detect hashmap_entry.hash assignment
e010a41216 diff: use hashmap_entry_init on moved_entry.ent
f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo"
de5abb5f7a git-p4: auto-delete named temporary file
c90b652afd Fifth batch
f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1'
b0f8aed48f Merge branch 'ma/user-manual-markup-update'
faf5576a8d Merge branch 'bc/doc-use-docbook-5'
314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes'
70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo'
847650798b Merge branch 'am/mailmap-andrey-mazo'
1a155f2e66 Merge branch 'jc/git-gui-has-maintainer'
1bcef51204 t/oid-info: add empty tree and empty blob values
ecde49bb8a t/oid-info: allow looking up hash algorithm name
11a3d3aadd git-rev-list.txt: prune options in synopsis
7d2f003ee4 Documentation: update the location of the git-gui repo
b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding()
46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines
b35304bf95 ci: really use shallow clones on Azure Pipelines
ab7d854aba tests: let --immediate and --write-junit-xml play well together
be5d88e112 test-tool run-command: learn to run (parts of) the testsuite
5d65ad17a9 vcxproj: include more generated files
030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built
61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable()
e4347c9434 msvc: handle DEVELOPER=1
ed712ef8d5 msvc: ignore some libraries when linking
5b8f9e2417 compat/win32/path-utils.h: add #include guards
41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning
c097b95a26 msvc: avoid using minus operator on unsigned types
dfd557c978 stash apply: report status correctly even in a worktree's subdirectory
d54dea77db fetch: let --jobs=<n> parallelize --multiple, too
87db61a436 trace2: write discard message to sentinel files
83e57b04e6 trace2: discard new traces if target directory has too many files
11c21f22de t4214: demonstrate octopus graph coloring failure
25eb905e14 t4214: explicitly list tags in log
63be8c8dd7 t4214: generate expect in their own test cases
a7a5590c6e t4214: use test_merge
94ba151300 test-lib: let test_merge() perform octopus merges
22541013d0 docs: clarify trace2 version invariants
3d4548e7e2 docs: mention trace2 target-dir mode in git-config
2fe44394c8 treewide: remove duplicate #include directives
dbcd970c27 push: do not pretend to return `int` from `die_push_simple()`
941790d7de fast-export: handle nested tags
8d7d33c1ce t9350: add tests for tags of things other than a commit
a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags
208d69246e fast-export: add support for --import-marks-if-exists
b8f50e5b60 fast-import: add support for new 'alias' command
f73b2aba05 fast-import: allow tags to be identified by mark labels
3164e6bd24 fast-import: fix handling of deleted tags
8085050ab4 add -i: show progress counter in the prompt
69fdb922ad Merge branch 'bw/diff3-conflict-style'
b436825b9b git-gui: support for diff3 conflict style
937b76ed49 range-diff: internally force `diff.noprefix=true`
411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job
25e4b8099c push: add trace2 instrumentation
5fc31180d8 fetch: add trace2 instrumentation
53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value
c3b57dc2a0 git-gui: use existing interface to query a path's attribute
45ab460d4a Merge branch 'js/git-bash-if-available'
0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command
71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only)
54a80a9ad8 wrapper: use a loop instead of repetitive statements
baed6bbb5b diffcore-break: use a goto instead of a redundant if statement
8da02ce62a commit-graph: remove a duplicate assignment
ddb3c856f3 shallow.c: don't free unallocated slabs
8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits
65904b8b2b promisor-remote: skip move_to_tail when no-op
2049b8dc65 diffcore_rename(): use a stable sort
97fff61012 Move git_sort(), a stable sort, into into libgit.a
69f272b922 dir: special case check for the possibility that pathspec is NULL
6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available
bc12974a89 Fourth batch
5a5350940b Merge branch 'ds/commit-graph-on-fetch'
974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch'
9755f70fe6 Merge branch 'ds/include-exclude'
93fc8760e7 Merge branch 'jh/trace2-pretty-output'
640f9cd599 Merge branch 'dl/rebase-i-keep-base'
026428c35e Merge branch 'sg/clean-nested-repo-with-ignored'
21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip'
d693345518 Merge branch 'dl/use-sq-from-test-lib'
d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes'
2be6ccc01a Merge branch 'sg/git-test-boolean'
cf861cd7a0 Merge branch 'rs/get-tagged-oid'
91243b019d Merge branch 'en/filter-branch-deprecation'
9bc67b6658 Merge branch 'en/merge-options-ff-and-friends'
fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden'
cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option'
8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return'
3ff6af7753 Merge branch 'nd/switch-and-restore'
aadac067aa Merge branch 'tb/file-url-to-unc-path'
b57a88a5f1 Merge branch 'js/gitdir-at-unc-root'
6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path'
430439536b Merge branch 'rs/parse-tree-indirect'
991fd97b9a Merge branch 'jk/fast-import-history-bugfix'
74a39b9bcc Merge branch 'mh/notes-duplicate-entries'
37801f0665 Merge branch 'tb/banned-vsprintf-namefix'
21ce0b48f3 Merge branch 'mh/release-commit-memory-fix'
f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup'
bf6136cab8 Merge branch 'rs/strbuf-detach'
a2e22bb3ad Merge branch 'rs/trace2-dst-warning'
1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup'
0281733483 Merge branch 'bc/hash-independent-tests-part-5'
f06fb376ed Merge branch 'jc/test-cleanup'
00bb74453d Merge branch 'dl/compat-cleanup'
59438be06c Merge branch 'js/visual-studio'
cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone'
af2abd870b fast-export: fix exporting a tag and nothing else
c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor
dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit
fd5b820d9c user-manual.txt: change header notation
e79b34533a user-manual.txt: add missing section label
b503a2d515 Makefile: emulate compile in $(HCO) target better
af26e2a9d2 pack-bitmap.h: remove magic number
b06fdead04 promisor-remote.h: include missing header
97b989ee3a apply.h: include missing header
4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name
d928a8388a t0028: add more tests
0b63fd6965 t0028: fix test for UTF-16-LE-BOM
fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration
2e09c01232 name-rev: avoid cutoff timestamp underflow
8464f94aeb promisor-remote.h: drop extern from function declaration
75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp
24c681794f doc: MyFirstContribution: fix cmd placement instructions
c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode
60c60b627e Merge branch 'py/git-git-extra-stuff'
faf420e05a treewide: correct several "up-to-date" to "up to date"
b71c6c3b64 Fix build with core.autocrlf=true
16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff
26e3d1cbea .mailmap: update email address of Andrey Mazo
27ea41c0b4 t/helper: ignore only executable files
7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()
83e3ad3b12 merge-recursive: symlink's descendants not in way
34933d0eff stash: make sure to write refreshed cache
e080b34540 merge: use refresh_and_write_cache
22184497a3 factor out refresh_and_write_cache function
7371612255 commit-graph: add --[no-]progress to write and verify
47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW
253bfe49bd SubmittingPatches: git-gui has a new maintainer
d17ae00c97 hg-to-git: make it compatible with both python3 and python2
4c86140027 Third batch
f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http'
627b826834 Merge branch 'md/list-objects-filter-combo'
b9ac6c59b8 Merge branch 'cc/multi-promisor'
de67293e74 Merge branch 'sg/line-log-tree-diff-optim'
95486229e3 Merge branch 'sg/complete-configuration-variables'
f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook'
a2e524ecf3 Merge branch 'cb/curl-use-xmalloc'
128666753b Merge branch 'jk/drop-release-pack-memory'
917a319ea5 Merge branch 'js/rebase-r-strategy'
7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui
4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout()
0d4304c124 doc: fix reference to --ignore-submodules
af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py
8a3a6817e2 Merge gitk to pick up emergency build fix
2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po
9027af58e2 Makefile: run coccicheck on more source files
43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES)
5dedf7de53 Makefile: define THIRD_PARTY_SOURCES
902b90cf42 clean: fix theoretical path corruption
ca8b5390db clean: rewrap overly long line
09487f2cba clean: avoid removing untracked files in a nested git repository
e86bbcf987 clean: disambiguate the definition of -d
3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run
29b577b960 dir: add commentary explaining match_pathspec_item's return value
89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it
a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case
404ebceda0 dir: also check directories for matching pathspecs
a5e916c745 dir: fix off-by-one error in match_pathspec_item
bbbb6b0b89 dir: fix typo in comment
7541cc5302 t7300: add testcases showing failure to clean specified pathspecs
0eb7c37a8a diff, log doc: small grammer, format, and language fixes
6fae6bd518 diff, log doc: say "patch text" instead of "patches"
2bb74b53a4 Test the progress display
bbf47568ad Revert "progress: use term_clear_line()"
cf6a2d2557 Makefile: strip leading ./ in $(LIB_H)
b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup
689a146c91 commit-graph: use commit_list_count()
59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N"
a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N"
a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base"
cf34337f98 list-objects-filter: give a more specific error sparse parsing error
4c96a77594 list-objects-filter: delay parsing of sparse oid
72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter
83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer
7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>`
226daba280 Doc/Makefile: give mansource/-version/-manual attributes
40e747e89d git-submodule.txt: fix AsciiDoc formatting error
f6461b82b9 Documentation: fix build with Asciidoctor 2
3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
f7a8834ba4 Merge branch 'bp/amend-toggle-bind'
ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit"
9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes
d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog
beffae768a gitk: Add Chinese (zh_CN) translation
56d9cbe68b packfile: expose get_delta_base()
bab28d9f97 builtin/pack-objects: report reused packfile objects
6c8ec8c30a Merge branch 'bw/commit-scrollbuffer'
acfa495519 Merge branch 'bw/amend-checkbutton'
da08d559b7 git-gui: add horizontal scrollbar to commit buffer
ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton
aeeb978ba6 completion: teach archive to use __gitcomp_builtin
2b9bd488ae completion: teach rebase to use __gitcomp_builtin
d49dffde9a completion: add missing completions for log, diff, show
6abada1880 upload-pack: disable commit graph more gently for shallow traversal
fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time
72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set
4fd39c76e6 doc: minor formatting fix
29f4332e66 Quit passing 'now' to date code
c77abf0460 Merge branch 'py/revert-hunks-lines'
5a2bb62180 Merge branch 'bp/widget-focus-hotkeys'
e07446ed5f git-gui: add hotkeys to set widget focus
f981ec18cf cache-tree: do not lazy-fetch tentative tree
f1d4a28250 Second batch
c8ada15456 Merge branch 'bc/reread-attributes-during-rebase'
8f3ba423e7 Merge branch 'tg/t0021-racefix'
a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email'
d49c2c3466 Merge branch 'sb/userdiff-dts'
2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe'
4c49dd042d Merge branch 'nd/diff-parseopt'
d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix'
8ce8a63b46 Merge branch 'ds/midx-expire-repack'
9437394661 Merge branch 'cb/fetch-set-upstream'
af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix'
fa9e7934c7 Merge branch 'bm/repository-layout-typofix'
d1a251a1fa Merge branch 'en/checkout-mismerge-fix'
e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental'
f4f8dfe127 Merge branch 'ds/feature-macros'
4a12f89865 Merge branch 'jk/eoo'
b4a1eec332 Merge branch 'jk/repo-init-cleanup'
70336bd50a Merge branch 'py/git-gui-do-quit'
ad7c543e3b grep: skip UTF8 checks explicitly
0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration()
b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration
4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor
b7e1ba5649 git-merge-index.txt: wrap shell listing in "----"
38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----"
5371813768 git-ls-remote.txt: wrap shell listing in "----"
1925fe0c8a Documentation: wrap config listings in "----"
922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor
2017956a19 Documentation: wrap blocks with "--"
dd2e50a84e commit-graph: turn off save_commit_buffer
67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits
806278dead commit-graph.c: handle corrupt/missing trees
16749b8dd2 commit-graph.c: handle commit parsing errors
23424ea759 t/t5318: introduce failing 'git commit-graph write' tests
bf1e28e0ad builtin/rebase.c: Remove pointless message
d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing
bd482d6e33 t: use common $SQ variable
3a37876b5d pack-objects: drop packlist index_pos optimization
7e6b96c73b test-read-cache: drop namelen variable
e4b369069e diff-delta: set size out-parameter to 0 for NULL delta
7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint
f1cbd033e2 pack-objects: use object_id in packlist_alloc()
0dfed92dfd git-am: handle missing "author" when parsing commit
3960290675 ci: restore running httpd tests
6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests
c77722b3ea use get_tagged_oid()
dad3f0607b tag: factor out get_tagged_oid()
468ce99b77 unpack-trees: rename 'is_excluded_from_list()'
65edd96aec treewide: rename 'exclude' methods to 'pattern'
4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_'
caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list'
ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern'
483e861111 t9902: use a non-deprecated command for testing
9df53c5de6 Recommend git-filter-repo instead of git-filter-branch
7b6ad97939 t6006: simplify, fix, and optimize empty message test
50094ca45f config/format.txt: specify default value of format.coverLetter
c1a6f21cd4 Doc: add more detail for git-format-patch
854b5cb46a t4014: stop losing return codes of git commands
dd2b6b6860 t4014: remove confusing pipe in check_threading()
6bd26f58ea t4014: use test_line_count() where possible
c6ec6dadba t4014: let sed open its own files
f2e2fa8f60 t4014: drop redirections to /dev/null
460609cbd5 t4014: use indentable here-docs
92014b69bb t4014: remove spaces after redirect operators
0ab74e979c t4014: use sq for test case names
cb46c40662 t4014: move closing sq onto its own line
b562a54c01 t4014: s/expected/expect/
e770fbfeff t3005: remove unused variable
da280f5f1a t: use LF variable defined in the test harness
7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch
552fc5016f mingw: apply array.cocci rule
476998d05b t3427: accelerate this test by using fast-export and fast-import
aac6ff7b5b .gitignore: stop ignoring `.manifest` files
2c65d90f75 am: reload .gitattributes after patching it
1577dc0f7c tree: simplify parse_tree_indirect()
50f26bd035 fetch: add fetch.writeCommitGraph config setting
8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set
27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options
0a8bc7068f clarify documentation for remote helpers
80e3658647 help: make help_unknown_ref() NORETURN
313677627a checkout: add simple check for 'git checkout -b'
3441de5b9c gitk: Make web links clickable
a4fa2f0a4c git-gui: allow undoing last revert
414d924beb rebase: teach rebase --keep-base
6330209d7d rebase tests: test linear branch topology
4effc5bc96 rebase: fast-forward --fork-point in more cases
c0efb4c1dd rebase: fast-forward --onto in more cases
2b318aa6c3 rebase: refactor can_fast_forward into goto tower
c9efc21683 t3432: test for --no-ff's interaction with fast-forward
1ebec8dfc1 fast-import: duplicate into history rather than passing ownership
9756082b3c fast-import: duplicate parsed encoding string
86ae43da6a status: mention --skip for revert and cherry-pick
b1b16bba96 completion: add --skip for cherry-pick and revert
deaa65a754 completion: merge options for cherry-pick and revert
4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
793ac7e309 t3432: test rebase fast-forward behavior
359ecebc34 t3431: add rebase --fork-point tests
502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage
ff61681b46 grep: refactor and simplify PCRE1 support
8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1
1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning()
fd99c2dd9b grep: use return value of strbuf_detach()
82f51af345 log-tree: always use return value of strbuf_detach()
7e92756751 http: don't leak urlmatch_config.vars
9784f97321 commit: free the right buffer in release_commit_memory
ce17feb1b3 path: add a function to check for path suffix
60d198d022 banned.h: fix vsprintf()'s ban message
60fe477a0b notes: avoid potential use-after-free during insertion
779ad6641b notes: avoid leaking duplicate entries
4e1a641ee3 mingw: fix launching of externals from Unicode paths
5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly
e2683d51d9 Fix .git/ discovery at the root of UNC shares
d17f2124a7 setup_git_directory(): handle UNC paths correctly
ebb8d2c90f mingw: support UNC in git clone file://server/share/repo
0c37c41d13 t4009: make hash size independent
c1f3dfcc23 t4002: make hash independent
8cc5ff83c3 t4000: make hash size independent
c784815073 t3903: abstract away SHA-1-specific constants
2ccdfb1c78 git-gui: return early when patch fails to apply
62bd99934b git-gui: allow reverting selected hunk
5f0a516de9 git-gui: allow reverting selected lines
fddf2ebe38 transport: teach all vtables to allow fetch first
ac3fda82bf transport-helper: skip ls-refs if unnecessary
745f681289 First batch after Git 2.23
d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg'
22e86e85cb Merge branch 'en/fast-import-merge-doc'
9c7573581c Merge branch 'jk/perf-no-dups'
4336fdb2ef Merge branch 'rs/nedalloc-fixlets'
8ae7a46c4d Merge branch 'sg/show-failed-test-names'
6ba06b582b Merge branch 'sg/commit-graph-validate'
072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix'
207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix'
77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests'
1b01cdbf2e Merge branch 'jk/tree-walk-overflow'
8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix'
307179732d Merge branch 'mt/grep-submodules-working-tree'
58166c2e9d t0021: make sure clean filter runs
8b3f33ef11 ref-filter: initialize empty name or email fields
3c81760bc6 userdiff: add a builtin pattern for dts files
fe49814409 t4014: drop unnecessary blank lines from test cases
a2bb801f6a line-log: avoid unnecessary full tree diffs
eef5204190 line-log: extract pathspec parsing from line ranges into a helper function
a63694f523 diff: skip GITLINK when lazy fetching missing objs
7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe
19800bdc3f parseopt: move definition of enum parse_opt_result up
415b770b88 packfile.h: drop extern from function declaration
acb49d1cc8 t3800: make hash-size independent
ca6ba94200 t3600: make hash size independent
19ce5496c2 t3506: make hash independent
9a6738c061 t3430: avoid hard-coded object IDs
4dd1b5f90f t3404: abstract away SHA-1-specific constants
b99bfc7a6c t3306: abstract away SHA-1-specific constants
e3e9d02e35 t3305: make hash size independent
b408cf8cf6 t3301: abstract away SHA-1-specific constants
b561edd213 t3206: abstract away hash size constants
a5f61c7d13 t3201: abstract away SHA-1-specific constants
1c24a54ea4 repository-layout.txt: correct pluralization of 'object'
b0a3186140 sequencer: simplify root commit creation
a47ba3c777 rebase -i: check for updated todo after squash and reword
450efe2d53 rebase -i: always update HEAD before rewording
c581e4a749 grep: under --debug, show whether PCRE JIT is enabled
aaa95dfa05 midx: switch to using the_hash_algo
be8e172e9f builtin/show-index: replace sha1_to_hex
3f34d70d40 rerere: replace sha1_to_hex
fc06be3b7f builtin/receive-pack: replace sha1_to_hex
69fa337060 builtin/index-pack: replace sha1_to_hex
3a4d7aa5ae packfile: replace sha1_to_hex
e0cb7cdb89 wt-status: convert struct wt_status to object_id
8d4d86b0f0 cache: remove null_sha1
f6ca67d673 builtin/worktree: switch null_sha1 to null_oid
dd336a5511 builtin/repack: write object IDs of the proper length
894c0f66bb pack-write: use hash_to_hex when writing checksums
4439c7a360 sequencer: convert to use the_hash_algo
95518faac1 bisect: switch to using the_hash_algo
e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo
fe9fec45f6 config: use the_hash_algo in abbrev comparison
976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
703d2d4193 bundle: switch to use the_hash_algo
9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo
7962e046ff show-index: switch hard-coded constants to the_hash_algo
fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ
7e0d029f18 builtin/rev-parse: switch to use the_hash_algo
319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo
fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo
f6af19a9ad fetch-pack: use parse_oid_hex
36261e42ec patch-id: convert to use the_hash_algo
28ba1830d0 builtin/replace: make hash size independent
24bc1a1292 pull, fetch: add --set-upstream option
71d41ff651 archive-tar: turn length miscalculation warning into BUG
17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header()
82a46af13e archive-tar: fix pax extended header length calculation
4060c1990a archive-tar: report wrong pax extended header length
4615a8cb5b merge-recursive: alphabetize include list
45ef16f77a merge-recursive: add sanity checks for relevant merge_options
f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
5bf7e5779e merge-recursive: split internal fields into a separate struct
e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output
a779fb829b merge-recursive: comment and reorder the merge_options fields
8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options
7c0a6c8e47 merge-recursive: move some definitions around to clean up the header
c749ab1da8 merge-recursive: rename merge_options argument to opt in header
bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity
ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list
4d7101e25c merge-recursive: fix some overly long lines
724dd767b2 cache-tree: share code between functions writing an index as a tree
345480d1ed merge-recursive: don't force external callers to do our logging
b4db8a2b76 merge-recursive: remove useless parameter in merge_trees()
98a1d3d888 merge-recursive: exit early if index != head
9822175d2b Ensure index matches head before invoking merge machinery, round N
10f751c06b merge-recursive: remove another implicit dependency on the_repository
f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks
8e01251694 merge-recursive: introduce an enum for detect_directory_renames values
743474cbfa merge-recursive: provide a better label for diff3 common ancestor
51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u)
5bace62582 l10n: Update Catalan translation
139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()
65c01c6442 checkout: provide better conflict hunk description with detached HEAD
d8523ca1b9 merge-recursive: be consistent with assert
acb7da05ac checkout: remove duplicate code
93b980e58f http: use xmalloc with cURL
64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental
aaf633c2ad repo-settings: create feature.experimental setting
c6cc4c5afd repo-settings: create feature.manyFiles setting
ad0fb65999 repo-settings: parse core.untrackedCache
31b1de6a09 commit-graph: turn on commit-graph by default
b068d9a250 t6501: use 'git gc' in quiet mode
7211b9e753 repo-settings: consolidate some config settings
507e5470a0 worktree remove: clarify error message on dirty worktree
5af9d5f6c8 completion: complete config variables and values for 'git clone --config='
88cd790d6a completion: complete config variables names and values for 'git clone -c'
dd33472831 completion: complete values of configuration variables after 'git -c var='
e1e00089da completion: complete configuration sections and variable names for 'git -c'
42d0efec59 completion: split _git_config()
d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp()
2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names
d9438873c4 completion: deduplicate configuration sections
7a09a8f093 completion: add tests for 'git config' completion
840d7e5b3c completion: complete more values of more 'color.*' configuration variables
08a12175d8 completion: fix a typo in a comment
9827d4c185 packfile: drop release_pack_memory()
d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed
362f8b280c t/perf: rename duplicate-numbered test script
742ed63345 trace2: cleanup whitespace in perf format
e34430556c trace2: cleanup whitespace in normal format
c2b890aca5 quote: add sq_append_quote_argv_pretty()
ad43e37839 trace2: trim trailing whitespace in normal format error message
04f10d332f trace2: remove dead code in maybe_add_string_va()
da4589ce7e trace2: trim whitespace in region messages in perf target format
0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit
5440eb0ea2 git-gui: call do_quit before destroying the main window
bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook
6098817fd7 git-merge: honor pre-merge-commit hook
a1f3dd7eb3 merge: do no-verify like commit
f78f6c7e0c t7503: verify proper hook execution
70597e8386 nedmalloc: avoid compiler warning about unused value
c9b9c09dae nedmalloc: do assignments only after the declaration section
22932d9169 config: stop checking whether the_repository is NULL
5732f2b1ef common-main: delay trace2 initialization
58ebccb478 t1309: use short branch name in includeIf.onbranch test
67feca3b1c gitcli: document --end-of-options
51b4594b40 parse-options: allow --end-of-options as a synonym for "--"
19e8789b23 revision: allow --end-of-options to end option parsing
ffe1afe67c tests: show the test name and number at the start of verbose output
96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests
7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits'
39d8831856 commit-graph: turn a group of write-related macro flags into an enum
9916073be5 t5318-commit-graph: use 'test_expect_code'
620c09e1b6 restore: add test for deleted ita files
ecd72042de checkout.c: unstage empty deleted ita files
a613d4f817 pack-refs: always refresh after taking the lock file
decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd'
371df1bea9 trace2: cleanup column alignment in perf target format
5aa02f9868 tree-walk: harden make_traverse_path() length computations
c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path()
b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len()
37806080d7 tree-walk: use size_t consistently
7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh'
12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh'
9055384710 tree-walk: drop oid from traverse_info
947208b725 setup_traverse_info(): stop copying oid
e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
a63f990d92 t3418: test `rebase -r` with merge strategies
5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges`
e145d99347 rebase -r: support merge strategies other than `recursive`
4e6023b13a t3427: fix another incorrect assumption
f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced
a9c71073da t3427: fix erroneous assumption
b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three
d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case
c248d32cdb t3427: simplify the `setup` test case significantly
8c1e24048a t3427: add a clarifying comment
5efed0ecf9 rebase: fold git-rebase--common into the -p backend
68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone
2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive`
6180b20239 t3400: stop referring to the scripted rebase
d5b581f228 Drop unused git-rebase--am.sh
814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation
6a289d45c0 grep: fix worktree case in submodules
870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching
8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data
09872f6418 grep: create a "is_fixed" member in "grep_pat"
8a35b540a9 grep: consistently use "p->fixed" in compile_regexp()
685668faaa grep: stop using a custom JIT stack with PCRE v1
34489239d0 grep: stop "using" a custom JIT stack with PCRE v2
04bef50c01 grep: remove overly paranoid BUG(...) code
b65abcafc7 grep: use PCRE v2 for optimized fixed-string search
48de2a768c grep: remove the kwset optimization
45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern>
25754125ce grep: make the behavior for NUL-byte in patterns sane
d316af059d grep tests: move binary pattern tests into their own file
471dac5d2c grep tests: move "grep binary" alongside the rest
f463beb805 grep: inline the return value of a function call used only once
b14cf112e2 t4210: skip more command-line encoding tests on MinGW
44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
4e2443b181 log tests: test regex backends in "--encode=<enc>" tests
90d21f9ebf list-objects-filter-options: make parser void
5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW
489fc9ee71 list-objects-filter-options: allow mult. --filter
c2694952e3 strbuf: give URL-encoding API a char predicate fn
cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list
f56f764279 list-objects-filter-options: move error check up
e987df5fe6 list-objects-filter: implement composite filters
842b00516a list-objects-filter-options: always supply *errbuf
7a7c7f4a6d list-objects-filter: put omits set in filter struct
9430147ca0 list-objects-filter: encapsulate filter components
4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c
60b7a92d84 Move repository_format_partial_clone to promisor-remote.c
db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
75de085211 remote: add promisor and partial clone config to the doc
7e154badc0 partial-clone: add multiple remotes in the doc
9a4c507886 t0410: test fetching from many promisor remotes
5e46139376 builtin/fetch: remove unique promisor remote limitation
fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter
b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote()
faf2abf496 promisor-remote: use repository_format_partial_clone
9cfebc1f3b promisor-remote: add promisor_remote_reinit()
9e27beaa23 promisor-remote: implement promisor_remote_get_direct()
48de315817 Add initial support for many promisor remotes
2e860675b6 fetch-object: make functions return an error code
c59c7c879e t0410: remove pipes after git commands
git-subtree-dir: third_party/git
git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
2020-05-22 18:46:45 +02:00
|
|
|
msgid "inconsistent header lines %d and %d"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:1372
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"git diff header lacks filename information when removing %d leading pathname "
|
|
|
|
|
"component (line %d)"
|
|
|
|
|
msgid_plural ""
|
|
|
|
|
"git diff header lacks filename information when removing %d leading pathname "
|
|
|
|
|
"components (line %d)"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:1385
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "git diff header lacks filename information (line %d)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:1481
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "recount: unexpected line: %.*s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: apply.c:1550
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "patch fragment without header at line %d: %.*s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: apply.c:1753
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "new file depends on old contents"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:1755
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "deleted file still has contents"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:1789
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "corrupt patch at line %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:1826
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "new file %s depends on old contents"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:1828
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "deleted file %s still has contents"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:1831
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "** warning: file %s becomes empty but is not deleted"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:1978
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "corrupt binary patch at line %d: %.*s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:2015
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized binary patch at line %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:2177
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "patch with only garbage at line %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:2263
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to read symlink %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:2267
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to open or read %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:2936
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid start of line: '%c'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3057
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Hunk #%d succeeded at %d (offset %d line)."
|
|
|
|
|
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3069
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3075
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"while searching for:\n"
|
|
|
|
|
"%.*s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3097
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "missing binary patch data for '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3105
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3152
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot apply binary patch to '%s' without full index line"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3163
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"the patch applies to '%s' (%s), which does not match the current contents."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3171
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "the patch applies to an empty '%s' but it is not empty"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3189
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "the necessary postimage %s for '%s' cannot be read"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3202
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "binary patch does not apply to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3209
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3230
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "patch failed: %s:%ld"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3353
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot checkout %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to read %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3413
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "reading from '%s' beyond a symbolic link"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3442 apply.c:3685
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "path %s has been renamed/deleted"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3528 apply.c:3700
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: does not exist in index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3537 apply.c:3708 apply.c:3953
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: does not match index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3572
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "repository lacks the necessary blob to fall back on 3-way merge."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3575
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Falling back to three-way merge...\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3591 apply.c:3595
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot read the current contents of '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3607
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to fall back on three-way merge...\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3621
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Applied patch to '%s' with conflicts.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3626
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Applied patch to '%s' cleanly.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3652
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "removal patch leaves file contents"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3725
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: wrong type"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3727
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s has type %o, expected %o"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858
|
|
|
|
|
#: read-cache.c:1313
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid path '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3950
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: already exists in index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3956
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: already exists in working directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3976
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "new mode (%o) of %s does not match old mode (%o)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:3981
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4001
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "affected file '%s' is beyond a symbolic link"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4005
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: patch does not apply"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4020
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Checking patch %s..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4112
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "sha1 information is lacking or useless for submodule %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4119
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "mode change for %s, which is not in current HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4122
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "sha1 information is lacking or useless (%s)."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4131
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not add %s to temporary index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4141
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not write temporary index to %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4279
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to remove %s from index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4313
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "corrupt patch for submodule %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4319
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to stat newly created file '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4327
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to create backing store for newly created file %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4333 apply.c:4478
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to add cache entry for %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4376 builtin/bisect--helper.c:537
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to write to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4380
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "closing file '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4450
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to write file '%s' mode %o"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4548
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Applied patch %s cleanly."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4556
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "internal error"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4559
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Applying patch %%s with %d reject..."
|
|
|
|
|
msgid_plural "Applying patch %%s with %d rejects..."
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4570
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "truncating .rej filename to %.*s.rej"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot open %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4592
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Hunk #%d applied cleanly."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4596
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Rejected hunk #%d."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4715
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Skipped patch '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4723
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unrecognized input"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4743
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to read index file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4900
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "can't open patch '%s': %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4927
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "squelched %d whitespace error"
|
|
|
|
|
msgid_plural "squelched %d whitespace errors"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4933 apply.c:4948
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%d line adds whitespace errors."
|
|
|
|
|
msgid_plural "%d lines add whitespace errors."
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4941
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%d line applied after fixing whitespace errors."
|
|
|
|
|
msgid_plural "%d lines applied after fixing whitespace errors."
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Unable to write new index file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4985
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "don't apply changes matching the given path"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4988
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "apply changes matching the given path"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4990 builtin/am.c:2279
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "num"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4991
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "remove <num> leading slashes from traditional diff paths"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4994
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ignore additions made by the patch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:4996
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "instead of applying the patch, output diffstat for the input"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5000
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show number of added and deleted lines in decimal notation"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5002
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "instead of applying the patch, output a summary for the input"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5004
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "instead of applying the patch, see if the patch is applicable"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5006
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "make sure the patch is applicable to the current index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5008
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "mark new files with `git add --intent-to-add`"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5010
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "apply a patch without touching the working tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5012
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "accept a patch that touches outside the working area"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5015
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "also apply the patch (use with --stat/--summary/--check)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5017
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "attempt three-way merge if a patch does not apply"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5019
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "build a temporary index based on embedded index information"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "paths are separated with NUL character"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5024
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ensure at least <n> lines of context match"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98
|
2020-01-12 00:36:56 +01:00
|
|
|
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3562 builtin/rebase.c:1340
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "action"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5026
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "detect new or modified lines that have whitespace errors"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5029 apply.c:5032
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ignore changes in whitespace when finding context"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5035
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "apply the patch in reverse"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5037
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "don't expect at least one line of context"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5039
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "leave the rejected hunks in corresponding *.rej files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5041
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "allow overlapping hunks"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22
|
|
|
|
|
#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775
|
|
|
|
|
#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "be verbose"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5044
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "tolerate incorrectly detected missing new-line at the end of file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5047
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not trust the line counts in the hunk headers"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5049 builtin/am.c:2267
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "root"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: apply.c:5050
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "prepend <root> to all filenames"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive-tar.c:125 archive-zip.c:345
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot stream blob %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: archive-tar.c:265 archive-zip.c:358
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unsupported file mode: 0%o (SHA1: %s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: archive-tar.c:449
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to start '%s' filter"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: archive-tar.c:452
|
|
|
|
|
msgid "unable to redirect descriptor"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: archive-tar.c:459
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' filter reported error"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: archive-zip.c:318
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "path is not valid UTF-8: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: archive-zip.c:322
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "path too long (%d chars, SHA1: %s): %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "deflate error (%d)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: archive-zip.c:603
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "timestamp too large for this system: %<PRIuMAX>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-01-12 00:36:56 +01:00
|
|
|
#: archive.c:14
|
|
|
|
|
msgid "git archive [<options>] <tree-ish> [<path>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: archive.c:15
|
|
|
|
|
msgid "git archive --list"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: archive.c:16
|
|
|
|
|
msgid ""
|
|
|
|
|
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: archive.c:17
|
|
|
|
|
msgid "git archive --remote <repo> [--exec <cmd>] --list"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:192
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot read %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852
|
|
|
|
|
#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786
|
|
|
|
|
#: builtin/merge.c:1124
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not read '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "pathspec '%s' did not match any files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:454
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no such ref: %.*s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:460
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "not a valid object name: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:473
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "not a tree object: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:485
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "current working directory is untracked"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:526
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "File not found: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: archive.c:528
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Not a regular file: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: archive.c:553
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "fmt"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:553
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "archive format"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:554 builtin/log.c:1760
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "prefix"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:555
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "prepend prefix to each pathname in the archive"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888
|
|
|
|
|
#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133
|
|
|
|
|
#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
|
|
|
|
|
#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105
|
|
|
|
|
#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412
|
|
|
|
|
#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:557
|
|
|
|
|
msgid "add untracked file to archive"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: archive.c:560 builtin/archive.c:90
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "write the archive to this file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:562
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "read .gitattributes in working directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:563
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "report archived files on stderr"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:564
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "store only"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:565
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "compress faster"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:573
|
|
|
|
|
msgid "compress better"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:576
|
|
|
|
|
msgid "list supported archive formats"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
|
|
|
|
|
#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
|
|
|
|
|
msgid "repo"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:579 builtin/archive.c:92
|
|
|
|
|
msgid "retrieve the archive from remote repository <repo>"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715
|
|
|
|
|
#: builtin/notes.c:498
|
|
|
|
|
msgid "command"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:581 builtin/archive.c:94
|
|
|
|
|
msgid "path to the remote git-upload-archive command"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:588
|
|
|
|
|
msgid "Unexpected option --remote"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:590
|
|
|
|
|
msgid "Option --exec can only be used together with --remote"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:592
|
|
|
|
|
msgid "Unexpected option --output"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:594
|
|
|
|
|
msgid "Options --add-file and --remote cannot be used together"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:616
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Unknown archive format '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: archive.c:623
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Argument not supported for format '%s': -%d"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: attr.c:212
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%.*s is not a valid attribute name"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: attr.c:369
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s not allowed: %s:%d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: attr.c:409
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Negative patterns are ignored in git attributes\n"
|
|
|
|
|
"Use '\\!' for literal leading exclamation."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bisect.c:476
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Badly quoted content in file '%s': %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bisect.c:686
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "We cannot bisect more!\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bisect.c:753
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Not a valid commit name %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bisect.c:778
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The merge base %s is bad.\n"
|
|
|
|
|
"This means the bug has been fixed between %s and [%s].\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bisect.c:783
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The merge base %s is new.\n"
|
|
|
|
|
"The property has changed between %s and [%s].\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bisect.c:788
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The merge base %s is %s.\n"
|
|
|
|
|
"This means the first '%s' commit is between %s and [%s].\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bisect.c:796
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Some %s revs are not ancestors of the %s rev.\n"
|
|
|
|
|
"git bisect cannot work properly in this case.\n"
|
|
|
|
|
"Maybe you mistook %s and %s revs?\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bisect.c:809
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"the merge base between %s and [%s] must be skipped.\n"
|
|
|
|
|
"So we cannot be sure the first %s commit is between %s and %s.\n"
|
|
|
|
|
"We continue anyway."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bisect.c:848
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Bisecting: a merge base must be tested\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bisect.c:898
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "a %s revision is needed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not create file '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bisect.c:974 builtin/merge.c:150
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not read file '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bisect.c:1014
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "reading bisect refs failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bisect.c:1044
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s was both %s and %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bisect.c:1053
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"No testable commit found.\n"
|
|
|
|
|
"Maybe you started with bad path parameters?\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bisect.c:1082
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "(roughly %d step)"
|
|
|
|
|
msgid_plural "(roughly %d steps)"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
|
|
|
|
|
#. steps)" translation.
|
|
|
|
|
#.
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bisect.c:1088
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Bisecting: %d revision left to test after this %s\n"
|
|
|
|
|
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: blame.c:2778
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--contents and --reverse do not blend well."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: blame.c:2792
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot use --contents with final commit object name"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: blame.c:2813
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--reverse and --first-parent together require specified latest commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105
|
|
|
|
|
#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404
|
|
|
|
|
#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319
|
|
|
|
|
#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395
|
|
|
|
|
#: builtin/shortlog.c:320
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "revision walk setup failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: blame.c:2840
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"--reverse --first-parent together require range along first-parent chain"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: blame.c:2851
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no such path %s in %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: blame.c:2862
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot read blob %s for path %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:53
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"After fixing the error cause you may try to fix up\n"
|
|
|
|
|
"the remote tracking information by invoking\n"
|
|
|
|
|
"\"git branch --set-upstream-to=%s%s%s\"."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:67
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Not setting branch %s as its own upstream."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:93
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:94
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:98
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:99
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Branch '%s' set up to track local branch '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:104
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:105
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Branch '%s' set up to track remote ref '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:109
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:110
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Branch '%s' set up to track local ref '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:119
|
|
|
|
|
msgid "Unable to write upstream branch configuration"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:156
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Not tracking: ambiguous information for ref %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:189
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a valid branch name."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:208
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "A branch named '%s' already exists."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:213
|
|
|
|
|
msgid "Cannot force update the current branch."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:233
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:235
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "the requested upstream branch '%s' does not exist"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:237
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"If you are planning on basing your work on an upstream\n"
|
|
|
|
|
"branch that already exists at the remote, you may need to\n"
|
|
|
|
|
"run \"git fetch\" to retrieve it.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"If you are planning to push out a new local branch that\n"
|
|
|
|
|
"will track its remote counterpart, you may want to use\n"
|
|
|
|
|
"\"git push -u\" to set the upstream config as you push."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:281
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Not a valid object name: '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:301
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Ambiguous object name: '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: branch.c:306
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Not a valid branch point: '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: branch.c:365
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is already checked out at '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: branch.c:388
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "HEAD of working tree %s is not updated"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bundle.c:41
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized bundle hash algorithm: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: bundle.c:45
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown capability '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: bundle.c:71
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "'%s' does not look like a v2 or v3 bundle file"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bundle.c:110
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized header: %s%s (%d)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142
|
|
|
|
|
#: builtin/commit.c:814
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not open '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bundle.c:189
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Repository lacks these prerequisite commits:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bundle.c:192
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "need a repository to verify a bundle"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bundle.c:243
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "The bundle contains this ref:"
|
|
|
|
|
msgid_plural "The bundle contains these %d refs:"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bundle.c:250
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "The bundle records a complete history."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bundle.c:252
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "The bundle requires this ref:"
|
|
|
|
|
msgid_plural "The bundle requires these %d refs:"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bundle.c:319
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to dup bundle descriptor"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bundle.c:326
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Could not spawn pack-objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bundle.c:337
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pack-objects died"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bundle.c:379
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "rev-list died"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bundle.c:428
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "ref '%s' is excluded by the rev-list options"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bundle.c:498
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "unsupported bundle version %d"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bundle.c:500
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "cannot write bundle version %d with algorithm %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "unrecognized argument: %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bundle.c:530
|
|
|
|
|
msgid "Refusing to create empty bundle."
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bundle.c:540
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "cannot create '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: bundle.c:565
|
|
|
|
|
msgid "index-pack died"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: color.c:329
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "invalid color value: %.*s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:188 midx.c:46
|
|
|
|
|
msgid "invalid hash version"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:246
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "commit-graph file is too small"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:311
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "commit-graph signature %X does not match signature %X"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:318
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "commit-graph version %X does not match version %X"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:325
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "commit-graph hash version %X does not match version %X"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:342
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "commit-graph file is too small to hold %u chunks"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:361
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "commit-graph improper chunk offset %08x%08x"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:433
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "commit-graph chunk id %08x appears multiple times"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:499
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "commit-graph has no base graphs chunk"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:509
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "commit-graph chain does not match"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:557
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid commit-graph chain: line '%s' not a hash"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:581
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to find all commit-graph files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:721 commit-graph.c:785
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "invalid commit position. commit-graph is likely corrupt"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:742
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not find commit %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:1042 builtin/am.c:1306
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to parse commit %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: commit-graph.c:1265 builtin/pack-objects.c:2864
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to get type of object %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:1301
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Loading known commits in commit graph"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:1318
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Expanding reachable commits in commit graph"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:1338
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Clearing commit marks in commit graph"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:1357
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Computing commit graph generation numbers"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:1424
|
|
|
|
|
msgid "Computing commit changed paths Bloom filters"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: commit-graph.c:1501
|
|
|
|
|
msgid "Collecting referenced commits"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: commit-graph.c:1526
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Finding commits for commit graph in %d pack"
|
|
|
|
|
msgid_plural "Finding commits for commit graph in %d packs"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:1539
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "error adding pack %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:1543
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "error opening index for %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:1582
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Finding commits for commit graph among packed objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:1597
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Counting distinct commits in commit graph"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:1629
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Finding extra edges in commit graph"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:1678
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "failed to write correct number of base graph ids"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:1720 midx.c:826
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to create leading directories of %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:1733
|
|
|
|
|
msgid "unable to create temporary graph layer"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: commit-graph.c:1738
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "unable to adjust shared permissions for '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:1808
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Writing out commit graph in %d pass"
|
|
|
|
|
msgid_plural "Writing out commit graph in %d passes"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:1853
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to open commit-graph chain file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:1869
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "failed to rename base commit-graph file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:1889
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "failed to rename temporary commit-graph file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:2015
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Scanning merged commits"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:2026
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unexpected duplicate commit id %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:2049
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Merging commit-graph"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:2259
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "the commit graph format cannot write %d commits"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:2270
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "too many commits to write graph"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:2363
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:2373
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "commit-graph has incorrect OID order: %s then %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:2383 commit-graph.c:2398
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:2390
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to parse commit %s from commit-graph"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:2408
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Verifying commits in commit graph"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:2423
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to parse commit %s from object database for commit-graph"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:2430
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "root tree OID for commit %s in commit-graph is %s != %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:2440
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "commit-graph parent list for commit %s is too long"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:2449
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "commit-graph parent for %s is %s != %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:2463
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "commit-graph parent list for commit %s terminates early"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:2468
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:2472
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:2488
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "commit-graph generation for commit %s is %u != %u"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit-graph.c:2494
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417
|
|
|
|
|
#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not parse %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: commit.c:54
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s %s is not a commit!"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: commit.c:194
|
|
|
|
|
msgid ""
|
|
|
|
|
"Support for <GIT_DIR>/info/grafts is deprecated\n"
|
|
|
|
|
"and will be removed in a future Git version.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Please use \"git replace --convert-graft-file\"\n"
|
|
|
|
|
"to convert the grafts into replace refs.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Turn this message off by running\n"
|
|
|
|
|
"\"git config advice.graftFileDeprecated false\""
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: commit.c:1172
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: commit.c:1176
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Commit %s has a bad GPG signature allegedly by %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: commit.c:1179
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Commit %s does not have a GPG signature."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: commit.c:1182
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Commit %s has a good GPG signature by %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: commit.c:1436
|
|
|
|
|
msgid ""
|
|
|
|
|
"Warning: commit message did not conform to UTF-8.\n"
|
|
|
|
|
"You may want to amend it after fixing the message, or set the config\n"
|
|
|
|
|
"variable i18n.commitencoding to the encoding your project uses.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-01-12 00:36:56 +01:00
|
|
|
#: compat/obstack.c:406 compat/obstack.c:408
|
|
|
|
|
msgid "memory exhausted"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:125
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"exceeded maximum include depth (%d) while including\n"
|
|
|
|
|
"\t%s\n"
|
|
|
|
|
"from\n"
|
|
|
|
|
"\t%s\n"
|
|
|
|
|
"This might be due to circular includes."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:141
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not expand include path '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:152
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "relative config includes must come from files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:198
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "relative config include conditionals must come from files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:378
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "key does not contain a section: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:384
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "key does not contain variable name: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:408 sequencer.c:2547
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid key: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:414
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid key (newline): %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:450 config.c:462
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bogus config parameter: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:497
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bogus format in %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:836
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad config line %d in blob %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:840
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad config line %d in file %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:844
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad config line %d in standard input"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:848
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad config line %d in submodule-blob %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:852
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad config line %d in command line %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:856
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad config line %d in %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:993
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "out of range"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:993
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "invalid unit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:994
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad numeric config value '%s' for '%s': %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1013
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1016
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1019
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1022
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1025
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1028
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad numeric config value '%s' for '%s' in %s: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1123
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to expand user dir in: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1132
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' for '%s' is not a valid timestamp"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1223
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "abbrev length out of range: %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1237 config.c:1248
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad zlib compression level %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1340
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "core.commentChar should only be one character"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1373
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid mode for object creation: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1445
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "malformed value for %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1471
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "malformed value for %s: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1472
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "must be one of nothing, matching, simple, upstream or current"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1533 builtin/pack-objects.c:3649
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad pack compression level %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1655
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to load config blob object '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1658
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "reference '%s' does not point to a blob"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1675
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to resolve config blob '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1705
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to parse %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:1759
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to parse command-line config"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:2122
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unknown error occurred while reading the configuration files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:2296
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid %s: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:2341
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:2387
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to parse '%s' from command-line config"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:2389
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad config variable '%s' in file '%s' at line %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:2470
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid section name '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:2502
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s has multiple values"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:2531
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to write new configuration file %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:2783 config.c:3107
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not lock config file %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:2794
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "opening %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:2829 builtin/config.c:354
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid pattern: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:2854
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid config file %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:2867 config.c:3120
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "fstat on %s failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:2878
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to mmap '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:2887 config.c:3125
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "chmod on %s failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:2972 config.c:3222
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not write config file %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:3006
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not set '%s' to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not unset '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:3098
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid section name: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: config.c:3265
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "missing value for '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: connect.c:61
|
|
|
|
|
msgid "the remote end hung up upon initial contact"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: connect.c:63
|
|
|
|
|
msgid ""
|
|
|
|
|
"Could not read from remote repository.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Please make sure you have the correct access rights\n"
|
|
|
|
|
"and the repository exists."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: connect.c:81
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "server doesn't support '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:118
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "server doesn't support feature '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:129
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "expected flush after capabilities"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:263
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "ignoring capabilities after first line '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:284
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "protocol error: unexpected capabilities^{}"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:306
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "protocol error: expected shallow sha-1, got '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:308
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "repository on the other end cannot be shallow"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:347
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "invalid packet"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:367
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "protocol error: unexpected '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:473
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown object format '%s' specified by server"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: connect.c:500
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid ls-refs response: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:504
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "expected flush after ref listing"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:507
|
|
|
|
|
msgid "expected response end packet after ref listing"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: connect.c:640
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "protocol '%s' is not supported"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:691
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to set SO_KEEPALIVE on socket"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:731 connect.c:794
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Looking up %s ... "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:735
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to look up %s (port %s) (%s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: this is the end of "Looking up %s ... "
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:739 connect.c:810
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"done.\n"
|
|
|
|
|
"Connecting to %s (port %s) ... "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:761 connect.c:838
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"unable to connect to %s:\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:767 connect.c:844
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "done."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:798
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to look up %s (%s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:804
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown port %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:941 connect.c:1271
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "strange hostname '%s' blocked"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:943
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "strange port '%s' blocked"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:953
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot start proxy %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:1024
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no path specified; see 'git help pull' for valid url syntax"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:1219
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ssh variant 'simple' does not support -4"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:1231
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ssh variant 'simple' does not support -6"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:1248
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ssh variant 'simple' does not support setting port"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:1360
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "strange pathname '%s' blocked"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connect.c:1408
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to fork"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Checking connectivity"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connected.c:120
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Could not run 'git rev-list'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connected.c:144
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "failed write to rev-list"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: connected.c:149
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "failed to close rev-list's stdin"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: convert.c:194
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "illegal crlf_action %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: convert.c:207
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "CRLF would be replaced by LF in %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: convert.c:209
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"CRLF will be replaced by LF in %s.\n"
|
|
|
|
|
"The file will have its original line endings in your working directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: convert.c:217
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "LF would be replaced by CRLF in %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: convert.c:219
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"LF will be replaced by CRLF in %s.\n"
|
|
|
|
|
"The file will have its original line endings in your working directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: convert.c:284
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "BOM is prohibited in '%s' if encoded as %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: convert.c:291
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
2020-11-21 19:20:35 +01:00
|
|
|
"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
|
|
|
|
|
"working-tree-encoding."
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: convert.c:304
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "BOM is required in '%s' if encoded as %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: convert.c:306
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
|
|
|
|
|
"%sLE (depending on the byte order) as working-tree-encoding."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: convert.c:419 convert.c:490
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to encode '%s' from %s to %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: convert.c:462
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "encoding '%s' from %s to %s and back is not the same"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: convert.c:665
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot fork to run external filter '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: convert.c:685
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot feed the input to external filter '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: convert.c:692
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "external filter '%s' failed %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: convert.c:727 convert.c:730
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "read from external filter '%s' failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: convert.c:733 convert.c:788
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "external filter '%s' failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: convert.c:837
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unexpected filter type"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: convert.c:848
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "path name too long for external filter"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: convert.c:940
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"external filter '%s' is not available anymore although not all paths have "
|
|
|
|
|
"been filtered"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: convert.c:1240
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "true/false are no valid working-tree-encodings"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: convert.c:1428 convert.c:1462
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: clean filter '%s' failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: convert.c:1508
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: smudge filter %s failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: credential.c:96
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "skipping credential lookup for key: credential.%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: credential.c:112
|
|
|
|
|
msgid "refusing to work with credential missing host field"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: credential.c:114
|
|
|
|
|
msgid "refusing to work with credential missing protocol field"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: credential.c:394
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "url contains a newline in its %s component: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: credential.c:438
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "url has no scheme: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: credential.c:511
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "credential url cannot be parsed: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: date.c:138
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "in the future"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: date.c:144
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%<PRIuMAX> second ago"
|
|
|
|
|
msgid_plural "%<PRIuMAX> seconds ago"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: date.c:151
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%<PRIuMAX> minute ago"
|
|
|
|
|
msgid_plural "%<PRIuMAX> minutes ago"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: date.c:158
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%<PRIuMAX> hour ago"
|
|
|
|
|
msgid_plural "%<PRIuMAX> hours ago"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: date.c:165
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%<PRIuMAX> day ago"
|
|
|
|
|
msgid_plural "%<PRIuMAX> days ago"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: date.c:171
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%<PRIuMAX> week ago"
|
|
|
|
|
msgid_plural "%<PRIuMAX> weeks ago"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: date.c:178
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%<PRIuMAX> month ago"
|
|
|
|
|
msgid_plural "%<PRIuMAX> months ago"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: date.c:189
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%<PRIuMAX> year"
|
|
|
|
|
msgid_plural "%<PRIuMAX> years"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: "%s" is "<n> years"
|
2020-11-21 19:20:35 +01:00
|
|
|
#: date.c:192
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s, %<PRIuMAX> month ago"
|
|
|
|
|
msgid_plural "%s, %<PRIuMAX> months ago"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: date.c:197 date.c:202
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%<PRIuMAX> year ago"
|
|
|
|
|
msgid_plural "%<PRIuMAX> years ago"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
|
|
|
|
#: delta-islands.c:272
|
|
|
|
|
msgid "Propagating island marks"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: delta-islands.c:290
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "bad tree object %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: delta-islands.c:334
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to load island regex for '%s': %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: delta-islands.c:390
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "island regex from config has too many capture groups (max=%d)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: delta-islands.c:467
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Marked %d islands, done.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: diff-no-index.c:238
|
|
|
|
|
msgid "git diff --no-index [<options>] <path> <path>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: diff-no-index.c:263
|
|
|
|
|
msgid ""
|
|
|
|
|
"Not a git repository. Use --no-index to compare two paths outside a working "
|
|
|
|
|
"tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:156
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:161
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " Unknown dirstat parameter '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:297
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
|
|
|
|
|
"'dimmed-zebra', 'plain'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:325
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
|
|
|
|
|
"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:333
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"color-moved-ws: allow-indentation-change cannot be combined with other "
|
|
|
|
|
"whitespace modes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:410
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:470
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Found errors in 'diff.dirstat' config variable:\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:4269
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "external diff died, stopping at %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:4618
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:4621
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "-G, -S and --find-object are mutually exclusive"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:4699
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--follow requires exactly one pathspec"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:4747
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid --stat value: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279
|
|
|
|
|
#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s expects a numerical value"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:4784
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Failed to parse --dirstat/-X option parameter:\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:4869
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown change class '%c' in --diff-filter=%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:4893
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown value after ws-error-highlight=%.*s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:4907
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to resolve '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:4957 diff.c:4963
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s expects <n>/<m> form"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:4975
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s expects a character, got '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:4996
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad --color-moved argument: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5015
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid mode '%s' in --color-moved-ws"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5055
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
|
|
|
|
|
"\"histogram\""
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5091 diff.c:5111
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid argument to %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5248
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to parse --submodule option parameter: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5304
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad --word-diff argument: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5327
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Diff output format options"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5329 diff.c:5335
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "generate patch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5332 builtin/log.c:176
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "suppress diff output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5337 diff.c:5451 diff.c:5458
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<n>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5338 diff.c:5341
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "generate diffs with <n> lines context"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5343
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "generate the diff in raw format"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5346
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "synonym for '-p --raw'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5350
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "synonym for '-p --stat'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5354
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "machine friendly --stat"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5357
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "output only the last line of --stat"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5359 diff.c:5367
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<param1,param2>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5360
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"output the distribution of relative amount of changes for each sub-directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5364
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "synonym for --dirstat=cumulative"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5368
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "synonym for --dirstat=files,param1,param2..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5372
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "warn if changes introduce conflict markers or whitespace errors"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5375
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "condensed summary such as creations, renames and mode changes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5378
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show only names of changed files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5381
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show only names and status of changed files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5383
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<width>[,<name-width>[,<count>]]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5384
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "generate diffstat"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5386 diff.c:5389 diff.c:5392
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<width>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5387
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "generate diffstat with a given width"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5390
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "generate diffstat with a given name width"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5393
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "generate diffstat with a given graph width"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5395
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<count>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5396
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "generate diffstat with limited lines"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5399
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "generate compact summary in diffstat"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5402
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "output a binary diff that can be applied"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5405
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show full pre- and post-image object names on the \"index\" lines"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5407
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show colored diff"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5408
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<kind>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5409
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
|
|
|
|
|
"diff"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5412
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"do not munge pathnames and use NULs as output field terminators in --raw or "
|
|
|
|
|
"--numstat"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<prefix>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5416
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show the given source prefix instead of \"a/\""
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5419
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show the given destination prefix instead of \"b/\""
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5422
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "prepend an additional prefix to every line of output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5425
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not show any source or destination prefix"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5428
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show context between diff hunks up to the specified number of lines"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5432 diff.c:5437 diff.c:5442
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<char>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5433
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "specify the character to indicate a new line instead of '+'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5438
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "specify the character to indicate an old line instead of '-'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5443
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "specify the character to indicate a context instead of ' '"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5446
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Diff rename options"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5447
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<n>[/<m>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5448
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "break complete rewrite changes into pairs of delete and create"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5452
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "detect renames"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5456
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "omit the preimage for deletes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5459
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "detect copies"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5463
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use unmodified files as source to find copies"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5465
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "disable rename detection"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5468
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use empty blobs as rename source"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5470
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "continue listing the history of a file beyond renames"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5473
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"prevent rename/copy detection if the number of rename/copy targets exceeds "
|
|
|
|
|
"given limit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5475
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Diff algorithm options"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5477
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "produce the smallest possible diff"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5480
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ignore whitespace when comparing lines"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5483
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ignore changes in amount of whitespace"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5486
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ignore changes in whitespace at EOL"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5489
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ignore carrier-return at the end of line"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5492
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ignore changes whose lines are all blank"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5495
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "heuristic to shift diff hunk boundaries for easy reading"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5498
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "generate diff using the \"patience diff\" algorithm"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5502
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "generate diff using the \"histogram diff\" algorithm"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5504
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<algorithm>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5505
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "choose a diff algorithm"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5507
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<text>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5508
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "generate diff using the \"anchored diff\" algorithm"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5510 diff.c:5519 diff.c:5522
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<mode>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5511
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show word diff, using <mode> to delimit changed words"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5513 diff.c:5516 diff.c:5561
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<regex>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5514
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use <regex> to decide what a word is"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5517
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5520
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "moved lines of code are colored differently"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5523
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "how white spaces are ignored in --color-moved"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5526
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Other diff options"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5528
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "when run from subdir, exclude changes outside and show relative paths"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5532
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "treat all files as text"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5534
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "swap two inputs, reverse the diff"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5536
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "exit with 1 if there were differences, 0 otherwise"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5538
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "disable all output of the program"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5540
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "allow an external diff helper to be executed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5542
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "run external text conversion filters when comparing binary files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5544
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<when>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5545
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ignore changes to submodules in the diff generation"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5548
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<format>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5549
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "specify how differences in submodules are shown"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5553
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "hide 'git add -N' entries from the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5556
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "treat 'git add -N' entries as real in the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5558
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<string>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5559
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"look for differences that change the number of occurrences of the specified "
|
|
|
|
|
"string"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5562
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"look for differences that change the number of occurrences of the specified "
|
|
|
|
|
"regex"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5565
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show all changes in the changeset with -S or -G"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5568
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "treat <string> in -S as extended POSIX regular expression"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5571
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "control the order in which files appear in the output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5572
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<object-id>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5573
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"look for differences that change the number of occurrences of the specified "
|
|
|
|
|
"object"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5575
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5576
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "select files by diff type"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5578
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<file>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:5579
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Output to a specific file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:6236
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "inexact rename detection was skipped due to too many files."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:6239
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "only found copies from modified paths due to too many files."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diff.c:6242
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"you may want to set your %s variable to at least %d and retry the command."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: diffcore-order.c:24
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to read orderfile '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: diffcore-rename.c:592
|
|
|
|
|
msgid "Performing inexact rename detection"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: dir.c:578
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "pathspec '%s' did not match any file(s) known to git"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: dir.c:718 dir.c:747 dir.c:760
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized pattern: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: dir.c:777 dir.c:791
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized negative pattern: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: dir.c:809
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: dir.c:819
|
|
|
|
|
msgid "disabling cone pattern matching"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: dir.c:1198
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot use %s as an exclude file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: dir.c:2305
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not open directory '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: dir.c:2605
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "failed to get kernel name and information"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: dir.c:2729
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "untracked cache is disabled on this system or location"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: dir.c:3520
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "index file corrupt in repo %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: dir.c:3565 dir.c:3570
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not create directories for %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: dir.c:3599
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not migrate git directory from '%s' to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: editor.c:74
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "hint: Waiting for your editor to close the file...%c"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: entry.c:177
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Filtering content"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: entry.c:478
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not stat file '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: environment.c:150
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad git namespace path \"%s\""
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: environment.c:337
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not set GIT_DIR to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: exec-cmd.c:363
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "too many args to run %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:176
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git fetch-pack: expected shallow list"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:179
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git fetch-pack: expected a flush packet after shallow list"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:190
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:210
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:221
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to write to remote"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:282
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--stateless-rpc requires multi_ack_detailed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:375 fetch-pack.c:1397
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid shallow line: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:381 fetch-pack.c:1403
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid unshallow line: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:383 fetch-pack.c:1405
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "object not found: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:386 fetch-pack.c:1408
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "error in object: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:388 fetch-pack.c:1410
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no shallow found: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:391 fetch-pack.c:1414
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "expected shallow/unshallow, got %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:431
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "got %s %d %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:448
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid commit %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:479
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "giving up"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:492 progress.c:339
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "done"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:504
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "got %s (%d) %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:540
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Marking %s as complete"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:755
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "already have %s (%s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:824
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "fetch-pack: unable to fork off sideband demultiplexer"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:832
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "protocol error: bad pack header"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:916
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "fetch-pack: unable to fork off %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:933
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:935
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "error in sideband demultiplexer"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:978
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Server version is %.*s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998
|
|
|
|
|
#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014
|
|
|
|
|
#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030
|
|
|
|
|
#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Server supports %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:985
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Server does not support shallow clients"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1045
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Server does not support --shallow-since"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1050
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Server does not support --shallow-exclude"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1054
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Server does not support --deepen"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1056
|
|
|
|
|
msgid "Server does not support this repository's object format"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: fetch-pack.c:1069
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no common commits"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1081 fetch-pack.c:1619
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git fetch-pack: fetch failed."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1205
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "mismatched algorithms: client %s; server %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: fetch-pack.c:1209
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "the server does not support algorithm '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: fetch-pack.c:1229
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Server does not support shallow requests"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1236
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Server supports filter"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1275
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to write request to remote"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1293
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "error reading section header '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1299
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "expected '%s', received '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1360
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unexpected acknowledgment line: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1365
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "error processing acks: %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1375
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "expected packfile to be sent after 'ready'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1377
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "expected no other sections to be sent after no 'ready'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1419
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "error processing shallow info: %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1466
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "expected wanted-ref, got '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1471
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unexpected wanted-ref: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1476
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "error processing wanted refs: %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1506
|
|
|
|
|
msgid "git fetch-pack: expected response end packet"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: fetch-pack.c:1887
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no matching remote head"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1910 builtin/clone.c:692
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "remote did not send all necessary objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1937
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no such remote ref %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: fetch-pack.c:1940
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Server does not allow request for unadvertised object %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: gpg-interface.c:272
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not create temporary file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: gpg-interface.c:275
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed writing detached signature to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: gpg-interface.c:457
|
|
|
|
|
msgid "gpg failed to sign the data"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: graph.c:98
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "ignore invalid color '%.*s' in log.graphColors"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: grep.c:668
|
|
|
|
|
msgid ""
|
|
|
|
|
"given pattern contains NULL byte (via -f <file>). This is only supported "
|
|
|
|
|
"with -P under PCRE v2"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: grep.c:2128
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s': unable to read %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89
|
2020-01-12 00:36:56 +01:00
|
|
|
#: builtin/rm.c:135
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to stat '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: grep.c:2156
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s': short read"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: help.c:23
|
|
|
|
|
msgid "start a working area (see also: git help tutorial)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: help.c:24
|
|
|
|
|
msgid "work on the current change (see also: git help everyday)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: help.c:25
|
|
|
|
|
msgid "examine the history and state (see also: git help revisions)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: help.c:26
|
|
|
|
|
msgid "grow, mark and tweak your common history"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: help.c:27
|
|
|
|
|
msgid "collaborate (see also: git help workflows)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: help.c:31
|
|
|
|
|
msgid "Main Porcelain Commands"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: help.c:32
|
|
|
|
|
msgid "Ancillary Commands / Manipulators"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: help.c:33
|
|
|
|
|
msgid "Ancillary Commands / Interrogators"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: help.c:34
|
|
|
|
|
msgid "Interacting with Others"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: help.c:35
|
|
|
|
|
msgid "Low-level Commands / Manipulators"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: help.c:36
|
|
|
|
|
msgid "Low-level Commands / Interrogators"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: help.c:37
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Low-level Commands / Syncing Repositories"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: help.c:38
|
|
|
|
|
msgid "Low-level Commands / Internal Helpers"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: help.c:300
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "available git commands in '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: help.c:307
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git commands available from elsewhere on your $PATH"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: help.c:316
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "These are common Git commands used in various situations:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: help.c:365 git.c:99
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unsupported command listing type '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: help.c:405
|
|
|
|
|
msgid "The Git concept guides are:"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: help.c:429
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "See 'git help <command>' to read about a specific subcommand"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: help.c:434
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "External commands"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: help.c:449
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Command aliases"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: help.c:513
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"'%s' appears to be a git command, but we were not\n"
|
|
|
|
|
"able to execute it. Maybe git-%s is broken?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: help.c:572
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Uh oh. Your system reports no Git commands at all."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: help.c:594
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "WARNING: You called a Git command named '%s', which does not exist."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: help.c:599
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Continuing under the assumption that you meant '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: help.c:604
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: help.c:612
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "git: '%s' is not a git command. See 'git --help'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: help.c:616
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"The most similar command is"
|
|
|
|
|
msgid_plural ""
|
|
|
|
|
"\n"
|
|
|
|
|
"The most similar commands are"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: help.c:656
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git version [<options>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: help.c:711
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: %s - %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: help.c:715
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Did you mean this?"
|
|
|
|
|
msgid_plural ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Did you mean one of these?"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ident.c:353
|
|
|
|
|
msgid "Author identity unknown\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: ident.c:356
|
|
|
|
|
msgid "Committer identity unknown\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: ident.c:362
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"*** Please tell me who you are.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Run\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git config --global user.email \"you@example.com\"\n"
|
|
|
|
|
" git config --global user.name \"Your Name\"\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"to set your account's default identity.\n"
|
|
|
|
|
"Omit --global to set the identity only in this repository.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ident.c:397
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no email was given and auto-detection is disabled"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ident.c:402
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to auto-detect email address (got '%s')"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ident.c:419
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no name was given and auto-detection is disabled"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ident.c:425
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to auto-detect name (got '%s')"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ident.c:433
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "empty ident name (for <%s>) not allowed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ident.c:439
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "name consists only of disallowed characters: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ident.c:454 builtin/commit.c:634
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid date format: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: list-objects-filter-options.c:81
|
|
|
|
|
msgid "expected 'tree:<depth>'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: list-objects-filter-options.c:96
|
|
|
|
|
msgid "sparse:path filters support has been dropped"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: list-objects-filter-options.c:109
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "invalid filter-spec '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: list-objects-filter-options.c:125
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "must escape char in sub-filter-spec: '%c'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: list-objects-filter-options.c:167
|
|
|
|
|
msgid "expected something after combine:"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: list-objects-filter-options.c:249
|
2020-05-26 01:06:52 +02:00
|
|
|
msgid "multiple filter-specs cannot be combined"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: list-objects-filter-options.c:361
|
|
|
|
|
msgid "unable to upgrade repository format to support partial clone"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: list-objects-filter.c:492
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to access sparse blob in '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: list-objects-filter.c:495
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "unable to parse sparse filter data in %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: list-objects.c:127
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: list-objects.c:140
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: list-objects.c:375
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to load root tree for commit %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: lockfile.c:152
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Unable to create '%s.lock': %s.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Another git process seems to be running in this repository, e.g.\n"
|
|
|
|
|
"an editor opened by 'git commit'. Please make sure all processes\n"
|
|
|
|
|
"are terminated then try again. If it still fails, a git process\n"
|
|
|
|
|
"may have crashed in this repository earlier:\n"
|
|
|
|
|
"remove the file manually to continue."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: lockfile.c:160
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Unable to create '%s.lock': %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ls-refs.c:109
|
|
|
|
|
msgid "expected flush after ls-refs arguments"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:356
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "(bad commit)\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:379
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "add_cacheinfo failed for path '%s'; merge aborting."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:388
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:874
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to create path '%s'%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:885
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Removing %s to make room for subdirectory\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:899 merge-recursive.c:918
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ": perhaps a D/F conflict?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:908
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "refusing to lose untracked file at '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:949 builtin/cat-file.c:41
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot read object %s '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:954
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "blob expected for %s '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:979
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to open '%s': %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:990
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to symlink '%s': %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:995
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "do not know what to do with %06o %s '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1191
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to merge submodule %s (not checked out)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1198
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to merge submodule %s (commits not present)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1205
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1213 merge-recursive.c:1225
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Fast-forwarding submodule %s to the following commit:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1216 merge-recursive.c:1228
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Fast-forwarding submodule %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1251
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to merge submodule %s (merge following commits not found)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1255
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to merge submodule %s (not fast-forward)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1256
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Found a possible merge resolution for the submodule:\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1259
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"If this is correct simply add it to the index for example\n"
|
|
|
|
|
"by using:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git update-index --cacheinfo 160000 %s \"%s\"\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"which will accept this suggestion.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1268
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to merge submodule %s (multiple merges found)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1341
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Failed to execute internal merge"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1346
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Unable to add %s to database"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1378
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Auto-merging %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1402
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1474
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
|
|
|
|
|
"in tree."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1479
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
|
|
|
|
|
"left in tree."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1486
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
|
|
|
|
|
"in tree at %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1491
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
|
|
|
|
|
"left in tree at %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1526
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "rename"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1526
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "renamed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Refusing to lose dirty file at %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1587
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Refusing to lose untracked file at %s, even though it's in the way."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1645
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1676
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s is a directory in %s adding as %s instead"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1681
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Refusing to lose untracked file at %s; adding as %s instead"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1708
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
|
|
|
|
|
"\"->\"%s\" in \"%s\"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1713
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (left unresolved)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:1805
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:2068
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"CONFLICT (directory rename split): Unclear where to place %s because "
|
|
|
|
|
"directory %s was renamed to multiple other directories, with no destination "
|
|
|
|
|
"getting a majority of the files."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:2100
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
|
|
|
|
|
"implicit directory rename(s) putting the following path(s) there: %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:2110
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
|
|
|
|
|
"implicit directory renames tried to put these paths there: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:2202
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
|
|
|
|
|
">%s in %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:2447
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
|
|
|
|
|
"renamed."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:2973
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot read object %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:2976
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "object %s is not a blob"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3040
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "modify"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3040
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "modified"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3052
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "content"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3056
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add/add"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3079
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Skipped %s (merged same as existing)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3101
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "submodule"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3102
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "CONFLICT (%s): Merge conflict in %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3132
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Adding as %s instead"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3215
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Path updated: %s added in %s inside a directory that was renamed in %s; "
|
|
|
|
|
"moving it to %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3218
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
|
|
|
|
|
"in %s, suggesting it should perhaps be moved to %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3222
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
|
|
|
|
|
"%s; moving it to %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3225
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
|
|
|
|
|
"was renamed in %s, suggesting it should perhaps be moved to %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3339
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Removing %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3362
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "file/directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3367
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "directory/file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3374
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3383
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Adding %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3392
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "CONFLICT (add/add): Merge conflict in %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3436
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Already up to date!"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3445
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "merging of trees %s and %s failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3550
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Merging:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3563
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "found %u common ancestor:"
|
|
|
|
|
msgid_plural "found %u common ancestors:"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3613
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "merge returned no commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3672
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Your local changes to the following files would be overwritten by merge:\n"
|
|
|
|
|
" %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:3769
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not parse object '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Unable to write index."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: merge.c:41
|
|
|
|
|
msgid "failed to read the cache"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930
|
|
|
|
|
#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816
|
|
|
|
|
#: builtin/stash.c:265
|
|
|
|
|
msgid "unable to write new index file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: midx.c:79
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "multi-pack-index file %s is too small"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:95
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:100
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "multi-pack-index version %d not recognized"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:105
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "multi-pack-index hash version %u does not match version %u"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:122
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "invalid chunk offset (too large)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:146
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "terminating multi-pack-index chunk id appears earlier than expected"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:159
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "multi-pack-index missing required pack-name chunk"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:161
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "multi-pack-index missing required OID fanout chunk"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:163
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "multi-pack-index missing required OID lookup chunk"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:165
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "multi-pack-index missing required object offsets chunk"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:179
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:222
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad pack-int-id: %u (%u total packs)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:272
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:300
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "error preparing packfile from multi-pack-index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:485
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to add packfile '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:491
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to open pack-index '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:551
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to locate object %d in packfile"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:853
|
|
|
|
|
msgid "Adding packfiles to multi-pack-index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: midx.c:886
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "did not see pack-file %s to drop"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:938
|
|
|
|
|
msgid "no pack files to index."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: midx.c:990
|
|
|
|
|
msgid "Writing chunks to multi-pack-index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: midx.c:1068
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to clear multi-pack-index at %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:1124
|
|
|
|
|
msgid "multi-pack-index file exists, but failed to parse"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: midx.c:1132
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Looking for referenced packfiles"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:1147
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:1152
|
|
|
|
|
msgid "the midx contains no oid"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: midx.c:1161
|
|
|
|
|
msgid "Verifying OID order in multi-pack-index"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:1170
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:1190
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Sorting objects by packfile"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:1197
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Verifying object offsets"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:1213
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to load pack entry for oid[%d] = %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:1219
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to load pack-index for packfile %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:1228
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:1253
|
|
|
|
|
msgid "Counting referenced objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: midx.c:1263
|
|
|
|
|
msgid "Finding and deleting unreferenced packfiles"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: midx.c:1454
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not start pack-objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: midx.c:1474
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not finish pack-objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: name-hash.c:537
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to create lazy_dir thread: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: name-hash.c:559
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to create lazy_name thread: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: name-hash.c:565
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to join lazy_name thread: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: notes-merge.c:277
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"You have not concluded your previous notes merge (%s exists).\n"
|
|
|
|
|
"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
|
|
|
|
|
"commit/abort the previous merge before you start a new notes merge."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: notes-merge.c:284
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "You have not concluded your notes merge (%s exists)."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: notes-utils.c:46
|
|
|
|
|
msgid "Cannot commit uninitialized/unreferenced notes tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: notes-utils.c:105
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Bad notes.rewriteMode value: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: notes-utils.c:115
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: The first %s is the name of
|
|
|
|
|
#. the environment variable, the second %s is
|
|
|
|
|
#. its value.
|
|
|
|
|
#.
|
|
|
|
|
#: notes-utils.c:145
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Bad %s value: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: object.c:53
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid object type \"%s\""
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: object.c:173
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "object %s is a %s, not a %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: object.c:233
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "object %s has unknown type id %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: object.c:246
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to parse object: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: object.c:266 object.c:278
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "hash mismatch %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to get size of %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: packfile.c:630
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "offset before end of packfile (broken .idx?)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: packfile.c:1922
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "offset before start of pack index for %s (corrupt index?)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: packfile.c:1926
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "offset beyond end of pack index for %s (truncated index?)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: parse-options-cb.c:20 parse-options-cb.c:24
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "option `%s' expects a numerical value"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: parse-options-cb.c:41
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "malformed expiration date '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: parse-options-cb.c:54
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: parse-options-cb.c:132 parse-options-cb.c:149
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "malformed object name '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-01-12 00:36:56 +01:00
|
|
|
#: parse-options.c:38
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s requires a value"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: parse-options.c:73
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s is incompatible with %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: parse-options.c:78
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s : incompatible with something else"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: parse-options.c:92 parse-options.c:96 parse-options.c:317
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s takes no value"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: parse-options.c:94
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s isn't available"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: parse-options.c:217
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: parse-options.c:386
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: parse-options.c:420 parse-options.c:428
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "did you mean `--%s` (with two dashes)?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: parse-options.c:666 parse-options.c:971
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "alias of --%s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: parse-options.c:862
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown option `%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: parse-options.c:864
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown switch `%c'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: parse-options.c:866
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown non-ascii option in string: `%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: parse-options.c:890
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: parse-options.c:909
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "usage: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: the colon here should align with the
|
|
|
|
|
#. one in "usage: %s" translation.
|
|
|
|
|
#.
|
2020-11-21 19:20:35 +01:00
|
|
|
#: parse-options.c:915
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " or: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: parse-options.c:918
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: parse-options.c:957
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "-NUM"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: path.c:915
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not make %s writable by group"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pathspec.c:130
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Escape character '\\' not allowed as last character in attr value"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pathspec.c:148
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Only one 'attr:' specification is allowed."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pathspec.c:151
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "attr spec must not be empty"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pathspec.c:194
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid attribute name %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pathspec.c:259
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pathspec.c:266
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"global 'literal' pathspec setting is incompatible with all other global "
|
|
|
|
|
"pathspec settings"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pathspec.c:306
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "invalid parameter for pathspec magic 'prefix'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pathspec.c:327
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid pathspec magic '%.*s' in '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pathspec.c:332
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Missing ')' at the end of pathspec magic in '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pathspec.c:370
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Unimplemented pathspec magic '%c' in '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pathspec.c:429
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: 'literal' and 'glob' are incompatible"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pathspec.c:445
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "%s: '%s' is outside repository at '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pathspec.c:521
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' (mnemonic: '%c')"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pathspec.c:531
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: pathspec magic not supported by this command: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pathspec.c:598
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "pathspec '%s' is beyond a symbolic link"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pathspec.c:643
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "line is badly quoted: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-01-12 00:36:56 +01:00
|
|
|
#: pkt-line.c:92
|
|
|
|
|
msgid "unable to write flush packet"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: pkt-line.c:99
|
|
|
|
|
msgid "unable to write delim packet"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: pkt-line.c:106
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "unable to write stateless separator packet"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: pkt-line.c:113
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "flush packet write failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pkt-line.c:153 pkt-line.c:239
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "protocol error: impossibly long line"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pkt-line.c:169 pkt-line.c:171
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "packet write with format failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pkt-line.c:203
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "packet write failed - data exceeds max packet size"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pkt-line.c:210 pkt-line.c:217
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "packet write failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pkt-line.c:302
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "read error"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pkt-line.c:310
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "the remote end hung up unexpectedly"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pkt-line.c:338
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "protocol error: bad line length character: %.4s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pkt-line.c:352 pkt-line.c:357
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "protocol error: bad line length %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pkt-line.c:373 sideband.c:150
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "remote error: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: preload-index.c:119
|
|
|
|
|
msgid "Refreshing index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: preload-index.c:138
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to create threaded lstat: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: pretty.c:983
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to parse --pretty format"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: promisor-remote.c:30
|
|
|
|
|
msgid "promisor-remote: unable to fork off fetch subprocess"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: promisor-remote.c:35 promisor-remote.c:37
|
|
|
|
|
msgid "promisor-remote: could not write to fetch subprocess"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: promisor-remote.c:41
|
|
|
|
|
msgid "promisor-remote: could not close stdin to fetch subprocess"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: promisor-remote.c:53
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "promisor remote name cannot begin with '/': %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: prune-packed.c:35
|
|
|
|
|
msgid "Removing duplicate objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: range-diff.c:77
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not start `log`"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: range-diff.c:79
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not read `log` output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: range-diff.c:98 sequencer.c:5283
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not parse commit '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: range-diff.c:112
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"could not parse first line of `log` output: did not start with 'commit ': "
|
|
|
|
|
"'%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: range-diff.c:137
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not parse git header '%.*s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: range-diff.c:301
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "failed to generate diff"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: range-diff.c:534 range-diff.c:536
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not parse log for '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:682
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "will not add file alias '%s' ('%s' already exists in index)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:698
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot create an empty blob in the object database"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:720
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: can only add regular files, symbolic links or git-directories"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:725
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' does not have a commit checked out"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:777
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to index file '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:796
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to add '%s' to index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:807
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to stat '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:1318
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' appears as both a file and as a directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:1524
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Refresh index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:1639
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"index.version set, but the value is invalid.\n"
|
|
|
|
|
"Using version %i"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:1649
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"GIT_INDEX_VERSION set, but the value is invalid.\n"
|
|
|
|
|
"Using version %i"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:1705
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad signature 0x%08x"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:1708
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad index version %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:1717
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "bad index file sha1 signature"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:1747
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "index uses %.4s extension, which we do not understand"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:1749
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "ignoring %.4s extension"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:1786
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown index entry format 0x%08x"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:1802
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "malformed name field in the index, near path '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:1859
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unordered stage entries in index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:1862
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "multiple stage entries for merged file '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:1865
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unordered stage entries for '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111
|
|
|
|
|
#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181
|
|
|
|
|
#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991
|
|
|
|
|
#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507
|
|
|
|
|
#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290
|
|
|
|
|
#: builtin/submodule--helper.c:332
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "index file corrupt"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:2115
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to create load_cache_entries thread: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:2128
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to join load_cache_entries thread: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:2161
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: index file open failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:2165
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: cannot stat the open index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:2169
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: index file smaller than expected"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:2173
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: unable to map index file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:2215
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to create load_index_extensions thread: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:2242
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to join load_index_extensions thread: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:2274
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not freshen shared index '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:2321
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "broken index, expect %s in %s, got %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not close '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not stat '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:3133
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to open git dir: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:3145
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to unlink: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:3170
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot fix permission bits on '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: read-cache.c:3319
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: cannot drop to stage #0"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: rebase-interactive.c:11
|
|
|
|
|
msgid ""
|
|
|
|
|
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
|
|
|
|
|
"continue'.\n"
|
|
|
|
|
"Or you can abort the rebase with 'git rebase --abort'.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: rebase-interactive.c:33
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: rebase-interactive.c:42
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Commands:\n"
|
|
|
|
|
"p, pick <commit> = use commit\n"
|
|
|
|
|
"r, reword <commit> = use commit, but edit the commit message\n"
|
|
|
|
|
"e, edit <commit> = use commit, but stop for amending\n"
|
|
|
|
|
"s, squash <commit> = use commit, but meld into previous commit\n"
|
|
|
|
|
"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
|
|
|
|
|
"x, exec <command> = run command (the rest of the line) using shell\n"
|
|
|
|
|
"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
|
|
|
|
|
"d, drop <commit> = remove commit\n"
|
|
|
|
|
"l, label <label> = label current HEAD with a name\n"
|
|
|
|
|
"t, reset <label> = reset HEAD to a label\n"
|
|
|
|
|
"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
|
|
|
|
|
". create a merge commit using the original merge commit's\n"
|
|
|
|
|
". message (or the oneline, if no original merge commit was\n"
|
|
|
|
|
". specified). Use -c <commit> to reword the commit message.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"These lines can be re-ordered; they are executed from top to bottom.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: rebase-interactive.c:63
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Rebase %s onto %s (%d command)"
|
|
|
|
|
msgid_plural "Rebase %s onto %s (%d commands)"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"You are editing the todo file of an ongoing interactive rebase.\n"
|
|
|
|
|
"To continue rebase after editing, run:\n"
|
|
|
|
|
" git rebase --continue\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"However, if you remove everything, the rebase will be aborted.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571
|
|
|
|
|
#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not write '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222
|
|
|
|
|
#: builtin/rebase.c:246
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "could not write '%s'."
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: rebase-interactive.c:193
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Warning: some commits may have been dropped accidentally.\n"
|
|
|
|
|
"Dropped commits (newer to older):\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: rebase-interactive.c:200
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Use 'git config rebase.missingCommitsCheck' to change the level of "
|
|
|
|
|
"warnings.\n"
|
|
|
|
|
"The possible behaviours are: ignore, warn, error.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361
|
|
|
|
|
#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233
|
|
|
|
|
#: builtin/rebase.c:258
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "could not read '%s'."
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:42 wt-status.c:1973
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "gone"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: ref-filter.c:43
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "ahead %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: ref-filter.c:44
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "behind %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: ref-filter.c:45
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "ahead %d, behind %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:169
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "expected format: %%(color:<color>)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:171
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized color: %%(color:%s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:193
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Integer value expected refname:lstrip=%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:197
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Integer value expected refname:rstrip=%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:199
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized %%(%s) argument: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:254
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%%(objecttype) does not take arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:276
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized %%(objectsize) argument: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:284
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%%(deltabase) does not take arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:296
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%%(body) does not take arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:309
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "unrecognized %%(subject) argument: %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:330
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown %%(trailers) argument: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:363
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "positive value expected contents:lines=%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:365
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized %%(contents) argument: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:380
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "positive value expected '%s' in %%(%s)"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:384
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "unrecognized argument '%s' in %%(%s)"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:398
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized email option: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: ref-filter.c:428
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "expected format: %%(align:<width>,<position>)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:440
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized position:%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:447
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized width:%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:456
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized %%(align) argument: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:464
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "positive width expected with the %%(align) atom"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:482
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized %%(if) argument: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:584
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "malformed field name: %.*s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:611
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown field name: %.*s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:615
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"not a git repository, but the field '%.*s' requires access to object data"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:739
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "format: %%(if) atom used without a %%(then) atom"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:802
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "format: %%(then) atom used without an %%(if) atom"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:804
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "format: %%(then) atom used more than once"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:806
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "format: %%(then) atom used after %%(else)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:834
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "format: %%(else) atom used without an %%(if) atom"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:836
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "format: %%(else) atom used without a %%(then) atom"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:838
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "format: %%(else) atom used more than once"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:853
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "format: %%(end) atom used without corresponding atom"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:910
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "malformed format string %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:1541
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no branch, rebasing %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:1544
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no branch, rebasing detached HEAD %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:1547
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no branch, bisect started on %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:1557
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:1591 ref-filter.c:1800
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "missing object %s for %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:1601
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "parse_object_buffer failed on %s for %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:2054
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "malformed object at '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:2143
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "ignoring ref with broken name %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:2148 refs.c:657
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "ignoring broken ref %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: ref-filter.c:2464
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "format: %%(end) atom missing"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:2563
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "malformed object name %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.c:2568
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "option `%s' must point to a commit"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: refs.c:264
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "%s does not point to a valid object!"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: refs.c:572
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "could not retrieve `%s`"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: refs.c:579
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid branch name: %s = %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: refs.c:655
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "ignoring dangling symref %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: refs.c:892
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "log for ref %s has gap after %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: refs.c:898
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "log for ref %s unexpectedly ended on %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: refs.c:957
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "log for %s is empty"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: refs.c:1049
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "refusing to update ref with bad name '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: refs.c:1120
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "update_ref failed for ref '%s': %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: refs.c:1944
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "multiple updates for ref '%s' not allowed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: refs.c:2024
|
|
|
|
|
msgid "ref updates forbidden inside quarantine environment"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: refs.c:2035
|
|
|
|
|
msgid "ref updates aborted by hook"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: refs.c:2135 refs.c:2165
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' exists; cannot create '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: refs.c:2141 refs.c:2176
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot process '%s' and '%s' at the same time"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: refs/files-backend.c:1228
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not remove reference %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: refs/files-backend.c:1242 refs/packed-backend.c:1542
|
|
|
|
|
#: refs/packed-backend.c:1552
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not delete reference %s: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: refs/files-backend.c:1245 refs/packed-backend.c:1555
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not delete references: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: refspec.c:167
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid refspec '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:351
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "config remote shorthand cannot begin with '/': %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:399
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "more than one receivepack given, using the first"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:407
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "more than one uploadpack given, using the first"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:590
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot fetch both %s and %s to %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:594
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s usually tracks %s, not %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:598
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s tracks both %s and %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:666
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "key '%s' of pattern had no '*'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:676
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "value '%s' of pattern has no '*'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1073
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "src refspec %s does not match any"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1078
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "src refspec %s matches more than one"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
|
|
|
|
|
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
|
|
|
|
|
#. the <src>.
|
|
|
|
|
#.
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1093
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The destination you provided is not a full refname (i.e.,\n"
|
|
|
|
|
"starting with \"refs/\"). We tried to guess what you meant by:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"- Looking for a ref that matches '%s' on the remote side.\n"
|
|
|
|
|
"- Checking if the <src> being pushed ('%s')\n"
|
|
|
|
|
" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
|
|
|
|
|
" refs/{heads,tags}/ prefix on the remote side.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Neither worked, so we gave up. You must fully qualify the ref."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1113
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The <src> part of the refspec is a commit object.\n"
|
|
|
|
|
"Did you mean to create a new branch by pushing to\n"
|
|
|
|
|
"'%s:refs/heads/%s'?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1118
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The <src> part of the refspec is a tag object.\n"
|
|
|
|
|
"Did you mean to create a new tag by pushing to\n"
|
|
|
|
|
"'%s:refs/tags/%s'?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1123
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The <src> part of the refspec is a tree object.\n"
|
|
|
|
|
"Did you mean to tag a new tree by pushing to\n"
|
|
|
|
|
"'%s:refs/tags/%s'?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1128
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The <src> part of the refspec is a blob object.\n"
|
|
|
|
|
"Did you mean to tag a new blob by pushing to\n"
|
|
|
|
|
"'%s:refs/tags/%s'?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1164
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s cannot be resolved to branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1175
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to delete '%s': remote ref does not exist"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1187
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "dst refspec %s matches more than one"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1194
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "dst ref %s receives from more than one src"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1703 remote.c:1804
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "HEAD does not point to a branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1712
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no such branch: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1715
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no upstream configured for branch '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1721
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "upstream branch '%s' not stored as a remote-tracking branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1736
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "push destination '%s' on remote '%s' has no local tracking branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1748
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "branch '%s' has no remote for pushing"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1758
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "push refspecs for '%s' do not include '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1771
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "push has no destination (push.default is 'nothing')"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1793
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot resolve 'simple' push to a single destination"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1922
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "couldn't find remote ref %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:1935
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "* Ignoring funny ref '%s' locally"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:2098
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Your branch is based on '%s', but the upstream is gone.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:2102
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:2105
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Your branch is up to date with '%s'.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:2109
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Your branch and '%s' refer to different commits.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:2112
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " (use \"%s\" for details)\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:2116
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Your branch is ahead of '%s' by %d commit.\n"
|
|
|
|
|
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:2122
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (use \"git push\" to publish your local commits)\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:2125
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
|
|
|
|
|
msgid_plural ""
|
|
|
|
|
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:2133
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (use \"git pull\" to update your local branch)\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:2136
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Your branch and '%s' have diverged,\n"
|
|
|
|
|
"and have %d and %d different commit each, respectively.\n"
|
|
|
|
|
msgid_plural ""
|
|
|
|
|
"Your branch and '%s' have diverged,\n"
|
|
|
|
|
"and have %d and %d different commits each, respectively.\n"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:2146
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote.c:2337
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot parse expected object name '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: replace-object.c:21
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "bad replace ref name: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: replace-object.c:30
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "duplicate replace ref: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: replace-object.c:82
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "replace depth too high for object %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: rerere.c:217 rerere.c:226 rerere.c:229
|
|
|
|
|
msgid "corrupt MERGE_RR"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: rerere.c:264 rerere.c:269
|
|
|
|
|
msgid "unable to write rerere record"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: rerere.c:495
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "there were errors while writing '%s' (%s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: rerere.c:498
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to flush '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: rerere.c:503 rerere.c:1039
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not parse conflict hunks in '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: rerere.c:684
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed utime() on '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: rerere.c:694
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "writing '%s' failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: rerere.c:714
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Staged '%s' using previous resolution."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: rerere.c:753
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Recorded resolution for '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: rerere.c:788
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Resolved '%s' using previous resolution."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: rerere.c:803
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot unlink stray '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: rerere.c:807
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Recorded preimage for '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: rerere.c:881 submodule.c:2082 builtin/log.c:1975
|
|
|
|
|
#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not create directory '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: rerere.c:1057
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to update conflicted state in '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: rerere.c:1068 rerere.c:1075
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "no remembered resolution for '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: rerere.c:1077
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot unlink '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: rerere.c:1087
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Updated preimage for '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: rerere.c:1096
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Forgot resolution for '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: rerere.c:1199
|
|
|
|
|
msgid "unable to open rr-cache directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: reset.c:42
|
|
|
|
|
msgid "could not determine HEAD revision"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: reset.c:70 reset.c:76 sequencer.c:3426
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "failed to find tree of %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: revision.c:2344
|
|
|
|
|
msgid "--unpacked=<packfile> no longer supported"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: revision.c:2364
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown value for --diff-merges: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: revision.c:2702
|
|
|
|
|
msgid "your current branch appears to be broken"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: revision.c:2705
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "your current branch '%s' does not have any commits yet"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: revision.c:2915
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "-L does not yet support diff formats besides -p and -s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: run-command.c:763
|
|
|
|
|
msgid "open /dev/null failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: run-command.c:1270
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot create async thread: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: run-command.c:1334
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The '%s' hook was ignored because it's not set as executable.\n"
|
|
|
|
|
"You can disable this warning with `git config advice.ignoredHook false`."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: send-pack.c:145
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unexpected flush packet while reading remote unpack status"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: send-pack.c:147
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to parse remote unpack status: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: send-pack.c:149
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "remote unpack failed: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: send-pack.c:372
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "failed to sign the push certificate"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: send-pack.c:460
|
|
|
|
|
msgid "the receiving end does not support this repository's hash algorithm"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: send-pack.c:469
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "the receiving end does not support --signed push"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: send-pack.c:471
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"not sending a push certificate since the receiving end does not support --"
|
|
|
|
|
"signed push"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: send-pack.c:483
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "the receiving end does not support --atomic push"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: send-pack.c:488
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "the receiving end does not support push options"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:194
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid commit message cleanup mode '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:308
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not delete '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not remove '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:339
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "revert"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:341
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cherry-pick"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:343
|
|
|
|
|
msgid "rebase"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:345
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown action: %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:404
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"after resolving the conflicts, mark the corrected paths\n"
|
|
|
|
|
"with 'git add <paths>' or 'git rm <paths>'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:407
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"after resolving the conflicts, mark the corrected paths\n"
|
|
|
|
|
"with 'git add <paths>' or 'git rm <paths>'\n"
|
|
|
|
|
"and commit the result with 'git commit'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:420 sequencer.c:3028
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not lock '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046
|
|
|
|
|
#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "could not write to '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:427
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "could not write eol to '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048
|
|
|
|
|
#: sequencer.c:3311
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "failed to finalize '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:471
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "your local changes would be overwritten by %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:475
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "commit your changes or stash them to proceed."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:507
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: fast-forward"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:546 builtin/tag.c:566
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid cleanup mode %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
|
2020-11-21 19:20:35 +01:00
|
|
|
#. "rebase".
|
2020-01-12 00:36:56 +01:00
|
|
|
#.
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:640
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: Unable to write new index file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:657
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to update cache tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:671
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not resolve HEAD commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:751
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no key present in '%.*s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:762
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to dequote value of '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724
|
|
|
|
|
#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not open '%s' for reading"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:809
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "'GIT_AUTHOR_NAME' already given"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:814
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "'GIT_AUTHOR_EMAIL' already given"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:819
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "'GIT_AUTHOR_DATE' already given"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:823
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown variable '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:828
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "missing 'GIT_AUTHOR_NAME'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:830
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "missing 'GIT_AUTHOR_EMAIL'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:832
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "missing 'GIT_AUTHOR_DATE'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:897
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"you have staged changes in your working tree\n"
|
|
|
|
|
"If these changes are meant to be squashed into the previous commit, run:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git commit --amend %s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"If they are meant to go into a new commit, run:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git commit %s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"In both cases, once you're done, continue with:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git rebase --continue\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1178
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "'prepare-commit-msg' hook failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1184
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Your name and email address were configured automatically based\n"
|
|
|
|
|
"on your username and hostname. Please check that they are accurate.\n"
|
|
|
|
|
"You can suppress this message by setting them explicitly. Run the\n"
|
|
|
|
|
"following command and follow the instructions in your editor to edit\n"
|
|
|
|
|
"your configuration file:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git config --global --edit\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"After doing this, you may fix the identity used for this commit with:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git commit --amend --reset-author\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1197
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Your name and email address were configured automatically based\n"
|
|
|
|
|
"on your username and hostname. Please check that they are accurate.\n"
|
|
|
|
|
"You can suppress this message by setting them explicitly:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git config --global user.name \"Your Name\"\n"
|
|
|
|
|
" git config --global user.email you@example.com\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"After doing this, you may fix the identity used for this commit with:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git commit --amend --reset-author\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1239
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "couldn't look up newly created commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1241
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not parse newly created commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1287
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to resolve HEAD after creating commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1289
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "detached HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1293
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (root-commit)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1314
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not parse HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1316
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "HEAD %s is not a commit!"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not parse HEAD commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1373 sequencer.c:2067
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to parse commit author"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git write-tree failed to write a tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1417 sequencer.c:1535
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to read commit message from '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1446 sequencer.c:1478
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid author identity '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:1452
|
|
|
|
|
msgid "corrupt author: missing date information"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890
|
|
|
|
|
#: builtin/merge.c:915
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "failed to write commit object"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1518 sequencer.c:4237
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not update %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:1567
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not parse commit %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1572
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not parse parent commit %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1655 sequencer.c:1766
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown command: %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1713 sequencer.c:1738
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "This is a combination of %d commits."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1723
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "need a HEAD to fixup"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1725 sequencer.c:3338
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not read HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1727
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not read HEAD's commit message"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1733
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot write '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1740 git-rebase--preserve-merges.sh:486
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "This is the 1st commit message:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1748
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not read commit message of %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1755
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "This is the commit message #%d:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1761
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "The commit message #%d will be skipped:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1849
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "your index file is unmerged."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1856
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot fixup root commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1875
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "commit %s is a merge but no -m option was given."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1883 sequencer.c:1891
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "commit %s does not have parent %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1897
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot get commit message for %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: The first %s will be a "todo" command like
|
|
|
|
|
#. "revert" or "pick", the second %s a SHA1.
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1916
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: cannot parse parent commit %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:1981
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not rename '%s' to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2038
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not revert %s... %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2039
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not apply %s... %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2059
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "dropping %s %s -- patch contents already upstream\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:2117
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "git %s: failed to read the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2124
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "git %s: failed to refresh the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2201
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s does not accept arguments: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2210
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "missing arguments for %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2241
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "could not parse '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2302
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid line %d: %.*s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2313
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot '%s' without a previous commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2399
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cancelling a cherry picking in progress"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2408
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cancelling a revert in progress"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2452
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "please fix this using 'git rebase --edit-todo'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2454
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unusable instruction sheet: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2459
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no commits parsed."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2470
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot cherry-pick during a revert."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2472
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot revert during a cherry-pick."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2550
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid value for %s: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2657
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unusable squash-onto"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2677
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "malformed options sheet: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2769 sequencer.c:4609
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "empty commit set passed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2786
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "revert is already in progress"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2788
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "try \"git revert (--continue | %s--abort | --quit)\""
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2791
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cherry-pick is already in progress"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2793
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2807
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not create sequencer directory '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2822
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not lock HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2882 sequencer.c:4325
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no cherry-pick or revert in progress"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2884 sequencer.c:2895
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot resolve HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2886 sequencer.c:2930
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot abort from a branch yet to be born"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2916 builtin/grep.c:745
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot open '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2918
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot read '%s': %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2919
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unexpected end of file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2925
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2936
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2977
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no revert in progress"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2986
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no cherry-pick in progress"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:2996
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "failed to skip the commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3003
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "there is nothing to skip"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3006
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"have you committed already?\n"
|
|
|
|
|
"try \"git %s --continue\""
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3168 sequencer.c:4217
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot read HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3185
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to copy '%s' to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3193
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"You can amend the commit now, with\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git commit --amend %s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Once you are satisfied with your changes, run\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git rebase --continue\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3203
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not apply %s... %.*s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3210
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not merge %.*s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not copy '%s' to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3240
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Executing: %s\n"
|
2020-05-26 01:06:52 +02:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3255
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"execution failed: %s\n"
|
|
|
|
|
"%sYou can fix the problem, and then run\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git rebase --continue\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3261
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "and made changes to the index and/or the working tree\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3267
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"execution succeeded: %s\n"
|
|
|
|
|
"but left changes to the index and/or the working tree\n"
|
|
|
|
|
"Commit or stash your changes, and then run\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git rebase --continue\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3328
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "illegal label name: '%.*s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3382
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "writing fake root commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3387
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "writing squash-onto"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3471
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not resolve '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3502
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot merge without a current revision"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3524
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to parse '%.*s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3533
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "nothing to merge: '%.*s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3545
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "octopus merge cannot be executed on top of a [new root]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3561
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not get commit message of '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3730
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not even attempt to merge '%.*s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3746
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "merge: Unable to write new index file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3820
|
|
|
|
|
msgid "Cannot autostash"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:3823
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Unexpected stash response: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:3829
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not create directory for '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:3832
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Created autostash: %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:3836
|
|
|
|
|
msgid "could not reset --hard"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:3861
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Applied autostash.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3873
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot store %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3876
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
2020-11-21 19:20:35 +01:00
|
|
|
"%s\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
"Your changes are safe in the stash.\n"
|
|
|
|
|
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3881
|
|
|
|
|
msgid "Applying autostash resulted in conflicts."
|
2020-05-26 01:06:52 +02:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3882
|
|
|
|
|
msgid "Autostash exists; creating a new stash entry."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:3974
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: not a valid OID"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3979 git-rebase--preserve-merges.sh:769
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not detach HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3994
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Stopped at HEAD\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:3996
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Stopped at %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:4004
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Could not execute the todo command\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" %.*s\n"
|
|
|
|
|
"It has been rescheduled; To edit the command before continuing, please\n"
|
|
|
|
|
"edit the todo list first:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git rebase --edit-todo\n"
|
|
|
|
|
" git rebase --continue\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:4050
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Rebasing (%d/%d)%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:4095
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Stopped at %s... %.*s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:4166
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown command %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:4225
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not read orig-head"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:4230
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not read 'onto'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:4244
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not update HEAD to %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:4304
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Successfully rebased and updated %s.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:4337
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot rebase: You have unstaged changes."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:4346
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot amend non-existing commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:4348
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid file: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:4350
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid contents: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:4353
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"You have uncommitted changes in your working tree. Please, commit them\n"
|
|
|
|
|
"first and then run 'git rebase --continue' again."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:4389 sequencer.c:4428
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not write file: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:4444
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not remove CHERRY_PICK_HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:4451
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not commit staged changes."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:4477
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid committer '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:4586
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: can't cherry-pick a %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:4590
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: bad revision"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:4625
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "can't revert as initial commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:5102
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "make_script: unhandled options"
|
|
|
|
|
msgstr ""
|
Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96
af6b65d45e Git 2.26.2
7397ca3373 Git 2.25.4
b86a4be245 Git 2.24.3
f2771efd07 Git 2.23.3
c9808fa014 Git 2.22.4
9206d27eb5 Git 2.21.3
041bc65923 Git 2.20.4
76b54ee9b9 Git 2.19.5
ba6f0905fd Git 2.18.4
df5be6dc3f Git 2.17.5
1a3609e402 fsck: reject URL with empty host in .gitmodules
e7fab62b73 credential: treat URL with empty scheme as invalid
c44088ecc4 credential: treat URL without scheme as invalid
fe29a9b7b0 credential: die() when parsing invalid urls
a2b26ffb1a fsck: convert gitmodules url to URL passed to curl
8ba8ed568e credential: refuse to operate when missing host or protocol
24036686c4 credential: parse URL without host as empty host, not unset
73aafe9bc2 t0300: use more realistic inputs
a88dbd2f8c t0300: make "quit" helper more realistic
de49261b05 Git 2.26.1
274b9cc253 Git 2.26
55a7568606 Merge branch 'en/rebase-backend'
c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git
1557364fb4 l10n: tr.po: change file mode to 644
2da1b05674 t3419: prevent failure when run with EXPENSIVE
1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0
5804c6ec40 l10n: de.po: add missing space
98cedd0233 Merge https://github.com/prati0100/git-gui
4914ba4bcf l10n: tr: Fix a couple of ambiguities
a5728022e0 Merge branch 'py/remove-tcloo'
7fcb965970 RelNotes/2.26.0: fix various typos
f0c03bcf95 l10n: Update Catalan translation
67b0a24910 Git 2.25.3
be8661a328 Sync with Git 2.25.2
0822e66b5d Git 2.25.2
65588b0b2e unicode: update the width tables to Unicode 13.0
7be274b0ff Merge branch 'js/ci-windows-update' into maint
9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint
221887a492 Merge branch 'jk/doc-credential-helper' into maint
32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint
fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint
618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint
50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint
fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint
41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint
2d7247af6f Merge branch 'am/mingw-poll-fix' into maint
4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint
76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint
569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint
16a4bf1035 Merge branch 'en/check-ignore' into maint
3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint
56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint
1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint
7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint
fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint
a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint
93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint
dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint
758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint
f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint
506223f9c5 Git 2.24.2
17a02783d8 Git 2.23.2
69fab82147 Git 2.22.3
fe22686494 Git 2.21.2
d1259ce117 Git 2.20.3
a5979d7009 Git 2.19.4
21a3e5016b Git 2.18.3
c42c0f1297 Git 2.17.4
d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u)
3891a84ccd git-gui: create a new namespace for chord script evaluation
8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5
440e7442d1 l10n: zh_CN: Revise v2.26.0 translation
2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2
6c85aac65f Git 2.26-rc2
74f172e39e Merge branch 'en/test-cleanup'
e96327c947 Merge branch 'es/outside-repo-errmsg-hints'
ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0
15fa8d9667 l10n: vi: fix translation + grammar
5c20398699 prefix_path: show gitdir if worktree unavailable
1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated)
c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated)
a4a2f64642 Merge branch 'js/askpass-coerce-utf8'
850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows
d769dcc5cd Merge branch 'py/blame-status-error'
70e24186c0 t6022, t6046: fix flaky files-are-updated checks
30e9940356 Hopefully the final batch before -rc2
b4f0038525 Merge branch 'en/rebase-backend'
25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master
07259e74ec fsck: detect gitmodules URLs with embedded newlines
c716fe4bd9 credential: detect unrepresentable values when parsing urls
17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr
9a6bbee800 credential: avoid writing values with newlines
17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2
1afe18a3bb l10n: es: 2.26.0 round#2
5ab9217a3c Merge branch of github.com:alshopov/git-po into master
c6713676d6 Merge branch of github.com:bitigchi/git-po into master
b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t)
2713dec02d l10n: tr: v2.26.0 round 2
c9ef57cc3a l10n: fr : v2.26.0 rnd 2
120b1eb731 git-rebase.txt: highlight backend differences with commit rewording
9a1b7474d6 sequencer: clear state upon dropping a become-empty commit
937d143630 i18n: unmark a message in rebase.c
a56d361f66 Merge branch 'ds/sparse-add'
5fa9169ced Merge branch 'dr/push-remote-ref-update'
cdef998b46 Merge branch 'jc/doc-single-h-is-for-help'
051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed)
52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master
9643441983 l10n: tr: Add glossary for Turkish translations
438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv
fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git
2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u)
dd2c269652 l10n: tr: Add Turkish translations
8f4f099f8b l10n: tr: Add Turkish translation team info
b4374e96c8 Git 2.26-rc1
4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch'
3658d77f8e Merge branch 'hd/show-one-mergetag-fix'
6125104b88 Merge branch 'rt/format-zero-length-fix'
1ac37deba2 Merge branch 'am/mingw-poll-fix'
cf372dc815 Merge branch 'en/test-cleanup'
d1075adfdf Merge branch 'en/merge-path-collision'
a4fd114ffc Merge branch 'kk/complete-diff-color-moved'
a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file'
0e0d717537 Merge branch 'pb/am-show-current-patch'
9b7f726dfc Merge branch 'am/pathspec-f-f-more'
4605a73073 t1091: don't grep for `strerror()` string
4d9c2902a1 l10n: fr v2.26.0 rnd1
ad182bee3f Merge branch of github.com:alshopov/git-po into master
23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1
98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t)
f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed)
76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po
076cbdcd73 Git 2.26-rc0
0d65f3fb1a t5537: adjust test_oid label
e63cefb024 Merge branch 'hi/gpg-use-check-signature'
5da7329e29 Merge branch 'rs/commit-graph-code-simplification'
0108fc1b46 Merge branch 'js/ci-windows-update'
f3ccd9f0d9 Merge branch 'be/describe-multiroot'
a6b4709302 Merge branch 'ag/rebase-remove-redundant-code'
b22db265d6 Merge branch 'es/recursive-single-branch-clone'
e8e71848ea Merge branch 'jk/nth-packed-object-id'
a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'
4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere'
49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix'
2cbb058669 Merge branch 'bc/wildcard-credential'
25063e2530 Merge branch 'mr/bisect-in-c-1'
f4d7dfce4d Merge branch 'ds/sparse-add'
4d864895a2 t2402: test worktree path when called in .git directory
af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch()
7655b4119d remote-curl: show progress for fetches over dumb HTTP
2f268890c2 The eighth batch for 2.26
aa5a7e02ad Merge branch 'ma/test-cleanup'
58595e713c Merge branch 'rs/blame-typefix-for-fingerprint'
ff41848e99 Merge branch 'rs/micro-cleanups'
4cbf1a0e22 Merge branch 'es/worktree-cleanup'
46703057c1 Merge branch 'ak/test-log-graph'
777815f5f9 Merge branch 'jk/run-command-formatfix'
444cff61b4 Merge branch 'ds/partial-clone-fixes'
48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure'
8c22bd9ff9 Merge branch 'en/rebase-backend'
cb2f5a8e97 Merge branch 'en/check-ignore'
0df82d99da Merge branch 'jk/object-filter-with-bitmap'
80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix'
29b09c518c Merge branch 'jk/doc-diff-parallel'
237a28173f show_one_mergetag: print non-parent in hex form.
5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context"
6d1210e133 l10n: Update Catalan translation
0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification"
7329d94be7 config.mak.dev: re-enable -Wformat-zero-length
7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings
94f4d01932 mingw: workaround for hangs when sending STDIN
1ff466c018 Documentation: clarify that `-h` alone stands for `help`
65bf820d0e t6020: new test with interleaved lexicographic ordering of directories
9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it
d5bb92eced t3035: prefer test_must_fail to bash negation for git commands
b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions
42d180dd01 t602[1236], t6034: modernize test formatting
802050400a merge-recursive: apply collision handling unification to recursive case
7f487ce062 Azure Pipeline: switch to the latest agent pools
5ed9fc3fc8 ci: prevent `perforce` from being quarantined
eafff6e41e t/lib-httpd: avoid using macOS' sed
d68ce906c7 commit-graph: use progress title directly
30b1c7ad9d describe: don't abort too early when searching tags
240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to'
2d2118b814 The seventh batch for 2.26
325eb66830 Merge branch 'es/doc-mentoring'
87f17d790d Merge branch 'es/bright-colors'
d0038f4b31 Merge branch 'bw/remote-rename-update-config'
132f600b06 clone: pass --single-branch during --recurse-submodules
47319576f1 submodule--helper: use C99 named initializer
ffe005576a lib-log-graph: consolidate colored graph cmp logic
989eea958b lib-log-graph: consolidate test_cmp_graph logic
bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching
bb4995fc3f worktree: add utility to find worktree by pathname
a80c4c2214 worktree: improve find_worktree() documentation
2fecc48cad packfile: drop nth_packed_object_sha1()
6ac9760a30 packed_object_info(): use object_id internally for delta base
b99b6bcc57 packed_object_info(): use object_id for returning delta base
63f4a7fc01 pack-check: push oid lookup into loop
e31c71083a pack-check: convert "internal error" die to a BUG()
500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps
f66d4e0250 pack-objects: use object_id struct in pack-reuse code
a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id
3f83fd5e44 pack-objects: read delta base oid into object_id struct
0763671b8e nth_packed_object_oid(): use customary integer return
02bbbe9df9 worktree: drop unused code from get_main_worktree()
27f182b3fc blame: provide type of fingerprints pointer
b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere
df126ca142 t3400: make test clean up after itself
3c29e21eb0 t: drop debug `cat` calls
cac439b56d t9810: drop debug `cat` call
91de82adc9 t4117: check for files using `test_path_is_file`
4ef346482d receive.denyCurrentBranch: respect all worktrees
f8692114db t5509: use a bare repository for test push target
45f274fbb1 get_main_worktree(): allow it to be called in the Git directory
fd0bc17557 completion: add diff --color-moved[-ws]
2ce6d075fa use strpbrk(3) to search for characters from a given set
2b3c430bce quote: use isalnum() to check for alphanumeric characters
a51d9e8f07 t1050: replace test -f with test_path_is_file
3e96c66805 partial-clone: avoid fetching when looking for objects
d0badf8797 partial-clone: demonstrate bugs in partial fetch
539052f42f run-command.h: fix mis-indented struct member
6c11c6a124 sparse-checkout: allow one-character directories in cone mode
aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch
f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch
e8ef1e8d6e am: convert "resume" variable to a struct
bc8620b440 parse-options: convert "command mode" to a flag
62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE()
46fd7b3900 credential: allow wildcard patterns when matching config
82eb249853 credential: use the last matching username in the config
588c70e10f t0300: add tests for some additional cases
732f934408 t1300: add test for urlmatch with multiple wildcards
3fa0e04667 mailmap: add an additional email address for brian m. carlson
8a98758a8d stash push: support the --pathspec-from-file option
8c3713cede stash: eliminate crude option parsing
3f3d8068f5 doc: stash: synchronize <pathspec> description
b22909144c doc: stash: document more options
0093abc286 doc: stash: split options from description (2)
2b7460d167 doc: stash: split options from description (1)
5f393dc3aa rm: support the --pathspec-from-file option
fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags
73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure
6c69f22233 bisect: libify `bisect_next_all`
9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents
45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents
cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents
e8e3ce6718 bisect: libify `bisect_checkout`
ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents
7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()`
680e8a01e5 bisect: add enum to represent bisect returning codes
bfacfce7d9 bisect--helper: introduce new `decide_next()` function
b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0
292731c4c2 bisect--helper: change `retval` to `res`
16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays
7ec8125fba check-ignore: fix documentation and implementation to match
2607d39da3 doc-diff: use single-colon rule in rendering Makefile
0aa6ce3094 doc/config/push: use longer "--" line for preformatted example
20a5fd881a rev-list --count: comment on the use of count_right++
63a58457e0 Merge branch 'py/missing-bracket'
51ebf55b93 The sixth batch for 2.26
f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints'
123538444f Merge branch 'jk/doc-credential-helper'
e154451a2f Merge branch 'js/mingw-open-in-gdb'
fc25a19265 Merge branch 'js/test-unc-fetch'
6365058605 Merge branch 'js/test-avoid-pipe'
966b69f02f Merge branch 'js/test-write-junit-xml-fix'
d880c3de23 Merge branch 'jk/mailinfo-cleanup'
5d55554b1d Merge branch 'mr/show-config-scope'
9f3f38769d Merge branch 'rs/strbuf-insertstr'
cbecc168d4 Merge branch 'rs/parse-options-concat-dup'
5af345a438 Merge branch 'bc/hash-independent-tests-part-8'
0460c109c3 Merge branch 'rs/name-rev-memsave'
6b9919c0a2 git-gui: add missing close bracket
5897e5ac96 Merge branch 'cs/german-translation'
cf85a32eb6 git-gui: update German translation
5096e51c54 git-gui: extend translation glossary template with more terms
8b85bb1b70 git-gui: update pot template and German translation to current source code
e68e29171c Sync with 2.25.1
c522f061d5 Git 2.25.1
10cdb9f38a rebase: rename the two primary rebase backends
2ac0d6273f rebase: change the default backend from "am" to "merge"
8295ed690b rebase: make the backend configurable via config setting
76340c8107 rebase tests: repeat some tests using the merge backend instead of am
980b482d28 rebase tests: mark tests specific to the am-backend with --am
c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases
6d04ce75c4 git-prompt: change the prompt for interactive-based rebases
52eb738d6b rebase: add an --am option
8af14f0859 rebase: move incompatibility checks between backend options a bit earlier
be50c938df git-rebase.txt: add more details about behavioral differences of backends
befb89ce7c rebase: allow more types of rebases to fast-forward
9a70f3d4ae t3432: make these tests work with either am or merge backends
93122c985a rebase: fix handling of restrict_revision
55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer
8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling
7db00f0b3b t3406: simplify an already simple test
e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty
d48e5e21da rebase (interactive-backend): make --keep-empty the default
e0020b2f82 prefix_path: show gitdir when arg is outside repo
cc4f2eb828 doc: move credential helper info into gitcredentials(7)
bfdd66e72f Sync with maint
7ae7e234c7 The fifth batch for 2.26
53c3be2c29 Merge branch 'tb/commit-graph-object-dir'
7b029ebaef Merge branch 'jk/index-pack-dupfix'
aa21cc97bd Merge branch 'jk/alloc-cleanups'
883326077a Merge branch 'jh/notes-fanout-fix'
f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule'
78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs'
df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'
433b8aac2e Merge branch 'ds/sparse-checkout-harden'
4a77434bc8 Merge branch 'ld/p4-cleanup-processes'
8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone'
09e48400a3 Merge branch 'jk/get-oid-error-message-i18n'
4dbeecba27 Merge branch 'ag/edit-todo-drop-check'
f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2'
d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout'
251187084d Merge branch 'js/rebase-i-with-colliding-hash'
c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix'
56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store'
0da63da794 Merge branch 'jn/promote-proto2-to-default'
a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup'
daef1b300b Merge branch 'hw/advice-add-nothing'
6141e0cc00 Merge branch 'js/convert-typofix' into maint
4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint
5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint
b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint
7137d6089b Merge branch 'ms/doc-bundle-format' into maint
52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint
0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint
1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint
cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint
153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint
8857657cc9 Merge branch 'jt/t5616-robustify' into maint
1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint
f468972671 Merge branch 'bc/misconception-doc' into maint
6e69042e26 Merge branch 'bc/author-committer-doc' into maint
650ed395be Merge branch 'ds/refmap-doc' into maint
80b806f1a8 Merge branch 'bc/actualmente' into maint
eceff4ba12 Merge branch 'rt/submodule-i18n' into maint
8a17eb7972 Merge branch 'jk/test-fixes' into maint
54bbadaeca Merge branch 'jk/asan-build-fix' into maint
8dbeba198e Merge branch 'ds/sparse-cone' into maint
e361f36f61 Merge branch 'nd/switch-and-restore' into maint
4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint
ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint
5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint
c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint
d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint
9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint
3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint
3ab3185f99 pack-objects: support filters with bitmaps
84243da129 pack-bitmap: implement BLOB_LIMIT filtering
4f3bd5606a pack-bitmap: implement BLOB_NONE filtering
cc4aa28506 bitmap: add bitmap_unset() function
2aaeb9ac41 rev-list: use bitmap filters for traversal
6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure
4eb707ebd6 rev-list: allow commit-only bitmap traversals
ea047a8eb4 t5310: factor out bitmap traversal comparison
608d9c9365 rev-list: allow bitmaps when counting objects
55cb10f9b5 rev-list: make --count work with --objects
792f811998 rev-list: factor out bitmap-optimized routines
d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs
08809c09aa mingw: add a helper function to attach GDB to the current process
bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths
de26f02db1 t9001, t9116: avoid pipes
a2dc43414c MyFirstContribution: rephrase contact info
e03f928e2a rev-list: fallback to non-bitmap traversal when filtering
acac50dd8c pack-bitmap: fix leak of haves/wants object lists
551cf8b655 pack-bitmap: factor out type iterator initialization
d8437c57fa The fourth batch for 2.26
a3dcf84df0 Merge branch 'js/convert-typofix'
0de2d1409b Merge branch 'js/ci-squelch-doc-warning'
0410c2ba31 Merge branch 'jb/multi-pack-index-docfix'
0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example'
e99c325bb4 Merge branch 'ms/doc-bundle-format'
afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix'
db72f8c940 Merge branch 'jb/parse-options-message-fix'
3d2471ba85 Merge branch 'ma/filter-branch-doc-caret'
b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path'
44cba9c4b3 Merge branch 'jc/skip-prefix'
556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index'
17e4a1b141 Merge branch 'hw/doc-git-dir'
4cf7f48891 Merge branch 'jk/push-default-doc'
b783391018 Merge branch 'jk/clang-sanitizer-fixes'
a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache'
3f7553acf5 Merge branch 'jt/t5616-robustify'
341f8a6476 Merge branch 'jk/escaped-wildcard-dwim'
b486d2ee81 Merge branch 'jn/pretend-object-doc'
076ee3e8a2 tests: fix --write-junit-xml with subshells
2b0f19fa7a convert: fix typo
c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors
1751b09a92 color.c: support bright aixterm colors
4a28eb0ae4 color.c: refactor color_output arguments
f696a2b1c8 mailinfo: factor out some repeated header handling
ffbea1816d mailinfo: be more liberal with header whitespace
f447d0293e mailinfo: simplify parsing of header values
b6537d83ee mailinfo: treat header values as C strings
ef07659926 sparse-checkout: work with Windows paths
2631dc879d sparse-checkout: create 'add' subcommand
4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand
6fb705abcb sparse-checkout: extract add_patterns_from_input()
b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config
f2a2327a4a config: provide access to the current line number
923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values
ceff1a1308 remote: clean-up config callback
1a83068c26 remote: clean-up by returning early to avoid one indentation
88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types
145d59f482 config: add '--show-scope' to print the scope of a config value
9a83d088ee submodule-config: add subomdule config scope
e37efa40e1 config: teach git_config_source to remember its scope
5c105a842e config: preserve scope in do_git_config_sequence
6766e41b8a config: clarify meaning of command line scoping
6dc905d974 config: split repo scope to local and worktree
a5cb4204b6 config: make scope_name non-static and rename it
30183894ea ci: ignore rubygems warning in the "Documentation" job
7a9f8ca805 parse-options: simplify parse_options_dup()
c84078573e parse-options: const parse_options_concat() parameters
f904f9025f parse-options: factor out parse_options_count()
a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat()
517b60564e mailinfo: don't insert header prefix for handle_content_type()
a91cc7fad0 strbuf: add and use strbuf_insertstr()
eb31044ff7 pack-format: correct multi-pack-index description
9299f84921 diff-options.txt: avoid "regex" overload in example
7378ec90e1 doc: describe Git bundle format
f3037657e8 t6024: update for SHA-256
edf04243b2 t6006: make hash size independent
5db24dcffd t6000: abstract away SHA-1-specific constants
d341e0805d t5703: make test work with SHA-256
88ed241a7e t5607: make hash size independent
48c10cc0e6 t5318: update for SHA-256
f7ae8e69b6 t5515: make test hash independent
e70649bb66 t5321: make test hash independent
a30f93b143 t5313: make test hash independent
a79eec220b t5309: make test hash independent
796d1383a3 t5302: make hash size independent
417e45e5e3 t4060: make test work with SHA-256
dfa5f53e78 t4211: add test cases for SHA-256
f743e8f5b3 t4211: move SHA-1-specific test cases into a directory
72f936b120 t4013: make test hash independent
5df0f11f07 t3311: make test work with SHA-256
07877f393c t3310: make test work with SHA-256
6025e898d6 t3309: make test work with SHA-256
7b1a1822fe t3308: make test work with SHA-256
94db7e3e93 t3206: make hash size independent
db12505c2c t/lib-pack: support SHA-256
303b3c1c46 submodule: add newline on invalid submodule error
887a0fd573 add: change advice config variables used by the add API
de93cc14ab The third batch for 2.26
ea46d9097b Merge branch 'mt/sparse-checkout-doc-update'
ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix'
b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend'
7ab963e122 Merge branch 'en/fill-directory-fixes-more'
f52ab33616 Merge branch 'bc/hash-independent-tests-part-7'
25794d6ce9 Merge branch 'km/submodule-add-errmsg'
d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity'
76c57fedfa Merge branch 'js/add-p-leftover-bits'
9a5315edfd Merge branch 'js/patch-mode-in-others-in-c'
381e8e9de1 Merge branch 'dl/test-must-fail-fixes'
395518cf7a parse-options: lose an unnecessary space in an error message
079f970971 name-rev: sort tip names before applying
2d53975488 name-rev: release unused name strings
977dc1912b name-rev: generate name strings only if they are better
1c56fc2084 name-rev: pre-size buffer in get_parent_name()
ddc42ec786 name-rev: factor out get_parent_name()
f13ca7cef5 name-rev: put struct rev_name into commit slab
d689d6d82f name-rev: don't _peek() in create_or_update_name()
15a4205d96 name-rev: don't leak path copy in name_ref()
36d2419c9a name-rev: respect const qualifier
71620ca86c name-rev: remove unused typedef
3e2feb0d64 name-rev: rewrite create_or_update_name()
a21781011f index-pack: downgrade twice-resolved REF_DELTA to die()
dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout
e1c5253951 t3305: check notes fanout more carefully and robustly
e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks
a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st'
ad2dd5bb63 commit-graph.c: remove path normalization, comparison
13c2499249 commit-graph.h: store object directory in 'struct commit_graph'
0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context'
f38c92452d t7400: testcase for submodule status on unregistered inner git repos
5290d45134 tree-walk.c: break circular dependency with unpack-trees
f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch
d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode
e53ffe2704 sparse-checkout: escape all glob characters on write
e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand
bd64de42de sparse-checkout: unquote C-style strings over --stdin
d585f0e799 sparse-checkout: write escaped patterns in cone mode
4f52c2ce6c sparse-checkout: properly match escaped characters
9abc60f801 sparse-checkout: warn on globs in cone patterns
145136a95a C: use skip_prefix() to avoid hardcoded string length
04e5b3f0b4 submodule foreach: replace $path with $sm_path in example
1793280e91 t5318: don't pass non-object directory to '--object-dir'
da8063522f diff: move diff.wsErrorHighlight to "basic" config
b98d188581 sha1-file: allow check_object_signature() to handle any repo
2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file()
7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare()
c8123e72f6 streaming: allow open_istream() to handle any repo
5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile()
a651946730 cache-tree: use given repo's hash_algo at verify_one()
eb999b3295 diff: make diff_populate_filespec() honor its repo argument
5b0ca878e0 Sync with maint
344ee18728 The second batch
53a83299c7 Merge branch 'bc/misconception-doc'
c9ccf9d09b Merge branch 'bc/author-committer-doc'
0d0fa20c40 Merge branch 'ss/t6025-modernize'
7050624abc Merge branch 'lh/bool-to-type-bool'
4b69f29271 Merge branch 'ds/refmap-doc'
aff812ce3c Merge branch 'bc/actualmente'
38fb56e92a Merge branch 'rt/submodule-i18n'
f0940743fa Merge branch 'js/builtin-add-i-cmds'
0afeb3fdf4 Merge branch 'jk/test-fixes'
808dab2b58 Merge branch 'jk/asan-build-fix'
fec1ff97c2 Merge branch 'sg/completion-worktree'
c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function'
11ad30b887 Merge branch 'hi/gpg-mintrustlevel'
96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases'
d52adee779 Merge branch 'ds/graph-horizontal-edges'
6909474491 Merge branch 'am/update-pathspec-f-f-tests'
043426c8fd Merge branch 'ds/sparse-cone'
34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig'
8dd40c0472 traverse_trees(): use stack array for name entries
667b76ec58 walker_fetch(): avoid raw array length computation
9734b74a8f normalize_path_copy(): document "dst" size expectations
43f33e492a git-p4: avoid leak of file handle when cloning
19fa5ac333 git-p4: check for access to remote host earlier
6026aff5bb git-p4: cleanup better on error exit
ca5b5cce62 git-p4: create helper function importRevisions()
4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable
5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce
837b3a6376 git-p4: make closeStreams() idempotent
b0418303b1 sha1-name: mark get_oid() error messages for translation
2df1aa239c fetch: forgo full connectivity check if --filter
50033772d5 connected: verify promisor-ness of partial clone
d82ad54945 git: update documentation for --git-dir
0ad7144999 .mailmap: map Yi-Jyun Pan's email
c56c48dd07 grep: ignore --recurse-submodules if --no-index is given
8b2a1928f0 doc: drop "explicitly given" from push.default description
cf82bff73f obstack: avoid computing offsets from NULL pointer
3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer
d20bc01a51 avoid computing zero offsets from NULL pointer
7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero
bc3f657f71 t1506: drop space after redirection operator
e5d7b2f65c t1400: avoid "test" string comparisons
5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c
c7a6207591 Sync with maint
7210ca4ee5 .mailmap: fix GGG authoship screwup
37a63faae5 t4124: only mark git command with test_must_fail
a8c663cf65 t3507: use test_path_is_missing()
2def7f017c t3507: fix indentation
e8a1c686ae t3504: do check for conflict marker after failed cherry-pick
1c9fd32fd2 t3419: stop losing return code of git command
c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}()
a781cd6fef t3415: stop losing return codes of git commands
86ce6e0dd1 t3310: extract common notes_merge_files_gone()
245b9ba0ba t3030: use test_path_is_missing()
4a6f11fd7b t2018: replace "sha" with "oid"
62e80fcb48 t2018: don't lose return code of git commands
30c0367668 t2018: teach do_checkout() to accept `!` arg
40caa5366a t2018: be more discerning when checking for expected exit codes
b54128bb0b t5616: make robust to delta base change
4c616c2ba1 merge-recursive: use subtraction to flip stage
ee798742bd merge-recursive: silence -Wxor-used-as-pow warning
39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule
a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin
3b2885ec9b submodule: fix status of initialized but not cloned submodules
ace912bfb8 t7400: add a testcase for submodule status on empty dirs
4bb4fd4290 MyFirstContribution: add avenues for getting help
9e6d3e6417 sparse-checkout: detect short patterns
41de0c6fbc sparse-checkout: cone mode does not recognize "**"
7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone
47dbf10d8a clone: fix --sparse option with URLs
3c754067a1 sparse-checkout: create leading directories
d622c34396 t1091: improve here-docs
522e641748 t1091: use check_files to reduce boilerplate
417be08d02 t1300: create custom config file without special characters
3de7ee369b t1300: fix over-indented HERE-DOCs
329e6ec397 config: fix typo in variable name
767a9c417e rebase -i: stop checking out the tip of the branch to rebase
dfaed02862 fsmonitor: update documentation for hook version and watchman hooks
e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2
d031049da3 completion: add support for sparse-checkout
a402723e48 doc: sparse-checkout: mention --cone option
26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck
b6992261de rebase -i: re-fix short SHA-1 collision
d859dcad94 parse_insn_line(): improve error message when parsing failed
d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects
92fb0db94c pack-objects: add checks for duplicate objects
bb514de356 pack-objects: improve partial packfile reuse
ff483026a9 builtin/pack-objects: introduce obj_is_packed()
e704fc7978 pack-objects: introduce pack.allowPackReuse
2f4af77699 csum-file: introduce hashfile_total()
8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting()
59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile
40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains()
14fbd26044 ewah/bitmap: introduce bitmap_word_alloc()
bc7a3d4dc0 The first batch post 2.25 cycle
09e393d913 Merge branch 'nd/switch-and-restore'
45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport'
0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout'
36da2a8635 Merge branch 'es/unpack-trees-oob-fix'
42096c778d Merge branch 'bc/run-command-nullness-after-free-fix'
1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted'
a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees'
e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached'
9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting'
237a83a943 Merge branch 'dl/credential-netrc'
a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir()
129510a067 t2405: clarify test descriptions and simplify test
4eaadc8493 t2405: use git -C and test_commit -C instead of subshells
773c60a45e t7410: rename to t2405-worktree-submodule.sh
7a2dc95cbc docs: mention when increasing http.postBuffer is valuable
1b13e9032f doc: dissuade users from trying to ignore tracked files
69e104d70e doc: provide guidance on user.name format
813f6025a5 docs: expand on possible and recommended user config options
bc94e5862a doc: move author and committer information to git-commit(1)
7979dfe1d4 l10n: Update Catalan translation
81e3db42f3 templates: fix deprecated type option `--bool`
c513a958b6 t6025: use helpers to replace test -f <path>
70789843bd t6025: modernize style
6a7aca6f01 doc: rm: synchronize <pathspec> description
856249c62a docs: use "currently" for the present time
b40a50264a fetch: document and test --refmap=""
a9ae8fde2e t3404: directly test the behavior of interest
22a69fda19 git-rebase.txt: update description of --allow-empty-message
f1928f04b2 grep: use no. of cores as the default no. of threads
70a9fef240 grep: move driver pre-load out of critical section
1184a95ea2 grep: re-enable threads in non-worktree case
6c307626f1 grep: protect packed_git [re-]initialization
c441ea4edc grep: allow submodule functions to run in parallel
d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules()
1d1729caeb grep: replace grep_read_mutex by internal obj read lock
31877c9aec object-store: allow threaded access to object reading
b1fc9da1c8 replace-object: make replace operations thread-safe
d5b0bac528 grep: fix racy calls in grep_objects()
faf123c730 grep: fix race conditions at grep_submodule()
c3a5bb31c1 grep: fix race conditions on userdiff calls
0222540827 fetch: emphasize failure during submodule fetch
232378479e Sync with maint
e4837b4406 t7800: don't rely on reuse_worktree_file()
fbce03d329 t4018: drop "debugging" cat from hunk-header tests
f65d07fffa Makefile: use compat regex with SANITIZE=address
849e43cc18 built-in add -i: accept open-ended ranges again
d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files
a4ffbbbb99 submodule.c: mark more strings for translation
0cbb60574e dir: point treat_leading_path() warning to the right place
ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent
22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2
f365bf40a0 clean: demonstrate a bug with pathspecs
b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x
277eb5af7c t5604: make hash independent
44b6c05b43 t5601: switch into repository to hash object
7a868c51c2 t5562: use $ZERO_OID
1b8f39fb0d t5540: make hash size independent
a8c17e3bd6 t5537: make hash size independent
832072219c t5530: compute results based on object length
74ad99b1d8 t5512: abstract away SHA-1-specific constants
ba1be1ab45 t5510: make hash size independent
cba472d3ad t5504: make hash algorithm independent
82d5aeb1e6 t5324: make hash size independent
3c5e65cac1 t5319: make test work with SHA-256
235d3cddb8 t5319: change invalid offset for SHA-256 compatibility
1d86c8f0ce t5318: update for SHA-256
525a7f1769 t4300: abstract away SHA-1-specific constants
7a1bcb251b t4204: make hash size independent
cb78f4f0fe t4202: abstract away SHA-1-specific constants
717c939d8f t4200: make hash size independent
08a9dd891c t4134: compute appropriate length constant
215b60bf07 t4066: compute index line in diffs
194264c185 t4054: make hash-size independent
7d5ecd775d completion: list paths and refs for 'git worktree add'
3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands
3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options
367efd54b3 completion: return the index of found word from __git_find_on_cmdline()
d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function
2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper
54887b4689 gpg-interface: add minTrustLevel as a configuration option
684ceae32d fetch: default to protocol version 2
33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION
8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate
b9ab170752 config doc: protocol.version is not experimental
07ef3c6604 fetch test: use more robust test for filtered objects
d6509da620 fetch test: mark test of "skipping" haves as v0-only
a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too
c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function
bf66db37f1 add: use advise function to display hints
c958d3bd0a graph: fix collapse of multiple edges
8588932e20 graph: add test to demonstrate horizontal line bug
d0d0a357a1 t: directly test parse_pathspec_file()
568cabb2fe t: fix quotes tests for --pathspec-from-file
f94f7bd00d t: add tests for error conditions with --pathspec-from-file
b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job
12acdf573a built-in add -p: handle Escape sequences more efficiently
e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode
04f816b125 built-in add -p: respect the `interactive.singlekey` config setting
a5e46e6b01 terminal: add a new function to read a single keystroke
9ea416cb51 terminal: accommodate Git for Windows' default terminal
94ac3c31f7 terminal: make the code of disable_echo() reusable
08b1ea4c39 built-in add -p: handle diff.algorithm
180f48df69 built-in add -p: support interactive.diffFilter
1e4ffc765d t3701: adjust difffilter test
c81638541c submodule add: show 'add --dry-run' stderr when aborting
8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token
56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token
d0654dc308 Git 2.25
b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po
4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'"
ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1
e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master
1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
d78a1968c5 Merge branch 'ma/config-advice-markup-fix'
a20ae3ee29 l10n: Update Catalan translation
49e268e23e mingw: safeguard better against backslashes in file names
4c6c7971e0 unpack-trees: correctly compute result count
63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1
75449c1b39 l10n: de.po: Reword generation numbers
6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t)
3901d2c6bd config/advice.txt: fix description list separator
7a6a90c6ec Git 2.25-rc2
1f5f3ffe5c Merge branch 'ds/graph-assert-fix'
a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix'
202f68b252 Merge branch 'pm/am-in-body-header-doc-update'
7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix'
c5dc20638b Merge branch 'do/gitweb-typofix-in-comments'
fe47c9cb5f Merge https://github.com/prati0100/git-gui
a1087c9367 graph: fix lack of color in horizontal lines
0d251c3291 graph: drop assert() for merge with two collapsing parents
4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper
573117dfa5 unpack-trees: watch for out-of-range index position
e701bab3e9 restore: invalidate cache-tree when removing entries with --staged
1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command
fa74180d08 checkout: don't revert file on ambiguous tracking branches
2957709bd4 parse_branchname_arg(): extract part as new function
5020f6806a t2018: improve style of if-statement
7ffb54618b t2018: add space between function name and ()
63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH
065027ee1a string-list: note in docs that callers can specify sorting function
26f924d50e unpack-trees: exit check_updates() early if updates are not wanted
042ed3e048 The final batch before -rc2
0f1930cd1b Merge branch 'ds/sparse-cone'
037f067587 Merge branch 'ds/commit-graph-set-size-mult'
f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify'
c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode'
a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
c4117fcb97 Merge branch 'pb/clarify-line-log-doc'
556f0258df Merge branch 'ew/packfile-syscall-optim'
5814d44d9b doc: submodule: fix typo for command absorbgitdirs
7047f75f22 editorconfig: indent text files with tabs
60440d72db sha1-file: document how to use pretend_object_file
7fdc5f296f l10n: es: 2.25.0 round #1
f8740c586b am: document that Date: can appear as an in-body header
4e2c4c0d4f gitweb: fix a couple spelling errors in comments
421c0ffb02 multi-pack-index: correct configuration in documentation
757ff352bd Documentation/git-sparse-checkout.txt: fix a typo
0d2116c644 Merge branch 'zs/open-current-file'
9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u)
3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master
4c5081614c l10n: fr.po v2.25.0 rnd 1
5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0
63020f175f commit-graph: prefer default size_mult when given zero
224c7d70fa mingw: only test index entries for backslashes, not tree entries
9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED
8679ef24ed Git 2.25-rc1
a82027e9e6 Merge branch 'js/use-test-tool-on-path'
13432fc6dd Merge branch 'js/mingw-reserved-filenames'
e0e1ac5db0 Merge branch 'en/rebase-signoff-fix'
b76a244c9d Merge branch 'em/freebsd-cirrus-ci'
bc855232bc Merge branch 'bk/p4-misc-usability'
763a59e71c merge-recursive: remove unnecessary oid_eq function
44143583b7 sparse-checkout: use extern for global variables
d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master
13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1
786f4d2405 git-gui: allow opening currently selected file in default app
4fd683b6a3 sparse-checkout: document interactions with submodules
de11951b03 sparse-checkout: list directories in cone mode
0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0
578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed)
173fff68da Merge tag 'v2.25.0-rc0' into git-po-master
f1842ff531 t2018: remove trailing space from test description
20a67e8ce9 t3008: find test-tool through path lookup
9e341f62ca l10n: Update Catalan translation
4e61b2214d packfile: replace lseek+read with pread
ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision
2be45868a8 doc: log, gitk: document accepted line-log diff formats
280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD
0a76bd7381 mailmap: mask accentless variant for Công Danh
99c33bed56 Git 2.25-rc0
d2189a721c Merge branch 'en/fill-directory-fixes'
8be0a428d6 Merge branch 'rs/test-cleanup'
65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string'
c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
45b96a6fa1 Merge branch 'js/add-p-in-c'
ccc292e862 Merge branch 'jc/drop-gen-hdrs'
dfee504bee Merge branch 'ja/doc-markup-cleanup'
87cbb1ca66 Merge branch 'rs/ref-read-cleanup'
20aa6d88b7 Merge branch 'rb/p4-lfs'
fcd5b55f56 Merge branch 'pb/submodule-doc-xref'
4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free'
ba6b66281e Merge branch 'ln/userdiff-elixir'
bd72a08d6c Merge branch 'ds/sparse-cone'
f3c520e17f Merge branch 'sg/name-rev-wo-recursion'
6514ad40a1 Merge branch 'ra/t5150-depends-on-perl'
17066bea38 Merge branch 'dl/format-patch-notes-config-fixup'
135365dd99 Merge branch 'am/pathspec-f-f-checkout'
ff0cb70d45 Merge branch 'am/pathspec-from-file'
4dc42c6c18 mingw: refuse paths containing reserved names
98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16
c480eeb574 commit --interactive: make it work with the built-in `add -i`
cee6cb7300 built-in add -p: implement the "worktree" patch modes
52628f94fc built-in add -p: implement the "checkout" patch modes
6610e4628a built-in stash: use the built-in `git add -p` if so configured
90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting
36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes
d2a233cb8b built-in add -p: prepare for patch modes other than "stage"
761e3d26bb sparse-checkout: improve OS ls compatibility
6579d93a97 contrib/credential/netrc: work outside a repo
1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable
b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI
b441717256 t1507: inline full_name()
9291e6329e t1507: run commands within test_expect_success
5236fce6b4 t1507: stop losing return codes of git commands
10812c2337 t1501: remove use of `test_might_fail cp`
62d58cda69 t1409: use test_path_is_missing()
b87b02cfe6 t1409: let sed open its own input file
9b92070e52 t1307: reorder `nongit test_must_fail`
3595d10c26 t1306: convert `test_might_fail rm` to `rm -f`
f511bc02ed t0020: use ! check_packed_refs_marked
f6041abdcd t0020: don't use `test_must_fail has_cr`
f46c243e66 t0003: don't use `test_must_fail attr_check`
99c049bc4c t0003: use test_must_be_empty()
3738439c77 t0003: use named parameters in attr_check()
7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err()
b8afb908c2 t/lib-git-p4: use test_path_is_missing()
4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases
6836d2fe06 dir.c: use st_add3() for allocation size
c847dfafee dir: consolidate similar code in treat_directory()
777b420347 dir: synchronize treat_leading_path() and read_directory_recursive()
b9670c1f5e dir: fix checks on common prefix directory
5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit
23cbe427c4 Merge branch 'py/console-close-esc'
124a895811 t4015: improve coverage of function context test
509efef789 commit: forbid --pathspec-from-file --all
12029dc57d t3434: mark successful test as such
e0f9095aaa notes.h: fix typos in comment
675ef6bab8 t6030: don't create unused file
01ed17dc8c t5580: don't create unused file
f670adb49b t3501: don't create unused file
1e1ccbfdd3 git-gui: allow closing console window with Escape
7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays.
b02fd2acca The sixth batch
59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex'
e3b72391d1 Merge branch 'rs/commit-export-env-simplify'
43bf44e23a Merge branch 'rs/archive-zip-code-cleanup'
4438a1a59f Merge branch 'js/t3404-indent-fix'
3a44db2ed2 Merge branch 'dr/branch-usage-casefix'
8bc481f4f6 Merge branch 'sg/t9300-robustify'
011fc2e88e Merge branch 'js/add-i-a-bit-more-tests'
d1c0fe8d9b Merge branch 'dl/range-diff-with-notes'
26c816a67d Merge branch 'hw/doc-in-header'
f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
71a7de7a99 Merge branch 'dl/rebase-with-autobase'
c9f5fc9114 Merge branch 'dl/test-cleanup'
6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap'
3beff388b2 Merge branch 'js/builtin-add-i-cmds'
4755a34c47 Merge branch 'dd/time-reentrancy'
37c2619d91 Merge branch 'ag/sequencer-todo-updates'
608e380502 git-p4: show detailed help when parsing options fail
e2aed5fd5b git-p4: yes/no prompts should sanitize user text
571fb96573 fix-typo: consecutive-word duplications
f371984613 Makefile: drop GEN_HDRS
2e4083198d built-in add -p: show helpful hint when nothing can be staged
54d9d9b2ee built-in add -p: only show the applicable parts of the help text
ade246efed built-in add -p: implement the 'q' ("quit") command
d6cf873340 built-in add -p: implement the '/' ("search regex") command
9254bdfb4f built-in add -p: implement the 'g' ("goto") command
bcdd297b78 built-in add -p: implement hunk editing
b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf"
11f2c0dae8 built-in add -p: coalesce hunks after splitting them
510aeca199 built-in add -p: implement the hunk splitting feature
0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions
5906d5de77 built-in app -p: allow selecting a mode change as a "hunk"
47dc4fd5eb built-in add -p: handle deleted empty files
80399aec5a built-in add -p: support multi-file diffs
7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed
12c24cf850 built-in add -p: color the prompt and the help text
25ea47af49 built-in add -p: adjust hunk headers as needed
e3bd11b4eb built-in add -p: show colored hunks by default
1942ee44e8 built-in add -i: wire up the new C code for the `patch` command
f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C
d1b1384d61 userdiff: remove empty subexpression from elixir regex
df5be01669 doc: indent multi-line items in list
fd5041e127 doc: remove non pure ASCII characters
190a65f9db sparse-checkout: respect core.ignoreCase in cone mode
1d7297513d notes: break set_display_notes() into smaller functions
66f79ee23d config/format.txt: clarify behavior of multiple format.notes
cc2bd5c45d gitmodules: link to gitsubmodules guide
99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed
e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed
8c02fe6060 t7004: don't create unused file
cb05d6a5ed t4256: don't create unused file
c5c4eddd56 dir: break part of read_directory_recursive() out for reuse
072a231016 dir: exit before wildcard fall-through if there is no wildcard
2f5d3847d4 dir: remove stray quote character in comment
a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories"
452efd11fb t3011: demonstrate directory traversal failures
ea94b16fb8 git-p4: honor lfs.storage configuration variable
51a0a4ed95 bisect--helper: avoid use-after-free
d32e065a91 Merge branch 'kk/branch-name-encoding'
ad05a3d8e5 The fifth batch
7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix'
b089e5e6cb Merge branch 'em/test-skip-regex-illseq'
930078ba39 Merge branch 'hi/gpg-use-check-signature'
08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode'
7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk'
55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm'
41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress'
5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise'
dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix'
d37cfe3b5c Merge branch 'dl/pretty-reference'
99c4ff1bda Merge branch 'dl/submodule-set-url'
55d607d85b Merge branch 'js/mingw-inherit-only-std-handles'
c58ae96fc4 Merge branch 'am/pathspec-from-file'
7c88714262 Merge branch 'po/bundle-doc-clonable'
5d9324e0f4 Merge branch 'ra/rebase-i-more-options'
7034cd094b Sync with Git 2.24.1
09ac67a183 format-patch: move git_config() before repo_init_revisions()
8164c961e1 format-patch: use --notes behavior for format.notes
452538c358 notes: extract logic into set_display_notes()
e6e230eeae notes: create init_display_notes() helper
1e6ed5441a notes: rename to load_display_notes()
2866fd284c name-rev: cleanup name_ref()
49f7a2fde9 name-rev: eliminate recursion in name_rev()
fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name'
e05e8cf074 archive-zip: use enum for compression method
39acfa3d22 git gui: fix branch name encoding error
11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description
8cf8f9b4aa t3404: fix indentation
4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs
147ee35558 commit: use strbuf_add() to add a length-limited string
559c6fc317 The fourth batch
56e6c16394 Merge branch 'dl/lore-is-the-archive'
3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive'
7cb0d37f6d Merge branch 'tg/perf-remove-stale-result'
403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick'
f0cf2fee5d Merge branch 'hi/grep-do-not-return-void'
391fb22ac7 Merge branch 'rs/use-skip-prefix-more'
92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd'
4ba74ca901 Merge branch 'rs/test-cleanup'
f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick'
ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9'
8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters
3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances
dd432a6ecf name-rev: restructure parsing commits and applying date cutoff
dd090a8a37 name-rev: pull out deref handling from the recursion
766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper
d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev()
bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation
e0c4da6f2a name-rev: avoid unnecessary cast in name_ref()
c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name()
c593a26348 t6120-describe: modernize the 'check_describe' helper
abcf857300 range-diff: clear `other_arg` at end of function
f8675343d7 range-diff: mark pointers as const
828765dfe0 t3206: fix incorrect test name
0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early
21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile
b4bbbbd5a2 apply --allow-overlap: fix a corner case
89c8559367 git add -p: use non-zero exit code when the diff generation failed
e91162be9c t3701: verify that the diff.algorithm config setting is handled
0c3222c4f3 t3701: verify the shown messages when nothing can be added
24be352d52 t3701: add a test for the different `add -p` prompts
8539b46534 t3701: avoid depending on the TTY prerequisite
0f0fba2cc8 t3701: add a test for advanced split-hunk editing
53a06cf39b Git 2.24.1
67af91c47a Sync with 2.23.1
a7312d1a28 Git 2.23.1
7fd9fd94fb Sync with 2.22.2
d9589d4051 Git 2.22.2
5421ddd8d0 Sync with 2.21.1
367f12b7e9 Git 2.21.1
20c71bcf67 Merge branch 'fix-msys2-quoting-bugs'
7d8b676992 mingw: sh arguments need quoting in more circumstances
d9061ed9da t7415: drop v2.20.x-specific work-around
04522edbd4 mingw: fix quoting of empty arguments for `sh`
49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts
e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly
fc346cb292 Sync with 2.20.2
4cd1cf31ef Git 2.20.2
c154745074 submodule: defend against submodule.update = !command in .gitmodules
4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x
d851d94151 Sync with 2.19.3
caccc527ca Git 2.19.3
7c9fbda6e2 Sync with 2.18.2
9877106b01 Git 2.18.2
14af7ed5a9 Sync with 2.17.3
a5ab8d0317 Git 2.17.3
bb92255ebe fsck: reject submodule.update = !command in .gitmodules
bdfef0492c Sync with 2.16.6
eb288bc455 Git 2.16.6
68440496c7 test-drop-caches: use `has_dos_drive_prefix()`
9ac92fed5b Sync with 2.15.4
7cdafcaacf Git 2.15.4
e904deb89d submodule: reject submodule.update = !command in .gitmodules
d3ac8c3f27 Sync with 2.14.6
66d2a6159f Git 2.14.6
083378cc35 The third batch
88bd37a2d0 Merge branch 'js/pkt-line-h-typofix'
473b431410 Merge branch 'us/unpack-trees-fsmonitor'
e0f9ec9027 Merge branch 'sg/test-bool-env'
fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset'
e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere'
88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory'
8feb47e882 Merge branch 'dl/t5520-cleanup'
6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree'
57d46bc602 Merge branch 'mg/doc-submodule-status-cached'
75bd003c7b Merge branch 'js/git-svn-use-rebase-merges'
f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix'
c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'
36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree'
cf91c31688 Merge branch 'sg/unpack-progress-throughput'
ef6104581d Merge branch 'pb/submodule-update-fetches'
7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix'
f3c7bfdde2 Merge branch 'dl/range-diff-with-notes'
9502b616f1 Merge branch 'jh/userdiff-python-async'
76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2'
995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label'
f7998d9793 Merge branch 'js/builtin-add-i'
917d0d6234 Merge branch 'js/rebase-r-safer-label'
56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers'
2763530048 Merge branch 'jg/revert-untracked'
fa38ab68b0 git-gui: revert untracked files by deleting them
d9c6469f38 git-gui: update status bar to track operations
29a9366052 git-gui: consolidate naming conventions
0bb313a552 xdiff: unignore changes in function context
2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names'
65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods'
5532ebdeb7 Merge branch 'fix-mingw-quoting-bug'
76a681ce9c Merge branch 'dubiously-nested-submodules'
dd53ea7220 Merge branch 'turn-on-protectntfs-by-default'
f82a97eb91 mingw: handle `subst`-ed "DOS drives"
7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams'
d2c84dad1c mingw: refuse to access paths with trailing spaces or periods
379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh
817ddd64c2 mingw: refuse to access paths with illegal characters
cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors
7530a6287e quote-stress-test: allow skipping some trials
35edce2056 t6130/t9350: prepare for stringent Win32 path validation
55953c77c0 quote-stress-test: accept arguments to test via the command-line
ad15592529 tests: add a helper to stress test argument quoting
a8dee3ca61 Disallow dubiously-nested submodule git directories
9102f958ee protect_ntfs: turn on NTFS protection by default
91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams
6d8684161e mingw: fix quoting of arguments
3a85dc7d53 is_ntfs_dotgit(): speed it up
7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses
288a74bcd2 is_ntfs_dotgit(): only verify the leading segment
a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark
cae0bc09ab rebase: fix format.useAutoBase breakage
945dc55dda format-patch: teach --no-base
700e006c5d t4014: use test_config()
a749d01e1d format-patch: fix indentation
0c47e06176 t3400: demonstrate failure with format.useAutoBase
d9b31db2c4 t7700: stop losing return codes of git commands
3699d69df0 t7700: make references to SHA-1 generic
dcf9a748ca t7700: replace egrep with grep
cfe5eda02a t7700: consolidate code into test_has_duplicate_object()
ae475afc0f t7700: consolidate code into test_no_missing_in_packs()
14b7664df8 doc: replace LKML link with lore.kernel.org
d23f9c8e04 RelNotes: replace Gmane with real Message-IDs
dcee037228 doc: replace MARC links with lore.kernel.org
a9aecc7abb checkout, restore: support the --pathspec-from-file option
cfd9376c1d doc: restore: synchronize <pathspec> description
8ea1189eac doc: checkout: synchronize <pathspec> description
6fdc9ad259 doc: checkout: fix broken text reference
1d022bb43f doc: checkout: remove duplicate synopsis
bebb5d6d6b add: support the --pathspec-from-file option
21bb3083c3 cmd_add: prepare for next patch
4778452597 Merge branch 'prevent-name-squatting-on-windows'
a7b1ad3b05 Merge branch 'jk/fast-import-unsafe'
525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()`
e1d911dd4c mingw: disallow backslash characters in tree objects' file names
0060fd1511 clone --recurse-submodules: prevent name squatting on Windows
a52ed76142 fast-import: disallow "feature import-marks" by default
68061e3470 fast-import: disallow "feature export-marks" by default
019683025f fast-import: delay creating leading directories for export-marks
e075dba372 fast-import: stop creating leading directories for import-marks
11e934d56e fast-import: tighten parsing of boolean command line options
816f806786 t9300: create marks files for double-import-marks test
f94804c1f2 t9300: drop some useless uses of cat
4f3e57ef13 submodule--helper: advise on fatal alternate error
10c64a0b3c Doc: explain submodule.alternateErrorStrategy
ec48540fe8 packfile.c: speed up loading lots of packfiles
3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value
a4fb016ba1 pkt-line: fix a typo
0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r
e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data
228f53135a The second batch
6c630f237e Merge branch 'jk/gitweb-anti-xss'
3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell'
4775e02a5c Merge branch 'ma/t7004'
a6c6f8d02a Merge branch 'js/complete-svn-recursive'
3ae8defaf9 Merge branch 'jk/send-pack-remote-failure'
aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix'
4ab9616c76 Merge branch 'sg/skip-skipped-prereq'
723a8adba5 Merge branch 'ds/test-read-graph'
9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation'
406ca29e0d Merge branch 'rs/parse-options-dup-null-fix'
fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging'
8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion'
ef8f621045 Merge branch 'dl/complete-rebase-onto'
3c3e5d0ea2 Merge branch 'tg/stash-refresh-index'
43c5fe1c1d Merge branch 'nn/doc-rebase-merges'
6511cb33c9 Merge branch 'dd/sequencer-utf8'
f165457618 Merge branch 'jk/remove-sha1-to-hex'
a774064fb0 Merge branch 'dj/typofix-merge-strat'
ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates'
d2489ce92c Merge branch 'rs/skip-iprefix'
376e7309e1 Merge branch 'ln/userdiff-elixir'
9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log'
d3096d2ba6 Merge branch 'en/doc-typofix'
26f20fa3fc Merge branch 'ns/test-desc-typofix'
ffd130a363 Merge branch 'en/t6024-style'
5149902ff9 Merge branch 'en/misc-doc-fixes'
bcb06e204c Merge branch 'js/fetch-multi-lockfix'
d08daec001 Merge branch 'rs/trace2-dots'
fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix'
bad5ed39cd Merge branch 'cb/curl-use-xmalloc'
7ab2088255 Merge branch 'rt/fetch-message-fix'
f089ddd56a Merge branch 'es/myfirstcontrib-updates'
3c90710c0c Merge branch 'hw/config-doc-in-header'
d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code'
5444d52866 Merge branch 'js/vreportf-wo-buffering'
05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add'
ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides'
532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default'
dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists'
fac9ab1419 Merge branch 'ma/bisect-doc-sample-update'
a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix'
0be5caf97c Merge branch 'jc/log-graph-simplify'
0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck'
2e697ced9d built-in add -i: offer the `quit` command
d7633578b5 built-in add -i: re-implement the `diff` command
8746e07277 built-in add -i: implement the `patch` command
ab1e1cccaf built-in add -i: re-implement `add-untracked` in C
c54ef5e424 built-in add -i: re-implement `revert` in C
a8c45be939 built-in add -i: implement the `update` command
f37c226454 built-in add -i: prepare for multi-selection commands
c08171d156 built-in add -i: allow filtering the modified files list
0c3944a628 add-interactive: make sure to release `rev.prune_data`
4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance
867fc7f310 grep: don't return an expression from pcre2_free()
c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables
72b006f4bf gpg-interface: prefer check_signature() for GPG verification
7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD
b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r
ccd469450a date.c: switch to reentrant {gm,local}time_r
271c351b2f t7811: don't create unused file
65efb42862 t9300: don't create unused file
f6b9413baf sequencer: fix a memory leak in sequencer_continue()
3eae30e464 doc: replace public-inbox links with lore.kernel.org
46c67492aa doc: recommend lore.kernel.org over public-inbox.org
5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects
17a4ae92ea t7700: s/test -f/test_path_is_file/
d2eee32a89 t7700: move keywords onto their own line
7a1c8c2346 t7700: remove spaces after redirect operators
09279086e8 t7700: drop redirections to /dev/null
756ee7fc9f t7501: stop losing return codes of git commands
38c1aa01de t7501: remove spaces after redirect operators
763b47bafa t5703: stop losing return codes of git commands
eacaa1c180 t5703: simplify one-time-sed generation logic
a29b2429e5 t5317: use ! grep to check for no matching lines
6c37f3ec1b t5317: stop losing return codes of git commands
b66e0a1773 t4138: stop losing return codes of git commands
afd43c9905 t4015: use test_write_lines()
946d2353a3 t4015: stop losing return codes of git commands
50cd31c652 t3600: comment on inducing SIGPIPE in `git rm`
3b737381d8 t3600: stop losing return codes of git commands
0d913dfa7e t3600: use test_line_count() where possible
29a40b5a67 t3301: stop losing return codes of git commands
9b5a9fa60a t0090: stop losing return codes of git commands
17aa9d9c1a t0014: remove git command upstream of pipe
77a946be98 apply-one-time-sed.sh: modernize style
176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job
ed254710ee test: use test_must_be_empty F instead of test_cmp empty F
c74b3cbb83 t7812: add missing redirects
213dabf49d test: use test_must_be_empty F instead of test -z $(cat F)
c93a5aaec8 t1400: use test_must_be_empty
6e4826ea75 t1410: use test_line_count
a5d04a3ef9 t1512: use test_line_count
54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd()
2059e79c0d name-rev: use skip_prefix() instead of starts_with()
1768aaf01d push: use skip_prefix() instead of starts_with()
ec6ee0c07a shell: use skip_prefix() instead of starts_with()
7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with()
a6293f5d28 fetch: use skip_prefix() instead of starts_with()
13ca8fb79e t5150: skip request-pull test if Perl is disabled
ecc0869080 commit-graph: use start_delayed_progress()
44a4693bfc progress: create GIT_PROGRESS_DELAY
528d9e6d01 t/perf: don't depend on Git.pm
b8dcc45387 perf-lib: use a single filename for all measurement types
fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk'
d82dfa7f5b rebase -i: finishing touches to --reset-author-date
1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory
393adf7a6f sequencer: directly call pick_commits() from complete_action()
a2dd67f105 rebase: fill `squash_onto' in get_replay_opts()
3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function
34065541e3 sequencer: update `done_nr' when skipping commands in a todo list
8638114e06 sequencer: update `total_nr' when adding an item to a todo list
0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk
ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk
ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions
9917eca794 l10n: zh_TW: add translation for v2.24.0
0a8e3036a3 reset: parse rev as tree-ish in patch mode
f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits
8d483c8408 doc: document 'git submodule status --cached'
befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick
ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later
9a780a384d mingw: spawned processes need to inherit only standard handles
c5a03b1e29 mingw: work around incorrect standard handles
eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes
a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool
43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values
2d05ef2778 sequencer: fix empty commit check when amending
ea8b7be147 git svn: stop using `rebase --preserve-merges`
67a6ea6300 gpg-interface: limit search for primary key fingerprint
392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern
cff4e9138d sparse-checkout: check for dirty status
416adc8711 sparse-checkout: update working directory in-process for 'init'
f75a69f880 sparse-checkout: cone mode should not interact with .gitignore
fb10ca5b54 sparse-checkout: write using lockfile
99dfa6f970 sparse-checkout: use in-process update for disable subcommand
e091228e17 sparse-checkout: update working directory in-process
e9de487aa3 sparse-checkout: sanitize for nested folders
4dcd4def3c unpack-trees: add progress to clear_ce_flags()
eb42feca97 unpack-trees: hash less in cone mode
af09ce24a9 sparse-checkout: init and set in cone mode
96cc8ab531 sparse-checkout: use hashmaps for cone patterns
879321eb0b sparse-checkout: add 'cone' mode
e6152e35ff trace2: add region in clear_ce_flags
72918c1ad9 sparse-checkout: create 'disable' subcommand
7bffca95ea sparse-checkout: add '--stdin' option to set subcommand
f6039a9423 sparse-checkout: 'set' subcommand
d89f09c828 clone: add --sparse mode
bab3c35908 sparse-checkout: create 'init' subcommand
94c0956b60 sparse-checkout: create builtin with 'list' subcommand
679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files
df6d3d6802 lib-bash.sh: move `then` onto its own line
2a02262078 t5520: replace `! git` with `test_must_fail git`
c245e58bb6 t5520: remove redundant lines in test cases
a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp
e959a18ee7 t5520: don't put git in upstream of pipe
5540ed27bc t5520: test single-line files by git with test_cmp
dd0f1e767b t5520: use test_cmp_rev where possible
979f8891cc t5520: replace test -{n,z} with test-lib functions
3037d3db90 t5520: use test_line_count where possible
93a9bf876b t5520: remove spaces after redirect operator
ceeef863de t5520: replace test -f with test-lib functions
4c8b046f82 t5520: let sed open its own input
53c62b9810 t5520: use sq for test case names
e8d1eaf9b4 t5520: improve test style
2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals
8cb7980382 t0000: test multiple local assignment
5b583e6a09 format-patch: pass notes configuration to range-diff
bd36191886 range-diff: pass through --notes to `git log`
9f726e1b87 range-diff: output `## Notes ##` header
3bdbdfb7a5 t3206: range-diff compares logs with commit notes
75c5aa0701 t3206: s/expected/expect/
79f3950d02 t3206: disable parameter substitution in heredoc
3a6e48e9f7 t3206: remove spaces after redirect operators
26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish
077a1fda82 userdiff: support Python async functions
3798149a74 SubmittingPatches: use `--pretty=reference`
1f0fc1db85 pretty: implement 'reference' format
618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type
0df621172d pretty: provide short date format
ac52d9410e t4205: cover `git log --reflog -z` blindspot
3e8ed3b93e pretty.c: inline initalize format_context
4982516451 revision: make get_revision_mark() return const pointer
f0f9de2bd7 completion: complete `tformat:` pretty format
fb2ffa77a6 SubmittingPatches: remove dq from commit reference
bae74c9dfb pretty-formats.txt: use generic terms for hash
bd00717eab SubmittingPatches: use generic terms for hash
9d45ac4cbf rev-list-options.txt: remove reference to --show-notes
828e829b9e argv-array: add space after `while`
e440fc5888 commit: support the --pathspec-from-file option
66a25a7242 doc: commit: synchronize <pathspec> description
64bac8df97 reset: support the `--pathspec-from-file` option
d137b50756 doc: reset: synchronize <pathspec> description
24e4750c96 pathspec: add new function to parse file
0dbc4a0edf ci(osx): update homebrew-cask repository with less noise
e02058a729 sequencer: handle rebase-merges for "onto" message
bae60ba7e9 builtin/unpack-objects.c: show throughput progress
2d92ab32fd rev-parse: make --show-toplevel without a worktree an error
9e5afdf997 fetch: add trace2 instrumentation
4c4066d95d run-command: move doc to run-command.h
6c51cb525d trace2: move doc to trace2.h
7db0305438 parse-options: add link to doc file in parse-options.h
d95a77d059 submodule-config: move doc to submodule-config.h
f3b9055624 credential: move doc to credential.h
bbcfa3002a tree-walk: move doc to tree-walk.h
971b1f24a2 argv-array: move doc to argv-array.h
f1ecbe0f53 trace: move doc to trace.h
13aa9c8b70 cache: move doc to cache.h
c0be43f898 sigchain: move doc to sigchain.h
19ef3ddd36 pathspec: move doc to pathspec.h
301d595e72 revision: move doc to revision.h
3a1b3415d9 attr: move doc to attr.h
126c1ccefb refs: move doc to refs.h
d27eb356bf remote: move doc to remote.h and refspec.h
405c6b1fbc sha1-array: move doc to sha1-array.h
d3d7172e40 merge: move doc to ll-merge.h
3f1480b745 graph: move doc to graph.h and graph.c
266f03eccd dir: move doc to dir.h
13c4d7eb22 diff: move doc to diff.h and diffcore.h
cd5522271f rebase -r: let `label` generate safer labels
867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()`
8c15904462 built-in add -i: implement the `help` command
3d965c7674 built-in add -i: use color in the main loop
68db1cbf8e built-in add -i: support `?` (prompt help)
76b743234c built-in add -i: show unique prefixes of the commands
6348bfba58 built-in add -i: implement the main loop
a376e37b2c gitweb: escape URLs generated by href()
b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI
f28bceca75 t/gitweb-lib.sh: drop confusing quotes
0eba60c9b7 t9502: pass along all arguments in xss helper
932757b0cc INSTALL: use existing shell scripts as example
b018719927 t7004: check existence of correct tag
1daaebcaa5 built-in add -i: color the header in the `status` command
5e82b9e4d2 built-in add -i: implement the `status` command
e4cb659ebd diff: export diffstat interface
f83dff60a7 Start to implement a built-in version of `git add --interactive`
df53c80822 stash: make sure we have a valid index before writing it
ad7a403268 send-pack: check remote ref status on pack-objects failure
d91ce887c9 t6120-describe: correct test repo history graph in comment
1f9247a3bd completion: tab-complete "git svn --recursive"
603960b50e promisor-remote: remove fetch_if_missing=0
e362fadcd0 clone: remove fetch_if_missing=0
169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL
51bd6be32d mingw: use COPY_ARRAY for copying array
4bd0593e0f test-tool: use 'read-graph' helper
e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway
d784d978f6 t4215: use helper function to check output
61eea521fe fsmonitor: do not compare bitmap size with size of split index
b19f3fe9dd hex: drop sha1_to_hex()
c1ce9c06d0 completion: learn to complete `git rebase --onto=`
f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls
d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase
aa6d7f93ed hex: drop sha1_to_hex_r()
52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch
5772b0c745 sequencer: reencode old merge-commit message
e0eba649e8 bundle-verify: add --quiet
79862b6b77 bundle-create: progress output control
73c3253d75 bundle: framework for options before bundle file
68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in"
b375744274 sequencer: reencode squashing commit's message
019a9d8362 sequencer: reencode revert/cherry-pick's todo list
0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list
e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding
1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary
d9f6f3b619 The first batch post 2.24 cycle
28014c1084 Merge branch 'bc/hash-independent-tests-part-6'
57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree'
c22f63c40f Merge branch 'pb/pretty-email-without-domain-part'
5731ca3657 Merge branch 'hw/remove-api-docs-placeholder'
14b58c62bc Merge branch 'sg/commit-graph-usage-fix'
eff313f8a7 Merge branch 'dl/apply-3way-diff3'
db806d7064 Merge branch 'sg/dir-trie-fixes'
f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix'
8f1119b988 Merge branch 'wb/midx-progress'
d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes'
0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges'
8f40d89783 Merge branch 'hv/bitshift-constants-in-blame'
d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head'
5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer'
b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc'
15d9f3dc66 Merge branch 'es/walken-tutorial'
026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor'
ed28358833 convert: use skip_iprefix() in validate_encoding()
89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding()
03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules
ae821ffe83 multimail: fix a few simple spelling errors
557c5895c2 sha1dc: fix trivial comment spelling error
aa74be316a Fix spelling errors in test commands
96c0caf5e3 Fix spelling errors in messages shown to users
4dc8b1c114 Fix spelling errors in names of tests
7a40cf1553 Fix spelling errors in comments of testcases
15beaaa3d1 Fix spelling errors in code comments
a807200f67 userdiff: add Elixir to supported userdiff languages
461caf3e8a git-shortlog.txt: include commit limiting options
6462d5eb9a fetch: remove fetch_if_missing=0
46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion
99b2ba35f5 t0028: eliminate non-standard usage of printf
add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul`
14c4776d75 t: fix typo in test descriptions
270de6acbe t6024: modernize style
77363a51fb name-hash.c: remove duplicate word in comment
c92faa4d22 hashmap: fix documentation misuses of -> versus .
a6d39f2efb git-filter-branch.txt: correct argument name typo
4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators
8915297925 Fix spelling errors in documentation outside of Documentation/
031fd4b93b Documentation: fix a bunch of typos, both old and new
dd0b61f577 fsmonitor: fix watchman integration
5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare()
7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph
c14e6e7903 fetch: add the command-line option `--write-commit-graph`
da72936f54 Git 2.24
1d34d425d4 Merge branch 'bc/doc-use-docbook-5'
dac1d83c91 Merge branch 'ds/commit-graph-on-fetch'
c32ca691c2 Merge branch 'jt/delay-fetch-if-missing'
ab6b50e4c8 Merge https://github.com/prati0100/git-gui
93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po
a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2
fe28ad8520 rebase: add --reset-author-date
08187b4cba rebase -i: support --ignore-date
0185c683c9 sequencer: rename amend_author to author_to_rename
cbd8db17ac rebase -i: support --committer-date-is-author-date
c068bcc59b sequencer: allow callers of read_author_script() to ignore fields
ba51d2fb24 rebase -i: add --ignore-whitespace flag
3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower
3ada78de3f myfirstcontrib: add dependency installation step
4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt
4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly
8dfb04ae96 update-index: optionally leave skip-worktree entries alone
116d1fa6c6 vreportf(): avoid relying on stdio buffering
efd5444238 RelNotes/2.24.0: fix self-contradictory note
391c7e40b5 fetch.c: fix typo in a warning message
55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template
849e43680d RelNotes/2.24.0: typofix
0115e5d929 git-diff.txt: document return code of `--no-index`
798d66e35d l10n: de.po: Update German translation
c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u)
f21f8f5d35 Git 2.24-rc2
8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix'
0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix'
f2db52c46b Merge branch 'js/mingw-needs-hiding-fix'
5b7594abdc Merge branch 'master' of github.com:vnwildman/git
034d33653a Merge branch 'next' of github.com:ChrisADR/git-po
26b061007c submodule: teach set-url subcommand
460782b7be t7519-status-fsmonitor: improve comments
d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses
4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config
1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694)
f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0
762d5b4f46 help: add gitsubmodules to the list of guides
76a53d640f git_path(): handle `.lock` files correctly
3ce47211a6 t1400: wrap setup code in test case
44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string
6c02042139 clone: rename static function `dir_exists()`.
8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command
77200e9332 l10n: es: 2.24.0 round 2
e42df36b42 Merge branch 'l10n/it/update-italian-translation'
5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2
51728480fe l10n: fr v2.24.0 rnd2
045a548698 l10n: git.pot: v2.24.0 round 2 (1 new)
468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master
b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree()
c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit()
103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag()
f648ee7088 fsck: rename vague "oid" local variables
cc579000bf fsck: don't require an object struct in verify_headers()
7854399366 fsck: don't require an object struct for fsck_ident()
b8b00f1693 fsck: drop blob struct from fsck_finish()
6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob()
38370253fd fsck: don't require an object struct for report()
f59793763d fsck: only require an oid for skiplist functions
5afc4b1dc6 fsck: only provide oid/type in fsck_error callback
82ef89b318 fsck: don't require object structs for display functions
733902905d fsck: use oids rather than objects for object_name API
d40bbc109b fsck_describe_object(): build on our get_object_name() primitive
a59cfb3230 fsck: unify object-name code
23a173a761 fsck: require an actual buffer for non-blobs
2175a0c601 fsck: stop checking tag->tagged
ec65231571 fsck: stop checking commit->parent counts
1de6007d85 fsck: stop checking commit->tree value
228c78fbd4 commit, tag: don't set parsed bit for parse failures
60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()`
8b656572ca builtin/commit-graph.c: remove subcommand-less usage string
fa26d5ede6 t4048: abstract away SHA-1-specific constants
cf02be8486 t4045: make hash-size independent
38ee26b2a3 t4044: update test to work with SHA-256
37ab8ebef1 t4039: abstract away SHA-1-specific constants
0370b35414 t4038: abstract away SHA-1 specific constants
0253e126a2 t4034: abstract away SHA-1-specific constants
45e2ef2b1d t4027: make hash-size independent
79b0edc1a0 t4015: abstract away SHA-1-specific constants
840624ff55 t4011: abstract away SHA-1-specific constants
32a6707267 t4010: abstract away SHA-1-specific constants
440bf91dfa t3429: remove SHA1 annotation
0b408ca2bd t1305: avoid comparing extensions
2eabd38313 rev-parse: add a --show-object-format option
52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode
45e206f0d8 t4203: use test-lib.sh definitions
2ae4944aac t6006: use test-lib.sh definitions
cb99a34e23 commit-graph: fix writing first commit-graph during fetch
e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug
7b4fb434b4 documentation: remove empty doc files
566a1439f6 Git 2.24-rc1
04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix'
4d6fb2beeb Merge branch 'ds/feature-macros'
5f0b6ed907 Merge branch 'js/azure-ci-osx-fix'
c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs'
1b4f85285f Merge branch 'dl/submodule-set-branch'
c7aadccba0 fetch: delay fetch_if_missing=0 until after config
c11e9966cb repo-settings: read an int for index.version
091489d068 apply: respect merge.conflictStyle in --3way
aa76ae4905 t4108: demonstrate bug in apply
95806205cd t4108: use `test_config` instead of `git config`
b0069684d4 t4108: remove git command upstream of pipe
fa87b81385 t4108: replace create_file with test_write_lines
7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job
6c96630cb0 config: move documentation to config.h
d81542e6f3 Eleventh batch
e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix'
d45d771978 Merge branch 'bc/smart-http-atomic-push'
22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix'
2e215b7959 Merge branch 'sb/userdiff-dts'
e3cf08361a Merge branch 'sg/progress-fix'
b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix'
c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc'
f45f88b2e4 path.c: don't call the match function without value in trie_find()
c72fc40d09 path.c: clarify two field names in 'struct common_dir'
8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file
7cb8c929d7 path.c: clarify trie_find()'s in-code comment
e536b1fedf Documentation: mention more worktree-specific exceptions
680cba2c2b multi-pack-index: add [--[no-]progress] option.
64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack
ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file
8dc18f8937 midx: add progress to expire_midx_packs
840cef0c70 midx: add progress to write_midx_file
efbc3aee08 midx: add MIDX_PROGRESS flag
0eb3671ed9 ci(osx): use new location of the `perforce` cask
da1e295e00 t604[236]: do not run setup in separate tests
49b8133a9e merge-recursive: fix merging a subdirectory into the root directory
d3eebaad5e merge-recursive: clean up get_renamed_dir_portion()
80736d7c5e doc: am --show-current-patch gives an entire e-mail message
a8e2c0eadc t7419: change test_must_fail to ! for grep
19c29e538e t4014: make output-directory tests self-contained
12a4aeaad8 Merge branch 'js/azure-pipelines-msvc'
399c23c046 ci(visual-studio): actually run the tests in parallel
711cd6d15c ci(visual-studio): use strict compile flags, and optimization
370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0
cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master
907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master
13bcea8c7f l10n: fr 2.24.0 rnd 1
135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master
3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed)
8da56a4848 userdiff: fix some corner cases in dts regex
86795774bb builtin/blame.c: constants into bit shift format
feebd2d256 rebase: hide --preserve-merges option
0e40a73a4c Doc: Bundle file usage
78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error
12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error
c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error
2b6f6ea1bd test-progress: fix test failures on big-endian systems
f757409e36 l10n: bg.po: Updated Bulgarian translation (4693)
176f5adfdb completion: clarify installation instruction for zsh
d966095db0 Git 2.24-rc0
90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array'
3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth'
d0258d0944 Merge branch 'rs/http-push-simplify'
bb52def6da Merge branch 'jj/stash-reset-only-toplevel'
f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs'
e5fca6b573 Merge branch 'bb/compat-util-comment-fix'
43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup'
07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely'
2d74d28ee0 Merge branch 'dl/compat-cleanup'
9b83a94829 Merge branch 'ta/t1308-typofix'
376012c919 Merge branch 'js/doc-stash-save'
10da030ab7 grep: avoid leak of chartables in PCRE2
513f2b0bbd grep: make PCRE2 aware of custom allocator
57d4660468 grep: make PCRE1 aware of custom allocator
d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand
8af69cf3e2 t3301: test diagnose messages for too few/many paramters
6f1194246a remote-curl: pass on atomic capability to remote side
bbb13e8188 graph: fix coloring of octopus dashes
92beecc136 graph: flatten edges that fuse with their right neighbor
479db18bc0 graph: smooth appearance of collapsing edges on commit lines
0195285b95 graph: rename `new_mapping` to `old_mapping`
d62893ecc1 graph: commit and post-merge lines for left-skewed merges
0f0f389f12 graph: tidy up display of left-skewed merges
458152cce1 graph: example of graph output that can be simplified
ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state
46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()`
a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()`
9157a2a032 graph: reuse `find_new_column_by_commit()`
210179a20d graph: handle line padding in `graph_next_line()`
fbccf255f9 graph: automatically track display width of graph lines
5374a290aa fetch-pack: write fetched refs to .promisor
4627bc777e sequencer: run post-commit hook
49697cb721 move run_commit_hook() to libgit and use it there
12bb7a540a sequencer.h fix placement of #endif
6a619ca03c t3404: remove uneeded calls to set_fake_editor
b2dbacbddf t3404: set $EDITOR in subshell
88a92b6c73 t3404: remove unnecessary subshell
bf8e65b30b format-patch: teach --cover-from-description option
a92331df18 format-patch: use enum variables
46273df7bf format-patch: replace erroneous and condition
3b3c79f6c9 diff-highlight: fix a whitespace nit
108b97dc37 Ninth batch
cbe8cdd3a0 Merge branch 'jk/coc'
3b9ec27919 Merge branch 'js/trace2-fetch-push'
c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch'
1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup'
eb3de5b823 Merge branch 'js/xdiffi-comment-updates'
4e8371ec26 Merge branch 'dl/t0000-skip-test-test'
b6d712fa4e Merge branch 'tg/range-diff-output-update'
77458870a5 Merge branch 'gs/sq-quote-buf-pretty'
5efabc7ed9 Merge branch 'ew/hashmap'
d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files'
6ed610b968 Merge branch 'am/t0028-utf16-tests'
5b900fb812 Merge branch 'dl/octopus-graph-bug'
16d9d7184b Merge branch 'en/fast-imexport-nested-tags'
6d5291be45 Merge branch 'js/azure-pipelines-msvc'
ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd'
d96e31e390 Merge branch 'js/fetch-jobs'
280bd44551 Merge branch 'en/merge-recursive-cleanup'
062a309d36 remote-curl: use argv_array in parse_push()
a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes
5cc6a4be11 http-push: simplify deleting a list item
556895d0c8 stash: avoid recursive hard reset on submodules
b524f6b399 Merge branch 'ka/japanese-translation'
f6f3824b4e git-gui: improve Japanese translation
61f4b407d3 Merge branch 'py/readme'
1e6880fd06 git-gui: add a readme
edefc31873 format-patch: create leading components of output directory
68b69211b2 git-compat-util: fix documentation syntax
fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth()
e0479fa073 documentation: add tutorial for object walking
3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed
4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target
9cad1c4488 pthread.h: manually align parameter lists
8c1cfd58e3 t1308-config-set: fix a test that has a typo
57d8f4b4c7 doc(stash): clarify the description of `save`
08da6496b6 Eighth batch
07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup'
f0d407e6ae Merge branch 'kt/add-i-progress'
66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree'
a4c5d9f66e Merge branch 'rs/dedup-includes'
159cdabd87 Merge branch 'js/range-diff-noprefix'
93424f1f7d Merge branch 'cb/pcre1-cleanup'
a73f91774c Merge branch 'ab/pcre-jit-fixes'
4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword'
020011f2cb Merge branch 'tk/git-svn-trim-author-name'
676278f8ea Merge branch 'bc/object-id-part17'
aafb75452b Merge branch 'en/clean-nested-with-ignored'
3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails
5cdf2301d4 add a Code of Conduct document
70bf0b755a Seventh batch
9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat'
2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary'
d17f54947d Merge branch 'rs/convert-fix-utf-without-dash'
82c80f98e6 Merge branch 'py/git-gui-has-maintainer'
6e12570822 Merge branch 'ah/cleanups'
772cad0afb Merge branch 'js/diff-rename-force-stable-sort'
424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path'
678a9ca629 Merge branch 'as/shallow-slab-use-fix'
0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix'
042a54d251 Merge branch 'am/visual-studio-config-fix'
03d3b1297c xdiffi: fix typos and touch up comments
b05b40930e t0000: cover GIT_SKIP_TESTS blindspots
d8bc1a518a send-pack: never fetch when checking exclusions
756fb0dedb t4014: treat rev-list output as the expected value
2b6a9b13ca range-diff: don't segfault with mode-only changes
360c7ba330 transport: push codepath can take arbitrary repository
ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments
b657047719 merge-recursive: fix the fix to the diff3 common ancestor label
b744c3af07 Sixth batch
417056578a Merge branch 'bw/submodule-helper-usage-fix'
9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check'
1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a'
59b19bcd9f Merge branch 'cc/multi-promisor'
1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way'
5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort'
eb35c18e42 Merge branch 'sg/travis-help-debug'
cabb145fe3 Merge branch 'rs/alias-use-copy-array'
56c7ab0f4e Merge branch 'sg/t-helper-gitignore'
e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang'
583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules'
337e3f2b49 Merge branch 'rs/nth-switch-code-simplification'
8f53fe1733 Merge branch 'hb/hg-to-git-py3'
ef93bfbd45 Merge branch 'sg/progress-fix'
980351d1ac Merge branch 'js/doc-patch-text'
80693e3f09 Merge branch 'tb/commit-graph-harden'
ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge'
3f84633563 Merge branch 'dl/cocci-everywhere'
caf150ce7d Merge branch 'gs/commit-graph-progress'
1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim'
1398171378 Merge branch 'rs/commit-graph-use-list-count'
773521df26 Merge branch 'rs/nth-parent-parse'
7f17913161 Merge branch 'dl/submodule-set-branch'
cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix'
bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees'
098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack'
37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc'
e392382f95 Merge branch 'dl/complete-rebase-and-archive'
cda8faa37e Merge branch 'jk/commit-graph-cleanup'
36d2fca82b Merge branch 'ss/get-time-cleanup'
ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude'
ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob'
ba2d451122 Merge branch 'tg/stash-refresh-index'
e2b5038d87 hashmap_entry: remove first member requirement from docs
404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry
23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators
c8e424c9c9 hashmap: introduce hashmap_free_entries
8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry *
87571c3f71 hashmap: use *_entry APIs for iteration
939af16eac hashmap_cmp_fn takes hashmap_entry params
f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *"
f0e63c4113 hashmap: use *_entry APIs to wrap container_of
6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *"
973d5eea74 introduce container_of macro
26b455f21e hashmap_put takes "struct hashmap_entry *"
28ee794128 hashmap_remove takes "const struct hashmap_entry *"
b6c5241606 hashmap_get takes "const struct hashmap_entry *"
b94e5c1df6 hashmap_add takes "struct hashmap_entry *"
f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *"
d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *"
d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry
12878c8351 coccicheck: detect hashmap_entry.hash assignment
e010a41216 diff: use hashmap_entry_init on moved_entry.ent
f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo"
de5abb5f7a git-p4: auto-delete named temporary file
c90b652afd Fifth batch
f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1'
b0f8aed48f Merge branch 'ma/user-manual-markup-update'
faf5576a8d Merge branch 'bc/doc-use-docbook-5'
314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes'
70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo'
847650798b Merge branch 'am/mailmap-andrey-mazo'
1a155f2e66 Merge branch 'jc/git-gui-has-maintainer'
1bcef51204 t/oid-info: add empty tree and empty blob values
ecde49bb8a t/oid-info: allow looking up hash algorithm name
11a3d3aadd git-rev-list.txt: prune options in synopsis
7d2f003ee4 Documentation: update the location of the git-gui repo
b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding()
46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines
b35304bf95 ci: really use shallow clones on Azure Pipelines
ab7d854aba tests: let --immediate and --write-junit-xml play well together
be5d88e112 test-tool run-command: learn to run (parts of) the testsuite
5d65ad17a9 vcxproj: include more generated files
030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built
61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable()
e4347c9434 msvc: handle DEVELOPER=1
ed712ef8d5 msvc: ignore some libraries when linking
5b8f9e2417 compat/win32/path-utils.h: add #include guards
41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning
c097b95a26 msvc: avoid using minus operator on unsigned types
dfd557c978 stash apply: report status correctly even in a worktree's subdirectory
d54dea77db fetch: let --jobs=<n> parallelize --multiple, too
87db61a436 trace2: write discard message to sentinel files
83e57b04e6 trace2: discard new traces if target directory has too many files
11c21f22de t4214: demonstrate octopus graph coloring failure
25eb905e14 t4214: explicitly list tags in log
63be8c8dd7 t4214: generate expect in their own test cases
a7a5590c6e t4214: use test_merge
94ba151300 test-lib: let test_merge() perform octopus merges
22541013d0 docs: clarify trace2 version invariants
3d4548e7e2 docs: mention trace2 target-dir mode in git-config
2fe44394c8 treewide: remove duplicate #include directives
dbcd970c27 push: do not pretend to return `int` from `die_push_simple()`
941790d7de fast-export: handle nested tags
8d7d33c1ce t9350: add tests for tags of things other than a commit
a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags
208d69246e fast-export: add support for --import-marks-if-exists
b8f50e5b60 fast-import: add support for new 'alias' command
f73b2aba05 fast-import: allow tags to be identified by mark labels
3164e6bd24 fast-import: fix handling of deleted tags
8085050ab4 add -i: show progress counter in the prompt
69fdb922ad Merge branch 'bw/diff3-conflict-style'
b436825b9b git-gui: support for diff3 conflict style
937b76ed49 range-diff: internally force `diff.noprefix=true`
411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job
25e4b8099c push: add trace2 instrumentation
5fc31180d8 fetch: add trace2 instrumentation
53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value
c3b57dc2a0 git-gui: use existing interface to query a path's attribute
45ab460d4a Merge branch 'js/git-bash-if-available'
0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command
71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only)
54a80a9ad8 wrapper: use a loop instead of repetitive statements
baed6bbb5b diffcore-break: use a goto instead of a redundant if statement
8da02ce62a commit-graph: remove a duplicate assignment
ddb3c856f3 shallow.c: don't free unallocated slabs
8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits
65904b8b2b promisor-remote: skip move_to_tail when no-op
2049b8dc65 diffcore_rename(): use a stable sort
97fff61012 Move git_sort(), a stable sort, into into libgit.a
69f272b922 dir: special case check for the possibility that pathspec is NULL
6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available
bc12974a89 Fourth batch
5a5350940b Merge branch 'ds/commit-graph-on-fetch'
974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch'
9755f70fe6 Merge branch 'ds/include-exclude'
93fc8760e7 Merge branch 'jh/trace2-pretty-output'
640f9cd599 Merge branch 'dl/rebase-i-keep-base'
026428c35e Merge branch 'sg/clean-nested-repo-with-ignored'
21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip'
d693345518 Merge branch 'dl/use-sq-from-test-lib'
d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes'
2be6ccc01a Merge branch 'sg/git-test-boolean'
cf861cd7a0 Merge branch 'rs/get-tagged-oid'
91243b019d Merge branch 'en/filter-branch-deprecation'
9bc67b6658 Merge branch 'en/merge-options-ff-and-friends'
fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden'
cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option'
8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return'
3ff6af7753 Merge branch 'nd/switch-and-restore'
aadac067aa Merge branch 'tb/file-url-to-unc-path'
b57a88a5f1 Merge branch 'js/gitdir-at-unc-root'
6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path'
430439536b Merge branch 'rs/parse-tree-indirect'
991fd97b9a Merge branch 'jk/fast-import-history-bugfix'
74a39b9bcc Merge branch 'mh/notes-duplicate-entries'
37801f0665 Merge branch 'tb/banned-vsprintf-namefix'
21ce0b48f3 Merge branch 'mh/release-commit-memory-fix'
f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup'
bf6136cab8 Merge branch 'rs/strbuf-detach'
a2e22bb3ad Merge branch 'rs/trace2-dst-warning'
1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup'
0281733483 Merge branch 'bc/hash-independent-tests-part-5'
f06fb376ed Merge branch 'jc/test-cleanup'
00bb74453d Merge branch 'dl/compat-cleanup'
59438be06c Merge branch 'js/visual-studio'
cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone'
af2abd870b fast-export: fix exporting a tag and nothing else
c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor
dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit
fd5b820d9c user-manual.txt: change header notation
e79b34533a user-manual.txt: add missing section label
b503a2d515 Makefile: emulate compile in $(HCO) target better
af26e2a9d2 pack-bitmap.h: remove magic number
b06fdead04 promisor-remote.h: include missing header
97b989ee3a apply.h: include missing header
4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name
d928a8388a t0028: add more tests
0b63fd6965 t0028: fix test for UTF-16-LE-BOM
fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration
2e09c01232 name-rev: avoid cutoff timestamp underflow
8464f94aeb promisor-remote.h: drop extern from function declaration
75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp
24c681794f doc: MyFirstContribution: fix cmd placement instructions
c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode
60c60b627e Merge branch 'py/git-git-extra-stuff'
faf420e05a treewide: correct several "up-to-date" to "up to date"
b71c6c3b64 Fix build with core.autocrlf=true
16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff
26e3d1cbea .mailmap: update email address of Andrey Mazo
27ea41c0b4 t/helper: ignore only executable files
7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()
83e3ad3b12 merge-recursive: symlink's descendants not in way
34933d0eff stash: make sure to write refreshed cache
e080b34540 merge: use refresh_and_write_cache
22184497a3 factor out refresh_and_write_cache function
7371612255 commit-graph: add --[no-]progress to write and verify
47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW
253bfe49bd SubmittingPatches: git-gui has a new maintainer
d17ae00c97 hg-to-git: make it compatible with both python3 and python2
4c86140027 Third batch
f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http'
627b826834 Merge branch 'md/list-objects-filter-combo'
b9ac6c59b8 Merge branch 'cc/multi-promisor'
de67293e74 Merge branch 'sg/line-log-tree-diff-optim'
95486229e3 Merge branch 'sg/complete-configuration-variables'
f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook'
a2e524ecf3 Merge branch 'cb/curl-use-xmalloc'
128666753b Merge branch 'jk/drop-release-pack-memory'
917a319ea5 Merge branch 'js/rebase-r-strategy'
7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui
4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout()
0d4304c124 doc: fix reference to --ignore-submodules
af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py
8a3a6817e2 Merge gitk to pick up emergency build fix
2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po
9027af58e2 Makefile: run coccicheck on more source files
43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES)
5dedf7de53 Makefile: define THIRD_PARTY_SOURCES
902b90cf42 clean: fix theoretical path corruption
ca8b5390db clean: rewrap overly long line
09487f2cba clean: avoid removing untracked files in a nested git repository
e86bbcf987 clean: disambiguate the definition of -d
3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run
29b577b960 dir: add commentary explaining match_pathspec_item's return value
89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it
a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case
404ebceda0 dir: also check directories for matching pathspecs
a5e916c745 dir: fix off-by-one error in match_pathspec_item
bbbb6b0b89 dir: fix typo in comment
7541cc5302 t7300: add testcases showing failure to clean specified pathspecs
0eb7c37a8a diff, log doc: small grammer, format, and language fixes
6fae6bd518 diff, log doc: say "patch text" instead of "patches"
2bb74b53a4 Test the progress display
bbf47568ad Revert "progress: use term_clear_line()"
cf6a2d2557 Makefile: strip leading ./ in $(LIB_H)
b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup
689a146c91 commit-graph: use commit_list_count()
59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N"
a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N"
a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base"
cf34337f98 list-objects-filter: give a more specific error sparse parsing error
4c96a77594 list-objects-filter: delay parsing of sparse oid
72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter
83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer
7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>`
226daba280 Doc/Makefile: give mansource/-version/-manual attributes
40e747e89d git-submodule.txt: fix AsciiDoc formatting error
f6461b82b9 Documentation: fix build with Asciidoctor 2
3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
f7a8834ba4 Merge branch 'bp/amend-toggle-bind'
ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit"
9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes
d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog
beffae768a gitk: Add Chinese (zh_CN) translation
56d9cbe68b packfile: expose get_delta_base()
bab28d9f97 builtin/pack-objects: report reused packfile objects
6c8ec8c30a Merge branch 'bw/commit-scrollbuffer'
acfa495519 Merge branch 'bw/amend-checkbutton'
da08d559b7 git-gui: add horizontal scrollbar to commit buffer
ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton
aeeb978ba6 completion: teach archive to use __gitcomp_builtin
2b9bd488ae completion: teach rebase to use __gitcomp_builtin
d49dffde9a completion: add missing completions for log, diff, show
6abada1880 upload-pack: disable commit graph more gently for shallow traversal
fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time
72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set
4fd39c76e6 doc: minor formatting fix
29f4332e66 Quit passing 'now' to date code
c77abf0460 Merge branch 'py/revert-hunks-lines'
5a2bb62180 Merge branch 'bp/widget-focus-hotkeys'
e07446ed5f git-gui: add hotkeys to set widget focus
f981ec18cf cache-tree: do not lazy-fetch tentative tree
f1d4a28250 Second batch
c8ada15456 Merge branch 'bc/reread-attributes-during-rebase'
8f3ba423e7 Merge branch 'tg/t0021-racefix'
a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email'
d49c2c3466 Merge branch 'sb/userdiff-dts'
2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe'
4c49dd042d Merge branch 'nd/diff-parseopt'
d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix'
8ce8a63b46 Merge branch 'ds/midx-expire-repack'
9437394661 Merge branch 'cb/fetch-set-upstream'
af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix'
fa9e7934c7 Merge branch 'bm/repository-layout-typofix'
d1a251a1fa Merge branch 'en/checkout-mismerge-fix'
e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental'
f4f8dfe127 Merge branch 'ds/feature-macros'
4a12f89865 Merge branch 'jk/eoo'
b4a1eec332 Merge branch 'jk/repo-init-cleanup'
70336bd50a Merge branch 'py/git-gui-do-quit'
ad7c543e3b grep: skip UTF8 checks explicitly
0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration()
b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration
4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor
b7e1ba5649 git-merge-index.txt: wrap shell listing in "----"
38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----"
5371813768 git-ls-remote.txt: wrap shell listing in "----"
1925fe0c8a Documentation: wrap config listings in "----"
922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor
2017956a19 Documentation: wrap blocks with "--"
dd2e50a84e commit-graph: turn off save_commit_buffer
67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits
806278dead commit-graph.c: handle corrupt/missing trees
16749b8dd2 commit-graph.c: handle commit parsing errors
23424ea759 t/t5318: introduce failing 'git commit-graph write' tests
bf1e28e0ad builtin/rebase.c: Remove pointless message
d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing
bd482d6e33 t: use common $SQ variable
3a37876b5d pack-objects: drop packlist index_pos optimization
7e6b96c73b test-read-cache: drop namelen variable
e4b369069e diff-delta: set size out-parameter to 0 for NULL delta
7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint
f1cbd033e2 pack-objects: use object_id in packlist_alloc()
0dfed92dfd git-am: handle missing "author" when parsing commit
3960290675 ci: restore running httpd tests
6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests
c77722b3ea use get_tagged_oid()
dad3f0607b tag: factor out get_tagged_oid()
468ce99b77 unpack-trees: rename 'is_excluded_from_list()'
65edd96aec treewide: rename 'exclude' methods to 'pattern'
4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_'
caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list'
ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern'
483e861111 t9902: use a non-deprecated command for testing
9df53c5de6 Recommend git-filter-repo instead of git-filter-branch
7b6ad97939 t6006: simplify, fix, and optimize empty message test
50094ca45f config/format.txt: specify default value of format.coverLetter
c1a6f21cd4 Doc: add more detail for git-format-patch
854b5cb46a t4014: stop losing return codes of git commands
dd2b6b6860 t4014: remove confusing pipe in check_threading()
6bd26f58ea t4014: use test_line_count() where possible
c6ec6dadba t4014: let sed open its own files
f2e2fa8f60 t4014: drop redirections to /dev/null
460609cbd5 t4014: use indentable here-docs
92014b69bb t4014: remove spaces after redirect operators
0ab74e979c t4014: use sq for test case names
cb46c40662 t4014: move closing sq onto its own line
b562a54c01 t4014: s/expected/expect/
e770fbfeff t3005: remove unused variable
da280f5f1a t: use LF variable defined in the test harness
7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch
552fc5016f mingw: apply array.cocci rule
476998d05b t3427: accelerate this test by using fast-export and fast-import
aac6ff7b5b .gitignore: stop ignoring `.manifest` files
2c65d90f75 am: reload .gitattributes after patching it
1577dc0f7c tree: simplify parse_tree_indirect()
50f26bd035 fetch: add fetch.writeCommitGraph config setting
8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set
27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options
0a8bc7068f clarify documentation for remote helpers
80e3658647 help: make help_unknown_ref() NORETURN
313677627a checkout: add simple check for 'git checkout -b'
3441de5b9c gitk: Make web links clickable
a4fa2f0a4c git-gui: allow undoing last revert
414d924beb rebase: teach rebase --keep-base
6330209d7d rebase tests: test linear branch topology
4effc5bc96 rebase: fast-forward --fork-point in more cases
c0efb4c1dd rebase: fast-forward --onto in more cases
2b318aa6c3 rebase: refactor can_fast_forward into goto tower
c9efc21683 t3432: test for --no-ff's interaction with fast-forward
1ebec8dfc1 fast-import: duplicate into history rather than passing ownership
9756082b3c fast-import: duplicate parsed encoding string
86ae43da6a status: mention --skip for revert and cherry-pick
b1b16bba96 completion: add --skip for cherry-pick and revert
deaa65a754 completion: merge options for cherry-pick and revert
4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
793ac7e309 t3432: test rebase fast-forward behavior
359ecebc34 t3431: add rebase --fork-point tests
502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage
ff61681b46 grep: refactor and simplify PCRE1 support
8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1
1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning()
fd99c2dd9b grep: use return value of strbuf_detach()
82f51af345 log-tree: always use return value of strbuf_detach()
7e92756751 http: don't leak urlmatch_config.vars
9784f97321 commit: free the right buffer in release_commit_memory
ce17feb1b3 path: add a function to check for path suffix
60d198d022 banned.h: fix vsprintf()'s ban message
60fe477a0b notes: avoid potential use-after-free during insertion
779ad6641b notes: avoid leaking duplicate entries
4e1a641ee3 mingw: fix launching of externals from Unicode paths
5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly
e2683d51d9 Fix .git/ discovery at the root of UNC shares
d17f2124a7 setup_git_directory(): handle UNC paths correctly
ebb8d2c90f mingw: support UNC in git clone file://server/share/repo
0c37c41d13 t4009: make hash size independent
c1f3dfcc23 t4002: make hash independent
8cc5ff83c3 t4000: make hash size independent
c784815073 t3903: abstract away SHA-1-specific constants
2ccdfb1c78 git-gui: return early when patch fails to apply
62bd99934b git-gui: allow reverting selected hunk
5f0a516de9 git-gui: allow reverting selected lines
fddf2ebe38 transport: teach all vtables to allow fetch first
ac3fda82bf transport-helper: skip ls-refs if unnecessary
745f681289 First batch after Git 2.23
d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg'
22e86e85cb Merge branch 'en/fast-import-merge-doc'
9c7573581c Merge branch 'jk/perf-no-dups'
4336fdb2ef Merge branch 'rs/nedalloc-fixlets'
8ae7a46c4d Merge branch 'sg/show-failed-test-names'
6ba06b582b Merge branch 'sg/commit-graph-validate'
072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix'
207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix'
77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests'
1b01cdbf2e Merge branch 'jk/tree-walk-overflow'
8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix'
307179732d Merge branch 'mt/grep-submodules-working-tree'
58166c2e9d t0021: make sure clean filter runs
8b3f33ef11 ref-filter: initialize empty name or email fields
3c81760bc6 userdiff: add a builtin pattern for dts files
fe49814409 t4014: drop unnecessary blank lines from test cases
a2bb801f6a line-log: avoid unnecessary full tree diffs
eef5204190 line-log: extract pathspec parsing from line ranges into a helper function
a63694f523 diff: skip GITLINK when lazy fetching missing objs
7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe
19800bdc3f parseopt: move definition of enum parse_opt_result up
415b770b88 packfile.h: drop extern from function declaration
acb49d1cc8 t3800: make hash-size independent
ca6ba94200 t3600: make hash size independent
19ce5496c2 t3506: make hash independent
9a6738c061 t3430: avoid hard-coded object IDs
4dd1b5f90f t3404: abstract away SHA-1-specific constants
b99bfc7a6c t3306: abstract away SHA-1-specific constants
e3e9d02e35 t3305: make hash size independent
b408cf8cf6 t3301: abstract away SHA-1-specific constants
b561edd213 t3206: abstract away hash size constants
a5f61c7d13 t3201: abstract away SHA-1-specific constants
1c24a54ea4 repository-layout.txt: correct pluralization of 'object'
b0a3186140 sequencer: simplify root commit creation
a47ba3c777 rebase -i: check for updated todo after squash and reword
450efe2d53 rebase -i: always update HEAD before rewording
c581e4a749 grep: under --debug, show whether PCRE JIT is enabled
aaa95dfa05 midx: switch to using the_hash_algo
be8e172e9f builtin/show-index: replace sha1_to_hex
3f34d70d40 rerere: replace sha1_to_hex
fc06be3b7f builtin/receive-pack: replace sha1_to_hex
69fa337060 builtin/index-pack: replace sha1_to_hex
3a4d7aa5ae packfile: replace sha1_to_hex
e0cb7cdb89 wt-status: convert struct wt_status to object_id
8d4d86b0f0 cache: remove null_sha1
f6ca67d673 builtin/worktree: switch null_sha1 to null_oid
dd336a5511 builtin/repack: write object IDs of the proper length
894c0f66bb pack-write: use hash_to_hex when writing checksums
4439c7a360 sequencer: convert to use the_hash_algo
95518faac1 bisect: switch to using the_hash_algo
e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo
fe9fec45f6 config: use the_hash_algo in abbrev comparison
976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
703d2d4193 bundle: switch to use the_hash_algo
9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo
7962e046ff show-index: switch hard-coded constants to the_hash_algo
fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ
7e0d029f18 builtin/rev-parse: switch to use the_hash_algo
319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo
fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo
f6af19a9ad fetch-pack: use parse_oid_hex
36261e42ec patch-id: convert to use the_hash_algo
28ba1830d0 builtin/replace: make hash size independent
24bc1a1292 pull, fetch: add --set-upstream option
71d41ff651 archive-tar: turn length miscalculation warning into BUG
17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header()
82a46af13e archive-tar: fix pax extended header length calculation
4060c1990a archive-tar: report wrong pax extended header length
4615a8cb5b merge-recursive: alphabetize include list
45ef16f77a merge-recursive: add sanity checks for relevant merge_options
f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
5bf7e5779e merge-recursive: split internal fields into a separate struct
e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output
a779fb829b merge-recursive: comment and reorder the merge_options fields
8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options
7c0a6c8e47 merge-recursive: move some definitions around to clean up the header
c749ab1da8 merge-recursive: rename merge_options argument to opt in header
bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity
ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list
4d7101e25c merge-recursive: fix some overly long lines
724dd767b2 cache-tree: share code between functions writing an index as a tree
345480d1ed merge-recursive: don't force external callers to do our logging
b4db8a2b76 merge-recursive: remove useless parameter in merge_trees()
98a1d3d888 merge-recursive: exit early if index != head
9822175d2b Ensure index matches head before invoking merge machinery, round N
10f751c06b merge-recursive: remove another implicit dependency on the_repository
f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks
8e01251694 merge-recursive: introduce an enum for detect_directory_renames values
743474cbfa merge-recursive: provide a better label for diff3 common ancestor
51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u)
5bace62582 l10n: Update Catalan translation
139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()
65c01c6442 checkout: provide better conflict hunk description with detached HEAD
d8523ca1b9 merge-recursive: be consistent with assert
acb7da05ac checkout: remove duplicate code
93b980e58f http: use xmalloc with cURL
64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental
aaf633c2ad repo-settings: create feature.experimental setting
c6cc4c5afd repo-settings: create feature.manyFiles setting
ad0fb65999 repo-settings: parse core.untrackedCache
31b1de6a09 commit-graph: turn on commit-graph by default
b068d9a250 t6501: use 'git gc' in quiet mode
7211b9e753 repo-settings: consolidate some config settings
507e5470a0 worktree remove: clarify error message on dirty worktree
5af9d5f6c8 completion: complete config variables and values for 'git clone --config='
88cd790d6a completion: complete config variables names and values for 'git clone -c'
dd33472831 completion: complete values of configuration variables after 'git -c var='
e1e00089da completion: complete configuration sections and variable names for 'git -c'
42d0efec59 completion: split _git_config()
d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp()
2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names
d9438873c4 completion: deduplicate configuration sections
7a09a8f093 completion: add tests for 'git config' completion
840d7e5b3c completion: complete more values of more 'color.*' configuration variables
08a12175d8 completion: fix a typo in a comment
9827d4c185 packfile: drop release_pack_memory()
d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed
362f8b280c t/perf: rename duplicate-numbered test script
742ed63345 trace2: cleanup whitespace in perf format
e34430556c trace2: cleanup whitespace in normal format
c2b890aca5 quote: add sq_append_quote_argv_pretty()
ad43e37839 trace2: trim trailing whitespace in normal format error message
04f10d332f trace2: remove dead code in maybe_add_string_va()
da4589ce7e trace2: trim whitespace in region messages in perf target format
0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit
5440eb0ea2 git-gui: call do_quit before destroying the main window
bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook
6098817fd7 git-merge: honor pre-merge-commit hook
a1f3dd7eb3 merge: do no-verify like commit
f78f6c7e0c t7503: verify proper hook execution
70597e8386 nedmalloc: avoid compiler warning about unused value
c9b9c09dae nedmalloc: do assignments only after the declaration section
22932d9169 config: stop checking whether the_repository is NULL
5732f2b1ef common-main: delay trace2 initialization
58ebccb478 t1309: use short branch name in includeIf.onbranch test
67feca3b1c gitcli: document --end-of-options
51b4594b40 parse-options: allow --end-of-options as a synonym for "--"
19e8789b23 revision: allow --end-of-options to end option parsing
ffe1afe67c tests: show the test name and number at the start of verbose output
96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests
7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits'
39d8831856 commit-graph: turn a group of write-related macro flags into an enum
9916073be5 t5318-commit-graph: use 'test_expect_code'
620c09e1b6 restore: add test for deleted ita files
ecd72042de checkout.c: unstage empty deleted ita files
a613d4f817 pack-refs: always refresh after taking the lock file
decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd'
371df1bea9 trace2: cleanup column alignment in perf target format
5aa02f9868 tree-walk: harden make_traverse_path() length computations
c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path()
b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len()
37806080d7 tree-walk: use size_t consistently
7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh'
12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh'
9055384710 tree-walk: drop oid from traverse_info
947208b725 setup_traverse_info(): stop copying oid
e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
a63f990d92 t3418: test `rebase -r` with merge strategies
5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges`
e145d99347 rebase -r: support merge strategies other than `recursive`
4e6023b13a t3427: fix another incorrect assumption
f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced
a9c71073da t3427: fix erroneous assumption
b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three
d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case
c248d32cdb t3427: simplify the `setup` test case significantly
8c1e24048a t3427: add a clarifying comment
5efed0ecf9 rebase: fold git-rebase--common into the -p backend
68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone
2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive`
6180b20239 t3400: stop referring to the scripted rebase
d5b581f228 Drop unused git-rebase--am.sh
814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation
6a289d45c0 grep: fix worktree case in submodules
870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching
8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data
09872f6418 grep: create a "is_fixed" member in "grep_pat"
8a35b540a9 grep: consistently use "p->fixed" in compile_regexp()
685668faaa grep: stop using a custom JIT stack with PCRE v1
34489239d0 grep: stop "using" a custom JIT stack with PCRE v2
04bef50c01 grep: remove overly paranoid BUG(...) code
b65abcafc7 grep: use PCRE v2 for optimized fixed-string search
48de2a768c grep: remove the kwset optimization
45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern>
25754125ce grep: make the behavior for NUL-byte in patterns sane
d316af059d grep tests: move binary pattern tests into their own file
471dac5d2c grep tests: move "grep binary" alongside the rest
f463beb805 grep: inline the return value of a function call used only once
b14cf112e2 t4210: skip more command-line encoding tests on MinGW
44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
4e2443b181 log tests: test regex backends in "--encode=<enc>" tests
90d21f9ebf list-objects-filter-options: make parser void
5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW
489fc9ee71 list-objects-filter-options: allow mult. --filter
c2694952e3 strbuf: give URL-encoding API a char predicate fn
cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list
f56f764279 list-objects-filter-options: move error check up
e987df5fe6 list-objects-filter: implement composite filters
842b00516a list-objects-filter-options: always supply *errbuf
7a7c7f4a6d list-objects-filter: put omits set in filter struct
9430147ca0 list-objects-filter: encapsulate filter components
4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c
60b7a92d84 Move repository_format_partial_clone to promisor-remote.c
db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
75de085211 remote: add promisor and partial clone config to the doc
7e154badc0 partial-clone: add multiple remotes in the doc
9a4c507886 t0410: test fetching from many promisor remotes
5e46139376 builtin/fetch: remove unique promisor remote limitation
fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter
b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote()
faf2abf496 promisor-remote: use repository_format_partial_clone
9cfebc1f3b promisor-remote: add promisor_remote_reinit()
9e27beaa23 promisor-remote: implement promisor_remote_get_direct()
48de315817 Add initial support for many promisor remotes
2e860675b6 fetch-object: make functions return an error code
c59c7c879e t0410: remove pipes after git commands
git-subtree-dir: third_party/git
git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
2020-05-22 18:46:45 +02:00
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:5105
|
Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96
af6b65d45e Git 2.26.2
7397ca3373 Git 2.25.4
b86a4be245 Git 2.24.3
f2771efd07 Git 2.23.3
c9808fa014 Git 2.22.4
9206d27eb5 Git 2.21.3
041bc65923 Git 2.20.4
76b54ee9b9 Git 2.19.5
ba6f0905fd Git 2.18.4
df5be6dc3f Git 2.17.5
1a3609e402 fsck: reject URL with empty host in .gitmodules
e7fab62b73 credential: treat URL with empty scheme as invalid
c44088ecc4 credential: treat URL without scheme as invalid
fe29a9b7b0 credential: die() when parsing invalid urls
a2b26ffb1a fsck: convert gitmodules url to URL passed to curl
8ba8ed568e credential: refuse to operate when missing host or protocol
24036686c4 credential: parse URL without host as empty host, not unset
73aafe9bc2 t0300: use more realistic inputs
a88dbd2f8c t0300: make "quit" helper more realistic
de49261b05 Git 2.26.1
274b9cc253 Git 2.26
55a7568606 Merge branch 'en/rebase-backend'
c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git
1557364fb4 l10n: tr.po: change file mode to 644
2da1b05674 t3419: prevent failure when run with EXPENSIVE
1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0
5804c6ec40 l10n: de.po: add missing space
98cedd0233 Merge https://github.com/prati0100/git-gui
4914ba4bcf l10n: tr: Fix a couple of ambiguities
a5728022e0 Merge branch 'py/remove-tcloo'
7fcb965970 RelNotes/2.26.0: fix various typos
f0c03bcf95 l10n: Update Catalan translation
67b0a24910 Git 2.25.3
be8661a328 Sync with Git 2.25.2
0822e66b5d Git 2.25.2
65588b0b2e unicode: update the width tables to Unicode 13.0
7be274b0ff Merge branch 'js/ci-windows-update' into maint
9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint
221887a492 Merge branch 'jk/doc-credential-helper' into maint
32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint
fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint
618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint
50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint
fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint
41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint
2d7247af6f Merge branch 'am/mingw-poll-fix' into maint
4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint
76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint
569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint
16a4bf1035 Merge branch 'en/check-ignore' into maint
3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint
56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint
1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint
7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint
fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint
a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint
93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint
dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint
758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint
f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint
506223f9c5 Git 2.24.2
17a02783d8 Git 2.23.2
69fab82147 Git 2.22.3
fe22686494 Git 2.21.2
d1259ce117 Git 2.20.3
a5979d7009 Git 2.19.4
21a3e5016b Git 2.18.3
c42c0f1297 Git 2.17.4
d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u)
3891a84ccd git-gui: create a new namespace for chord script evaluation
8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5
440e7442d1 l10n: zh_CN: Revise v2.26.0 translation
2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2
6c85aac65f Git 2.26-rc2
74f172e39e Merge branch 'en/test-cleanup'
e96327c947 Merge branch 'es/outside-repo-errmsg-hints'
ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0
15fa8d9667 l10n: vi: fix translation + grammar
5c20398699 prefix_path: show gitdir if worktree unavailable
1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated)
c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated)
a4a2f64642 Merge branch 'js/askpass-coerce-utf8'
850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows
d769dcc5cd Merge branch 'py/blame-status-error'
70e24186c0 t6022, t6046: fix flaky files-are-updated checks
30e9940356 Hopefully the final batch before -rc2
b4f0038525 Merge branch 'en/rebase-backend'
25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master
07259e74ec fsck: detect gitmodules URLs with embedded newlines
c716fe4bd9 credential: detect unrepresentable values when parsing urls
17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr
9a6bbee800 credential: avoid writing values with newlines
17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2
1afe18a3bb l10n: es: 2.26.0 round#2
5ab9217a3c Merge branch of github.com:alshopov/git-po into master
c6713676d6 Merge branch of github.com:bitigchi/git-po into master
b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t)
2713dec02d l10n: tr: v2.26.0 round 2
c9ef57cc3a l10n: fr : v2.26.0 rnd 2
120b1eb731 git-rebase.txt: highlight backend differences with commit rewording
9a1b7474d6 sequencer: clear state upon dropping a become-empty commit
937d143630 i18n: unmark a message in rebase.c
a56d361f66 Merge branch 'ds/sparse-add'
5fa9169ced Merge branch 'dr/push-remote-ref-update'
cdef998b46 Merge branch 'jc/doc-single-h-is-for-help'
051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed)
52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master
9643441983 l10n: tr: Add glossary for Turkish translations
438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv
fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git
2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u)
dd2c269652 l10n: tr: Add Turkish translations
8f4f099f8b l10n: tr: Add Turkish translation team info
b4374e96c8 Git 2.26-rc1
4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch'
3658d77f8e Merge branch 'hd/show-one-mergetag-fix'
6125104b88 Merge branch 'rt/format-zero-length-fix'
1ac37deba2 Merge branch 'am/mingw-poll-fix'
cf372dc815 Merge branch 'en/test-cleanup'
d1075adfdf Merge branch 'en/merge-path-collision'
a4fd114ffc Merge branch 'kk/complete-diff-color-moved'
a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file'
0e0d717537 Merge branch 'pb/am-show-current-patch'
9b7f726dfc Merge branch 'am/pathspec-f-f-more'
4605a73073 t1091: don't grep for `strerror()` string
4d9c2902a1 l10n: fr v2.26.0 rnd1
ad182bee3f Merge branch of github.com:alshopov/git-po into master
23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1
98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t)
f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed)
76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po
076cbdcd73 Git 2.26-rc0
0d65f3fb1a t5537: adjust test_oid label
e63cefb024 Merge branch 'hi/gpg-use-check-signature'
5da7329e29 Merge branch 'rs/commit-graph-code-simplification'
0108fc1b46 Merge branch 'js/ci-windows-update'
f3ccd9f0d9 Merge branch 'be/describe-multiroot'
a6b4709302 Merge branch 'ag/rebase-remove-redundant-code'
b22db265d6 Merge branch 'es/recursive-single-branch-clone'
e8e71848ea Merge branch 'jk/nth-packed-object-id'
a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'
4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere'
49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix'
2cbb058669 Merge branch 'bc/wildcard-credential'
25063e2530 Merge branch 'mr/bisect-in-c-1'
f4d7dfce4d Merge branch 'ds/sparse-add'
4d864895a2 t2402: test worktree path when called in .git directory
af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch()
7655b4119d remote-curl: show progress for fetches over dumb HTTP
2f268890c2 The eighth batch for 2.26
aa5a7e02ad Merge branch 'ma/test-cleanup'
58595e713c Merge branch 'rs/blame-typefix-for-fingerprint'
ff41848e99 Merge branch 'rs/micro-cleanups'
4cbf1a0e22 Merge branch 'es/worktree-cleanup'
46703057c1 Merge branch 'ak/test-log-graph'
777815f5f9 Merge branch 'jk/run-command-formatfix'
444cff61b4 Merge branch 'ds/partial-clone-fixes'
48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure'
8c22bd9ff9 Merge branch 'en/rebase-backend'
cb2f5a8e97 Merge branch 'en/check-ignore'
0df82d99da Merge branch 'jk/object-filter-with-bitmap'
80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix'
29b09c518c Merge branch 'jk/doc-diff-parallel'
237a28173f show_one_mergetag: print non-parent in hex form.
5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context"
6d1210e133 l10n: Update Catalan translation
0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification"
7329d94be7 config.mak.dev: re-enable -Wformat-zero-length
7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings
94f4d01932 mingw: workaround for hangs when sending STDIN
1ff466c018 Documentation: clarify that `-h` alone stands for `help`
65bf820d0e t6020: new test with interleaved lexicographic ordering of directories
9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it
d5bb92eced t3035: prefer test_must_fail to bash negation for git commands
b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions
42d180dd01 t602[1236], t6034: modernize test formatting
802050400a merge-recursive: apply collision handling unification to recursive case
7f487ce062 Azure Pipeline: switch to the latest agent pools
5ed9fc3fc8 ci: prevent `perforce` from being quarantined
eafff6e41e t/lib-httpd: avoid using macOS' sed
d68ce906c7 commit-graph: use progress title directly
30b1c7ad9d describe: don't abort too early when searching tags
240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to'
2d2118b814 The seventh batch for 2.26
325eb66830 Merge branch 'es/doc-mentoring'
87f17d790d Merge branch 'es/bright-colors'
d0038f4b31 Merge branch 'bw/remote-rename-update-config'
132f600b06 clone: pass --single-branch during --recurse-submodules
47319576f1 submodule--helper: use C99 named initializer
ffe005576a lib-log-graph: consolidate colored graph cmp logic
989eea958b lib-log-graph: consolidate test_cmp_graph logic
bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching
bb4995fc3f worktree: add utility to find worktree by pathname
a80c4c2214 worktree: improve find_worktree() documentation
2fecc48cad packfile: drop nth_packed_object_sha1()
6ac9760a30 packed_object_info(): use object_id internally for delta base
b99b6bcc57 packed_object_info(): use object_id for returning delta base
63f4a7fc01 pack-check: push oid lookup into loop
e31c71083a pack-check: convert "internal error" die to a BUG()
500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps
f66d4e0250 pack-objects: use object_id struct in pack-reuse code
a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id
3f83fd5e44 pack-objects: read delta base oid into object_id struct
0763671b8e nth_packed_object_oid(): use customary integer return
02bbbe9df9 worktree: drop unused code from get_main_worktree()
27f182b3fc blame: provide type of fingerprints pointer
b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere
df126ca142 t3400: make test clean up after itself
3c29e21eb0 t: drop debug `cat` calls
cac439b56d t9810: drop debug `cat` call
91de82adc9 t4117: check for files using `test_path_is_file`
4ef346482d receive.denyCurrentBranch: respect all worktrees
f8692114db t5509: use a bare repository for test push target
45f274fbb1 get_main_worktree(): allow it to be called in the Git directory
fd0bc17557 completion: add diff --color-moved[-ws]
2ce6d075fa use strpbrk(3) to search for characters from a given set
2b3c430bce quote: use isalnum() to check for alphanumeric characters
a51d9e8f07 t1050: replace test -f with test_path_is_file
3e96c66805 partial-clone: avoid fetching when looking for objects
d0badf8797 partial-clone: demonstrate bugs in partial fetch
539052f42f run-command.h: fix mis-indented struct member
6c11c6a124 sparse-checkout: allow one-character directories in cone mode
aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch
f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch
e8ef1e8d6e am: convert "resume" variable to a struct
bc8620b440 parse-options: convert "command mode" to a flag
62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE()
46fd7b3900 credential: allow wildcard patterns when matching config
82eb249853 credential: use the last matching username in the config
588c70e10f t0300: add tests for some additional cases
732f934408 t1300: add test for urlmatch with multiple wildcards
3fa0e04667 mailmap: add an additional email address for brian m. carlson
8a98758a8d stash push: support the --pathspec-from-file option
8c3713cede stash: eliminate crude option parsing
3f3d8068f5 doc: stash: synchronize <pathspec> description
b22909144c doc: stash: document more options
0093abc286 doc: stash: split options from description (2)
2b7460d167 doc: stash: split options from description (1)
5f393dc3aa rm: support the --pathspec-from-file option
fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags
73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure
6c69f22233 bisect: libify `bisect_next_all`
9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents
45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents
cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents
e8e3ce6718 bisect: libify `bisect_checkout`
ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents
7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()`
680e8a01e5 bisect: add enum to represent bisect returning codes
bfacfce7d9 bisect--helper: introduce new `decide_next()` function
b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0
292731c4c2 bisect--helper: change `retval` to `res`
16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays
7ec8125fba check-ignore: fix documentation and implementation to match
2607d39da3 doc-diff: use single-colon rule in rendering Makefile
0aa6ce3094 doc/config/push: use longer "--" line for preformatted example
20a5fd881a rev-list --count: comment on the use of count_right++
63a58457e0 Merge branch 'py/missing-bracket'
51ebf55b93 The sixth batch for 2.26
f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints'
123538444f Merge branch 'jk/doc-credential-helper'
e154451a2f Merge branch 'js/mingw-open-in-gdb'
fc25a19265 Merge branch 'js/test-unc-fetch'
6365058605 Merge branch 'js/test-avoid-pipe'
966b69f02f Merge branch 'js/test-write-junit-xml-fix'
d880c3de23 Merge branch 'jk/mailinfo-cleanup'
5d55554b1d Merge branch 'mr/show-config-scope'
9f3f38769d Merge branch 'rs/strbuf-insertstr'
cbecc168d4 Merge branch 'rs/parse-options-concat-dup'
5af345a438 Merge branch 'bc/hash-independent-tests-part-8'
0460c109c3 Merge branch 'rs/name-rev-memsave'
6b9919c0a2 git-gui: add missing close bracket
5897e5ac96 Merge branch 'cs/german-translation'
cf85a32eb6 git-gui: update German translation
5096e51c54 git-gui: extend translation glossary template with more terms
8b85bb1b70 git-gui: update pot template and German translation to current source code
e68e29171c Sync with 2.25.1
c522f061d5 Git 2.25.1
10cdb9f38a rebase: rename the two primary rebase backends
2ac0d6273f rebase: change the default backend from "am" to "merge"
8295ed690b rebase: make the backend configurable via config setting
76340c8107 rebase tests: repeat some tests using the merge backend instead of am
980b482d28 rebase tests: mark tests specific to the am-backend with --am
c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases
6d04ce75c4 git-prompt: change the prompt for interactive-based rebases
52eb738d6b rebase: add an --am option
8af14f0859 rebase: move incompatibility checks between backend options a bit earlier
be50c938df git-rebase.txt: add more details about behavioral differences of backends
befb89ce7c rebase: allow more types of rebases to fast-forward
9a70f3d4ae t3432: make these tests work with either am or merge backends
93122c985a rebase: fix handling of restrict_revision
55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer
8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling
7db00f0b3b t3406: simplify an already simple test
e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty
d48e5e21da rebase (interactive-backend): make --keep-empty the default
e0020b2f82 prefix_path: show gitdir when arg is outside repo
cc4f2eb828 doc: move credential helper info into gitcredentials(7)
bfdd66e72f Sync with maint
7ae7e234c7 The fifth batch for 2.26
53c3be2c29 Merge branch 'tb/commit-graph-object-dir'
7b029ebaef Merge branch 'jk/index-pack-dupfix'
aa21cc97bd Merge branch 'jk/alloc-cleanups'
883326077a Merge branch 'jh/notes-fanout-fix'
f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule'
78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs'
df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'
433b8aac2e Merge branch 'ds/sparse-checkout-harden'
4a77434bc8 Merge branch 'ld/p4-cleanup-processes'
8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone'
09e48400a3 Merge branch 'jk/get-oid-error-message-i18n'
4dbeecba27 Merge branch 'ag/edit-todo-drop-check'
f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2'
d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout'
251187084d Merge branch 'js/rebase-i-with-colliding-hash'
c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix'
56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store'
0da63da794 Merge branch 'jn/promote-proto2-to-default'
a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup'
daef1b300b Merge branch 'hw/advice-add-nothing'
6141e0cc00 Merge branch 'js/convert-typofix' into maint
4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint
5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint
b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint
7137d6089b Merge branch 'ms/doc-bundle-format' into maint
52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint
0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint
1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint
cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint
153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint
8857657cc9 Merge branch 'jt/t5616-robustify' into maint
1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint
f468972671 Merge branch 'bc/misconception-doc' into maint
6e69042e26 Merge branch 'bc/author-committer-doc' into maint
650ed395be Merge branch 'ds/refmap-doc' into maint
80b806f1a8 Merge branch 'bc/actualmente' into maint
eceff4ba12 Merge branch 'rt/submodule-i18n' into maint
8a17eb7972 Merge branch 'jk/test-fixes' into maint
54bbadaeca Merge branch 'jk/asan-build-fix' into maint
8dbeba198e Merge branch 'ds/sparse-cone' into maint
e361f36f61 Merge branch 'nd/switch-and-restore' into maint
4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint
ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint
5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint
c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint
d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint
9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint
3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint
3ab3185f99 pack-objects: support filters with bitmaps
84243da129 pack-bitmap: implement BLOB_LIMIT filtering
4f3bd5606a pack-bitmap: implement BLOB_NONE filtering
cc4aa28506 bitmap: add bitmap_unset() function
2aaeb9ac41 rev-list: use bitmap filters for traversal
6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure
4eb707ebd6 rev-list: allow commit-only bitmap traversals
ea047a8eb4 t5310: factor out bitmap traversal comparison
608d9c9365 rev-list: allow bitmaps when counting objects
55cb10f9b5 rev-list: make --count work with --objects
792f811998 rev-list: factor out bitmap-optimized routines
d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs
08809c09aa mingw: add a helper function to attach GDB to the current process
bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths
de26f02db1 t9001, t9116: avoid pipes
a2dc43414c MyFirstContribution: rephrase contact info
e03f928e2a rev-list: fallback to non-bitmap traversal when filtering
acac50dd8c pack-bitmap: fix leak of haves/wants object lists
551cf8b655 pack-bitmap: factor out type iterator initialization
d8437c57fa The fourth batch for 2.26
a3dcf84df0 Merge branch 'js/convert-typofix'
0de2d1409b Merge branch 'js/ci-squelch-doc-warning'
0410c2ba31 Merge branch 'jb/multi-pack-index-docfix'
0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example'
e99c325bb4 Merge branch 'ms/doc-bundle-format'
afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix'
db72f8c940 Merge branch 'jb/parse-options-message-fix'
3d2471ba85 Merge branch 'ma/filter-branch-doc-caret'
b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path'
44cba9c4b3 Merge branch 'jc/skip-prefix'
556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index'
17e4a1b141 Merge branch 'hw/doc-git-dir'
4cf7f48891 Merge branch 'jk/push-default-doc'
b783391018 Merge branch 'jk/clang-sanitizer-fixes'
a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache'
3f7553acf5 Merge branch 'jt/t5616-robustify'
341f8a6476 Merge branch 'jk/escaped-wildcard-dwim'
b486d2ee81 Merge branch 'jn/pretend-object-doc'
076ee3e8a2 tests: fix --write-junit-xml with subshells
2b0f19fa7a convert: fix typo
c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors
1751b09a92 color.c: support bright aixterm colors
4a28eb0ae4 color.c: refactor color_output arguments
f696a2b1c8 mailinfo: factor out some repeated header handling
ffbea1816d mailinfo: be more liberal with header whitespace
f447d0293e mailinfo: simplify parsing of header values
b6537d83ee mailinfo: treat header values as C strings
ef07659926 sparse-checkout: work with Windows paths
2631dc879d sparse-checkout: create 'add' subcommand
4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand
6fb705abcb sparse-checkout: extract add_patterns_from_input()
b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config
f2a2327a4a config: provide access to the current line number
923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values
ceff1a1308 remote: clean-up config callback
1a83068c26 remote: clean-up by returning early to avoid one indentation
88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types
145d59f482 config: add '--show-scope' to print the scope of a config value
9a83d088ee submodule-config: add subomdule config scope
e37efa40e1 config: teach git_config_source to remember its scope
5c105a842e config: preserve scope in do_git_config_sequence
6766e41b8a config: clarify meaning of command line scoping
6dc905d974 config: split repo scope to local and worktree
a5cb4204b6 config: make scope_name non-static and rename it
30183894ea ci: ignore rubygems warning in the "Documentation" job
7a9f8ca805 parse-options: simplify parse_options_dup()
c84078573e parse-options: const parse_options_concat() parameters
f904f9025f parse-options: factor out parse_options_count()
a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat()
517b60564e mailinfo: don't insert header prefix for handle_content_type()
a91cc7fad0 strbuf: add and use strbuf_insertstr()
eb31044ff7 pack-format: correct multi-pack-index description
9299f84921 diff-options.txt: avoid "regex" overload in example
7378ec90e1 doc: describe Git bundle format
f3037657e8 t6024: update for SHA-256
edf04243b2 t6006: make hash size independent
5db24dcffd t6000: abstract away SHA-1-specific constants
d341e0805d t5703: make test work with SHA-256
88ed241a7e t5607: make hash size independent
48c10cc0e6 t5318: update for SHA-256
f7ae8e69b6 t5515: make test hash independent
e70649bb66 t5321: make test hash independent
a30f93b143 t5313: make test hash independent
a79eec220b t5309: make test hash independent
796d1383a3 t5302: make hash size independent
417e45e5e3 t4060: make test work with SHA-256
dfa5f53e78 t4211: add test cases for SHA-256
f743e8f5b3 t4211: move SHA-1-specific test cases into a directory
72f936b120 t4013: make test hash independent
5df0f11f07 t3311: make test work with SHA-256
07877f393c t3310: make test work with SHA-256
6025e898d6 t3309: make test work with SHA-256
7b1a1822fe t3308: make test work with SHA-256
94db7e3e93 t3206: make hash size independent
db12505c2c t/lib-pack: support SHA-256
303b3c1c46 submodule: add newline on invalid submodule error
887a0fd573 add: change advice config variables used by the add API
de93cc14ab The third batch for 2.26
ea46d9097b Merge branch 'mt/sparse-checkout-doc-update'
ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix'
b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend'
7ab963e122 Merge branch 'en/fill-directory-fixes-more'
f52ab33616 Merge branch 'bc/hash-independent-tests-part-7'
25794d6ce9 Merge branch 'km/submodule-add-errmsg'
d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity'
76c57fedfa Merge branch 'js/add-p-leftover-bits'
9a5315edfd Merge branch 'js/patch-mode-in-others-in-c'
381e8e9de1 Merge branch 'dl/test-must-fail-fixes'
395518cf7a parse-options: lose an unnecessary space in an error message
079f970971 name-rev: sort tip names before applying
2d53975488 name-rev: release unused name strings
977dc1912b name-rev: generate name strings only if they are better
1c56fc2084 name-rev: pre-size buffer in get_parent_name()
ddc42ec786 name-rev: factor out get_parent_name()
f13ca7cef5 name-rev: put struct rev_name into commit slab
d689d6d82f name-rev: don't _peek() in create_or_update_name()
15a4205d96 name-rev: don't leak path copy in name_ref()
36d2419c9a name-rev: respect const qualifier
71620ca86c name-rev: remove unused typedef
3e2feb0d64 name-rev: rewrite create_or_update_name()
a21781011f index-pack: downgrade twice-resolved REF_DELTA to die()
dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout
e1c5253951 t3305: check notes fanout more carefully and robustly
e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks
a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st'
ad2dd5bb63 commit-graph.c: remove path normalization, comparison
13c2499249 commit-graph.h: store object directory in 'struct commit_graph'
0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context'
f38c92452d t7400: testcase for submodule status on unregistered inner git repos
5290d45134 tree-walk.c: break circular dependency with unpack-trees
f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch
d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode
e53ffe2704 sparse-checkout: escape all glob characters on write
e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand
bd64de42de sparse-checkout: unquote C-style strings over --stdin
d585f0e799 sparse-checkout: write escaped patterns in cone mode
4f52c2ce6c sparse-checkout: properly match escaped characters
9abc60f801 sparse-checkout: warn on globs in cone patterns
145136a95a C: use skip_prefix() to avoid hardcoded string length
04e5b3f0b4 submodule foreach: replace $path with $sm_path in example
1793280e91 t5318: don't pass non-object directory to '--object-dir'
da8063522f diff: move diff.wsErrorHighlight to "basic" config
b98d188581 sha1-file: allow check_object_signature() to handle any repo
2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file()
7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare()
c8123e72f6 streaming: allow open_istream() to handle any repo
5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile()
a651946730 cache-tree: use given repo's hash_algo at verify_one()
eb999b3295 diff: make diff_populate_filespec() honor its repo argument
5b0ca878e0 Sync with maint
344ee18728 The second batch
53a83299c7 Merge branch 'bc/misconception-doc'
c9ccf9d09b Merge branch 'bc/author-committer-doc'
0d0fa20c40 Merge branch 'ss/t6025-modernize'
7050624abc Merge branch 'lh/bool-to-type-bool'
4b69f29271 Merge branch 'ds/refmap-doc'
aff812ce3c Merge branch 'bc/actualmente'
38fb56e92a Merge branch 'rt/submodule-i18n'
f0940743fa Merge branch 'js/builtin-add-i-cmds'
0afeb3fdf4 Merge branch 'jk/test-fixes'
808dab2b58 Merge branch 'jk/asan-build-fix'
fec1ff97c2 Merge branch 'sg/completion-worktree'
c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function'
11ad30b887 Merge branch 'hi/gpg-mintrustlevel'
96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases'
d52adee779 Merge branch 'ds/graph-horizontal-edges'
6909474491 Merge branch 'am/update-pathspec-f-f-tests'
043426c8fd Merge branch 'ds/sparse-cone'
34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig'
8dd40c0472 traverse_trees(): use stack array for name entries
667b76ec58 walker_fetch(): avoid raw array length computation
9734b74a8f normalize_path_copy(): document "dst" size expectations
43f33e492a git-p4: avoid leak of file handle when cloning
19fa5ac333 git-p4: check for access to remote host earlier
6026aff5bb git-p4: cleanup better on error exit
ca5b5cce62 git-p4: create helper function importRevisions()
4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable
5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce
837b3a6376 git-p4: make closeStreams() idempotent
b0418303b1 sha1-name: mark get_oid() error messages for translation
2df1aa239c fetch: forgo full connectivity check if --filter
50033772d5 connected: verify promisor-ness of partial clone
d82ad54945 git: update documentation for --git-dir
0ad7144999 .mailmap: map Yi-Jyun Pan's email
c56c48dd07 grep: ignore --recurse-submodules if --no-index is given
8b2a1928f0 doc: drop "explicitly given" from push.default description
cf82bff73f obstack: avoid computing offsets from NULL pointer
3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer
d20bc01a51 avoid computing zero offsets from NULL pointer
7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero
bc3f657f71 t1506: drop space after redirection operator
e5d7b2f65c t1400: avoid "test" string comparisons
5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c
c7a6207591 Sync with maint
7210ca4ee5 .mailmap: fix GGG authoship screwup
37a63faae5 t4124: only mark git command with test_must_fail
a8c663cf65 t3507: use test_path_is_missing()
2def7f017c t3507: fix indentation
e8a1c686ae t3504: do check for conflict marker after failed cherry-pick
1c9fd32fd2 t3419: stop losing return code of git command
c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}()
a781cd6fef t3415: stop losing return codes of git commands
86ce6e0dd1 t3310: extract common notes_merge_files_gone()
245b9ba0ba t3030: use test_path_is_missing()
4a6f11fd7b t2018: replace "sha" with "oid"
62e80fcb48 t2018: don't lose return code of git commands
30c0367668 t2018: teach do_checkout() to accept `!` arg
40caa5366a t2018: be more discerning when checking for expected exit codes
b54128bb0b t5616: make robust to delta base change
4c616c2ba1 merge-recursive: use subtraction to flip stage
ee798742bd merge-recursive: silence -Wxor-used-as-pow warning
39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule
a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin
3b2885ec9b submodule: fix status of initialized but not cloned submodules
ace912bfb8 t7400: add a testcase for submodule status on empty dirs
4bb4fd4290 MyFirstContribution: add avenues for getting help
9e6d3e6417 sparse-checkout: detect short patterns
41de0c6fbc sparse-checkout: cone mode does not recognize "**"
7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone
47dbf10d8a clone: fix --sparse option with URLs
3c754067a1 sparse-checkout: create leading directories
d622c34396 t1091: improve here-docs
522e641748 t1091: use check_files to reduce boilerplate
417be08d02 t1300: create custom config file without special characters
3de7ee369b t1300: fix over-indented HERE-DOCs
329e6ec397 config: fix typo in variable name
767a9c417e rebase -i: stop checking out the tip of the branch to rebase
dfaed02862 fsmonitor: update documentation for hook version and watchman hooks
e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2
d031049da3 completion: add support for sparse-checkout
a402723e48 doc: sparse-checkout: mention --cone option
26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck
b6992261de rebase -i: re-fix short SHA-1 collision
d859dcad94 parse_insn_line(): improve error message when parsing failed
d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects
92fb0db94c pack-objects: add checks for duplicate objects
bb514de356 pack-objects: improve partial packfile reuse
ff483026a9 builtin/pack-objects: introduce obj_is_packed()
e704fc7978 pack-objects: introduce pack.allowPackReuse
2f4af77699 csum-file: introduce hashfile_total()
8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting()
59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile
40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains()
14fbd26044 ewah/bitmap: introduce bitmap_word_alloc()
bc7a3d4dc0 The first batch post 2.25 cycle
09e393d913 Merge branch 'nd/switch-and-restore'
45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport'
0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout'
36da2a8635 Merge branch 'es/unpack-trees-oob-fix'
42096c778d Merge branch 'bc/run-command-nullness-after-free-fix'
1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted'
a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees'
e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached'
9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting'
237a83a943 Merge branch 'dl/credential-netrc'
a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir()
129510a067 t2405: clarify test descriptions and simplify test
4eaadc8493 t2405: use git -C and test_commit -C instead of subshells
773c60a45e t7410: rename to t2405-worktree-submodule.sh
7a2dc95cbc docs: mention when increasing http.postBuffer is valuable
1b13e9032f doc: dissuade users from trying to ignore tracked files
69e104d70e doc: provide guidance on user.name format
813f6025a5 docs: expand on possible and recommended user config options
bc94e5862a doc: move author and committer information to git-commit(1)
7979dfe1d4 l10n: Update Catalan translation
81e3db42f3 templates: fix deprecated type option `--bool`
c513a958b6 t6025: use helpers to replace test -f <path>
70789843bd t6025: modernize style
6a7aca6f01 doc: rm: synchronize <pathspec> description
856249c62a docs: use "currently" for the present time
b40a50264a fetch: document and test --refmap=""
a9ae8fde2e t3404: directly test the behavior of interest
22a69fda19 git-rebase.txt: update description of --allow-empty-message
f1928f04b2 grep: use no. of cores as the default no. of threads
70a9fef240 grep: move driver pre-load out of critical section
1184a95ea2 grep: re-enable threads in non-worktree case
6c307626f1 grep: protect packed_git [re-]initialization
c441ea4edc grep: allow submodule functions to run in parallel
d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules()
1d1729caeb grep: replace grep_read_mutex by internal obj read lock
31877c9aec object-store: allow threaded access to object reading
b1fc9da1c8 replace-object: make replace operations thread-safe
d5b0bac528 grep: fix racy calls in grep_objects()
faf123c730 grep: fix race conditions at grep_submodule()
c3a5bb31c1 grep: fix race conditions on userdiff calls
0222540827 fetch: emphasize failure during submodule fetch
232378479e Sync with maint
e4837b4406 t7800: don't rely on reuse_worktree_file()
fbce03d329 t4018: drop "debugging" cat from hunk-header tests
f65d07fffa Makefile: use compat regex with SANITIZE=address
849e43cc18 built-in add -i: accept open-ended ranges again
d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files
a4ffbbbb99 submodule.c: mark more strings for translation
0cbb60574e dir: point treat_leading_path() warning to the right place
ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent
22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2
f365bf40a0 clean: demonstrate a bug with pathspecs
b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x
277eb5af7c t5604: make hash independent
44b6c05b43 t5601: switch into repository to hash object
7a868c51c2 t5562: use $ZERO_OID
1b8f39fb0d t5540: make hash size independent
a8c17e3bd6 t5537: make hash size independent
832072219c t5530: compute results based on object length
74ad99b1d8 t5512: abstract away SHA-1-specific constants
ba1be1ab45 t5510: make hash size independent
cba472d3ad t5504: make hash algorithm independent
82d5aeb1e6 t5324: make hash size independent
3c5e65cac1 t5319: make test work with SHA-256
235d3cddb8 t5319: change invalid offset for SHA-256 compatibility
1d86c8f0ce t5318: update for SHA-256
525a7f1769 t4300: abstract away SHA-1-specific constants
7a1bcb251b t4204: make hash size independent
cb78f4f0fe t4202: abstract away SHA-1-specific constants
717c939d8f t4200: make hash size independent
08a9dd891c t4134: compute appropriate length constant
215b60bf07 t4066: compute index line in diffs
194264c185 t4054: make hash-size independent
7d5ecd775d completion: list paths and refs for 'git worktree add'
3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands
3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options
367efd54b3 completion: return the index of found word from __git_find_on_cmdline()
d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function
2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper
54887b4689 gpg-interface: add minTrustLevel as a configuration option
684ceae32d fetch: default to protocol version 2
33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION
8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate
b9ab170752 config doc: protocol.version is not experimental
07ef3c6604 fetch test: use more robust test for filtered objects
d6509da620 fetch test: mark test of "skipping" haves as v0-only
a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too
c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function
bf66db37f1 add: use advise function to display hints
c958d3bd0a graph: fix collapse of multiple edges
8588932e20 graph: add test to demonstrate horizontal line bug
d0d0a357a1 t: directly test parse_pathspec_file()
568cabb2fe t: fix quotes tests for --pathspec-from-file
f94f7bd00d t: add tests for error conditions with --pathspec-from-file
b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job
12acdf573a built-in add -p: handle Escape sequences more efficiently
e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode
04f816b125 built-in add -p: respect the `interactive.singlekey` config setting
a5e46e6b01 terminal: add a new function to read a single keystroke
9ea416cb51 terminal: accommodate Git for Windows' default terminal
94ac3c31f7 terminal: make the code of disable_echo() reusable
08b1ea4c39 built-in add -p: handle diff.algorithm
180f48df69 built-in add -p: support interactive.diffFilter
1e4ffc765d t3701: adjust difffilter test
c81638541c submodule add: show 'add --dry-run' stderr when aborting
8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token
56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token
d0654dc308 Git 2.25
b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po
4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'"
ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1
e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master
1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
d78a1968c5 Merge branch 'ma/config-advice-markup-fix'
a20ae3ee29 l10n: Update Catalan translation
49e268e23e mingw: safeguard better against backslashes in file names
4c6c7971e0 unpack-trees: correctly compute result count
63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1
75449c1b39 l10n: de.po: Reword generation numbers
6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t)
3901d2c6bd config/advice.txt: fix description list separator
7a6a90c6ec Git 2.25-rc2
1f5f3ffe5c Merge branch 'ds/graph-assert-fix'
a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix'
202f68b252 Merge branch 'pm/am-in-body-header-doc-update'
7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix'
c5dc20638b Merge branch 'do/gitweb-typofix-in-comments'
fe47c9cb5f Merge https://github.com/prati0100/git-gui
a1087c9367 graph: fix lack of color in horizontal lines
0d251c3291 graph: drop assert() for merge with two collapsing parents
4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper
573117dfa5 unpack-trees: watch for out-of-range index position
e701bab3e9 restore: invalidate cache-tree when removing entries with --staged
1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command
fa74180d08 checkout: don't revert file on ambiguous tracking branches
2957709bd4 parse_branchname_arg(): extract part as new function
5020f6806a t2018: improve style of if-statement
7ffb54618b t2018: add space between function name and ()
63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH
065027ee1a string-list: note in docs that callers can specify sorting function
26f924d50e unpack-trees: exit check_updates() early if updates are not wanted
042ed3e048 The final batch before -rc2
0f1930cd1b Merge branch 'ds/sparse-cone'
037f067587 Merge branch 'ds/commit-graph-set-size-mult'
f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify'
c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode'
a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
c4117fcb97 Merge branch 'pb/clarify-line-log-doc'
556f0258df Merge branch 'ew/packfile-syscall-optim'
5814d44d9b doc: submodule: fix typo for command absorbgitdirs
7047f75f22 editorconfig: indent text files with tabs
60440d72db sha1-file: document how to use pretend_object_file
7fdc5f296f l10n: es: 2.25.0 round #1
f8740c586b am: document that Date: can appear as an in-body header
4e2c4c0d4f gitweb: fix a couple spelling errors in comments
421c0ffb02 multi-pack-index: correct configuration in documentation
757ff352bd Documentation/git-sparse-checkout.txt: fix a typo
0d2116c644 Merge branch 'zs/open-current-file'
9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u)
3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master
4c5081614c l10n: fr.po v2.25.0 rnd 1
5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0
63020f175f commit-graph: prefer default size_mult when given zero
224c7d70fa mingw: only test index entries for backslashes, not tree entries
9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED
8679ef24ed Git 2.25-rc1
a82027e9e6 Merge branch 'js/use-test-tool-on-path'
13432fc6dd Merge branch 'js/mingw-reserved-filenames'
e0e1ac5db0 Merge branch 'en/rebase-signoff-fix'
b76a244c9d Merge branch 'em/freebsd-cirrus-ci'
bc855232bc Merge branch 'bk/p4-misc-usability'
763a59e71c merge-recursive: remove unnecessary oid_eq function
44143583b7 sparse-checkout: use extern for global variables
d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master
13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1
786f4d2405 git-gui: allow opening currently selected file in default app
4fd683b6a3 sparse-checkout: document interactions with submodules
de11951b03 sparse-checkout: list directories in cone mode
0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0
578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed)
173fff68da Merge tag 'v2.25.0-rc0' into git-po-master
f1842ff531 t2018: remove trailing space from test description
20a67e8ce9 t3008: find test-tool through path lookup
9e341f62ca l10n: Update Catalan translation
4e61b2214d packfile: replace lseek+read with pread
ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision
2be45868a8 doc: log, gitk: document accepted line-log diff formats
280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD
0a76bd7381 mailmap: mask accentless variant for Công Danh
99c33bed56 Git 2.25-rc0
d2189a721c Merge branch 'en/fill-directory-fixes'
8be0a428d6 Merge branch 'rs/test-cleanup'
65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string'
c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
45b96a6fa1 Merge branch 'js/add-p-in-c'
ccc292e862 Merge branch 'jc/drop-gen-hdrs'
dfee504bee Merge branch 'ja/doc-markup-cleanup'
87cbb1ca66 Merge branch 'rs/ref-read-cleanup'
20aa6d88b7 Merge branch 'rb/p4-lfs'
fcd5b55f56 Merge branch 'pb/submodule-doc-xref'
4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free'
ba6b66281e Merge branch 'ln/userdiff-elixir'
bd72a08d6c Merge branch 'ds/sparse-cone'
f3c520e17f Merge branch 'sg/name-rev-wo-recursion'
6514ad40a1 Merge branch 'ra/t5150-depends-on-perl'
17066bea38 Merge branch 'dl/format-patch-notes-config-fixup'
135365dd99 Merge branch 'am/pathspec-f-f-checkout'
ff0cb70d45 Merge branch 'am/pathspec-from-file'
4dc42c6c18 mingw: refuse paths containing reserved names
98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16
c480eeb574 commit --interactive: make it work with the built-in `add -i`
cee6cb7300 built-in add -p: implement the "worktree" patch modes
52628f94fc built-in add -p: implement the "checkout" patch modes
6610e4628a built-in stash: use the built-in `git add -p` if so configured
90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting
36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes
d2a233cb8b built-in add -p: prepare for patch modes other than "stage"
761e3d26bb sparse-checkout: improve OS ls compatibility
6579d93a97 contrib/credential/netrc: work outside a repo
1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable
b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI
b441717256 t1507: inline full_name()
9291e6329e t1507: run commands within test_expect_success
5236fce6b4 t1507: stop losing return codes of git commands
10812c2337 t1501: remove use of `test_might_fail cp`
62d58cda69 t1409: use test_path_is_missing()
b87b02cfe6 t1409: let sed open its own input file
9b92070e52 t1307: reorder `nongit test_must_fail`
3595d10c26 t1306: convert `test_might_fail rm` to `rm -f`
f511bc02ed t0020: use ! check_packed_refs_marked
f6041abdcd t0020: don't use `test_must_fail has_cr`
f46c243e66 t0003: don't use `test_must_fail attr_check`
99c049bc4c t0003: use test_must_be_empty()
3738439c77 t0003: use named parameters in attr_check()
7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err()
b8afb908c2 t/lib-git-p4: use test_path_is_missing()
4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases
6836d2fe06 dir.c: use st_add3() for allocation size
c847dfafee dir: consolidate similar code in treat_directory()
777b420347 dir: synchronize treat_leading_path() and read_directory_recursive()
b9670c1f5e dir: fix checks on common prefix directory
5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit
23cbe427c4 Merge branch 'py/console-close-esc'
124a895811 t4015: improve coverage of function context test
509efef789 commit: forbid --pathspec-from-file --all
12029dc57d t3434: mark successful test as such
e0f9095aaa notes.h: fix typos in comment
675ef6bab8 t6030: don't create unused file
01ed17dc8c t5580: don't create unused file
f670adb49b t3501: don't create unused file
1e1ccbfdd3 git-gui: allow closing console window with Escape
7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays.
b02fd2acca The sixth batch
59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex'
e3b72391d1 Merge branch 'rs/commit-export-env-simplify'
43bf44e23a Merge branch 'rs/archive-zip-code-cleanup'
4438a1a59f Merge branch 'js/t3404-indent-fix'
3a44db2ed2 Merge branch 'dr/branch-usage-casefix'
8bc481f4f6 Merge branch 'sg/t9300-robustify'
011fc2e88e Merge branch 'js/add-i-a-bit-more-tests'
d1c0fe8d9b Merge branch 'dl/range-diff-with-notes'
26c816a67d Merge branch 'hw/doc-in-header'
f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
71a7de7a99 Merge branch 'dl/rebase-with-autobase'
c9f5fc9114 Merge branch 'dl/test-cleanup'
6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap'
3beff388b2 Merge branch 'js/builtin-add-i-cmds'
4755a34c47 Merge branch 'dd/time-reentrancy'
37c2619d91 Merge branch 'ag/sequencer-todo-updates'
608e380502 git-p4: show detailed help when parsing options fail
e2aed5fd5b git-p4: yes/no prompts should sanitize user text
571fb96573 fix-typo: consecutive-word duplications
f371984613 Makefile: drop GEN_HDRS
2e4083198d built-in add -p: show helpful hint when nothing can be staged
54d9d9b2ee built-in add -p: only show the applicable parts of the help text
ade246efed built-in add -p: implement the 'q' ("quit") command
d6cf873340 built-in add -p: implement the '/' ("search regex") command
9254bdfb4f built-in add -p: implement the 'g' ("goto") command
bcdd297b78 built-in add -p: implement hunk editing
b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf"
11f2c0dae8 built-in add -p: coalesce hunks after splitting them
510aeca199 built-in add -p: implement the hunk splitting feature
0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions
5906d5de77 built-in app -p: allow selecting a mode change as a "hunk"
47dc4fd5eb built-in add -p: handle deleted empty files
80399aec5a built-in add -p: support multi-file diffs
7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed
12c24cf850 built-in add -p: color the prompt and the help text
25ea47af49 built-in add -p: adjust hunk headers as needed
e3bd11b4eb built-in add -p: show colored hunks by default
1942ee44e8 built-in add -i: wire up the new C code for the `patch` command
f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C
d1b1384d61 userdiff: remove empty subexpression from elixir regex
df5be01669 doc: indent multi-line items in list
fd5041e127 doc: remove non pure ASCII characters
190a65f9db sparse-checkout: respect core.ignoreCase in cone mode
1d7297513d notes: break set_display_notes() into smaller functions
66f79ee23d config/format.txt: clarify behavior of multiple format.notes
cc2bd5c45d gitmodules: link to gitsubmodules guide
99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed
e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed
8c02fe6060 t7004: don't create unused file
cb05d6a5ed t4256: don't create unused file
c5c4eddd56 dir: break part of read_directory_recursive() out for reuse
072a231016 dir: exit before wildcard fall-through if there is no wildcard
2f5d3847d4 dir: remove stray quote character in comment
a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories"
452efd11fb t3011: demonstrate directory traversal failures
ea94b16fb8 git-p4: honor lfs.storage configuration variable
51a0a4ed95 bisect--helper: avoid use-after-free
d32e065a91 Merge branch 'kk/branch-name-encoding'
ad05a3d8e5 The fifth batch
7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix'
b089e5e6cb Merge branch 'em/test-skip-regex-illseq'
930078ba39 Merge branch 'hi/gpg-use-check-signature'
08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode'
7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk'
55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm'
41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress'
5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise'
dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix'
d37cfe3b5c Merge branch 'dl/pretty-reference'
99c4ff1bda Merge branch 'dl/submodule-set-url'
55d607d85b Merge branch 'js/mingw-inherit-only-std-handles'
c58ae96fc4 Merge branch 'am/pathspec-from-file'
7c88714262 Merge branch 'po/bundle-doc-clonable'
5d9324e0f4 Merge branch 'ra/rebase-i-more-options'
7034cd094b Sync with Git 2.24.1
09ac67a183 format-patch: move git_config() before repo_init_revisions()
8164c961e1 format-patch: use --notes behavior for format.notes
452538c358 notes: extract logic into set_display_notes()
e6e230eeae notes: create init_display_notes() helper
1e6ed5441a notes: rename to load_display_notes()
2866fd284c name-rev: cleanup name_ref()
49f7a2fde9 name-rev: eliminate recursion in name_rev()
fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name'
e05e8cf074 archive-zip: use enum for compression method
39acfa3d22 git gui: fix branch name encoding error
11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description
8cf8f9b4aa t3404: fix indentation
4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs
147ee35558 commit: use strbuf_add() to add a length-limited string
559c6fc317 The fourth batch
56e6c16394 Merge branch 'dl/lore-is-the-archive'
3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive'
7cb0d37f6d Merge branch 'tg/perf-remove-stale-result'
403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick'
f0cf2fee5d Merge branch 'hi/grep-do-not-return-void'
391fb22ac7 Merge branch 'rs/use-skip-prefix-more'
92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd'
4ba74ca901 Merge branch 'rs/test-cleanup'
f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick'
ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9'
8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters
3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances
dd432a6ecf name-rev: restructure parsing commits and applying date cutoff
dd090a8a37 name-rev: pull out deref handling from the recursion
766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper
d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev()
bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation
e0c4da6f2a name-rev: avoid unnecessary cast in name_ref()
c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name()
c593a26348 t6120-describe: modernize the 'check_describe' helper
abcf857300 range-diff: clear `other_arg` at end of function
f8675343d7 range-diff: mark pointers as const
828765dfe0 t3206: fix incorrect test name
0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early
21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile
b4bbbbd5a2 apply --allow-overlap: fix a corner case
89c8559367 git add -p: use non-zero exit code when the diff generation failed
e91162be9c t3701: verify that the diff.algorithm config setting is handled
0c3222c4f3 t3701: verify the shown messages when nothing can be added
24be352d52 t3701: add a test for the different `add -p` prompts
8539b46534 t3701: avoid depending on the TTY prerequisite
0f0fba2cc8 t3701: add a test for advanced split-hunk editing
53a06cf39b Git 2.24.1
67af91c47a Sync with 2.23.1
a7312d1a28 Git 2.23.1
7fd9fd94fb Sync with 2.22.2
d9589d4051 Git 2.22.2
5421ddd8d0 Sync with 2.21.1
367f12b7e9 Git 2.21.1
20c71bcf67 Merge branch 'fix-msys2-quoting-bugs'
7d8b676992 mingw: sh arguments need quoting in more circumstances
d9061ed9da t7415: drop v2.20.x-specific work-around
04522edbd4 mingw: fix quoting of empty arguments for `sh`
49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts
e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly
fc346cb292 Sync with 2.20.2
4cd1cf31ef Git 2.20.2
c154745074 submodule: defend against submodule.update = !command in .gitmodules
4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x
d851d94151 Sync with 2.19.3
caccc527ca Git 2.19.3
7c9fbda6e2 Sync with 2.18.2
9877106b01 Git 2.18.2
14af7ed5a9 Sync with 2.17.3
a5ab8d0317 Git 2.17.3
bb92255ebe fsck: reject submodule.update = !command in .gitmodules
bdfef0492c Sync with 2.16.6
eb288bc455 Git 2.16.6
68440496c7 test-drop-caches: use `has_dos_drive_prefix()`
9ac92fed5b Sync with 2.15.4
7cdafcaacf Git 2.15.4
e904deb89d submodule: reject submodule.update = !command in .gitmodules
d3ac8c3f27 Sync with 2.14.6
66d2a6159f Git 2.14.6
083378cc35 The third batch
88bd37a2d0 Merge branch 'js/pkt-line-h-typofix'
473b431410 Merge branch 'us/unpack-trees-fsmonitor'
e0f9ec9027 Merge branch 'sg/test-bool-env'
fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset'
e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere'
88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory'
8feb47e882 Merge branch 'dl/t5520-cleanup'
6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree'
57d46bc602 Merge branch 'mg/doc-submodule-status-cached'
75bd003c7b Merge branch 'js/git-svn-use-rebase-merges'
f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix'
c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'
36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree'
cf91c31688 Merge branch 'sg/unpack-progress-throughput'
ef6104581d Merge branch 'pb/submodule-update-fetches'
7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix'
f3c7bfdde2 Merge branch 'dl/range-diff-with-notes'
9502b616f1 Merge branch 'jh/userdiff-python-async'
76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2'
995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label'
f7998d9793 Merge branch 'js/builtin-add-i'
917d0d6234 Merge branch 'js/rebase-r-safer-label'
56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers'
2763530048 Merge branch 'jg/revert-untracked'
fa38ab68b0 git-gui: revert untracked files by deleting them
d9c6469f38 git-gui: update status bar to track operations
29a9366052 git-gui: consolidate naming conventions
0bb313a552 xdiff: unignore changes in function context
2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names'
65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods'
5532ebdeb7 Merge branch 'fix-mingw-quoting-bug'
76a681ce9c Merge branch 'dubiously-nested-submodules'
dd53ea7220 Merge branch 'turn-on-protectntfs-by-default'
f82a97eb91 mingw: handle `subst`-ed "DOS drives"
7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams'
d2c84dad1c mingw: refuse to access paths with trailing spaces or periods
379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh
817ddd64c2 mingw: refuse to access paths with illegal characters
cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors
7530a6287e quote-stress-test: allow skipping some trials
35edce2056 t6130/t9350: prepare for stringent Win32 path validation
55953c77c0 quote-stress-test: accept arguments to test via the command-line
ad15592529 tests: add a helper to stress test argument quoting
a8dee3ca61 Disallow dubiously-nested submodule git directories
9102f958ee protect_ntfs: turn on NTFS protection by default
91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams
6d8684161e mingw: fix quoting of arguments
3a85dc7d53 is_ntfs_dotgit(): speed it up
7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses
288a74bcd2 is_ntfs_dotgit(): only verify the leading segment
a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark
cae0bc09ab rebase: fix format.useAutoBase breakage
945dc55dda format-patch: teach --no-base
700e006c5d t4014: use test_config()
a749d01e1d format-patch: fix indentation
0c47e06176 t3400: demonstrate failure with format.useAutoBase
d9b31db2c4 t7700: stop losing return codes of git commands
3699d69df0 t7700: make references to SHA-1 generic
dcf9a748ca t7700: replace egrep with grep
cfe5eda02a t7700: consolidate code into test_has_duplicate_object()
ae475afc0f t7700: consolidate code into test_no_missing_in_packs()
14b7664df8 doc: replace LKML link with lore.kernel.org
d23f9c8e04 RelNotes: replace Gmane with real Message-IDs
dcee037228 doc: replace MARC links with lore.kernel.org
a9aecc7abb checkout, restore: support the --pathspec-from-file option
cfd9376c1d doc: restore: synchronize <pathspec> description
8ea1189eac doc: checkout: synchronize <pathspec> description
6fdc9ad259 doc: checkout: fix broken text reference
1d022bb43f doc: checkout: remove duplicate synopsis
bebb5d6d6b add: support the --pathspec-from-file option
21bb3083c3 cmd_add: prepare for next patch
4778452597 Merge branch 'prevent-name-squatting-on-windows'
a7b1ad3b05 Merge branch 'jk/fast-import-unsafe'
525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()`
e1d911dd4c mingw: disallow backslash characters in tree objects' file names
0060fd1511 clone --recurse-submodules: prevent name squatting on Windows
a52ed76142 fast-import: disallow "feature import-marks" by default
68061e3470 fast-import: disallow "feature export-marks" by default
019683025f fast-import: delay creating leading directories for export-marks
e075dba372 fast-import: stop creating leading directories for import-marks
11e934d56e fast-import: tighten parsing of boolean command line options
816f806786 t9300: create marks files for double-import-marks test
f94804c1f2 t9300: drop some useless uses of cat
4f3e57ef13 submodule--helper: advise on fatal alternate error
10c64a0b3c Doc: explain submodule.alternateErrorStrategy
ec48540fe8 packfile.c: speed up loading lots of packfiles
3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value
a4fb016ba1 pkt-line: fix a typo
0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r
e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data
228f53135a The second batch
6c630f237e Merge branch 'jk/gitweb-anti-xss'
3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell'
4775e02a5c Merge branch 'ma/t7004'
a6c6f8d02a Merge branch 'js/complete-svn-recursive'
3ae8defaf9 Merge branch 'jk/send-pack-remote-failure'
aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix'
4ab9616c76 Merge branch 'sg/skip-skipped-prereq'
723a8adba5 Merge branch 'ds/test-read-graph'
9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation'
406ca29e0d Merge branch 'rs/parse-options-dup-null-fix'
fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging'
8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion'
ef8f621045 Merge branch 'dl/complete-rebase-onto'
3c3e5d0ea2 Merge branch 'tg/stash-refresh-index'
43c5fe1c1d Merge branch 'nn/doc-rebase-merges'
6511cb33c9 Merge branch 'dd/sequencer-utf8'
f165457618 Merge branch 'jk/remove-sha1-to-hex'
a774064fb0 Merge branch 'dj/typofix-merge-strat'
ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates'
d2489ce92c Merge branch 'rs/skip-iprefix'
376e7309e1 Merge branch 'ln/userdiff-elixir'
9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log'
d3096d2ba6 Merge branch 'en/doc-typofix'
26f20fa3fc Merge branch 'ns/test-desc-typofix'
ffd130a363 Merge branch 'en/t6024-style'
5149902ff9 Merge branch 'en/misc-doc-fixes'
bcb06e204c Merge branch 'js/fetch-multi-lockfix'
d08daec001 Merge branch 'rs/trace2-dots'
fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix'
bad5ed39cd Merge branch 'cb/curl-use-xmalloc'
7ab2088255 Merge branch 'rt/fetch-message-fix'
f089ddd56a Merge branch 'es/myfirstcontrib-updates'
3c90710c0c Merge branch 'hw/config-doc-in-header'
d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code'
5444d52866 Merge branch 'js/vreportf-wo-buffering'
05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add'
ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides'
532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default'
dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists'
fac9ab1419 Merge branch 'ma/bisect-doc-sample-update'
a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix'
0be5caf97c Merge branch 'jc/log-graph-simplify'
0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck'
2e697ced9d built-in add -i: offer the `quit` command
d7633578b5 built-in add -i: re-implement the `diff` command
8746e07277 built-in add -i: implement the `patch` command
ab1e1cccaf built-in add -i: re-implement `add-untracked` in C
c54ef5e424 built-in add -i: re-implement `revert` in C
a8c45be939 built-in add -i: implement the `update` command
f37c226454 built-in add -i: prepare for multi-selection commands
c08171d156 built-in add -i: allow filtering the modified files list
0c3944a628 add-interactive: make sure to release `rev.prune_data`
4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance
867fc7f310 grep: don't return an expression from pcre2_free()
c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables
72b006f4bf gpg-interface: prefer check_signature() for GPG verification
7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD
b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r
ccd469450a date.c: switch to reentrant {gm,local}time_r
271c351b2f t7811: don't create unused file
65efb42862 t9300: don't create unused file
f6b9413baf sequencer: fix a memory leak in sequencer_continue()
3eae30e464 doc: replace public-inbox links with lore.kernel.org
46c67492aa doc: recommend lore.kernel.org over public-inbox.org
5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects
17a4ae92ea t7700: s/test -f/test_path_is_file/
d2eee32a89 t7700: move keywords onto their own line
7a1c8c2346 t7700: remove spaces after redirect operators
09279086e8 t7700: drop redirections to /dev/null
756ee7fc9f t7501: stop losing return codes of git commands
38c1aa01de t7501: remove spaces after redirect operators
763b47bafa t5703: stop losing return codes of git commands
eacaa1c180 t5703: simplify one-time-sed generation logic
a29b2429e5 t5317: use ! grep to check for no matching lines
6c37f3ec1b t5317: stop losing return codes of git commands
b66e0a1773 t4138: stop losing return codes of git commands
afd43c9905 t4015: use test_write_lines()
946d2353a3 t4015: stop losing return codes of git commands
50cd31c652 t3600: comment on inducing SIGPIPE in `git rm`
3b737381d8 t3600: stop losing return codes of git commands
0d913dfa7e t3600: use test_line_count() where possible
29a40b5a67 t3301: stop losing return codes of git commands
9b5a9fa60a t0090: stop losing return codes of git commands
17aa9d9c1a t0014: remove git command upstream of pipe
77a946be98 apply-one-time-sed.sh: modernize style
176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job
ed254710ee test: use test_must_be_empty F instead of test_cmp empty F
c74b3cbb83 t7812: add missing redirects
213dabf49d test: use test_must_be_empty F instead of test -z $(cat F)
c93a5aaec8 t1400: use test_must_be_empty
6e4826ea75 t1410: use test_line_count
a5d04a3ef9 t1512: use test_line_count
54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd()
2059e79c0d name-rev: use skip_prefix() instead of starts_with()
1768aaf01d push: use skip_prefix() instead of starts_with()
ec6ee0c07a shell: use skip_prefix() instead of starts_with()
7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with()
a6293f5d28 fetch: use skip_prefix() instead of starts_with()
13ca8fb79e t5150: skip request-pull test if Perl is disabled
ecc0869080 commit-graph: use start_delayed_progress()
44a4693bfc progress: create GIT_PROGRESS_DELAY
528d9e6d01 t/perf: don't depend on Git.pm
b8dcc45387 perf-lib: use a single filename for all measurement types
fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk'
d82dfa7f5b rebase -i: finishing touches to --reset-author-date
1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory
393adf7a6f sequencer: directly call pick_commits() from complete_action()
a2dd67f105 rebase: fill `squash_onto' in get_replay_opts()
3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function
34065541e3 sequencer: update `done_nr' when skipping commands in a todo list
8638114e06 sequencer: update `total_nr' when adding an item to a todo list
0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk
ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk
ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions
9917eca794 l10n: zh_TW: add translation for v2.24.0
0a8e3036a3 reset: parse rev as tree-ish in patch mode
f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits
8d483c8408 doc: document 'git submodule status --cached'
befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick
ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later
9a780a384d mingw: spawned processes need to inherit only standard handles
c5a03b1e29 mingw: work around incorrect standard handles
eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes
a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool
43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values
2d05ef2778 sequencer: fix empty commit check when amending
ea8b7be147 git svn: stop using `rebase --preserve-merges`
67a6ea6300 gpg-interface: limit search for primary key fingerprint
392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern
cff4e9138d sparse-checkout: check for dirty status
416adc8711 sparse-checkout: update working directory in-process for 'init'
f75a69f880 sparse-checkout: cone mode should not interact with .gitignore
fb10ca5b54 sparse-checkout: write using lockfile
99dfa6f970 sparse-checkout: use in-process update for disable subcommand
e091228e17 sparse-checkout: update working directory in-process
e9de487aa3 sparse-checkout: sanitize for nested folders
4dcd4def3c unpack-trees: add progress to clear_ce_flags()
eb42feca97 unpack-trees: hash less in cone mode
af09ce24a9 sparse-checkout: init and set in cone mode
96cc8ab531 sparse-checkout: use hashmaps for cone patterns
879321eb0b sparse-checkout: add 'cone' mode
e6152e35ff trace2: add region in clear_ce_flags
72918c1ad9 sparse-checkout: create 'disable' subcommand
7bffca95ea sparse-checkout: add '--stdin' option to set subcommand
f6039a9423 sparse-checkout: 'set' subcommand
d89f09c828 clone: add --sparse mode
bab3c35908 sparse-checkout: create 'init' subcommand
94c0956b60 sparse-checkout: create builtin with 'list' subcommand
679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files
df6d3d6802 lib-bash.sh: move `then` onto its own line
2a02262078 t5520: replace `! git` with `test_must_fail git`
c245e58bb6 t5520: remove redundant lines in test cases
a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp
e959a18ee7 t5520: don't put git in upstream of pipe
5540ed27bc t5520: test single-line files by git with test_cmp
dd0f1e767b t5520: use test_cmp_rev where possible
979f8891cc t5520: replace test -{n,z} with test-lib functions
3037d3db90 t5520: use test_line_count where possible
93a9bf876b t5520: remove spaces after redirect operator
ceeef863de t5520: replace test -f with test-lib functions
4c8b046f82 t5520: let sed open its own input
53c62b9810 t5520: use sq for test case names
e8d1eaf9b4 t5520: improve test style
2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals
8cb7980382 t0000: test multiple local assignment
5b583e6a09 format-patch: pass notes configuration to range-diff
bd36191886 range-diff: pass through --notes to `git log`
9f726e1b87 range-diff: output `## Notes ##` header
3bdbdfb7a5 t3206: range-diff compares logs with commit notes
75c5aa0701 t3206: s/expected/expect/
79f3950d02 t3206: disable parameter substitution in heredoc
3a6e48e9f7 t3206: remove spaces after redirect operators
26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish
077a1fda82 userdiff: support Python async functions
3798149a74 SubmittingPatches: use `--pretty=reference`
1f0fc1db85 pretty: implement 'reference' format
618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type
0df621172d pretty: provide short date format
ac52d9410e t4205: cover `git log --reflog -z` blindspot
3e8ed3b93e pretty.c: inline initalize format_context
4982516451 revision: make get_revision_mark() return const pointer
f0f9de2bd7 completion: complete `tformat:` pretty format
fb2ffa77a6 SubmittingPatches: remove dq from commit reference
bae74c9dfb pretty-formats.txt: use generic terms for hash
bd00717eab SubmittingPatches: use generic terms for hash
9d45ac4cbf rev-list-options.txt: remove reference to --show-notes
828e829b9e argv-array: add space after `while`
e440fc5888 commit: support the --pathspec-from-file option
66a25a7242 doc: commit: synchronize <pathspec> description
64bac8df97 reset: support the `--pathspec-from-file` option
d137b50756 doc: reset: synchronize <pathspec> description
24e4750c96 pathspec: add new function to parse file
0dbc4a0edf ci(osx): update homebrew-cask repository with less noise
e02058a729 sequencer: handle rebase-merges for "onto" message
bae60ba7e9 builtin/unpack-objects.c: show throughput progress
2d92ab32fd rev-parse: make --show-toplevel without a worktree an error
9e5afdf997 fetch: add trace2 instrumentation
4c4066d95d run-command: move doc to run-command.h
6c51cb525d trace2: move doc to trace2.h
7db0305438 parse-options: add link to doc file in parse-options.h
d95a77d059 submodule-config: move doc to submodule-config.h
f3b9055624 credential: move doc to credential.h
bbcfa3002a tree-walk: move doc to tree-walk.h
971b1f24a2 argv-array: move doc to argv-array.h
f1ecbe0f53 trace: move doc to trace.h
13aa9c8b70 cache: move doc to cache.h
c0be43f898 sigchain: move doc to sigchain.h
19ef3ddd36 pathspec: move doc to pathspec.h
301d595e72 revision: move doc to revision.h
3a1b3415d9 attr: move doc to attr.h
126c1ccefb refs: move doc to refs.h
d27eb356bf remote: move doc to remote.h and refspec.h
405c6b1fbc sha1-array: move doc to sha1-array.h
d3d7172e40 merge: move doc to ll-merge.h
3f1480b745 graph: move doc to graph.h and graph.c
266f03eccd dir: move doc to dir.h
13c4d7eb22 diff: move doc to diff.h and diffcore.h
cd5522271f rebase -r: let `label` generate safer labels
867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()`
8c15904462 built-in add -i: implement the `help` command
3d965c7674 built-in add -i: use color in the main loop
68db1cbf8e built-in add -i: support `?` (prompt help)
76b743234c built-in add -i: show unique prefixes of the commands
6348bfba58 built-in add -i: implement the main loop
a376e37b2c gitweb: escape URLs generated by href()
b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI
f28bceca75 t/gitweb-lib.sh: drop confusing quotes
0eba60c9b7 t9502: pass along all arguments in xss helper
932757b0cc INSTALL: use existing shell scripts as example
b018719927 t7004: check existence of correct tag
1daaebcaa5 built-in add -i: color the header in the `status` command
5e82b9e4d2 built-in add -i: implement the `status` command
e4cb659ebd diff: export diffstat interface
f83dff60a7 Start to implement a built-in version of `git add --interactive`
df53c80822 stash: make sure we have a valid index before writing it
ad7a403268 send-pack: check remote ref status on pack-objects failure
d91ce887c9 t6120-describe: correct test repo history graph in comment
1f9247a3bd completion: tab-complete "git svn --recursive"
603960b50e promisor-remote: remove fetch_if_missing=0
e362fadcd0 clone: remove fetch_if_missing=0
169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL
51bd6be32d mingw: use COPY_ARRAY for copying array
4bd0593e0f test-tool: use 'read-graph' helper
e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway
d784d978f6 t4215: use helper function to check output
61eea521fe fsmonitor: do not compare bitmap size with size of split index
b19f3fe9dd hex: drop sha1_to_hex()
c1ce9c06d0 completion: learn to complete `git rebase --onto=`
f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls
d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase
aa6d7f93ed hex: drop sha1_to_hex_r()
52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch
5772b0c745 sequencer: reencode old merge-commit message
e0eba649e8 bundle-verify: add --quiet
79862b6b77 bundle-create: progress output control
73c3253d75 bundle: framework for options before bundle file
68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in"
b375744274 sequencer: reencode squashing commit's message
019a9d8362 sequencer: reencode revert/cherry-pick's todo list
0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list
e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding
1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary
d9f6f3b619 The first batch post 2.24 cycle
28014c1084 Merge branch 'bc/hash-independent-tests-part-6'
57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree'
c22f63c40f Merge branch 'pb/pretty-email-without-domain-part'
5731ca3657 Merge branch 'hw/remove-api-docs-placeholder'
14b58c62bc Merge branch 'sg/commit-graph-usage-fix'
eff313f8a7 Merge branch 'dl/apply-3way-diff3'
db806d7064 Merge branch 'sg/dir-trie-fixes'
f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix'
8f1119b988 Merge branch 'wb/midx-progress'
d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes'
0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges'
8f40d89783 Merge branch 'hv/bitshift-constants-in-blame'
d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head'
5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer'
b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc'
15d9f3dc66 Merge branch 'es/walken-tutorial'
026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor'
ed28358833 convert: use skip_iprefix() in validate_encoding()
89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding()
03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules
ae821ffe83 multimail: fix a few simple spelling errors
557c5895c2 sha1dc: fix trivial comment spelling error
aa74be316a Fix spelling errors in test commands
96c0caf5e3 Fix spelling errors in messages shown to users
4dc8b1c114 Fix spelling errors in names of tests
7a40cf1553 Fix spelling errors in comments of testcases
15beaaa3d1 Fix spelling errors in code comments
a807200f67 userdiff: add Elixir to supported userdiff languages
461caf3e8a git-shortlog.txt: include commit limiting options
6462d5eb9a fetch: remove fetch_if_missing=0
46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion
99b2ba35f5 t0028: eliminate non-standard usage of printf
add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul`
14c4776d75 t: fix typo in test descriptions
270de6acbe t6024: modernize style
77363a51fb name-hash.c: remove duplicate word in comment
c92faa4d22 hashmap: fix documentation misuses of -> versus .
a6d39f2efb git-filter-branch.txt: correct argument name typo
4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators
8915297925 Fix spelling errors in documentation outside of Documentation/
031fd4b93b Documentation: fix a bunch of typos, both old and new
dd0b61f577 fsmonitor: fix watchman integration
5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare()
7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph
c14e6e7903 fetch: add the command-line option `--write-commit-graph`
da72936f54 Git 2.24
1d34d425d4 Merge branch 'bc/doc-use-docbook-5'
dac1d83c91 Merge branch 'ds/commit-graph-on-fetch'
c32ca691c2 Merge branch 'jt/delay-fetch-if-missing'
ab6b50e4c8 Merge https://github.com/prati0100/git-gui
93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po
a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2
fe28ad8520 rebase: add --reset-author-date
08187b4cba rebase -i: support --ignore-date
0185c683c9 sequencer: rename amend_author to author_to_rename
cbd8db17ac rebase -i: support --committer-date-is-author-date
c068bcc59b sequencer: allow callers of read_author_script() to ignore fields
ba51d2fb24 rebase -i: add --ignore-whitespace flag
3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower
3ada78de3f myfirstcontrib: add dependency installation step
4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt
4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly
8dfb04ae96 update-index: optionally leave skip-worktree entries alone
116d1fa6c6 vreportf(): avoid relying on stdio buffering
efd5444238 RelNotes/2.24.0: fix self-contradictory note
391c7e40b5 fetch.c: fix typo in a warning message
55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template
849e43680d RelNotes/2.24.0: typofix
0115e5d929 git-diff.txt: document return code of `--no-index`
798d66e35d l10n: de.po: Update German translation
c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u)
f21f8f5d35 Git 2.24-rc2
8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix'
0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix'
f2db52c46b Merge branch 'js/mingw-needs-hiding-fix'
5b7594abdc Merge branch 'master' of github.com:vnwildman/git
034d33653a Merge branch 'next' of github.com:ChrisADR/git-po
26b061007c submodule: teach set-url subcommand
460782b7be t7519-status-fsmonitor: improve comments
d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses
4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config
1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694)
f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0
762d5b4f46 help: add gitsubmodules to the list of guides
76a53d640f git_path(): handle `.lock` files correctly
3ce47211a6 t1400: wrap setup code in test case
44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string
6c02042139 clone: rename static function `dir_exists()`.
8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command
77200e9332 l10n: es: 2.24.0 round 2
e42df36b42 Merge branch 'l10n/it/update-italian-translation'
5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2
51728480fe l10n: fr v2.24.0 rnd2
045a548698 l10n: git.pot: v2.24.0 round 2 (1 new)
468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master
b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree()
c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit()
103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag()
f648ee7088 fsck: rename vague "oid" local variables
cc579000bf fsck: don't require an object struct in verify_headers()
7854399366 fsck: don't require an object struct for fsck_ident()
b8b00f1693 fsck: drop blob struct from fsck_finish()
6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob()
38370253fd fsck: don't require an object struct for report()
f59793763d fsck: only require an oid for skiplist functions
5afc4b1dc6 fsck: only provide oid/type in fsck_error callback
82ef89b318 fsck: don't require object structs for display functions
733902905d fsck: use oids rather than objects for object_name API
d40bbc109b fsck_describe_object(): build on our get_object_name() primitive
a59cfb3230 fsck: unify object-name code
23a173a761 fsck: require an actual buffer for non-blobs
2175a0c601 fsck: stop checking tag->tagged
ec65231571 fsck: stop checking commit->parent counts
1de6007d85 fsck: stop checking commit->tree value
228c78fbd4 commit, tag: don't set parsed bit for parse failures
60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()`
8b656572ca builtin/commit-graph.c: remove subcommand-less usage string
fa26d5ede6 t4048: abstract away SHA-1-specific constants
cf02be8486 t4045: make hash-size independent
38ee26b2a3 t4044: update test to work with SHA-256
37ab8ebef1 t4039: abstract away SHA-1-specific constants
0370b35414 t4038: abstract away SHA-1 specific constants
0253e126a2 t4034: abstract away SHA-1-specific constants
45e2ef2b1d t4027: make hash-size independent
79b0edc1a0 t4015: abstract away SHA-1-specific constants
840624ff55 t4011: abstract away SHA-1-specific constants
32a6707267 t4010: abstract away SHA-1-specific constants
440bf91dfa t3429: remove SHA1 annotation
0b408ca2bd t1305: avoid comparing extensions
2eabd38313 rev-parse: add a --show-object-format option
52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode
45e206f0d8 t4203: use test-lib.sh definitions
2ae4944aac t6006: use test-lib.sh definitions
cb99a34e23 commit-graph: fix writing first commit-graph during fetch
e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug
7b4fb434b4 documentation: remove empty doc files
566a1439f6 Git 2.24-rc1
04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix'
4d6fb2beeb Merge branch 'ds/feature-macros'
5f0b6ed907 Merge branch 'js/azure-ci-osx-fix'
c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs'
1b4f85285f Merge branch 'dl/submodule-set-branch'
c7aadccba0 fetch: delay fetch_if_missing=0 until after config
c11e9966cb repo-settings: read an int for index.version
091489d068 apply: respect merge.conflictStyle in --3way
aa76ae4905 t4108: demonstrate bug in apply
95806205cd t4108: use `test_config` instead of `git config`
b0069684d4 t4108: remove git command upstream of pipe
fa87b81385 t4108: replace create_file with test_write_lines
7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job
6c96630cb0 config: move documentation to config.h
d81542e6f3 Eleventh batch
e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix'
d45d771978 Merge branch 'bc/smart-http-atomic-push'
22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix'
2e215b7959 Merge branch 'sb/userdiff-dts'
e3cf08361a Merge branch 'sg/progress-fix'
b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix'
c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc'
f45f88b2e4 path.c: don't call the match function without value in trie_find()
c72fc40d09 path.c: clarify two field names in 'struct common_dir'
8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file
7cb8c929d7 path.c: clarify trie_find()'s in-code comment
e536b1fedf Documentation: mention more worktree-specific exceptions
680cba2c2b multi-pack-index: add [--[no-]progress] option.
64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack
ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file
8dc18f8937 midx: add progress to expire_midx_packs
840cef0c70 midx: add progress to write_midx_file
efbc3aee08 midx: add MIDX_PROGRESS flag
0eb3671ed9 ci(osx): use new location of the `perforce` cask
da1e295e00 t604[236]: do not run setup in separate tests
49b8133a9e merge-recursive: fix merging a subdirectory into the root directory
d3eebaad5e merge-recursive: clean up get_renamed_dir_portion()
80736d7c5e doc: am --show-current-patch gives an entire e-mail message
a8e2c0eadc t7419: change test_must_fail to ! for grep
19c29e538e t4014: make output-directory tests self-contained
12a4aeaad8 Merge branch 'js/azure-pipelines-msvc'
399c23c046 ci(visual-studio): actually run the tests in parallel
711cd6d15c ci(visual-studio): use strict compile flags, and optimization
370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0
cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master
907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master
13bcea8c7f l10n: fr 2.24.0 rnd 1
135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master
3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed)
8da56a4848 userdiff: fix some corner cases in dts regex
86795774bb builtin/blame.c: constants into bit shift format
feebd2d256 rebase: hide --preserve-merges option
0e40a73a4c Doc: Bundle file usage
78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error
12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error
c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error
2b6f6ea1bd test-progress: fix test failures on big-endian systems
f757409e36 l10n: bg.po: Updated Bulgarian translation (4693)
176f5adfdb completion: clarify installation instruction for zsh
d966095db0 Git 2.24-rc0
90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array'
3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth'
d0258d0944 Merge branch 'rs/http-push-simplify'
bb52def6da Merge branch 'jj/stash-reset-only-toplevel'
f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs'
e5fca6b573 Merge branch 'bb/compat-util-comment-fix'
43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup'
07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely'
2d74d28ee0 Merge branch 'dl/compat-cleanup'
9b83a94829 Merge branch 'ta/t1308-typofix'
376012c919 Merge branch 'js/doc-stash-save'
10da030ab7 grep: avoid leak of chartables in PCRE2
513f2b0bbd grep: make PCRE2 aware of custom allocator
57d4660468 grep: make PCRE1 aware of custom allocator
d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand
8af69cf3e2 t3301: test diagnose messages for too few/many paramters
6f1194246a remote-curl: pass on atomic capability to remote side
bbb13e8188 graph: fix coloring of octopus dashes
92beecc136 graph: flatten edges that fuse with their right neighbor
479db18bc0 graph: smooth appearance of collapsing edges on commit lines
0195285b95 graph: rename `new_mapping` to `old_mapping`
d62893ecc1 graph: commit and post-merge lines for left-skewed merges
0f0f389f12 graph: tidy up display of left-skewed merges
458152cce1 graph: example of graph output that can be simplified
ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state
46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()`
a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()`
9157a2a032 graph: reuse `find_new_column_by_commit()`
210179a20d graph: handle line padding in `graph_next_line()`
fbccf255f9 graph: automatically track display width of graph lines
5374a290aa fetch-pack: write fetched refs to .promisor
4627bc777e sequencer: run post-commit hook
49697cb721 move run_commit_hook() to libgit and use it there
12bb7a540a sequencer.h fix placement of #endif
6a619ca03c t3404: remove uneeded calls to set_fake_editor
b2dbacbddf t3404: set $EDITOR in subshell
88a92b6c73 t3404: remove unnecessary subshell
bf8e65b30b format-patch: teach --cover-from-description option
a92331df18 format-patch: use enum variables
46273df7bf format-patch: replace erroneous and condition
3b3c79f6c9 diff-highlight: fix a whitespace nit
108b97dc37 Ninth batch
cbe8cdd3a0 Merge branch 'jk/coc'
3b9ec27919 Merge branch 'js/trace2-fetch-push'
c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch'
1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup'
eb3de5b823 Merge branch 'js/xdiffi-comment-updates'
4e8371ec26 Merge branch 'dl/t0000-skip-test-test'
b6d712fa4e Merge branch 'tg/range-diff-output-update'
77458870a5 Merge branch 'gs/sq-quote-buf-pretty'
5efabc7ed9 Merge branch 'ew/hashmap'
d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files'
6ed610b968 Merge branch 'am/t0028-utf16-tests'
5b900fb812 Merge branch 'dl/octopus-graph-bug'
16d9d7184b Merge branch 'en/fast-imexport-nested-tags'
6d5291be45 Merge branch 'js/azure-pipelines-msvc'
ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd'
d96e31e390 Merge branch 'js/fetch-jobs'
280bd44551 Merge branch 'en/merge-recursive-cleanup'
062a309d36 remote-curl: use argv_array in parse_push()
a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes
5cc6a4be11 http-push: simplify deleting a list item
556895d0c8 stash: avoid recursive hard reset on submodules
b524f6b399 Merge branch 'ka/japanese-translation'
f6f3824b4e git-gui: improve Japanese translation
61f4b407d3 Merge branch 'py/readme'
1e6880fd06 git-gui: add a readme
edefc31873 format-patch: create leading components of output directory
68b69211b2 git-compat-util: fix documentation syntax
fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth()
e0479fa073 documentation: add tutorial for object walking
3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed
4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target
9cad1c4488 pthread.h: manually align parameter lists
8c1cfd58e3 t1308-config-set: fix a test that has a typo
57d8f4b4c7 doc(stash): clarify the description of `save`
08da6496b6 Eighth batch
07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup'
f0d407e6ae Merge branch 'kt/add-i-progress'
66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree'
a4c5d9f66e Merge branch 'rs/dedup-includes'
159cdabd87 Merge branch 'js/range-diff-noprefix'
93424f1f7d Merge branch 'cb/pcre1-cleanup'
a73f91774c Merge branch 'ab/pcre-jit-fixes'
4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword'
020011f2cb Merge branch 'tk/git-svn-trim-author-name'
676278f8ea Merge branch 'bc/object-id-part17'
aafb75452b Merge branch 'en/clean-nested-with-ignored'
3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails
5cdf2301d4 add a Code of Conduct document
70bf0b755a Seventh batch
9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat'
2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary'
d17f54947d Merge branch 'rs/convert-fix-utf-without-dash'
82c80f98e6 Merge branch 'py/git-gui-has-maintainer'
6e12570822 Merge branch 'ah/cleanups'
772cad0afb Merge branch 'js/diff-rename-force-stable-sort'
424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path'
678a9ca629 Merge branch 'as/shallow-slab-use-fix'
0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix'
042a54d251 Merge branch 'am/visual-studio-config-fix'
03d3b1297c xdiffi: fix typos and touch up comments
b05b40930e t0000: cover GIT_SKIP_TESTS blindspots
d8bc1a518a send-pack: never fetch when checking exclusions
756fb0dedb t4014: treat rev-list output as the expected value
2b6a9b13ca range-diff: don't segfault with mode-only changes
360c7ba330 transport: push codepath can take arbitrary repository
ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments
b657047719 merge-recursive: fix the fix to the diff3 common ancestor label
b744c3af07 Sixth batch
417056578a Merge branch 'bw/submodule-helper-usage-fix'
9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check'
1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a'
59b19bcd9f Merge branch 'cc/multi-promisor'
1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way'
5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort'
eb35c18e42 Merge branch 'sg/travis-help-debug'
cabb145fe3 Merge branch 'rs/alias-use-copy-array'
56c7ab0f4e Merge branch 'sg/t-helper-gitignore'
e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang'
583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules'
337e3f2b49 Merge branch 'rs/nth-switch-code-simplification'
8f53fe1733 Merge branch 'hb/hg-to-git-py3'
ef93bfbd45 Merge branch 'sg/progress-fix'
980351d1ac Merge branch 'js/doc-patch-text'
80693e3f09 Merge branch 'tb/commit-graph-harden'
ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge'
3f84633563 Merge branch 'dl/cocci-everywhere'
caf150ce7d Merge branch 'gs/commit-graph-progress'
1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim'
1398171378 Merge branch 'rs/commit-graph-use-list-count'
773521df26 Merge branch 'rs/nth-parent-parse'
7f17913161 Merge branch 'dl/submodule-set-branch'
cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix'
bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees'
098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack'
37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc'
e392382f95 Merge branch 'dl/complete-rebase-and-archive'
cda8faa37e Merge branch 'jk/commit-graph-cleanup'
36d2fca82b Merge branch 'ss/get-time-cleanup'
ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude'
ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob'
ba2d451122 Merge branch 'tg/stash-refresh-index'
e2b5038d87 hashmap_entry: remove first member requirement from docs
404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry
23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators
c8e424c9c9 hashmap: introduce hashmap_free_entries
8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry *
87571c3f71 hashmap: use *_entry APIs for iteration
939af16eac hashmap_cmp_fn takes hashmap_entry params
f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *"
f0e63c4113 hashmap: use *_entry APIs to wrap container_of
6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *"
973d5eea74 introduce container_of macro
26b455f21e hashmap_put takes "struct hashmap_entry *"
28ee794128 hashmap_remove takes "const struct hashmap_entry *"
b6c5241606 hashmap_get takes "const struct hashmap_entry *"
b94e5c1df6 hashmap_add takes "struct hashmap_entry *"
f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *"
d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *"
d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry
12878c8351 coccicheck: detect hashmap_entry.hash assignment
e010a41216 diff: use hashmap_entry_init on moved_entry.ent
f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo"
de5abb5f7a git-p4: auto-delete named temporary file
c90b652afd Fifth batch
f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1'
b0f8aed48f Merge branch 'ma/user-manual-markup-update'
faf5576a8d Merge branch 'bc/doc-use-docbook-5'
314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes'
70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo'
847650798b Merge branch 'am/mailmap-andrey-mazo'
1a155f2e66 Merge branch 'jc/git-gui-has-maintainer'
1bcef51204 t/oid-info: add empty tree and empty blob values
ecde49bb8a t/oid-info: allow looking up hash algorithm name
11a3d3aadd git-rev-list.txt: prune options in synopsis
7d2f003ee4 Documentation: update the location of the git-gui repo
b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding()
46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines
b35304bf95 ci: really use shallow clones on Azure Pipelines
ab7d854aba tests: let --immediate and --write-junit-xml play well together
be5d88e112 test-tool run-command: learn to run (parts of) the testsuite
5d65ad17a9 vcxproj: include more generated files
030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built
61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable()
e4347c9434 msvc: handle DEVELOPER=1
ed712ef8d5 msvc: ignore some libraries when linking
5b8f9e2417 compat/win32/path-utils.h: add #include guards
41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning
c097b95a26 msvc: avoid using minus operator on unsigned types
dfd557c978 stash apply: report status correctly even in a worktree's subdirectory
d54dea77db fetch: let --jobs=<n> parallelize --multiple, too
87db61a436 trace2: write discard message to sentinel files
83e57b04e6 trace2: discard new traces if target directory has too many files
11c21f22de t4214: demonstrate octopus graph coloring failure
25eb905e14 t4214: explicitly list tags in log
63be8c8dd7 t4214: generate expect in their own test cases
a7a5590c6e t4214: use test_merge
94ba151300 test-lib: let test_merge() perform octopus merges
22541013d0 docs: clarify trace2 version invariants
3d4548e7e2 docs: mention trace2 target-dir mode in git-config
2fe44394c8 treewide: remove duplicate #include directives
dbcd970c27 push: do not pretend to return `int` from `die_push_simple()`
941790d7de fast-export: handle nested tags
8d7d33c1ce t9350: add tests for tags of things other than a commit
a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags
208d69246e fast-export: add support for --import-marks-if-exists
b8f50e5b60 fast-import: add support for new 'alias' command
f73b2aba05 fast-import: allow tags to be identified by mark labels
3164e6bd24 fast-import: fix handling of deleted tags
8085050ab4 add -i: show progress counter in the prompt
69fdb922ad Merge branch 'bw/diff3-conflict-style'
b436825b9b git-gui: support for diff3 conflict style
937b76ed49 range-diff: internally force `diff.noprefix=true`
411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job
25e4b8099c push: add trace2 instrumentation
5fc31180d8 fetch: add trace2 instrumentation
53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value
c3b57dc2a0 git-gui: use existing interface to query a path's attribute
45ab460d4a Merge branch 'js/git-bash-if-available'
0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command
71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only)
54a80a9ad8 wrapper: use a loop instead of repetitive statements
baed6bbb5b diffcore-break: use a goto instead of a redundant if statement
8da02ce62a commit-graph: remove a duplicate assignment
ddb3c856f3 shallow.c: don't free unallocated slabs
8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits
65904b8b2b promisor-remote: skip move_to_tail when no-op
2049b8dc65 diffcore_rename(): use a stable sort
97fff61012 Move git_sort(), a stable sort, into into libgit.a
69f272b922 dir: special case check for the possibility that pathspec is NULL
6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available
bc12974a89 Fourth batch
5a5350940b Merge branch 'ds/commit-graph-on-fetch'
974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch'
9755f70fe6 Merge branch 'ds/include-exclude'
93fc8760e7 Merge branch 'jh/trace2-pretty-output'
640f9cd599 Merge branch 'dl/rebase-i-keep-base'
026428c35e Merge branch 'sg/clean-nested-repo-with-ignored'
21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip'
d693345518 Merge branch 'dl/use-sq-from-test-lib'
d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes'
2be6ccc01a Merge branch 'sg/git-test-boolean'
cf861cd7a0 Merge branch 'rs/get-tagged-oid'
91243b019d Merge branch 'en/filter-branch-deprecation'
9bc67b6658 Merge branch 'en/merge-options-ff-and-friends'
fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden'
cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option'
8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return'
3ff6af7753 Merge branch 'nd/switch-and-restore'
aadac067aa Merge branch 'tb/file-url-to-unc-path'
b57a88a5f1 Merge branch 'js/gitdir-at-unc-root'
6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path'
430439536b Merge branch 'rs/parse-tree-indirect'
991fd97b9a Merge branch 'jk/fast-import-history-bugfix'
74a39b9bcc Merge branch 'mh/notes-duplicate-entries'
37801f0665 Merge branch 'tb/banned-vsprintf-namefix'
21ce0b48f3 Merge branch 'mh/release-commit-memory-fix'
f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup'
bf6136cab8 Merge branch 'rs/strbuf-detach'
a2e22bb3ad Merge branch 'rs/trace2-dst-warning'
1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup'
0281733483 Merge branch 'bc/hash-independent-tests-part-5'
f06fb376ed Merge branch 'jc/test-cleanup'
00bb74453d Merge branch 'dl/compat-cleanup'
59438be06c Merge branch 'js/visual-studio'
cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone'
af2abd870b fast-export: fix exporting a tag and nothing else
c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor
dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit
fd5b820d9c user-manual.txt: change header notation
e79b34533a user-manual.txt: add missing section label
b503a2d515 Makefile: emulate compile in $(HCO) target better
af26e2a9d2 pack-bitmap.h: remove magic number
b06fdead04 promisor-remote.h: include missing header
97b989ee3a apply.h: include missing header
4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name
d928a8388a t0028: add more tests
0b63fd6965 t0028: fix test for UTF-16-LE-BOM
fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration
2e09c01232 name-rev: avoid cutoff timestamp underflow
8464f94aeb promisor-remote.h: drop extern from function declaration
75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp
24c681794f doc: MyFirstContribution: fix cmd placement instructions
c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode
60c60b627e Merge branch 'py/git-git-extra-stuff'
faf420e05a treewide: correct several "up-to-date" to "up to date"
b71c6c3b64 Fix build with core.autocrlf=true
16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff
26e3d1cbea .mailmap: update email address of Andrey Mazo
27ea41c0b4 t/helper: ignore only executable files
7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()
83e3ad3b12 merge-recursive: symlink's descendants not in way
34933d0eff stash: make sure to write refreshed cache
e080b34540 merge: use refresh_and_write_cache
22184497a3 factor out refresh_and_write_cache function
7371612255 commit-graph: add --[no-]progress to write and verify
47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW
253bfe49bd SubmittingPatches: git-gui has a new maintainer
d17ae00c97 hg-to-git: make it compatible with both python3 and python2
4c86140027 Third batch
f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http'
627b826834 Merge branch 'md/list-objects-filter-combo'
b9ac6c59b8 Merge branch 'cc/multi-promisor'
de67293e74 Merge branch 'sg/line-log-tree-diff-optim'
95486229e3 Merge branch 'sg/complete-configuration-variables'
f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook'
a2e524ecf3 Merge branch 'cb/curl-use-xmalloc'
128666753b Merge branch 'jk/drop-release-pack-memory'
917a319ea5 Merge branch 'js/rebase-r-strategy'
7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui
4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout()
0d4304c124 doc: fix reference to --ignore-submodules
af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py
8a3a6817e2 Merge gitk to pick up emergency build fix
2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po
9027af58e2 Makefile: run coccicheck on more source files
43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES)
5dedf7de53 Makefile: define THIRD_PARTY_SOURCES
902b90cf42 clean: fix theoretical path corruption
ca8b5390db clean: rewrap overly long line
09487f2cba clean: avoid removing untracked files in a nested git repository
e86bbcf987 clean: disambiguate the definition of -d
3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run
29b577b960 dir: add commentary explaining match_pathspec_item's return value
89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it
a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case
404ebceda0 dir: also check directories for matching pathspecs
a5e916c745 dir: fix off-by-one error in match_pathspec_item
bbbb6b0b89 dir: fix typo in comment
7541cc5302 t7300: add testcases showing failure to clean specified pathspecs
0eb7c37a8a diff, log doc: small grammer, format, and language fixes
6fae6bd518 diff, log doc: say "patch text" instead of "patches"
2bb74b53a4 Test the progress display
bbf47568ad Revert "progress: use term_clear_line()"
cf6a2d2557 Makefile: strip leading ./ in $(LIB_H)
b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup
689a146c91 commit-graph: use commit_list_count()
59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N"
a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N"
a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base"
cf34337f98 list-objects-filter: give a more specific error sparse parsing error
4c96a77594 list-objects-filter: delay parsing of sparse oid
72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter
83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer
7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>`
226daba280 Doc/Makefile: give mansource/-version/-manual attributes
40e747e89d git-submodule.txt: fix AsciiDoc formatting error
f6461b82b9 Documentation: fix build with Asciidoctor 2
3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
f7a8834ba4 Merge branch 'bp/amend-toggle-bind'
ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit"
9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes
d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog
beffae768a gitk: Add Chinese (zh_CN) translation
56d9cbe68b packfile: expose get_delta_base()
bab28d9f97 builtin/pack-objects: report reused packfile objects
6c8ec8c30a Merge branch 'bw/commit-scrollbuffer'
acfa495519 Merge branch 'bw/amend-checkbutton'
da08d559b7 git-gui: add horizontal scrollbar to commit buffer
ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton
aeeb978ba6 completion: teach archive to use __gitcomp_builtin
2b9bd488ae completion: teach rebase to use __gitcomp_builtin
d49dffde9a completion: add missing completions for log, diff, show
6abada1880 upload-pack: disable commit graph more gently for shallow traversal
fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time
72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set
4fd39c76e6 doc: minor formatting fix
29f4332e66 Quit passing 'now' to date code
c77abf0460 Merge branch 'py/revert-hunks-lines'
5a2bb62180 Merge branch 'bp/widget-focus-hotkeys'
e07446ed5f git-gui: add hotkeys to set widget focus
f981ec18cf cache-tree: do not lazy-fetch tentative tree
f1d4a28250 Second batch
c8ada15456 Merge branch 'bc/reread-attributes-during-rebase'
8f3ba423e7 Merge branch 'tg/t0021-racefix'
a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email'
d49c2c3466 Merge branch 'sb/userdiff-dts'
2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe'
4c49dd042d Merge branch 'nd/diff-parseopt'
d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix'
8ce8a63b46 Merge branch 'ds/midx-expire-repack'
9437394661 Merge branch 'cb/fetch-set-upstream'
af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix'
fa9e7934c7 Merge branch 'bm/repository-layout-typofix'
d1a251a1fa Merge branch 'en/checkout-mismerge-fix'
e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental'
f4f8dfe127 Merge branch 'ds/feature-macros'
4a12f89865 Merge branch 'jk/eoo'
b4a1eec332 Merge branch 'jk/repo-init-cleanup'
70336bd50a Merge branch 'py/git-gui-do-quit'
ad7c543e3b grep: skip UTF8 checks explicitly
0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration()
b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration
4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor
b7e1ba5649 git-merge-index.txt: wrap shell listing in "----"
38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----"
5371813768 git-ls-remote.txt: wrap shell listing in "----"
1925fe0c8a Documentation: wrap config listings in "----"
922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor
2017956a19 Documentation: wrap blocks with "--"
dd2e50a84e commit-graph: turn off save_commit_buffer
67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits
806278dead commit-graph.c: handle corrupt/missing trees
16749b8dd2 commit-graph.c: handle commit parsing errors
23424ea759 t/t5318: introduce failing 'git commit-graph write' tests
bf1e28e0ad builtin/rebase.c: Remove pointless message
d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing
bd482d6e33 t: use common $SQ variable
3a37876b5d pack-objects: drop packlist index_pos optimization
7e6b96c73b test-read-cache: drop namelen variable
e4b369069e diff-delta: set size out-parameter to 0 for NULL delta
7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint
f1cbd033e2 pack-objects: use object_id in packlist_alloc()
0dfed92dfd git-am: handle missing "author" when parsing commit
3960290675 ci: restore running httpd tests
6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests
c77722b3ea use get_tagged_oid()
dad3f0607b tag: factor out get_tagged_oid()
468ce99b77 unpack-trees: rename 'is_excluded_from_list()'
65edd96aec treewide: rename 'exclude' methods to 'pattern'
4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_'
caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list'
ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern'
483e861111 t9902: use a non-deprecated command for testing
9df53c5de6 Recommend git-filter-repo instead of git-filter-branch
7b6ad97939 t6006: simplify, fix, and optimize empty message test
50094ca45f config/format.txt: specify default value of format.coverLetter
c1a6f21cd4 Doc: add more detail for git-format-patch
854b5cb46a t4014: stop losing return codes of git commands
dd2b6b6860 t4014: remove confusing pipe in check_threading()
6bd26f58ea t4014: use test_line_count() where possible
c6ec6dadba t4014: let sed open its own files
f2e2fa8f60 t4014: drop redirections to /dev/null
460609cbd5 t4014: use indentable here-docs
92014b69bb t4014: remove spaces after redirect operators
0ab74e979c t4014: use sq for test case names
cb46c40662 t4014: move closing sq onto its own line
b562a54c01 t4014: s/expected/expect/
e770fbfeff t3005: remove unused variable
da280f5f1a t: use LF variable defined in the test harness
7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch
552fc5016f mingw: apply array.cocci rule
476998d05b t3427: accelerate this test by using fast-export and fast-import
aac6ff7b5b .gitignore: stop ignoring `.manifest` files
2c65d90f75 am: reload .gitattributes after patching it
1577dc0f7c tree: simplify parse_tree_indirect()
50f26bd035 fetch: add fetch.writeCommitGraph config setting
8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set
27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options
0a8bc7068f clarify documentation for remote helpers
80e3658647 help: make help_unknown_ref() NORETURN
313677627a checkout: add simple check for 'git checkout -b'
3441de5b9c gitk: Make web links clickable
a4fa2f0a4c git-gui: allow undoing last revert
414d924beb rebase: teach rebase --keep-base
6330209d7d rebase tests: test linear branch topology
4effc5bc96 rebase: fast-forward --fork-point in more cases
c0efb4c1dd rebase: fast-forward --onto in more cases
2b318aa6c3 rebase: refactor can_fast_forward into goto tower
c9efc21683 t3432: test for --no-ff's interaction with fast-forward
1ebec8dfc1 fast-import: duplicate into history rather than passing ownership
9756082b3c fast-import: duplicate parsed encoding string
86ae43da6a status: mention --skip for revert and cherry-pick
b1b16bba96 completion: add --skip for cherry-pick and revert
deaa65a754 completion: merge options for cherry-pick and revert
4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
793ac7e309 t3432: test rebase fast-forward behavior
359ecebc34 t3431: add rebase --fork-point tests
502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage
ff61681b46 grep: refactor and simplify PCRE1 support
8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1
1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning()
fd99c2dd9b grep: use return value of strbuf_detach()
82f51af345 log-tree: always use return value of strbuf_detach()
7e92756751 http: don't leak urlmatch_config.vars
9784f97321 commit: free the right buffer in release_commit_memory
ce17feb1b3 path: add a function to check for path suffix
60d198d022 banned.h: fix vsprintf()'s ban message
60fe477a0b notes: avoid potential use-after-free during insertion
779ad6641b notes: avoid leaking duplicate entries
4e1a641ee3 mingw: fix launching of externals from Unicode paths
5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly
e2683d51d9 Fix .git/ discovery at the root of UNC shares
d17f2124a7 setup_git_directory(): handle UNC paths correctly
ebb8d2c90f mingw: support UNC in git clone file://server/share/repo
0c37c41d13 t4009: make hash size independent
c1f3dfcc23 t4002: make hash independent
8cc5ff83c3 t4000: make hash size independent
c784815073 t3903: abstract away SHA-1-specific constants
2ccdfb1c78 git-gui: return early when patch fails to apply
62bd99934b git-gui: allow reverting selected hunk
5f0a516de9 git-gui: allow reverting selected lines
fddf2ebe38 transport: teach all vtables to allow fetch first
ac3fda82bf transport-helper: skip ls-refs if unnecessary
745f681289 First batch after Git 2.23
d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg'
22e86e85cb Merge branch 'en/fast-import-merge-doc'
9c7573581c Merge branch 'jk/perf-no-dups'
4336fdb2ef Merge branch 'rs/nedalloc-fixlets'
8ae7a46c4d Merge branch 'sg/show-failed-test-names'
6ba06b582b Merge branch 'sg/commit-graph-validate'
072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix'
207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix'
77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests'
1b01cdbf2e Merge branch 'jk/tree-walk-overflow'
8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix'
307179732d Merge branch 'mt/grep-submodules-working-tree'
58166c2e9d t0021: make sure clean filter runs
8b3f33ef11 ref-filter: initialize empty name or email fields
3c81760bc6 userdiff: add a builtin pattern for dts files
fe49814409 t4014: drop unnecessary blank lines from test cases
a2bb801f6a line-log: avoid unnecessary full tree diffs
eef5204190 line-log: extract pathspec parsing from line ranges into a helper function
a63694f523 diff: skip GITLINK when lazy fetching missing objs
7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe
19800bdc3f parseopt: move definition of enum parse_opt_result up
415b770b88 packfile.h: drop extern from function declaration
acb49d1cc8 t3800: make hash-size independent
ca6ba94200 t3600: make hash size independent
19ce5496c2 t3506: make hash independent
9a6738c061 t3430: avoid hard-coded object IDs
4dd1b5f90f t3404: abstract away SHA-1-specific constants
b99bfc7a6c t3306: abstract away SHA-1-specific constants
e3e9d02e35 t3305: make hash size independent
b408cf8cf6 t3301: abstract away SHA-1-specific constants
b561edd213 t3206: abstract away hash size constants
a5f61c7d13 t3201: abstract away SHA-1-specific constants
1c24a54ea4 repository-layout.txt: correct pluralization of 'object'
b0a3186140 sequencer: simplify root commit creation
a47ba3c777 rebase -i: check for updated todo after squash and reword
450efe2d53 rebase -i: always update HEAD before rewording
c581e4a749 grep: under --debug, show whether PCRE JIT is enabled
aaa95dfa05 midx: switch to using the_hash_algo
be8e172e9f builtin/show-index: replace sha1_to_hex
3f34d70d40 rerere: replace sha1_to_hex
fc06be3b7f builtin/receive-pack: replace sha1_to_hex
69fa337060 builtin/index-pack: replace sha1_to_hex
3a4d7aa5ae packfile: replace sha1_to_hex
e0cb7cdb89 wt-status: convert struct wt_status to object_id
8d4d86b0f0 cache: remove null_sha1
f6ca67d673 builtin/worktree: switch null_sha1 to null_oid
dd336a5511 builtin/repack: write object IDs of the proper length
894c0f66bb pack-write: use hash_to_hex when writing checksums
4439c7a360 sequencer: convert to use the_hash_algo
95518faac1 bisect: switch to using the_hash_algo
e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo
fe9fec45f6 config: use the_hash_algo in abbrev comparison
976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
703d2d4193 bundle: switch to use the_hash_algo
9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo
7962e046ff show-index: switch hard-coded constants to the_hash_algo
fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ
7e0d029f18 builtin/rev-parse: switch to use the_hash_algo
319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo
fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo
f6af19a9ad fetch-pack: use parse_oid_hex
36261e42ec patch-id: convert to use the_hash_algo
28ba1830d0 builtin/replace: make hash size independent
24bc1a1292 pull, fetch: add --set-upstream option
71d41ff651 archive-tar: turn length miscalculation warning into BUG
17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header()
82a46af13e archive-tar: fix pax extended header length calculation
4060c1990a archive-tar: report wrong pax extended header length
4615a8cb5b merge-recursive: alphabetize include list
45ef16f77a merge-recursive: add sanity checks for relevant merge_options
f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
5bf7e5779e merge-recursive: split internal fields into a separate struct
e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output
a779fb829b merge-recursive: comment and reorder the merge_options fields
8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options
7c0a6c8e47 merge-recursive: move some definitions around to clean up the header
c749ab1da8 merge-recursive: rename merge_options argument to opt in header
bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity
ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list
4d7101e25c merge-recursive: fix some overly long lines
724dd767b2 cache-tree: share code between functions writing an index as a tree
345480d1ed merge-recursive: don't force external callers to do our logging
b4db8a2b76 merge-recursive: remove useless parameter in merge_trees()
98a1d3d888 merge-recursive: exit early if index != head
9822175d2b Ensure index matches head before invoking merge machinery, round N
10f751c06b merge-recursive: remove another implicit dependency on the_repository
f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks
8e01251694 merge-recursive: introduce an enum for detect_directory_renames values
743474cbfa merge-recursive: provide a better label for diff3 common ancestor
51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u)
5bace62582 l10n: Update Catalan translation
139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()
65c01c6442 checkout: provide better conflict hunk description with detached HEAD
d8523ca1b9 merge-recursive: be consistent with assert
acb7da05ac checkout: remove duplicate code
93b980e58f http: use xmalloc with cURL
64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental
aaf633c2ad repo-settings: create feature.experimental setting
c6cc4c5afd repo-settings: create feature.manyFiles setting
ad0fb65999 repo-settings: parse core.untrackedCache
31b1de6a09 commit-graph: turn on commit-graph by default
b068d9a250 t6501: use 'git gc' in quiet mode
7211b9e753 repo-settings: consolidate some config settings
507e5470a0 worktree remove: clarify error message on dirty worktree
5af9d5f6c8 completion: complete config variables and values for 'git clone --config='
88cd790d6a completion: complete config variables names and values for 'git clone -c'
dd33472831 completion: complete values of configuration variables after 'git -c var='
e1e00089da completion: complete configuration sections and variable names for 'git -c'
42d0efec59 completion: split _git_config()
d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp()
2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names
d9438873c4 completion: deduplicate configuration sections
7a09a8f093 completion: add tests for 'git config' completion
840d7e5b3c completion: complete more values of more 'color.*' configuration variables
08a12175d8 completion: fix a typo in a comment
9827d4c185 packfile: drop release_pack_memory()
d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed
362f8b280c t/perf: rename duplicate-numbered test script
742ed63345 trace2: cleanup whitespace in perf format
e34430556c trace2: cleanup whitespace in normal format
c2b890aca5 quote: add sq_append_quote_argv_pretty()
ad43e37839 trace2: trim trailing whitespace in normal format error message
04f10d332f trace2: remove dead code in maybe_add_string_va()
da4589ce7e trace2: trim whitespace in region messages in perf target format
0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit
5440eb0ea2 git-gui: call do_quit before destroying the main window
bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook
6098817fd7 git-merge: honor pre-merge-commit hook
a1f3dd7eb3 merge: do no-verify like commit
f78f6c7e0c t7503: verify proper hook execution
70597e8386 nedmalloc: avoid compiler warning about unused value
c9b9c09dae nedmalloc: do assignments only after the declaration section
22932d9169 config: stop checking whether the_repository is NULL
5732f2b1ef common-main: delay trace2 initialization
58ebccb478 t1309: use short branch name in includeIf.onbranch test
67feca3b1c gitcli: document --end-of-options
51b4594b40 parse-options: allow --end-of-options as a synonym for "--"
19e8789b23 revision: allow --end-of-options to end option parsing
ffe1afe67c tests: show the test name and number at the start of verbose output
96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests
7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits'
39d8831856 commit-graph: turn a group of write-related macro flags into an enum
9916073be5 t5318-commit-graph: use 'test_expect_code'
620c09e1b6 restore: add test for deleted ita files
ecd72042de checkout.c: unstage empty deleted ita files
a613d4f817 pack-refs: always refresh after taking the lock file
decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd'
371df1bea9 trace2: cleanup column alignment in perf target format
5aa02f9868 tree-walk: harden make_traverse_path() length computations
c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path()
b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len()
37806080d7 tree-walk: use size_t consistently
7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh'
12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh'
9055384710 tree-walk: drop oid from traverse_info
947208b725 setup_traverse_info(): stop copying oid
e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
a63f990d92 t3418: test `rebase -r` with merge strategies
5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges`
e145d99347 rebase -r: support merge strategies other than `recursive`
4e6023b13a t3427: fix another incorrect assumption
f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced
a9c71073da t3427: fix erroneous assumption
b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three
d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case
c248d32cdb t3427: simplify the `setup` test case significantly
8c1e24048a t3427: add a clarifying comment
5efed0ecf9 rebase: fold git-rebase--common into the -p backend
68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone
2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive`
6180b20239 t3400: stop referring to the scripted rebase
d5b581f228 Drop unused git-rebase--am.sh
814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation
6a289d45c0 grep: fix worktree case in submodules
870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching
8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data
09872f6418 grep: create a "is_fixed" member in "grep_pat"
8a35b540a9 grep: consistently use "p->fixed" in compile_regexp()
685668faaa grep: stop using a custom JIT stack with PCRE v1
34489239d0 grep: stop "using" a custom JIT stack with PCRE v2
04bef50c01 grep: remove overly paranoid BUG(...) code
b65abcafc7 grep: use PCRE v2 for optimized fixed-string search
48de2a768c grep: remove the kwset optimization
45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern>
25754125ce grep: make the behavior for NUL-byte in patterns sane
d316af059d grep tests: move binary pattern tests into their own file
471dac5d2c grep tests: move "grep binary" alongside the rest
f463beb805 grep: inline the return value of a function call used only once
b14cf112e2 t4210: skip more command-line encoding tests on MinGW
44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
4e2443b181 log tests: test regex backends in "--encode=<enc>" tests
90d21f9ebf list-objects-filter-options: make parser void
5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW
489fc9ee71 list-objects-filter-options: allow mult. --filter
c2694952e3 strbuf: give URL-encoding API a char predicate fn
cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list
f56f764279 list-objects-filter-options: move error check up
e987df5fe6 list-objects-filter: implement composite filters
842b00516a list-objects-filter-options: always supply *errbuf
7a7c7f4a6d list-objects-filter: put omits set in filter struct
9430147ca0 list-objects-filter: encapsulate filter components
4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c
60b7a92d84 Move repository_format_partial_clone to promisor-remote.c
db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
75de085211 remote: add promisor and partial clone config to the doc
7e154badc0 partial-clone: add multiple remotes in the doc
9a4c507886 t0410: test fetching from many promisor remotes
5e46139376 builtin/fetch: remove unique promisor remote limitation
fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter
b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote()
faf2abf496 promisor-remote: use repository_format_partial_clone
9cfebc1f3b promisor-remote: add promisor_remote_reinit()
9e27beaa23 promisor-remote: implement promisor_remote_get_direct()
48de315817 Add initial support for many promisor remotes
2e860675b6 fetch-object: make functions return an error code
c59c7c879e t0410: remove pipes after git commands
git-subtree-dir: third_party/git
git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
2020-05-22 18:46:45 +02:00
|
|
|
msgid "make_script: error preparing revisions"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:5347 sequencer.c:5364
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "nothing to do"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:5383
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not skip unnecessary pick commands"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sequencer.c:5480
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "the script was already rearranged."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:133
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "'%s' is outside repository at '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:185
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"%s: no such path in the working tree.\n"
|
|
|
|
|
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:198
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
|
|
|
|
|
"Use '--' to separate paths from revisions, like this:\n"
|
|
|
|
|
"'git <command> [<revision>...] -- [<file>...]'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:264
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "option '%s' must come before non-option arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:283
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"ambiguous argument '%s': both revision and filename\n"
|
|
|
|
|
"Use '--' to separate paths from revisions, like this:\n"
|
|
|
|
|
"'git <command> [<revision>...] -- [<file>...]'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:419
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to set up work tree using invalid config"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:423
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "this operation must be run in a work tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:661
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Expected git repo version <= %d, found %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:669
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unknown repository extensions found:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:681
|
|
|
|
|
msgid "repo version is 0, but v1-only extensions found:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: setup.c:700
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "error opening '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:702
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "too large to be a .git file: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:704
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "error reading %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:706
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid gitfile format: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:708
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no path in gitfile: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:710
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "not a git repository: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:812
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'$%s' too big"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:826
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "not a git repository: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:855 setup.c:857 setup.c:888
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot chdir to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot come back to cwd"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:987
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to stat '%*s%s%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:1225
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Unable to read current working directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:1234 setup.c:1240
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot change to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:1245
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "not a git repository (or any of the parent directories): %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:1251
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"not a git repository (or any parent up to mount point %s)\n"
|
|
|
|
|
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:1362
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"problem with core.sharedRepository filemode value (0%.3o).\n"
|
|
|
|
|
"The owner of files must always have read and write permissions."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:1409
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "open /dev/null or dup failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:1424
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "fork failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: setup.c:1429
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "setsid failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:470
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "object directory %s does not exist; check .git/objects/info/alternates"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:521
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to normalize alternate object path: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:593
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: ignoring alternate object stores, nesting too deep"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:600
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to normalize object directory: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:643
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to fdopen alternates lockfile"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:661
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to read alternates file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:668
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to move new alternates file into place"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:703
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' does not exist"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:724
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "reference repository '%s' as a linked checkout is not supported yet."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:730
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "reference repository '%s' is not a local repository."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:736
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "reference repository '%s' is shallow"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:744
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "reference repository '%s' is grafted"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:804
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid line while parsing alternate refs: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:954
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:975
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "mmap failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1139
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "object file %s is empty"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1274 sha1-file.c:2467
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "corrupt loose object '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1276 sha1-file.c:2471
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "garbage at end of loose object '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1318
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "invalid object type"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1402
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to unpack %s header with --allow-unknown-type"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1405
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to unpack %s header"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1411
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to parse %s header with --allow-unknown-type"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1414
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to parse %s header"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1641
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to read object %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1645
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "replacement %s not found for %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1649
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "loose object %s (stored in %s) is corrupt"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1653
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "packed object %s (stored in %s) is corrupt"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1758
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to write file %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1765
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to set permission to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1772
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "file write error"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1792
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "error when closing loose object file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1857
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "insufficient permission for adding an object to repository database %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1859
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to create temporary file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1883
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to write loose object file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1889
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to deflate new object %s (%d)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1893
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "deflateEnd on object %s failed (%d)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1897
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "confused by unstable object source data for %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1907 builtin/pack-objects.c:1086
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed utime() on %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:1984
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot read object for %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:2035
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "corrupt commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:2043
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "corrupt tag"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:2143
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "read error while indexing %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:2146
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "short read while indexing %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:2219 sha1-file.c:2229
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: failed to insert into database"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:2235
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: unsupported file type"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:2259
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s is not a valid object"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:2261
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s is not a valid '%s' object"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:2288 builtin/index-pack.c:192
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to open %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:2478 sha1-file.c:2531
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "hash mismatch for %s (expected %s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:2502
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to mmap %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:2507
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to unpack header of %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:2513
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to parse header of %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-file.c:2524
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to unpack contents of %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-name.c:486
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "short SHA1 %s is ambiguous"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-name.c:497
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "The candidates are:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-name.c:796
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Git normally never creates a ref that ends with 40 hex characters\n"
|
|
|
|
|
"because it will be ignored when you just specify 40-hex. These refs\n"
|
|
|
|
|
"may be created by mistake. For example,\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git switch -c $br $(git rev-parse ...)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
|
|
|
|
|
"examine these refs and maybe delete them. Turn this message off by\n"
|
|
|
|
|
"running \"git config advice.objectNameWarning false\""
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: sha1-name.c:916
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "log for '%.*s' only goes back to %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sha1-name.c:924
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "log for '%.*s' only has %d entries"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sha1-name.c:1702
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' exists on disk, but not in '%.*s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sha1-name.c:1708
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"path '%s' exists, but not '%s'\n"
|
|
|
|
|
"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sha1-name.c:1717
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' does not exist in '%.*s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sha1-name.c:1745
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"path '%s' is in the index, but not at stage %d\n"
|
|
|
|
|
"hint: Did you mean ':%d:%s'?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sha1-name.c:1761
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"path '%s' is in the index, but not '%s'\n"
|
|
|
|
|
"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sha1-name.c:1769
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' exists on disk, but not in the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sha1-name.c:1771
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' does not exist (neither on disk nor in the index)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sha1-name.c:1784
|
|
|
|
|
msgid "relative path syntax can't be used outside working tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: sha1-name.c:1922
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid object name '%.*s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-01-12 00:36:56 +01:00
|
|
|
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
|
2020-11-21 19:20:35 +01:00
|
|
|
#: strbuf.c:848
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%u.%2.2u GiB"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
|
2020-11-21 19:20:35 +01:00
|
|
|
#: strbuf.c:850
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%u.%2.2u GiB/s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
|
2020-11-21 19:20:35 +01:00
|
|
|
#: strbuf.c:858
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%u.%2.2u MiB"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
|
2020-11-21 19:20:35 +01:00
|
|
|
#: strbuf.c:860
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%u.%2.2u MiB/s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
|
2020-11-21 19:20:35 +01:00
|
|
|
#: strbuf.c:867
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%u.%2.2u KiB"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
|
2020-11-21 19:20:35 +01:00
|
|
|
#: strbuf.c:869
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%u.%2.2u KiB/s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: IEC 80000-13:2008 byte
|
2020-11-21 19:20:35 +01:00
|
|
|
#: strbuf.c:875
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%u byte"
|
|
|
|
|
msgid_plural "%u bytes"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: IEC 80000-13:2008 byte/second
|
2020-11-21 19:20:35 +01:00
|
|
|
#: strbuf.c:877
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%u byte/s"
|
|
|
|
|
msgid_plural "%u bytes/s"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733
|
|
|
|
|
#: builtin/rebase.c:858
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not open '%s' for writing"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: strbuf.c:1175
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "could not edit '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule-config.c:237
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "ignoring suspicious submodule name: %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule-config.c:304
|
|
|
|
|
msgid "negative values not allowed for submodule.fetchjobs"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule-config.c:402
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule-config.c:499
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "invalid value for %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule-config.c:766
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Could not update .gitmodules entry %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:114 submodule.c:143
|
|
|
|
|
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
|
Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96
af6b65d45e Git 2.26.2
7397ca3373 Git 2.25.4
b86a4be245 Git 2.24.3
f2771efd07 Git 2.23.3
c9808fa014 Git 2.22.4
9206d27eb5 Git 2.21.3
041bc65923 Git 2.20.4
76b54ee9b9 Git 2.19.5
ba6f0905fd Git 2.18.4
df5be6dc3f Git 2.17.5
1a3609e402 fsck: reject URL with empty host in .gitmodules
e7fab62b73 credential: treat URL with empty scheme as invalid
c44088ecc4 credential: treat URL without scheme as invalid
fe29a9b7b0 credential: die() when parsing invalid urls
a2b26ffb1a fsck: convert gitmodules url to URL passed to curl
8ba8ed568e credential: refuse to operate when missing host or protocol
24036686c4 credential: parse URL without host as empty host, not unset
73aafe9bc2 t0300: use more realistic inputs
a88dbd2f8c t0300: make "quit" helper more realistic
de49261b05 Git 2.26.1
274b9cc253 Git 2.26
55a7568606 Merge branch 'en/rebase-backend'
c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git
1557364fb4 l10n: tr.po: change file mode to 644
2da1b05674 t3419: prevent failure when run with EXPENSIVE
1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0
5804c6ec40 l10n: de.po: add missing space
98cedd0233 Merge https://github.com/prati0100/git-gui
4914ba4bcf l10n: tr: Fix a couple of ambiguities
a5728022e0 Merge branch 'py/remove-tcloo'
7fcb965970 RelNotes/2.26.0: fix various typos
f0c03bcf95 l10n: Update Catalan translation
67b0a24910 Git 2.25.3
be8661a328 Sync with Git 2.25.2
0822e66b5d Git 2.25.2
65588b0b2e unicode: update the width tables to Unicode 13.0
7be274b0ff Merge branch 'js/ci-windows-update' into maint
9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint
221887a492 Merge branch 'jk/doc-credential-helper' into maint
32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint
fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint
618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint
50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint
fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint
41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint
2d7247af6f Merge branch 'am/mingw-poll-fix' into maint
4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint
76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint
569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint
16a4bf1035 Merge branch 'en/check-ignore' into maint
3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint
56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint
1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint
7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint
fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint
a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint
93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint
dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint
758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint
f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint
506223f9c5 Git 2.24.2
17a02783d8 Git 2.23.2
69fab82147 Git 2.22.3
fe22686494 Git 2.21.2
d1259ce117 Git 2.20.3
a5979d7009 Git 2.19.4
21a3e5016b Git 2.18.3
c42c0f1297 Git 2.17.4
d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u)
3891a84ccd git-gui: create a new namespace for chord script evaluation
8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5
440e7442d1 l10n: zh_CN: Revise v2.26.0 translation
2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2
6c85aac65f Git 2.26-rc2
74f172e39e Merge branch 'en/test-cleanup'
e96327c947 Merge branch 'es/outside-repo-errmsg-hints'
ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0
15fa8d9667 l10n: vi: fix translation + grammar
5c20398699 prefix_path: show gitdir if worktree unavailable
1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated)
c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated)
a4a2f64642 Merge branch 'js/askpass-coerce-utf8'
850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows
d769dcc5cd Merge branch 'py/blame-status-error'
70e24186c0 t6022, t6046: fix flaky files-are-updated checks
30e9940356 Hopefully the final batch before -rc2
b4f0038525 Merge branch 'en/rebase-backend'
25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master
07259e74ec fsck: detect gitmodules URLs with embedded newlines
c716fe4bd9 credential: detect unrepresentable values when parsing urls
17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr
9a6bbee800 credential: avoid writing values with newlines
17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2
1afe18a3bb l10n: es: 2.26.0 round#2
5ab9217a3c Merge branch of github.com:alshopov/git-po into master
c6713676d6 Merge branch of github.com:bitigchi/git-po into master
b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t)
2713dec02d l10n: tr: v2.26.0 round 2
c9ef57cc3a l10n: fr : v2.26.0 rnd 2
120b1eb731 git-rebase.txt: highlight backend differences with commit rewording
9a1b7474d6 sequencer: clear state upon dropping a become-empty commit
937d143630 i18n: unmark a message in rebase.c
a56d361f66 Merge branch 'ds/sparse-add'
5fa9169ced Merge branch 'dr/push-remote-ref-update'
cdef998b46 Merge branch 'jc/doc-single-h-is-for-help'
051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed)
52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master
9643441983 l10n: tr: Add glossary for Turkish translations
438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv
fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git
2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u)
dd2c269652 l10n: tr: Add Turkish translations
8f4f099f8b l10n: tr: Add Turkish translation team info
b4374e96c8 Git 2.26-rc1
4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch'
3658d77f8e Merge branch 'hd/show-one-mergetag-fix'
6125104b88 Merge branch 'rt/format-zero-length-fix'
1ac37deba2 Merge branch 'am/mingw-poll-fix'
cf372dc815 Merge branch 'en/test-cleanup'
d1075adfdf Merge branch 'en/merge-path-collision'
a4fd114ffc Merge branch 'kk/complete-diff-color-moved'
a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file'
0e0d717537 Merge branch 'pb/am-show-current-patch'
9b7f726dfc Merge branch 'am/pathspec-f-f-more'
4605a73073 t1091: don't grep for `strerror()` string
4d9c2902a1 l10n: fr v2.26.0 rnd1
ad182bee3f Merge branch of github.com:alshopov/git-po into master
23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1
98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t)
f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed)
76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po
076cbdcd73 Git 2.26-rc0
0d65f3fb1a t5537: adjust test_oid label
e63cefb024 Merge branch 'hi/gpg-use-check-signature'
5da7329e29 Merge branch 'rs/commit-graph-code-simplification'
0108fc1b46 Merge branch 'js/ci-windows-update'
f3ccd9f0d9 Merge branch 'be/describe-multiroot'
a6b4709302 Merge branch 'ag/rebase-remove-redundant-code'
b22db265d6 Merge branch 'es/recursive-single-branch-clone'
e8e71848ea Merge branch 'jk/nth-packed-object-id'
a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'
4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere'
49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix'
2cbb058669 Merge branch 'bc/wildcard-credential'
25063e2530 Merge branch 'mr/bisect-in-c-1'
f4d7dfce4d Merge branch 'ds/sparse-add'
4d864895a2 t2402: test worktree path when called in .git directory
af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch()
7655b4119d remote-curl: show progress for fetches over dumb HTTP
2f268890c2 The eighth batch for 2.26
aa5a7e02ad Merge branch 'ma/test-cleanup'
58595e713c Merge branch 'rs/blame-typefix-for-fingerprint'
ff41848e99 Merge branch 'rs/micro-cleanups'
4cbf1a0e22 Merge branch 'es/worktree-cleanup'
46703057c1 Merge branch 'ak/test-log-graph'
777815f5f9 Merge branch 'jk/run-command-formatfix'
444cff61b4 Merge branch 'ds/partial-clone-fixes'
48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure'
8c22bd9ff9 Merge branch 'en/rebase-backend'
cb2f5a8e97 Merge branch 'en/check-ignore'
0df82d99da Merge branch 'jk/object-filter-with-bitmap'
80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix'
29b09c518c Merge branch 'jk/doc-diff-parallel'
237a28173f show_one_mergetag: print non-parent in hex form.
5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context"
6d1210e133 l10n: Update Catalan translation
0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification"
7329d94be7 config.mak.dev: re-enable -Wformat-zero-length
7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings
94f4d01932 mingw: workaround for hangs when sending STDIN
1ff466c018 Documentation: clarify that `-h` alone stands for `help`
65bf820d0e t6020: new test with interleaved lexicographic ordering of directories
9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it
d5bb92eced t3035: prefer test_must_fail to bash negation for git commands
b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions
42d180dd01 t602[1236], t6034: modernize test formatting
802050400a merge-recursive: apply collision handling unification to recursive case
7f487ce062 Azure Pipeline: switch to the latest agent pools
5ed9fc3fc8 ci: prevent `perforce` from being quarantined
eafff6e41e t/lib-httpd: avoid using macOS' sed
d68ce906c7 commit-graph: use progress title directly
30b1c7ad9d describe: don't abort too early when searching tags
240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to'
2d2118b814 The seventh batch for 2.26
325eb66830 Merge branch 'es/doc-mentoring'
87f17d790d Merge branch 'es/bright-colors'
d0038f4b31 Merge branch 'bw/remote-rename-update-config'
132f600b06 clone: pass --single-branch during --recurse-submodules
47319576f1 submodule--helper: use C99 named initializer
ffe005576a lib-log-graph: consolidate colored graph cmp logic
989eea958b lib-log-graph: consolidate test_cmp_graph logic
bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching
bb4995fc3f worktree: add utility to find worktree by pathname
a80c4c2214 worktree: improve find_worktree() documentation
2fecc48cad packfile: drop nth_packed_object_sha1()
6ac9760a30 packed_object_info(): use object_id internally for delta base
b99b6bcc57 packed_object_info(): use object_id for returning delta base
63f4a7fc01 pack-check: push oid lookup into loop
e31c71083a pack-check: convert "internal error" die to a BUG()
500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps
f66d4e0250 pack-objects: use object_id struct in pack-reuse code
a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id
3f83fd5e44 pack-objects: read delta base oid into object_id struct
0763671b8e nth_packed_object_oid(): use customary integer return
02bbbe9df9 worktree: drop unused code from get_main_worktree()
27f182b3fc blame: provide type of fingerprints pointer
b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere
df126ca142 t3400: make test clean up after itself
3c29e21eb0 t: drop debug `cat` calls
cac439b56d t9810: drop debug `cat` call
91de82adc9 t4117: check for files using `test_path_is_file`
4ef346482d receive.denyCurrentBranch: respect all worktrees
f8692114db t5509: use a bare repository for test push target
45f274fbb1 get_main_worktree(): allow it to be called in the Git directory
fd0bc17557 completion: add diff --color-moved[-ws]
2ce6d075fa use strpbrk(3) to search for characters from a given set
2b3c430bce quote: use isalnum() to check for alphanumeric characters
a51d9e8f07 t1050: replace test -f with test_path_is_file
3e96c66805 partial-clone: avoid fetching when looking for objects
d0badf8797 partial-clone: demonstrate bugs in partial fetch
539052f42f run-command.h: fix mis-indented struct member
6c11c6a124 sparse-checkout: allow one-character directories in cone mode
aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch
f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch
e8ef1e8d6e am: convert "resume" variable to a struct
bc8620b440 parse-options: convert "command mode" to a flag
62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE()
46fd7b3900 credential: allow wildcard patterns when matching config
82eb249853 credential: use the last matching username in the config
588c70e10f t0300: add tests for some additional cases
732f934408 t1300: add test for urlmatch with multiple wildcards
3fa0e04667 mailmap: add an additional email address for brian m. carlson
8a98758a8d stash push: support the --pathspec-from-file option
8c3713cede stash: eliminate crude option parsing
3f3d8068f5 doc: stash: synchronize <pathspec> description
b22909144c doc: stash: document more options
0093abc286 doc: stash: split options from description (2)
2b7460d167 doc: stash: split options from description (1)
5f393dc3aa rm: support the --pathspec-from-file option
fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags
73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure
6c69f22233 bisect: libify `bisect_next_all`
9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents
45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents
cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents
e8e3ce6718 bisect: libify `bisect_checkout`
ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents
7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()`
680e8a01e5 bisect: add enum to represent bisect returning codes
bfacfce7d9 bisect--helper: introduce new `decide_next()` function
b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0
292731c4c2 bisect--helper: change `retval` to `res`
16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays
7ec8125fba check-ignore: fix documentation and implementation to match
2607d39da3 doc-diff: use single-colon rule in rendering Makefile
0aa6ce3094 doc/config/push: use longer "--" line for preformatted example
20a5fd881a rev-list --count: comment on the use of count_right++
63a58457e0 Merge branch 'py/missing-bracket'
51ebf55b93 The sixth batch for 2.26
f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints'
123538444f Merge branch 'jk/doc-credential-helper'
e154451a2f Merge branch 'js/mingw-open-in-gdb'
fc25a19265 Merge branch 'js/test-unc-fetch'
6365058605 Merge branch 'js/test-avoid-pipe'
966b69f02f Merge branch 'js/test-write-junit-xml-fix'
d880c3de23 Merge branch 'jk/mailinfo-cleanup'
5d55554b1d Merge branch 'mr/show-config-scope'
9f3f38769d Merge branch 'rs/strbuf-insertstr'
cbecc168d4 Merge branch 'rs/parse-options-concat-dup'
5af345a438 Merge branch 'bc/hash-independent-tests-part-8'
0460c109c3 Merge branch 'rs/name-rev-memsave'
6b9919c0a2 git-gui: add missing close bracket
5897e5ac96 Merge branch 'cs/german-translation'
cf85a32eb6 git-gui: update German translation
5096e51c54 git-gui: extend translation glossary template with more terms
8b85bb1b70 git-gui: update pot template and German translation to current source code
e68e29171c Sync with 2.25.1
c522f061d5 Git 2.25.1
10cdb9f38a rebase: rename the two primary rebase backends
2ac0d6273f rebase: change the default backend from "am" to "merge"
8295ed690b rebase: make the backend configurable via config setting
76340c8107 rebase tests: repeat some tests using the merge backend instead of am
980b482d28 rebase tests: mark tests specific to the am-backend with --am
c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases
6d04ce75c4 git-prompt: change the prompt for interactive-based rebases
52eb738d6b rebase: add an --am option
8af14f0859 rebase: move incompatibility checks between backend options a bit earlier
be50c938df git-rebase.txt: add more details about behavioral differences of backends
befb89ce7c rebase: allow more types of rebases to fast-forward
9a70f3d4ae t3432: make these tests work with either am or merge backends
93122c985a rebase: fix handling of restrict_revision
55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer
8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling
7db00f0b3b t3406: simplify an already simple test
e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty
d48e5e21da rebase (interactive-backend): make --keep-empty the default
e0020b2f82 prefix_path: show gitdir when arg is outside repo
cc4f2eb828 doc: move credential helper info into gitcredentials(7)
bfdd66e72f Sync with maint
7ae7e234c7 The fifth batch for 2.26
53c3be2c29 Merge branch 'tb/commit-graph-object-dir'
7b029ebaef Merge branch 'jk/index-pack-dupfix'
aa21cc97bd Merge branch 'jk/alloc-cleanups'
883326077a Merge branch 'jh/notes-fanout-fix'
f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule'
78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs'
df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'
433b8aac2e Merge branch 'ds/sparse-checkout-harden'
4a77434bc8 Merge branch 'ld/p4-cleanup-processes'
8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone'
09e48400a3 Merge branch 'jk/get-oid-error-message-i18n'
4dbeecba27 Merge branch 'ag/edit-todo-drop-check'
f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2'
d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout'
251187084d Merge branch 'js/rebase-i-with-colliding-hash'
c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix'
56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store'
0da63da794 Merge branch 'jn/promote-proto2-to-default'
a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup'
daef1b300b Merge branch 'hw/advice-add-nothing'
6141e0cc00 Merge branch 'js/convert-typofix' into maint
4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint
5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint
b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint
7137d6089b Merge branch 'ms/doc-bundle-format' into maint
52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint
0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint
1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint
cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint
153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint
8857657cc9 Merge branch 'jt/t5616-robustify' into maint
1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint
f468972671 Merge branch 'bc/misconception-doc' into maint
6e69042e26 Merge branch 'bc/author-committer-doc' into maint
650ed395be Merge branch 'ds/refmap-doc' into maint
80b806f1a8 Merge branch 'bc/actualmente' into maint
eceff4ba12 Merge branch 'rt/submodule-i18n' into maint
8a17eb7972 Merge branch 'jk/test-fixes' into maint
54bbadaeca Merge branch 'jk/asan-build-fix' into maint
8dbeba198e Merge branch 'ds/sparse-cone' into maint
e361f36f61 Merge branch 'nd/switch-and-restore' into maint
4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint
ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint
5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint
c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint
d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint
9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint
3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint
3ab3185f99 pack-objects: support filters with bitmaps
84243da129 pack-bitmap: implement BLOB_LIMIT filtering
4f3bd5606a pack-bitmap: implement BLOB_NONE filtering
cc4aa28506 bitmap: add bitmap_unset() function
2aaeb9ac41 rev-list: use bitmap filters for traversal
6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure
4eb707ebd6 rev-list: allow commit-only bitmap traversals
ea047a8eb4 t5310: factor out bitmap traversal comparison
608d9c9365 rev-list: allow bitmaps when counting objects
55cb10f9b5 rev-list: make --count work with --objects
792f811998 rev-list: factor out bitmap-optimized routines
d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs
08809c09aa mingw: add a helper function to attach GDB to the current process
bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths
de26f02db1 t9001, t9116: avoid pipes
a2dc43414c MyFirstContribution: rephrase contact info
e03f928e2a rev-list: fallback to non-bitmap traversal when filtering
acac50dd8c pack-bitmap: fix leak of haves/wants object lists
551cf8b655 pack-bitmap: factor out type iterator initialization
d8437c57fa The fourth batch for 2.26
a3dcf84df0 Merge branch 'js/convert-typofix'
0de2d1409b Merge branch 'js/ci-squelch-doc-warning'
0410c2ba31 Merge branch 'jb/multi-pack-index-docfix'
0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example'
e99c325bb4 Merge branch 'ms/doc-bundle-format'
afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix'
db72f8c940 Merge branch 'jb/parse-options-message-fix'
3d2471ba85 Merge branch 'ma/filter-branch-doc-caret'
b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path'
44cba9c4b3 Merge branch 'jc/skip-prefix'
556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index'
17e4a1b141 Merge branch 'hw/doc-git-dir'
4cf7f48891 Merge branch 'jk/push-default-doc'
b783391018 Merge branch 'jk/clang-sanitizer-fixes'
a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache'
3f7553acf5 Merge branch 'jt/t5616-robustify'
341f8a6476 Merge branch 'jk/escaped-wildcard-dwim'
b486d2ee81 Merge branch 'jn/pretend-object-doc'
076ee3e8a2 tests: fix --write-junit-xml with subshells
2b0f19fa7a convert: fix typo
c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors
1751b09a92 color.c: support bright aixterm colors
4a28eb0ae4 color.c: refactor color_output arguments
f696a2b1c8 mailinfo: factor out some repeated header handling
ffbea1816d mailinfo: be more liberal with header whitespace
f447d0293e mailinfo: simplify parsing of header values
b6537d83ee mailinfo: treat header values as C strings
ef07659926 sparse-checkout: work with Windows paths
2631dc879d sparse-checkout: create 'add' subcommand
4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand
6fb705abcb sparse-checkout: extract add_patterns_from_input()
b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config
f2a2327a4a config: provide access to the current line number
923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values
ceff1a1308 remote: clean-up config callback
1a83068c26 remote: clean-up by returning early to avoid one indentation
88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types
145d59f482 config: add '--show-scope' to print the scope of a config value
9a83d088ee submodule-config: add subomdule config scope
e37efa40e1 config: teach git_config_source to remember its scope
5c105a842e config: preserve scope in do_git_config_sequence
6766e41b8a config: clarify meaning of command line scoping
6dc905d974 config: split repo scope to local and worktree
a5cb4204b6 config: make scope_name non-static and rename it
30183894ea ci: ignore rubygems warning in the "Documentation" job
7a9f8ca805 parse-options: simplify parse_options_dup()
c84078573e parse-options: const parse_options_concat() parameters
f904f9025f parse-options: factor out parse_options_count()
a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat()
517b60564e mailinfo: don't insert header prefix for handle_content_type()
a91cc7fad0 strbuf: add and use strbuf_insertstr()
eb31044ff7 pack-format: correct multi-pack-index description
9299f84921 diff-options.txt: avoid "regex" overload in example
7378ec90e1 doc: describe Git bundle format
f3037657e8 t6024: update for SHA-256
edf04243b2 t6006: make hash size independent
5db24dcffd t6000: abstract away SHA-1-specific constants
d341e0805d t5703: make test work with SHA-256
88ed241a7e t5607: make hash size independent
48c10cc0e6 t5318: update for SHA-256
f7ae8e69b6 t5515: make test hash independent
e70649bb66 t5321: make test hash independent
a30f93b143 t5313: make test hash independent
a79eec220b t5309: make test hash independent
796d1383a3 t5302: make hash size independent
417e45e5e3 t4060: make test work with SHA-256
dfa5f53e78 t4211: add test cases for SHA-256
f743e8f5b3 t4211: move SHA-1-specific test cases into a directory
72f936b120 t4013: make test hash independent
5df0f11f07 t3311: make test work with SHA-256
07877f393c t3310: make test work with SHA-256
6025e898d6 t3309: make test work with SHA-256
7b1a1822fe t3308: make test work with SHA-256
94db7e3e93 t3206: make hash size independent
db12505c2c t/lib-pack: support SHA-256
303b3c1c46 submodule: add newline on invalid submodule error
887a0fd573 add: change advice config variables used by the add API
de93cc14ab The third batch for 2.26
ea46d9097b Merge branch 'mt/sparse-checkout-doc-update'
ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix'
b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend'
7ab963e122 Merge branch 'en/fill-directory-fixes-more'
f52ab33616 Merge branch 'bc/hash-independent-tests-part-7'
25794d6ce9 Merge branch 'km/submodule-add-errmsg'
d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity'
76c57fedfa Merge branch 'js/add-p-leftover-bits'
9a5315edfd Merge branch 'js/patch-mode-in-others-in-c'
381e8e9de1 Merge branch 'dl/test-must-fail-fixes'
395518cf7a parse-options: lose an unnecessary space in an error message
079f970971 name-rev: sort tip names before applying
2d53975488 name-rev: release unused name strings
977dc1912b name-rev: generate name strings only if they are better
1c56fc2084 name-rev: pre-size buffer in get_parent_name()
ddc42ec786 name-rev: factor out get_parent_name()
f13ca7cef5 name-rev: put struct rev_name into commit slab
d689d6d82f name-rev: don't _peek() in create_or_update_name()
15a4205d96 name-rev: don't leak path copy in name_ref()
36d2419c9a name-rev: respect const qualifier
71620ca86c name-rev: remove unused typedef
3e2feb0d64 name-rev: rewrite create_or_update_name()
a21781011f index-pack: downgrade twice-resolved REF_DELTA to die()
dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout
e1c5253951 t3305: check notes fanout more carefully and robustly
e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks
a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st'
ad2dd5bb63 commit-graph.c: remove path normalization, comparison
13c2499249 commit-graph.h: store object directory in 'struct commit_graph'
0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context'
f38c92452d t7400: testcase for submodule status on unregistered inner git repos
5290d45134 tree-walk.c: break circular dependency with unpack-trees
f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch
d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode
e53ffe2704 sparse-checkout: escape all glob characters on write
e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand
bd64de42de sparse-checkout: unquote C-style strings over --stdin
d585f0e799 sparse-checkout: write escaped patterns in cone mode
4f52c2ce6c sparse-checkout: properly match escaped characters
9abc60f801 sparse-checkout: warn on globs in cone patterns
145136a95a C: use skip_prefix() to avoid hardcoded string length
04e5b3f0b4 submodule foreach: replace $path with $sm_path in example
1793280e91 t5318: don't pass non-object directory to '--object-dir'
da8063522f diff: move diff.wsErrorHighlight to "basic" config
b98d188581 sha1-file: allow check_object_signature() to handle any repo
2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file()
7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare()
c8123e72f6 streaming: allow open_istream() to handle any repo
5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile()
a651946730 cache-tree: use given repo's hash_algo at verify_one()
eb999b3295 diff: make diff_populate_filespec() honor its repo argument
5b0ca878e0 Sync with maint
344ee18728 The second batch
53a83299c7 Merge branch 'bc/misconception-doc'
c9ccf9d09b Merge branch 'bc/author-committer-doc'
0d0fa20c40 Merge branch 'ss/t6025-modernize'
7050624abc Merge branch 'lh/bool-to-type-bool'
4b69f29271 Merge branch 'ds/refmap-doc'
aff812ce3c Merge branch 'bc/actualmente'
38fb56e92a Merge branch 'rt/submodule-i18n'
f0940743fa Merge branch 'js/builtin-add-i-cmds'
0afeb3fdf4 Merge branch 'jk/test-fixes'
808dab2b58 Merge branch 'jk/asan-build-fix'
fec1ff97c2 Merge branch 'sg/completion-worktree'
c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function'
11ad30b887 Merge branch 'hi/gpg-mintrustlevel'
96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases'
d52adee779 Merge branch 'ds/graph-horizontal-edges'
6909474491 Merge branch 'am/update-pathspec-f-f-tests'
043426c8fd Merge branch 'ds/sparse-cone'
34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig'
8dd40c0472 traverse_trees(): use stack array for name entries
667b76ec58 walker_fetch(): avoid raw array length computation
9734b74a8f normalize_path_copy(): document "dst" size expectations
43f33e492a git-p4: avoid leak of file handle when cloning
19fa5ac333 git-p4: check for access to remote host earlier
6026aff5bb git-p4: cleanup better on error exit
ca5b5cce62 git-p4: create helper function importRevisions()
4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable
5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce
837b3a6376 git-p4: make closeStreams() idempotent
b0418303b1 sha1-name: mark get_oid() error messages for translation
2df1aa239c fetch: forgo full connectivity check if --filter
50033772d5 connected: verify promisor-ness of partial clone
d82ad54945 git: update documentation for --git-dir
0ad7144999 .mailmap: map Yi-Jyun Pan's email
c56c48dd07 grep: ignore --recurse-submodules if --no-index is given
8b2a1928f0 doc: drop "explicitly given" from push.default description
cf82bff73f obstack: avoid computing offsets from NULL pointer
3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer
d20bc01a51 avoid computing zero offsets from NULL pointer
7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero
bc3f657f71 t1506: drop space after redirection operator
e5d7b2f65c t1400: avoid "test" string comparisons
5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c
c7a6207591 Sync with maint
7210ca4ee5 .mailmap: fix GGG authoship screwup
37a63faae5 t4124: only mark git command with test_must_fail
a8c663cf65 t3507: use test_path_is_missing()
2def7f017c t3507: fix indentation
e8a1c686ae t3504: do check for conflict marker after failed cherry-pick
1c9fd32fd2 t3419: stop losing return code of git command
c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}()
a781cd6fef t3415: stop losing return codes of git commands
86ce6e0dd1 t3310: extract common notes_merge_files_gone()
245b9ba0ba t3030: use test_path_is_missing()
4a6f11fd7b t2018: replace "sha" with "oid"
62e80fcb48 t2018: don't lose return code of git commands
30c0367668 t2018: teach do_checkout() to accept `!` arg
40caa5366a t2018: be more discerning when checking for expected exit codes
b54128bb0b t5616: make robust to delta base change
4c616c2ba1 merge-recursive: use subtraction to flip stage
ee798742bd merge-recursive: silence -Wxor-used-as-pow warning
39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule
a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin
3b2885ec9b submodule: fix status of initialized but not cloned submodules
ace912bfb8 t7400: add a testcase for submodule status on empty dirs
4bb4fd4290 MyFirstContribution: add avenues for getting help
9e6d3e6417 sparse-checkout: detect short patterns
41de0c6fbc sparse-checkout: cone mode does not recognize "**"
7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone
47dbf10d8a clone: fix --sparse option with URLs
3c754067a1 sparse-checkout: create leading directories
d622c34396 t1091: improve here-docs
522e641748 t1091: use check_files to reduce boilerplate
417be08d02 t1300: create custom config file without special characters
3de7ee369b t1300: fix over-indented HERE-DOCs
329e6ec397 config: fix typo in variable name
767a9c417e rebase -i: stop checking out the tip of the branch to rebase
dfaed02862 fsmonitor: update documentation for hook version and watchman hooks
e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2
d031049da3 completion: add support for sparse-checkout
a402723e48 doc: sparse-checkout: mention --cone option
26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck
b6992261de rebase -i: re-fix short SHA-1 collision
d859dcad94 parse_insn_line(): improve error message when parsing failed
d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects
92fb0db94c pack-objects: add checks for duplicate objects
bb514de356 pack-objects: improve partial packfile reuse
ff483026a9 builtin/pack-objects: introduce obj_is_packed()
e704fc7978 pack-objects: introduce pack.allowPackReuse
2f4af77699 csum-file: introduce hashfile_total()
8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting()
59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile
40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains()
14fbd26044 ewah/bitmap: introduce bitmap_word_alloc()
bc7a3d4dc0 The first batch post 2.25 cycle
09e393d913 Merge branch 'nd/switch-and-restore'
45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport'
0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout'
36da2a8635 Merge branch 'es/unpack-trees-oob-fix'
42096c778d Merge branch 'bc/run-command-nullness-after-free-fix'
1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted'
a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees'
e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached'
9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting'
237a83a943 Merge branch 'dl/credential-netrc'
a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir()
129510a067 t2405: clarify test descriptions and simplify test
4eaadc8493 t2405: use git -C and test_commit -C instead of subshells
773c60a45e t7410: rename to t2405-worktree-submodule.sh
7a2dc95cbc docs: mention when increasing http.postBuffer is valuable
1b13e9032f doc: dissuade users from trying to ignore tracked files
69e104d70e doc: provide guidance on user.name format
813f6025a5 docs: expand on possible and recommended user config options
bc94e5862a doc: move author and committer information to git-commit(1)
7979dfe1d4 l10n: Update Catalan translation
81e3db42f3 templates: fix deprecated type option `--bool`
c513a958b6 t6025: use helpers to replace test -f <path>
70789843bd t6025: modernize style
6a7aca6f01 doc: rm: synchronize <pathspec> description
856249c62a docs: use "currently" for the present time
b40a50264a fetch: document and test --refmap=""
a9ae8fde2e t3404: directly test the behavior of interest
22a69fda19 git-rebase.txt: update description of --allow-empty-message
f1928f04b2 grep: use no. of cores as the default no. of threads
70a9fef240 grep: move driver pre-load out of critical section
1184a95ea2 grep: re-enable threads in non-worktree case
6c307626f1 grep: protect packed_git [re-]initialization
c441ea4edc grep: allow submodule functions to run in parallel
d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules()
1d1729caeb grep: replace grep_read_mutex by internal obj read lock
31877c9aec object-store: allow threaded access to object reading
b1fc9da1c8 replace-object: make replace operations thread-safe
d5b0bac528 grep: fix racy calls in grep_objects()
faf123c730 grep: fix race conditions at grep_submodule()
c3a5bb31c1 grep: fix race conditions on userdiff calls
0222540827 fetch: emphasize failure during submodule fetch
232378479e Sync with maint
e4837b4406 t7800: don't rely on reuse_worktree_file()
fbce03d329 t4018: drop "debugging" cat from hunk-header tests
f65d07fffa Makefile: use compat regex with SANITIZE=address
849e43cc18 built-in add -i: accept open-ended ranges again
d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files
a4ffbbbb99 submodule.c: mark more strings for translation
0cbb60574e dir: point treat_leading_path() warning to the right place
ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent
22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2
f365bf40a0 clean: demonstrate a bug with pathspecs
b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x
277eb5af7c t5604: make hash independent
44b6c05b43 t5601: switch into repository to hash object
7a868c51c2 t5562: use $ZERO_OID
1b8f39fb0d t5540: make hash size independent
a8c17e3bd6 t5537: make hash size independent
832072219c t5530: compute results based on object length
74ad99b1d8 t5512: abstract away SHA-1-specific constants
ba1be1ab45 t5510: make hash size independent
cba472d3ad t5504: make hash algorithm independent
82d5aeb1e6 t5324: make hash size independent
3c5e65cac1 t5319: make test work with SHA-256
235d3cddb8 t5319: change invalid offset for SHA-256 compatibility
1d86c8f0ce t5318: update for SHA-256
525a7f1769 t4300: abstract away SHA-1-specific constants
7a1bcb251b t4204: make hash size independent
cb78f4f0fe t4202: abstract away SHA-1-specific constants
717c939d8f t4200: make hash size independent
08a9dd891c t4134: compute appropriate length constant
215b60bf07 t4066: compute index line in diffs
194264c185 t4054: make hash-size independent
7d5ecd775d completion: list paths and refs for 'git worktree add'
3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands
3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options
367efd54b3 completion: return the index of found word from __git_find_on_cmdline()
d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function
2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper
54887b4689 gpg-interface: add minTrustLevel as a configuration option
684ceae32d fetch: default to protocol version 2
33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION
8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate
b9ab170752 config doc: protocol.version is not experimental
07ef3c6604 fetch test: use more robust test for filtered objects
d6509da620 fetch test: mark test of "skipping" haves as v0-only
a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too
c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function
bf66db37f1 add: use advise function to display hints
c958d3bd0a graph: fix collapse of multiple edges
8588932e20 graph: add test to demonstrate horizontal line bug
d0d0a357a1 t: directly test parse_pathspec_file()
568cabb2fe t: fix quotes tests for --pathspec-from-file
f94f7bd00d t: add tests for error conditions with --pathspec-from-file
b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job
12acdf573a built-in add -p: handle Escape sequences more efficiently
e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode
04f816b125 built-in add -p: respect the `interactive.singlekey` config setting
a5e46e6b01 terminal: add a new function to read a single keystroke
9ea416cb51 terminal: accommodate Git for Windows' default terminal
94ac3c31f7 terminal: make the code of disable_echo() reusable
08b1ea4c39 built-in add -p: handle diff.algorithm
180f48df69 built-in add -p: support interactive.diffFilter
1e4ffc765d t3701: adjust difffilter test
c81638541c submodule add: show 'add --dry-run' stderr when aborting
8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token
56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token
d0654dc308 Git 2.25
b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po
4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'"
ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1
e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master
1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
d78a1968c5 Merge branch 'ma/config-advice-markup-fix'
a20ae3ee29 l10n: Update Catalan translation
49e268e23e mingw: safeguard better against backslashes in file names
4c6c7971e0 unpack-trees: correctly compute result count
63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1
75449c1b39 l10n: de.po: Reword generation numbers
6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t)
3901d2c6bd config/advice.txt: fix description list separator
7a6a90c6ec Git 2.25-rc2
1f5f3ffe5c Merge branch 'ds/graph-assert-fix'
a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix'
202f68b252 Merge branch 'pm/am-in-body-header-doc-update'
7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix'
c5dc20638b Merge branch 'do/gitweb-typofix-in-comments'
fe47c9cb5f Merge https://github.com/prati0100/git-gui
a1087c9367 graph: fix lack of color in horizontal lines
0d251c3291 graph: drop assert() for merge with two collapsing parents
4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper
573117dfa5 unpack-trees: watch for out-of-range index position
e701bab3e9 restore: invalidate cache-tree when removing entries with --staged
1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command
fa74180d08 checkout: don't revert file on ambiguous tracking branches
2957709bd4 parse_branchname_arg(): extract part as new function
5020f6806a t2018: improve style of if-statement
7ffb54618b t2018: add space between function name and ()
63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH
065027ee1a string-list: note in docs that callers can specify sorting function
26f924d50e unpack-trees: exit check_updates() early if updates are not wanted
042ed3e048 The final batch before -rc2
0f1930cd1b Merge branch 'ds/sparse-cone'
037f067587 Merge branch 'ds/commit-graph-set-size-mult'
f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify'
c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode'
a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
c4117fcb97 Merge branch 'pb/clarify-line-log-doc'
556f0258df Merge branch 'ew/packfile-syscall-optim'
5814d44d9b doc: submodule: fix typo for command absorbgitdirs
7047f75f22 editorconfig: indent text files with tabs
60440d72db sha1-file: document how to use pretend_object_file
7fdc5f296f l10n: es: 2.25.0 round #1
f8740c586b am: document that Date: can appear as an in-body header
4e2c4c0d4f gitweb: fix a couple spelling errors in comments
421c0ffb02 multi-pack-index: correct configuration in documentation
757ff352bd Documentation/git-sparse-checkout.txt: fix a typo
0d2116c644 Merge branch 'zs/open-current-file'
9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u)
3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master
4c5081614c l10n: fr.po v2.25.0 rnd 1
5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0
63020f175f commit-graph: prefer default size_mult when given zero
224c7d70fa mingw: only test index entries for backslashes, not tree entries
9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED
8679ef24ed Git 2.25-rc1
a82027e9e6 Merge branch 'js/use-test-tool-on-path'
13432fc6dd Merge branch 'js/mingw-reserved-filenames'
e0e1ac5db0 Merge branch 'en/rebase-signoff-fix'
b76a244c9d Merge branch 'em/freebsd-cirrus-ci'
bc855232bc Merge branch 'bk/p4-misc-usability'
763a59e71c merge-recursive: remove unnecessary oid_eq function
44143583b7 sparse-checkout: use extern for global variables
d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master
13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1
786f4d2405 git-gui: allow opening currently selected file in default app
4fd683b6a3 sparse-checkout: document interactions with submodules
de11951b03 sparse-checkout: list directories in cone mode
0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0
578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed)
173fff68da Merge tag 'v2.25.0-rc0' into git-po-master
f1842ff531 t2018: remove trailing space from test description
20a67e8ce9 t3008: find test-tool through path lookup
9e341f62ca l10n: Update Catalan translation
4e61b2214d packfile: replace lseek+read with pread
ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision
2be45868a8 doc: log, gitk: document accepted line-log diff formats
280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD
0a76bd7381 mailmap: mask accentless variant for Công Danh
99c33bed56 Git 2.25-rc0
d2189a721c Merge branch 'en/fill-directory-fixes'
8be0a428d6 Merge branch 'rs/test-cleanup'
65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string'
c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
45b96a6fa1 Merge branch 'js/add-p-in-c'
ccc292e862 Merge branch 'jc/drop-gen-hdrs'
dfee504bee Merge branch 'ja/doc-markup-cleanup'
87cbb1ca66 Merge branch 'rs/ref-read-cleanup'
20aa6d88b7 Merge branch 'rb/p4-lfs'
fcd5b55f56 Merge branch 'pb/submodule-doc-xref'
4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free'
ba6b66281e Merge branch 'ln/userdiff-elixir'
bd72a08d6c Merge branch 'ds/sparse-cone'
f3c520e17f Merge branch 'sg/name-rev-wo-recursion'
6514ad40a1 Merge branch 'ra/t5150-depends-on-perl'
17066bea38 Merge branch 'dl/format-patch-notes-config-fixup'
135365dd99 Merge branch 'am/pathspec-f-f-checkout'
ff0cb70d45 Merge branch 'am/pathspec-from-file'
4dc42c6c18 mingw: refuse paths containing reserved names
98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16
c480eeb574 commit --interactive: make it work with the built-in `add -i`
cee6cb7300 built-in add -p: implement the "worktree" patch modes
52628f94fc built-in add -p: implement the "checkout" patch modes
6610e4628a built-in stash: use the built-in `git add -p` if so configured
90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting
36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes
d2a233cb8b built-in add -p: prepare for patch modes other than "stage"
761e3d26bb sparse-checkout: improve OS ls compatibility
6579d93a97 contrib/credential/netrc: work outside a repo
1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable
b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI
b441717256 t1507: inline full_name()
9291e6329e t1507: run commands within test_expect_success
5236fce6b4 t1507: stop losing return codes of git commands
10812c2337 t1501: remove use of `test_might_fail cp`
62d58cda69 t1409: use test_path_is_missing()
b87b02cfe6 t1409: let sed open its own input file
9b92070e52 t1307: reorder `nongit test_must_fail`
3595d10c26 t1306: convert `test_might_fail rm` to `rm -f`
f511bc02ed t0020: use ! check_packed_refs_marked
f6041abdcd t0020: don't use `test_must_fail has_cr`
f46c243e66 t0003: don't use `test_must_fail attr_check`
99c049bc4c t0003: use test_must_be_empty()
3738439c77 t0003: use named parameters in attr_check()
7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err()
b8afb908c2 t/lib-git-p4: use test_path_is_missing()
4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases
6836d2fe06 dir.c: use st_add3() for allocation size
c847dfafee dir: consolidate similar code in treat_directory()
777b420347 dir: synchronize treat_leading_path() and read_directory_recursive()
b9670c1f5e dir: fix checks on common prefix directory
5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit
23cbe427c4 Merge branch 'py/console-close-esc'
124a895811 t4015: improve coverage of function context test
509efef789 commit: forbid --pathspec-from-file --all
12029dc57d t3434: mark successful test as such
e0f9095aaa notes.h: fix typos in comment
675ef6bab8 t6030: don't create unused file
01ed17dc8c t5580: don't create unused file
f670adb49b t3501: don't create unused file
1e1ccbfdd3 git-gui: allow closing console window with Escape
7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays.
b02fd2acca The sixth batch
59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex'
e3b72391d1 Merge branch 'rs/commit-export-env-simplify'
43bf44e23a Merge branch 'rs/archive-zip-code-cleanup'
4438a1a59f Merge branch 'js/t3404-indent-fix'
3a44db2ed2 Merge branch 'dr/branch-usage-casefix'
8bc481f4f6 Merge branch 'sg/t9300-robustify'
011fc2e88e Merge branch 'js/add-i-a-bit-more-tests'
d1c0fe8d9b Merge branch 'dl/range-diff-with-notes'
26c816a67d Merge branch 'hw/doc-in-header'
f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
71a7de7a99 Merge branch 'dl/rebase-with-autobase'
c9f5fc9114 Merge branch 'dl/test-cleanup'
6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap'
3beff388b2 Merge branch 'js/builtin-add-i-cmds'
4755a34c47 Merge branch 'dd/time-reentrancy'
37c2619d91 Merge branch 'ag/sequencer-todo-updates'
608e380502 git-p4: show detailed help when parsing options fail
e2aed5fd5b git-p4: yes/no prompts should sanitize user text
571fb96573 fix-typo: consecutive-word duplications
f371984613 Makefile: drop GEN_HDRS
2e4083198d built-in add -p: show helpful hint when nothing can be staged
54d9d9b2ee built-in add -p: only show the applicable parts of the help text
ade246efed built-in add -p: implement the 'q' ("quit") command
d6cf873340 built-in add -p: implement the '/' ("search regex") command
9254bdfb4f built-in add -p: implement the 'g' ("goto") command
bcdd297b78 built-in add -p: implement hunk editing
b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf"
11f2c0dae8 built-in add -p: coalesce hunks after splitting them
510aeca199 built-in add -p: implement the hunk splitting feature
0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions
5906d5de77 built-in app -p: allow selecting a mode change as a "hunk"
47dc4fd5eb built-in add -p: handle deleted empty files
80399aec5a built-in add -p: support multi-file diffs
7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed
12c24cf850 built-in add -p: color the prompt and the help text
25ea47af49 built-in add -p: adjust hunk headers as needed
e3bd11b4eb built-in add -p: show colored hunks by default
1942ee44e8 built-in add -i: wire up the new C code for the `patch` command
f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C
d1b1384d61 userdiff: remove empty subexpression from elixir regex
df5be01669 doc: indent multi-line items in list
fd5041e127 doc: remove non pure ASCII characters
190a65f9db sparse-checkout: respect core.ignoreCase in cone mode
1d7297513d notes: break set_display_notes() into smaller functions
66f79ee23d config/format.txt: clarify behavior of multiple format.notes
cc2bd5c45d gitmodules: link to gitsubmodules guide
99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed
e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed
8c02fe6060 t7004: don't create unused file
cb05d6a5ed t4256: don't create unused file
c5c4eddd56 dir: break part of read_directory_recursive() out for reuse
072a231016 dir: exit before wildcard fall-through if there is no wildcard
2f5d3847d4 dir: remove stray quote character in comment
a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories"
452efd11fb t3011: demonstrate directory traversal failures
ea94b16fb8 git-p4: honor lfs.storage configuration variable
51a0a4ed95 bisect--helper: avoid use-after-free
d32e065a91 Merge branch 'kk/branch-name-encoding'
ad05a3d8e5 The fifth batch
7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix'
b089e5e6cb Merge branch 'em/test-skip-regex-illseq'
930078ba39 Merge branch 'hi/gpg-use-check-signature'
08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode'
7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk'
55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm'
41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress'
5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise'
dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix'
d37cfe3b5c Merge branch 'dl/pretty-reference'
99c4ff1bda Merge branch 'dl/submodule-set-url'
55d607d85b Merge branch 'js/mingw-inherit-only-std-handles'
c58ae96fc4 Merge branch 'am/pathspec-from-file'
7c88714262 Merge branch 'po/bundle-doc-clonable'
5d9324e0f4 Merge branch 'ra/rebase-i-more-options'
7034cd094b Sync with Git 2.24.1
09ac67a183 format-patch: move git_config() before repo_init_revisions()
8164c961e1 format-patch: use --notes behavior for format.notes
452538c358 notes: extract logic into set_display_notes()
e6e230eeae notes: create init_display_notes() helper
1e6ed5441a notes: rename to load_display_notes()
2866fd284c name-rev: cleanup name_ref()
49f7a2fde9 name-rev: eliminate recursion in name_rev()
fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name'
e05e8cf074 archive-zip: use enum for compression method
39acfa3d22 git gui: fix branch name encoding error
11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description
8cf8f9b4aa t3404: fix indentation
4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs
147ee35558 commit: use strbuf_add() to add a length-limited string
559c6fc317 The fourth batch
56e6c16394 Merge branch 'dl/lore-is-the-archive'
3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive'
7cb0d37f6d Merge branch 'tg/perf-remove-stale-result'
403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick'
f0cf2fee5d Merge branch 'hi/grep-do-not-return-void'
391fb22ac7 Merge branch 'rs/use-skip-prefix-more'
92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd'
4ba74ca901 Merge branch 'rs/test-cleanup'
f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick'
ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9'
8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters
3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances
dd432a6ecf name-rev: restructure parsing commits and applying date cutoff
dd090a8a37 name-rev: pull out deref handling from the recursion
766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper
d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev()
bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation
e0c4da6f2a name-rev: avoid unnecessary cast in name_ref()
c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name()
c593a26348 t6120-describe: modernize the 'check_describe' helper
abcf857300 range-diff: clear `other_arg` at end of function
f8675343d7 range-diff: mark pointers as const
828765dfe0 t3206: fix incorrect test name
0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early
21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile
b4bbbbd5a2 apply --allow-overlap: fix a corner case
89c8559367 git add -p: use non-zero exit code when the diff generation failed
e91162be9c t3701: verify that the diff.algorithm config setting is handled
0c3222c4f3 t3701: verify the shown messages when nothing can be added
24be352d52 t3701: add a test for the different `add -p` prompts
8539b46534 t3701: avoid depending on the TTY prerequisite
0f0fba2cc8 t3701: add a test for advanced split-hunk editing
53a06cf39b Git 2.24.1
67af91c47a Sync with 2.23.1
a7312d1a28 Git 2.23.1
7fd9fd94fb Sync with 2.22.2
d9589d4051 Git 2.22.2
5421ddd8d0 Sync with 2.21.1
367f12b7e9 Git 2.21.1
20c71bcf67 Merge branch 'fix-msys2-quoting-bugs'
7d8b676992 mingw: sh arguments need quoting in more circumstances
d9061ed9da t7415: drop v2.20.x-specific work-around
04522edbd4 mingw: fix quoting of empty arguments for `sh`
49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts
e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly
fc346cb292 Sync with 2.20.2
4cd1cf31ef Git 2.20.2
c154745074 submodule: defend against submodule.update = !command in .gitmodules
4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x
d851d94151 Sync with 2.19.3
caccc527ca Git 2.19.3
7c9fbda6e2 Sync with 2.18.2
9877106b01 Git 2.18.2
14af7ed5a9 Sync with 2.17.3
a5ab8d0317 Git 2.17.3
bb92255ebe fsck: reject submodule.update = !command in .gitmodules
bdfef0492c Sync with 2.16.6
eb288bc455 Git 2.16.6
68440496c7 test-drop-caches: use `has_dos_drive_prefix()`
9ac92fed5b Sync with 2.15.4
7cdafcaacf Git 2.15.4
e904deb89d submodule: reject submodule.update = !command in .gitmodules
d3ac8c3f27 Sync with 2.14.6
66d2a6159f Git 2.14.6
083378cc35 The third batch
88bd37a2d0 Merge branch 'js/pkt-line-h-typofix'
473b431410 Merge branch 'us/unpack-trees-fsmonitor'
e0f9ec9027 Merge branch 'sg/test-bool-env'
fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset'
e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere'
88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory'
8feb47e882 Merge branch 'dl/t5520-cleanup'
6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree'
57d46bc602 Merge branch 'mg/doc-submodule-status-cached'
75bd003c7b Merge branch 'js/git-svn-use-rebase-merges'
f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix'
c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'
36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree'
cf91c31688 Merge branch 'sg/unpack-progress-throughput'
ef6104581d Merge branch 'pb/submodule-update-fetches'
7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix'
f3c7bfdde2 Merge branch 'dl/range-diff-with-notes'
9502b616f1 Merge branch 'jh/userdiff-python-async'
76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2'
995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label'
f7998d9793 Merge branch 'js/builtin-add-i'
917d0d6234 Merge branch 'js/rebase-r-safer-label'
56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers'
2763530048 Merge branch 'jg/revert-untracked'
fa38ab68b0 git-gui: revert untracked files by deleting them
d9c6469f38 git-gui: update status bar to track operations
29a9366052 git-gui: consolidate naming conventions
0bb313a552 xdiff: unignore changes in function context
2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names'
65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods'
5532ebdeb7 Merge branch 'fix-mingw-quoting-bug'
76a681ce9c Merge branch 'dubiously-nested-submodules'
dd53ea7220 Merge branch 'turn-on-protectntfs-by-default'
f82a97eb91 mingw: handle `subst`-ed "DOS drives"
7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams'
d2c84dad1c mingw: refuse to access paths with trailing spaces or periods
379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh
817ddd64c2 mingw: refuse to access paths with illegal characters
cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors
7530a6287e quote-stress-test: allow skipping some trials
35edce2056 t6130/t9350: prepare for stringent Win32 path validation
55953c77c0 quote-stress-test: accept arguments to test via the command-line
ad15592529 tests: add a helper to stress test argument quoting
a8dee3ca61 Disallow dubiously-nested submodule git directories
9102f958ee protect_ntfs: turn on NTFS protection by default
91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams
6d8684161e mingw: fix quoting of arguments
3a85dc7d53 is_ntfs_dotgit(): speed it up
7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses
288a74bcd2 is_ntfs_dotgit(): only verify the leading segment
a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark
cae0bc09ab rebase: fix format.useAutoBase breakage
945dc55dda format-patch: teach --no-base
700e006c5d t4014: use test_config()
a749d01e1d format-patch: fix indentation
0c47e06176 t3400: demonstrate failure with format.useAutoBase
d9b31db2c4 t7700: stop losing return codes of git commands
3699d69df0 t7700: make references to SHA-1 generic
dcf9a748ca t7700: replace egrep with grep
cfe5eda02a t7700: consolidate code into test_has_duplicate_object()
ae475afc0f t7700: consolidate code into test_no_missing_in_packs()
14b7664df8 doc: replace LKML link with lore.kernel.org
d23f9c8e04 RelNotes: replace Gmane with real Message-IDs
dcee037228 doc: replace MARC links with lore.kernel.org
a9aecc7abb checkout, restore: support the --pathspec-from-file option
cfd9376c1d doc: restore: synchronize <pathspec> description
8ea1189eac doc: checkout: synchronize <pathspec> description
6fdc9ad259 doc: checkout: fix broken text reference
1d022bb43f doc: checkout: remove duplicate synopsis
bebb5d6d6b add: support the --pathspec-from-file option
21bb3083c3 cmd_add: prepare for next patch
4778452597 Merge branch 'prevent-name-squatting-on-windows'
a7b1ad3b05 Merge branch 'jk/fast-import-unsafe'
525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()`
e1d911dd4c mingw: disallow backslash characters in tree objects' file names
0060fd1511 clone --recurse-submodules: prevent name squatting on Windows
a52ed76142 fast-import: disallow "feature import-marks" by default
68061e3470 fast-import: disallow "feature export-marks" by default
019683025f fast-import: delay creating leading directories for export-marks
e075dba372 fast-import: stop creating leading directories for import-marks
11e934d56e fast-import: tighten parsing of boolean command line options
816f806786 t9300: create marks files for double-import-marks test
f94804c1f2 t9300: drop some useless uses of cat
4f3e57ef13 submodule--helper: advise on fatal alternate error
10c64a0b3c Doc: explain submodule.alternateErrorStrategy
ec48540fe8 packfile.c: speed up loading lots of packfiles
3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value
a4fb016ba1 pkt-line: fix a typo
0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r
e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data
228f53135a The second batch
6c630f237e Merge branch 'jk/gitweb-anti-xss'
3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell'
4775e02a5c Merge branch 'ma/t7004'
a6c6f8d02a Merge branch 'js/complete-svn-recursive'
3ae8defaf9 Merge branch 'jk/send-pack-remote-failure'
aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix'
4ab9616c76 Merge branch 'sg/skip-skipped-prereq'
723a8adba5 Merge branch 'ds/test-read-graph'
9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation'
406ca29e0d Merge branch 'rs/parse-options-dup-null-fix'
fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging'
8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion'
ef8f621045 Merge branch 'dl/complete-rebase-onto'
3c3e5d0ea2 Merge branch 'tg/stash-refresh-index'
43c5fe1c1d Merge branch 'nn/doc-rebase-merges'
6511cb33c9 Merge branch 'dd/sequencer-utf8'
f165457618 Merge branch 'jk/remove-sha1-to-hex'
a774064fb0 Merge branch 'dj/typofix-merge-strat'
ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates'
d2489ce92c Merge branch 'rs/skip-iprefix'
376e7309e1 Merge branch 'ln/userdiff-elixir'
9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log'
d3096d2ba6 Merge branch 'en/doc-typofix'
26f20fa3fc Merge branch 'ns/test-desc-typofix'
ffd130a363 Merge branch 'en/t6024-style'
5149902ff9 Merge branch 'en/misc-doc-fixes'
bcb06e204c Merge branch 'js/fetch-multi-lockfix'
d08daec001 Merge branch 'rs/trace2-dots'
fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix'
bad5ed39cd Merge branch 'cb/curl-use-xmalloc'
7ab2088255 Merge branch 'rt/fetch-message-fix'
f089ddd56a Merge branch 'es/myfirstcontrib-updates'
3c90710c0c Merge branch 'hw/config-doc-in-header'
d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code'
5444d52866 Merge branch 'js/vreportf-wo-buffering'
05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add'
ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides'
532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default'
dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists'
fac9ab1419 Merge branch 'ma/bisect-doc-sample-update'
a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix'
0be5caf97c Merge branch 'jc/log-graph-simplify'
0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck'
2e697ced9d built-in add -i: offer the `quit` command
d7633578b5 built-in add -i: re-implement the `diff` command
8746e07277 built-in add -i: implement the `patch` command
ab1e1cccaf built-in add -i: re-implement `add-untracked` in C
c54ef5e424 built-in add -i: re-implement `revert` in C
a8c45be939 built-in add -i: implement the `update` command
f37c226454 built-in add -i: prepare for multi-selection commands
c08171d156 built-in add -i: allow filtering the modified files list
0c3944a628 add-interactive: make sure to release `rev.prune_data`
4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance
867fc7f310 grep: don't return an expression from pcre2_free()
c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables
72b006f4bf gpg-interface: prefer check_signature() for GPG verification
7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD
b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r
ccd469450a date.c: switch to reentrant {gm,local}time_r
271c351b2f t7811: don't create unused file
65efb42862 t9300: don't create unused file
f6b9413baf sequencer: fix a memory leak in sequencer_continue()
3eae30e464 doc: replace public-inbox links with lore.kernel.org
46c67492aa doc: recommend lore.kernel.org over public-inbox.org
5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects
17a4ae92ea t7700: s/test -f/test_path_is_file/
d2eee32a89 t7700: move keywords onto their own line
7a1c8c2346 t7700: remove spaces after redirect operators
09279086e8 t7700: drop redirections to /dev/null
756ee7fc9f t7501: stop losing return codes of git commands
38c1aa01de t7501: remove spaces after redirect operators
763b47bafa t5703: stop losing return codes of git commands
eacaa1c180 t5703: simplify one-time-sed generation logic
a29b2429e5 t5317: use ! grep to check for no matching lines
6c37f3ec1b t5317: stop losing return codes of git commands
b66e0a1773 t4138: stop losing return codes of git commands
afd43c9905 t4015: use test_write_lines()
946d2353a3 t4015: stop losing return codes of git commands
50cd31c652 t3600: comment on inducing SIGPIPE in `git rm`
3b737381d8 t3600: stop losing return codes of git commands
0d913dfa7e t3600: use test_line_count() where possible
29a40b5a67 t3301: stop losing return codes of git commands
9b5a9fa60a t0090: stop losing return codes of git commands
17aa9d9c1a t0014: remove git command upstream of pipe
77a946be98 apply-one-time-sed.sh: modernize style
176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job
ed254710ee test: use test_must_be_empty F instead of test_cmp empty F
c74b3cbb83 t7812: add missing redirects
213dabf49d test: use test_must_be_empty F instead of test -z $(cat F)
c93a5aaec8 t1400: use test_must_be_empty
6e4826ea75 t1410: use test_line_count
a5d04a3ef9 t1512: use test_line_count
54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd()
2059e79c0d name-rev: use skip_prefix() instead of starts_with()
1768aaf01d push: use skip_prefix() instead of starts_with()
ec6ee0c07a shell: use skip_prefix() instead of starts_with()
7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with()
a6293f5d28 fetch: use skip_prefix() instead of starts_with()
13ca8fb79e t5150: skip request-pull test if Perl is disabled
ecc0869080 commit-graph: use start_delayed_progress()
44a4693bfc progress: create GIT_PROGRESS_DELAY
528d9e6d01 t/perf: don't depend on Git.pm
b8dcc45387 perf-lib: use a single filename for all measurement types
fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk'
d82dfa7f5b rebase -i: finishing touches to --reset-author-date
1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory
393adf7a6f sequencer: directly call pick_commits() from complete_action()
a2dd67f105 rebase: fill `squash_onto' in get_replay_opts()
3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function
34065541e3 sequencer: update `done_nr' when skipping commands in a todo list
8638114e06 sequencer: update `total_nr' when adding an item to a todo list
0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk
ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk
ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions
9917eca794 l10n: zh_TW: add translation for v2.24.0
0a8e3036a3 reset: parse rev as tree-ish in patch mode
f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits
8d483c8408 doc: document 'git submodule status --cached'
befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick
ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later
9a780a384d mingw: spawned processes need to inherit only standard handles
c5a03b1e29 mingw: work around incorrect standard handles
eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes
a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool
43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values
2d05ef2778 sequencer: fix empty commit check when amending
ea8b7be147 git svn: stop using `rebase --preserve-merges`
67a6ea6300 gpg-interface: limit search for primary key fingerprint
392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern
cff4e9138d sparse-checkout: check for dirty status
416adc8711 sparse-checkout: update working directory in-process for 'init'
f75a69f880 sparse-checkout: cone mode should not interact with .gitignore
fb10ca5b54 sparse-checkout: write using lockfile
99dfa6f970 sparse-checkout: use in-process update for disable subcommand
e091228e17 sparse-checkout: update working directory in-process
e9de487aa3 sparse-checkout: sanitize for nested folders
4dcd4def3c unpack-trees: add progress to clear_ce_flags()
eb42feca97 unpack-trees: hash less in cone mode
af09ce24a9 sparse-checkout: init and set in cone mode
96cc8ab531 sparse-checkout: use hashmaps for cone patterns
879321eb0b sparse-checkout: add 'cone' mode
e6152e35ff trace2: add region in clear_ce_flags
72918c1ad9 sparse-checkout: create 'disable' subcommand
7bffca95ea sparse-checkout: add '--stdin' option to set subcommand
f6039a9423 sparse-checkout: 'set' subcommand
d89f09c828 clone: add --sparse mode
bab3c35908 sparse-checkout: create 'init' subcommand
94c0956b60 sparse-checkout: create builtin with 'list' subcommand
679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files
df6d3d6802 lib-bash.sh: move `then` onto its own line
2a02262078 t5520: replace `! git` with `test_must_fail git`
c245e58bb6 t5520: remove redundant lines in test cases
a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp
e959a18ee7 t5520: don't put git in upstream of pipe
5540ed27bc t5520: test single-line files by git with test_cmp
dd0f1e767b t5520: use test_cmp_rev where possible
979f8891cc t5520: replace test -{n,z} with test-lib functions
3037d3db90 t5520: use test_line_count where possible
93a9bf876b t5520: remove spaces after redirect operator
ceeef863de t5520: replace test -f with test-lib functions
4c8b046f82 t5520: let sed open its own input
53c62b9810 t5520: use sq for test case names
e8d1eaf9b4 t5520: improve test style
2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals
8cb7980382 t0000: test multiple local assignment
5b583e6a09 format-patch: pass notes configuration to range-diff
bd36191886 range-diff: pass through --notes to `git log`
9f726e1b87 range-diff: output `## Notes ##` header
3bdbdfb7a5 t3206: range-diff compares logs with commit notes
75c5aa0701 t3206: s/expected/expect/
79f3950d02 t3206: disable parameter substitution in heredoc
3a6e48e9f7 t3206: remove spaces after redirect operators
26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish
077a1fda82 userdiff: support Python async functions
3798149a74 SubmittingPatches: use `--pretty=reference`
1f0fc1db85 pretty: implement 'reference' format
618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type
0df621172d pretty: provide short date format
ac52d9410e t4205: cover `git log --reflog -z` blindspot
3e8ed3b93e pretty.c: inline initalize format_context
4982516451 revision: make get_revision_mark() return const pointer
f0f9de2bd7 completion: complete `tformat:` pretty format
fb2ffa77a6 SubmittingPatches: remove dq from commit reference
bae74c9dfb pretty-formats.txt: use generic terms for hash
bd00717eab SubmittingPatches: use generic terms for hash
9d45ac4cbf rev-list-options.txt: remove reference to --show-notes
828e829b9e argv-array: add space after `while`
e440fc5888 commit: support the --pathspec-from-file option
66a25a7242 doc: commit: synchronize <pathspec> description
64bac8df97 reset: support the `--pathspec-from-file` option
d137b50756 doc: reset: synchronize <pathspec> description
24e4750c96 pathspec: add new function to parse file
0dbc4a0edf ci(osx): update homebrew-cask repository with less noise
e02058a729 sequencer: handle rebase-merges for "onto" message
bae60ba7e9 builtin/unpack-objects.c: show throughput progress
2d92ab32fd rev-parse: make --show-toplevel without a worktree an error
9e5afdf997 fetch: add trace2 instrumentation
4c4066d95d run-command: move doc to run-command.h
6c51cb525d trace2: move doc to trace2.h
7db0305438 parse-options: add link to doc file in parse-options.h
d95a77d059 submodule-config: move doc to submodule-config.h
f3b9055624 credential: move doc to credential.h
bbcfa3002a tree-walk: move doc to tree-walk.h
971b1f24a2 argv-array: move doc to argv-array.h
f1ecbe0f53 trace: move doc to trace.h
13aa9c8b70 cache: move doc to cache.h
c0be43f898 sigchain: move doc to sigchain.h
19ef3ddd36 pathspec: move doc to pathspec.h
301d595e72 revision: move doc to revision.h
3a1b3415d9 attr: move doc to attr.h
126c1ccefb refs: move doc to refs.h
d27eb356bf remote: move doc to remote.h and refspec.h
405c6b1fbc sha1-array: move doc to sha1-array.h
d3d7172e40 merge: move doc to ll-merge.h
3f1480b745 graph: move doc to graph.h and graph.c
266f03eccd dir: move doc to dir.h
13c4d7eb22 diff: move doc to diff.h and diffcore.h
cd5522271f rebase -r: let `label` generate safer labels
867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()`
8c15904462 built-in add -i: implement the `help` command
3d965c7674 built-in add -i: use color in the main loop
68db1cbf8e built-in add -i: support `?` (prompt help)
76b743234c built-in add -i: show unique prefixes of the commands
6348bfba58 built-in add -i: implement the main loop
a376e37b2c gitweb: escape URLs generated by href()
b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI
f28bceca75 t/gitweb-lib.sh: drop confusing quotes
0eba60c9b7 t9502: pass along all arguments in xss helper
932757b0cc INSTALL: use existing shell scripts as example
b018719927 t7004: check existence of correct tag
1daaebcaa5 built-in add -i: color the header in the `status` command
5e82b9e4d2 built-in add -i: implement the `status` command
e4cb659ebd diff: export diffstat interface
f83dff60a7 Start to implement a built-in version of `git add --interactive`
df53c80822 stash: make sure we have a valid index before writing it
ad7a403268 send-pack: check remote ref status on pack-objects failure
d91ce887c9 t6120-describe: correct test repo history graph in comment
1f9247a3bd completion: tab-complete "git svn --recursive"
603960b50e promisor-remote: remove fetch_if_missing=0
e362fadcd0 clone: remove fetch_if_missing=0
169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL
51bd6be32d mingw: use COPY_ARRAY for copying array
4bd0593e0f test-tool: use 'read-graph' helper
e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway
d784d978f6 t4215: use helper function to check output
61eea521fe fsmonitor: do not compare bitmap size with size of split index
b19f3fe9dd hex: drop sha1_to_hex()
c1ce9c06d0 completion: learn to complete `git rebase --onto=`
f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls
d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase
aa6d7f93ed hex: drop sha1_to_hex_r()
52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch
5772b0c745 sequencer: reencode old merge-commit message
e0eba649e8 bundle-verify: add --quiet
79862b6b77 bundle-create: progress output control
73c3253d75 bundle: framework for options before bundle file
68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in"
b375744274 sequencer: reencode squashing commit's message
019a9d8362 sequencer: reencode revert/cherry-pick's todo list
0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list
e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding
1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary
d9f6f3b619 The first batch post 2.24 cycle
28014c1084 Merge branch 'bc/hash-independent-tests-part-6'
57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree'
c22f63c40f Merge branch 'pb/pretty-email-without-domain-part'
5731ca3657 Merge branch 'hw/remove-api-docs-placeholder'
14b58c62bc Merge branch 'sg/commit-graph-usage-fix'
eff313f8a7 Merge branch 'dl/apply-3way-diff3'
db806d7064 Merge branch 'sg/dir-trie-fixes'
f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix'
8f1119b988 Merge branch 'wb/midx-progress'
d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes'
0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges'
8f40d89783 Merge branch 'hv/bitshift-constants-in-blame'
d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head'
5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer'
b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc'
15d9f3dc66 Merge branch 'es/walken-tutorial'
026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor'
ed28358833 convert: use skip_iprefix() in validate_encoding()
89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding()
03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules
ae821ffe83 multimail: fix a few simple spelling errors
557c5895c2 sha1dc: fix trivial comment spelling error
aa74be316a Fix spelling errors in test commands
96c0caf5e3 Fix spelling errors in messages shown to users
4dc8b1c114 Fix spelling errors in names of tests
7a40cf1553 Fix spelling errors in comments of testcases
15beaaa3d1 Fix spelling errors in code comments
a807200f67 userdiff: add Elixir to supported userdiff languages
461caf3e8a git-shortlog.txt: include commit limiting options
6462d5eb9a fetch: remove fetch_if_missing=0
46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion
99b2ba35f5 t0028: eliminate non-standard usage of printf
add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul`
14c4776d75 t: fix typo in test descriptions
270de6acbe t6024: modernize style
77363a51fb name-hash.c: remove duplicate word in comment
c92faa4d22 hashmap: fix documentation misuses of -> versus .
a6d39f2efb git-filter-branch.txt: correct argument name typo
4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators
8915297925 Fix spelling errors in documentation outside of Documentation/
031fd4b93b Documentation: fix a bunch of typos, both old and new
dd0b61f577 fsmonitor: fix watchman integration
5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare()
7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph
c14e6e7903 fetch: add the command-line option `--write-commit-graph`
da72936f54 Git 2.24
1d34d425d4 Merge branch 'bc/doc-use-docbook-5'
dac1d83c91 Merge branch 'ds/commit-graph-on-fetch'
c32ca691c2 Merge branch 'jt/delay-fetch-if-missing'
ab6b50e4c8 Merge https://github.com/prati0100/git-gui
93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po
a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2
fe28ad8520 rebase: add --reset-author-date
08187b4cba rebase -i: support --ignore-date
0185c683c9 sequencer: rename amend_author to author_to_rename
cbd8db17ac rebase -i: support --committer-date-is-author-date
c068bcc59b sequencer: allow callers of read_author_script() to ignore fields
ba51d2fb24 rebase -i: add --ignore-whitespace flag
3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower
3ada78de3f myfirstcontrib: add dependency installation step
4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt
4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly
8dfb04ae96 update-index: optionally leave skip-worktree entries alone
116d1fa6c6 vreportf(): avoid relying on stdio buffering
efd5444238 RelNotes/2.24.0: fix self-contradictory note
391c7e40b5 fetch.c: fix typo in a warning message
55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template
849e43680d RelNotes/2.24.0: typofix
0115e5d929 git-diff.txt: document return code of `--no-index`
798d66e35d l10n: de.po: Update German translation
c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u)
f21f8f5d35 Git 2.24-rc2
8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix'
0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix'
f2db52c46b Merge branch 'js/mingw-needs-hiding-fix'
5b7594abdc Merge branch 'master' of github.com:vnwildman/git
034d33653a Merge branch 'next' of github.com:ChrisADR/git-po
26b061007c submodule: teach set-url subcommand
460782b7be t7519-status-fsmonitor: improve comments
d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses
4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config
1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694)
f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0
762d5b4f46 help: add gitsubmodules to the list of guides
76a53d640f git_path(): handle `.lock` files correctly
3ce47211a6 t1400: wrap setup code in test case
44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string
6c02042139 clone: rename static function `dir_exists()`.
8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command
77200e9332 l10n: es: 2.24.0 round 2
e42df36b42 Merge branch 'l10n/it/update-italian-translation'
5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2
51728480fe l10n: fr v2.24.0 rnd2
045a548698 l10n: git.pot: v2.24.0 round 2 (1 new)
468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master
b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree()
c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit()
103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag()
f648ee7088 fsck: rename vague "oid" local variables
cc579000bf fsck: don't require an object struct in verify_headers()
7854399366 fsck: don't require an object struct for fsck_ident()
b8b00f1693 fsck: drop blob struct from fsck_finish()
6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob()
38370253fd fsck: don't require an object struct for report()
f59793763d fsck: only require an oid for skiplist functions
5afc4b1dc6 fsck: only provide oid/type in fsck_error callback
82ef89b318 fsck: don't require object structs for display functions
733902905d fsck: use oids rather than objects for object_name API
d40bbc109b fsck_describe_object(): build on our get_object_name() primitive
a59cfb3230 fsck: unify object-name code
23a173a761 fsck: require an actual buffer for non-blobs
2175a0c601 fsck: stop checking tag->tagged
ec65231571 fsck: stop checking commit->parent counts
1de6007d85 fsck: stop checking commit->tree value
228c78fbd4 commit, tag: don't set parsed bit for parse failures
60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()`
8b656572ca builtin/commit-graph.c: remove subcommand-less usage string
fa26d5ede6 t4048: abstract away SHA-1-specific constants
cf02be8486 t4045: make hash-size independent
38ee26b2a3 t4044: update test to work with SHA-256
37ab8ebef1 t4039: abstract away SHA-1-specific constants
0370b35414 t4038: abstract away SHA-1 specific constants
0253e126a2 t4034: abstract away SHA-1-specific constants
45e2ef2b1d t4027: make hash-size independent
79b0edc1a0 t4015: abstract away SHA-1-specific constants
840624ff55 t4011: abstract away SHA-1-specific constants
32a6707267 t4010: abstract away SHA-1-specific constants
440bf91dfa t3429: remove SHA1 annotation
0b408ca2bd t1305: avoid comparing extensions
2eabd38313 rev-parse: add a --show-object-format option
52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode
45e206f0d8 t4203: use test-lib.sh definitions
2ae4944aac t6006: use test-lib.sh definitions
cb99a34e23 commit-graph: fix writing first commit-graph during fetch
e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug
7b4fb434b4 documentation: remove empty doc files
566a1439f6 Git 2.24-rc1
04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix'
4d6fb2beeb Merge branch 'ds/feature-macros'
5f0b6ed907 Merge branch 'js/azure-ci-osx-fix'
c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs'
1b4f85285f Merge branch 'dl/submodule-set-branch'
c7aadccba0 fetch: delay fetch_if_missing=0 until after config
c11e9966cb repo-settings: read an int for index.version
091489d068 apply: respect merge.conflictStyle in --3way
aa76ae4905 t4108: demonstrate bug in apply
95806205cd t4108: use `test_config` instead of `git config`
b0069684d4 t4108: remove git command upstream of pipe
fa87b81385 t4108: replace create_file with test_write_lines
7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job
6c96630cb0 config: move documentation to config.h
d81542e6f3 Eleventh batch
e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix'
d45d771978 Merge branch 'bc/smart-http-atomic-push'
22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix'
2e215b7959 Merge branch 'sb/userdiff-dts'
e3cf08361a Merge branch 'sg/progress-fix'
b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix'
c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc'
f45f88b2e4 path.c: don't call the match function without value in trie_find()
c72fc40d09 path.c: clarify two field names in 'struct common_dir'
8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file
7cb8c929d7 path.c: clarify trie_find()'s in-code comment
e536b1fedf Documentation: mention more worktree-specific exceptions
680cba2c2b multi-pack-index: add [--[no-]progress] option.
64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack
ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file
8dc18f8937 midx: add progress to expire_midx_packs
840cef0c70 midx: add progress to write_midx_file
efbc3aee08 midx: add MIDX_PROGRESS flag
0eb3671ed9 ci(osx): use new location of the `perforce` cask
da1e295e00 t604[236]: do not run setup in separate tests
49b8133a9e merge-recursive: fix merging a subdirectory into the root directory
d3eebaad5e merge-recursive: clean up get_renamed_dir_portion()
80736d7c5e doc: am --show-current-patch gives an entire e-mail message
a8e2c0eadc t7419: change test_must_fail to ! for grep
19c29e538e t4014: make output-directory tests self-contained
12a4aeaad8 Merge branch 'js/azure-pipelines-msvc'
399c23c046 ci(visual-studio): actually run the tests in parallel
711cd6d15c ci(visual-studio): use strict compile flags, and optimization
370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0
cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master
907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master
13bcea8c7f l10n: fr 2.24.0 rnd 1
135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master
3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed)
8da56a4848 userdiff: fix some corner cases in dts regex
86795774bb builtin/blame.c: constants into bit shift format
feebd2d256 rebase: hide --preserve-merges option
0e40a73a4c Doc: Bundle file usage
78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error
12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error
c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error
2b6f6ea1bd test-progress: fix test failures on big-endian systems
f757409e36 l10n: bg.po: Updated Bulgarian translation (4693)
176f5adfdb completion: clarify installation instruction for zsh
d966095db0 Git 2.24-rc0
90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array'
3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth'
d0258d0944 Merge branch 'rs/http-push-simplify'
bb52def6da Merge branch 'jj/stash-reset-only-toplevel'
f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs'
e5fca6b573 Merge branch 'bb/compat-util-comment-fix'
43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup'
07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely'
2d74d28ee0 Merge branch 'dl/compat-cleanup'
9b83a94829 Merge branch 'ta/t1308-typofix'
376012c919 Merge branch 'js/doc-stash-save'
10da030ab7 grep: avoid leak of chartables in PCRE2
513f2b0bbd grep: make PCRE2 aware of custom allocator
57d4660468 grep: make PCRE1 aware of custom allocator
d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand
8af69cf3e2 t3301: test diagnose messages for too few/many paramters
6f1194246a remote-curl: pass on atomic capability to remote side
bbb13e8188 graph: fix coloring of octopus dashes
92beecc136 graph: flatten edges that fuse with their right neighbor
479db18bc0 graph: smooth appearance of collapsing edges on commit lines
0195285b95 graph: rename `new_mapping` to `old_mapping`
d62893ecc1 graph: commit and post-merge lines for left-skewed merges
0f0f389f12 graph: tidy up display of left-skewed merges
458152cce1 graph: example of graph output that can be simplified
ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state
46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()`
a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()`
9157a2a032 graph: reuse `find_new_column_by_commit()`
210179a20d graph: handle line padding in `graph_next_line()`
fbccf255f9 graph: automatically track display width of graph lines
5374a290aa fetch-pack: write fetched refs to .promisor
4627bc777e sequencer: run post-commit hook
49697cb721 move run_commit_hook() to libgit and use it there
12bb7a540a sequencer.h fix placement of #endif
6a619ca03c t3404: remove uneeded calls to set_fake_editor
b2dbacbddf t3404: set $EDITOR in subshell
88a92b6c73 t3404: remove unnecessary subshell
bf8e65b30b format-patch: teach --cover-from-description option
a92331df18 format-patch: use enum variables
46273df7bf format-patch: replace erroneous and condition
3b3c79f6c9 diff-highlight: fix a whitespace nit
108b97dc37 Ninth batch
cbe8cdd3a0 Merge branch 'jk/coc'
3b9ec27919 Merge branch 'js/trace2-fetch-push'
c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch'
1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup'
eb3de5b823 Merge branch 'js/xdiffi-comment-updates'
4e8371ec26 Merge branch 'dl/t0000-skip-test-test'
b6d712fa4e Merge branch 'tg/range-diff-output-update'
77458870a5 Merge branch 'gs/sq-quote-buf-pretty'
5efabc7ed9 Merge branch 'ew/hashmap'
d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files'
6ed610b968 Merge branch 'am/t0028-utf16-tests'
5b900fb812 Merge branch 'dl/octopus-graph-bug'
16d9d7184b Merge branch 'en/fast-imexport-nested-tags'
6d5291be45 Merge branch 'js/azure-pipelines-msvc'
ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd'
d96e31e390 Merge branch 'js/fetch-jobs'
280bd44551 Merge branch 'en/merge-recursive-cleanup'
062a309d36 remote-curl: use argv_array in parse_push()
a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes
5cc6a4be11 http-push: simplify deleting a list item
556895d0c8 stash: avoid recursive hard reset on submodules
b524f6b399 Merge branch 'ka/japanese-translation'
f6f3824b4e git-gui: improve Japanese translation
61f4b407d3 Merge branch 'py/readme'
1e6880fd06 git-gui: add a readme
edefc31873 format-patch: create leading components of output directory
68b69211b2 git-compat-util: fix documentation syntax
fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth()
e0479fa073 documentation: add tutorial for object walking
3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed
4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target
9cad1c4488 pthread.h: manually align parameter lists
8c1cfd58e3 t1308-config-set: fix a test that has a typo
57d8f4b4c7 doc(stash): clarify the description of `save`
08da6496b6 Eighth batch
07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup'
f0d407e6ae Merge branch 'kt/add-i-progress'
66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree'
a4c5d9f66e Merge branch 'rs/dedup-includes'
159cdabd87 Merge branch 'js/range-diff-noprefix'
93424f1f7d Merge branch 'cb/pcre1-cleanup'
a73f91774c Merge branch 'ab/pcre-jit-fixes'
4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword'
020011f2cb Merge branch 'tk/git-svn-trim-author-name'
676278f8ea Merge branch 'bc/object-id-part17'
aafb75452b Merge branch 'en/clean-nested-with-ignored'
3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails
5cdf2301d4 add a Code of Conduct document
70bf0b755a Seventh batch
9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat'
2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary'
d17f54947d Merge branch 'rs/convert-fix-utf-without-dash'
82c80f98e6 Merge branch 'py/git-gui-has-maintainer'
6e12570822 Merge branch 'ah/cleanups'
772cad0afb Merge branch 'js/diff-rename-force-stable-sort'
424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path'
678a9ca629 Merge branch 'as/shallow-slab-use-fix'
0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix'
042a54d251 Merge branch 'am/visual-studio-config-fix'
03d3b1297c xdiffi: fix typos and touch up comments
b05b40930e t0000: cover GIT_SKIP_TESTS blindspots
d8bc1a518a send-pack: never fetch when checking exclusions
756fb0dedb t4014: treat rev-list output as the expected value
2b6a9b13ca range-diff: don't segfault with mode-only changes
360c7ba330 transport: push codepath can take arbitrary repository
ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments
b657047719 merge-recursive: fix the fix to the diff3 common ancestor label
b744c3af07 Sixth batch
417056578a Merge branch 'bw/submodule-helper-usage-fix'
9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check'
1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a'
59b19bcd9f Merge branch 'cc/multi-promisor'
1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way'
5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort'
eb35c18e42 Merge branch 'sg/travis-help-debug'
cabb145fe3 Merge branch 'rs/alias-use-copy-array'
56c7ab0f4e Merge branch 'sg/t-helper-gitignore'
e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang'
583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules'
337e3f2b49 Merge branch 'rs/nth-switch-code-simplification'
8f53fe1733 Merge branch 'hb/hg-to-git-py3'
ef93bfbd45 Merge branch 'sg/progress-fix'
980351d1ac Merge branch 'js/doc-patch-text'
80693e3f09 Merge branch 'tb/commit-graph-harden'
ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge'
3f84633563 Merge branch 'dl/cocci-everywhere'
caf150ce7d Merge branch 'gs/commit-graph-progress'
1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim'
1398171378 Merge branch 'rs/commit-graph-use-list-count'
773521df26 Merge branch 'rs/nth-parent-parse'
7f17913161 Merge branch 'dl/submodule-set-branch'
cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix'
bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees'
098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack'
37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc'
e392382f95 Merge branch 'dl/complete-rebase-and-archive'
cda8faa37e Merge branch 'jk/commit-graph-cleanup'
36d2fca82b Merge branch 'ss/get-time-cleanup'
ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude'
ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob'
ba2d451122 Merge branch 'tg/stash-refresh-index'
e2b5038d87 hashmap_entry: remove first member requirement from docs
404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry
23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators
c8e424c9c9 hashmap: introduce hashmap_free_entries
8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry *
87571c3f71 hashmap: use *_entry APIs for iteration
939af16eac hashmap_cmp_fn takes hashmap_entry params
f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *"
f0e63c4113 hashmap: use *_entry APIs to wrap container_of
6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *"
973d5eea74 introduce container_of macro
26b455f21e hashmap_put takes "struct hashmap_entry *"
28ee794128 hashmap_remove takes "const struct hashmap_entry *"
b6c5241606 hashmap_get takes "const struct hashmap_entry *"
b94e5c1df6 hashmap_add takes "struct hashmap_entry *"
f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *"
d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *"
d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry
12878c8351 coccicheck: detect hashmap_entry.hash assignment
e010a41216 diff: use hashmap_entry_init on moved_entry.ent
f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo"
de5abb5f7a git-p4: auto-delete named temporary file
c90b652afd Fifth batch
f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1'
b0f8aed48f Merge branch 'ma/user-manual-markup-update'
faf5576a8d Merge branch 'bc/doc-use-docbook-5'
314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes'
70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo'
847650798b Merge branch 'am/mailmap-andrey-mazo'
1a155f2e66 Merge branch 'jc/git-gui-has-maintainer'
1bcef51204 t/oid-info: add empty tree and empty blob values
ecde49bb8a t/oid-info: allow looking up hash algorithm name
11a3d3aadd git-rev-list.txt: prune options in synopsis
7d2f003ee4 Documentation: update the location of the git-gui repo
b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding()
46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines
b35304bf95 ci: really use shallow clones on Azure Pipelines
ab7d854aba tests: let --immediate and --write-junit-xml play well together
be5d88e112 test-tool run-command: learn to run (parts of) the testsuite
5d65ad17a9 vcxproj: include more generated files
030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built
61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable()
e4347c9434 msvc: handle DEVELOPER=1
ed712ef8d5 msvc: ignore some libraries when linking
5b8f9e2417 compat/win32/path-utils.h: add #include guards
41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning
c097b95a26 msvc: avoid using minus operator on unsigned types
dfd557c978 stash apply: report status correctly even in a worktree's subdirectory
d54dea77db fetch: let --jobs=<n> parallelize --multiple, too
87db61a436 trace2: write discard message to sentinel files
83e57b04e6 trace2: discard new traces if target directory has too many files
11c21f22de t4214: demonstrate octopus graph coloring failure
25eb905e14 t4214: explicitly list tags in log
63be8c8dd7 t4214: generate expect in their own test cases
a7a5590c6e t4214: use test_merge
94ba151300 test-lib: let test_merge() perform octopus merges
22541013d0 docs: clarify trace2 version invariants
3d4548e7e2 docs: mention trace2 target-dir mode in git-config
2fe44394c8 treewide: remove duplicate #include directives
dbcd970c27 push: do not pretend to return `int` from `die_push_simple()`
941790d7de fast-export: handle nested tags
8d7d33c1ce t9350: add tests for tags of things other than a commit
a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags
208d69246e fast-export: add support for --import-marks-if-exists
b8f50e5b60 fast-import: add support for new 'alias' command
f73b2aba05 fast-import: allow tags to be identified by mark labels
3164e6bd24 fast-import: fix handling of deleted tags
8085050ab4 add -i: show progress counter in the prompt
69fdb922ad Merge branch 'bw/diff3-conflict-style'
b436825b9b git-gui: support for diff3 conflict style
937b76ed49 range-diff: internally force `diff.noprefix=true`
411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job
25e4b8099c push: add trace2 instrumentation
5fc31180d8 fetch: add trace2 instrumentation
53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value
c3b57dc2a0 git-gui: use existing interface to query a path's attribute
45ab460d4a Merge branch 'js/git-bash-if-available'
0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command
71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only)
54a80a9ad8 wrapper: use a loop instead of repetitive statements
baed6bbb5b diffcore-break: use a goto instead of a redundant if statement
8da02ce62a commit-graph: remove a duplicate assignment
ddb3c856f3 shallow.c: don't free unallocated slabs
8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits
65904b8b2b promisor-remote: skip move_to_tail when no-op
2049b8dc65 diffcore_rename(): use a stable sort
97fff61012 Move git_sort(), a stable sort, into into libgit.a
69f272b922 dir: special case check for the possibility that pathspec is NULL
6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available
bc12974a89 Fourth batch
5a5350940b Merge branch 'ds/commit-graph-on-fetch'
974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch'
9755f70fe6 Merge branch 'ds/include-exclude'
93fc8760e7 Merge branch 'jh/trace2-pretty-output'
640f9cd599 Merge branch 'dl/rebase-i-keep-base'
026428c35e Merge branch 'sg/clean-nested-repo-with-ignored'
21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip'
d693345518 Merge branch 'dl/use-sq-from-test-lib'
d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes'
2be6ccc01a Merge branch 'sg/git-test-boolean'
cf861cd7a0 Merge branch 'rs/get-tagged-oid'
91243b019d Merge branch 'en/filter-branch-deprecation'
9bc67b6658 Merge branch 'en/merge-options-ff-and-friends'
fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden'
cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option'
8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return'
3ff6af7753 Merge branch 'nd/switch-and-restore'
aadac067aa Merge branch 'tb/file-url-to-unc-path'
b57a88a5f1 Merge branch 'js/gitdir-at-unc-root'
6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path'
430439536b Merge branch 'rs/parse-tree-indirect'
991fd97b9a Merge branch 'jk/fast-import-history-bugfix'
74a39b9bcc Merge branch 'mh/notes-duplicate-entries'
37801f0665 Merge branch 'tb/banned-vsprintf-namefix'
21ce0b48f3 Merge branch 'mh/release-commit-memory-fix'
f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup'
bf6136cab8 Merge branch 'rs/strbuf-detach'
a2e22bb3ad Merge branch 'rs/trace2-dst-warning'
1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup'
0281733483 Merge branch 'bc/hash-independent-tests-part-5'
f06fb376ed Merge branch 'jc/test-cleanup'
00bb74453d Merge branch 'dl/compat-cleanup'
59438be06c Merge branch 'js/visual-studio'
cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone'
af2abd870b fast-export: fix exporting a tag and nothing else
c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor
dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit
fd5b820d9c user-manual.txt: change header notation
e79b34533a user-manual.txt: add missing section label
b503a2d515 Makefile: emulate compile in $(HCO) target better
af26e2a9d2 pack-bitmap.h: remove magic number
b06fdead04 promisor-remote.h: include missing header
97b989ee3a apply.h: include missing header
4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name
d928a8388a t0028: add more tests
0b63fd6965 t0028: fix test for UTF-16-LE-BOM
fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration
2e09c01232 name-rev: avoid cutoff timestamp underflow
8464f94aeb promisor-remote.h: drop extern from function declaration
75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp
24c681794f doc: MyFirstContribution: fix cmd placement instructions
c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode
60c60b627e Merge branch 'py/git-git-extra-stuff'
faf420e05a treewide: correct several "up-to-date" to "up to date"
b71c6c3b64 Fix build with core.autocrlf=true
16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff
26e3d1cbea .mailmap: update email address of Andrey Mazo
27ea41c0b4 t/helper: ignore only executable files
7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()
83e3ad3b12 merge-recursive: symlink's descendants not in way
34933d0eff stash: make sure to write refreshed cache
e080b34540 merge: use refresh_and_write_cache
22184497a3 factor out refresh_and_write_cache function
7371612255 commit-graph: add --[no-]progress to write and verify
47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW
253bfe49bd SubmittingPatches: git-gui has a new maintainer
d17ae00c97 hg-to-git: make it compatible with both python3 and python2
4c86140027 Third batch
f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http'
627b826834 Merge branch 'md/list-objects-filter-combo'
b9ac6c59b8 Merge branch 'cc/multi-promisor'
de67293e74 Merge branch 'sg/line-log-tree-diff-optim'
95486229e3 Merge branch 'sg/complete-configuration-variables'
f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook'
a2e524ecf3 Merge branch 'cb/curl-use-xmalloc'
128666753b Merge branch 'jk/drop-release-pack-memory'
917a319ea5 Merge branch 'js/rebase-r-strategy'
7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui
4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout()
0d4304c124 doc: fix reference to --ignore-submodules
af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py
8a3a6817e2 Merge gitk to pick up emergency build fix
2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po
9027af58e2 Makefile: run coccicheck on more source files
43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES)
5dedf7de53 Makefile: define THIRD_PARTY_SOURCES
902b90cf42 clean: fix theoretical path corruption
ca8b5390db clean: rewrap overly long line
09487f2cba clean: avoid removing untracked files in a nested git repository
e86bbcf987 clean: disambiguate the definition of -d
3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run
29b577b960 dir: add commentary explaining match_pathspec_item's return value
89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it
a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case
404ebceda0 dir: also check directories for matching pathspecs
a5e916c745 dir: fix off-by-one error in match_pathspec_item
bbbb6b0b89 dir: fix typo in comment
7541cc5302 t7300: add testcases showing failure to clean specified pathspecs
0eb7c37a8a diff, log doc: small grammer, format, and language fixes
6fae6bd518 diff, log doc: say "patch text" instead of "patches"
2bb74b53a4 Test the progress display
bbf47568ad Revert "progress: use term_clear_line()"
cf6a2d2557 Makefile: strip leading ./ in $(LIB_H)
b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup
689a146c91 commit-graph: use commit_list_count()
59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N"
a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N"
a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base"
cf34337f98 list-objects-filter: give a more specific error sparse parsing error
4c96a77594 list-objects-filter: delay parsing of sparse oid
72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter
83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer
7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>`
226daba280 Doc/Makefile: give mansource/-version/-manual attributes
40e747e89d git-submodule.txt: fix AsciiDoc formatting error
f6461b82b9 Documentation: fix build with Asciidoctor 2
3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
f7a8834ba4 Merge branch 'bp/amend-toggle-bind'
ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit"
9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes
d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog
beffae768a gitk: Add Chinese (zh_CN) translation
56d9cbe68b packfile: expose get_delta_base()
bab28d9f97 builtin/pack-objects: report reused packfile objects
6c8ec8c30a Merge branch 'bw/commit-scrollbuffer'
acfa495519 Merge branch 'bw/amend-checkbutton'
da08d559b7 git-gui: add horizontal scrollbar to commit buffer
ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton
aeeb978ba6 completion: teach archive to use __gitcomp_builtin
2b9bd488ae completion: teach rebase to use __gitcomp_builtin
d49dffde9a completion: add missing completions for log, diff, show
6abada1880 upload-pack: disable commit graph more gently for shallow traversal
fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time
72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set
4fd39c76e6 doc: minor formatting fix
29f4332e66 Quit passing 'now' to date code
c77abf0460 Merge branch 'py/revert-hunks-lines'
5a2bb62180 Merge branch 'bp/widget-focus-hotkeys'
e07446ed5f git-gui: add hotkeys to set widget focus
f981ec18cf cache-tree: do not lazy-fetch tentative tree
f1d4a28250 Second batch
c8ada15456 Merge branch 'bc/reread-attributes-during-rebase'
8f3ba423e7 Merge branch 'tg/t0021-racefix'
a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email'
d49c2c3466 Merge branch 'sb/userdiff-dts'
2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe'
4c49dd042d Merge branch 'nd/diff-parseopt'
d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix'
8ce8a63b46 Merge branch 'ds/midx-expire-repack'
9437394661 Merge branch 'cb/fetch-set-upstream'
af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix'
fa9e7934c7 Merge branch 'bm/repository-layout-typofix'
d1a251a1fa Merge branch 'en/checkout-mismerge-fix'
e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental'
f4f8dfe127 Merge branch 'ds/feature-macros'
4a12f89865 Merge branch 'jk/eoo'
b4a1eec332 Merge branch 'jk/repo-init-cleanup'
70336bd50a Merge branch 'py/git-gui-do-quit'
ad7c543e3b grep: skip UTF8 checks explicitly
0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration()
b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration
4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor
b7e1ba5649 git-merge-index.txt: wrap shell listing in "----"
38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----"
5371813768 git-ls-remote.txt: wrap shell listing in "----"
1925fe0c8a Documentation: wrap config listings in "----"
922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor
2017956a19 Documentation: wrap blocks with "--"
dd2e50a84e commit-graph: turn off save_commit_buffer
67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits
806278dead commit-graph.c: handle corrupt/missing trees
16749b8dd2 commit-graph.c: handle commit parsing errors
23424ea759 t/t5318: introduce failing 'git commit-graph write' tests
bf1e28e0ad builtin/rebase.c: Remove pointless message
d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing
bd482d6e33 t: use common $SQ variable
3a37876b5d pack-objects: drop packlist index_pos optimization
7e6b96c73b test-read-cache: drop namelen variable
e4b369069e diff-delta: set size out-parameter to 0 for NULL delta
7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint
f1cbd033e2 pack-objects: use object_id in packlist_alloc()
0dfed92dfd git-am: handle missing "author" when parsing commit
3960290675 ci: restore running httpd tests
6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests
c77722b3ea use get_tagged_oid()
dad3f0607b tag: factor out get_tagged_oid()
468ce99b77 unpack-trees: rename 'is_excluded_from_list()'
65edd96aec treewide: rename 'exclude' methods to 'pattern'
4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_'
caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list'
ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern'
483e861111 t9902: use a non-deprecated command for testing
9df53c5de6 Recommend git-filter-repo instead of git-filter-branch
7b6ad97939 t6006: simplify, fix, and optimize empty message test
50094ca45f config/format.txt: specify default value of format.coverLetter
c1a6f21cd4 Doc: add more detail for git-format-patch
854b5cb46a t4014: stop losing return codes of git commands
dd2b6b6860 t4014: remove confusing pipe in check_threading()
6bd26f58ea t4014: use test_line_count() where possible
c6ec6dadba t4014: let sed open its own files
f2e2fa8f60 t4014: drop redirections to /dev/null
460609cbd5 t4014: use indentable here-docs
92014b69bb t4014: remove spaces after redirect operators
0ab74e979c t4014: use sq for test case names
cb46c40662 t4014: move closing sq onto its own line
b562a54c01 t4014: s/expected/expect/
e770fbfeff t3005: remove unused variable
da280f5f1a t: use LF variable defined in the test harness
7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch
552fc5016f mingw: apply array.cocci rule
476998d05b t3427: accelerate this test by using fast-export and fast-import
aac6ff7b5b .gitignore: stop ignoring `.manifest` files
2c65d90f75 am: reload .gitattributes after patching it
1577dc0f7c tree: simplify parse_tree_indirect()
50f26bd035 fetch: add fetch.writeCommitGraph config setting
8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set
27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options
0a8bc7068f clarify documentation for remote helpers
80e3658647 help: make help_unknown_ref() NORETURN
313677627a checkout: add simple check for 'git checkout -b'
3441de5b9c gitk: Make web links clickable
a4fa2f0a4c git-gui: allow undoing last revert
414d924beb rebase: teach rebase --keep-base
6330209d7d rebase tests: test linear branch topology
4effc5bc96 rebase: fast-forward --fork-point in more cases
c0efb4c1dd rebase: fast-forward --onto in more cases
2b318aa6c3 rebase: refactor can_fast_forward into goto tower
c9efc21683 t3432: test for --no-ff's interaction with fast-forward
1ebec8dfc1 fast-import: duplicate into history rather than passing ownership
9756082b3c fast-import: duplicate parsed encoding string
86ae43da6a status: mention --skip for revert and cherry-pick
b1b16bba96 completion: add --skip for cherry-pick and revert
deaa65a754 completion: merge options for cherry-pick and revert
4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
793ac7e309 t3432: test rebase fast-forward behavior
359ecebc34 t3431: add rebase --fork-point tests
502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage
ff61681b46 grep: refactor and simplify PCRE1 support
8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1
1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning()
fd99c2dd9b grep: use return value of strbuf_detach()
82f51af345 log-tree: always use return value of strbuf_detach()
7e92756751 http: don't leak urlmatch_config.vars
9784f97321 commit: free the right buffer in release_commit_memory
ce17feb1b3 path: add a function to check for path suffix
60d198d022 banned.h: fix vsprintf()'s ban message
60fe477a0b notes: avoid potential use-after-free during insertion
779ad6641b notes: avoid leaking duplicate entries
4e1a641ee3 mingw: fix launching of externals from Unicode paths
5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly
e2683d51d9 Fix .git/ discovery at the root of UNC shares
d17f2124a7 setup_git_directory(): handle UNC paths correctly
ebb8d2c90f mingw: support UNC in git clone file://server/share/repo
0c37c41d13 t4009: make hash size independent
c1f3dfcc23 t4002: make hash independent
8cc5ff83c3 t4000: make hash size independent
c784815073 t3903: abstract away SHA-1-specific constants
2ccdfb1c78 git-gui: return early when patch fails to apply
62bd99934b git-gui: allow reverting selected hunk
5f0a516de9 git-gui: allow reverting selected lines
fddf2ebe38 transport: teach all vtables to allow fetch first
ac3fda82bf transport-helper: skip ls-refs if unnecessary
745f681289 First batch after Git 2.23
d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg'
22e86e85cb Merge branch 'en/fast-import-merge-doc'
9c7573581c Merge branch 'jk/perf-no-dups'
4336fdb2ef Merge branch 'rs/nedalloc-fixlets'
8ae7a46c4d Merge branch 'sg/show-failed-test-names'
6ba06b582b Merge branch 'sg/commit-graph-validate'
072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix'
207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix'
77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests'
1b01cdbf2e Merge branch 'jk/tree-walk-overflow'
8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix'
307179732d Merge branch 'mt/grep-submodules-working-tree'
58166c2e9d t0021: make sure clean filter runs
8b3f33ef11 ref-filter: initialize empty name or email fields
3c81760bc6 userdiff: add a builtin pattern for dts files
fe49814409 t4014: drop unnecessary blank lines from test cases
a2bb801f6a line-log: avoid unnecessary full tree diffs
eef5204190 line-log: extract pathspec parsing from line ranges into a helper function
a63694f523 diff: skip GITLINK when lazy fetching missing objs
7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe
19800bdc3f parseopt: move definition of enum parse_opt_result up
415b770b88 packfile.h: drop extern from function declaration
acb49d1cc8 t3800: make hash-size independent
ca6ba94200 t3600: make hash size independent
19ce5496c2 t3506: make hash independent
9a6738c061 t3430: avoid hard-coded object IDs
4dd1b5f90f t3404: abstract away SHA-1-specific constants
b99bfc7a6c t3306: abstract away SHA-1-specific constants
e3e9d02e35 t3305: make hash size independent
b408cf8cf6 t3301: abstract away SHA-1-specific constants
b561edd213 t3206: abstract away hash size constants
a5f61c7d13 t3201: abstract away SHA-1-specific constants
1c24a54ea4 repository-layout.txt: correct pluralization of 'object'
b0a3186140 sequencer: simplify root commit creation
a47ba3c777 rebase -i: check for updated todo after squash and reword
450efe2d53 rebase -i: always update HEAD before rewording
c581e4a749 grep: under --debug, show whether PCRE JIT is enabled
aaa95dfa05 midx: switch to using the_hash_algo
be8e172e9f builtin/show-index: replace sha1_to_hex
3f34d70d40 rerere: replace sha1_to_hex
fc06be3b7f builtin/receive-pack: replace sha1_to_hex
69fa337060 builtin/index-pack: replace sha1_to_hex
3a4d7aa5ae packfile: replace sha1_to_hex
e0cb7cdb89 wt-status: convert struct wt_status to object_id
8d4d86b0f0 cache: remove null_sha1
f6ca67d673 builtin/worktree: switch null_sha1 to null_oid
dd336a5511 builtin/repack: write object IDs of the proper length
894c0f66bb pack-write: use hash_to_hex when writing checksums
4439c7a360 sequencer: convert to use the_hash_algo
95518faac1 bisect: switch to using the_hash_algo
e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo
fe9fec45f6 config: use the_hash_algo in abbrev comparison
976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
703d2d4193 bundle: switch to use the_hash_algo
9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo
7962e046ff show-index: switch hard-coded constants to the_hash_algo
fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ
7e0d029f18 builtin/rev-parse: switch to use the_hash_algo
319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo
fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo
f6af19a9ad fetch-pack: use parse_oid_hex
36261e42ec patch-id: convert to use the_hash_algo
28ba1830d0 builtin/replace: make hash size independent
24bc1a1292 pull, fetch: add --set-upstream option
71d41ff651 archive-tar: turn length miscalculation warning into BUG
17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header()
82a46af13e archive-tar: fix pax extended header length calculation
4060c1990a archive-tar: report wrong pax extended header length
4615a8cb5b merge-recursive: alphabetize include list
45ef16f77a merge-recursive: add sanity checks for relevant merge_options
f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
5bf7e5779e merge-recursive: split internal fields into a separate struct
e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output
a779fb829b merge-recursive: comment and reorder the merge_options fields
8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options
7c0a6c8e47 merge-recursive: move some definitions around to clean up the header
c749ab1da8 merge-recursive: rename merge_options argument to opt in header
bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity
ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list
4d7101e25c merge-recursive: fix some overly long lines
724dd767b2 cache-tree: share code between functions writing an index as a tree
345480d1ed merge-recursive: don't force external callers to do our logging
b4db8a2b76 merge-recursive: remove useless parameter in merge_trees()
98a1d3d888 merge-recursive: exit early if index != head
9822175d2b Ensure index matches head before invoking merge machinery, round N
10f751c06b merge-recursive: remove another implicit dependency on the_repository
f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks
8e01251694 merge-recursive: introduce an enum for detect_directory_renames values
743474cbfa merge-recursive: provide a better label for diff3 common ancestor
51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u)
5bace62582 l10n: Update Catalan translation
139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()
65c01c6442 checkout: provide better conflict hunk description with detached HEAD
d8523ca1b9 merge-recursive: be consistent with assert
acb7da05ac checkout: remove duplicate code
93b980e58f http: use xmalloc with cURL
64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental
aaf633c2ad repo-settings: create feature.experimental setting
c6cc4c5afd repo-settings: create feature.manyFiles setting
ad0fb65999 repo-settings: parse core.untrackedCache
31b1de6a09 commit-graph: turn on commit-graph by default
b068d9a250 t6501: use 'git gc' in quiet mode
7211b9e753 repo-settings: consolidate some config settings
507e5470a0 worktree remove: clarify error message on dirty worktree
5af9d5f6c8 completion: complete config variables and values for 'git clone --config='
88cd790d6a completion: complete config variables names and values for 'git clone -c'
dd33472831 completion: complete values of configuration variables after 'git -c var='
e1e00089da completion: complete configuration sections and variable names for 'git -c'
42d0efec59 completion: split _git_config()
d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp()
2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names
d9438873c4 completion: deduplicate configuration sections
7a09a8f093 completion: add tests for 'git config' completion
840d7e5b3c completion: complete more values of more 'color.*' configuration variables
08a12175d8 completion: fix a typo in a comment
9827d4c185 packfile: drop release_pack_memory()
d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed
362f8b280c t/perf: rename duplicate-numbered test script
742ed63345 trace2: cleanup whitespace in perf format
e34430556c trace2: cleanup whitespace in normal format
c2b890aca5 quote: add sq_append_quote_argv_pretty()
ad43e37839 trace2: trim trailing whitespace in normal format error message
04f10d332f trace2: remove dead code in maybe_add_string_va()
da4589ce7e trace2: trim whitespace in region messages in perf target format
0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit
5440eb0ea2 git-gui: call do_quit before destroying the main window
bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook
6098817fd7 git-merge: honor pre-merge-commit hook
a1f3dd7eb3 merge: do no-verify like commit
f78f6c7e0c t7503: verify proper hook execution
70597e8386 nedmalloc: avoid compiler warning about unused value
c9b9c09dae nedmalloc: do assignments only after the declaration section
22932d9169 config: stop checking whether the_repository is NULL
5732f2b1ef common-main: delay trace2 initialization
58ebccb478 t1309: use short branch name in includeIf.onbranch test
67feca3b1c gitcli: document --end-of-options
51b4594b40 parse-options: allow --end-of-options as a synonym for "--"
19e8789b23 revision: allow --end-of-options to end option parsing
ffe1afe67c tests: show the test name and number at the start of verbose output
96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests
7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits'
39d8831856 commit-graph: turn a group of write-related macro flags into an enum
9916073be5 t5318-commit-graph: use 'test_expect_code'
620c09e1b6 restore: add test for deleted ita files
ecd72042de checkout.c: unstage empty deleted ita files
a613d4f817 pack-refs: always refresh after taking the lock file
decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd'
371df1bea9 trace2: cleanup column alignment in perf target format
5aa02f9868 tree-walk: harden make_traverse_path() length computations
c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path()
b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len()
37806080d7 tree-walk: use size_t consistently
7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh'
12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh'
9055384710 tree-walk: drop oid from traverse_info
947208b725 setup_traverse_info(): stop copying oid
e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
a63f990d92 t3418: test `rebase -r` with merge strategies
5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges`
e145d99347 rebase -r: support merge strategies other than `recursive`
4e6023b13a t3427: fix another incorrect assumption
f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced
a9c71073da t3427: fix erroneous assumption
b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three
d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case
c248d32cdb t3427: simplify the `setup` test case significantly
8c1e24048a t3427: add a clarifying comment
5efed0ecf9 rebase: fold git-rebase--common into the -p backend
68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone
2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive`
6180b20239 t3400: stop referring to the scripted rebase
d5b581f228 Drop unused git-rebase--am.sh
814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation
6a289d45c0 grep: fix worktree case in submodules
870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching
8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data
09872f6418 grep: create a "is_fixed" member in "grep_pat"
8a35b540a9 grep: consistently use "p->fixed" in compile_regexp()
685668faaa grep: stop using a custom JIT stack with PCRE v1
34489239d0 grep: stop "using" a custom JIT stack with PCRE v2
04bef50c01 grep: remove overly paranoid BUG(...) code
b65abcafc7 grep: use PCRE v2 for optimized fixed-string search
48de2a768c grep: remove the kwset optimization
45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern>
25754125ce grep: make the behavior for NUL-byte in patterns sane
d316af059d grep tests: move binary pattern tests into their own file
471dac5d2c grep tests: move "grep binary" alongside the rest
f463beb805 grep: inline the return value of a function call used only once
b14cf112e2 t4210: skip more command-line encoding tests on MinGW
44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
4e2443b181 log tests: test regex backends in "--encode=<enc>" tests
90d21f9ebf list-objects-filter-options: make parser void
5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW
489fc9ee71 list-objects-filter-options: allow mult. --filter
c2694952e3 strbuf: give URL-encoding API a char predicate fn
cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list
f56f764279 list-objects-filter-options: move error check up
e987df5fe6 list-objects-filter: implement composite filters
842b00516a list-objects-filter-options: always supply *errbuf
7a7c7f4a6d list-objects-filter: put omits set in filter struct
9430147ca0 list-objects-filter: encapsulate filter components
4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c
60b7a92d84 Move repository_format_partial_clone to promisor-remote.c
db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
75de085211 remote: add promisor and partial clone config to the doc
7e154badc0 partial-clone: add multiple remotes in the doc
9a4c507886 t0410: test fetching from many promisor remotes
5e46139376 builtin/fetch: remove unique promisor remote limitation
fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter
b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote()
faf2abf496 promisor-remote: use repository_format_partial_clone
9cfebc1f3b promisor-remote: add promisor_remote_reinit()
9e27beaa23 promisor-remote: implement promisor_remote_get_direct()
48de315817 Add initial support for many promisor remotes
2e860675b6 fetch-object: make functions return an error code
c59c7c879e t0410: remove pipes after git commands
git-subtree-dir: third_party/git
git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
2020-05-22 18:46:45 +02:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:118 submodule.c:147
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Could not find section in .gitmodules where path=%s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:154
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Could not remove .gitmodules entry for %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:165
|
|
|
|
|
msgid "staging updated .gitmodules failed"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:327
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "in unpopulated submodule '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:358
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Pathspec '%s' is in submodule '%.*s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:434
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "bad --ignore-submodules argument: %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:816
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
2020-11-21 19:20:35 +01:00
|
|
|
"Submodule in commit %s at path: '%s' collides with a submodule named the "
|
|
|
|
|
"same. Skipping it."
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:919
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "submodule entry '%s' (%s) is a %s, not a commit"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:1004
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
2020-11-21 19:20:35 +01:00
|
|
|
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
|
|
|
|
|
"submodule %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:1127
|
2020-05-26 01:06:52 +02:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "process for submodule '%s' failed"
|
2020-05-26 01:06:52 +02:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469
|
|
|
|
|
msgid "Failed to resolve HEAD as a valid ref."
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:1167
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Pushing submodule '%s'\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:1170
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Unable to push submodule '%s'\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:1462
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Fetching submodule %s%s\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:1492
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Could not access submodule '%s'\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:1646
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Errors during submodule fetch:\n"
|
|
|
|
|
"%s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:1671
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "'%s' not recognized as a git repository"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:1688
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Could not run 'git status --porcelain=2' in submodule %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:1729
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "'git status --porcelain=2' failed in submodule %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:1804
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "could not start 'git status' in submodule '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:1817
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "could not run 'git status' in submodule '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:1832
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Could not unset core.worktree setting in submodule '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:1859 submodule.c:2169
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not recurse into submodule '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:1880
|
|
|
|
|
msgid "could not reset submodule index"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:1922
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "submodule '%s' has dirty index"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:1974
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Submodule '%s' could not be updated."
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:2042
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "submodule git dir '%s' is inside git dir '%.*s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:2063
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid ""
|
|
|
|
|
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:2075 submodule.c:2134
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "could not lookup name for submodule '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:2079
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "refusing to move '%s' into an existing git dir"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:2086
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Migrating git directory of '%s%s' from\n"
|
|
|
|
|
"'%s' to\n"
|
|
|
|
|
"'%s'\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:2214
|
|
|
|
|
msgid "could not start ls-files in .."
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: submodule.c:2254
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "ls-tree returned unexpected return code %d"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: trailer.c:236
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "running trailer command '%s' failed"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551
|
|
|
|
|
#: trailer.c:555
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown value '%s' for key '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "more than one %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: trailer.c:728
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "empty trailer token in trailer '%.*s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: trailer.c:748
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not read input file '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: trailer.c:751
|
|
|
|
|
msgid "could not read from stdin"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: trailer.c:1009 wrapper.c:676
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "could not stat %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: trailer.c:1011
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "file %s is not a regular file"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: trailer.c:1013
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "file %s is not writable by user"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: trailer.c:1025
|
|
|
|
|
msgid "could not open temporary file"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: trailer.c:1065
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not rename temporary file to %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:62 transport-helper.c:91
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "full write to remote helper failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:145
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to find remote helper for '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:161 transport-helper.c:575
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "can't dup helper output fd"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:214
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"unknown mandatory capability %s; this remote helper probably needs newer "
|
|
|
|
|
"version of Git"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:220
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "this remote helper should implement refspec capability"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:287 transport-helper.c:429
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s unexpectedly said: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:417
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s also locked %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:497
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "couldn't run fast-import"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:520
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "error while running fast-import"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:549 transport-helper.c:1226
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not read ref %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:594
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown response to connect: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:616
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "setting remote service path not supported by protocol"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:618
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "invalid remote service path"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:661 transport.c:1428
|
|
|
|
|
msgid "operation not supported by protocol"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: transport-helper.c:664
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "can't connect to subservice %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:745
|
|
|
|
|
msgid "'option' without a matching 'ok/error' directive"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: transport-helper.c:788
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "expected ok/error, helper said '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:841
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "helper reported unexpected status of %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:924
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "helper %s does not support dry-run"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:927
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "helper %s does not support --signed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:930
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "helper %s does not support --signed=if-asked"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:935
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "helper %s does not support --atomic"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: transport-helper.c:941
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "helper %s does not support 'push-option'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:1040
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "remote-helper doesn't support push; refspec needed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:1045
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "helper %s does not support 'force'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:1092
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "couldn't run fast-export"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:1097
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "error while running fast-export"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:1122
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"No refs in common and none specified; doing nothing.\n"
|
2020-11-21 19:20:35 +01:00
|
|
|
"Perhaps you should specify a branch.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: transport-helper.c:1203
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unsupported object format '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:1212
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "malformed response in ref list: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:1364
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "read(%s) failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:1391
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "write(%s) failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:1440
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s thread failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:1444
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s thread failed to join: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:1463 transport-helper.c:1467
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "can't start thread for copying data: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:1504
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s process failed to wait"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:1508
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s process failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport-helper.c:1526 transport-helper.c:1535
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "can't start thread for copying data"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: transport.c:116
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: transport.c:145
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not read bundle '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: transport.c:220
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "transport: invalid depth option '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: transport.c:269
|
|
|
|
|
msgid "see protocol.version in 'git help config' for more details"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: transport.c:270
|
|
|
|
|
msgid "server options require protocol version 2 or later"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: transport.c:712
|
|
|
|
|
msgid "could not parse transport.color.* config"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: transport.c:785
|
|
|
|
|
msgid "support for protocol v2 not implemented yet"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: transport.c:919
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown value for config '%s': %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: transport.c:985
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "transport '%s' not allowed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: transport.c:1038
|
|
|
|
|
msgid "git-over-rsync is no longer supported"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: transport.c:1140
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following submodule paths contain changes that can\n"
|
|
|
|
|
"not be found on any remote:\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: transport.c:1144
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Please try\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tgit push --recurse-submodules=on-demand\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"or cd to the path and use\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tgit push\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"to push them to a remote.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: transport.c:1152
|
|
|
|
|
msgid "Aborting."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: transport.c:1297
|
|
|
|
|
msgid "failed to push all needed submodules"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: tree-walk.c:32
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "too-short tree object"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: tree-walk.c:38
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "malformed mode in tree entry"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: tree-walk.c:42
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "empty filename in tree entry"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: tree-walk.c:117
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "too-short tree file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:113
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Your local changes to the following files would be overwritten by checkout:\n"
|
|
|
|
|
"%%sPlease commit your changes or stash them before you switch branches."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:115
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Your local changes to the following files would be overwritten by checkout:\n"
|
|
|
|
|
"%%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:118
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Your local changes to the following files would be overwritten by merge:\n"
|
|
|
|
|
"%%sPlease commit your changes or stash them before you merge."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:120
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Your local changes to the following files would be overwritten by merge:\n"
|
|
|
|
|
"%%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:123
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Your local changes to the following files would be overwritten by %s:\n"
|
|
|
|
|
"%%sPlease commit your changes or stash them before you %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:125
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Your local changes to the following files would be overwritten by %s:\n"
|
|
|
|
|
"%%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:130
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Updating the following directories would lose untracked files in them:\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:134
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be removed by checkout:\n"
|
|
|
|
|
"%%sPlease move or remove them before you switch branches."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:136
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be removed by checkout:\n"
|
|
|
|
|
"%%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:139
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be removed by merge:\n"
|
|
|
|
|
"%%sPlease move or remove them before you merge."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:141
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be removed by merge:\n"
|
|
|
|
|
"%%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:144
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be removed by %s:\n"
|
|
|
|
|
"%%sPlease move or remove them before you %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:146
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be removed by %s:\n"
|
|
|
|
|
"%%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:152
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be overwritten by "
|
|
|
|
|
"checkout:\n"
|
|
|
|
|
"%%sPlease move or remove them before you switch branches."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:154
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be overwritten by "
|
|
|
|
|
"checkout:\n"
|
|
|
|
|
"%%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:157
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be overwritten by merge:\n"
|
|
|
|
|
"%%sPlease move or remove them before you merge."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:159
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be overwritten by merge:\n"
|
|
|
|
|
"%%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:162
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be overwritten by %s:\n"
|
|
|
|
|
"%%sPlease move or remove them before you %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:164
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be overwritten by %s:\n"
|
|
|
|
|
"%%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:172
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:175
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
2020-11-21 19:20:35 +01:00
|
|
|
"Cannot update submodule:\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:178
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
2020-11-21 19:20:35 +01:00
|
|
|
"The following paths are not up to date and were left despite sparse "
|
|
|
|
|
"patterns:\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:180
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
2020-11-21 19:20:35 +01:00
|
|
|
"The following paths are unmerged and were left despite sparse patterns:\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:182
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
2020-11-21 19:20:35 +01:00
|
|
|
"The following paths were already present and thus not updated despite sparse "
|
|
|
|
|
"patterns:\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:262
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Aborting\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:289
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"After fixing the above paths, you may want to run `git sparse-checkout "
|
|
|
|
|
"reapply`.\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: unpack-trees.c:350
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Updating files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: unpack-trees.c:382
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"the following paths have collided (e.g. case-sensitive paths\n"
|
|
|
|
|
"on a case-insensitive filesystem) and only one from the same\n"
|
|
|
|
|
"colliding group is in the working tree:\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: unpack-trees.c:1498
|
|
|
|
|
msgid "Updating index flags"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: upload-pack.c:1516
|
|
|
|
|
msgid "expected flush after fetch arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-01-12 00:36:56 +01:00
|
|
|
#: urlmatch.c:163
|
|
|
|
|
msgid "invalid URL scheme name or missing '://' suffix"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid %XX escape sequence"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: urlmatch.c:215
|
|
|
|
|
msgid "missing host and scheme is not 'file:'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: urlmatch.c:232
|
|
|
|
|
msgid "a 'file:' URL may not have a port number"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: urlmatch.c:247
|
|
|
|
|
msgid "invalid characters in host name"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: urlmatch.c:292 urlmatch.c:303
|
|
|
|
|
msgid "invalid port number"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: urlmatch.c:371
|
|
|
|
|
msgid "invalid '..' path segment"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: walker.c:170
|
|
|
|
|
msgid "Fetching objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: worktree.c:236 builtin/am.c:2116
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to read '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: worktree.c:283
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' at main working tree is not the repository directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: worktree.c:294
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' file does not contain absolute path to the working tree location"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: worktree.c:306
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' does not exist"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: worktree.c:312
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a .git file, error code %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: worktree.c:321
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' does not point back to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: worktree.c:587
|
|
|
|
|
msgid "not a directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: worktree.c:596
|
|
|
|
|
msgid ".git is not a file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: worktree.c:598
|
|
|
|
|
msgid ".git file broken"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: worktree.c:600
|
|
|
|
|
msgid ".git file incorrect"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: worktree.c:670
|
|
|
|
|
msgid "not a valid path"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: worktree.c:676
|
|
|
|
|
msgid "unable to locate repository; .git is not a file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: worktree.c:679
|
|
|
|
|
msgid "unable to locate repository; .git file broken"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: worktree.c:685
|
|
|
|
|
msgid "gitdir unreadable"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: worktree.c:689
|
|
|
|
|
msgid "gitdir incorrect"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: wrapper.c:197 wrapper.c:367
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not open '%s' for reading and writing"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wrapper.c:398 wrapper.c:599
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to access '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wrapper.c:607
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to get current working directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: wt-status.c:158
|
|
|
|
|
msgid "Unmerged paths:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: wt-status.c:187 wt-status.c:219
|
|
|
|
|
msgid " (use \"git restore --staged <file>...\" to unstage)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: wt-status.c:190 wt-status.c:222
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: wt-status.c:193 wt-status.c:225
|
|
|
|
|
msgid " (use \"git rm --cached <file>...\" to unstage)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: wt-status.c:197
|
|
|
|
|
msgid " (use \"git add <file>...\" to mark resolution)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: wt-status.c:199 wt-status.c:203
|
|
|
|
|
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: wt-status.c:201
|
|
|
|
|
msgid " (use \"git rm <file>...\" to mark resolution)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:211 wt-status.c:1070
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Changes to be committed:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:234 wt-status.c:1079
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Changes not staged for commit:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: wt-status.c:238
|
|
|
|
|
msgid " (use \"git add <file>...\" to update what will be committed)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: wt-status.c:240
|
|
|
|
|
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: wt-status.c:241
|
|
|
|
|
msgid ""
|
|
|
|
|
" (use \"git restore <file>...\" to discard changes in working directory)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: wt-status.c:243
|
|
|
|
|
msgid " (commit or discard the untracked or modified content in submodules)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: wt-status.c:254
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid " (use \"git %s <file>...\" to include in what will be committed)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:266
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "both deleted:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:268
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "added by us:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:270
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "deleted by them:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:272
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "added by them:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:274
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "deleted by us:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:276
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "both added:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:278
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "both modified:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:288
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "new file:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:290
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "copied:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:292
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "deleted:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:294
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "modified:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:296
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "renamed:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:298
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "typechange:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:300
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unknown:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:302
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unmerged:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:382
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "new commits, "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:384
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "modified content, "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:386
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "untracked content, "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:903
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Your stash currently has %d entry"
|
|
|
|
|
msgid_plural "Your stash currently has %d entries"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:934
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Submodules changed but not updated:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:936
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Submodule changes to be committed:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1018
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Do not modify or remove the line above.\n"
|
|
|
|
|
"Everything below it will be ignored."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1110
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"It took %.2f seconds to compute the branch ahead/behind values.\n"
|
|
|
|
|
"You can use '--no-ahead-behind' to avoid this.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1140
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You have unmerged paths."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1143
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (fix conflicts and run \"git commit\")"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1145
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (use \"git merge --abort\" to abort the merge)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1149
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "All conflicts fixed but you are still merging."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1152
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (use \"git commit\" to conclude merge)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1161
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You are in the middle of an am session."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1164
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "The current patch is empty."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1168
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (fix conflicts and then run \"git am --continue\")"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1170
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (use \"git am --skip\" to skip this patch)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1172
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (use \"git am --abort\" to restore the original branch)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1305
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git-rebase-todo is missing."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1307
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No commands done."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1310
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Last command done (%d command done):"
|
|
|
|
|
msgid_plural "Last commands done (%d commands done):"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1321
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " (see more in file %s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1326
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No commands remaining."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1329
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Next command to do (%d remaining command):"
|
|
|
|
|
msgid_plural "Next commands to do (%d remaining commands):"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1337
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (use \"git rebase --edit-todo\" to view and edit)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1349
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "You are currently rebasing branch '%s' on '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1354
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You are currently rebasing."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1367
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (fix conflicts and then run \"git rebase --continue\")"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1369
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (use \"git rebase --skip\" to skip this patch)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1371
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (use \"git rebase --abort\" to check out the original branch)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1378
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (all conflicts fixed: run \"git rebase --continue\")"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1382
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1387
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You are currently splitting a commit during a rebase."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1390
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1394
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1399
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You are currently editing a commit during a rebase."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1402
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (use \"git commit --amend\" to amend the current commit)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1404
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
" (use \"git rebase --continue\" once you are satisfied with your changes)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1415
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Cherry-pick currently in progress."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1418
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "You are currently cherry-picking commit %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1425
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1428
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (run \"git cherry-pick --continue\" to continue)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1431
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1433
|
|
|
|
|
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: wt-status.c:1435
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1445
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Revert currently in progress."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1448
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "You are currently reverting commit %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1454
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (fix conflicts and run \"git revert --continue\")"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1457
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (run \"git revert --continue\" to continue)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1460
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (all conflicts fixed: run \"git revert --continue\")"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1462
|
|
|
|
|
msgid " (use \"git revert --skip\" to skip this patch)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: wt-status.c:1464
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (use \"git revert --abort\" to cancel the revert operation)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: wt-status.c:1474
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "You are currently bisecting, started from branch '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: wt-status.c:1478
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You are currently bisecting."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: wt-status.c:1481
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (use \"git bisect reset\" to get back to the original branch)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1492
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "You are in a sparse checkout with %d%% of tracked files present."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: wt-status.c:1731
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "On branch "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1738
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "interactive rebase in progress; onto "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1740
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "rebase in progress; onto "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1750
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Not currently on any branch."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1767
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Initial commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1768
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No commits yet"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1782
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Untracked files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1784
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Ignored files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1788
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
|
|
|
|
|
"may speed it up, but you have to be careful not to forget to add\n"
|
|
|
|
|
"new files yourself (see 'git help status')."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1794
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Untracked files not listed%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1796
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (use -u option to show untracked files)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1802
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No changes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1807
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1811
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no changes added to commit\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1815
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"nothing added to commit but untracked files present (use \"git add\" to "
|
|
|
|
|
"track)\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1819
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "nothing added to commit but untracked files present\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1823
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1827 wt-status.c:1833
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "nothing to commit\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1830
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "nothing to commit (use -u to show untracked files)\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1835
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "nothing to commit, working tree clean\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1940
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No commits yet on "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1944
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "HEAD (no branch)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1975
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "different"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1977 wt-status.c:1985
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "behind "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:1980 wt-status.c:1983
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ahead "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: the action is e.g. "pull with rebase"
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:2505
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot %s: You have unstaged changes."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:2511
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "additionally, your index contains uncommitted changes."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.c:2513
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot %s: Your index contains uncommitted changes."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: compat/precompose_utf8.c:58 builtin/clone.c:456
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to unlink '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/add.c:26
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git add [<options>] [--] <pathspec>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:88
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unexpected diff status %c"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:93 builtin/commit.c:285
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "updating files failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:103
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "remove '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:178
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Unstaged changes after refreshing the index:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:272 builtin/rev-parse.c:904
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Could not read the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:283
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not open '%s' for writing."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:287
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Could not write patch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:290
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "editing patch failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:293
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not stat '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:295
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Empty patch. Aborted."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:300
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not apply '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:308
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "The following paths are ignored by one of your .gitignore files:\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124
|
|
|
|
|
#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538
|
|
|
|
|
#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "dry run"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:331
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "interactive picking"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "select hunks interactively"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:333
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "edit current diff and apply"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:334
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "allow adding otherwise ignored files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:335
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "update tracked files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:336
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "renormalize EOL of tracked files (implies -u)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:337
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "record only the fact that the path will be added later"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:338
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add changes from all tracked and untracked files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:341
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ignore paths removed in the working tree (same as --no-all)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:343
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "don't add, only refresh the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:344
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "just skip files which cannot be added because of errors"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:345
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "check if - even missing - files are ignored in dry run"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:347 builtin/update-index.c:1004
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "override the executable bit of the listed files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:349
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "warn when adding an embedded repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:351
|
|
|
|
|
msgid "backend for `git stash -p`"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/add.c:369
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"You've added another git repository inside your current repository.\n"
|
|
|
|
|
"Clones of the outer repository will not contain the contents of\n"
|
|
|
|
|
"the embedded repository and will not know how to obtain it.\n"
|
|
|
|
|
"If you meant to add a submodule, use:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tgit submodule add <url> %s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"If you added this path by mistake, you can remove it from the\n"
|
|
|
|
|
"index with:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tgit rm --cached %s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"See \"git help submodule\" for more information."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:397
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "adding embedded git repository: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:416
|
|
|
|
|
msgid ""
|
|
|
|
|
"Use -f if you really want to add them.\n"
|
|
|
|
|
"Turn this message off by running\n"
|
|
|
|
|
"\"git config advice.addIgnoredFile false\""
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:425
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "adding files failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:453 builtin/commit.c:345
|
|
|
|
|
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/add.c:470
|
|
|
|
|
msgid "--pathspec-from-file is incompatible with --edit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/add.c:482
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "-A and -u are mutually incompatible"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:485
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Option --ignore-missing can only be used together with --dry-run"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:489
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "--chmod param '%s' must be either -x or +x"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351
|
|
|
|
|
#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503
|
|
|
|
|
msgid "--pathspec-from-file is incompatible with pathspec arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357
|
|
|
|
|
#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509
|
|
|
|
|
msgid "--pathspec-file-nul requires --pathspec-from-file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/add.c:518
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Nothing specified, nothing added.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/add.c:520
|
|
|
|
|
msgid ""
|
|
|
|
|
"Maybe you wanted to say 'git add .'?\n"
|
|
|
|
|
"Turn this message off by running\n"
|
|
|
|
|
"\"git config advice.addEmptyPathspec false\""
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/am.c:160
|
2020-05-26 01:06:52 +02:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "invalid committer: %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:366
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not parse author script"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:450
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' was deleted by the applypatch-msg hook"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:492
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Malformed input line: '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:530
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to copy notes from '%s' to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:556
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "fseek failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:744
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not parse patch '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:809
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Only one StGIT patch series can be applied at once"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:857
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "invalid timestamp"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:862 builtin/am.c:874
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "invalid Date line"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:869
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "invalid timezone offset"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:962
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Patch format detection failed."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:967 builtin/clone.c:409
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to create directory '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:972
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Failed to split patches."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1103
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "When you have resolved this problem, run \"%s --continue\"."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1104
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1105
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1188
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1216
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Patch is empty."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1281
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "missing author line in commit %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1284
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "invalid ident line: %.*s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1503
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1505
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Using index info to reconstruct a base tree..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1524
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Did you hand edit your patch?\n"
|
|
|
|
|
"It does not apply to blobs recorded in its index."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1530
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Falling back to patching base and 3-way merge..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1556
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Failed to merge in the changes."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1588
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "applying to an empty history"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1639 builtin/am.c:1643
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot resume: %s does not exist."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1661
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Commit Body is:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
|
|
|
|
|
#. in your translation. The program will only accept English
|
|
|
|
|
#. input at this point.
|
|
|
|
|
#.
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1671
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1717 builtin/commit.c:395
|
|
|
|
|
msgid "unable to write index file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/am.c:1721
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Dirty index: cannot apply patches (dirty: %s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1761 builtin/am.c:1829
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Applying: %.*s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1778
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No changes -- Patch already applied."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1784
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Patch failed at %s %.*s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1788
|
|
|
|
|
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1832
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"No changes - did you forget to use 'git add'?\n"
|
|
|
|
|
"If there is nothing left to stage, chances are that something else\n"
|
|
|
|
|
"already introduced the same changes; you might want to skip this patch."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1839
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"You still have unmerged paths in your index.\n"
|
|
|
|
|
"You should 'git add' each file with resolved conflicts to mark them as "
|
|
|
|
|
"such.\n"
|
|
|
|
|
"You might run `git rm` on a file to accept \"deleted by them\" for it."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347
|
|
|
|
|
#: builtin/reset.c:355
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not parse object '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:1998
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "failed to clean index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2042
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"You seem to have moved HEAD since the last 'am' failure.\n"
|
|
|
|
|
"Not rewinding to ORIG_HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2149
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid value for --patch-format: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2191
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid value for --show-current-patch: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/am.c:2195
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/am.c:2226
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2227
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git am [<options>] (--continue | --skip | --abort)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2233
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "run interactively"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2235
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "historical option -- no-op"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2237
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "allow fall back on 3way merging if needed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16
|
|
|
|
|
#: builtin/repack.c:309 builtin/stash.c:816
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "be quiet"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2240
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add a Signed-off-by line to the commit message"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2243
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "recode into utf8 (default)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2245
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pass -k flag to git-mailinfo"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2247
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pass -b flag to git-mailinfo"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2249
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pass -m flag to git-mailinfo"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2251
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2254
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2257
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "strip everything before a scissors line"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268
|
|
|
|
|
#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
|
|
|
|
|
#: builtin/am.c:2286
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pass it through git-apply"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
|
|
|
|
|
#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251
|
|
|
|
|
#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
|
|
|
|
|
#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324
|
|
|
|
|
#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172
|
|
|
|
|
#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175
|
|
|
|
|
#: parse-options.h:316
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135
|
|
|
|
|
#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438
|
|
|
|
|
#: builtin/verify-tag.c:38
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "format"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2283
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "format the patch(es) are in"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2289
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "override error message when patch failure occurs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2291
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "continue applying patches after resolving a conflict"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2294
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "synonyms for --continue"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2297
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "skip the current patch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2300
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "restore the original branch and abort the patching operation."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2303
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "abort the patching operation but keep HEAD where it is."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2307
|
|
|
|
|
msgid "show the patch being applied"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2312
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "lie about committer date"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2314
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use current timestamp for author date"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515
|
|
|
|
|
#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530
|
|
|
|
|
#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "key-id"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "GPG-sign commits"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2320
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "(internal use for git-rebase)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2338
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"The -b/--binary option has been a no-op for long time, and\n"
|
|
|
|
|
"it will be removed. Please do not use it anymore."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2345
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "failed to read the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2360
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "previous rebase directory %s still exists but mbox given."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2384
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Stray %s directory found.\n"
|
|
|
|
|
"Use \"git am --abort\" to remove it."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2390
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Resolve operation not in progress, we are not resuming."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/am.c:2400
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "interactive mode requires patches on the command line"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/apply.c:8
|
|
|
|
|
msgid "git apply [<options>] [<patch>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/archive.c:17
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not create archive file '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/archive.c:20
|
|
|
|
|
msgid "could not redirect output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/archive.c:37
|
|
|
|
|
msgid "git archive: Remote with no URL"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/archive.c:61
|
|
|
|
|
msgid "git archive: expected ACK/NAK, got a flush packet"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/archive.c:64
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git archive: NACK %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/archive.c:65
|
|
|
|
|
msgid "git archive: protocol error"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/archive.c:69
|
|
|
|
|
msgid "git archive: expected a flush"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:23
|
|
|
|
|
msgid "git bisect--helper --next-all"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:24
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git bisect--helper --write-terms <bad_term> <good_term>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:25
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git bisect--helper --bisect-clean-state"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:26
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git bisect--helper --bisect-reset [<commit>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:27
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
|
|
|
|
|
"<bad_term>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:28
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
|
|
|
|
|
"<bad_term>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:29
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:30
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
|
|
|
|
|
"term-new]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:31
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
2020-11-21 19:20:35 +01:00
|
|
|
"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
|
|
|
|
|
"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
|
|
|
|
|
"[<paths>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/bisect--helper.c:33
|
|
|
|
|
msgid "git bisect--helper --bisect-next"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/bisect--helper.c:34
|
|
|
|
|
msgid "git bisect--helper --bisect-auto-next"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/bisect--helper.c:35
|
|
|
|
|
msgid "git bisect--helper --bisect-autostart"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:97
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot open file '%s' in mode '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/bisect--helper.c:104
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not write to file '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/bisect--helper.c:143
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a valid term"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:147
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "can't use the builtin command '%s' as a term"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:157
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "can't change the meaning of the term '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:167
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "please use two different terms"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:207
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "We are not bisecting.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:215
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a valid commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:224
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:268
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Bad bisect_write argument: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:273
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "couldn't get the oid of the rev '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:285
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "couldn't open the file '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:311
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid command: you're currently in a %s/%s bisect"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:338
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"You need to give me at least one %s and %s revision.\n"
|
|
|
|
|
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:342
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"You need to start by \"git bisect start\".\n"
|
|
|
|
|
"You then need to give me at least one %s and %s revision.\n"
|
|
|
|
|
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:362
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bisecting only with a %s commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: Make sure to include [Y] and [n] in your
|
|
|
|
|
#. translation. The program will only accept English input
|
|
|
|
|
#. at this point.
|
|
|
|
|
#.
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:370
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Are you sure [Y/n]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:431
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no terms defined"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:434
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Your current terms are %s for the old state\n"
|
|
|
|
|
"and %s for the new state.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:444
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"invalid argument %s for 'git bisect terms'.\n"
|
|
|
|
|
"Supported options are: --term-good|--term-old and --term-bad|--term-new."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:511
|
|
|
|
|
msgid "revision walk setup failed\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/bisect--helper.c:533
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not open '%s' for appending"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664
|
|
|
|
|
msgid "'' is not a valid term"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/bisect--helper.c:674
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized option: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:678
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' does not appear to be a valid revision"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:709
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "bad HEAD - I need a HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:724
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:745
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "won't bisect on cg-seek'ed tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:748
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "bad HEAD - strange symbolic ref"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:775
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid ref: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:827
|
|
|
|
|
msgid "You need to start by \"git bisect start\"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: Make sure to include [Y] and [n] in your
|
|
|
|
|
#. translation. The program will only accept English input
|
|
|
|
|
#. at this point.
|
|
|
|
|
#.
|
|
|
|
|
#: builtin/bisect--helper.c:838
|
|
|
|
|
msgid "Do you want me to do it for you [Y/n]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/bisect--helper.c:866
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "perform 'git bisect next'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:868
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "write the terms to .git/BISECT_TERMS"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:870
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cleanup the bisection state"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:872
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "check for expected revs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:874
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "reset the bisection state"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:876
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "write out the bisection state in BISECT_LOG"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:878
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "check and set terms in a bisection state"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:880
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "check whether bad or good terms exist"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:882
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "print out the bisect terms"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:884
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "start the bisect session"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:886
|
|
|
|
|
msgid "find the next bisection commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/bisect--helper.c:888
|
|
|
|
|
msgid "verify the next bisection state then checkout the next bisection commit"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:890
|
|
|
|
|
msgid "start the bisection if it has not yet been started"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/bisect--helper.c:892
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no log for BISECT_WRITE"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:910
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--write-terms requires two arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:914
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--bisect-clean-state requires no arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:921
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--bisect-reset requires either no argument or a commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:925
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--bisect-write requires either 4 or 5 arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:931
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--check-and-set-terms requires 3 arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:937
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--bisect-next-check requires 2 or 3 arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:943
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--bisect-terms requires 0 or 1 argument"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bisect--helper.c:952
|
|
|
|
|
msgid "--bisect-next requires 0 arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/bisect--helper.c:958
|
|
|
|
|
msgid "--bisect-auto-next requires 0 arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/bisect--helper.c:964
|
|
|
|
|
msgid "--bisect-autostart does not accept arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/blame.c:32
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/blame.c:37
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<rev-opts> are documented in git-rev-list(1)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/blame.c:410
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "expecting a color: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/blame.c:417
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "must end with a color"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/blame.c:730
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid color '%s' in color.blame.repeatedLines"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/blame.c:748
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "invalid value for blame.coloring"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:845
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot find revision %s to ignore"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:867
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Show blame entries as we find them, incrementally"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:868
|
|
|
|
|
msgid "Do not show object names of boundary commits (Default: off)"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:869
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Do not treat root commits as boundaries (Default: off)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:870
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Show work cost statistics"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:871
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Force progress reporting"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:872
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Show output score for blame entries"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:873
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Show original filename (Default: auto)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:874
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Show original linenumber (Default: off)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:875
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Show in a format designed for machine consumption"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:876
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Show porcelain format with per-line commit information"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:877
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Use the same output mode as git-annotate (Default: off)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:878
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Show raw timestamp (Default: off)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:879
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Show long commit SHA1 (Default: off)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:880
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Suppress author name and timestamp (Default: off)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:881
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Show author email instead of name (Default: off)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:882
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Ignore whitespace differences"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:883 builtin/log.c:1808
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "rev"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:883
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Ignore <rev> when blaming"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:884
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Ignore revisions from <file>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:885
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "color redundant metadata from previous line differently"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:886
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "color lines by age"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:887
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Spend extra cycles to find better match"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:888
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Use revisions from <file> instead of calling git-rev-list"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:889
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Use <file>'s contents as the final image"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:890 builtin/blame.c:891
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "score"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:890
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Find line copies within and across files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:891
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Find line movements within and across files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:892
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "n,m"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:892
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Process only line range n,m, counting from 1"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:944
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--progress can't be used with --incremental or porcelain formats"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: This string is used to tell us the
|
|
|
|
|
#. maximum display width for a relative timestamp in
|
|
|
|
|
#. "git blame" output. For C locale, "4 years, 11
|
|
|
|
|
#. months ago", which takes 22 places, is the longest
|
|
|
|
|
#. among various forms of relative timestamps, but
|
|
|
|
|
#. your language may need more or fewer display
|
|
|
|
|
#. columns.
|
|
|
|
|
#.
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:995
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "4 years, 11 months ago"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:1110
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "file %s has only %lu line"
|
|
|
|
|
msgid_plural "file %s has only %lu lines"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/blame.c:1156
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Blaming lines"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:29
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:30
|
|
|
|
|
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:31
|
|
|
|
|
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:32
|
|
|
|
|
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:33
|
|
|
|
|
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:34
|
|
|
|
|
msgid "git branch [<options>] [-r | -a] [--points-at]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:35
|
|
|
|
|
msgid "git branch [<options>] [-r | -a] [--format]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:154
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"deleting branch '%s' that has been merged to\n"
|
|
|
|
|
" '%s', but not yet merged to HEAD."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:158
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"not deleting branch '%s' that is not yet merged to\n"
|
|
|
|
|
" '%s', even though it is merged to HEAD."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:172
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Couldn't look up commit object for '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:176
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The branch '%s' is not fully merged.\n"
|
|
|
|
|
"If you are sure you want to delete it, run 'git branch -D %s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:189
|
|
|
|
|
msgid "Update of config-file failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:220
|
|
|
|
|
msgid "cannot use -a with -d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:226
|
|
|
|
|
msgid "Couldn't look up commit object for HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:240
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot delete branch '%s' checked out at '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:255
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "remote-tracking branch '%s' not found."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:256
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "branch '%s' not found."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:271
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Error deleting remote-tracking branch '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:272
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Error deleting branch '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:279
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Deleted remote-tracking branch %s (was %s).\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:280
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Deleted branch %s (was %s).\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:429 builtin/tag.c:61
|
|
|
|
|
msgid "unable to parse format string"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:460
|
|
|
|
|
msgid "could not resolve HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:466
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "HEAD (%s) points outside of refs/heads/"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:481
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Branch %s is being rebased at %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:485
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Branch %s is being bisected at %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:502
|
|
|
|
|
msgid "cannot copy the current branch while not on any."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:504
|
|
|
|
|
msgid "cannot rename the current branch while not on any."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:515
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid branch name: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:542
|
|
|
|
|
msgid "Branch rename failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:544
|
|
|
|
|
msgid "Branch copy failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:548
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Created a copy of a misnamed branch '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:551
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Renamed a misnamed branch '%s' away"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:557
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Branch renamed to %s, but HEAD is not updated!"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:566
|
|
|
|
|
msgid "Branch is renamed, but update of config-file failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:568
|
|
|
|
|
msgid "Branch is copied, but update of config-file failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:584
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Please edit the description for the branch\n"
|
|
|
|
|
" %s\n"
|
|
|
|
|
"Lines starting with '%c' will be stripped.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:618
|
|
|
|
|
msgid "Generic options"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:620
|
|
|
|
|
msgid "show hash and subject, give twice for upstream branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:621
|
|
|
|
|
msgid "suppress informational messages"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:622
|
|
|
|
|
msgid "set up tracking mode (see git-pull(1))"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:624
|
|
|
|
|
msgid "do not use"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/branch.c:626 builtin/rebase.c:526
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "upstream"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:626
|
|
|
|
|
msgid "change the upstream info"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:627
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "unset the upstream info"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:628
|
|
|
|
|
msgid "use colored output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:629
|
|
|
|
|
msgid "act on remote-tracking branches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:631 builtin/branch.c:633
|
|
|
|
|
msgid "print only branches that contain the commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:632 builtin/branch.c:634
|
|
|
|
|
msgid "print only branches that don't contain the commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:637
|
|
|
|
|
msgid "Specific git-branch actions:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:638
|
|
|
|
|
msgid "list both remote-tracking and local branches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:640
|
|
|
|
|
msgid "delete fully merged branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:641
|
|
|
|
|
msgid "delete branch (even if not merged)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:642
|
|
|
|
|
msgid "move/rename a branch and its reflog"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:643
|
|
|
|
|
msgid "move/rename a branch, even if target exists"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:644
|
|
|
|
|
msgid "copy a branch and its reflog"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:645
|
|
|
|
|
msgid "copy a branch, even if target exists"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:646
|
|
|
|
|
msgid "list branch names"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:647
|
|
|
|
|
msgid "show current branch name"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:648
|
|
|
|
|
msgid "create the branch's reflog"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:650
|
|
|
|
|
msgid "edit the description for the branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/branch.c:651
|
|
|
|
|
msgid "force creation, move/rename, deletion"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:652
|
|
|
|
|
msgid "print only branches that are merged"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:653
|
|
|
|
|
msgid "print only branches that are not merged"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:654
|
|
|
|
|
msgid "list branches in columns"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415
|
|
|
|
|
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
|
|
|
|
|
#: builtin/tag.c:434
|
|
|
|
|
msgid "object"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:657
|
|
|
|
|
msgid "print only branches of the object"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441
|
|
|
|
|
msgid "sorting and filtering are case insensitive"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439
|
|
|
|
|
#: builtin/verify-tag.c:38
|
|
|
|
|
msgid "format to use for the output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:682 builtin/clone.c:789
|
|
|
|
|
msgid "HEAD not found below refs/heads!"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:706
|
|
|
|
|
msgid "--column and --verbose are incompatible"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784
|
|
|
|
|
msgid "branch name required"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:751
|
|
|
|
|
msgid "Cannot give description to detached HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:756
|
|
|
|
|
msgid "cannot edit description of more than one branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:763
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "No commit on branch '%s' yet."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:766
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "No branch named '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:781
|
|
|
|
|
msgid "too many branches for a copy operation"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:790
|
|
|
|
|
msgid "too many arguments for a rename operation"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:795
|
|
|
|
|
msgid "too many arguments to set new upstream"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:799
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"could not set upstream of HEAD to %s when it does not point to any branch."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:802 builtin/branch.c:825
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "no such branch '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:806
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "branch '%s' does not exist"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:819
|
|
|
|
|
msgid "too many arguments to unset upstream"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:823
|
|
|
|
|
msgid "could not unset upstream of HEAD when it does not point to any branch."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:829
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Branch '%s' has no upstream information"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:839
|
|
|
|
|
msgid ""
|
|
|
|
|
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
|
|
|
|
|
"Did you mean to use: -a|-r --list <pattern>?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:843
|
|
|
|
|
msgid ""
|
|
|
|
|
"the '--set-upstream' option is no longer supported. Please use '--track' or "
|
|
|
|
|
"'--set-upstream-to' instead."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/bugreport.c:15
|
|
|
|
|
msgid "git version:\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bugreport.c:21
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "uname() failed with error '%s' (%d)\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bugreport.c:31
|
|
|
|
|
msgid "compiler info: "
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bugreport.c:34
|
|
|
|
|
msgid "libc info: "
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bugreport.c:80
|
|
|
|
|
msgid "not run from a git repository - no hooks to show\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bugreport.c:90
|
|
|
|
|
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bugreport.c:97
|
|
|
|
|
msgid ""
|
|
|
|
|
"Thank you for filling out a Git bug report!\n"
|
|
|
|
|
"Please answer the following questions to help us understand your issue.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"What did you do before the bug happened? (Steps to reproduce your issue)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"What did you expect to happen? (Expected behavior)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"What happened instead? (Actual behavior)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"What's different between what you expected and what actually happened?\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Anything else you want to add:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Please review the rest of the bug report below.\n"
|
|
|
|
|
"You can delete any lines you don't wish to share.\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bugreport.c:134
|
|
|
|
|
msgid "specify a destination for the bugreport file"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bugreport.c:136
|
|
|
|
|
msgid "specify a strftime format suffix for the filename"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bugreport.c:158
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not create leading directories for '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bugreport.c:165
|
|
|
|
|
msgid "System Info"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bugreport.c:168
|
|
|
|
|
msgid "Enabled Hooks"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bugreport.c:175
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "couldn't create a new file at '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bugreport.c:178
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "unable to write to %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bugreport.c:188
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Created new report at '%s'.\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bundle.c:15 builtin/bundle.c:23
|
|
|
|
|
msgid "git bundle create [<options>] <file> <git-rev-list args>"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bundle.c:16 builtin/bundle.c:28
|
|
|
|
|
msgid "git bundle verify [<options>] <file>"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bundle.c:17 builtin/bundle.c:33
|
|
|
|
|
msgid "git bundle list-heads <file> [<refname>...]"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bundle.c:18 builtin/bundle.c:38
|
|
|
|
|
msgid "git bundle unbundle <file> [<refname>...]"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bundle.c:67 builtin/pack-objects.c:3480
|
|
|
|
|
msgid "do not show progress meter"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bundle.c:69 builtin/pack-objects.c:3482
|
|
|
|
|
msgid "show progress meter"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bundle.c:71 builtin/pack-objects.c:3484
|
|
|
|
|
msgid "show progress meter during object writing phase"
|
Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96
af6b65d45e Git 2.26.2
7397ca3373 Git 2.25.4
b86a4be245 Git 2.24.3
f2771efd07 Git 2.23.3
c9808fa014 Git 2.22.4
9206d27eb5 Git 2.21.3
041bc65923 Git 2.20.4
76b54ee9b9 Git 2.19.5
ba6f0905fd Git 2.18.4
df5be6dc3f Git 2.17.5
1a3609e402 fsck: reject URL with empty host in .gitmodules
e7fab62b73 credential: treat URL with empty scheme as invalid
c44088ecc4 credential: treat URL without scheme as invalid
fe29a9b7b0 credential: die() when parsing invalid urls
a2b26ffb1a fsck: convert gitmodules url to URL passed to curl
8ba8ed568e credential: refuse to operate when missing host or protocol
24036686c4 credential: parse URL without host as empty host, not unset
73aafe9bc2 t0300: use more realistic inputs
a88dbd2f8c t0300: make "quit" helper more realistic
de49261b05 Git 2.26.1
274b9cc253 Git 2.26
55a7568606 Merge branch 'en/rebase-backend'
c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git
1557364fb4 l10n: tr.po: change file mode to 644
2da1b05674 t3419: prevent failure when run with EXPENSIVE
1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0
5804c6ec40 l10n: de.po: add missing space
98cedd0233 Merge https://github.com/prati0100/git-gui
4914ba4bcf l10n: tr: Fix a couple of ambiguities
a5728022e0 Merge branch 'py/remove-tcloo'
7fcb965970 RelNotes/2.26.0: fix various typos
f0c03bcf95 l10n: Update Catalan translation
67b0a24910 Git 2.25.3
be8661a328 Sync with Git 2.25.2
0822e66b5d Git 2.25.2
65588b0b2e unicode: update the width tables to Unicode 13.0
7be274b0ff Merge branch 'js/ci-windows-update' into maint
9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint
221887a492 Merge branch 'jk/doc-credential-helper' into maint
32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint
fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint
618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint
50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint
fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint
41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint
2d7247af6f Merge branch 'am/mingw-poll-fix' into maint
4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint
76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint
569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint
16a4bf1035 Merge branch 'en/check-ignore' into maint
3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint
56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint
1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint
7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint
fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint
a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint
93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint
dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint
758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint
f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint
506223f9c5 Git 2.24.2
17a02783d8 Git 2.23.2
69fab82147 Git 2.22.3
fe22686494 Git 2.21.2
d1259ce117 Git 2.20.3
a5979d7009 Git 2.19.4
21a3e5016b Git 2.18.3
c42c0f1297 Git 2.17.4
d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u)
3891a84ccd git-gui: create a new namespace for chord script evaluation
8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5
440e7442d1 l10n: zh_CN: Revise v2.26.0 translation
2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2
6c85aac65f Git 2.26-rc2
74f172e39e Merge branch 'en/test-cleanup'
e96327c947 Merge branch 'es/outside-repo-errmsg-hints'
ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0
15fa8d9667 l10n: vi: fix translation + grammar
5c20398699 prefix_path: show gitdir if worktree unavailable
1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated)
c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated)
a4a2f64642 Merge branch 'js/askpass-coerce-utf8'
850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows
d769dcc5cd Merge branch 'py/blame-status-error'
70e24186c0 t6022, t6046: fix flaky files-are-updated checks
30e9940356 Hopefully the final batch before -rc2
b4f0038525 Merge branch 'en/rebase-backend'
25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master
07259e74ec fsck: detect gitmodules URLs with embedded newlines
c716fe4bd9 credential: detect unrepresentable values when parsing urls
17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr
9a6bbee800 credential: avoid writing values with newlines
17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2
1afe18a3bb l10n: es: 2.26.0 round#2
5ab9217a3c Merge branch of github.com:alshopov/git-po into master
c6713676d6 Merge branch of github.com:bitigchi/git-po into master
b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t)
2713dec02d l10n: tr: v2.26.0 round 2
c9ef57cc3a l10n: fr : v2.26.0 rnd 2
120b1eb731 git-rebase.txt: highlight backend differences with commit rewording
9a1b7474d6 sequencer: clear state upon dropping a become-empty commit
937d143630 i18n: unmark a message in rebase.c
a56d361f66 Merge branch 'ds/sparse-add'
5fa9169ced Merge branch 'dr/push-remote-ref-update'
cdef998b46 Merge branch 'jc/doc-single-h-is-for-help'
051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed)
52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master
9643441983 l10n: tr: Add glossary for Turkish translations
438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv
fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git
2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u)
dd2c269652 l10n: tr: Add Turkish translations
8f4f099f8b l10n: tr: Add Turkish translation team info
b4374e96c8 Git 2.26-rc1
4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch'
3658d77f8e Merge branch 'hd/show-one-mergetag-fix'
6125104b88 Merge branch 'rt/format-zero-length-fix'
1ac37deba2 Merge branch 'am/mingw-poll-fix'
cf372dc815 Merge branch 'en/test-cleanup'
d1075adfdf Merge branch 'en/merge-path-collision'
a4fd114ffc Merge branch 'kk/complete-diff-color-moved'
a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file'
0e0d717537 Merge branch 'pb/am-show-current-patch'
9b7f726dfc Merge branch 'am/pathspec-f-f-more'
4605a73073 t1091: don't grep for `strerror()` string
4d9c2902a1 l10n: fr v2.26.0 rnd1
ad182bee3f Merge branch of github.com:alshopov/git-po into master
23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1
98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t)
f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed)
76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po
076cbdcd73 Git 2.26-rc0
0d65f3fb1a t5537: adjust test_oid label
e63cefb024 Merge branch 'hi/gpg-use-check-signature'
5da7329e29 Merge branch 'rs/commit-graph-code-simplification'
0108fc1b46 Merge branch 'js/ci-windows-update'
f3ccd9f0d9 Merge branch 'be/describe-multiroot'
a6b4709302 Merge branch 'ag/rebase-remove-redundant-code'
b22db265d6 Merge branch 'es/recursive-single-branch-clone'
e8e71848ea Merge branch 'jk/nth-packed-object-id'
a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'
4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere'
49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix'
2cbb058669 Merge branch 'bc/wildcard-credential'
25063e2530 Merge branch 'mr/bisect-in-c-1'
f4d7dfce4d Merge branch 'ds/sparse-add'
4d864895a2 t2402: test worktree path when called in .git directory
af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch()
7655b4119d remote-curl: show progress for fetches over dumb HTTP
2f268890c2 The eighth batch for 2.26
aa5a7e02ad Merge branch 'ma/test-cleanup'
58595e713c Merge branch 'rs/blame-typefix-for-fingerprint'
ff41848e99 Merge branch 'rs/micro-cleanups'
4cbf1a0e22 Merge branch 'es/worktree-cleanup'
46703057c1 Merge branch 'ak/test-log-graph'
777815f5f9 Merge branch 'jk/run-command-formatfix'
444cff61b4 Merge branch 'ds/partial-clone-fixes'
48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure'
8c22bd9ff9 Merge branch 'en/rebase-backend'
cb2f5a8e97 Merge branch 'en/check-ignore'
0df82d99da Merge branch 'jk/object-filter-with-bitmap'
80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix'
29b09c518c Merge branch 'jk/doc-diff-parallel'
237a28173f show_one_mergetag: print non-parent in hex form.
5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context"
6d1210e133 l10n: Update Catalan translation
0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification"
7329d94be7 config.mak.dev: re-enable -Wformat-zero-length
7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings
94f4d01932 mingw: workaround for hangs when sending STDIN
1ff466c018 Documentation: clarify that `-h` alone stands for `help`
65bf820d0e t6020: new test with interleaved lexicographic ordering of directories
9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it
d5bb92eced t3035: prefer test_must_fail to bash negation for git commands
b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions
42d180dd01 t602[1236], t6034: modernize test formatting
802050400a merge-recursive: apply collision handling unification to recursive case
7f487ce062 Azure Pipeline: switch to the latest agent pools
5ed9fc3fc8 ci: prevent `perforce` from being quarantined
eafff6e41e t/lib-httpd: avoid using macOS' sed
d68ce906c7 commit-graph: use progress title directly
30b1c7ad9d describe: don't abort too early when searching tags
240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to'
2d2118b814 The seventh batch for 2.26
325eb66830 Merge branch 'es/doc-mentoring'
87f17d790d Merge branch 'es/bright-colors'
d0038f4b31 Merge branch 'bw/remote-rename-update-config'
132f600b06 clone: pass --single-branch during --recurse-submodules
47319576f1 submodule--helper: use C99 named initializer
ffe005576a lib-log-graph: consolidate colored graph cmp logic
989eea958b lib-log-graph: consolidate test_cmp_graph logic
bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching
bb4995fc3f worktree: add utility to find worktree by pathname
a80c4c2214 worktree: improve find_worktree() documentation
2fecc48cad packfile: drop nth_packed_object_sha1()
6ac9760a30 packed_object_info(): use object_id internally for delta base
b99b6bcc57 packed_object_info(): use object_id for returning delta base
63f4a7fc01 pack-check: push oid lookup into loop
e31c71083a pack-check: convert "internal error" die to a BUG()
500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps
f66d4e0250 pack-objects: use object_id struct in pack-reuse code
a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id
3f83fd5e44 pack-objects: read delta base oid into object_id struct
0763671b8e nth_packed_object_oid(): use customary integer return
02bbbe9df9 worktree: drop unused code from get_main_worktree()
27f182b3fc blame: provide type of fingerprints pointer
b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere
df126ca142 t3400: make test clean up after itself
3c29e21eb0 t: drop debug `cat` calls
cac439b56d t9810: drop debug `cat` call
91de82adc9 t4117: check for files using `test_path_is_file`
4ef346482d receive.denyCurrentBranch: respect all worktrees
f8692114db t5509: use a bare repository for test push target
45f274fbb1 get_main_worktree(): allow it to be called in the Git directory
fd0bc17557 completion: add diff --color-moved[-ws]
2ce6d075fa use strpbrk(3) to search for characters from a given set
2b3c430bce quote: use isalnum() to check for alphanumeric characters
a51d9e8f07 t1050: replace test -f with test_path_is_file
3e96c66805 partial-clone: avoid fetching when looking for objects
d0badf8797 partial-clone: demonstrate bugs in partial fetch
539052f42f run-command.h: fix mis-indented struct member
6c11c6a124 sparse-checkout: allow one-character directories in cone mode
aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch
f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch
e8ef1e8d6e am: convert "resume" variable to a struct
bc8620b440 parse-options: convert "command mode" to a flag
62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE()
46fd7b3900 credential: allow wildcard patterns when matching config
82eb249853 credential: use the last matching username in the config
588c70e10f t0300: add tests for some additional cases
732f934408 t1300: add test for urlmatch with multiple wildcards
3fa0e04667 mailmap: add an additional email address for brian m. carlson
8a98758a8d stash push: support the --pathspec-from-file option
8c3713cede stash: eliminate crude option parsing
3f3d8068f5 doc: stash: synchronize <pathspec> description
b22909144c doc: stash: document more options
0093abc286 doc: stash: split options from description (2)
2b7460d167 doc: stash: split options from description (1)
5f393dc3aa rm: support the --pathspec-from-file option
fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags
73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure
6c69f22233 bisect: libify `bisect_next_all`
9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents
45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents
cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents
e8e3ce6718 bisect: libify `bisect_checkout`
ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents
7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()`
680e8a01e5 bisect: add enum to represent bisect returning codes
bfacfce7d9 bisect--helper: introduce new `decide_next()` function
b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0
292731c4c2 bisect--helper: change `retval` to `res`
16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays
7ec8125fba check-ignore: fix documentation and implementation to match
2607d39da3 doc-diff: use single-colon rule in rendering Makefile
0aa6ce3094 doc/config/push: use longer "--" line for preformatted example
20a5fd881a rev-list --count: comment on the use of count_right++
63a58457e0 Merge branch 'py/missing-bracket'
51ebf55b93 The sixth batch for 2.26
f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints'
123538444f Merge branch 'jk/doc-credential-helper'
e154451a2f Merge branch 'js/mingw-open-in-gdb'
fc25a19265 Merge branch 'js/test-unc-fetch'
6365058605 Merge branch 'js/test-avoid-pipe'
966b69f02f Merge branch 'js/test-write-junit-xml-fix'
d880c3de23 Merge branch 'jk/mailinfo-cleanup'
5d55554b1d Merge branch 'mr/show-config-scope'
9f3f38769d Merge branch 'rs/strbuf-insertstr'
cbecc168d4 Merge branch 'rs/parse-options-concat-dup'
5af345a438 Merge branch 'bc/hash-independent-tests-part-8'
0460c109c3 Merge branch 'rs/name-rev-memsave'
6b9919c0a2 git-gui: add missing close bracket
5897e5ac96 Merge branch 'cs/german-translation'
cf85a32eb6 git-gui: update German translation
5096e51c54 git-gui: extend translation glossary template with more terms
8b85bb1b70 git-gui: update pot template and German translation to current source code
e68e29171c Sync with 2.25.1
c522f061d5 Git 2.25.1
10cdb9f38a rebase: rename the two primary rebase backends
2ac0d6273f rebase: change the default backend from "am" to "merge"
8295ed690b rebase: make the backend configurable via config setting
76340c8107 rebase tests: repeat some tests using the merge backend instead of am
980b482d28 rebase tests: mark tests specific to the am-backend with --am
c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases
6d04ce75c4 git-prompt: change the prompt for interactive-based rebases
52eb738d6b rebase: add an --am option
8af14f0859 rebase: move incompatibility checks between backend options a bit earlier
be50c938df git-rebase.txt: add more details about behavioral differences of backends
befb89ce7c rebase: allow more types of rebases to fast-forward
9a70f3d4ae t3432: make these tests work with either am or merge backends
93122c985a rebase: fix handling of restrict_revision
55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer
8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling
7db00f0b3b t3406: simplify an already simple test
e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty
d48e5e21da rebase (interactive-backend): make --keep-empty the default
e0020b2f82 prefix_path: show gitdir when arg is outside repo
cc4f2eb828 doc: move credential helper info into gitcredentials(7)
bfdd66e72f Sync with maint
7ae7e234c7 The fifth batch for 2.26
53c3be2c29 Merge branch 'tb/commit-graph-object-dir'
7b029ebaef Merge branch 'jk/index-pack-dupfix'
aa21cc97bd Merge branch 'jk/alloc-cleanups'
883326077a Merge branch 'jh/notes-fanout-fix'
f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule'
78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs'
df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'
433b8aac2e Merge branch 'ds/sparse-checkout-harden'
4a77434bc8 Merge branch 'ld/p4-cleanup-processes'
8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone'
09e48400a3 Merge branch 'jk/get-oid-error-message-i18n'
4dbeecba27 Merge branch 'ag/edit-todo-drop-check'
f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2'
d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout'
251187084d Merge branch 'js/rebase-i-with-colliding-hash'
c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix'
56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store'
0da63da794 Merge branch 'jn/promote-proto2-to-default'
a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup'
daef1b300b Merge branch 'hw/advice-add-nothing'
6141e0cc00 Merge branch 'js/convert-typofix' into maint
4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint
5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint
b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint
7137d6089b Merge branch 'ms/doc-bundle-format' into maint
52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint
0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint
1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint
cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint
153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint
8857657cc9 Merge branch 'jt/t5616-robustify' into maint
1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint
f468972671 Merge branch 'bc/misconception-doc' into maint
6e69042e26 Merge branch 'bc/author-committer-doc' into maint
650ed395be Merge branch 'ds/refmap-doc' into maint
80b806f1a8 Merge branch 'bc/actualmente' into maint
eceff4ba12 Merge branch 'rt/submodule-i18n' into maint
8a17eb7972 Merge branch 'jk/test-fixes' into maint
54bbadaeca Merge branch 'jk/asan-build-fix' into maint
8dbeba198e Merge branch 'ds/sparse-cone' into maint
e361f36f61 Merge branch 'nd/switch-and-restore' into maint
4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint
ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint
5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint
c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint
d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint
9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint
3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint
3ab3185f99 pack-objects: support filters with bitmaps
84243da129 pack-bitmap: implement BLOB_LIMIT filtering
4f3bd5606a pack-bitmap: implement BLOB_NONE filtering
cc4aa28506 bitmap: add bitmap_unset() function
2aaeb9ac41 rev-list: use bitmap filters for traversal
6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure
4eb707ebd6 rev-list: allow commit-only bitmap traversals
ea047a8eb4 t5310: factor out bitmap traversal comparison
608d9c9365 rev-list: allow bitmaps when counting objects
55cb10f9b5 rev-list: make --count work with --objects
792f811998 rev-list: factor out bitmap-optimized routines
d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs
08809c09aa mingw: add a helper function to attach GDB to the current process
bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths
de26f02db1 t9001, t9116: avoid pipes
a2dc43414c MyFirstContribution: rephrase contact info
e03f928e2a rev-list: fallback to non-bitmap traversal when filtering
acac50dd8c pack-bitmap: fix leak of haves/wants object lists
551cf8b655 pack-bitmap: factor out type iterator initialization
d8437c57fa The fourth batch for 2.26
a3dcf84df0 Merge branch 'js/convert-typofix'
0de2d1409b Merge branch 'js/ci-squelch-doc-warning'
0410c2ba31 Merge branch 'jb/multi-pack-index-docfix'
0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example'
e99c325bb4 Merge branch 'ms/doc-bundle-format'
afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix'
db72f8c940 Merge branch 'jb/parse-options-message-fix'
3d2471ba85 Merge branch 'ma/filter-branch-doc-caret'
b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path'
44cba9c4b3 Merge branch 'jc/skip-prefix'
556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index'
17e4a1b141 Merge branch 'hw/doc-git-dir'
4cf7f48891 Merge branch 'jk/push-default-doc'
b783391018 Merge branch 'jk/clang-sanitizer-fixes'
a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache'
3f7553acf5 Merge branch 'jt/t5616-robustify'
341f8a6476 Merge branch 'jk/escaped-wildcard-dwim'
b486d2ee81 Merge branch 'jn/pretend-object-doc'
076ee3e8a2 tests: fix --write-junit-xml with subshells
2b0f19fa7a convert: fix typo
c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors
1751b09a92 color.c: support bright aixterm colors
4a28eb0ae4 color.c: refactor color_output arguments
f696a2b1c8 mailinfo: factor out some repeated header handling
ffbea1816d mailinfo: be more liberal with header whitespace
f447d0293e mailinfo: simplify parsing of header values
b6537d83ee mailinfo: treat header values as C strings
ef07659926 sparse-checkout: work with Windows paths
2631dc879d sparse-checkout: create 'add' subcommand
4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand
6fb705abcb sparse-checkout: extract add_patterns_from_input()
b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config
f2a2327a4a config: provide access to the current line number
923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values
ceff1a1308 remote: clean-up config callback
1a83068c26 remote: clean-up by returning early to avoid one indentation
88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types
145d59f482 config: add '--show-scope' to print the scope of a config value
9a83d088ee submodule-config: add subomdule config scope
e37efa40e1 config: teach git_config_source to remember its scope
5c105a842e config: preserve scope in do_git_config_sequence
6766e41b8a config: clarify meaning of command line scoping
6dc905d974 config: split repo scope to local and worktree
a5cb4204b6 config: make scope_name non-static and rename it
30183894ea ci: ignore rubygems warning in the "Documentation" job
7a9f8ca805 parse-options: simplify parse_options_dup()
c84078573e parse-options: const parse_options_concat() parameters
f904f9025f parse-options: factor out parse_options_count()
a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat()
517b60564e mailinfo: don't insert header prefix for handle_content_type()
a91cc7fad0 strbuf: add and use strbuf_insertstr()
eb31044ff7 pack-format: correct multi-pack-index description
9299f84921 diff-options.txt: avoid "regex" overload in example
7378ec90e1 doc: describe Git bundle format
f3037657e8 t6024: update for SHA-256
edf04243b2 t6006: make hash size independent
5db24dcffd t6000: abstract away SHA-1-specific constants
d341e0805d t5703: make test work with SHA-256
88ed241a7e t5607: make hash size independent
48c10cc0e6 t5318: update for SHA-256
f7ae8e69b6 t5515: make test hash independent
e70649bb66 t5321: make test hash independent
a30f93b143 t5313: make test hash independent
a79eec220b t5309: make test hash independent
796d1383a3 t5302: make hash size independent
417e45e5e3 t4060: make test work with SHA-256
dfa5f53e78 t4211: add test cases for SHA-256
f743e8f5b3 t4211: move SHA-1-specific test cases into a directory
72f936b120 t4013: make test hash independent
5df0f11f07 t3311: make test work with SHA-256
07877f393c t3310: make test work with SHA-256
6025e898d6 t3309: make test work with SHA-256
7b1a1822fe t3308: make test work with SHA-256
94db7e3e93 t3206: make hash size independent
db12505c2c t/lib-pack: support SHA-256
303b3c1c46 submodule: add newline on invalid submodule error
887a0fd573 add: change advice config variables used by the add API
de93cc14ab The third batch for 2.26
ea46d9097b Merge branch 'mt/sparse-checkout-doc-update'
ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix'
b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend'
7ab963e122 Merge branch 'en/fill-directory-fixes-more'
f52ab33616 Merge branch 'bc/hash-independent-tests-part-7'
25794d6ce9 Merge branch 'km/submodule-add-errmsg'
d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity'
76c57fedfa Merge branch 'js/add-p-leftover-bits'
9a5315edfd Merge branch 'js/patch-mode-in-others-in-c'
381e8e9de1 Merge branch 'dl/test-must-fail-fixes'
395518cf7a parse-options: lose an unnecessary space in an error message
079f970971 name-rev: sort tip names before applying
2d53975488 name-rev: release unused name strings
977dc1912b name-rev: generate name strings only if they are better
1c56fc2084 name-rev: pre-size buffer in get_parent_name()
ddc42ec786 name-rev: factor out get_parent_name()
f13ca7cef5 name-rev: put struct rev_name into commit slab
d689d6d82f name-rev: don't _peek() in create_or_update_name()
15a4205d96 name-rev: don't leak path copy in name_ref()
36d2419c9a name-rev: respect const qualifier
71620ca86c name-rev: remove unused typedef
3e2feb0d64 name-rev: rewrite create_or_update_name()
a21781011f index-pack: downgrade twice-resolved REF_DELTA to die()
dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout
e1c5253951 t3305: check notes fanout more carefully and robustly
e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks
a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st'
ad2dd5bb63 commit-graph.c: remove path normalization, comparison
13c2499249 commit-graph.h: store object directory in 'struct commit_graph'
0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context'
f38c92452d t7400: testcase for submodule status on unregistered inner git repos
5290d45134 tree-walk.c: break circular dependency with unpack-trees
f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch
d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode
e53ffe2704 sparse-checkout: escape all glob characters on write
e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand
bd64de42de sparse-checkout: unquote C-style strings over --stdin
d585f0e799 sparse-checkout: write escaped patterns in cone mode
4f52c2ce6c sparse-checkout: properly match escaped characters
9abc60f801 sparse-checkout: warn on globs in cone patterns
145136a95a C: use skip_prefix() to avoid hardcoded string length
04e5b3f0b4 submodule foreach: replace $path with $sm_path in example
1793280e91 t5318: don't pass non-object directory to '--object-dir'
da8063522f diff: move diff.wsErrorHighlight to "basic" config
b98d188581 sha1-file: allow check_object_signature() to handle any repo
2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file()
7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare()
c8123e72f6 streaming: allow open_istream() to handle any repo
5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile()
a651946730 cache-tree: use given repo's hash_algo at verify_one()
eb999b3295 diff: make diff_populate_filespec() honor its repo argument
5b0ca878e0 Sync with maint
344ee18728 The second batch
53a83299c7 Merge branch 'bc/misconception-doc'
c9ccf9d09b Merge branch 'bc/author-committer-doc'
0d0fa20c40 Merge branch 'ss/t6025-modernize'
7050624abc Merge branch 'lh/bool-to-type-bool'
4b69f29271 Merge branch 'ds/refmap-doc'
aff812ce3c Merge branch 'bc/actualmente'
38fb56e92a Merge branch 'rt/submodule-i18n'
f0940743fa Merge branch 'js/builtin-add-i-cmds'
0afeb3fdf4 Merge branch 'jk/test-fixes'
808dab2b58 Merge branch 'jk/asan-build-fix'
fec1ff97c2 Merge branch 'sg/completion-worktree'
c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function'
11ad30b887 Merge branch 'hi/gpg-mintrustlevel'
96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases'
d52adee779 Merge branch 'ds/graph-horizontal-edges'
6909474491 Merge branch 'am/update-pathspec-f-f-tests'
043426c8fd Merge branch 'ds/sparse-cone'
34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig'
8dd40c0472 traverse_trees(): use stack array for name entries
667b76ec58 walker_fetch(): avoid raw array length computation
9734b74a8f normalize_path_copy(): document "dst" size expectations
43f33e492a git-p4: avoid leak of file handle when cloning
19fa5ac333 git-p4: check for access to remote host earlier
6026aff5bb git-p4: cleanup better on error exit
ca5b5cce62 git-p4: create helper function importRevisions()
4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable
5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce
837b3a6376 git-p4: make closeStreams() idempotent
b0418303b1 sha1-name: mark get_oid() error messages for translation
2df1aa239c fetch: forgo full connectivity check if --filter
50033772d5 connected: verify promisor-ness of partial clone
d82ad54945 git: update documentation for --git-dir
0ad7144999 .mailmap: map Yi-Jyun Pan's email
c56c48dd07 grep: ignore --recurse-submodules if --no-index is given
8b2a1928f0 doc: drop "explicitly given" from push.default description
cf82bff73f obstack: avoid computing offsets from NULL pointer
3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer
d20bc01a51 avoid computing zero offsets from NULL pointer
7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero
bc3f657f71 t1506: drop space after redirection operator
e5d7b2f65c t1400: avoid "test" string comparisons
5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c
c7a6207591 Sync with maint
7210ca4ee5 .mailmap: fix GGG authoship screwup
37a63faae5 t4124: only mark git command with test_must_fail
a8c663cf65 t3507: use test_path_is_missing()
2def7f017c t3507: fix indentation
e8a1c686ae t3504: do check for conflict marker after failed cherry-pick
1c9fd32fd2 t3419: stop losing return code of git command
c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}()
a781cd6fef t3415: stop losing return codes of git commands
86ce6e0dd1 t3310: extract common notes_merge_files_gone()
245b9ba0ba t3030: use test_path_is_missing()
4a6f11fd7b t2018: replace "sha" with "oid"
62e80fcb48 t2018: don't lose return code of git commands
30c0367668 t2018: teach do_checkout() to accept `!` arg
40caa5366a t2018: be more discerning when checking for expected exit codes
b54128bb0b t5616: make robust to delta base change
4c616c2ba1 merge-recursive: use subtraction to flip stage
ee798742bd merge-recursive: silence -Wxor-used-as-pow warning
39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule
a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin
3b2885ec9b submodule: fix status of initialized but not cloned submodules
ace912bfb8 t7400: add a testcase for submodule status on empty dirs
4bb4fd4290 MyFirstContribution: add avenues for getting help
9e6d3e6417 sparse-checkout: detect short patterns
41de0c6fbc sparse-checkout: cone mode does not recognize "**"
7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone
47dbf10d8a clone: fix --sparse option with URLs
3c754067a1 sparse-checkout: create leading directories
d622c34396 t1091: improve here-docs
522e641748 t1091: use check_files to reduce boilerplate
417be08d02 t1300: create custom config file without special characters
3de7ee369b t1300: fix over-indented HERE-DOCs
329e6ec397 config: fix typo in variable name
767a9c417e rebase -i: stop checking out the tip of the branch to rebase
dfaed02862 fsmonitor: update documentation for hook version and watchman hooks
e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2
d031049da3 completion: add support for sparse-checkout
a402723e48 doc: sparse-checkout: mention --cone option
26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck
b6992261de rebase -i: re-fix short SHA-1 collision
d859dcad94 parse_insn_line(): improve error message when parsing failed
d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects
92fb0db94c pack-objects: add checks for duplicate objects
bb514de356 pack-objects: improve partial packfile reuse
ff483026a9 builtin/pack-objects: introduce obj_is_packed()
e704fc7978 pack-objects: introduce pack.allowPackReuse
2f4af77699 csum-file: introduce hashfile_total()
8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting()
59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile
40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains()
14fbd26044 ewah/bitmap: introduce bitmap_word_alloc()
bc7a3d4dc0 The first batch post 2.25 cycle
09e393d913 Merge branch 'nd/switch-and-restore'
45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport'
0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout'
36da2a8635 Merge branch 'es/unpack-trees-oob-fix'
42096c778d Merge branch 'bc/run-command-nullness-after-free-fix'
1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted'
a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees'
e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached'
9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting'
237a83a943 Merge branch 'dl/credential-netrc'
a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir()
129510a067 t2405: clarify test descriptions and simplify test
4eaadc8493 t2405: use git -C and test_commit -C instead of subshells
773c60a45e t7410: rename to t2405-worktree-submodule.sh
7a2dc95cbc docs: mention when increasing http.postBuffer is valuable
1b13e9032f doc: dissuade users from trying to ignore tracked files
69e104d70e doc: provide guidance on user.name format
813f6025a5 docs: expand on possible and recommended user config options
bc94e5862a doc: move author and committer information to git-commit(1)
7979dfe1d4 l10n: Update Catalan translation
81e3db42f3 templates: fix deprecated type option `--bool`
c513a958b6 t6025: use helpers to replace test -f <path>
70789843bd t6025: modernize style
6a7aca6f01 doc: rm: synchronize <pathspec> description
856249c62a docs: use "currently" for the present time
b40a50264a fetch: document and test --refmap=""
a9ae8fde2e t3404: directly test the behavior of interest
22a69fda19 git-rebase.txt: update description of --allow-empty-message
f1928f04b2 grep: use no. of cores as the default no. of threads
70a9fef240 grep: move driver pre-load out of critical section
1184a95ea2 grep: re-enable threads in non-worktree case
6c307626f1 grep: protect packed_git [re-]initialization
c441ea4edc grep: allow submodule functions to run in parallel
d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules()
1d1729caeb grep: replace grep_read_mutex by internal obj read lock
31877c9aec object-store: allow threaded access to object reading
b1fc9da1c8 replace-object: make replace operations thread-safe
d5b0bac528 grep: fix racy calls in grep_objects()
faf123c730 grep: fix race conditions at grep_submodule()
c3a5bb31c1 grep: fix race conditions on userdiff calls
0222540827 fetch: emphasize failure during submodule fetch
232378479e Sync with maint
e4837b4406 t7800: don't rely on reuse_worktree_file()
fbce03d329 t4018: drop "debugging" cat from hunk-header tests
f65d07fffa Makefile: use compat regex with SANITIZE=address
849e43cc18 built-in add -i: accept open-ended ranges again
d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files
a4ffbbbb99 submodule.c: mark more strings for translation
0cbb60574e dir: point treat_leading_path() warning to the right place
ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent
22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2
f365bf40a0 clean: demonstrate a bug with pathspecs
b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x
277eb5af7c t5604: make hash independent
44b6c05b43 t5601: switch into repository to hash object
7a868c51c2 t5562: use $ZERO_OID
1b8f39fb0d t5540: make hash size independent
a8c17e3bd6 t5537: make hash size independent
832072219c t5530: compute results based on object length
74ad99b1d8 t5512: abstract away SHA-1-specific constants
ba1be1ab45 t5510: make hash size independent
cba472d3ad t5504: make hash algorithm independent
82d5aeb1e6 t5324: make hash size independent
3c5e65cac1 t5319: make test work with SHA-256
235d3cddb8 t5319: change invalid offset for SHA-256 compatibility
1d86c8f0ce t5318: update for SHA-256
525a7f1769 t4300: abstract away SHA-1-specific constants
7a1bcb251b t4204: make hash size independent
cb78f4f0fe t4202: abstract away SHA-1-specific constants
717c939d8f t4200: make hash size independent
08a9dd891c t4134: compute appropriate length constant
215b60bf07 t4066: compute index line in diffs
194264c185 t4054: make hash-size independent
7d5ecd775d completion: list paths and refs for 'git worktree add'
3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands
3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options
367efd54b3 completion: return the index of found word from __git_find_on_cmdline()
d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function
2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper
54887b4689 gpg-interface: add minTrustLevel as a configuration option
684ceae32d fetch: default to protocol version 2
33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION
8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate
b9ab170752 config doc: protocol.version is not experimental
07ef3c6604 fetch test: use more robust test for filtered objects
d6509da620 fetch test: mark test of "skipping" haves as v0-only
a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too
c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function
bf66db37f1 add: use advise function to display hints
c958d3bd0a graph: fix collapse of multiple edges
8588932e20 graph: add test to demonstrate horizontal line bug
d0d0a357a1 t: directly test parse_pathspec_file()
568cabb2fe t: fix quotes tests for --pathspec-from-file
f94f7bd00d t: add tests for error conditions with --pathspec-from-file
b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job
12acdf573a built-in add -p: handle Escape sequences more efficiently
e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode
04f816b125 built-in add -p: respect the `interactive.singlekey` config setting
a5e46e6b01 terminal: add a new function to read a single keystroke
9ea416cb51 terminal: accommodate Git for Windows' default terminal
94ac3c31f7 terminal: make the code of disable_echo() reusable
08b1ea4c39 built-in add -p: handle diff.algorithm
180f48df69 built-in add -p: support interactive.diffFilter
1e4ffc765d t3701: adjust difffilter test
c81638541c submodule add: show 'add --dry-run' stderr when aborting
8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token
56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token
d0654dc308 Git 2.25
b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po
4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'"
ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1
e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master
1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
d78a1968c5 Merge branch 'ma/config-advice-markup-fix'
a20ae3ee29 l10n: Update Catalan translation
49e268e23e mingw: safeguard better against backslashes in file names
4c6c7971e0 unpack-trees: correctly compute result count
63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1
75449c1b39 l10n: de.po: Reword generation numbers
6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t)
3901d2c6bd config/advice.txt: fix description list separator
7a6a90c6ec Git 2.25-rc2
1f5f3ffe5c Merge branch 'ds/graph-assert-fix'
a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix'
202f68b252 Merge branch 'pm/am-in-body-header-doc-update'
7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix'
c5dc20638b Merge branch 'do/gitweb-typofix-in-comments'
fe47c9cb5f Merge https://github.com/prati0100/git-gui
a1087c9367 graph: fix lack of color in horizontal lines
0d251c3291 graph: drop assert() for merge with two collapsing parents
4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper
573117dfa5 unpack-trees: watch for out-of-range index position
e701bab3e9 restore: invalidate cache-tree when removing entries with --staged
1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command
fa74180d08 checkout: don't revert file on ambiguous tracking branches
2957709bd4 parse_branchname_arg(): extract part as new function
5020f6806a t2018: improve style of if-statement
7ffb54618b t2018: add space between function name and ()
63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH
065027ee1a string-list: note in docs that callers can specify sorting function
26f924d50e unpack-trees: exit check_updates() early if updates are not wanted
042ed3e048 The final batch before -rc2
0f1930cd1b Merge branch 'ds/sparse-cone'
037f067587 Merge branch 'ds/commit-graph-set-size-mult'
f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify'
c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode'
a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
c4117fcb97 Merge branch 'pb/clarify-line-log-doc'
556f0258df Merge branch 'ew/packfile-syscall-optim'
5814d44d9b doc: submodule: fix typo for command absorbgitdirs
7047f75f22 editorconfig: indent text files with tabs
60440d72db sha1-file: document how to use pretend_object_file
7fdc5f296f l10n: es: 2.25.0 round #1
f8740c586b am: document that Date: can appear as an in-body header
4e2c4c0d4f gitweb: fix a couple spelling errors in comments
421c0ffb02 multi-pack-index: correct configuration in documentation
757ff352bd Documentation/git-sparse-checkout.txt: fix a typo
0d2116c644 Merge branch 'zs/open-current-file'
9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u)
3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master
4c5081614c l10n: fr.po v2.25.0 rnd 1
5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0
63020f175f commit-graph: prefer default size_mult when given zero
224c7d70fa mingw: only test index entries for backslashes, not tree entries
9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED
8679ef24ed Git 2.25-rc1
a82027e9e6 Merge branch 'js/use-test-tool-on-path'
13432fc6dd Merge branch 'js/mingw-reserved-filenames'
e0e1ac5db0 Merge branch 'en/rebase-signoff-fix'
b76a244c9d Merge branch 'em/freebsd-cirrus-ci'
bc855232bc Merge branch 'bk/p4-misc-usability'
763a59e71c merge-recursive: remove unnecessary oid_eq function
44143583b7 sparse-checkout: use extern for global variables
d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master
13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1
786f4d2405 git-gui: allow opening currently selected file in default app
4fd683b6a3 sparse-checkout: document interactions with submodules
de11951b03 sparse-checkout: list directories in cone mode
0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0
578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed)
173fff68da Merge tag 'v2.25.0-rc0' into git-po-master
f1842ff531 t2018: remove trailing space from test description
20a67e8ce9 t3008: find test-tool through path lookup
9e341f62ca l10n: Update Catalan translation
4e61b2214d packfile: replace lseek+read with pread
ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision
2be45868a8 doc: log, gitk: document accepted line-log diff formats
280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD
0a76bd7381 mailmap: mask accentless variant for Công Danh
99c33bed56 Git 2.25-rc0
d2189a721c Merge branch 'en/fill-directory-fixes'
8be0a428d6 Merge branch 'rs/test-cleanup'
65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string'
c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
45b96a6fa1 Merge branch 'js/add-p-in-c'
ccc292e862 Merge branch 'jc/drop-gen-hdrs'
dfee504bee Merge branch 'ja/doc-markup-cleanup'
87cbb1ca66 Merge branch 'rs/ref-read-cleanup'
20aa6d88b7 Merge branch 'rb/p4-lfs'
fcd5b55f56 Merge branch 'pb/submodule-doc-xref'
4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free'
ba6b66281e Merge branch 'ln/userdiff-elixir'
bd72a08d6c Merge branch 'ds/sparse-cone'
f3c520e17f Merge branch 'sg/name-rev-wo-recursion'
6514ad40a1 Merge branch 'ra/t5150-depends-on-perl'
17066bea38 Merge branch 'dl/format-patch-notes-config-fixup'
135365dd99 Merge branch 'am/pathspec-f-f-checkout'
ff0cb70d45 Merge branch 'am/pathspec-from-file'
4dc42c6c18 mingw: refuse paths containing reserved names
98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16
c480eeb574 commit --interactive: make it work with the built-in `add -i`
cee6cb7300 built-in add -p: implement the "worktree" patch modes
52628f94fc built-in add -p: implement the "checkout" patch modes
6610e4628a built-in stash: use the built-in `git add -p` if so configured
90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting
36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes
d2a233cb8b built-in add -p: prepare for patch modes other than "stage"
761e3d26bb sparse-checkout: improve OS ls compatibility
6579d93a97 contrib/credential/netrc: work outside a repo
1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable
b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI
b441717256 t1507: inline full_name()
9291e6329e t1507: run commands within test_expect_success
5236fce6b4 t1507: stop losing return codes of git commands
10812c2337 t1501: remove use of `test_might_fail cp`
62d58cda69 t1409: use test_path_is_missing()
b87b02cfe6 t1409: let sed open its own input file
9b92070e52 t1307: reorder `nongit test_must_fail`
3595d10c26 t1306: convert `test_might_fail rm` to `rm -f`
f511bc02ed t0020: use ! check_packed_refs_marked
f6041abdcd t0020: don't use `test_must_fail has_cr`
f46c243e66 t0003: don't use `test_must_fail attr_check`
99c049bc4c t0003: use test_must_be_empty()
3738439c77 t0003: use named parameters in attr_check()
7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err()
b8afb908c2 t/lib-git-p4: use test_path_is_missing()
4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases
6836d2fe06 dir.c: use st_add3() for allocation size
c847dfafee dir: consolidate similar code in treat_directory()
777b420347 dir: synchronize treat_leading_path() and read_directory_recursive()
b9670c1f5e dir: fix checks on common prefix directory
5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit
23cbe427c4 Merge branch 'py/console-close-esc'
124a895811 t4015: improve coverage of function context test
509efef789 commit: forbid --pathspec-from-file --all
12029dc57d t3434: mark successful test as such
e0f9095aaa notes.h: fix typos in comment
675ef6bab8 t6030: don't create unused file
01ed17dc8c t5580: don't create unused file
f670adb49b t3501: don't create unused file
1e1ccbfdd3 git-gui: allow closing console window with Escape
7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays.
b02fd2acca The sixth batch
59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex'
e3b72391d1 Merge branch 'rs/commit-export-env-simplify'
43bf44e23a Merge branch 'rs/archive-zip-code-cleanup'
4438a1a59f Merge branch 'js/t3404-indent-fix'
3a44db2ed2 Merge branch 'dr/branch-usage-casefix'
8bc481f4f6 Merge branch 'sg/t9300-robustify'
011fc2e88e Merge branch 'js/add-i-a-bit-more-tests'
d1c0fe8d9b Merge branch 'dl/range-diff-with-notes'
26c816a67d Merge branch 'hw/doc-in-header'
f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
71a7de7a99 Merge branch 'dl/rebase-with-autobase'
c9f5fc9114 Merge branch 'dl/test-cleanup'
6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap'
3beff388b2 Merge branch 'js/builtin-add-i-cmds'
4755a34c47 Merge branch 'dd/time-reentrancy'
37c2619d91 Merge branch 'ag/sequencer-todo-updates'
608e380502 git-p4: show detailed help when parsing options fail
e2aed5fd5b git-p4: yes/no prompts should sanitize user text
571fb96573 fix-typo: consecutive-word duplications
f371984613 Makefile: drop GEN_HDRS
2e4083198d built-in add -p: show helpful hint when nothing can be staged
54d9d9b2ee built-in add -p: only show the applicable parts of the help text
ade246efed built-in add -p: implement the 'q' ("quit") command
d6cf873340 built-in add -p: implement the '/' ("search regex") command
9254bdfb4f built-in add -p: implement the 'g' ("goto") command
bcdd297b78 built-in add -p: implement hunk editing
b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf"
11f2c0dae8 built-in add -p: coalesce hunks after splitting them
510aeca199 built-in add -p: implement the hunk splitting feature
0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions
5906d5de77 built-in app -p: allow selecting a mode change as a "hunk"
47dc4fd5eb built-in add -p: handle deleted empty files
80399aec5a built-in add -p: support multi-file diffs
7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed
12c24cf850 built-in add -p: color the prompt and the help text
25ea47af49 built-in add -p: adjust hunk headers as needed
e3bd11b4eb built-in add -p: show colored hunks by default
1942ee44e8 built-in add -i: wire up the new C code for the `patch` command
f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C
d1b1384d61 userdiff: remove empty subexpression from elixir regex
df5be01669 doc: indent multi-line items in list
fd5041e127 doc: remove non pure ASCII characters
190a65f9db sparse-checkout: respect core.ignoreCase in cone mode
1d7297513d notes: break set_display_notes() into smaller functions
66f79ee23d config/format.txt: clarify behavior of multiple format.notes
cc2bd5c45d gitmodules: link to gitsubmodules guide
99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed
e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed
8c02fe6060 t7004: don't create unused file
cb05d6a5ed t4256: don't create unused file
c5c4eddd56 dir: break part of read_directory_recursive() out for reuse
072a231016 dir: exit before wildcard fall-through if there is no wildcard
2f5d3847d4 dir: remove stray quote character in comment
a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories"
452efd11fb t3011: demonstrate directory traversal failures
ea94b16fb8 git-p4: honor lfs.storage configuration variable
51a0a4ed95 bisect--helper: avoid use-after-free
d32e065a91 Merge branch 'kk/branch-name-encoding'
ad05a3d8e5 The fifth batch
7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix'
b089e5e6cb Merge branch 'em/test-skip-regex-illseq'
930078ba39 Merge branch 'hi/gpg-use-check-signature'
08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode'
7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk'
55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm'
41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress'
5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise'
dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix'
d37cfe3b5c Merge branch 'dl/pretty-reference'
99c4ff1bda Merge branch 'dl/submodule-set-url'
55d607d85b Merge branch 'js/mingw-inherit-only-std-handles'
c58ae96fc4 Merge branch 'am/pathspec-from-file'
7c88714262 Merge branch 'po/bundle-doc-clonable'
5d9324e0f4 Merge branch 'ra/rebase-i-more-options'
7034cd094b Sync with Git 2.24.1
09ac67a183 format-patch: move git_config() before repo_init_revisions()
8164c961e1 format-patch: use --notes behavior for format.notes
452538c358 notes: extract logic into set_display_notes()
e6e230eeae notes: create init_display_notes() helper
1e6ed5441a notes: rename to load_display_notes()
2866fd284c name-rev: cleanup name_ref()
49f7a2fde9 name-rev: eliminate recursion in name_rev()
fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name'
e05e8cf074 archive-zip: use enum for compression method
39acfa3d22 git gui: fix branch name encoding error
11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description
8cf8f9b4aa t3404: fix indentation
4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs
147ee35558 commit: use strbuf_add() to add a length-limited string
559c6fc317 The fourth batch
56e6c16394 Merge branch 'dl/lore-is-the-archive'
3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive'
7cb0d37f6d Merge branch 'tg/perf-remove-stale-result'
403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick'
f0cf2fee5d Merge branch 'hi/grep-do-not-return-void'
391fb22ac7 Merge branch 'rs/use-skip-prefix-more'
92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd'
4ba74ca901 Merge branch 'rs/test-cleanup'
f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick'
ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9'
8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters
3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances
dd432a6ecf name-rev: restructure parsing commits and applying date cutoff
dd090a8a37 name-rev: pull out deref handling from the recursion
766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper
d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev()
bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation
e0c4da6f2a name-rev: avoid unnecessary cast in name_ref()
c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name()
c593a26348 t6120-describe: modernize the 'check_describe' helper
abcf857300 range-diff: clear `other_arg` at end of function
f8675343d7 range-diff: mark pointers as const
828765dfe0 t3206: fix incorrect test name
0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early
21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile
b4bbbbd5a2 apply --allow-overlap: fix a corner case
89c8559367 git add -p: use non-zero exit code when the diff generation failed
e91162be9c t3701: verify that the diff.algorithm config setting is handled
0c3222c4f3 t3701: verify the shown messages when nothing can be added
24be352d52 t3701: add a test for the different `add -p` prompts
8539b46534 t3701: avoid depending on the TTY prerequisite
0f0fba2cc8 t3701: add a test for advanced split-hunk editing
53a06cf39b Git 2.24.1
67af91c47a Sync with 2.23.1
a7312d1a28 Git 2.23.1
7fd9fd94fb Sync with 2.22.2
d9589d4051 Git 2.22.2
5421ddd8d0 Sync with 2.21.1
367f12b7e9 Git 2.21.1
20c71bcf67 Merge branch 'fix-msys2-quoting-bugs'
7d8b676992 mingw: sh arguments need quoting in more circumstances
d9061ed9da t7415: drop v2.20.x-specific work-around
04522edbd4 mingw: fix quoting of empty arguments for `sh`
49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts
e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly
fc346cb292 Sync with 2.20.2
4cd1cf31ef Git 2.20.2
c154745074 submodule: defend against submodule.update = !command in .gitmodules
4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x
d851d94151 Sync with 2.19.3
caccc527ca Git 2.19.3
7c9fbda6e2 Sync with 2.18.2
9877106b01 Git 2.18.2
14af7ed5a9 Sync with 2.17.3
a5ab8d0317 Git 2.17.3
bb92255ebe fsck: reject submodule.update = !command in .gitmodules
bdfef0492c Sync with 2.16.6
eb288bc455 Git 2.16.6
68440496c7 test-drop-caches: use `has_dos_drive_prefix()`
9ac92fed5b Sync with 2.15.4
7cdafcaacf Git 2.15.4
e904deb89d submodule: reject submodule.update = !command in .gitmodules
d3ac8c3f27 Sync with 2.14.6
66d2a6159f Git 2.14.6
083378cc35 The third batch
88bd37a2d0 Merge branch 'js/pkt-line-h-typofix'
473b431410 Merge branch 'us/unpack-trees-fsmonitor'
e0f9ec9027 Merge branch 'sg/test-bool-env'
fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset'
e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere'
88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory'
8feb47e882 Merge branch 'dl/t5520-cleanup'
6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree'
57d46bc602 Merge branch 'mg/doc-submodule-status-cached'
75bd003c7b Merge branch 'js/git-svn-use-rebase-merges'
f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix'
c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'
36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree'
cf91c31688 Merge branch 'sg/unpack-progress-throughput'
ef6104581d Merge branch 'pb/submodule-update-fetches'
7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix'
f3c7bfdde2 Merge branch 'dl/range-diff-with-notes'
9502b616f1 Merge branch 'jh/userdiff-python-async'
76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2'
995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label'
f7998d9793 Merge branch 'js/builtin-add-i'
917d0d6234 Merge branch 'js/rebase-r-safer-label'
56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers'
2763530048 Merge branch 'jg/revert-untracked'
fa38ab68b0 git-gui: revert untracked files by deleting them
d9c6469f38 git-gui: update status bar to track operations
29a9366052 git-gui: consolidate naming conventions
0bb313a552 xdiff: unignore changes in function context
2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names'
65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods'
5532ebdeb7 Merge branch 'fix-mingw-quoting-bug'
76a681ce9c Merge branch 'dubiously-nested-submodules'
dd53ea7220 Merge branch 'turn-on-protectntfs-by-default'
f82a97eb91 mingw: handle `subst`-ed "DOS drives"
7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams'
d2c84dad1c mingw: refuse to access paths with trailing spaces or periods
379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh
817ddd64c2 mingw: refuse to access paths with illegal characters
cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors
7530a6287e quote-stress-test: allow skipping some trials
35edce2056 t6130/t9350: prepare for stringent Win32 path validation
55953c77c0 quote-stress-test: accept arguments to test via the command-line
ad15592529 tests: add a helper to stress test argument quoting
a8dee3ca61 Disallow dubiously-nested submodule git directories
9102f958ee protect_ntfs: turn on NTFS protection by default
91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams
6d8684161e mingw: fix quoting of arguments
3a85dc7d53 is_ntfs_dotgit(): speed it up
7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses
288a74bcd2 is_ntfs_dotgit(): only verify the leading segment
a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark
cae0bc09ab rebase: fix format.useAutoBase breakage
945dc55dda format-patch: teach --no-base
700e006c5d t4014: use test_config()
a749d01e1d format-patch: fix indentation
0c47e06176 t3400: demonstrate failure with format.useAutoBase
d9b31db2c4 t7700: stop losing return codes of git commands
3699d69df0 t7700: make references to SHA-1 generic
dcf9a748ca t7700: replace egrep with grep
cfe5eda02a t7700: consolidate code into test_has_duplicate_object()
ae475afc0f t7700: consolidate code into test_no_missing_in_packs()
14b7664df8 doc: replace LKML link with lore.kernel.org
d23f9c8e04 RelNotes: replace Gmane with real Message-IDs
dcee037228 doc: replace MARC links with lore.kernel.org
a9aecc7abb checkout, restore: support the --pathspec-from-file option
cfd9376c1d doc: restore: synchronize <pathspec> description
8ea1189eac doc: checkout: synchronize <pathspec> description
6fdc9ad259 doc: checkout: fix broken text reference
1d022bb43f doc: checkout: remove duplicate synopsis
bebb5d6d6b add: support the --pathspec-from-file option
21bb3083c3 cmd_add: prepare for next patch
4778452597 Merge branch 'prevent-name-squatting-on-windows'
a7b1ad3b05 Merge branch 'jk/fast-import-unsafe'
525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()`
e1d911dd4c mingw: disallow backslash characters in tree objects' file names
0060fd1511 clone --recurse-submodules: prevent name squatting on Windows
a52ed76142 fast-import: disallow "feature import-marks" by default
68061e3470 fast-import: disallow "feature export-marks" by default
019683025f fast-import: delay creating leading directories for export-marks
e075dba372 fast-import: stop creating leading directories for import-marks
11e934d56e fast-import: tighten parsing of boolean command line options
816f806786 t9300: create marks files for double-import-marks test
f94804c1f2 t9300: drop some useless uses of cat
4f3e57ef13 submodule--helper: advise on fatal alternate error
10c64a0b3c Doc: explain submodule.alternateErrorStrategy
ec48540fe8 packfile.c: speed up loading lots of packfiles
3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value
a4fb016ba1 pkt-line: fix a typo
0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r
e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data
228f53135a The second batch
6c630f237e Merge branch 'jk/gitweb-anti-xss'
3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell'
4775e02a5c Merge branch 'ma/t7004'
a6c6f8d02a Merge branch 'js/complete-svn-recursive'
3ae8defaf9 Merge branch 'jk/send-pack-remote-failure'
aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix'
4ab9616c76 Merge branch 'sg/skip-skipped-prereq'
723a8adba5 Merge branch 'ds/test-read-graph'
9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation'
406ca29e0d Merge branch 'rs/parse-options-dup-null-fix'
fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging'
8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion'
ef8f621045 Merge branch 'dl/complete-rebase-onto'
3c3e5d0ea2 Merge branch 'tg/stash-refresh-index'
43c5fe1c1d Merge branch 'nn/doc-rebase-merges'
6511cb33c9 Merge branch 'dd/sequencer-utf8'
f165457618 Merge branch 'jk/remove-sha1-to-hex'
a774064fb0 Merge branch 'dj/typofix-merge-strat'
ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates'
d2489ce92c Merge branch 'rs/skip-iprefix'
376e7309e1 Merge branch 'ln/userdiff-elixir'
9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log'
d3096d2ba6 Merge branch 'en/doc-typofix'
26f20fa3fc Merge branch 'ns/test-desc-typofix'
ffd130a363 Merge branch 'en/t6024-style'
5149902ff9 Merge branch 'en/misc-doc-fixes'
bcb06e204c Merge branch 'js/fetch-multi-lockfix'
d08daec001 Merge branch 'rs/trace2-dots'
fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix'
bad5ed39cd Merge branch 'cb/curl-use-xmalloc'
7ab2088255 Merge branch 'rt/fetch-message-fix'
f089ddd56a Merge branch 'es/myfirstcontrib-updates'
3c90710c0c Merge branch 'hw/config-doc-in-header'
d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code'
5444d52866 Merge branch 'js/vreportf-wo-buffering'
05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add'
ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides'
532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default'
dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists'
fac9ab1419 Merge branch 'ma/bisect-doc-sample-update'
a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix'
0be5caf97c Merge branch 'jc/log-graph-simplify'
0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck'
2e697ced9d built-in add -i: offer the `quit` command
d7633578b5 built-in add -i: re-implement the `diff` command
8746e07277 built-in add -i: implement the `patch` command
ab1e1cccaf built-in add -i: re-implement `add-untracked` in C
c54ef5e424 built-in add -i: re-implement `revert` in C
a8c45be939 built-in add -i: implement the `update` command
f37c226454 built-in add -i: prepare for multi-selection commands
c08171d156 built-in add -i: allow filtering the modified files list
0c3944a628 add-interactive: make sure to release `rev.prune_data`
4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance
867fc7f310 grep: don't return an expression from pcre2_free()
c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables
72b006f4bf gpg-interface: prefer check_signature() for GPG verification
7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD
b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r
ccd469450a date.c: switch to reentrant {gm,local}time_r
271c351b2f t7811: don't create unused file
65efb42862 t9300: don't create unused file
f6b9413baf sequencer: fix a memory leak in sequencer_continue()
3eae30e464 doc: replace public-inbox links with lore.kernel.org
46c67492aa doc: recommend lore.kernel.org over public-inbox.org
5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects
17a4ae92ea t7700: s/test -f/test_path_is_file/
d2eee32a89 t7700: move keywords onto their own line
7a1c8c2346 t7700: remove spaces after redirect operators
09279086e8 t7700: drop redirections to /dev/null
756ee7fc9f t7501: stop losing return codes of git commands
38c1aa01de t7501: remove spaces after redirect operators
763b47bafa t5703: stop losing return codes of git commands
eacaa1c180 t5703: simplify one-time-sed generation logic
a29b2429e5 t5317: use ! grep to check for no matching lines
6c37f3ec1b t5317: stop losing return codes of git commands
b66e0a1773 t4138: stop losing return codes of git commands
afd43c9905 t4015: use test_write_lines()
946d2353a3 t4015: stop losing return codes of git commands
50cd31c652 t3600: comment on inducing SIGPIPE in `git rm`
3b737381d8 t3600: stop losing return codes of git commands
0d913dfa7e t3600: use test_line_count() where possible
29a40b5a67 t3301: stop losing return codes of git commands
9b5a9fa60a t0090: stop losing return codes of git commands
17aa9d9c1a t0014: remove git command upstream of pipe
77a946be98 apply-one-time-sed.sh: modernize style
176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job
ed254710ee test: use test_must_be_empty F instead of test_cmp empty F
c74b3cbb83 t7812: add missing redirects
213dabf49d test: use test_must_be_empty F instead of test -z $(cat F)
c93a5aaec8 t1400: use test_must_be_empty
6e4826ea75 t1410: use test_line_count
a5d04a3ef9 t1512: use test_line_count
54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd()
2059e79c0d name-rev: use skip_prefix() instead of starts_with()
1768aaf01d push: use skip_prefix() instead of starts_with()
ec6ee0c07a shell: use skip_prefix() instead of starts_with()
7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with()
a6293f5d28 fetch: use skip_prefix() instead of starts_with()
13ca8fb79e t5150: skip request-pull test if Perl is disabled
ecc0869080 commit-graph: use start_delayed_progress()
44a4693bfc progress: create GIT_PROGRESS_DELAY
528d9e6d01 t/perf: don't depend on Git.pm
b8dcc45387 perf-lib: use a single filename for all measurement types
fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk'
d82dfa7f5b rebase -i: finishing touches to --reset-author-date
1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory
393adf7a6f sequencer: directly call pick_commits() from complete_action()
a2dd67f105 rebase: fill `squash_onto' in get_replay_opts()
3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function
34065541e3 sequencer: update `done_nr' when skipping commands in a todo list
8638114e06 sequencer: update `total_nr' when adding an item to a todo list
0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk
ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk
ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions
9917eca794 l10n: zh_TW: add translation for v2.24.0
0a8e3036a3 reset: parse rev as tree-ish in patch mode
f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits
8d483c8408 doc: document 'git submodule status --cached'
befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick
ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later
9a780a384d mingw: spawned processes need to inherit only standard handles
c5a03b1e29 mingw: work around incorrect standard handles
eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes
a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool
43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values
2d05ef2778 sequencer: fix empty commit check when amending
ea8b7be147 git svn: stop using `rebase --preserve-merges`
67a6ea6300 gpg-interface: limit search for primary key fingerprint
392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern
cff4e9138d sparse-checkout: check for dirty status
416adc8711 sparse-checkout: update working directory in-process for 'init'
f75a69f880 sparse-checkout: cone mode should not interact with .gitignore
fb10ca5b54 sparse-checkout: write using lockfile
99dfa6f970 sparse-checkout: use in-process update for disable subcommand
e091228e17 sparse-checkout: update working directory in-process
e9de487aa3 sparse-checkout: sanitize for nested folders
4dcd4def3c unpack-trees: add progress to clear_ce_flags()
eb42feca97 unpack-trees: hash less in cone mode
af09ce24a9 sparse-checkout: init and set in cone mode
96cc8ab531 sparse-checkout: use hashmaps for cone patterns
879321eb0b sparse-checkout: add 'cone' mode
e6152e35ff trace2: add region in clear_ce_flags
72918c1ad9 sparse-checkout: create 'disable' subcommand
7bffca95ea sparse-checkout: add '--stdin' option to set subcommand
f6039a9423 sparse-checkout: 'set' subcommand
d89f09c828 clone: add --sparse mode
bab3c35908 sparse-checkout: create 'init' subcommand
94c0956b60 sparse-checkout: create builtin with 'list' subcommand
679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files
df6d3d6802 lib-bash.sh: move `then` onto its own line
2a02262078 t5520: replace `! git` with `test_must_fail git`
c245e58bb6 t5520: remove redundant lines in test cases
a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp
e959a18ee7 t5520: don't put git in upstream of pipe
5540ed27bc t5520: test single-line files by git with test_cmp
dd0f1e767b t5520: use test_cmp_rev where possible
979f8891cc t5520: replace test -{n,z} with test-lib functions
3037d3db90 t5520: use test_line_count where possible
93a9bf876b t5520: remove spaces after redirect operator
ceeef863de t5520: replace test -f with test-lib functions
4c8b046f82 t5520: let sed open its own input
53c62b9810 t5520: use sq for test case names
e8d1eaf9b4 t5520: improve test style
2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals
8cb7980382 t0000: test multiple local assignment
5b583e6a09 format-patch: pass notes configuration to range-diff
bd36191886 range-diff: pass through --notes to `git log`
9f726e1b87 range-diff: output `## Notes ##` header
3bdbdfb7a5 t3206: range-diff compares logs with commit notes
75c5aa0701 t3206: s/expected/expect/
79f3950d02 t3206: disable parameter substitution in heredoc
3a6e48e9f7 t3206: remove spaces after redirect operators
26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish
077a1fda82 userdiff: support Python async functions
3798149a74 SubmittingPatches: use `--pretty=reference`
1f0fc1db85 pretty: implement 'reference' format
618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type
0df621172d pretty: provide short date format
ac52d9410e t4205: cover `git log --reflog -z` blindspot
3e8ed3b93e pretty.c: inline initalize format_context
4982516451 revision: make get_revision_mark() return const pointer
f0f9de2bd7 completion: complete `tformat:` pretty format
fb2ffa77a6 SubmittingPatches: remove dq from commit reference
bae74c9dfb pretty-formats.txt: use generic terms for hash
bd00717eab SubmittingPatches: use generic terms for hash
9d45ac4cbf rev-list-options.txt: remove reference to --show-notes
828e829b9e argv-array: add space after `while`
e440fc5888 commit: support the --pathspec-from-file option
66a25a7242 doc: commit: synchronize <pathspec> description
64bac8df97 reset: support the `--pathspec-from-file` option
d137b50756 doc: reset: synchronize <pathspec> description
24e4750c96 pathspec: add new function to parse file
0dbc4a0edf ci(osx): update homebrew-cask repository with less noise
e02058a729 sequencer: handle rebase-merges for "onto" message
bae60ba7e9 builtin/unpack-objects.c: show throughput progress
2d92ab32fd rev-parse: make --show-toplevel without a worktree an error
9e5afdf997 fetch: add trace2 instrumentation
4c4066d95d run-command: move doc to run-command.h
6c51cb525d trace2: move doc to trace2.h
7db0305438 parse-options: add link to doc file in parse-options.h
d95a77d059 submodule-config: move doc to submodule-config.h
f3b9055624 credential: move doc to credential.h
bbcfa3002a tree-walk: move doc to tree-walk.h
971b1f24a2 argv-array: move doc to argv-array.h
f1ecbe0f53 trace: move doc to trace.h
13aa9c8b70 cache: move doc to cache.h
c0be43f898 sigchain: move doc to sigchain.h
19ef3ddd36 pathspec: move doc to pathspec.h
301d595e72 revision: move doc to revision.h
3a1b3415d9 attr: move doc to attr.h
126c1ccefb refs: move doc to refs.h
d27eb356bf remote: move doc to remote.h and refspec.h
405c6b1fbc sha1-array: move doc to sha1-array.h
d3d7172e40 merge: move doc to ll-merge.h
3f1480b745 graph: move doc to graph.h and graph.c
266f03eccd dir: move doc to dir.h
13c4d7eb22 diff: move doc to diff.h and diffcore.h
cd5522271f rebase -r: let `label` generate safer labels
867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()`
8c15904462 built-in add -i: implement the `help` command
3d965c7674 built-in add -i: use color in the main loop
68db1cbf8e built-in add -i: support `?` (prompt help)
76b743234c built-in add -i: show unique prefixes of the commands
6348bfba58 built-in add -i: implement the main loop
a376e37b2c gitweb: escape URLs generated by href()
b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI
f28bceca75 t/gitweb-lib.sh: drop confusing quotes
0eba60c9b7 t9502: pass along all arguments in xss helper
932757b0cc INSTALL: use existing shell scripts as example
b018719927 t7004: check existence of correct tag
1daaebcaa5 built-in add -i: color the header in the `status` command
5e82b9e4d2 built-in add -i: implement the `status` command
e4cb659ebd diff: export diffstat interface
f83dff60a7 Start to implement a built-in version of `git add --interactive`
df53c80822 stash: make sure we have a valid index before writing it
ad7a403268 send-pack: check remote ref status on pack-objects failure
d91ce887c9 t6120-describe: correct test repo history graph in comment
1f9247a3bd completion: tab-complete "git svn --recursive"
603960b50e promisor-remote: remove fetch_if_missing=0
e362fadcd0 clone: remove fetch_if_missing=0
169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL
51bd6be32d mingw: use COPY_ARRAY for copying array
4bd0593e0f test-tool: use 'read-graph' helper
e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway
d784d978f6 t4215: use helper function to check output
61eea521fe fsmonitor: do not compare bitmap size with size of split index
b19f3fe9dd hex: drop sha1_to_hex()
c1ce9c06d0 completion: learn to complete `git rebase --onto=`
f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls
d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase
aa6d7f93ed hex: drop sha1_to_hex_r()
52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch
5772b0c745 sequencer: reencode old merge-commit message
e0eba649e8 bundle-verify: add --quiet
79862b6b77 bundle-create: progress output control
73c3253d75 bundle: framework for options before bundle file
68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in"
b375744274 sequencer: reencode squashing commit's message
019a9d8362 sequencer: reencode revert/cherry-pick's todo list
0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list
e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding
1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary
d9f6f3b619 The first batch post 2.24 cycle
28014c1084 Merge branch 'bc/hash-independent-tests-part-6'
57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree'
c22f63c40f Merge branch 'pb/pretty-email-without-domain-part'
5731ca3657 Merge branch 'hw/remove-api-docs-placeholder'
14b58c62bc Merge branch 'sg/commit-graph-usage-fix'
eff313f8a7 Merge branch 'dl/apply-3way-diff3'
db806d7064 Merge branch 'sg/dir-trie-fixes'
f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix'
8f1119b988 Merge branch 'wb/midx-progress'
d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes'
0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges'
8f40d89783 Merge branch 'hv/bitshift-constants-in-blame'
d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head'
5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer'
b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc'
15d9f3dc66 Merge branch 'es/walken-tutorial'
026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor'
ed28358833 convert: use skip_iprefix() in validate_encoding()
89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding()
03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules
ae821ffe83 multimail: fix a few simple spelling errors
557c5895c2 sha1dc: fix trivial comment spelling error
aa74be316a Fix spelling errors in test commands
96c0caf5e3 Fix spelling errors in messages shown to users
4dc8b1c114 Fix spelling errors in names of tests
7a40cf1553 Fix spelling errors in comments of testcases
15beaaa3d1 Fix spelling errors in code comments
a807200f67 userdiff: add Elixir to supported userdiff languages
461caf3e8a git-shortlog.txt: include commit limiting options
6462d5eb9a fetch: remove fetch_if_missing=0
46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion
99b2ba35f5 t0028: eliminate non-standard usage of printf
add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul`
14c4776d75 t: fix typo in test descriptions
270de6acbe t6024: modernize style
77363a51fb name-hash.c: remove duplicate word in comment
c92faa4d22 hashmap: fix documentation misuses of -> versus .
a6d39f2efb git-filter-branch.txt: correct argument name typo
4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators
8915297925 Fix spelling errors in documentation outside of Documentation/
031fd4b93b Documentation: fix a bunch of typos, both old and new
dd0b61f577 fsmonitor: fix watchman integration
5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare()
7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph
c14e6e7903 fetch: add the command-line option `--write-commit-graph`
da72936f54 Git 2.24
1d34d425d4 Merge branch 'bc/doc-use-docbook-5'
dac1d83c91 Merge branch 'ds/commit-graph-on-fetch'
c32ca691c2 Merge branch 'jt/delay-fetch-if-missing'
ab6b50e4c8 Merge https://github.com/prati0100/git-gui
93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po
a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2
fe28ad8520 rebase: add --reset-author-date
08187b4cba rebase -i: support --ignore-date
0185c683c9 sequencer: rename amend_author to author_to_rename
cbd8db17ac rebase -i: support --committer-date-is-author-date
c068bcc59b sequencer: allow callers of read_author_script() to ignore fields
ba51d2fb24 rebase -i: add --ignore-whitespace flag
3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower
3ada78de3f myfirstcontrib: add dependency installation step
4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt
4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly
8dfb04ae96 update-index: optionally leave skip-worktree entries alone
116d1fa6c6 vreportf(): avoid relying on stdio buffering
efd5444238 RelNotes/2.24.0: fix self-contradictory note
391c7e40b5 fetch.c: fix typo in a warning message
55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template
849e43680d RelNotes/2.24.0: typofix
0115e5d929 git-diff.txt: document return code of `--no-index`
798d66e35d l10n: de.po: Update German translation
c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u)
f21f8f5d35 Git 2.24-rc2
8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix'
0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix'
f2db52c46b Merge branch 'js/mingw-needs-hiding-fix'
5b7594abdc Merge branch 'master' of github.com:vnwildman/git
034d33653a Merge branch 'next' of github.com:ChrisADR/git-po
26b061007c submodule: teach set-url subcommand
460782b7be t7519-status-fsmonitor: improve comments
d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses
4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config
1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694)
f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0
762d5b4f46 help: add gitsubmodules to the list of guides
76a53d640f git_path(): handle `.lock` files correctly
3ce47211a6 t1400: wrap setup code in test case
44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string
6c02042139 clone: rename static function `dir_exists()`.
8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command
77200e9332 l10n: es: 2.24.0 round 2
e42df36b42 Merge branch 'l10n/it/update-italian-translation'
5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2
51728480fe l10n: fr v2.24.0 rnd2
045a548698 l10n: git.pot: v2.24.0 round 2 (1 new)
468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master
b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree()
c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit()
103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag()
f648ee7088 fsck: rename vague "oid" local variables
cc579000bf fsck: don't require an object struct in verify_headers()
7854399366 fsck: don't require an object struct for fsck_ident()
b8b00f1693 fsck: drop blob struct from fsck_finish()
6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob()
38370253fd fsck: don't require an object struct for report()
f59793763d fsck: only require an oid for skiplist functions
5afc4b1dc6 fsck: only provide oid/type in fsck_error callback
82ef89b318 fsck: don't require object structs for display functions
733902905d fsck: use oids rather than objects for object_name API
d40bbc109b fsck_describe_object(): build on our get_object_name() primitive
a59cfb3230 fsck: unify object-name code
23a173a761 fsck: require an actual buffer for non-blobs
2175a0c601 fsck: stop checking tag->tagged
ec65231571 fsck: stop checking commit->parent counts
1de6007d85 fsck: stop checking commit->tree value
228c78fbd4 commit, tag: don't set parsed bit for parse failures
60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()`
8b656572ca builtin/commit-graph.c: remove subcommand-less usage string
fa26d5ede6 t4048: abstract away SHA-1-specific constants
cf02be8486 t4045: make hash-size independent
38ee26b2a3 t4044: update test to work with SHA-256
37ab8ebef1 t4039: abstract away SHA-1-specific constants
0370b35414 t4038: abstract away SHA-1 specific constants
0253e126a2 t4034: abstract away SHA-1-specific constants
45e2ef2b1d t4027: make hash-size independent
79b0edc1a0 t4015: abstract away SHA-1-specific constants
840624ff55 t4011: abstract away SHA-1-specific constants
32a6707267 t4010: abstract away SHA-1-specific constants
440bf91dfa t3429: remove SHA1 annotation
0b408ca2bd t1305: avoid comparing extensions
2eabd38313 rev-parse: add a --show-object-format option
52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode
45e206f0d8 t4203: use test-lib.sh definitions
2ae4944aac t6006: use test-lib.sh definitions
cb99a34e23 commit-graph: fix writing first commit-graph during fetch
e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug
7b4fb434b4 documentation: remove empty doc files
566a1439f6 Git 2.24-rc1
04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix'
4d6fb2beeb Merge branch 'ds/feature-macros'
5f0b6ed907 Merge branch 'js/azure-ci-osx-fix'
c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs'
1b4f85285f Merge branch 'dl/submodule-set-branch'
c7aadccba0 fetch: delay fetch_if_missing=0 until after config
c11e9966cb repo-settings: read an int for index.version
091489d068 apply: respect merge.conflictStyle in --3way
aa76ae4905 t4108: demonstrate bug in apply
95806205cd t4108: use `test_config` instead of `git config`
b0069684d4 t4108: remove git command upstream of pipe
fa87b81385 t4108: replace create_file with test_write_lines
7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job
6c96630cb0 config: move documentation to config.h
d81542e6f3 Eleventh batch
e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix'
d45d771978 Merge branch 'bc/smart-http-atomic-push'
22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix'
2e215b7959 Merge branch 'sb/userdiff-dts'
e3cf08361a Merge branch 'sg/progress-fix'
b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix'
c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc'
f45f88b2e4 path.c: don't call the match function without value in trie_find()
c72fc40d09 path.c: clarify two field names in 'struct common_dir'
8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file
7cb8c929d7 path.c: clarify trie_find()'s in-code comment
e536b1fedf Documentation: mention more worktree-specific exceptions
680cba2c2b multi-pack-index: add [--[no-]progress] option.
64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack
ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file
8dc18f8937 midx: add progress to expire_midx_packs
840cef0c70 midx: add progress to write_midx_file
efbc3aee08 midx: add MIDX_PROGRESS flag
0eb3671ed9 ci(osx): use new location of the `perforce` cask
da1e295e00 t604[236]: do not run setup in separate tests
49b8133a9e merge-recursive: fix merging a subdirectory into the root directory
d3eebaad5e merge-recursive: clean up get_renamed_dir_portion()
80736d7c5e doc: am --show-current-patch gives an entire e-mail message
a8e2c0eadc t7419: change test_must_fail to ! for grep
19c29e538e t4014: make output-directory tests self-contained
12a4aeaad8 Merge branch 'js/azure-pipelines-msvc'
399c23c046 ci(visual-studio): actually run the tests in parallel
711cd6d15c ci(visual-studio): use strict compile flags, and optimization
370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0
cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master
907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master
13bcea8c7f l10n: fr 2.24.0 rnd 1
135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master
3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed)
8da56a4848 userdiff: fix some corner cases in dts regex
86795774bb builtin/blame.c: constants into bit shift format
feebd2d256 rebase: hide --preserve-merges option
0e40a73a4c Doc: Bundle file usage
78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error
12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error
c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error
2b6f6ea1bd test-progress: fix test failures on big-endian systems
f757409e36 l10n: bg.po: Updated Bulgarian translation (4693)
176f5adfdb completion: clarify installation instruction for zsh
d966095db0 Git 2.24-rc0
90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array'
3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth'
d0258d0944 Merge branch 'rs/http-push-simplify'
bb52def6da Merge branch 'jj/stash-reset-only-toplevel'
f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs'
e5fca6b573 Merge branch 'bb/compat-util-comment-fix'
43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup'
07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely'
2d74d28ee0 Merge branch 'dl/compat-cleanup'
9b83a94829 Merge branch 'ta/t1308-typofix'
376012c919 Merge branch 'js/doc-stash-save'
10da030ab7 grep: avoid leak of chartables in PCRE2
513f2b0bbd grep: make PCRE2 aware of custom allocator
57d4660468 grep: make PCRE1 aware of custom allocator
d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand
8af69cf3e2 t3301: test diagnose messages for too few/many paramters
6f1194246a remote-curl: pass on atomic capability to remote side
bbb13e8188 graph: fix coloring of octopus dashes
92beecc136 graph: flatten edges that fuse with their right neighbor
479db18bc0 graph: smooth appearance of collapsing edges on commit lines
0195285b95 graph: rename `new_mapping` to `old_mapping`
d62893ecc1 graph: commit and post-merge lines for left-skewed merges
0f0f389f12 graph: tidy up display of left-skewed merges
458152cce1 graph: example of graph output that can be simplified
ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state
46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()`
a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()`
9157a2a032 graph: reuse `find_new_column_by_commit()`
210179a20d graph: handle line padding in `graph_next_line()`
fbccf255f9 graph: automatically track display width of graph lines
5374a290aa fetch-pack: write fetched refs to .promisor
4627bc777e sequencer: run post-commit hook
49697cb721 move run_commit_hook() to libgit and use it there
12bb7a540a sequencer.h fix placement of #endif
6a619ca03c t3404: remove uneeded calls to set_fake_editor
b2dbacbddf t3404: set $EDITOR in subshell
88a92b6c73 t3404: remove unnecessary subshell
bf8e65b30b format-patch: teach --cover-from-description option
a92331df18 format-patch: use enum variables
46273df7bf format-patch: replace erroneous and condition
3b3c79f6c9 diff-highlight: fix a whitespace nit
108b97dc37 Ninth batch
cbe8cdd3a0 Merge branch 'jk/coc'
3b9ec27919 Merge branch 'js/trace2-fetch-push'
c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch'
1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup'
eb3de5b823 Merge branch 'js/xdiffi-comment-updates'
4e8371ec26 Merge branch 'dl/t0000-skip-test-test'
b6d712fa4e Merge branch 'tg/range-diff-output-update'
77458870a5 Merge branch 'gs/sq-quote-buf-pretty'
5efabc7ed9 Merge branch 'ew/hashmap'
d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files'
6ed610b968 Merge branch 'am/t0028-utf16-tests'
5b900fb812 Merge branch 'dl/octopus-graph-bug'
16d9d7184b Merge branch 'en/fast-imexport-nested-tags'
6d5291be45 Merge branch 'js/azure-pipelines-msvc'
ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd'
d96e31e390 Merge branch 'js/fetch-jobs'
280bd44551 Merge branch 'en/merge-recursive-cleanup'
062a309d36 remote-curl: use argv_array in parse_push()
a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes
5cc6a4be11 http-push: simplify deleting a list item
556895d0c8 stash: avoid recursive hard reset on submodules
b524f6b399 Merge branch 'ka/japanese-translation'
f6f3824b4e git-gui: improve Japanese translation
61f4b407d3 Merge branch 'py/readme'
1e6880fd06 git-gui: add a readme
edefc31873 format-patch: create leading components of output directory
68b69211b2 git-compat-util: fix documentation syntax
fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth()
e0479fa073 documentation: add tutorial for object walking
3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed
4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target
9cad1c4488 pthread.h: manually align parameter lists
8c1cfd58e3 t1308-config-set: fix a test that has a typo
57d8f4b4c7 doc(stash): clarify the description of `save`
08da6496b6 Eighth batch
07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup'
f0d407e6ae Merge branch 'kt/add-i-progress'
66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree'
a4c5d9f66e Merge branch 'rs/dedup-includes'
159cdabd87 Merge branch 'js/range-diff-noprefix'
93424f1f7d Merge branch 'cb/pcre1-cleanup'
a73f91774c Merge branch 'ab/pcre-jit-fixes'
4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword'
020011f2cb Merge branch 'tk/git-svn-trim-author-name'
676278f8ea Merge branch 'bc/object-id-part17'
aafb75452b Merge branch 'en/clean-nested-with-ignored'
3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails
5cdf2301d4 add a Code of Conduct document
70bf0b755a Seventh batch
9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat'
2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary'
d17f54947d Merge branch 'rs/convert-fix-utf-without-dash'
82c80f98e6 Merge branch 'py/git-gui-has-maintainer'
6e12570822 Merge branch 'ah/cleanups'
772cad0afb Merge branch 'js/diff-rename-force-stable-sort'
424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path'
678a9ca629 Merge branch 'as/shallow-slab-use-fix'
0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix'
042a54d251 Merge branch 'am/visual-studio-config-fix'
03d3b1297c xdiffi: fix typos and touch up comments
b05b40930e t0000: cover GIT_SKIP_TESTS blindspots
d8bc1a518a send-pack: never fetch when checking exclusions
756fb0dedb t4014: treat rev-list output as the expected value
2b6a9b13ca range-diff: don't segfault with mode-only changes
360c7ba330 transport: push codepath can take arbitrary repository
ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments
b657047719 merge-recursive: fix the fix to the diff3 common ancestor label
b744c3af07 Sixth batch
417056578a Merge branch 'bw/submodule-helper-usage-fix'
9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check'
1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a'
59b19bcd9f Merge branch 'cc/multi-promisor'
1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way'
5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort'
eb35c18e42 Merge branch 'sg/travis-help-debug'
cabb145fe3 Merge branch 'rs/alias-use-copy-array'
56c7ab0f4e Merge branch 'sg/t-helper-gitignore'
e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang'
583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules'
337e3f2b49 Merge branch 'rs/nth-switch-code-simplification'
8f53fe1733 Merge branch 'hb/hg-to-git-py3'
ef93bfbd45 Merge branch 'sg/progress-fix'
980351d1ac Merge branch 'js/doc-patch-text'
80693e3f09 Merge branch 'tb/commit-graph-harden'
ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge'
3f84633563 Merge branch 'dl/cocci-everywhere'
caf150ce7d Merge branch 'gs/commit-graph-progress'
1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim'
1398171378 Merge branch 'rs/commit-graph-use-list-count'
773521df26 Merge branch 'rs/nth-parent-parse'
7f17913161 Merge branch 'dl/submodule-set-branch'
cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix'
bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees'
098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack'
37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc'
e392382f95 Merge branch 'dl/complete-rebase-and-archive'
cda8faa37e Merge branch 'jk/commit-graph-cleanup'
36d2fca82b Merge branch 'ss/get-time-cleanup'
ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude'
ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob'
ba2d451122 Merge branch 'tg/stash-refresh-index'
e2b5038d87 hashmap_entry: remove first member requirement from docs
404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry
23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators
c8e424c9c9 hashmap: introduce hashmap_free_entries
8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry *
87571c3f71 hashmap: use *_entry APIs for iteration
939af16eac hashmap_cmp_fn takes hashmap_entry params
f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *"
f0e63c4113 hashmap: use *_entry APIs to wrap container_of
6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *"
973d5eea74 introduce container_of macro
26b455f21e hashmap_put takes "struct hashmap_entry *"
28ee794128 hashmap_remove takes "const struct hashmap_entry *"
b6c5241606 hashmap_get takes "const struct hashmap_entry *"
b94e5c1df6 hashmap_add takes "struct hashmap_entry *"
f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *"
d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *"
d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry
12878c8351 coccicheck: detect hashmap_entry.hash assignment
e010a41216 diff: use hashmap_entry_init on moved_entry.ent
f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo"
de5abb5f7a git-p4: auto-delete named temporary file
c90b652afd Fifth batch
f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1'
b0f8aed48f Merge branch 'ma/user-manual-markup-update'
faf5576a8d Merge branch 'bc/doc-use-docbook-5'
314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes'
70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo'
847650798b Merge branch 'am/mailmap-andrey-mazo'
1a155f2e66 Merge branch 'jc/git-gui-has-maintainer'
1bcef51204 t/oid-info: add empty tree and empty blob values
ecde49bb8a t/oid-info: allow looking up hash algorithm name
11a3d3aadd git-rev-list.txt: prune options in synopsis
7d2f003ee4 Documentation: update the location of the git-gui repo
b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding()
46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines
b35304bf95 ci: really use shallow clones on Azure Pipelines
ab7d854aba tests: let --immediate and --write-junit-xml play well together
be5d88e112 test-tool run-command: learn to run (parts of) the testsuite
5d65ad17a9 vcxproj: include more generated files
030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built
61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable()
e4347c9434 msvc: handle DEVELOPER=1
ed712ef8d5 msvc: ignore some libraries when linking
5b8f9e2417 compat/win32/path-utils.h: add #include guards
41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning
c097b95a26 msvc: avoid using minus operator on unsigned types
dfd557c978 stash apply: report status correctly even in a worktree's subdirectory
d54dea77db fetch: let --jobs=<n> parallelize --multiple, too
87db61a436 trace2: write discard message to sentinel files
83e57b04e6 trace2: discard new traces if target directory has too many files
11c21f22de t4214: demonstrate octopus graph coloring failure
25eb905e14 t4214: explicitly list tags in log
63be8c8dd7 t4214: generate expect in their own test cases
a7a5590c6e t4214: use test_merge
94ba151300 test-lib: let test_merge() perform octopus merges
22541013d0 docs: clarify trace2 version invariants
3d4548e7e2 docs: mention trace2 target-dir mode in git-config
2fe44394c8 treewide: remove duplicate #include directives
dbcd970c27 push: do not pretend to return `int` from `die_push_simple()`
941790d7de fast-export: handle nested tags
8d7d33c1ce t9350: add tests for tags of things other than a commit
a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags
208d69246e fast-export: add support for --import-marks-if-exists
b8f50e5b60 fast-import: add support for new 'alias' command
f73b2aba05 fast-import: allow tags to be identified by mark labels
3164e6bd24 fast-import: fix handling of deleted tags
8085050ab4 add -i: show progress counter in the prompt
69fdb922ad Merge branch 'bw/diff3-conflict-style'
b436825b9b git-gui: support for diff3 conflict style
937b76ed49 range-diff: internally force `diff.noprefix=true`
411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job
25e4b8099c push: add trace2 instrumentation
5fc31180d8 fetch: add trace2 instrumentation
53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value
c3b57dc2a0 git-gui: use existing interface to query a path's attribute
45ab460d4a Merge branch 'js/git-bash-if-available'
0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command
71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only)
54a80a9ad8 wrapper: use a loop instead of repetitive statements
baed6bbb5b diffcore-break: use a goto instead of a redundant if statement
8da02ce62a commit-graph: remove a duplicate assignment
ddb3c856f3 shallow.c: don't free unallocated slabs
8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits
65904b8b2b promisor-remote: skip move_to_tail when no-op
2049b8dc65 diffcore_rename(): use a stable sort
97fff61012 Move git_sort(), a stable sort, into into libgit.a
69f272b922 dir: special case check for the possibility that pathspec is NULL
6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available
bc12974a89 Fourth batch
5a5350940b Merge branch 'ds/commit-graph-on-fetch'
974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch'
9755f70fe6 Merge branch 'ds/include-exclude'
93fc8760e7 Merge branch 'jh/trace2-pretty-output'
640f9cd599 Merge branch 'dl/rebase-i-keep-base'
026428c35e Merge branch 'sg/clean-nested-repo-with-ignored'
21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip'
d693345518 Merge branch 'dl/use-sq-from-test-lib'
d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes'
2be6ccc01a Merge branch 'sg/git-test-boolean'
cf861cd7a0 Merge branch 'rs/get-tagged-oid'
91243b019d Merge branch 'en/filter-branch-deprecation'
9bc67b6658 Merge branch 'en/merge-options-ff-and-friends'
fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden'
cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option'
8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return'
3ff6af7753 Merge branch 'nd/switch-and-restore'
aadac067aa Merge branch 'tb/file-url-to-unc-path'
b57a88a5f1 Merge branch 'js/gitdir-at-unc-root'
6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path'
430439536b Merge branch 'rs/parse-tree-indirect'
991fd97b9a Merge branch 'jk/fast-import-history-bugfix'
74a39b9bcc Merge branch 'mh/notes-duplicate-entries'
37801f0665 Merge branch 'tb/banned-vsprintf-namefix'
21ce0b48f3 Merge branch 'mh/release-commit-memory-fix'
f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup'
bf6136cab8 Merge branch 'rs/strbuf-detach'
a2e22bb3ad Merge branch 'rs/trace2-dst-warning'
1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup'
0281733483 Merge branch 'bc/hash-independent-tests-part-5'
f06fb376ed Merge branch 'jc/test-cleanup'
00bb74453d Merge branch 'dl/compat-cleanup'
59438be06c Merge branch 'js/visual-studio'
cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone'
af2abd870b fast-export: fix exporting a tag and nothing else
c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor
dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit
fd5b820d9c user-manual.txt: change header notation
e79b34533a user-manual.txt: add missing section label
b503a2d515 Makefile: emulate compile in $(HCO) target better
af26e2a9d2 pack-bitmap.h: remove magic number
b06fdead04 promisor-remote.h: include missing header
97b989ee3a apply.h: include missing header
4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name
d928a8388a t0028: add more tests
0b63fd6965 t0028: fix test for UTF-16-LE-BOM
fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration
2e09c01232 name-rev: avoid cutoff timestamp underflow
8464f94aeb promisor-remote.h: drop extern from function declaration
75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp
24c681794f doc: MyFirstContribution: fix cmd placement instructions
c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode
60c60b627e Merge branch 'py/git-git-extra-stuff'
faf420e05a treewide: correct several "up-to-date" to "up to date"
b71c6c3b64 Fix build with core.autocrlf=true
16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff
26e3d1cbea .mailmap: update email address of Andrey Mazo
27ea41c0b4 t/helper: ignore only executable files
7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()
83e3ad3b12 merge-recursive: symlink's descendants not in way
34933d0eff stash: make sure to write refreshed cache
e080b34540 merge: use refresh_and_write_cache
22184497a3 factor out refresh_and_write_cache function
7371612255 commit-graph: add --[no-]progress to write and verify
47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW
253bfe49bd SubmittingPatches: git-gui has a new maintainer
d17ae00c97 hg-to-git: make it compatible with both python3 and python2
4c86140027 Third batch
f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http'
627b826834 Merge branch 'md/list-objects-filter-combo'
b9ac6c59b8 Merge branch 'cc/multi-promisor'
de67293e74 Merge branch 'sg/line-log-tree-diff-optim'
95486229e3 Merge branch 'sg/complete-configuration-variables'
f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook'
a2e524ecf3 Merge branch 'cb/curl-use-xmalloc'
128666753b Merge branch 'jk/drop-release-pack-memory'
917a319ea5 Merge branch 'js/rebase-r-strategy'
7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui
4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout()
0d4304c124 doc: fix reference to --ignore-submodules
af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py
8a3a6817e2 Merge gitk to pick up emergency build fix
2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po
9027af58e2 Makefile: run coccicheck on more source files
43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES)
5dedf7de53 Makefile: define THIRD_PARTY_SOURCES
902b90cf42 clean: fix theoretical path corruption
ca8b5390db clean: rewrap overly long line
09487f2cba clean: avoid removing untracked files in a nested git repository
e86bbcf987 clean: disambiguate the definition of -d
3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run
29b577b960 dir: add commentary explaining match_pathspec_item's return value
89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it
a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case
404ebceda0 dir: also check directories for matching pathspecs
a5e916c745 dir: fix off-by-one error in match_pathspec_item
bbbb6b0b89 dir: fix typo in comment
7541cc5302 t7300: add testcases showing failure to clean specified pathspecs
0eb7c37a8a diff, log doc: small grammer, format, and language fixes
6fae6bd518 diff, log doc: say "patch text" instead of "patches"
2bb74b53a4 Test the progress display
bbf47568ad Revert "progress: use term_clear_line()"
cf6a2d2557 Makefile: strip leading ./ in $(LIB_H)
b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup
689a146c91 commit-graph: use commit_list_count()
59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N"
a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N"
a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base"
cf34337f98 list-objects-filter: give a more specific error sparse parsing error
4c96a77594 list-objects-filter: delay parsing of sparse oid
72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter
83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer
7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>`
226daba280 Doc/Makefile: give mansource/-version/-manual attributes
40e747e89d git-submodule.txt: fix AsciiDoc formatting error
f6461b82b9 Documentation: fix build with Asciidoctor 2
3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
f7a8834ba4 Merge branch 'bp/amend-toggle-bind'
ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit"
9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes
d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog
beffae768a gitk: Add Chinese (zh_CN) translation
56d9cbe68b packfile: expose get_delta_base()
bab28d9f97 builtin/pack-objects: report reused packfile objects
6c8ec8c30a Merge branch 'bw/commit-scrollbuffer'
acfa495519 Merge branch 'bw/amend-checkbutton'
da08d559b7 git-gui: add horizontal scrollbar to commit buffer
ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton
aeeb978ba6 completion: teach archive to use __gitcomp_builtin
2b9bd488ae completion: teach rebase to use __gitcomp_builtin
d49dffde9a completion: add missing completions for log, diff, show
6abada1880 upload-pack: disable commit graph more gently for shallow traversal
fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time
72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set
4fd39c76e6 doc: minor formatting fix
29f4332e66 Quit passing 'now' to date code
c77abf0460 Merge branch 'py/revert-hunks-lines'
5a2bb62180 Merge branch 'bp/widget-focus-hotkeys'
e07446ed5f git-gui: add hotkeys to set widget focus
f981ec18cf cache-tree: do not lazy-fetch tentative tree
f1d4a28250 Second batch
c8ada15456 Merge branch 'bc/reread-attributes-during-rebase'
8f3ba423e7 Merge branch 'tg/t0021-racefix'
a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email'
d49c2c3466 Merge branch 'sb/userdiff-dts'
2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe'
4c49dd042d Merge branch 'nd/diff-parseopt'
d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix'
8ce8a63b46 Merge branch 'ds/midx-expire-repack'
9437394661 Merge branch 'cb/fetch-set-upstream'
af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix'
fa9e7934c7 Merge branch 'bm/repository-layout-typofix'
d1a251a1fa Merge branch 'en/checkout-mismerge-fix'
e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental'
f4f8dfe127 Merge branch 'ds/feature-macros'
4a12f89865 Merge branch 'jk/eoo'
b4a1eec332 Merge branch 'jk/repo-init-cleanup'
70336bd50a Merge branch 'py/git-gui-do-quit'
ad7c543e3b grep: skip UTF8 checks explicitly
0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration()
b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration
4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor
b7e1ba5649 git-merge-index.txt: wrap shell listing in "----"
38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----"
5371813768 git-ls-remote.txt: wrap shell listing in "----"
1925fe0c8a Documentation: wrap config listings in "----"
922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor
2017956a19 Documentation: wrap blocks with "--"
dd2e50a84e commit-graph: turn off save_commit_buffer
67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits
806278dead commit-graph.c: handle corrupt/missing trees
16749b8dd2 commit-graph.c: handle commit parsing errors
23424ea759 t/t5318: introduce failing 'git commit-graph write' tests
bf1e28e0ad builtin/rebase.c: Remove pointless message
d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing
bd482d6e33 t: use common $SQ variable
3a37876b5d pack-objects: drop packlist index_pos optimization
7e6b96c73b test-read-cache: drop namelen variable
e4b369069e diff-delta: set size out-parameter to 0 for NULL delta
7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint
f1cbd033e2 pack-objects: use object_id in packlist_alloc()
0dfed92dfd git-am: handle missing "author" when parsing commit
3960290675 ci: restore running httpd tests
6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests
c77722b3ea use get_tagged_oid()
dad3f0607b tag: factor out get_tagged_oid()
468ce99b77 unpack-trees: rename 'is_excluded_from_list()'
65edd96aec treewide: rename 'exclude' methods to 'pattern'
4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_'
caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list'
ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern'
483e861111 t9902: use a non-deprecated command for testing
9df53c5de6 Recommend git-filter-repo instead of git-filter-branch
7b6ad97939 t6006: simplify, fix, and optimize empty message test
50094ca45f config/format.txt: specify default value of format.coverLetter
c1a6f21cd4 Doc: add more detail for git-format-patch
854b5cb46a t4014: stop losing return codes of git commands
dd2b6b6860 t4014: remove confusing pipe in check_threading()
6bd26f58ea t4014: use test_line_count() where possible
c6ec6dadba t4014: let sed open its own files
f2e2fa8f60 t4014: drop redirections to /dev/null
460609cbd5 t4014: use indentable here-docs
92014b69bb t4014: remove spaces after redirect operators
0ab74e979c t4014: use sq for test case names
cb46c40662 t4014: move closing sq onto its own line
b562a54c01 t4014: s/expected/expect/
e770fbfeff t3005: remove unused variable
da280f5f1a t: use LF variable defined in the test harness
7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch
552fc5016f mingw: apply array.cocci rule
476998d05b t3427: accelerate this test by using fast-export and fast-import
aac6ff7b5b .gitignore: stop ignoring `.manifest` files
2c65d90f75 am: reload .gitattributes after patching it
1577dc0f7c tree: simplify parse_tree_indirect()
50f26bd035 fetch: add fetch.writeCommitGraph config setting
8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set
27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options
0a8bc7068f clarify documentation for remote helpers
80e3658647 help: make help_unknown_ref() NORETURN
313677627a checkout: add simple check for 'git checkout -b'
3441de5b9c gitk: Make web links clickable
a4fa2f0a4c git-gui: allow undoing last revert
414d924beb rebase: teach rebase --keep-base
6330209d7d rebase tests: test linear branch topology
4effc5bc96 rebase: fast-forward --fork-point in more cases
c0efb4c1dd rebase: fast-forward --onto in more cases
2b318aa6c3 rebase: refactor can_fast_forward into goto tower
c9efc21683 t3432: test for --no-ff's interaction with fast-forward
1ebec8dfc1 fast-import: duplicate into history rather than passing ownership
9756082b3c fast-import: duplicate parsed encoding string
86ae43da6a status: mention --skip for revert and cherry-pick
b1b16bba96 completion: add --skip for cherry-pick and revert
deaa65a754 completion: merge options for cherry-pick and revert
4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
793ac7e309 t3432: test rebase fast-forward behavior
359ecebc34 t3431: add rebase --fork-point tests
502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage
ff61681b46 grep: refactor and simplify PCRE1 support
8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1
1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning()
fd99c2dd9b grep: use return value of strbuf_detach()
82f51af345 log-tree: always use return value of strbuf_detach()
7e92756751 http: don't leak urlmatch_config.vars
9784f97321 commit: free the right buffer in release_commit_memory
ce17feb1b3 path: add a function to check for path suffix
60d198d022 banned.h: fix vsprintf()'s ban message
60fe477a0b notes: avoid potential use-after-free during insertion
779ad6641b notes: avoid leaking duplicate entries
4e1a641ee3 mingw: fix launching of externals from Unicode paths
5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly
e2683d51d9 Fix .git/ discovery at the root of UNC shares
d17f2124a7 setup_git_directory(): handle UNC paths correctly
ebb8d2c90f mingw: support UNC in git clone file://server/share/repo
0c37c41d13 t4009: make hash size independent
c1f3dfcc23 t4002: make hash independent
8cc5ff83c3 t4000: make hash size independent
c784815073 t3903: abstract away SHA-1-specific constants
2ccdfb1c78 git-gui: return early when patch fails to apply
62bd99934b git-gui: allow reverting selected hunk
5f0a516de9 git-gui: allow reverting selected lines
fddf2ebe38 transport: teach all vtables to allow fetch first
ac3fda82bf transport-helper: skip ls-refs if unnecessary
745f681289 First batch after Git 2.23
d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg'
22e86e85cb Merge branch 'en/fast-import-merge-doc'
9c7573581c Merge branch 'jk/perf-no-dups'
4336fdb2ef Merge branch 'rs/nedalloc-fixlets'
8ae7a46c4d Merge branch 'sg/show-failed-test-names'
6ba06b582b Merge branch 'sg/commit-graph-validate'
072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix'
207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix'
77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests'
1b01cdbf2e Merge branch 'jk/tree-walk-overflow'
8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix'
307179732d Merge branch 'mt/grep-submodules-working-tree'
58166c2e9d t0021: make sure clean filter runs
8b3f33ef11 ref-filter: initialize empty name or email fields
3c81760bc6 userdiff: add a builtin pattern for dts files
fe49814409 t4014: drop unnecessary blank lines from test cases
a2bb801f6a line-log: avoid unnecessary full tree diffs
eef5204190 line-log: extract pathspec parsing from line ranges into a helper function
a63694f523 diff: skip GITLINK when lazy fetching missing objs
7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe
19800bdc3f parseopt: move definition of enum parse_opt_result up
415b770b88 packfile.h: drop extern from function declaration
acb49d1cc8 t3800: make hash-size independent
ca6ba94200 t3600: make hash size independent
19ce5496c2 t3506: make hash independent
9a6738c061 t3430: avoid hard-coded object IDs
4dd1b5f90f t3404: abstract away SHA-1-specific constants
b99bfc7a6c t3306: abstract away SHA-1-specific constants
e3e9d02e35 t3305: make hash size independent
b408cf8cf6 t3301: abstract away SHA-1-specific constants
b561edd213 t3206: abstract away hash size constants
a5f61c7d13 t3201: abstract away SHA-1-specific constants
1c24a54ea4 repository-layout.txt: correct pluralization of 'object'
b0a3186140 sequencer: simplify root commit creation
a47ba3c777 rebase -i: check for updated todo after squash and reword
450efe2d53 rebase -i: always update HEAD before rewording
c581e4a749 grep: under --debug, show whether PCRE JIT is enabled
aaa95dfa05 midx: switch to using the_hash_algo
be8e172e9f builtin/show-index: replace sha1_to_hex
3f34d70d40 rerere: replace sha1_to_hex
fc06be3b7f builtin/receive-pack: replace sha1_to_hex
69fa337060 builtin/index-pack: replace sha1_to_hex
3a4d7aa5ae packfile: replace sha1_to_hex
e0cb7cdb89 wt-status: convert struct wt_status to object_id
8d4d86b0f0 cache: remove null_sha1
f6ca67d673 builtin/worktree: switch null_sha1 to null_oid
dd336a5511 builtin/repack: write object IDs of the proper length
894c0f66bb pack-write: use hash_to_hex when writing checksums
4439c7a360 sequencer: convert to use the_hash_algo
95518faac1 bisect: switch to using the_hash_algo
e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo
fe9fec45f6 config: use the_hash_algo in abbrev comparison
976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
703d2d4193 bundle: switch to use the_hash_algo
9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo
7962e046ff show-index: switch hard-coded constants to the_hash_algo
fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ
7e0d029f18 builtin/rev-parse: switch to use the_hash_algo
319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo
fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo
f6af19a9ad fetch-pack: use parse_oid_hex
36261e42ec patch-id: convert to use the_hash_algo
28ba1830d0 builtin/replace: make hash size independent
24bc1a1292 pull, fetch: add --set-upstream option
71d41ff651 archive-tar: turn length miscalculation warning into BUG
17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header()
82a46af13e archive-tar: fix pax extended header length calculation
4060c1990a archive-tar: report wrong pax extended header length
4615a8cb5b merge-recursive: alphabetize include list
45ef16f77a merge-recursive: add sanity checks for relevant merge_options
f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
5bf7e5779e merge-recursive: split internal fields into a separate struct
e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output
a779fb829b merge-recursive: comment and reorder the merge_options fields
8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options
7c0a6c8e47 merge-recursive: move some definitions around to clean up the header
c749ab1da8 merge-recursive: rename merge_options argument to opt in header
bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity
ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list
4d7101e25c merge-recursive: fix some overly long lines
724dd767b2 cache-tree: share code between functions writing an index as a tree
345480d1ed merge-recursive: don't force external callers to do our logging
b4db8a2b76 merge-recursive: remove useless parameter in merge_trees()
98a1d3d888 merge-recursive: exit early if index != head
9822175d2b Ensure index matches head before invoking merge machinery, round N
10f751c06b merge-recursive: remove another implicit dependency on the_repository
f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks
8e01251694 merge-recursive: introduce an enum for detect_directory_renames values
743474cbfa merge-recursive: provide a better label for diff3 common ancestor
51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u)
5bace62582 l10n: Update Catalan translation
139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()
65c01c6442 checkout: provide better conflict hunk description with detached HEAD
d8523ca1b9 merge-recursive: be consistent with assert
acb7da05ac checkout: remove duplicate code
93b980e58f http: use xmalloc with cURL
64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental
aaf633c2ad repo-settings: create feature.experimental setting
c6cc4c5afd repo-settings: create feature.manyFiles setting
ad0fb65999 repo-settings: parse core.untrackedCache
31b1de6a09 commit-graph: turn on commit-graph by default
b068d9a250 t6501: use 'git gc' in quiet mode
7211b9e753 repo-settings: consolidate some config settings
507e5470a0 worktree remove: clarify error message on dirty worktree
5af9d5f6c8 completion: complete config variables and values for 'git clone --config='
88cd790d6a completion: complete config variables names and values for 'git clone -c'
dd33472831 completion: complete values of configuration variables after 'git -c var='
e1e00089da completion: complete configuration sections and variable names for 'git -c'
42d0efec59 completion: split _git_config()
d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp()
2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names
d9438873c4 completion: deduplicate configuration sections
7a09a8f093 completion: add tests for 'git config' completion
840d7e5b3c completion: complete more values of more 'color.*' configuration variables
08a12175d8 completion: fix a typo in a comment
9827d4c185 packfile: drop release_pack_memory()
d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed
362f8b280c t/perf: rename duplicate-numbered test script
742ed63345 trace2: cleanup whitespace in perf format
e34430556c trace2: cleanup whitespace in normal format
c2b890aca5 quote: add sq_append_quote_argv_pretty()
ad43e37839 trace2: trim trailing whitespace in normal format error message
04f10d332f trace2: remove dead code in maybe_add_string_va()
da4589ce7e trace2: trim whitespace in region messages in perf target format
0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit
5440eb0ea2 git-gui: call do_quit before destroying the main window
bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook
6098817fd7 git-merge: honor pre-merge-commit hook
a1f3dd7eb3 merge: do no-verify like commit
f78f6c7e0c t7503: verify proper hook execution
70597e8386 nedmalloc: avoid compiler warning about unused value
c9b9c09dae nedmalloc: do assignments only after the declaration section
22932d9169 config: stop checking whether the_repository is NULL
5732f2b1ef common-main: delay trace2 initialization
58ebccb478 t1309: use short branch name in includeIf.onbranch test
67feca3b1c gitcli: document --end-of-options
51b4594b40 parse-options: allow --end-of-options as a synonym for "--"
19e8789b23 revision: allow --end-of-options to end option parsing
ffe1afe67c tests: show the test name and number at the start of verbose output
96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests
7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits'
39d8831856 commit-graph: turn a group of write-related macro flags into an enum
9916073be5 t5318-commit-graph: use 'test_expect_code'
620c09e1b6 restore: add test for deleted ita files
ecd72042de checkout.c: unstage empty deleted ita files
a613d4f817 pack-refs: always refresh after taking the lock file
decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd'
371df1bea9 trace2: cleanup column alignment in perf target format
5aa02f9868 tree-walk: harden make_traverse_path() length computations
c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path()
b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len()
37806080d7 tree-walk: use size_t consistently
7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh'
12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh'
9055384710 tree-walk: drop oid from traverse_info
947208b725 setup_traverse_info(): stop copying oid
e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
a63f990d92 t3418: test `rebase -r` with merge strategies
5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges`
e145d99347 rebase -r: support merge strategies other than `recursive`
4e6023b13a t3427: fix another incorrect assumption
f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced
a9c71073da t3427: fix erroneous assumption
b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three
d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case
c248d32cdb t3427: simplify the `setup` test case significantly
8c1e24048a t3427: add a clarifying comment
5efed0ecf9 rebase: fold git-rebase--common into the -p backend
68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone
2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive`
6180b20239 t3400: stop referring to the scripted rebase
d5b581f228 Drop unused git-rebase--am.sh
814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation
6a289d45c0 grep: fix worktree case in submodules
870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching
8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data
09872f6418 grep: create a "is_fixed" member in "grep_pat"
8a35b540a9 grep: consistently use "p->fixed" in compile_regexp()
685668faaa grep: stop using a custom JIT stack with PCRE v1
34489239d0 grep: stop "using" a custom JIT stack with PCRE v2
04bef50c01 grep: remove overly paranoid BUG(...) code
b65abcafc7 grep: use PCRE v2 for optimized fixed-string search
48de2a768c grep: remove the kwset optimization
45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern>
25754125ce grep: make the behavior for NUL-byte in patterns sane
d316af059d grep tests: move binary pattern tests into their own file
471dac5d2c grep tests: move "grep binary" alongside the rest
f463beb805 grep: inline the return value of a function call used only once
b14cf112e2 t4210: skip more command-line encoding tests on MinGW
44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
4e2443b181 log tests: test regex backends in "--encode=<enc>" tests
90d21f9ebf list-objects-filter-options: make parser void
5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW
489fc9ee71 list-objects-filter-options: allow mult. --filter
c2694952e3 strbuf: give URL-encoding API a char predicate fn
cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list
f56f764279 list-objects-filter-options: move error check up
e987df5fe6 list-objects-filter: implement composite filters
842b00516a list-objects-filter-options: always supply *errbuf
7a7c7f4a6d list-objects-filter: put omits set in filter struct
9430147ca0 list-objects-filter: encapsulate filter components
4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c
60b7a92d84 Move repository_format_partial_clone to promisor-remote.c
db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
75de085211 remote: add promisor and partial clone config to the doc
7e154badc0 partial-clone: add multiple remotes in the doc
9a4c507886 t0410: test fetching from many promisor remotes
5e46139376 builtin/fetch: remove unique promisor remote limitation
fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter
b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote()
faf2abf496 promisor-remote: use repository_format_partial_clone
9cfebc1f3b promisor-remote: add promisor_remote_reinit()
9e27beaa23 promisor-remote: implement promisor_remote_get_direct()
48de315817 Add initial support for many promisor remotes
2e860675b6 fetch-object: make functions return an error code
c59c7c879e t0410: remove pipes after git commands
git-subtree-dir: third_party/git
git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
2020-05-22 18:46:45 +02:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bundle.c:74 builtin/pack-objects.c:3487
|
|
|
|
|
msgid "similar to --all-progress when progress meter is shown"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bundle.c:76
|
|
|
|
|
msgid "specify bundle format version"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bundle.c:96
|
|
|
|
|
msgid "Need a repository to create a bundle."
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bundle.c:107
|
|
|
|
|
msgid "do not show bundle details"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bundle.c:122
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s is okay\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bundle.c:163
|
|
|
|
|
msgid "Need a repository to unbundle."
|
Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96
af6b65d45e Git 2.26.2
7397ca3373 Git 2.25.4
b86a4be245 Git 2.24.3
f2771efd07 Git 2.23.3
c9808fa014 Git 2.22.4
9206d27eb5 Git 2.21.3
041bc65923 Git 2.20.4
76b54ee9b9 Git 2.19.5
ba6f0905fd Git 2.18.4
df5be6dc3f Git 2.17.5
1a3609e402 fsck: reject URL with empty host in .gitmodules
e7fab62b73 credential: treat URL with empty scheme as invalid
c44088ecc4 credential: treat URL without scheme as invalid
fe29a9b7b0 credential: die() when parsing invalid urls
a2b26ffb1a fsck: convert gitmodules url to URL passed to curl
8ba8ed568e credential: refuse to operate when missing host or protocol
24036686c4 credential: parse URL without host as empty host, not unset
73aafe9bc2 t0300: use more realistic inputs
a88dbd2f8c t0300: make "quit" helper more realistic
de49261b05 Git 2.26.1
274b9cc253 Git 2.26
55a7568606 Merge branch 'en/rebase-backend'
c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git
1557364fb4 l10n: tr.po: change file mode to 644
2da1b05674 t3419: prevent failure when run with EXPENSIVE
1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0
5804c6ec40 l10n: de.po: add missing space
98cedd0233 Merge https://github.com/prati0100/git-gui
4914ba4bcf l10n: tr: Fix a couple of ambiguities
a5728022e0 Merge branch 'py/remove-tcloo'
7fcb965970 RelNotes/2.26.0: fix various typos
f0c03bcf95 l10n: Update Catalan translation
67b0a24910 Git 2.25.3
be8661a328 Sync with Git 2.25.2
0822e66b5d Git 2.25.2
65588b0b2e unicode: update the width tables to Unicode 13.0
7be274b0ff Merge branch 'js/ci-windows-update' into maint
9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint
221887a492 Merge branch 'jk/doc-credential-helper' into maint
32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint
fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint
618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint
50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint
fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint
41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint
2d7247af6f Merge branch 'am/mingw-poll-fix' into maint
4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint
76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint
569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint
16a4bf1035 Merge branch 'en/check-ignore' into maint
3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint
56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint
1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint
7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint
fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint
a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint
93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint
dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint
758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint
f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint
506223f9c5 Git 2.24.2
17a02783d8 Git 2.23.2
69fab82147 Git 2.22.3
fe22686494 Git 2.21.2
d1259ce117 Git 2.20.3
a5979d7009 Git 2.19.4
21a3e5016b Git 2.18.3
c42c0f1297 Git 2.17.4
d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u)
3891a84ccd git-gui: create a new namespace for chord script evaluation
8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5
440e7442d1 l10n: zh_CN: Revise v2.26.0 translation
2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2
6c85aac65f Git 2.26-rc2
74f172e39e Merge branch 'en/test-cleanup'
e96327c947 Merge branch 'es/outside-repo-errmsg-hints'
ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0
15fa8d9667 l10n: vi: fix translation + grammar
5c20398699 prefix_path: show gitdir if worktree unavailable
1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated)
c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated)
a4a2f64642 Merge branch 'js/askpass-coerce-utf8'
850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows
d769dcc5cd Merge branch 'py/blame-status-error'
70e24186c0 t6022, t6046: fix flaky files-are-updated checks
30e9940356 Hopefully the final batch before -rc2
b4f0038525 Merge branch 'en/rebase-backend'
25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master
07259e74ec fsck: detect gitmodules URLs with embedded newlines
c716fe4bd9 credential: detect unrepresentable values when parsing urls
17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr
9a6bbee800 credential: avoid writing values with newlines
17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2
1afe18a3bb l10n: es: 2.26.0 round#2
5ab9217a3c Merge branch of github.com:alshopov/git-po into master
c6713676d6 Merge branch of github.com:bitigchi/git-po into master
b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t)
2713dec02d l10n: tr: v2.26.0 round 2
c9ef57cc3a l10n: fr : v2.26.0 rnd 2
120b1eb731 git-rebase.txt: highlight backend differences with commit rewording
9a1b7474d6 sequencer: clear state upon dropping a become-empty commit
937d143630 i18n: unmark a message in rebase.c
a56d361f66 Merge branch 'ds/sparse-add'
5fa9169ced Merge branch 'dr/push-remote-ref-update'
cdef998b46 Merge branch 'jc/doc-single-h-is-for-help'
051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed)
52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master
9643441983 l10n: tr: Add glossary for Turkish translations
438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv
fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git
2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u)
dd2c269652 l10n: tr: Add Turkish translations
8f4f099f8b l10n: tr: Add Turkish translation team info
b4374e96c8 Git 2.26-rc1
4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch'
3658d77f8e Merge branch 'hd/show-one-mergetag-fix'
6125104b88 Merge branch 'rt/format-zero-length-fix'
1ac37deba2 Merge branch 'am/mingw-poll-fix'
cf372dc815 Merge branch 'en/test-cleanup'
d1075adfdf Merge branch 'en/merge-path-collision'
a4fd114ffc Merge branch 'kk/complete-diff-color-moved'
a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file'
0e0d717537 Merge branch 'pb/am-show-current-patch'
9b7f726dfc Merge branch 'am/pathspec-f-f-more'
4605a73073 t1091: don't grep for `strerror()` string
4d9c2902a1 l10n: fr v2.26.0 rnd1
ad182bee3f Merge branch of github.com:alshopov/git-po into master
23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1
98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t)
f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed)
76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po
076cbdcd73 Git 2.26-rc0
0d65f3fb1a t5537: adjust test_oid label
e63cefb024 Merge branch 'hi/gpg-use-check-signature'
5da7329e29 Merge branch 'rs/commit-graph-code-simplification'
0108fc1b46 Merge branch 'js/ci-windows-update'
f3ccd9f0d9 Merge branch 'be/describe-multiroot'
a6b4709302 Merge branch 'ag/rebase-remove-redundant-code'
b22db265d6 Merge branch 'es/recursive-single-branch-clone'
e8e71848ea Merge branch 'jk/nth-packed-object-id'
a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'
4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere'
49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix'
2cbb058669 Merge branch 'bc/wildcard-credential'
25063e2530 Merge branch 'mr/bisect-in-c-1'
f4d7dfce4d Merge branch 'ds/sparse-add'
4d864895a2 t2402: test worktree path when called in .git directory
af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch()
7655b4119d remote-curl: show progress for fetches over dumb HTTP
2f268890c2 The eighth batch for 2.26
aa5a7e02ad Merge branch 'ma/test-cleanup'
58595e713c Merge branch 'rs/blame-typefix-for-fingerprint'
ff41848e99 Merge branch 'rs/micro-cleanups'
4cbf1a0e22 Merge branch 'es/worktree-cleanup'
46703057c1 Merge branch 'ak/test-log-graph'
777815f5f9 Merge branch 'jk/run-command-formatfix'
444cff61b4 Merge branch 'ds/partial-clone-fixes'
48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure'
8c22bd9ff9 Merge branch 'en/rebase-backend'
cb2f5a8e97 Merge branch 'en/check-ignore'
0df82d99da Merge branch 'jk/object-filter-with-bitmap'
80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix'
29b09c518c Merge branch 'jk/doc-diff-parallel'
237a28173f show_one_mergetag: print non-parent in hex form.
5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context"
6d1210e133 l10n: Update Catalan translation
0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification"
7329d94be7 config.mak.dev: re-enable -Wformat-zero-length
7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings
94f4d01932 mingw: workaround for hangs when sending STDIN
1ff466c018 Documentation: clarify that `-h` alone stands for `help`
65bf820d0e t6020: new test with interleaved lexicographic ordering of directories
9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it
d5bb92eced t3035: prefer test_must_fail to bash negation for git commands
b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions
42d180dd01 t602[1236], t6034: modernize test formatting
802050400a merge-recursive: apply collision handling unification to recursive case
7f487ce062 Azure Pipeline: switch to the latest agent pools
5ed9fc3fc8 ci: prevent `perforce` from being quarantined
eafff6e41e t/lib-httpd: avoid using macOS' sed
d68ce906c7 commit-graph: use progress title directly
30b1c7ad9d describe: don't abort too early when searching tags
240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to'
2d2118b814 The seventh batch for 2.26
325eb66830 Merge branch 'es/doc-mentoring'
87f17d790d Merge branch 'es/bright-colors'
d0038f4b31 Merge branch 'bw/remote-rename-update-config'
132f600b06 clone: pass --single-branch during --recurse-submodules
47319576f1 submodule--helper: use C99 named initializer
ffe005576a lib-log-graph: consolidate colored graph cmp logic
989eea958b lib-log-graph: consolidate test_cmp_graph logic
bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching
bb4995fc3f worktree: add utility to find worktree by pathname
a80c4c2214 worktree: improve find_worktree() documentation
2fecc48cad packfile: drop nth_packed_object_sha1()
6ac9760a30 packed_object_info(): use object_id internally for delta base
b99b6bcc57 packed_object_info(): use object_id for returning delta base
63f4a7fc01 pack-check: push oid lookup into loop
e31c71083a pack-check: convert "internal error" die to a BUG()
500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps
f66d4e0250 pack-objects: use object_id struct in pack-reuse code
a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id
3f83fd5e44 pack-objects: read delta base oid into object_id struct
0763671b8e nth_packed_object_oid(): use customary integer return
02bbbe9df9 worktree: drop unused code from get_main_worktree()
27f182b3fc blame: provide type of fingerprints pointer
b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere
df126ca142 t3400: make test clean up after itself
3c29e21eb0 t: drop debug `cat` calls
cac439b56d t9810: drop debug `cat` call
91de82adc9 t4117: check for files using `test_path_is_file`
4ef346482d receive.denyCurrentBranch: respect all worktrees
f8692114db t5509: use a bare repository for test push target
45f274fbb1 get_main_worktree(): allow it to be called in the Git directory
fd0bc17557 completion: add diff --color-moved[-ws]
2ce6d075fa use strpbrk(3) to search for characters from a given set
2b3c430bce quote: use isalnum() to check for alphanumeric characters
a51d9e8f07 t1050: replace test -f with test_path_is_file
3e96c66805 partial-clone: avoid fetching when looking for objects
d0badf8797 partial-clone: demonstrate bugs in partial fetch
539052f42f run-command.h: fix mis-indented struct member
6c11c6a124 sparse-checkout: allow one-character directories in cone mode
aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch
f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch
e8ef1e8d6e am: convert "resume" variable to a struct
bc8620b440 parse-options: convert "command mode" to a flag
62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE()
46fd7b3900 credential: allow wildcard patterns when matching config
82eb249853 credential: use the last matching username in the config
588c70e10f t0300: add tests for some additional cases
732f934408 t1300: add test for urlmatch with multiple wildcards
3fa0e04667 mailmap: add an additional email address for brian m. carlson
8a98758a8d stash push: support the --pathspec-from-file option
8c3713cede stash: eliminate crude option parsing
3f3d8068f5 doc: stash: synchronize <pathspec> description
b22909144c doc: stash: document more options
0093abc286 doc: stash: split options from description (2)
2b7460d167 doc: stash: split options from description (1)
5f393dc3aa rm: support the --pathspec-from-file option
fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags
73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure
6c69f22233 bisect: libify `bisect_next_all`
9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents
45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents
cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents
e8e3ce6718 bisect: libify `bisect_checkout`
ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents
7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()`
680e8a01e5 bisect: add enum to represent bisect returning codes
bfacfce7d9 bisect--helper: introduce new `decide_next()` function
b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0
292731c4c2 bisect--helper: change `retval` to `res`
16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays
7ec8125fba check-ignore: fix documentation and implementation to match
2607d39da3 doc-diff: use single-colon rule in rendering Makefile
0aa6ce3094 doc/config/push: use longer "--" line for preformatted example
20a5fd881a rev-list --count: comment on the use of count_right++
63a58457e0 Merge branch 'py/missing-bracket'
51ebf55b93 The sixth batch for 2.26
f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints'
123538444f Merge branch 'jk/doc-credential-helper'
e154451a2f Merge branch 'js/mingw-open-in-gdb'
fc25a19265 Merge branch 'js/test-unc-fetch'
6365058605 Merge branch 'js/test-avoid-pipe'
966b69f02f Merge branch 'js/test-write-junit-xml-fix'
d880c3de23 Merge branch 'jk/mailinfo-cleanup'
5d55554b1d Merge branch 'mr/show-config-scope'
9f3f38769d Merge branch 'rs/strbuf-insertstr'
cbecc168d4 Merge branch 'rs/parse-options-concat-dup'
5af345a438 Merge branch 'bc/hash-independent-tests-part-8'
0460c109c3 Merge branch 'rs/name-rev-memsave'
6b9919c0a2 git-gui: add missing close bracket
5897e5ac96 Merge branch 'cs/german-translation'
cf85a32eb6 git-gui: update German translation
5096e51c54 git-gui: extend translation glossary template with more terms
8b85bb1b70 git-gui: update pot template and German translation to current source code
e68e29171c Sync with 2.25.1
c522f061d5 Git 2.25.1
10cdb9f38a rebase: rename the two primary rebase backends
2ac0d6273f rebase: change the default backend from "am" to "merge"
8295ed690b rebase: make the backend configurable via config setting
76340c8107 rebase tests: repeat some tests using the merge backend instead of am
980b482d28 rebase tests: mark tests specific to the am-backend with --am
c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases
6d04ce75c4 git-prompt: change the prompt for interactive-based rebases
52eb738d6b rebase: add an --am option
8af14f0859 rebase: move incompatibility checks between backend options a bit earlier
be50c938df git-rebase.txt: add more details about behavioral differences of backends
befb89ce7c rebase: allow more types of rebases to fast-forward
9a70f3d4ae t3432: make these tests work with either am or merge backends
93122c985a rebase: fix handling of restrict_revision
55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer
8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling
7db00f0b3b t3406: simplify an already simple test
e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty
d48e5e21da rebase (interactive-backend): make --keep-empty the default
e0020b2f82 prefix_path: show gitdir when arg is outside repo
cc4f2eb828 doc: move credential helper info into gitcredentials(7)
bfdd66e72f Sync with maint
7ae7e234c7 The fifth batch for 2.26
53c3be2c29 Merge branch 'tb/commit-graph-object-dir'
7b029ebaef Merge branch 'jk/index-pack-dupfix'
aa21cc97bd Merge branch 'jk/alloc-cleanups'
883326077a Merge branch 'jh/notes-fanout-fix'
f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule'
78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs'
df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'
433b8aac2e Merge branch 'ds/sparse-checkout-harden'
4a77434bc8 Merge branch 'ld/p4-cleanup-processes'
8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone'
09e48400a3 Merge branch 'jk/get-oid-error-message-i18n'
4dbeecba27 Merge branch 'ag/edit-todo-drop-check'
f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2'
d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout'
251187084d Merge branch 'js/rebase-i-with-colliding-hash'
c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix'
56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store'
0da63da794 Merge branch 'jn/promote-proto2-to-default'
a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup'
daef1b300b Merge branch 'hw/advice-add-nothing'
6141e0cc00 Merge branch 'js/convert-typofix' into maint
4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint
5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint
b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint
7137d6089b Merge branch 'ms/doc-bundle-format' into maint
52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint
0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint
1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint
cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint
153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint
8857657cc9 Merge branch 'jt/t5616-robustify' into maint
1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint
f468972671 Merge branch 'bc/misconception-doc' into maint
6e69042e26 Merge branch 'bc/author-committer-doc' into maint
650ed395be Merge branch 'ds/refmap-doc' into maint
80b806f1a8 Merge branch 'bc/actualmente' into maint
eceff4ba12 Merge branch 'rt/submodule-i18n' into maint
8a17eb7972 Merge branch 'jk/test-fixes' into maint
54bbadaeca Merge branch 'jk/asan-build-fix' into maint
8dbeba198e Merge branch 'ds/sparse-cone' into maint
e361f36f61 Merge branch 'nd/switch-and-restore' into maint
4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint
ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint
5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint
c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint
d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint
9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint
3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint
3ab3185f99 pack-objects: support filters with bitmaps
84243da129 pack-bitmap: implement BLOB_LIMIT filtering
4f3bd5606a pack-bitmap: implement BLOB_NONE filtering
cc4aa28506 bitmap: add bitmap_unset() function
2aaeb9ac41 rev-list: use bitmap filters for traversal
6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure
4eb707ebd6 rev-list: allow commit-only bitmap traversals
ea047a8eb4 t5310: factor out bitmap traversal comparison
608d9c9365 rev-list: allow bitmaps when counting objects
55cb10f9b5 rev-list: make --count work with --objects
792f811998 rev-list: factor out bitmap-optimized routines
d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs
08809c09aa mingw: add a helper function to attach GDB to the current process
bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths
de26f02db1 t9001, t9116: avoid pipes
a2dc43414c MyFirstContribution: rephrase contact info
e03f928e2a rev-list: fallback to non-bitmap traversal when filtering
acac50dd8c pack-bitmap: fix leak of haves/wants object lists
551cf8b655 pack-bitmap: factor out type iterator initialization
d8437c57fa The fourth batch for 2.26
a3dcf84df0 Merge branch 'js/convert-typofix'
0de2d1409b Merge branch 'js/ci-squelch-doc-warning'
0410c2ba31 Merge branch 'jb/multi-pack-index-docfix'
0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example'
e99c325bb4 Merge branch 'ms/doc-bundle-format'
afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix'
db72f8c940 Merge branch 'jb/parse-options-message-fix'
3d2471ba85 Merge branch 'ma/filter-branch-doc-caret'
b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path'
44cba9c4b3 Merge branch 'jc/skip-prefix'
556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index'
17e4a1b141 Merge branch 'hw/doc-git-dir'
4cf7f48891 Merge branch 'jk/push-default-doc'
b783391018 Merge branch 'jk/clang-sanitizer-fixes'
a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache'
3f7553acf5 Merge branch 'jt/t5616-robustify'
341f8a6476 Merge branch 'jk/escaped-wildcard-dwim'
b486d2ee81 Merge branch 'jn/pretend-object-doc'
076ee3e8a2 tests: fix --write-junit-xml with subshells
2b0f19fa7a convert: fix typo
c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors
1751b09a92 color.c: support bright aixterm colors
4a28eb0ae4 color.c: refactor color_output arguments
f696a2b1c8 mailinfo: factor out some repeated header handling
ffbea1816d mailinfo: be more liberal with header whitespace
f447d0293e mailinfo: simplify parsing of header values
b6537d83ee mailinfo: treat header values as C strings
ef07659926 sparse-checkout: work with Windows paths
2631dc879d sparse-checkout: create 'add' subcommand
4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand
6fb705abcb sparse-checkout: extract add_patterns_from_input()
b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config
f2a2327a4a config: provide access to the current line number
923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values
ceff1a1308 remote: clean-up config callback
1a83068c26 remote: clean-up by returning early to avoid one indentation
88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types
145d59f482 config: add '--show-scope' to print the scope of a config value
9a83d088ee submodule-config: add subomdule config scope
e37efa40e1 config: teach git_config_source to remember its scope
5c105a842e config: preserve scope in do_git_config_sequence
6766e41b8a config: clarify meaning of command line scoping
6dc905d974 config: split repo scope to local and worktree
a5cb4204b6 config: make scope_name non-static and rename it
30183894ea ci: ignore rubygems warning in the "Documentation" job
7a9f8ca805 parse-options: simplify parse_options_dup()
c84078573e parse-options: const parse_options_concat() parameters
f904f9025f parse-options: factor out parse_options_count()
a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat()
517b60564e mailinfo: don't insert header prefix for handle_content_type()
a91cc7fad0 strbuf: add and use strbuf_insertstr()
eb31044ff7 pack-format: correct multi-pack-index description
9299f84921 diff-options.txt: avoid "regex" overload in example
7378ec90e1 doc: describe Git bundle format
f3037657e8 t6024: update for SHA-256
edf04243b2 t6006: make hash size independent
5db24dcffd t6000: abstract away SHA-1-specific constants
d341e0805d t5703: make test work with SHA-256
88ed241a7e t5607: make hash size independent
48c10cc0e6 t5318: update for SHA-256
f7ae8e69b6 t5515: make test hash independent
e70649bb66 t5321: make test hash independent
a30f93b143 t5313: make test hash independent
a79eec220b t5309: make test hash independent
796d1383a3 t5302: make hash size independent
417e45e5e3 t4060: make test work with SHA-256
dfa5f53e78 t4211: add test cases for SHA-256
f743e8f5b3 t4211: move SHA-1-specific test cases into a directory
72f936b120 t4013: make test hash independent
5df0f11f07 t3311: make test work with SHA-256
07877f393c t3310: make test work with SHA-256
6025e898d6 t3309: make test work with SHA-256
7b1a1822fe t3308: make test work with SHA-256
94db7e3e93 t3206: make hash size independent
db12505c2c t/lib-pack: support SHA-256
303b3c1c46 submodule: add newline on invalid submodule error
887a0fd573 add: change advice config variables used by the add API
de93cc14ab The third batch for 2.26
ea46d9097b Merge branch 'mt/sparse-checkout-doc-update'
ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix'
b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend'
7ab963e122 Merge branch 'en/fill-directory-fixes-more'
f52ab33616 Merge branch 'bc/hash-independent-tests-part-7'
25794d6ce9 Merge branch 'km/submodule-add-errmsg'
d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity'
76c57fedfa Merge branch 'js/add-p-leftover-bits'
9a5315edfd Merge branch 'js/patch-mode-in-others-in-c'
381e8e9de1 Merge branch 'dl/test-must-fail-fixes'
395518cf7a parse-options: lose an unnecessary space in an error message
079f970971 name-rev: sort tip names before applying
2d53975488 name-rev: release unused name strings
977dc1912b name-rev: generate name strings only if they are better
1c56fc2084 name-rev: pre-size buffer in get_parent_name()
ddc42ec786 name-rev: factor out get_parent_name()
f13ca7cef5 name-rev: put struct rev_name into commit slab
d689d6d82f name-rev: don't _peek() in create_or_update_name()
15a4205d96 name-rev: don't leak path copy in name_ref()
36d2419c9a name-rev: respect const qualifier
71620ca86c name-rev: remove unused typedef
3e2feb0d64 name-rev: rewrite create_or_update_name()
a21781011f index-pack: downgrade twice-resolved REF_DELTA to die()
dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout
e1c5253951 t3305: check notes fanout more carefully and robustly
e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks
a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st'
ad2dd5bb63 commit-graph.c: remove path normalization, comparison
13c2499249 commit-graph.h: store object directory in 'struct commit_graph'
0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context'
f38c92452d t7400: testcase for submodule status on unregistered inner git repos
5290d45134 tree-walk.c: break circular dependency with unpack-trees
f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch
d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode
e53ffe2704 sparse-checkout: escape all glob characters on write
e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand
bd64de42de sparse-checkout: unquote C-style strings over --stdin
d585f0e799 sparse-checkout: write escaped patterns in cone mode
4f52c2ce6c sparse-checkout: properly match escaped characters
9abc60f801 sparse-checkout: warn on globs in cone patterns
145136a95a C: use skip_prefix() to avoid hardcoded string length
04e5b3f0b4 submodule foreach: replace $path with $sm_path in example
1793280e91 t5318: don't pass non-object directory to '--object-dir'
da8063522f diff: move diff.wsErrorHighlight to "basic" config
b98d188581 sha1-file: allow check_object_signature() to handle any repo
2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file()
7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare()
c8123e72f6 streaming: allow open_istream() to handle any repo
5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile()
a651946730 cache-tree: use given repo's hash_algo at verify_one()
eb999b3295 diff: make diff_populate_filespec() honor its repo argument
5b0ca878e0 Sync with maint
344ee18728 The second batch
53a83299c7 Merge branch 'bc/misconception-doc'
c9ccf9d09b Merge branch 'bc/author-committer-doc'
0d0fa20c40 Merge branch 'ss/t6025-modernize'
7050624abc Merge branch 'lh/bool-to-type-bool'
4b69f29271 Merge branch 'ds/refmap-doc'
aff812ce3c Merge branch 'bc/actualmente'
38fb56e92a Merge branch 'rt/submodule-i18n'
f0940743fa Merge branch 'js/builtin-add-i-cmds'
0afeb3fdf4 Merge branch 'jk/test-fixes'
808dab2b58 Merge branch 'jk/asan-build-fix'
fec1ff97c2 Merge branch 'sg/completion-worktree'
c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function'
11ad30b887 Merge branch 'hi/gpg-mintrustlevel'
96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases'
d52adee779 Merge branch 'ds/graph-horizontal-edges'
6909474491 Merge branch 'am/update-pathspec-f-f-tests'
043426c8fd Merge branch 'ds/sparse-cone'
34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig'
8dd40c0472 traverse_trees(): use stack array for name entries
667b76ec58 walker_fetch(): avoid raw array length computation
9734b74a8f normalize_path_copy(): document "dst" size expectations
43f33e492a git-p4: avoid leak of file handle when cloning
19fa5ac333 git-p4: check for access to remote host earlier
6026aff5bb git-p4: cleanup better on error exit
ca5b5cce62 git-p4: create helper function importRevisions()
4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable
5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce
837b3a6376 git-p4: make closeStreams() idempotent
b0418303b1 sha1-name: mark get_oid() error messages for translation
2df1aa239c fetch: forgo full connectivity check if --filter
50033772d5 connected: verify promisor-ness of partial clone
d82ad54945 git: update documentation for --git-dir
0ad7144999 .mailmap: map Yi-Jyun Pan's email
c56c48dd07 grep: ignore --recurse-submodules if --no-index is given
8b2a1928f0 doc: drop "explicitly given" from push.default description
cf82bff73f obstack: avoid computing offsets from NULL pointer
3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer
d20bc01a51 avoid computing zero offsets from NULL pointer
7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero
bc3f657f71 t1506: drop space after redirection operator
e5d7b2f65c t1400: avoid "test" string comparisons
5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c
c7a6207591 Sync with maint
7210ca4ee5 .mailmap: fix GGG authoship screwup
37a63faae5 t4124: only mark git command with test_must_fail
a8c663cf65 t3507: use test_path_is_missing()
2def7f017c t3507: fix indentation
e8a1c686ae t3504: do check for conflict marker after failed cherry-pick
1c9fd32fd2 t3419: stop losing return code of git command
c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}()
a781cd6fef t3415: stop losing return codes of git commands
86ce6e0dd1 t3310: extract common notes_merge_files_gone()
245b9ba0ba t3030: use test_path_is_missing()
4a6f11fd7b t2018: replace "sha" with "oid"
62e80fcb48 t2018: don't lose return code of git commands
30c0367668 t2018: teach do_checkout() to accept `!` arg
40caa5366a t2018: be more discerning when checking for expected exit codes
b54128bb0b t5616: make robust to delta base change
4c616c2ba1 merge-recursive: use subtraction to flip stage
ee798742bd merge-recursive: silence -Wxor-used-as-pow warning
39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule
a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin
3b2885ec9b submodule: fix status of initialized but not cloned submodules
ace912bfb8 t7400: add a testcase for submodule status on empty dirs
4bb4fd4290 MyFirstContribution: add avenues for getting help
9e6d3e6417 sparse-checkout: detect short patterns
41de0c6fbc sparse-checkout: cone mode does not recognize "**"
7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone
47dbf10d8a clone: fix --sparse option with URLs
3c754067a1 sparse-checkout: create leading directories
d622c34396 t1091: improve here-docs
522e641748 t1091: use check_files to reduce boilerplate
417be08d02 t1300: create custom config file without special characters
3de7ee369b t1300: fix over-indented HERE-DOCs
329e6ec397 config: fix typo in variable name
767a9c417e rebase -i: stop checking out the tip of the branch to rebase
dfaed02862 fsmonitor: update documentation for hook version and watchman hooks
e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2
d031049da3 completion: add support for sparse-checkout
a402723e48 doc: sparse-checkout: mention --cone option
26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck
b6992261de rebase -i: re-fix short SHA-1 collision
d859dcad94 parse_insn_line(): improve error message when parsing failed
d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects
92fb0db94c pack-objects: add checks for duplicate objects
bb514de356 pack-objects: improve partial packfile reuse
ff483026a9 builtin/pack-objects: introduce obj_is_packed()
e704fc7978 pack-objects: introduce pack.allowPackReuse
2f4af77699 csum-file: introduce hashfile_total()
8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting()
59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile
40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains()
14fbd26044 ewah/bitmap: introduce bitmap_word_alloc()
bc7a3d4dc0 The first batch post 2.25 cycle
09e393d913 Merge branch 'nd/switch-and-restore'
45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport'
0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout'
36da2a8635 Merge branch 'es/unpack-trees-oob-fix'
42096c778d Merge branch 'bc/run-command-nullness-after-free-fix'
1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted'
a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees'
e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached'
9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting'
237a83a943 Merge branch 'dl/credential-netrc'
a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir()
129510a067 t2405: clarify test descriptions and simplify test
4eaadc8493 t2405: use git -C and test_commit -C instead of subshells
773c60a45e t7410: rename to t2405-worktree-submodule.sh
7a2dc95cbc docs: mention when increasing http.postBuffer is valuable
1b13e9032f doc: dissuade users from trying to ignore tracked files
69e104d70e doc: provide guidance on user.name format
813f6025a5 docs: expand on possible and recommended user config options
bc94e5862a doc: move author and committer information to git-commit(1)
7979dfe1d4 l10n: Update Catalan translation
81e3db42f3 templates: fix deprecated type option `--bool`
c513a958b6 t6025: use helpers to replace test -f <path>
70789843bd t6025: modernize style
6a7aca6f01 doc: rm: synchronize <pathspec> description
856249c62a docs: use "currently" for the present time
b40a50264a fetch: document and test --refmap=""
a9ae8fde2e t3404: directly test the behavior of interest
22a69fda19 git-rebase.txt: update description of --allow-empty-message
f1928f04b2 grep: use no. of cores as the default no. of threads
70a9fef240 grep: move driver pre-load out of critical section
1184a95ea2 grep: re-enable threads in non-worktree case
6c307626f1 grep: protect packed_git [re-]initialization
c441ea4edc grep: allow submodule functions to run in parallel
d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules()
1d1729caeb grep: replace grep_read_mutex by internal obj read lock
31877c9aec object-store: allow threaded access to object reading
b1fc9da1c8 replace-object: make replace operations thread-safe
d5b0bac528 grep: fix racy calls in grep_objects()
faf123c730 grep: fix race conditions at grep_submodule()
c3a5bb31c1 grep: fix race conditions on userdiff calls
0222540827 fetch: emphasize failure during submodule fetch
232378479e Sync with maint
e4837b4406 t7800: don't rely on reuse_worktree_file()
fbce03d329 t4018: drop "debugging" cat from hunk-header tests
f65d07fffa Makefile: use compat regex with SANITIZE=address
849e43cc18 built-in add -i: accept open-ended ranges again
d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files
a4ffbbbb99 submodule.c: mark more strings for translation
0cbb60574e dir: point treat_leading_path() warning to the right place
ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent
22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2
f365bf40a0 clean: demonstrate a bug with pathspecs
b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x
277eb5af7c t5604: make hash independent
44b6c05b43 t5601: switch into repository to hash object
7a868c51c2 t5562: use $ZERO_OID
1b8f39fb0d t5540: make hash size independent
a8c17e3bd6 t5537: make hash size independent
832072219c t5530: compute results based on object length
74ad99b1d8 t5512: abstract away SHA-1-specific constants
ba1be1ab45 t5510: make hash size independent
cba472d3ad t5504: make hash algorithm independent
82d5aeb1e6 t5324: make hash size independent
3c5e65cac1 t5319: make test work with SHA-256
235d3cddb8 t5319: change invalid offset for SHA-256 compatibility
1d86c8f0ce t5318: update for SHA-256
525a7f1769 t4300: abstract away SHA-1-specific constants
7a1bcb251b t4204: make hash size independent
cb78f4f0fe t4202: abstract away SHA-1-specific constants
717c939d8f t4200: make hash size independent
08a9dd891c t4134: compute appropriate length constant
215b60bf07 t4066: compute index line in diffs
194264c185 t4054: make hash-size independent
7d5ecd775d completion: list paths and refs for 'git worktree add'
3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands
3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options
367efd54b3 completion: return the index of found word from __git_find_on_cmdline()
d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function
2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper
54887b4689 gpg-interface: add minTrustLevel as a configuration option
684ceae32d fetch: default to protocol version 2
33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION
8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate
b9ab170752 config doc: protocol.version is not experimental
07ef3c6604 fetch test: use more robust test for filtered objects
d6509da620 fetch test: mark test of "skipping" haves as v0-only
a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too
c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function
bf66db37f1 add: use advise function to display hints
c958d3bd0a graph: fix collapse of multiple edges
8588932e20 graph: add test to demonstrate horizontal line bug
d0d0a357a1 t: directly test parse_pathspec_file()
568cabb2fe t: fix quotes tests for --pathspec-from-file
f94f7bd00d t: add tests for error conditions with --pathspec-from-file
b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job
12acdf573a built-in add -p: handle Escape sequences more efficiently
e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode
04f816b125 built-in add -p: respect the `interactive.singlekey` config setting
a5e46e6b01 terminal: add a new function to read a single keystroke
9ea416cb51 terminal: accommodate Git for Windows' default terminal
94ac3c31f7 terminal: make the code of disable_echo() reusable
08b1ea4c39 built-in add -p: handle diff.algorithm
180f48df69 built-in add -p: support interactive.diffFilter
1e4ffc765d t3701: adjust difffilter test
c81638541c submodule add: show 'add --dry-run' stderr when aborting
8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token
56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token
d0654dc308 Git 2.25
b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po
4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'"
ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1
e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master
1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
d78a1968c5 Merge branch 'ma/config-advice-markup-fix'
a20ae3ee29 l10n: Update Catalan translation
49e268e23e mingw: safeguard better against backslashes in file names
4c6c7971e0 unpack-trees: correctly compute result count
63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1
75449c1b39 l10n: de.po: Reword generation numbers
6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t)
3901d2c6bd config/advice.txt: fix description list separator
7a6a90c6ec Git 2.25-rc2
1f5f3ffe5c Merge branch 'ds/graph-assert-fix'
a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix'
202f68b252 Merge branch 'pm/am-in-body-header-doc-update'
7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix'
c5dc20638b Merge branch 'do/gitweb-typofix-in-comments'
fe47c9cb5f Merge https://github.com/prati0100/git-gui
a1087c9367 graph: fix lack of color in horizontal lines
0d251c3291 graph: drop assert() for merge with two collapsing parents
4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper
573117dfa5 unpack-trees: watch for out-of-range index position
e701bab3e9 restore: invalidate cache-tree when removing entries with --staged
1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command
fa74180d08 checkout: don't revert file on ambiguous tracking branches
2957709bd4 parse_branchname_arg(): extract part as new function
5020f6806a t2018: improve style of if-statement
7ffb54618b t2018: add space between function name and ()
63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH
065027ee1a string-list: note in docs that callers can specify sorting function
26f924d50e unpack-trees: exit check_updates() early if updates are not wanted
042ed3e048 The final batch before -rc2
0f1930cd1b Merge branch 'ds/sparse-cone'
037f067587 Merge branch 'ds/commit-graph-set-size-mult'
f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify'
c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode'
a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
c4117fcb97 Merge branch 'pb/clarify-line-log-doc'
556f0258df Merge branch 'ew/packfile-syscall-optim'
5814d44d9b doc: submodule: fix typo for command absorbgitdirs
7047f75f22 editorconfig: indent text files with tabs
60440d72db sha1-file: document how to use pretend_object_file
7fdc5f296f l10n: es: 2.25.0 round #1
f8740c586b am: document that Date: can appear as an in-body header
4e2c4c0d4f gitweb: fix a couple spelling errors in comments
421c0ffb02 multi-pack-index: correct configuration in documentation
757ff352bd Documentation/git-sparse-checkout.txt: fix a typo
0d2116c644 Merge branch 'zs/open-current-file'
9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u)
3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master
4c5081614c l10n: fr.po v2.25.0 rnd 1
5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0
63020f175f commit-graph: prefer default size_mult when given zero
224c7d70fa mingw: only test index entries for backslashes, not tree entries
9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED
8679ef24ed Git 2.25-rc1
a82027e9e6 Merge branch 'js/use-test-tool-on-path'
13432fc6dd Merge branch 'js/mingw-reserved-filenames'
e0e1ac5db0 Merge branch 'en/rebase-signoff-fix'
b76a244c9d Merge branch 'em/freebsd-cirrus-ci'
bc855232bc Merge branch 'bk/p4-misc-usability'
763a59e71c merge-recursive: remove unnecessary oid_eq function
44143583b7 sparse-checkout: use extern for global variables
d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master
13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1
786f4d2405 git-gui: allow opening currently selected file in default app
4fd683b6a3 sparse-checkout: document interactions with submodules
de11951b03 sparse-checkout: list directories in cone mode
0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0
578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed)
173fff68da Merge tag 'v2.25.0-rc0' into git-po-master
f1842ff531 t2018: remove trailing space from test description
20a67e8ce9 t3008: find test-tool through path lookup
9e341f62ca l10n: Update Catalan translation
4e61b2214d packfile: replace lseek+read with pread
ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision
2be45868a8 doc: log, gitk: document accepted line-log diff formats
280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD
0a76bd7381 mailmap: mask accentless variant for Công Danh
99c33bed56 Git 2.25-rc0
d2189a721c Merge branch 'en/fill-directory-fixes'
8be0a428d6 Merge branch 'rs/test-cleanup'
65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string'
c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
45b96a6fa1 Merge branch 'js/add-p-in-c'
ccc292e862 Merge branch 'jc/drop-gen-hdrs'
dfee504bee Merge branch 'ja/doc-markup-cleanup'
87cbb1ca66 Merge branch 'rs/ref-read-cleanup'
20aa6d88b7 Merge branch 'rb/p4-lfs'
fcd5b55f56 Merge branch 'pb/submodule-doc-xref'
4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free'
ba6b66281e Merge branch 'ln/userdiff-elixir'
bd72a08d6c Merge branch 'ds/sparse-cone'
f3c520e17f Merge branch 'sg/name-rev-wo-recursion'
6514ad40a1 Merge branch 'ra/t5150-depends-on-perl'
17066bea38 Merge branch 'dl/format-patch-notes-config-fixup'
135365dd99 Merge branch 'am/pathspec-f-f-checkout'
ff0cb70d45 Merge branch 'am/pathspec-from-file'
4dc42c6c18 mingw: refuse paths containing reserved names
98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16
c480eeb574 commit --interactive: make it work with the built-in `add -i`
cee6cb7300 built-in add -p: implement the "worktree" patch modes
52628f94fc built-in add -p: implement the "checkout" patch modes
6610e4628a built-in stash: use the built-in `git add -p` if so configured
90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting
36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes
d2a233cb8b built-in add -p: prepare for patch modes other than "stage"
761e3d26bb sparse-checkout: improve OS ls compatibility
6579d93a97 contrib/credential/netrc: work outside a repo
1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable
b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI
b441717256 t1507: inline full_name()
9291e6329e t1507: run commands within test_expect_success
5236fce6b4 t1507: stop losing return codes of git commands
10812c2337 t1501: remove use of `test_might_fail cp`
62d58cda69 t1409: use test_path_is_missing()
b87b02cfe6 t1409: let sed open its own input file
9b92070e52 t1307: reorder `nongit test_must_fail`
3595d10c26 t1306: convert `test_might_fail rm` to `rm -f`
f511bc02ed t0020: use ! check_packed_refs_marked
f6041abdcd t0020: don't use `test_must_fail has_cr`
f46c243e66 t0003: don't use `test_must_fail attr_check`
99c049bc4c t0003: use test_must_be_empty()
3738439c77 t0003: use named parameters in attr_check()
7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err()
b8afb908c2 t/lib-git-p4: use test_path_is_missing()
4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases
6836d2fe06 dir.c: use st_add3() for allocation size
c847dfafee dir: consolidate similar code in treat_directory()
777b420347 dir: synchronize treat_leading_path() and read_directory_recursive()
b9670c1f5e dir: fix checks on common prefix directory
5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit
23cbe427c4 Merge branch 'py/console-close-esc'
124a895811 t4015: improve coverage of function context test
509efef789 commit: forbid --pathspec-from-file --all
12029dc57d t3434: mark successful test as such
e0f9095aaa notes.h: fix typos in comment
675ef6bab8 t6030: don't create unused file
01ed17dc8c t5580: don't create unused file
f670adb49b t3501: don't create unused file
1e1ccbfdd3 git-gui: allow closing console window with Escape
7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays.
b02fd2acca The sixth batch
59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex'
e3b72391d1 Merge branch 'rs/commit-export-env-simplify'
43bf44e23a Merge branch 'rs/archive-zip-code-cleanup'
4438a1a59f Merge branch 'js/t3404-indent-fix'
3a44db2ed2 Merge branch 'dr/branch-usage-casefix'
8bc481f4f6 Merge branch 'sg/t9300-robustify'
011fc2e88e Merge branch 'js/add-i-a-bit-more-tests'
d1c0fe8d9b Merge branch 'dl/range-diff-with-notes'
26c816a67d Merge branch 'hw/doc-in-header'
f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
71a7de7a99 Merge branch 'dl/rebase-with-autobase'
c9f5fc9114 Merge branch 'dl/test-cleanup'
6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap'
3beff388b2 Merge branch 'js/builtin-add-i-cmds'
4755a34c47 Merge branch 'dd/time-reentrancy'
37c2619d91 Merge branch 'ag/sequencer-todo-updates'
608e380502 git-p4: show detailed help when parsing options fail
e2aed5fd5b git-p4: yes/no prompts should sanitize user text
571fb96573 fix-typo: consecutive-word duplications
f371984613 Makefile: drop GEN_HDRS
2e4083198d built-in add -p: show helpful hint when nothing can be staged
54d9d9b2ee built-in add -p: only show the applicable parts of the help text
ade246efed built-in add -p: implement the 'q' ("quit") command
d6cf873340 built-in add -p: implement the '/' ("search regex") command
9254bdfb4f built-in add -p: implement the 'g' ("goto") command
bcdd297b78 built-in add -p: implement hunk editing
b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf"
11f2c0dae8 built-in add -p: coalesce hunks after splitting them
510aeca199 built-in add -p: implement the hunk splitting feature
0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions
5906d5de77 built-in app -p: allow selecting a mode change as a "hunk"
47dc4fd5eb built-in add -p: handle deleted empty files
80399aec5a built-in add -p: support multi-file diffs
7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed
12c24cf850 built-in add -p: color the prompt and the help text
25ea47af49 built-in add -p: adjust hunk headers as needed
e3bd11b4eb built-in add -p: show colored hunks by default
1942ee44e8 built-in add -i: wire up the new C code for the `patch` command
f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C
d1b1384d61 userdiff: remove empty subexpression from elixir regex
df5be01669 doc: indent multi-line items in list
fd5041e127 doc: remove non pure ASCII characters
190a65f9db sparse-checkout: respect core.ignoreCase in cone mode
1d7297513d notes: break set_display_notes() into smaller functions
66f79ee23d config/format.txt: clarify behavior of multiple format.notes
cc2bd5c45d gitmodules: link to gitsubmodules guide
99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed
e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed
8c02fe6060 t7004: don't create unused file
cb05d6a5ed t4256: don't create unused file
c5c4eddd56 dir: break part of read_directory_recursive() out for reuse
072a231016 dir: exit before wildcard fall-through if there is no wildcard
2f5d3847d4 dir: remove stray quote character in comment
a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories"
452efd11fb t3011: demonstrate directory traversal failures
ea94b16fb8 git-p4: honor lfs.storage configuration variable
51a0a4ed95 bisect--helper: avoid use-after-free
d32e065a91 Merge branch 'kk/branch-name-encoding'
ad05a3d8e5 The fifth batch
7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix'
b089e5e6cb Merge branch 'em/test-skip-regex-illseq'
930078ba39 Merge branch 'hi/gpg-use-check-signature'
08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode'
7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk'
55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm'
41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress'
5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise'
dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix'
d37cfe3b5c Merge branch 'dl/pretty-reference'
99c4ff1bda Merge branch 'dl/submodule-set-url'
55d607d85b Merge branch 'js/mingw-inherit-only-std-handles'
c58ae96fc4 Merge branch 'am/pathspec-from-file'
7c88714262 Merge branch 'po/bundle-doc-clonable'
5d9324e0f4 Merge branch 'ra/rebase-i-more-options'
7034cd094b Sync with Git 2.24.1
09ac67a183 format-patch: move git_config() before repo_init_revisions()
8164c961e1 format-patch: use --notes behavior for format.notes
452538c358 notes: extract logic into set_display_notes()
e6e230eeae notes: create init_display_notes() helper
1e6ed5441a notes: rename to load_display_notes()
2866fd284c name-rev: cleanup name_ref()
49f7a2fde9 name-rev: eliminate recursion in name_rev()
fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name'
e05e8cf074 archive-zip: use enum for compression method
39acfa3d22 git gui: fix branch name encoding error
11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description
8cf8f9b4aa t3404: fix indentation
4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs
147ee35558 commit: use strbuf_add() to add a length-limited string
559c6fc317 The fourth batch
56e6c16394 Merge branch 'dl/lore-is-the-archive'
3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive'
7cb0d37f6d Merge branch 'tg/perf-remove-stale-result'
403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick'
f0cf2fee5d Merge branch 'hi/grep-do-not-return-void'
391fb22ac7 Merge branch 'rs/use-skip-prefix-more'
92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd'
4ba74ca901 Merge branch 'rs/test-cleanup'
f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick'
ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9'
8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters
3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances
dd432a6ecf name-rev: restructure parsing commits and applying date cutoff
dd090a8a37 name-rev: pull out deref handling from the recursion
766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper
d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev()
bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation
e0c4da6f2a name-rev: avoid unnecessary cast in name_ref()
c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name()
c593a26348 t6120-describe: modernize the 'check_describe' helper
abcf857300 range-diff: clear `other_arg` at end of function
f8675343d7 range-diff: mark pointers as const
828765dfe0 t3206: fix incorrect test name
0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early
21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile
b4bbbbd5a2 apply --allow-overlap: fix a corner case
89c8559367 git add -p: use non-zero exit code when the diff generation failed
e91162be9c t3701: verify that the diff.algorithm config setting is handled
0c3222c4f3 t3701: verify the shown messages when nothing can be added
24be352d52 t3701: add a test for the different `add -p` prompts
8539b46534 t3701: avoid depending on the TTY prerequisite
0f0fba2cc8 t3701: add a test for advanced split-hunk editing
53a06cf39b Git 2.24.1
67af91c47a Sync with 2.23.1
a7312d1a28 Git 2.23.1
7fd9fd94fb Sync with 2.22.2
d9589d4051 Git 2.22.2
5421ddd8d0 Sync with 2.21.1
367f12b7e9 Git 2.21.1
20c71bcf67 Merge branch 'fix-msys2-quoting-bugs'
7d8b676992 mingw: sh arguments need quoting in more circumstances
d9061ed9da t7415: drop v2.20.x-specific work-around
04522edbd4 mingw: fix quoting of empty arguments for `sh`
49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts
e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly
fc346cb292 Sync with 2.20.2
4cd1cf31ef Git 2.20.2
c154745074 submodule: defend against submodule.update = !command in .gitmodules
4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x
d851d94151 Sync with 2.19.3
caccc527ca Git 2.19.3
7c9fbda6e2 Sync with 2.18.2
9877106b01 Git 2.18.2
14af7ed5a9 Sync with 2.17.3
a5ab8d0317 Git 2.17.3
bb92255ebe fsck: reject submodule.update = !command in .gitmodules
bdfef0492c Sync with 2.16.6
eb288bc455 Git 2.16.6
68440496c7 test-drop-caches: use `has_dos_drive_prefix()`
9ac92fed5b Sync with 2.15.4
7cdafcaacf Git 2.15.4
e904deb89d submodule: reject submodule.update = !command in .gitmodules
d3ac8c3f27 Sync with 2.14.6
66d2a6159f Git 2.14.6
083378cc35 The third batch
88bd37a2d0 Merge branch 'js/pkt-line-h-typofix'
473b431410 Merge branch 'us/unpack-trees-fsmonitor'
e0f9ec9027 Merge branch 'sg/test-bool-env'
fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset'
e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere'
88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory'
8feb47e882 Merge branch 'dl/t5520-cleanup'
6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree'
57d46bc602 Merge branch 'mg/doc-submodule-status-cached'
75bd003c7b Merge branch 'js/git-svn-use-rebase-merges'
f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix'
c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'
36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree'
cf91c31688 Merge branch 'sg/unpack-progress-throughput'
ef6104581d Merge branch 'pb/submodule-update-fetches'
7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix'
f3c7bfdde2 Merge branch 'dl/range-diff-with-notes'
9502b616f1 Merge branch 'jh/userdiff-python-async'
76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2'
995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label'
f7998d9793 Merge branch 'js/builtin-add-i'
917d0d6234 Merge branch 'js/rebase-r-safer-label'
56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers'
2763530048 Merge branch 'jg/revert-untracked'
fa38ab68b0 git-gui: revert untracked files by deleting them
d9c6469f38 git-gui: update status bar to track operations
29a9366052 git-gui: consolidate naming conventions
0bb313a552 xdiff: unignore changes in function context
2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names'
65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods'
5532ebdeb7 Merge branch 'fix-mingw-quoting-bug'
76a681ce9c Merge branch 'dubiously-nested-submodules'
dd53ea7220 Merge branch 'turn-on-protectntfs-by-default'
f82a97eb91 mingw: handle `subst`-ed "DOS drives"
7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams'
d2c84dad1c mingw: refuse to access paths with trailing spaces or periods
379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh
817ddd64c2 mingw: refuse to access paths with illegal characters
cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors
7530a6287e quote-stress-test: allow skipping some trials
35edce2056 t6130/t9350: prepare for stringent Win32 path validation
55953c77c0 quote-stress-test: accept arguments to test via the command-line
ad15592529 tests: add a helper to stress test argument quoting
a8dee3ca61 Disallow dubiously-nested submodule git directories
9102f958ee protect_ntfs: turn on NTFS protection by default
91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams
6d8684161e mingw: fix quoting of arguments
3a85dc7d53 is_ntfs_dotgit(): speed it up
7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses
288a74bcd2 is_ntfs_dotgit(): only verify the leading segment
a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark
cae0bc09ab rebase: fix format.useAutoBase breakage
945dc55dda format-patch: teach --no-base
700e006c5d t4014: use test_config()
a749d01e1d format-patch: fix indentation
0c47e06176 t3400: demonstrate failure with format.useAutoBase
d9b31db2c4 t7700: stop losing return codes of git commands
3699d69df0 t7700: make references to SHA-1 generic
dcf9a748ca t7700: replace egrep with grep
cfe5eda02a t7700: consolidate code into test_has_duplicate_object()
ae475afc0f t7700: consolidate code into test_no_missing_in_packs()
14b7664df8 doc: replace LKML link with lore.kernel.org
d23f9c8e04 RelNotes: replace Gmane with real Message-IDs
dcee037228 doc: replace MARC links with lore.kernel.org
a9aecc7abb checkout, restore: support the --pathspec-from-file option
cfd9376c1d doc: restore: synchronize <pathspec> description
8ea1189eac doc: checkout: synchronize <pathspec> description
6fdc9ad259 doc: checkout: fix broken text reference
1d022bb43f doc: checkout: remove duplicate synopsis
bebb5d6d6b add: support the --pathspec-from-file option
21bb3083c3 cmd_add: prepare for next patch
4778452597 Merge branch 'prevent-name-squatting-on-windows'
a7b1ad3b05 Merge branch 'jk/fast-import-unsafe'
525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()`
e1d911dd4c mingw: disallow backslash characters in tree objects' file names
0060fd1511 clone --recurse-submodules: prevent name squatting on Windows
a52ed76142 fast-import: disallow "feature import-marks" by default
68061e3470 fast-import: disallow "feature export-marks" by default
019683025f fast-import: delay creating leading directories for export-marks
e075dba372 fast-import: stop creating leading directories for import-marks
11e934d56e fast-import: tighten parsing of boolean command line options
816f806786 t9300: create marks files for double-import-marks test
f94804c1f2 t9300: drop some useless uses of cat
4f3e57ef13 submodule--helper: advise on fatal alternate error
10c64a0b3c Doc: explain submodule.alternateErrorStrategy
ec48540fe8 packfile.c: speed up loading lots of packfiles
3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value
a4fb016ba1 pkt-line: fix a typo
0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r
e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data
228f53135a The second batch
6c630f237e Merge branch 'jk/gitweb-anti-xss'
3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell'
4775e02a5c Merge branch 'ma/t7004'
a6c6f8d02a Merge branch 'js/complete-svn-recursive'
3ae8defaf9 Merge branch 'jk/send-pack-remote-failure'
aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix'
4ab9616c76 Merge branch 'sg/skip-skipped-prereq'
723a8adba5 Merge branch 'ds/test-read-graph'
9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation'
406ca29e0d Merge branch 'rs/parse-options-dup-null-fix'
fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging'
8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion'
ef8f621045 Merge branch 'dl/complete-rebase-onto'
3c3e5d0ea2 Merge branch 'tg/stash-refresh-index'
43c5fe1c1d Merge branch 'nn/doc-rebase-merges'
6511cb33c9 Merge branch 'dd/sequencer-utf8'
f165457618 Merge branch 'jk/remove-sha1-to-hex'
a774064fb0 Merge branch 'dj/typofix-merge-strat'
ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates'
d2489ce92c Merge branch 'rs/skip-iprefix'
376e7309e1 Merge branch 'ln/userdiff-elixir'
9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log'
d3096d2ba6 Merge branch 'en/doc-typofix'
26f20fa3fc Merge branch 'ns/test-desc-typofix'
ffd130a363 Merge branch 'en/t6024-style'
5149902ff9 Merge branch 'en/misc-doc-fixes'
bcb06e204c Merge branch 'js/fetch-multi-lockfix'
d08daec001 Merge branch 'rs/trace2-dots'
fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix'
bad5ed39cd Merge branch 'cb/curl-use-xmalloc'
7ab2088255 Merge branch 'rt/fetch-message-fix'
f089ddd56a Merge branch 'es/myfirstcontrib-updates'
3c90710c0c Merge branch 'hw/config-doc-in-header'
d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code'
5444d52866 Merge branch 'js/vreportf-wo-buffering'
05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add'
ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides'
532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default'
dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists'
fac9ab1419 Merge branch 'ma/bisect-doc-sample-update'
a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix'
0be5caf97c Merge branch 'jc/log-graph-simplify'
0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck'
2e697ced9d built-in add -i: offer the `quit` command
d7633578b5 built-in add -i: re-implement the `diff` command
8746e07277 built-in add -i: implement the `patch` command
ab1e1cccaf built-in add -i: re-implement `add-untracked` in C
c54ef5e424 built-in add -i: re-implement `revert` in C
a8c45be939 built-in add -i: implement the `update` command
f37c226454 built-in add -i: prepare for multi-selection commands
c08171d156 built-in add -i: allow filtering the modified files list
0c3944a628 add-interactive: make sure to release `rev.prune_data`
4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance
867fc7f310 grep: don't return an expression from pcre2_free()
c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables
72b006f4bf gpg-interface: prefer check_signature() for GPG verification
7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD
b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r
ccd469450a date.c: switch to reentrant {gm,local}time_r
271c351b2f t7811: don't create unused file
65efb42862 t9300: don't create unused file
f6b9413baf sequencer: fix a memory leak in sequencer_continue()
3eae30e464 doc: replace public-inbox links with lore.kernel.org
46c67492aa doc: recommend lore.kernel.org over public-inbox.org
5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects
17a4ae92ea t7700: s/test -f/test_path_is_file/
d2eee32a89 t7700: move keywords onto their own line
7a1c8c2346 t7700: remove spaces after redirect operators
09279086e8 t7700: drop redirections to /dev/null
756ee7fc9f t7501: stop losing return codes of git commands
38c1aa01de t7501: remove spaces after redirect operators
763b47bafa t5703: stop losing return codes of git commands
eacaa1c180 t5703: simplify one-time-sed generation logic
a29b2429e5 t5317: use ! grep to check for no matching lines
6c37f3ec1b t5317: stop losing return codes of git commands
b66e0a1773 t4138: stop losing return codes of git commands
afd43c9905 t4015: use test_write_lines()
946d2353a3 t4015: stop losing return codes of git commands
50cd31c652 t3600: comment on inducing SIGPIPE in `git rm`
3b737381d8 t3600: stop losing return codes of git commands
0d913dfa7e t3600: use test_line_count() where possible
29a40b5a67 t3301: stop losing return codes of git commands
9b5a9fa60a t0090: stop losing return codes of git commands
17aa9d9c1a t0014: remove git command upstream of pipe
77a946be98 apply-one-time-sed.sh: modernize style
176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job
ed254710ee test: use test_must_be_empty F instead of test_cmp empty F
c74b3cbb83 t7812: add missing redirects
213dabf49d test: use test_must_be_empty F instead of test -z $(cat F)
c93a5aaec8 t1400: use test_must_be_empty
6e4826ea75 t1410: use test_line_count
a5d04a3ef9 t1512: use test_line_count
54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd()
2059e79c0d name-rev: use skip_prefix() instead of starts_with()
1768aaf01d push: use skip_prefix() instead of starts_with()
ec6ee0c07a shell: use skip_prefix() instead of starts_with()
7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with()
a6293f5d28 fetch: use skip_prefix() instead of starts_with()
13ca8fb79e t5150: skip request-pull test if Perl is disabled
ecc0869080 commit-graph: use start_delayed_progress()
44a4693bfc progress: create GIT_PROGRESS_DELAY
528d9e6d01 t/perf: don't depend on Git.pm
b8dcc45387 perf-lib: use a single filename for all measurement types
fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk'
d82dfa7f5b rebase -i: finishing touches to --reset-author-date
1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory
393adf7a6f sequencer: directly call pick_commits() from complete_action()
a2dd67f105 rebase: fill `squash_onto' in get_replay_opts()
3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function
34065541e3 sequencer: update `done_nr' when skipping commands in a todo list
8638114e06 sequencer: update `total_nr' when adding an item to a todo list
0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk
ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk
ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions
9917eca794 l10n: zh_TW: add translation for v2.24.0
0a8e3036a3 reset: parse rev as tree-ish in patch mode
f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits
8d483c8408 doc: document 'git submodule status --cached'
befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick
ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later
9a780a384d mingw: spawned processes need to inherit only standard handles
c5a03b1e29 mingw: work around incorrect standard handles
eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes
a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool
43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values
2d05ef2778 sequencer: fix empty commit check when amending
ea8b7be147 git svn: stop using `rebase --preserve-merges`
67a6ea6300 gpg-interface: limit search for primary key fingerprint
392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern
cff4e9138d sparse-checkout: check for dirty status
416adc8711 sparse-checkout: update working directory in-process for 'init'
f75a69f880 sparse-checkout: cone mode should not interact with .gitignore
fb10ca5b54 sparse-checkout: write using lockfile
99dfa6f970 sparse-checkout: use in-process update for disable subcommand
e091228e17 sparse-checkout: update working directory in-process
e9de487aa3 sparse-checkout: sanitize for nested folders
4dcd4def3c unpack-trees: add progress to clear_ce_flags()
eb42feca97 unpack-trees: hash less in cone mode
af09ce24a9 sparse-checkout: init and set in cone mode
96cc8ab531 sparse-checkout: use hashmaps for cone patterns
879321eb0b sparse-checkout: add 'cone' mode
e6152e35ff trace2: add region in clear_ce_flags
72918c1ad9 sparse-checkout: create 'disable' subcommand
7bffca95ea sparse-checkout: add '--stdin' option to set subcommand
f6039a9423 sparse-checkout: 'set' subcommand
d89f09c828 clone: add --sparse mode
bab3c35908 sparse-checkout: create 'init' subcommand
94c0956b60 sparse-checkout: create builtin with 'list' subcommand
679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files
df6d3d6802 lib-bash.sh: move `then` onto its own line
2a02262078 t5520: replace `! git` with `test_must_fail git`
c245e58bb6 t5520: remove redundant lines in test cases
a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp
e959a18ee7 t5520: don't put git in upstream of pipe
5540ed27bc t5520: test single-line files by git with test_cmp
dd0f1e767b t5520: use test_cmp_rev where possible
979f8891cc t5520: replace test -{n,z} with test-lib functions
3037d3db90 t5520: use test_line_count where possible
93a9bf876b t5520: remove spaces after redirect operator
ceeef863de t5520: replace test -f with test-lib functions
4c8b046f82 t5520: let sed open its own input
53c62b9810 t5520: use sq for test case names
e8d1eaf9b4 t5520: improve test style
2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals
8cb7980382 t0000: test multiple local assignment
5b583e6a09 format-patch: pass notes configuration to range-diff
bd36191886 range-diff: pass through --notes to `git log`
9f726e1b87 range-diff: output `## Notes ##` header
3bdbdfb7a5 t3206: range-diff compares logs with commit notes
75c5aa0701 t3206: s/expected/expect/
79f3950d02 t3206: disable parameter substitution in heredoc
3a6e48e9f7 t3206: remove spaces after redirect operators
26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish
077a1fda82 userdiff: support Python async functions
3798149a74 SubmittingPatches: use `--pretty=reference`
1f0fc1db85 pretty: implement 'reference' format
618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type
0df621172d pretty: provide short date format
ac52d9410e t4205: cover `git log --reflog -z` blindspot
3e8ed3b93e pretty.c: inline initalize format_context
4982516451 revision: make get_revision_mark() return const pointer
f0f9de2bd7 completion: complete `tformat:` pretty format
fb2ffa77a6 SubmittingPatches: remove dq from commit reference
bae74c9dfb pretty-formats.txt: use generic terms for hash
bd00717eab SubmittingPatches: use generic terms for hash
9d45ac4cbf rev-list-options.txt: remove reference to --show-notes
828e829b9e argv-array: add space after `while`
e440fc5888 commit: support the --pathspec-from-file option
66a25a7242 doc: commit: synchronize <pathspec> description
64bac8df97 reset: support the `--pathspec-from-file` option
d137b50756 doc: reset: synchronize <pathspec> description
24e4750c96 pathspec: add new function to parse file
0dbc4a0edf ci(osx): update homebrew-cask repository with less noise
e02058a729 sequencer: handle rebase-merges for "onto" message
bae60ba7e9 builtin/unpack-objects.c: show throughput progress
2d92ab32fd rev-parse: make --show-toplevel without a worktree an error
9e5afdf997 fetch: add trace2 instrumentation
4c4066d95d run-command: move doc to run-command.h
6c51cb525d trace2: move doc to trace2.h
7db0305438 parse-options: add link to doc file in parse-options.h
d95a77d059 submodule-config: move doc to submodule-config.h
f3b9055624 credential: move doc to credential.h
bbcfa3002a tree-walk: move doc to tree-walk.h
971b1f24a2 argv-array: move doc to argv-array.h
f1ecbe0f53 trace: move doc to trace.h
13aa9c8b70 cache: move doc to cache.h
c0be43f898 sigchain: move doc to sigchain.h
19ef3ddd36 pathspec: move doc to pathspec.h
301d595e72 revision: move doc to revision.h
3a1b3415d9 attr: move doc to attr.h
126c1ccefb refs: move doc to refs.h
d27eb356bf remote: move doc to remote.h and refspec.h
405c6b1fbc sha1-array: move doc to sha1-array.h
d3d7172e40 merge: move doc to ll-merge.h
3f1480b745 graph: move doc to graph.h and graph.c
266f03eccd dir: move doc to dir.h
13c4d7eb22 diff: move doc to diff.h and diffcore.h
cd5522271f rebase -r: let `label` generate safer labels
867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()`
8c15904462 built-in add -i: implement the `help` command
3d965c7674 built-in add -i: use color in the main loop
68db1cbf8e built-in add -i: support `?` (prompt help)
76b743234c built-in add -i: show unique prefixes of the commands
6348bfba58 built-in add -i: implement the main loop
a376e37b2c gitweb: escape URLs generated by href()
b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI
f28bceca75 t/gitweb-lib.sh: drop confusing quotes
0eba60c9b7 t9502: pass along all arguments in xss helper
932757b0cc INSTALL: use existing shell scripts as example
b018719927 t7004: check existence of correct tag
1daaebcaa5 built-in add -i: color the header in the `status` command
5e82b9e4d2 built-in add -i: implement the `status` command
e4cb659ebd diff: export diffstat interface
f83dff60a7 Start to implement a built-in version of `git add --interactive`
df53c80822 stash: make sure we have a valid index before writing it
ad7a403268 send-pack: check remote ref status on pack-objects failure
d91ce887c9 t6120-describe: correct test repo history graph in comment
1f9247a3bd completion: tab-complete "git svn --recursive"
603960b50e promisor-remote: remove fetch_if_missing=0
e362fadcd0 clone: remove fetch_if_missing=0
169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL
51bd6be32d mingw: use COPY_ARRAY for copying array
4bd0593e0f test-tool: use 'read-graph' helper
e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway
d784d978f6 t4215: use helper function to check output
61eea521fe fsmonitor: do not compare bitmap size with size of split index
b19f3fe9dd hex: drop sha1_to_hex()
c1ce9c06d0 completion: learn to complete `git rebase --onto=`
f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls
d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase
aa6d7f93ed hex: drop sha1_to_hex_r()
52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch
5772b0c745 sequencer: reencode old merge-commit message
e0eba649e8 bundle-verify: add --quiet
79862b6b77 bundle-create: progress output control
73c3253d75 bundle: framework for options before bundle file
68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in"
b375744274 sequencer: reencode squashing commit's message
019a9d8362 sequencer: reencode revert/cherry-pick's todo list
0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list
e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding
1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary
d9f6f3b619 The first batch post 2.24 cycle
28014c1084 Merge branch 'bc/hash-independent-tests-part-6'
57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree'
c22f63c40f Merge branch 'pb/pretty-email-without-domain-part'
5731ca3657 Merge branch 'hw/remove-api-docs-placeholder'
14b58c62bc Merge branch 'sg/commit-graph-usage-fix'
eff313f8a7 Merge branch 'dl/apply-3way-diff3'
db806d7064 Merge branch 'sg/dir-trie-fixes'
f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix'
8f1119b988 Merge branch 'wb/midx-progress'
d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes'
0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges'
8f40d89783 Merge branch 'hv/bitshift-constants-in-blame'
d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head'
5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer'
b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc'
15d9f3dc66 Merge branch 'es/walken-tutorial'
026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor'
ed28358833 convert: use skip_iprefix() in validate_encoding()
89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding()
03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules
ae821ffe83 multimail: fix a few simple spelling errors
557c5895c2 sha1dc: fix trivial comment spelling error
aa74be316a Fix spelling errors in test commands
96c0caf5e3 Fix spelling errors in messages shown to users
4dc8b1c114 Fix spelling errors in names of tests
7a40cf1553 Fix spelling errors in comments of testcases
15beaaa3d1 Fix spelling errors in code comments
a807200f67 userdiff: add Elixir to supported userdiff languages
461caf3e8a git-shortlog.txt: include commit limiting options
6462d5eb9a fetch: remove fetch_if_missing=0
46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion
99b2ba35f5 t0028: eliminate non-standard usage of printf
add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul`
14c4776d75 t: fix typo in test descriptions
270de6acbe t6024: modernize style
77363a51fb name-hash.c: remove duplicate word in comment
c92faa4d22 hashmap: fix documentation misuses of -> versus .
a6d39f2efb git-filter-branch.txt: correct argument name typo
4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators
8915297925 Fix spelling errors in documentation outside of Documentation/
031fd4b93b Documentation: fix a bunch of typos, both old and new
dd0b61f577 fsmonitor: fix watchman integration
5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare()
7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph
c14e6e7903 fetch: add the command-line option `--write-commit-graph`
da72936f54 Git 2.24
1d34d425d4 Merge branch 'bc/doc-use-docbook-5'
dac1d83c91 Merge branch 'ds/commit-graph-on-fetch'
c32ca691c2 Merge branch 'jt/delay-fetch-if-missing'
ab6b50e4c8 Merge https://github.com/prati0100/git-gui
93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po
a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2
fe28ad8520 rebase: add --reset-author-date
08187b4cba rebase -i: support --ignore-date
0185c683c9 sequencer: rename amend_author to author_to_rename
cbd8db17ac rebase -i: support --committer-date-is-author-date
c068bcc59b sequencer: allow callers of read_author_script() to ignore fields
ba51d2fb24 rebase -i: add --ignore-whitespace flag
3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower
3ada78de3f myfirstcontrib: add dependency installation step
4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt
4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly
8dfb04ae96 update-index: optionally leave skip-worktree entries alone
116d1fa6c6 vreportf(): avoid relying on stdio buffering
efd5444238 RelNotes/2.24.0: fix self-contradictory note
391c7e40b5 fetch.c: fix typo in a warning message
55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template
849e43680d RelNotes/2.24.0: typofix
0115e5d929 git-diff.txt: document return code of `--no-index`
798d66e35d l10n: de.po: Update German translation
c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u)
f21f8f5d35 Git 2.24-rc2
8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix'
0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix'
f2db52c46b Merge branch 'js/mingw-needs-hiding-fix'
5b7594abdc Merge branch 'master' of github.com:vnwildman/git
034d33653a Merge branch 'next' of github.com:ChrisADR/git-po
26b061007c submodule: teach set-url subcommand
460782b7be t7519-status-fsmonitor: improve comments
d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses
4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config
1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694)
f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0
762d5b4f46 help: add gitsubmodules to the list of guides
76a53d640f git_path(): handle `.lock` files correctly
3ce47211a6 t1400: wrap setup code in test case
44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string
6c02042139 clone: rename static function `dir_exists()`.
8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command
77200e9332 l10n: es: 2.24.0 round 2
e42df36b42 Merge branch 'l10n/it/update-italian-translation'
5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2
51728480fe l10n: fr v2.24.0 rnd2
045a548698 l10n: git.pot: v2.24.0 round 2 (1 new)
468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master
b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree()
c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit()
103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag()
f648ee7088 fsck: rename vague "oid" local variables
cc579000bf fsck: don't require an object struct in verify_headers()
7854399366 fsck: don't require an object struct for fsck_ident()
b8b00f1693 fsck: drop blob struct from fsck_finish()
6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob()
38370253fd fsck: don't require an object struct for report()
f59793763d fsck: only require an oid for skiplist functions
5afc4b1dc6 fsck: only provide oid/type in fsck_error callback
82ef89b318 fsck: don't require object structs for display functions
733902905d fsck: use oids rather than objects for object_name API
d40bbc109b fsck_describe_object(): build on our get_object_name() primitive
a59cfb3230 fsck: unify object-name code
23a173a761 fsck: require an actual buffer for non-blobs
2175a0c601 fsck: stop checking tag->tagged
ec65231571 fsck: stop checking commit->parent counts
1de6007d85 fsck: stop checking commit->tree value
228c78fbd4 commit, tag: don't set parsed bit for parse failures
60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()`
8b656572ca builtin/commit-graph.c: remove subcommand-less usage string
fa26d5ede6 t4048: abstract away SHA-1-specific constants
cf02be8486 t4045: make hash-size independent
38ee26b2a3 t4044: update test to work with SHA-256
37ab8ebef1 t4039: abstract away SHA-1-specific constants
0370b35414 t4038: abstract away SHA-1 specific constants
0253e126a2 t4034: abstract away SHA-1-specific constants
45e2ef2b1d t4027: make hash-size independent
79b0edc1a0 t4015: abstract away SHA-1-specific constants
840624ff55 t4011: abstract away SHA-1-specific constants
32a6707267 t4010: abstract away SHA-1-specific constants
440bf91dfa t3429: remove SHA1 annotation
0b408ca2bd t1305: avoid comparing extensions
2eabd38313 rev-parse: add a --show-object-format option
52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode
45e206f0d8 t4203: use test-lib.sh definitions
2ae4944aac t6006: use test-lib.sh definitions
cb99a34e23 commit-graph: fix writing first commit-graph during fetch
e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug
7b4fb434b4 documentation: remove empty doc files
566a1439f6 Git 2.24-rc1
04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix'
4d6fb2beeb Merge branch 'ds/feature-macros'
5f0b6ed907 Merge branch 'js/azure-ci-osx-fix'
c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs'
1b4f85285f Merge branch 'dl/submodule-set-branch'
c7aadccba0 fetch: delay fetch_if_missing=0 until after config
c11e9966cb repo-settings: read an int for index.version
091489d068 apply: respect merge.conflictStyle in --3way
aa76ae4905 t4108: demonstrate bug in apply
95806205cd t4108: use `test_config` instead of `git config`
b0069684d4 t4108: remove git command upstream of pipe
fa87b81385 t4108: replace create_file with test_write_lines
7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job
6c96630cb0 config: move documentation to config.h
d81542e6f3 Eleventh batch
e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix'
d45d771978 Merge branch 'bc/smart-http-atomic-push'
22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix'
2e215b7959 Merge branch 'sb/userdiff-dts'
e3cf08361a Merge branch 'sg/progress-fix'
b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix'
c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc'
f45f88b2e4 path.c: don't call the match function without value in trie_find()
c72fc40d09 path.c: clarify two field names in 'struct common_dir'
8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file
7cb8c929d7 path.c: clarify trie_find()'s in-code comment
e536b1fedf Documentation: mention more worktree-specific exceptions
680cba2c2b multi-pack-index: add [--[no-]progress] option.
64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack
ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file
8dc18f8937 midx: add progress to expire_midx_packs
840cef0c70 midx: add progress to write_midx_file
efbc3aee08 midx: add MIDX_PROGRESS flag
0eb3671ed9 ci(osx): use new location of the `perforce` cask
da1e295e00 t604[236]: do not run setup in separate tests
49b8133a9e merge-recursive: fix merging a subdirectory into the root directory
d3eebaad5e merge-recursive: clean up get_renamed_dir_portion()
80736d7c5e doc: am --show-current-patch gives an entire e-mail message
a8e2c0eadc t7419: change test_must_fail to ! for grep
19c29e538e t4014: make output-directory tests self-contained
12a4aeaad8 Merge branch 'js/azure-pipelines-msvc'
399c23c046 ci(visual-studio): actually run the tests in parallel
711cd6d15c ci(visual-studio): use strict compile flags, and optimization
370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0
cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master
907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master
13bcea8c7f l10n: fr 2.24.0 rnd 1
135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master
3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed)
8da56a4848 userdiff: fix some corner cases in dts regex
86795774bb builtin/blame.c: constants into bit shift format
feebd2d256 rebase: hide --preserve-merges option
0e40a73a4c Doc: Bundle file usage
78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error
12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error
c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error
2b6f6ea1bd test-progress: fix test failures on big-endian systems
f757409e36 l10n: bg.po: Updated Bulgarian translation (4693)
176f5adfdb completion: clarify installation instruction for zsh
d966095db0 Git 2.24-rc0
90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array'
3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth'
d0258d0944 Merge branch 'rs/http-push-simplify'
bb52def6da Merge branch 'jj/stash-reset-only-toplevel'
f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs'
e5fca6b573 Merge branch 'bb/compat-util-comment-fix'
43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup'
07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely'
2d74d28ee0 Merge branch 'dl/compat-cleanup'
9b83a94829 Merge branch 'ta/t1308-typofix'
376012c919 Merge branch 'js/doc-stash-save'
10da030ab7 grep: avoid leak of chartables in PCRE2
513f2b0bbd grep: make PCRE2 aware of custom allocator
57d4660468 grep: make PCRE1 aware of custom allocator
d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand
8af69cf3e2 t3301: test diagnose messages for too few/many paramters
6f1194246a remote-curl: pass on atomic capability to remote side
bbb13e8188 graph: fix coloring of octopus dashes
92beecc136 graph: flatten edges that fuse with their right neighbor
479db18bc0 graph: smooth appearance of collapsing edges on commit lines
0195285b95 graph: rename `new_mapping` to `old_mapping`
d62893ecc1 graph: commit and post-merge lines for left-skewed merges
0f0f389f12 graph: tidy up display of left-skewed merges
458152cce1 graph: example of graph output that can be simplified
ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state
46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()`
a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()`
9157a2a032 graph: reuse `find_new_column_by_commit()`
210179a20d graph: handle line padding in `graph_next_line()`
fbccf255f9 graph: automatically track display width of graph lines
5374a290aa fetch-pack: write fetched refs to .promisor
4627bc777e sequencer: run post-commit hook
49697cb721 move run_commit_hook() to libgit and use it there
12bb7a540a sequencer.h fix placement of #endif
6a619ca03c t3404: remove uneeded calls to set_fake_editor
b2dbacbddf t3404: set $EDITOR in subshell
88a92b6c73 t3404: remove unnecessary subshell
bf8e65b30b format-patch: teach --cover-from-description option
a92331df18 format-patch: use enum variables
46273df7bf format-patch: replace erroneous and condition
3b3c79f6c9 diff-highlight: fix a whitespace nit
108b97dc37 Ninth batch
cbe8cdd3a0 Merge branch 'jk/coc'
3b9ec27919 Merge branch 'js/trace2-fetch-push'
c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch'
1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup'
eb3de5b823 Merge branch 'js/xdiffi-comment-updates'
4e8371ec26 Merge branch 'dl/t0000-skip-test-test'
b6d712fa4e Merge branch 'tg/range-diff-output-update'
77458870a5 Merge branch 'gs/sq-quote-buf-pretty'
5efabc7ed9 Merge branch 'ew/hashmap'
d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files'
6ed610b968 Merge branch 'am/t0028-utf16-tests'
5b900fb812 Merge branch 'dl/octopus-graph-bug'
16d9d7184b Merge branch 'en/fast-imexport-nested-tags'
6d5291be45 Merge branch 'js/azure-pipelines-msvc'
ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd'
d96e31e390 Merge branch 'js/fetch-jobs'
280bd44551 Merge branch 'en/merge-recursive-cleanup'
062a309d36 remote-curl: use argv_array in parse_push()
a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes
5cc6a4be11 http-push: simplify deleting a list item
556895d0c8 stash: avoid recursive hard reset on submodules
b524f6b399 Merge branch 'ka/japanese-translation'
f6f3824b4e git-gui: improve Japanese translation
61f4b407d3 Merge branch 'py/readme'
1e6880fd06 git-gui: add a readme
edefc31873 format-patch: create leading components of output directory
68b69211b2 git-compat-util: fix documentation syntax
fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth()
e0479fa073 documentation: add tutorial for object walking
3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed
4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target
9cad1c4488 pthread.h: manually align parameter lists
8c1cfd58e3 t1308-config-set: fix a test that has a typo
57d8f4b4c7 doc(stash): clarify the description of `save`
08da6496b6 Eighth batch
07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup'
f0d407e6ae Merge branch 'kt/add-i-progress'
66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree'
a4c5d9f66e Merge branch 'rs/dedup-includes'
159cdabd87 Merge branch 'js/range-diff-noprefix'
93424f1f7d Merge branch 'cb/pcre1-cleanup'
a73f91774c Merge branch 'ab/pcre-jit-fixes'
4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword'
020011f2cb Merge branch 'tk/git-svn-trim-author-name'
676278f8ea Merge branch 'bc/object-id-part17'
aafb75452b Merge branch 'en/clean-nested-with-ignored'
3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails
5cdf2301d4 add a Code of Conduct document
70bf0b755a Seventh batch
9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat'
2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary'
d17f54947d Merge branch 'rs/convert-fix-utf-without-dash'
82c80f98e6 Merge branch 'py/git-gui-has-maintainer'
6e12570822 Merge branch 'ah/cleanups'
772cad0afb Merge branch 'js/diff-rename-force-stable-sort'
424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path'
678a9ca629 Merge branch 'as/shallow-slab-use-fix'
0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix'
042a54d251 Merge branch 'am/visual-studio-config-fix'
03d3b1297c xdiffi: fix typos and touch up comments
b05b40930e t0000: cover GIT_SKIP_TESTS blindspots
d8bc1a518a send-pack: never fetch when checking exclusions
756fb0dedb t4014: treat rev-list output as the expected value
2b6a9b13ca range-diff: don't segfault with mode-only changes
360c7ba330 transport: push codepath can take arbitrary repository
ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments
b657047719 merge-recursive: fix the fix to the diff3 common ancestor label
b744c3af07 Sixth batch
417056578a Merge branch 'bw/submodule-helper-usage-fix'
9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check'
1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a'
59b19bcd9f Merge branch 'cc/multi-promisor'
1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way'
5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort'
eb35c18e42 Merge branch 'sg/travis-help-debug'
cabb145fe3 Merge branch 'rs/alias-use-copy-array'
56c7ab0f4e Merge branch 'sg/t-helper-gitignore'
e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang'
583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules'
337e3f2b49 Merge branch 'rs/nth-switch-code-simplification'
8f53fe1733 Merge branch 'hb/hg-to-git-py3'
ef93bfbd45 Merge branch 'sg/progress-fix'
980351d1ac Merge branch 'js/doc-patch-text'
80693e3f09 Merge branch 'tb/commit-graph-harden'
ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge'
3f84633563 Merge branch 'dl/cocci-everywhere'
caf150ce7d Merge branch 'gs/commit-graph-progress'
1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim'
1398171378 Merge branch 'rs/commit-graph-use-list-count'
773521df26 Merge branch 'rs/nth-parent-parse'
7f17913161 Merge branch 'dl/submodule-set-branch'
cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix'
bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees'
098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack'
37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc'
e392382f95 Merge branch 'dl/complete-rebase-and-archive'
cda8faa37e Merge branch 'jk/commit-graph-cleanup'
36d2fca82b Merge branch 'ss/get-time-cleanup'
ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude'
ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob'
ba2d451122 Merge branch 'tg/stash-refresh-index'
e2b5038d87 hashmap_entry: remove first member requirement from docs
404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry
23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators
c8e424c9c9 hashmap: introduce hashmap_free_entries
8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry *
87571c3f71 hashmap: use *_entry APIs for iteration
939af16eac hashmap_cmp_fn takes hashmap_entry params
f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *"
f0e63c4113 hashmap: use *_entry APIs to wrap container_of
6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *"
973d5eea74 introduce container_of macro
26b455f21e hashmap_put takes "struct hashmap_entry *"
28ee794128 hashmap_remove takes "const struct hashmap_entry *"
b6c5241606 hashmap_get takes "const struct hashmap_entry *"
b94e5c1df6 hashmap_add takes "struct hashmap_entry *"
f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *"
d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *"
d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry
12878c8351 coccicheck: detect hashmap_entry.hash assignment
e010a41216 diff: use hashmap_entry_init on moved_entry.ent
f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo"
de5abb5f7a git-p4: auto-delete named temporary file
c90b652afd Fifth batch
f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1'
b0f8aed48f Merge branch 'ma/user-manual-markup-update'
faf5576a8d Merge branch 'bc/doc-use-docbook-5'
314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes'
70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo'
847650798b Merge branch 'am/mailmap-andrey-mazo'
1a155f2e66 Merge branch 'jc/git-gui-has-maintainer'
1bcef51204 t/oid-info: add empty tree and empty blob values
ecde49bb8a t/oid-info: allow looking up hash algorithm name
11a3d3aadd git-rev-list.txt: prune options in synopsis
7d2f003ee4 Documentation: update the location of the git-gui repo
b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding()
46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines
b35304bf95 ci: really use shallow clones on Azure Pipelines
ab7d854aba tests: let --immediate and --write-junit-xml play well together
be5d88e112 test-tool run-command: learn to run (parts of) the testsuite
5d65ad17a9 vcxproj: include more generated files
030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built
61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable()
e4347c9434 msvc: handle DEVELOPER=1
ed712ef8d5 msvc: ignore some libraries when linking
5b8f9e2417 compat/win32/path-utils.h: add #include guards
41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning
c097b95a26 msvc: avoid using minus operator on unsigned types
dfd557c978 stash apply: report status correctly even in a worktree's subdirectory
d54dea77db fetch: let --jobs=<n> parallelize --multiple, too
87db61a436 trace2: write discard message to sentinel files
83e57b04e6 trace2: discard new traces if target directory has too many files
11c21f22de t4214: demonstrate octopus graph coloring failure
25eb905e14 t4214: explicitly list tags in log
63be8c8dd7 t4214: generate expect in their own test cases
a7a5590c6e t4214: use test_merge
94ba151300 test-lib: let test_merge() perform octopus merges
22541013d0 docs: clarify trace2 version invariants
3d4548e7e2 docs: mention trace2 target-dir mode in git-config
2fe44394c8 treewide: remove duplicate #include directives
dbcd970c27 push: do not pretend to return `int` from `die_push_simple()`
941790d7de fast-export: handle nested tags
8d7d33c1ce t9350: add tests for tags of things other than a commit
a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags
208d69246e fast-export: add support for --import-marks-if-exists
b8f50e5b60 fast-import: add support for new 'alias' command
f73b2aba05 fast-import: allow tags to be identified by mark labels
3164e6bd24 fast-import: fix handling of deleted tags
8085050ab4 add -i: show progress counter in the prompt
69fdb922ad Merge branch 'bw/diff3-conflict-style'
b436825b9b git-gui: support for diff3 conflict style
937b76ed49 range-diff: internally force `diff.noprefix=true`
411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job
25e4b8099c push: add trace2 instrumentation
5fc31180d8 fetch: add trace2 instrumentation
53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value
c3b57dc2a0 git-gui: use existing interface to query a path's attribute
45ab460d4a Merge branch 'js/git-bash-if-available'
0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command
71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only)
54a80a9ad8 wrapper: use a loop instead of repetitive statements
baed6bbb5b diffcore-break: use a goto instead of a redundant if statement
8da02ce62a commit-graph: remove a duplicate assignment
ddb3c856f3 shallow.c: don't free unallocated slabs
8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits
65904b8b2b promisor-remote: skip move_to_tail when no-op
2049b8dc65 diffcore_rename(): use a stable sort
97fff61012 Move git_sort(), a stable sort, into into libgit.a
69f272b922 dir: special case check for the possibility that pathspec is NULL
6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available
bc12974a89 Fourth batch
5a5350940b Merge branch 'ds/commit-graph-on-fetch'
974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch'
9755f70fe6 Merge branch 'ds/include-exclude'
93fc8760e7 Merge branch 'jh/trace2-pretty-output'
640f9cd599 Merge branch 'dl/rebase-i-keep-base'
026428c35e Merge branch 'sg/clean-nested-repo-with-ignored'
21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip'
d693345518 Merge branch 'dl/use-sq-from-test-lib'
d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes'
2be6ccc01a Merge branch 'sg/git-test-boolean'
cf861cd7a0 Merge branch 'rs/get-tagged-oid'
91243b019d Merge branch 'en/filter-branch-deprecation'
9bc67b6658 Merge branch 'en/merge-options-ff-and-friends'
fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden'
cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option'
8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return'
3ff6af7753 Merge branch 'nd/switch-and-restore'
aadac067aa Merge branch 'tb/file-url-to-unc-path'
b57a88a5f1 Merge branch 'js/gitdir-at-unc-root'
6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path'
430439536b Merge branch 'rs/parse-tree-indirect'
991fd97b9a Merge branch 'jk/fast-import-history-bugfix'
74a39b9bcc Merge branch 'mh/notes-duplicate-entries'
37801f0665 Merge branch 'tb/banned-vsprintf-namefix'
21ce0b48f3 Merge branch 'mh/release-commit-memory-fix'
f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup'
bf6136cab8 Merge branch 'rs/strbuf-detach'
a2e22bb3ad Merge branch 'rs/trace2-dst-warning'
1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup'
0281733483 Merge branch 'bc/hash-independent-tests-part-5'
f06fb376ed Merge branch 'jc/test-cleanup'
00bb74453d Merge branch 'dl/compat-cleanup'
59438be06c Merge branch 'js/visual-studio'
cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone'
af2abd870b fast-export: fix exporting a tag and nothing else
c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor
dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit
fd5b820d9c user-manual.txt: change header notation
e79b34533a user-manual.txt: add missing section label
b503a2d515 Makefile: emulate compile in $(HCO) target better
af26e2a9d2 pack-bitmap.h: remove magic number
b06fdead04 promisor-remote.h: include missing header
97b989ee3a apply.h: include missing header
4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name
d928a8388a t0028: add more tests
0b63fd6965 t0028: fix test for UTF-16-LE-BOM
fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration
2e09c01232 name-rev: avoid cutoff timestamp underflow
8464f94aeb promisor-remote.h: drop extern from function declaration
75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp
24c681794f doc: MyFirstContribution: fix cmd placement instructions
c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode
60c60b627e Merge branch 'py/git-git-extra-stuff'
faf420e05a treewide: correct several "up-to-date" to "up to date"
b71c6c3b64 Fix build with core.autocrlf=true
16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff
26e3d1cbea .mailmap: update email address of Andrey Mazo
27ea41c0b4 t/helper: ignore only executable files
7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()
83e3ad3b12 merge-recursive: symlink's descendants not in way
34933d0eff stash: make sure to write refreshed cache
e080b34540 merge: use refresh_and_write_cache
22184497a3 factor out refresh_and_write_cache function
7371612255 commit-graph: add --[no-]progress to write and verify
47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW
253bfe49bd SubmittingPatches: git-gui has a new maintainer
d17ae00c97 hg-to-git: make it compatible with both python3 and python2
4c86140027 Third batch
f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http'
627b826834 Merge branch 'md/list-objects-filter-combo'
b9ac6c59b8 Merge branch 'cc/multi-promisor'
de67293e74 Merge branch 'sg/line-log-tree-diff-optim'
95486229e3 Merge branch 'sg/complete-configuration-variables'
f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook'
a2e524ecf3 Merge branch 'cb/curl-use-xmalloc'
128666753b Merge branch 'jk/drop-release-pack-memory'
917a319ea5 Merge branch 'js/rebase-r-strategy'
7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui
4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout()
0d4304c124 doc: fix reference to --ignore-submodules
af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py
8a3a6817e2 Merge gitk to pick up emergency build fix
2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po
9027af58e2 Makefile: run coccicheck on more source files
43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES)
5dedf7de53 Makefile: define THIRD_PARTY_SOURCES
902b90cf42 clean: fix theoretical path corruption
ca8b5390db clean: rewrap overly long line
09487f2cba clean: avoid removing untracked files in a nested git repository
e86bbcf987 clean: disambiguate the definition of -d
3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run
29b577b960 dir: add commentary explaining match_pathspec_item's return value
89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it
a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case
404ebceda0 dir: also check directories for matching pathspecs
a5e916c745 dir: fix off-by-one error in match_pathspec_item
bbbb6b0b89 dir: fix typo in comment
7541cc5302 t7300: add testcases showing failure to clean specified pathspecs
0eb7c37a8a diff, log doc: small grammer, format, and language fixes
6fae6bd518 diff, log doc: say "patch text" instead of "patches"
2bb74b53a4 Test the progress display
bbf47568ad Revert "progress: use term_clear_line()"
cf6a2d2557 Makefile: strip leading ./ in $(LIB_H)
b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup
689a146c91 commit-graph: use commit_list_count()
59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N"
a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N"
a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base"
cf34337f98 list-objects-filter: give a more specific error sparse parsing error
4c96a77594 list-objects-filter: delay parsing of sparse oid
72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter
83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer
7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>`
226daba280 Doc/Makefile: give mansource/-version/-manual attributes
40e747e89d git-submodule.txt: fix AsciiDoc formatting error
f6461b82b9 Documentation: fix build with Asciidoctor 2
3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
f7a8834ba4 Merge branch 'bp/amend-toggle-bind'
ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit"
9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes
d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog
beffae768a gitk: Add Chinese (zh_CN) translation
56d9cbe68b packfile: expose get_delta_base()
bab28d9f97 builtin/pack-objects: report reused packfile objects
6c8ec8c30a Merge branch 'bw/commit-scrollbuffer'
acfa495519 Merge branch 'bw/amend-checkbutton'
da08d559b7 git-gui: add horizontal scrollbar to commit buffer
ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton
aeeb978ba6 completion: teach archive to use __gitcomp_builtin
2b9bd488ae completion: teach rebase to use __gitcomp_builtin
d49dffde9a completion: add missing completions for log, diff, show
6abada1880 upload-pack: disable commit graph more gently for shallow traversal
fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time
72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set
4fd39c76e6 doc: minor formatting fix
29f4332e66 Quit passing 'now' to date code
c77abf0460 Merge branch 'py/revert-hunks-lines'
5a2bb62180 Merge branch 'bp/widget-focus-hotkeys'
e07446ed5f git-gui: add hotkeys to set widget focus
f981ec18cf cache-tree: do not lazy-fetch tentative tree
f1d4a28250 Second batch
c8ada15456 Merge branch 'bc/reread-attributes-during-rebase'
8f3ba423e7 Merge branch 'tg/t0021-racefix'
a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email'
d49c2c3466 Merge branch 'sb/userdiff-dts'
2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe'
4c49dd042d Merge branch 'nd/diff-parseopt'
d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix'
8ce8a63b46 Merge branch 'ds/midx-expire-repack'
9437394661 Merge branch 'cb/fetch-set-upstream'
af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix'
fa9e7934c7 Merge branch 'bm/repository-layout-typofix'
d1a251a1fa Merge branch 'en/checkout-mismerge-fix'
e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental'
f4f8dfe127 Merge branch 'ds/feature-macros'
4a12f89865 Merge branch 'jk/eoo'
b4a1eec332 Merge branch 'jk/repo-init-cleanup'
70336bd50a Merge branch 'py/git-gui-do-quit'
ad7c543e3b grep: skip UTF8 checks explicitly
0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration()
b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration
4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor
b7e1ba5649 git-merge-index.txt: wrap shell listing in "----"
38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----"
5371813768 git-ls-remote.txt: wrap shell listing in "----"
1925fe0c8a Documentation: wrap config listings in "----"
922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor
2017956a19 Documentation: wrap blocks with "--"
dd2e50a84e commit-graph: turn off save_commit_buffer
67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits
806278dead commit-graph.c: handle corrupt/missing trees
16749b8dd2 commit-graph.c: handle commit parsing errors
23424ea759 t/t5318: introduce failing 'git commit-graph write' tests
bf1e28e0ad builtin/rebase.c: Remove pointless message
d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing
bd482d6e33 t: use common $SQ variable
3a37876b5d pack-objects: drop packlist index_pos optimization
7e6b96c73b test-read-cache: drop namelen variable
e4b369069e diff-delta: set size out-parameter to 0 for NULL delta
7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint
f1cbd033e2 pack-objects: use object_id in packlist_alloc()
0dfed92dfd git-am: handle missing "author" when parsing commit
3960290675 ci: restore running httpd tests
6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests
c77722b3ea use get_tagged_oid()
dad3f0607b tag: factor out get_tagged_oid()
468ce99b77 unpack-trees: rename 'is_excluded_from_list()'
65edd96aec treewide: rename 'exclude' methods to 'pattern'
4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_'
caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list'
ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern'
483e861111 t9902: use a non-deprecated command for testing
9df53c5de6 Recommend git-filter-repo instead of git-filter-branch
7b6ad97939 t6006: simplify, fix, and optimize empty message test
50094ca45f config/format.txt: specify default value of format.coverLetter
c1a6f21cd4 Doc: add more detail for git-format-patch
854b5cb46a t4014: stop losing return codes of git commands
dd2b6b6860 t4014: remove confusing pipe in check_threading()
6bd26f58ea t4014: use test_line_count() where possible
c6ec6dadba t4014: let sed open its own files
f2e2fa8f60 t4014: drop redirections to /dev/null
460609cbd5 t4014: use indentable here-docs
92014b69bb t4014: remove spaces after redirect operators
0ab74e979c t4014: use sq for test case names
cb46c40662 t4014: move closing sq onto its own line
b562a54c01 t4014: s/expected/expect/
e770fbfeff t3005: remove unused variable
da280f5f1a t: use LF variable defined in the test harness
7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch
552fc5016f mingw: apply array.cocci rule
476998d05b t3427: accelerate this test by using fast-export and fast-import
aac6ff7b5b .gitignore: stop ignoring `.manifest` files
2c65d90f75 am: reload .gitattributes after patching it
1577dc0f7c tree: simplify parse_tree_indirect()
50f26bd035 fetch: add fetch.writeCommitGraph config setting
8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set
27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options
0a8bc7068f clarify documentation for remote helpers
80e3658647 help: make help_unknown_ref() NORETURN
313677627a checkout: add simple check for 'git checkout -b'
3441de5b9c gitk: Make web links clickable
a4fa2f0a4c git-gui: allow undoing last revert
414d924beb rebase: teach rebase --keep-base
6330209d7d rebase tests: test linear branch topology
4effc5bc96 rebase: fast-forward --fork-point in more cases
c0efb4c1dd rebase: fast-forward --onto in more cases
2b318aa6c3 rebase: refactor can_fast_forward into goto tower
c9efc21683 t3432: test for --no-ff's interaction with fast-forward
1ebec8dfc1 fast-import: duplicate into history rather than passing ownership
9756082b3c fast-import: duplicate parsed encoding string
86ae43da6a status: mention --skip for revert and cherry-pick
b1b16bba96 completion: add --skip for cherry-pick and revert
deaa65a754 completion: merge options for cherry-pick and revert
4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
793ac7e309 t3432: test rebase fast-forward behavior
359ecebc34 t3431: add rebase --fork-point tests
502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage
ff61681b46 grep: refactor and simplify PCRE1 support
8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1
1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning()
fd99c2dd9b grep: use return value of strbuf_detach()
82f51af345 log-tree: always use return value of strbuf_detach()
7e92756751 http: don't leak urlmatch_config.vars
9784f97321 commit: free the right buffer in release_commit_memory
ce17feb1b3 path: add a function to check for path suffix
60d198d022 banned.h: fix vsprintf()'s ban message
60fe477a0b notes: avoid potential use-after-free during insertion
779ad6641b notes: avoid leaking duplicate entries
4e1a641ee3 mingw: fix launching of externals from Unicode paths
5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly
e2683d51d9 Fix .git/ discovery at the root of UNC shares
d17f2124a7 setup_git_directory(): handle UNC paths correctly
ebb8d2c90f mingw: support UNC in git clone file://server/share/repo
0c37c41d13 t4009: make hash size independent
c1f3dfcc23 t4002: make hash independent
8cc5ff83c3 t4000: make hash size independent
c784815073 t3903: abstract away SHA-1-specific constants
2ccdfb1c78 git-gui: return early when patch fails to apply
62bd99934b git-gui: allow reverting selected hunk
5f0a516de9 git-gui: allow reverting selected lines
fddf2ebe38 transport: teach all vtables to allow fetch first
ac3fda82bf transport-helper: skip ls-refs if unnecessary
745f681289 First batch after Git 2.23
d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg'
22e86e85cb Merge branch 'en/fast-import-merge-doc'
9c7573581c Merge branch 'jk/perf-no-dups'
4336fdb2ef Merge branch 'rs/nedalloc-fixlets'
8ae7a46c4d Merge branch 'sg/show-failed-test-names'
6ba06b582b Merge branch 'sg/commit-graph-validate'
072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix'
207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix'
77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests'
1b01cdbf2e Merge branch 'jk/tree-walk-overflow'
8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix'
307179732d Merge branch 'mt/grep-submodules-working-tree'
58166c2e9d t0021: make sure clean filter runs
8b3f33ef11 ref-filter: initialize empty name or email fields
3c81760bc6 userdiff: add a builtin pattern for dts files
fe49814409 t4014: drop unnecessary blank lines from test cases
a2bb801f6a line-log: avoid unnecessary full tree diffs
eef5204190 line-log: extract pathspec parsing from line ranges into a helper function
a63694f523 diff: skip GITLINK when lazy fetching missing objs
7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe
19800bdc3f parseopt: move definition of enum parse_opt_result up
415b770b88 packfile.h: drop extern from function declaration
acb49d1cc8 t3800: make hash-size independent
ca6ba94200 t3600: make hash size independent
19ce5496c2 t3506: make hash independent
9a6738c061 t3430: avoid hard-coded object IDs
4dd1b5f90f t3404: abstract away SHA-1-specific constants
b99bfc7a6c t3306: abstract away SHA-1-specific constants
e3e9d02e35 t3305: make hash size independent
b408cf8cf6 t3301: abstract away SHA-1-specific constants
b561edd213 t3206: abstract away hash size constants
a5f61c7d13 t3201: abstract away SHA-1-specific constants
1c24a54ea4 repository-layout.txt: correct pluralization of 'object'
b0a3186140 sequencer: simplify root commit creation
a47ba3c777 rebase -i: check for updated todo after squash and reword
450efe2d53 rebase -i: always update HEAD before rewording
c581e4a749 grep: under --debug, show whether PCRE JIT is enabled
aaa95dfa05 midx: switch to using the_hash_algo
be8e172e9f builtin/show-index: replace sha1_to_hex
3f34d70d40 rerere: replace sha1_to_hex
fc06be3b7f builtin/receive-pack: replace sha1_to_hex
69fa337060 builtin/index-pack: replace sha1_to_hex
3a4d7aa5ae packfile: replace sha1_to_hex
e0cb7cdb89 wt-status: convert struct wt_status to object_id
8d4d86b0f0 cache: remove null_sha1
f6ca67d673 builtin/worktree: switch null_sha1 to null_oid
dd336a5511 builtin/repack: write object IDs of the proper length
894c0f66bb pack-write: use hash_to_hex when writing checksums
4439c7a360 sequencer: convert to use the_hash_algo
95518faac1 bisect: switch to using the_hash_algo
e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo
fe9fec45f6 config: use the_hash_algo in abbrev comparison
976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
703d2d4193 bundle: switch to use the_hash_algo
9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo
7962e046ff show-index: switch hard-coded constants to the_hash_algo
fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ
7e0d029f18 builtin/rev-parse: switch to use the_hash_algo
319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo
fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo
f6af19a9ad fetch-pack: use parse_oid_hex
36261e42ec patch-id: convert to use the_hash_algo
28ba1830d0 builtin/replace: make hash size independent
24bc1a1292 pull, fetch: add --set-upstream option
71d41ff651 archive-tar: turn length miscalculation warning into BUG
17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header()
82a46af13e archive-tar: fix pax extended header length calculation
4060c1990a archive-tar: report wrong pax extended header length
4615a8cb5b merge-recursive: alphabetize include list
45ef16f77a merge-recursive: add sanity checks for relevant merge_options
f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
5bf7e5779e merge-recursive: split internal fields into a separate struct
e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output
a779fb829b merge-recursive: comment and reorder the merge_options fields
8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options
7c0a6c8e47 merge-recursive: move some definitions around to clean up the header
c749ab1da8 merge-recursive: rename merge_options argument to opt in header
bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity
ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list
4d7101e25c merge-recursive: fix some overly long lines
724dd767b2 cache-tree: share code between functions writing an index as a tree
345480d1ed merge-recursive: don't force external callers to do our logging
b4db8a2b76 merge-recursive: remove useless parameter in merge_trees()
98a1d3d888 merge-recursive: exit early if index != head
9822175d2b Ensure index matches head before invoking merge machinery, round N
10f751c06b merge-recursive: remove another implicit dependency on the_repository
f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks
8e01251694 merge-recursive: introduce an enum for detect_directory_renames values
743474cbfa merge-recursive: provide a better label for diff3 common ancestor
51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u)
5bace62582 l10n: Update Catalan translation
139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()
65c01c6442 checkout: provide better conflict hunk description with detached HEAD
d8523ca1b9 merge-recursive: be consistent with assert
acb7da05ac checkout: remove duplicate code
93b980e58f http: use xmalloc with cURL
64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental
aaf633c2ad repo-settings: create feature.experimental setting
c6cc4c5afd repo-settings: create feature.manyFiles setting
ad0fb65999 repo-settings: parse core.untrackedCache
31b1de6a09 commit-graph: turn on commit-graph by default
b068d9a250 t6501: use 'git gc' in quiet mode
7211b9e753 repo-settings: consolidate some config settings
507e5470a0 worktree remove: clarify error message on dirty worktree
5af9d5f6c8 completion: complete config variables and values for 'git clone --config='
88cd790d6a completion: complete config variables names and values for 'git clone -c'
dd33472831 completion: complete values of configuration variables after 'git -c var='
e1e00089da completion: complete configuration sections and variable names for 'git -c'
42d0efec59 completion: split _git_config()
d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp()
2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names
d9438873c4 completion: deduplicate configuration sections
7a09a8f093 completion: add tests for 'git config' completion
840d7e5b3c completion: complete more values of more 'color.*' configuration variables
08a12175d8 completion: fix a typo in a comment
9827d4c185 packfile: drop release_pack_memory()
d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed
362f8b280c t/perf: rename duplicate-numbered test script
742ed63345 trace2: cleanup whitespace in perf format
e34430556c trace2: cleanup whitespace in normal format
c2b890aca5 quote: add sq_append_quote_argv_pretty()
ad43e37839 trace2: trim trailing whitespace in normal format error message
04f10d332f trace2: remove dead code in maybe_add_string_va()
da4589ce7e trace2: trim whitespace in region messages in perf target format
0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit
5440eb0ea2 git-gui: call do_quit before destroying the main window
bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook
6098817fd7 git-merge: honor pre-merge-commit hook
a1f3dd7eb3 merge: do no-verify like commit
f78f6c7e0c t7503: verify proper hook execution
70597e8386 nedmalloc: avoid compiler warning about unused value
c9b9c09dae nedmalloc: do assignments only after the declaration section
22932d9169 config: stop checking whether the_repository is NULL
5732f2b1ef common-main: delay trace2 initialization
58ebccb478 t1309: use short branch name in includeIf.onbranch test
67feca3b1c gitcli: document --end-of-options
51b4594b40 parse-options: allow --end-of-options as a synonym for "--"
19e8789b23 revision: allow --end-of-options to end option parsing
ffe1afe67c tests: show the test name and number at the start of verbose output
96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests
7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits'
39d8831856 commit-graph: turn a group of write-related macro flags into an enum
9916073be5 t5318-commit-graph: use 'test_expect_code'
620c09e1b6 restore: add test for deleted ita files
ecd72042de checkout.c: unstage empty deleted ita files
a613d4f817 pack-refs: always refresh after taking the lock file
decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd'
371df1bea9 trace2: cleanup column alignment in perf target format
5aa02f9868 tree-walk: harden make_traverse_path() length computations
c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path()
b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len()
37806080d7 tree-walk: use size_t consistently
7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh'
12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh'
9055384710 tree-walk: drop oid from traverse_info
947208b725 setup_traverse_info(): stop copying oid
e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
a63f990d92 t3418: test `rebase -r` with merge strategies
5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges`
e145d99347 rebase -r: support merge strategies other than `recursive`
4e6023b13a t3427: fix another incorrect assumption
f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced
a9c71073da t3427: fix erroneous assumption
b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three
d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case
c248d32cdb t3427: simplify the `setup` test case significantly
8c1e24048a t3427: add a clarifying comment
5efed0ecf9 rebase: fold git-rebase--common into the -p backend
68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone
2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive`
6180b20239 t3400: stop referring to the scripted rebase
d5b581f228 Drop unused git-rebase--am.sh
814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation
6a289d45c0 grep: fix worktree case in submodules
870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching
8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data
09872f6418 grep: create a "is_fixed" member in "grep_pat"
8a35b540a9 grep: consistently use "p->fixed" in compile_regexp()
685668faaa grep: stop using a custom JIT stack with PCRE v1
34489239d0 grep: stop "using" a custom JIT stack with PCRE v2
04bef50c01 grep: remove overly paranoid BUG(...) code
b65abcafc7 grep: use PCRE v2 for optimized fixed-string search
48de2a768c grep: remove the kwset optimization
45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern>
25754125ce grep: make the behavior for NUL-byte in patterns sane
d316af059d grep tests: move binary pattern tests into their own file
471dac5d2c grep tests: move "grep binary" alongside the rest
f463beb805 grep: inline the return value of a function call used only once
b14cf112e2 t4210: skip more command-line encoding tests on MinGW
44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
4e2443b181 log tests: test regex backends in "--encode=<enc>" tests
90d21f9ebf list-objects-filter-options: make parser void
5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW
489fc9ee71 list-objects-filter-options: allow mult. --filter
c2694952e3 strbuf: give URL-encoding API a char predicate fn
cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list
f56f764279 list-objects-filter-options: move error check up
e987df5fe6 list-objects-filter: implement composite filters
842b00516a list-objects-filter-options: always supply *errbuf
7a7c7f4a6d list-objects-filter: put omits set in filter struct
9430147ca0 list-objects-filter: encapsulate filter components
4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c
60b7a92d84 Move repository_format_partial_clone to promisor-remote.c
db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
75de085211 remote: add promisor and partial clone config to the doc
7e154badc0 partial-clone: add multiple remotes in the doc
9a4c507886 t0410: test fetching from many promisor remotes
5e46139376 builtin/fetch: remove unique promisor remote limitation
fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter
b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote()
faf2abf496 promisor-remote: use repository_format_partial_clone
9cfebc1f3b promisor-remote: add promisor_remote_reinit()
9e27beaa23 promisor-remote: implement promisor_remote_get_direct()
48de315817 Add initial support for many promisor remotes
2e860675b6 fetch-object: make functions return an error code
c59c7c879e t0410: remove pipes after git commands
git-subtree-dir: third_party/git
git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
2020-05-22 18:46:45 +02:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/bundle.c:171 builtin/remote.c:1687
|
|
|
|
|
msgid "be verbose; must be placed before a subcommand"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/bundle.c:193 builtin/remote.c:1718
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Unknown subcommand: %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/cat-file.c:598
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
|
|
|
|
|
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/cat-file.c:599
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
2020-11-21 19:20:35 +01:00
|
|
|
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
|
|
|
|
|
"symlinks] [--textconv | --filters]"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/cat-file.c:620
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "only one batch option may be specified"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/cat-file.c:638
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<type> can be one of: blob, tree, commit, tag"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/cat-file.c:639
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show object type"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/cat-file.c:640
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show object size"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/cat-file.c:642
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "exit with zero when there's no error"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/cat-file.c:643
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pretty-print object's content"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/cat-file.c:645
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "for blob objects, run textconv on object's content"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/cat-file.c:647
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "for blob objects, run filters on object's content"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/cat-file.c:648
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "blob"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/cat-file.c:649
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use a specific path for --textconv/--filters"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/cat-file.c:651
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "allow -s and -t to work with broken/corrupt objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/cat-file.c:652
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "buffer --batch output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/cat-file.c:654
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show info and content of objects fed from the standard input"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/cat-file.c:658
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show info about objects fed from the standard input"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/cat-file.c:662
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/cat-file.c:664
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show all objects with --batch or --batch-check"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/cat-file.c:666
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not order --batch-all-objects output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/check-attr.c:13
|
|
|
|
|
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/check-attr.c:14
|
|
|
|
|
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/check-attr.c:21
|
|
|
|
|
msgid "report all attributes set on file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/check-attr.c:22
|
|
|
|
|
msgid "use .gitattributes only from the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
|
|
|
|
|
msgid "read file names from stdin"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/check-attr.c:25 builtin/check-ignore.c:27
|
|
|
|
|
msgid "terminate input and output records by a NUL character"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538
|
|
|
|
|
#: builtin/worktree.c:561
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "suppress progress reporting"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/check-ignore.c:29
|
|
|
|
|
msgid "show non-matching input paths"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/check-ignore.c:31
|
|
|
|
|
msgid "ignore index when checking"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/check-ignore.c:163
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot specify pathnames with --stdin"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/check-ignore.c:166
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "-z only makes sense with --stdin"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/check-ignore.c:168
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no path specified"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/check-ignore.c:172
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--quiet is only valid with a single pathname"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/check-ignore.c:174
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot have both --quiet and --verbose"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/check-ignore.c:177
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--non-matching is only valid with --verbose"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/check-mailmap.c:9
|
|
|
|
|
msgid "git check-mailmap [<options>] <contact>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/check-mailmap.c:14
|
|
|
|
|
msgid "also read contacts from stdin"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/check-mailmap.c:25
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to parse contact: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/check-mailmap.c:48
|
|
|
|
|
msgid "no contacts specified"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout-index.c:131
|
|
|
|
|
msgid "git checkout-index [<options>] [--] [<file>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout-index.c:148
|
|
|
|
|
msgid "stage should be between 1 and 3 or all"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout-index.c:164
|
|
|
|
|
msgid "check out all files in the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout-index.c:165
|
|
|
|
|
msgid "force overwrite of existing files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout-index.c:167
|
|
|
|
|
msgid "no warning for existing files and files not in index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout-index.c:169
|
|
|
|
|
msgid "don't checkout new files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout-index.c:171
|
|
|
|
|
msgid "update stat information in the index file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout-index.c:175
|
|
|
|
|
msgid "read list of paths from the standard input"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout-index.c:177
|
|
|
|
|
msgid "write the content to temporary files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout-index.c:178 builtin/column.c:31
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827
|
|
|
|
|
#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333
|
|
|
|
|
#: builtin/worktree.c:754
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "string"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout-index.c:179
|
|
|
|
|
msgid "when creating files, prepend <string>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout-index.c:181
|
|
|
|
|
msgid "copy out the files from named stage"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout.c:31
|
|
|
|
|
msgid "git checkout [<options>] <branch>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout.c:32
|
|
|
|
|
msgid "git checkout [<options>] [<branch>] -- <file>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout.c:37
|
|
|
|
|
msgid "git switch [<options>] [<branch>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout.c:42
|
|
|
|
|
msgid "git restore [<options>] [--source=<branch>] <file>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:188 builtin/checkout.c:227
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' does not have our version"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:190 builtin/checkout.c:229
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' does not have their version"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:206
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' does not have all necessary versions"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:258
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' does not have necessary versions"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:275
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s': cannot merge"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:291
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Unable to add merge result for '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:396
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Recreated %d merge conflict"
|
|
|
|
|
msgid_plural "Recreated %d merge conflicts"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:401
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Updated %d path from %s"
|
|
|
|
|
msgid_plural "Updated %d paths from %s"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:408
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Updated %d path from the index"
|
|
|
|
|
msgid_plural "Updated %d paths from the index"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437
|
|
|
|
|
#: builtin/checkout.c:441
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' cannot be used with updating paths"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:444 builtin/checkout.c:447
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' cannot be used with %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:451
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot update paths and switch to branch '%s' at the same time."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:455
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "neither '%s' or '%s' is specified"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:459
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' must be used when '%s' is not specified"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:464 builtin/checkout.c:469
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' or '%s' cannot be used with %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:528 builtin/checkout.c:535
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' is unmerged"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:703
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "you need to resolve your current index first"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:757
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"cannot continue with staged changes in the following files:\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:853
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Can not do reflog for '%s': %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:895
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "HEAD is now at"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:899 builtin/clone.c:720
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to update HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:903
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Reset branch '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:906
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Already on '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:910
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Switched to and reset branch '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:912 builtin/checkout.c:1338
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Switched to a new branch '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:914
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Switched to branch '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:965
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " ... and %d more.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:971
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Warning: you are leaving %d commit behind, not connected to\n"
|
|
|
|
|
"any of your branches:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"%s\n"
|
|
|
|
|
msgid_plural ""
|
|
|
|
|
"Warning: you are leaving %d commits behind, not connected to\n"
|
|
|
|
|
"any of your branches:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"%s\n"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:990
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"If you want to keep it by creating a new branch, this may be a good time\n"
|
|
|
|
|
"to do so with:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git branch <new-branch-name> %s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgid_plural ""
|
|
|
|
|
"If you want to keep them by creating a new branch, this may be a good time\n"
|
|
|
|
|
"to do so with:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git branch <new-branch-name> %s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1025
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "internal error in revision walk"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1029
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Previous HEAD position was"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1069 builtin/checkout.c:1333
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You are on a branch yet to be born"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1146
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"'%s' could be both a local file and a tracking branch.\n"
|
|
|
|
|
"Please use -- (and optionally --no-guess) to disambiguate"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout.c:1153
|
|
|
|
|
msgid ""
|
|
|
|
|
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
|
|
|
|
|
"you can do so by fully qualifying the name with the --track option:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git checkout --track origin/<name>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
|
|
|
|
|
"one remote, e.g. the 'origin' remote, consider setting\n"
|
|
|
|
|
"checkout.defaultRemote=origin in your config."
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1163
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "'%s' matched multiple (%d) remote tracking branches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout.c:1229
|
|
|
|
|
msgid "only one reference expected"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1246
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "only one reference expected, %d given."
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid reference: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1305 builtin/checkout.c:1671
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "reference is not a tree: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1352
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "a branch is expected, got tag '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1354
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "a branch is expected, got remote branch '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1355 builtin/checkout.c:1363
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "a branch is expected, got '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1358
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "a branch is expected, got commit '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1374
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"cannot switch branch while merging\n"
|
|
|
|
|
"Consider \"git merge --quit\" or \"git worktree add\"."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1378
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"cannot switch branch in the middle of an am session\n"
|
|
|
|
|
"Consider \"git am --quit\" or \"git worktree add\"."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1382
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"cannot switch branch while rebasing\n"
|
|
|
|
|
"Consider \"git rebase --quit\" or \"git worktree add\"."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1386
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"cannot switch branch while cherry-picking\n"
|
|
|
|
|
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1390
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"cannot switch branch while reverting\n"
|
|
|
|
|
"Consider \"git revert --quit\" or \"git worktree add\"."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1394
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "you are switching branch while bisecting"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1401
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "paths cannot be used with switching branches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' cannot be used with switching branches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422
|
|
|
|
|
#: builtin/checkout.c:1427 builtin/checkout.c:1432
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' cannot be used with '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1429
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' cannot take <start-point>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1437
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot switch branch to a non-commit '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1444
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "missing branch or commit argument"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84
|
|
|
|
|
#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287
|
|
|
|
|
#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551
|
|
|
|
|
#: builtin/send-pack.c:192
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "force progress reporting"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1487
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "perform a 3-way merge with the new branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "style"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1489
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "conflict style (merge or diff3)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1501 builtin/worktree.c:558
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "detach HEAD at named commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1502
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "set upstream info for new branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1504
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "force checkout (throw away local modifications)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1506
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "new-branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1506
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "new unparented branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1508 builtin/merge.c:291
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "update ignored files (default)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1511
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not check if another worktree is holding the given ref"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1524
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "checkout our version for unmerged files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1527
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "checkout their version for unmerged files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1531
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not limit pathspecs to sparse entries only"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1586
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "-%c, -%c and --orphan are mutually exclusive"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1590
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "-p and --overlay are mutually exclusive"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1627
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--track needs a branch name"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1632
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "missing branch name; try -%c"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1664
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not resolve %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1680
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "invalid path specification"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1687
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1691
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "git checkout: --detach does not take a path argument '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1700
|
|
|
|
|
msgid "--pathspec-from-file is incompatible with --detach"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500
|
|
|
|
|
msgid "--pathspec-from-file is incompatible with --patch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout.c:1716
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
|
|
|
|
|
"checking out of the index."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1721
|
|
|
|
|
msgid "you must specify path(s) to restore"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798
|
|
|
|
|
#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170
|
|
|
|
|
#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554
|
|
|
|
|
#: builtin/worktree.c:556
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1748
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "create and checkout a new branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1750
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "create/reset and checkout a branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1751
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "create reflog for new branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1753
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "second guess 'git checkout <no-such-branch>' (default)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1754
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use overlay mode (default)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1799
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "create and switch to a new branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1801
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "create/reset and switch to a branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1803
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "second guess 'git switch <no-such-branch>'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1805
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "throw away local modifications"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1839
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "which tree-ish to checkout from"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1841
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "restore the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1843
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "restore the working tree (default)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1845
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ignore unmerged entries"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/checkout.c:1846
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use overlay mode"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:29
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:33
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Removing %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:34
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Would remove %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:35
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Skipping repository %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:36
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Would skip repository %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:37
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to remove %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:38
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not lstat %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:302 git-add--interactive.perl:595
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Prompt help:\n"
|
|
|
|
|
"1 - select a numbered item\n"
|
|
|
|
|
"foo - select item based on unique prefix\n"
|
|
|
|
|
" - (empty) select nothing\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:306 git-add--interactive.perl:604
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Prompt help:\n"
|
|
|
|
|
"1 - select a single item\n"
|
|
|
|
|
"3-5 - select a range of items\n"
|
|
|
|
|
"2-3,6-9 - select multiple ranges\n"
|
|
|
|
|
"foo - select item based on unique prefix\n"
|
|
|
|
|
"-... - unselect specified items\n"
|
|
|
|
|
"* - choose all items\n"
|
|
|
|
|
" - (empty) finish selecting\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:521 git-add--interactive.perl:570
|
|
|
|
|
#: git-add--interactive.perl:575
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format, perl-format
|
|
|
|
|
msgid "Huh (%s)?\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:661
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Input ignore patterns>> "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:696
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "WARNING: Cannot find items matched by: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:717
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Select items to delete"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: Make sure to keep [y/N] as is
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:758
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Remove %s [y/N]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:789
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"clean - start cleaning\n"
|
|
|
|
|
"filter by pattern - exclude items from deletion\n"
|
|
|
|
|
"select by numbers - select items to be deleted by numbers\n"
|
|
|
|
|
"ask each - confirm each deletion (like \"rm -i\")\n"
|
|
|
|
|
"quit - stop cleaning\n"
|
|
|
|
|
"help - this screen\n"
|
|
|
|
|
"? - help for prompt selection"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:825
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Would remove the following item:"
|
|
|
|
|
msgid_plural "Would remove the following items:"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:841
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No more files to clean, exiting."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:903
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not print names of files removed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:905
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "force"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:906
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "interactive cleaning"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:908
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "remove whole directories"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
|
|
|
|
|
#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183
|
|
|
|
|
#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528
|
2020-01-12 00:36:56 +01:00
|
|
|
#: builtin/show-ref.c:179
|
|
|
|
|
msgid "pattern"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:910
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add <pattern> to ignore rules"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:911
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "remove ignored files, too"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:913
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "remove only ignored files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:929
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
|
|
|
|
|
"clean"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:932
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
|
|
|
|
|
"refusing to clean"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clean.c:944
|
|
|
|
|
msgid "-x and -X cannot be used together"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:45
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git clone [<options>] [--] <repo> [<dir>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:93
|
|
|
|
|
msgid "don't create a checkout"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "create a bare repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:98
|
|
|
|
|
msgid "create a mirror repository (implies bare)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:100
|
|
|
|
|
msgid "to clone from a local repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:102
|
|
|
|
|
msgid "don't use local hardlinks, always copy"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:104
|
|
|
|
|
msgid "setup as shared repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:106
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pathspec"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:106
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "initialize submodules in the clone"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:110
|
|
|
|
|
msgid "number of submodules cloned in parallel"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:111 builtin/init-db.c:550
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "template-directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:112 builtin/init-db.c:551
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "directory from which templates will be used"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831
|
|
|
|
|
#: builtin/submodule--helper.c:2336
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "reference repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:118 builtin/submodule--helper.c:1833
|
|
|
|
|
#: builtin/submodule--helper.c:2338
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use --reference only while cloning"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561
|
|
|
|
|
#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "name"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:120
|
|
|
|
|
msgid "use <name> instead of 'origin' to track upstream"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:122
|
|
|
|
|
msgid "checkout <branch> instead of the remote's HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:124
|
|
|
|
|
msgid "path to git-upload-pack on the remote"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849
|
|
|
|
|
#: builtin/pull.c:208
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "depth"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:126
|
|
|
|
|
msgid "create a shallow clone of that depth"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535
|
|
|
|
|
#: builtin/pull.c:211
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "time"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:128
|
|
|
|
|
msgid "create a shallow clone since a specific time"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200
|
|
|
|
|
#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "revision"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "deepen history of shallow clone, excluding rev"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:132 builtin/submodule--helper.c:1843
|
|
|
|
|
#: builtin/submodule--helper.c:2352
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "clone only one branch, HEAD or --branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:134
|
|
|
|
|
msgid "don't clone any tags, and make later fetches not to follow them"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:136
|
|
|
|
|
msgid "any cloned submodules will be shallow"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:137 builtin/init-db.c:559
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "gitdir"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:138 builtin/init-db.c:560
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "separate git dir from working tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:139
|
|
|
|
|
msgid "key=value"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:140
|
|
|
|
|
msgid "set config inside the new repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76
|
|
|
|
|
#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "server-specific"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76
|
|
|
|
|
#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "option to transmit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234
|
|
|
|
|
#: builtin/push.c:561
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use IPv4 addresses only"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237
|
|
|
|
|
#: builtin/push.c:563
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use IPv6 addresses only"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:149
|
|
|
|
|
msgid "any cloned submodules will use their remote-tracking branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:151
|
|
|
|
|
msgid "initialize sparse-checkout file to include only files at root"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:287
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"No directory name could be guessed.\n"
|
|
|
|
|
"Please specify a directory on the command line"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:340
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "info: Could not add alternate for '%s': %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:413
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s exists and is not a directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:431
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to start iterator over '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:462
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to create link '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:466
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to copy file to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:471
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to iterate over '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:498
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "done.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:512
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Clone succeeded, but checkout failed.\n"
|
|
|
|
|
"You can inspect what was checked out with 'git status'\n"
|
|
|
|
|
"and retry with 'git restore --source=HEAD :/'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:589
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not find remote branch %s to clone."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:708
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to update %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:756
|
|
|
|
|
msgid "failed to initialize sparse-checkout"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:779
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:811
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to checkout working tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:868
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to write parameters to config file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:931
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot repack to clean up"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:933
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot unlink temporary alternates file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:970 builtin/receive-pack.c:2434
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Too many arguments."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:974
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You must specify a repository to clone."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:987
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "--bare and --origin %s options are incompatible."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:990
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--bare and --separate-git-dir are incompatible."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:1006
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "repository '%s' does not exist"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:1010 builtin/fetch.c:1841
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "depth %s is not a positive number"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:1020
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "destination path '%s' already exists and is not an empty directory."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:1026
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "repository path '%s' already exists and is not an empty directory."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:1040
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "working tree '%s' already exists."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271
|
|
|
|
|
#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not create leading directories of '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:1060
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not create work tree dir '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:1080
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Cloning into bare repository '%s'...\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:1082
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Cloning into '%s'...\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:1106
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"clone --recursive is not compatible with both --reference and --reference-if-"
|
|
|
|
|
"able"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:1170
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--depth is ignored in local clones; use file:// instead."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:1172
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--shallow-since is ignored in local clones; use file:// instead."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:1174
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:1176
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--filter is ignored in local clones; use file:// instead."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:1179
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "source repository is shallow, ignoring --local"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:1184
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--local is ignored"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:1268 builtin/clone.c:1276
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Remote branch %s not found in upstream %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/clone.c:1279
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You appear to have cloned an empty repository."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/column.c:10
|
|
|
|
|
msgid "git column [<options>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/column.c:27
|
|
|
|
|
msgid "lookup config vars"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/column.c:28 builtin/column.c:29
|
|
|
|
|
msgid "layout to use"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/column.c:30
|
|
|
|
|
msgid "Maximum width"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/column.c:31
|
|
|
|
|
msgid "Padding space on left border"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/column.c:32
|
|
|
|
|
msgid "Padding space on right border"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/column.c:33
|
|
|
|
|
msgid "Padding space between columns"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/column.c:51
|
|
|
|
|
msgid "--command must be the first argument"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
|
|
|
|
|
msgid ""
|
|
|
|
|
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
|
|
|
|
|
msgid ""
|
|
|
|
|
"git commit-graph write [--object-dir <objdir>] [--append] [--"
|
|
|
|
|
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
|
|
|
|
|
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:64
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not find object directory matching %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
|
|
|
|
|
#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764
|
|
|
|
|
msgid "dir"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
|
|
|
|
|
#: builtin/commit-graph.c:317
|
|
|
|
|
msgid "The object directory to store the graph"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:83
|
|
|
|
|
msgid "if the commit-graph is split, only verify the tip file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:106
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not open commit-graph '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:142
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized --split argument, %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:155
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unexpected non-hex object ID: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:160
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid object: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:213
|
|
|
|
|
msgid "start walk at all refs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:215
|
|
|
|
|
msgid "scan pack-indexes listed by stdin for commits"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:217
|
|
|
|
|
msgid "start walk at commits listed by stdin"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:219
|
|
|
|
|
msgid "include all commits already in the commit-graph file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:221
|
|
|
|
|
msgid "enable computation for changed paths"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:224
|
|
|
|
|
msgid "allow writing an incremental commit-graph file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:228
|
|
|
|
|
msgid "maximum number of commits in a non-base split commit-graph"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:230
|
|
|
|
|
msgid "maximum ratio between two levels of a split commit-graph"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:232
|
|
|
|
|
msgid "only expire files older than a given date-time"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:234
|
|
|
|
|
msgid "maximum number of changed-path Bloom filters to compute"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-graph.c:255
|
|
|
|
|
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit-graph.c:287
|
|
|
|
|
msgid "Collecting commits from input"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-tree.c:18
|
|
|
|
|
msgid ""
|
|
|
|
|
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
|
|
|
|
|
"<file>)...] <tree>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-tree.c:31
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "duplicate parent %s ignored"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "not a valid object name %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-tree.c:93
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git commit-tree: failed to open '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-tree.c:96
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git commit-tree: failed to read '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-tree.c:98
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git commit-tree: failed to close '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-tree.c:111
|
|
|
|
|
msgid "parent"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-tree.c:112
|
|
|
|
|
msgid "id of a parent commit object"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272
|
|
|
|
|
#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471
|
|
|
|
|
#: builtin/tag.c:413
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "message"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit-tree.c:115 builtin/commit.c:1504
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "commit message"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-tree.c:118
|
|
|
|
|
msgid "read commit log message from file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289
|
|
|
|
|
#: builtin/pull.c:176 builtin/revert.c:118
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "GPG sign commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-tree.c:133
|
|
|
|
|
msgid "must give exactly one tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit-tree.c:140
|
|
|
|
|
msgid "git commit-tree: failed to read"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit.c:41
|
|
|
|
|
msgid "git commit [<options>] [--] <pathspec>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit.c:46
|
|
|
|
|
msgid "git status [<options>] [--] <pathspec>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit.c:51
|
|
|
|
|
msgid ""
|
|
|
|
|
"You asked to amend the most recent commit, but doing so would make\n"
|
|
|
|
|
"it empty. You can repeat your command with --allow-empty, or you can\n"
|
|
|
|
|
"remove the commit entirely with \"git reset HEAD^\".\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit.c:56
|
|
|
|
|
msgid ""
|
|
|
|
|
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
|
|
|
|
|
"If you wish to commit it anyway, use:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git commit --allow-empty\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit.c:63
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Otherwise, please use 'git rebase --skip'\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit.c:66
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit.c:69
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"and then use:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git cherry-pick --continue\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"to resume cherry-picking the remaining commits.\n"
|
|
|
|
|
"If you wish to skip this commit, use:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git cherry-pick --skip\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:312
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "failed to unpack HEAD tree object"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:348
|
|
|
|
|
msgid "--pathspec-from-file with -a does not make sense"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit.c:361
|
|
|
|
|
msgid "No paths with --include/--only does not make sense."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit.c:373
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to create temporary index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:382
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "interactive add failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:397
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to update temporary index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:399
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Failed to update main cache tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to write new_index file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:476
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot do a partial commit during a merge."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:478
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot do a partial commit during a cherry-pick."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:480
|
|
|
|
|
msgid "cannot do a partial commit during a rebase."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit.c:488
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot read the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:507
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to write temporary index file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:605
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "commit '%s' lacks author header"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:607
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "commit '%s' has malformed author line"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:626
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "malformed --author parameter"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:679
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"unable to select a comment character that is not used\n"
|
|
|
|
|
"in the current commit message"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not lookup commit %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:729 builtin/shortlog.c:478
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "(reading log message from standard input)\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:731
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not read log from standard input"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:735
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not read log file '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:766 builtin/commit.c:782
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not read SQUASH_MSG"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:773
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not read MERGE_MSG"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:833
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not write commit template"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:853
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"It looks like you may be committing a merge.\n"
|
2020-11-21 19:20:35 +01:00
|
|
|
"If this is not correct, please run\n"
|
|
|
|
|
"\tgit update-ref -d MERGE_HEAD\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
"and try again.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:858
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"It looks like you may be committing a cherry-pick.\n"
|
2020-11-21 19:20:35 +01:00
|
|
|
"If this is not correct, please run\n"
|
|
|
|
|
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
"and try again.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:868
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Please enter the commit message for your changes. Lines starting\n"
|
|
|
|
|
"with '%c' will be ignored, and an empty message aborts the commit.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:876
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Please enter the commit message for your changes. Lines starting\n"
|
|
|
|
|
"with '%c' will be kept; you may remove them yourself if you want to.\n"
|
|
|
|
|
"An empty message aborts the commit.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:893
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%sAuthor: %.*s <%.*s>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:901
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%sDate: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:908
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%sCommitter: %.*s <%.*s>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:926
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Cannot read index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:997
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Error building trees"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1011 builtin/tag.c:276
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Please supply the message using either -m or -F option.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1055
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1069
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid ignored mode '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1087 builtin/commit.c:1331
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid untracked files mode '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1127
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--long and -z are incompatible"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1171
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Using both --reset-author and --author does not make sense"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1180
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You have nothing to amend."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1183
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You are in the middle of a merge -- cannot amend."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1185
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You are in the middle of a cherry-pick -- cannot amend."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1187
|
|
|
|
|
msgid "You are in the middle of a rebase -- cannot amend."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/commit.c:1190
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Options --squash and --fixup cannot be used together"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1200
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Only one of -c/-C/-F/--fixup can be used."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1202
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Option -m cannot be combined with -c/-C/-F."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1211
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--reset-author can be used only with -C, -c or --amend."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1229
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1235
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "paths '%s ...' with -a does not make sense"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1366 builtin/commit.c:1527
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show status concisely"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1368 builtin/commit.c:1529
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show branch information"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1370
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show stash information"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1372 builtin/commit.c:1531
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "compute full ahead/behind values"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1374
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "version"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539
|
|
|
|
|
#: builtin/worktree.c:722
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "machine-readable output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1377 builtin/commit.c:1535
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show status in long format (default)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1380 builtin/commit.c:1538
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "terminate entries with NUL"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
|
|
|
|
|
#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
|
|
|
|
|
#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "mode"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1383 builtin/commit.c:1541
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1387
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"show ignored files, optional modes: traditional, matching, no. (Default: "
|
|
|
|
|
"traditional)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1389 parse-options.h:192
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "when"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1390
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"ignore changes to submodules, optional when: all, dirty, untracked. "
|
|
|
|
|
"(Default: all)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1392
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "list untracked files in columns"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1393
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not detect renames"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1395
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "detect renames, optionally set similarity index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1415
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Unsupported combination of ignored and untracked-files arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1497
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "suppress summary after successful commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1498
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show diff in commit message template"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1500
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Commit message options"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "read message from file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1502
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "author"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1502
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "override author for commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1503 builtin/gc.c:539
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "date"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1503
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "override date for commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
|
|
|
|
|
#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1505
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "reuse and edit message from specified commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1506
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "reuse message from specified commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1507
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use autosquash formatted message to fixup specified commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1508
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use autosquash formatted message to squash specified commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1509
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "the commit is authored by me now (used with -C/-c/--amend)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292
|
|
|
|
|
#: builtin/pull.c:145 builtin/revert.c:110
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add Signed-off-by:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1511
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use specified template file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1512
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "force edit of commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1514
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "include status in commit message template"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1519
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Commit contents options"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1520
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "commit all changed files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1521
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add specified files to index for commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1522
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "interactively add files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1523
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "interactively add changes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1524
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "commit only specified files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1525
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "bypass pre-commit and commit-msg hooks"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1526
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show what would be committed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1539
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "amend previous commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1540
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "bypass post-rewrite hook"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1547
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ok to record an empty change"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1549
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ok to record a change with an empty message"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1622
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Corrupt MERGE_HEAD file (%s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1629
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not read MERGE_MODE"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1650
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not read commit message: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1657
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Aborting commit due to empty commit message.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1662
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Aborting commit; you did not edit the message.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/commit.c:1696
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"repository has been updated, but unable to write\n"
|
|
|
|
|
"new_index file. Check that disk is not full and quota is\n"
|
|
|
|
|
"not exceeded, and then \"git restore --staged :/\" to recover."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/config.c:11
|
|
|
|
|
msgid "git config [<options>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:107 builtin/env--helper.c:27
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized --type argument, %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:119
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "only one type at a time"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:128
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Config file location"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:129
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use global config file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:130
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use system config file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:131
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use repository config file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:132
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use per-worktree config file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:133
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use given config file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:134
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "blob-id"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:134
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "read config from given blob object"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:135
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Action"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:136
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "get value: name [value-regex]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:137
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "get all values: key [value-regex]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:138
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "get values for regexp: name-regex [value-regex]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:139
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "get value specific for the URL: section[.var] URL"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:140
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "replace all matching variables: name value [value_regex]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:141
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add a new variable: name value"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:142
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "remove a variable: name [value-regex]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:143
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "remove all matches: name [value-regex]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:144
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "rename section: old-name new-name"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:145
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "remove a section: name"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:146
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "list all"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:147
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "open an editor"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:148
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "find the color configured: slot [default]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:149
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "find the color setting: slot [stdout-is-tty]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:150
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Type"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:151 builtin/env--helper.c:43
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "value is given this type"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:152
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "value is \"true\" or \"false\""
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:153
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "value is decimal number"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:154
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "value is --bool or --int"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:155
|
|
|
|
|
msgid "value is --bool or string"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/config.c:156
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "value is a path (file or directory name)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:157
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "value is an expiry date"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:158
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Other"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:159
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "terminate values with NUL byte"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:160
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show variable names only"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:161
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "respect include directives on lookup"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:162
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show origin of config (file, standard input, blob, command line)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:163
|
|
|
|
|
msgid "show scope of config (worktree, local, global, system, command)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/config.c:164 builtin/env--helper.c:45
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "value"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:164
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "with --get, use default value when missing entry"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:178
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "wrong number of arguments, should be %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:180
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "wrong number of arguments, should be from %d to %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:334
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid key pattern: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:370
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to format default config value: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:434
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot parse color '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:476
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to parse default color value"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:529 builtin/config.c:789
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "not in a git directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:532
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "writing to stdin is not supported"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:535
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "writing config blobs is not supported"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:620
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"# This is Git's per-user configuration file.\n"
|
|
|
|
|
"[user]\n"
|
|
|
|
|
"# Please adapt and uncomment the following lines:\n"
|
|
|
|
|
"#\tname = %s\n"
|
|
|
|
|
"#\temail = %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:644
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "only one config file at a time"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:650
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--local can only be used inside a git repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:652
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--blob can only be used inside a git repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:654
|
|
|
|
|
msgid "--worktree can only be used inside a git repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/config.c:676
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "$HOME not set"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:700
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"--worktree cannot be used with multiple working trees unless the config\n"
|
|
|
|
|
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
|
|
|
|
|
"section in \"git help worktree\" for details"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:735
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--get-color and variable type are incoherent"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:740
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "only one action at a time"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:753
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--name-only is only applicable to --list or --get-regexp"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:759
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
|
|
|
|
|
"list"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:765
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--default is only applicable to --get"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:778
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to read config file '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:781
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "error processing config file(s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:791
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "editing stdin is not supported"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:793
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "editing blobs is not supported"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:807
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot create configuration file %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:820
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"cannot overwrite multiple values with a single value\n"
|
|
|
|
|
" Use a regexp, --add or --replace-all to change %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/config.c:894 builtin/config.c:905
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no such section: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/count-objects.c:90
|
|
|
|
|
msgid "git count-objects [-v] [-H | --human-readable]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/count-objects.c:100
|
|
|
|
|
msgid "print sizes in human readable format"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/credential-cache--daemon.c:226
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The permissions on your socket directory are too loose; other\n"
|
|
|
|
|
"users may be able to read your cached credentials. Consider running:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tchmod 0700 %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/credential-cache--daemon.c:275
|
|
|
|
|
msgid "print debugging messages to stderr"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/credential-cache--daemon.c:315
|
|
|
|
|
msgid "credential-cache--daemon unavailable; no unix socket support"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/credential-cache.c:154
|
|
|
|
|
msgid "credential-cache unavailable; no unix socket support"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/describe.c:26
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git describe [<options>] [<commit-ish>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:27
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git describe [<options>] --dirty"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/describe.c:63
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "head"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/describe.c:63
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "lightweight"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/describe.c:63
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "annotated"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/describe.c:277
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "annotated tag %s not available"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:281
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "tag '%s' is externally known as '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:328
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no tag exactly matches '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:330
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "No exact match on refs or tags, searching to describe\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:397
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "finished search at %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:424
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"No annotated tags can describe '%s'.\n"
|
|
|
|
|
"However, there were unannotated tags: try --tags."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:428
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"No tags can describe '%s'.\n"
|
|
|
|
|
"Try --always, or create some tags."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:458
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "traversed %lu commits\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:461
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"more than %i tags found; listed %i most recent\n"
|
|
|
|
|
"gave up search at %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:529
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "describe %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:532
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Not a valid object name %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:540
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s is neither a commit nor blob"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:554
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "find the tag that comes after the commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:555
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "debug search strategy on stderr"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:556
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use any ref"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:557
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use any tag, even unannotated"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:558
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "always use long format"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:559
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "only follow first parent"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:562
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "only output exact matches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:564
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "consider <n> most recent tags (default: 10)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:566
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "only consider tags matching <pattern>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:568
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not consider tags matching <pattern>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:570 builtin/name-rev.c:535
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show abbreviated commit object as fallback"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:571 builtin/describe.c:574
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "mark"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:572
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:575
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "append <mark> on broken working tree (default: \"-broken\")"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:593
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--long is incompatible with --abbrev=0"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:622
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No names found, cannot describe anything."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:673
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--dirty is incompatible with commit-ishes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/describe.c:675
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--broken is incompatible with commit-ishes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/diff.c:91
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s': not a regular file or symlink"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/diff.c:241
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid option: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/diff.c:358
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s...%s: no merge base"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/diff.c:468
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Not a git repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/diff.c:513
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid object '%s' given."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/diff.c:524
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "more than two blobs given: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/diff.c:529
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unhandled object '%s' given."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/diff.c:563
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s...%s: multiple merge bases, using %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-01-12 00:36:56 +01:00
|
|
|
#: builtin/difftool.c:30
|
|
|
|
|
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:260
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed: %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:302
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not read symlink %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:304
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not read symlink file %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:312
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not read object %s for symlink %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:413
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"combined diff formats('-c' and '--cc') are not supported in\n"
|
|
|
|
|
"directory diff mode('-d' and '--dir-diff')."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:634
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "both files modified: '%s' and '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:636
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "working tree file has been left."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:647
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "temporary files exist in '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:648
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "you may want to cleanup or recover these."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:697
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use `diff.guitool` instead of `diff.tool`"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:699
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "perform a full-directory diff"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:701
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not prompt before launching a diff tool"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:706
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use symlinks in dir-diff mode"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:707
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "tool"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:708
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use the specified diff tool"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:710
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "print a list of diff tools that may be used with `--tool`"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:713
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
|
|
|
|
|
"code"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:716
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "specify a custom command for viewing diffs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:717
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "passed to `diff`"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:732
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "difftool requires worktree or --no-index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:739
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--dir-diff is incompatible with --no-index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:742
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--gui, --tool and --extcmd are mutually exclusive"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:750
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no <tool> given for --tool=<tool>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/difftool.c:757
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no <cmd> given for --extcmd=<cmd>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/env--helper.c:6
|
|
|
|
|
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/env--helper.c:42 builtin/hash-object.c:98
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "type"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/env--helper.c:46
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "default for git_env_*(...) to fall back on"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/env--helper.c:48
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "be quiet only use git_env_*() value as exit code"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/env--helper.c:67
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/env--helper.c:82
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"option `--default' expects an unsigned long value with `--type=ulong`, not `"
|
|
|
|
|
"%s`"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fast-export.c:29
|
|
|
|
|
msgid "git fast-export [rev-list-opts]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fast-export.c:868
|
|
|
|
|
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fast-export.c:1178
|
|
|
|
|
msgid "--anonymize-map token cannot be empty"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fast-export.c:1198
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show progress after <n> objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fast-export.c:1200
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "select handling of signed tags"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fast-export.c:1203
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "select handling of tags that tag filtered objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fast-export.c:1206
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "select handling of commit messages in an alternate encoding"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fast-export.c:1209
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Dump marks to this file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fast-export.c:1211
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Import marks from this file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fast-export.c:1215
|
|
|
|
|
msgid "Import marks from this file if it exists"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fast-export.c:1217
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Fake a tagger when tags lack one"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fast-export.c:1219
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Output full tree for each commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fast-export.c:1221
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Use the done feature to terminate the stream"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fast-export.c:1222
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Skip output of blob data"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fast-export.c:1223 builtin/log.c:1811
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "refspec"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fast-export.c:1224
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Apply refspec to exported refs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fast-export.c:1225
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "anonymize output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fast-export.c:1226
|
|
|
|
|
msgid "from:to"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fast-export.c:1227
|
|
|
|
|
msgid "convert <from> to <to> in anonymized output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fast-export.c:1230
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Reference parents which are not in fast-export stream by object id"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fast-export.c:1232
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Show original object ids of blobs/commits"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fast-export.c:1234
|
|
|
|
|
msgid "Label tags with mark ids"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fast-export.c:1257
|
|
|
|
|
msgid "--anonymize-map without --anonymize does not make sense"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fast-export.c:1272
|
|
|
|
|
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fast-import.c:3086
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Missing from marks for submodule '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fast-import.c:3088
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Missing to marks for submodule '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fast-import.c:3223
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Expected 'mark' command, got %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fast-import.c:3228
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Expected 'to' command, got %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fast-import.c:3320
|
|
|
|
|
msgid "Expected format name:filename for submodule rewrite option"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fast-import.c:3374
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fetch-pack.c:241
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Lockfile created but not reported: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fetch.c:35
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:36
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git fetch [<options>] <group>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:37
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:38
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git fetch --all [<options>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:119
|
|
|
|
|
msgid "fetch.parallel cannot be negative"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fetch.c:142 builtin/pull.c:185
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "fetch from all remotes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:144 builtin/pull.c:245
|
|
|
|
|
msgid "set upstream for git pull/fetch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fetch.c:146 builtin/pull.c:188
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "append to .git/FETCH_HEAD instead of overwriting"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:148 builtin/pull.c:191
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "path to upload pack on remote end"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:149
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "force overwrite of local reference"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:151
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "fetch from multiple remotes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:153 builtin/pull.c:195
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "fetch all tags and associated objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:155
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not fetch all tags (--no-tags)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:157
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "number of submodules fetched in parallel"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:159 builtin/pull.c:198
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "prune remote-tracking branches no longer on remote"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:161
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "prune local tags no longer on remote and clobber changed tags"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "on-demand"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:163
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "control recursive fetching of submodules"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:168
|
|
|
|
|
msgid "write fetched references to the FETCH_HEAD file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fetch.c:169 builtin/pull.c:206
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "keep downloaded pack"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:171
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "allow updating of HEAD ref"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209
|
|
|
|
|
#: builtin/pull.c:218
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "deepen history of shallow clone"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:176 builtin/pull.c:212
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "deepen history of shallow repository based on time"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:182 builtin/pull.c:221
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "convert to a complete repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:185
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "prepend this to submodule path output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:188
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"default for recursive fetching of submodules (lower priority than config "
|
|
|
|
|
"files)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:192 builtin/pull.c:224
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "accept refs that update .git/shallow"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:193 builtin/pull.c:226
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "refmap"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:194 builtin/pull.c:227
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "specify fetch refmap"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:201 builtin/pull.c:240
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "report that we have only objects reachable from this object"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:204 builtin/fetch.c:206
|
|
|
|
|
msgid "run 'maintenance --auto' after fetching"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:208 builtin/pull.c:243
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "check for forced-updates on all updated branches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:210
|
|
|
|
|
msgid "write the commit-graph after fetching"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fetch.c:212
|
|
|
|
|
msgid "accept refspecs from stdin"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fetch.c:523
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Couldn't find remote ref HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:677
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "configuration fetch.output contains invalid value %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:775
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "object %s not found"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:779
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "[up to date]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "[rejected]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:793
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "can't fetch in current branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:803
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "[tag update]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863
|
|
|
|
|
#: builtin/fetch.c:875
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to update local ref"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:808
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "would clobber existing tag"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:830
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "[new tag]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:833
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "[new branch]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:836
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "[new ref]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:875
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "forced update"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:880
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "non-fast-forward"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:901
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Fetch normally indicates which branches had a forced update,\n"
|
|
|
|
|
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
|
|
|
|
|
"flag or run 'git config fetch.showForcedUpdates true'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:905
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"It took %.2f seconds to check forced updates. You can use\n"
|
|
|
|
|
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
|
|
|
|
|
"false'\n"
|
|
|
|
|
" to avoid this check.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:939
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s did not send all necessary objects\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:960
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "reject %s because shallow roots are not allowed to be updated"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1053 builtin/fetch.c:1191
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "From %.*s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1064
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"some local refs could not be updated; try running\n"
|
|
|
|
|
" 'git remote prune %s' to remove any old, conflicting branches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1161
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " (%s will become dangling)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1162
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " (%s has become dangling)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1194
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "[deleted]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1195 builtin/remote.c:1113
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "(none)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1218
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Refusing to fetch into current branch %s of non-bare repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1237
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Option \"%s\" value \"%s\" is not valid for %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1240
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Option \"%s\" is ignored for %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1448
|
|
|
|
|
msgid "multiple branches detected, incompatible with --set-upstream"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fetch.c:1463
|
|
|
|
|
msgid "not setting upstream for a remote remote-tracking branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fetch.c:1465
|
|
|
|
|
msgid "not setting upstream for a remote tag"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fetch.c:1467
|
|
|
|
|
msgid "unknown branch type"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fetch.c:1469
|
|
|
|
|
msgid ""
|
|
|
|
|
"no source branch found.\n"
|
|
|
|
|
"you need to specify exactly one branch with the --set-upstream option."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fetch.c:1598 builtin/fetch.c:1661
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Fetching %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not fetch %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1620
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not fetch '%s' (exit code: %d)\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1724
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"No remote repository specified. Please, specify either a URL or a\n"
|
|
|
|
|
"remote name from which new revisions should be fetched."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1760
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You need to specify a tag name."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1825
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Negative depth in --deepen is not supported"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1827
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--deepen and --depth are mutually exclusive"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1832
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--depth and --unshallow cannot be used together"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1834
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--unshallow on a complete repository does not make sense"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1851
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "fetch --all does not take a repository argument"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1853
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "fetch --all does not make sense with refspecs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1862
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "No such remote or remote group: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1869
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Fetching a group and specifying refspecs does not make sense"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1887
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"--filter can only be used with the remote configured in extensions."
|
|
|
|
|
"partialclone"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fetch.c:1891
|
|
|
|
|
msgid "--stdin can only be used when fetching from one remote"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/fmt-merge-msg.c:7
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fmt-merge-msg.c:18
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "populate log with at most <n> entries from shortlog"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fmt-merge-msg.c:21
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "alias for --log (deprecated)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fmt-merge-msg.c:24
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "text"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fmt-merge-msg.c:25
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use <text> as start of message"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fmt-merge-msg.c:26
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "file to read from"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:10
|
|
|
|
|
msgid "git for-each-ref [<options>] [<pattern>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:11
|
|
|
|
|
msgid "git for-each-ref [--points-at <object>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:12
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:13
|
|
|
|
|
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:28
|
|
|
|
|
msgid "quote placeholders suitably for shells"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:30
|
|
|
|
|
msgid "quote placeholders suitably for perl"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:32
|
|
|
|
|
msgid "quote placeholders suitably for python"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:34
|
|
|
|
|
msgid "quote placeholders suitably for Tcl"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:37
|
|
|
|
|
msgid "show only <n> matched refs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/for-each-ref.c:39 builtin/tag.c:440
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "respect format colors"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:42
|
|
|
|
|
msgid "print only refs which points at the given object"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:44
|
|
|
|
|
msgid "print only refs that are merged"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:45
|
|
|
|
|
msgid "print only refs that are not merged"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:46
|
|
|
|
|
msgid "print only refs which contain the commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:47
|
|
|
|
|
msgid "print only refs which don't contain the commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unknown"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:101 builtin/fsck.c:121
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "error in %s %s: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:115
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "warning in %s %s: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:144 builtin/fsck.c:147
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "broken link from %7s %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:156
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "wrong object type in link"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:172
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"broken link from %7s %s\n"
|
|
|
|
|
" to %7s %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:283
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "missing %s %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:310
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unreachable %s %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:330
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "dangling %s %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:340
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not create lost-found"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:351
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not finish '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:368
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Checking %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:406
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Checking connectivity (%d objects)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:425
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Checking %s %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:430
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "broken links"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:439
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "root %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:447
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "tagged %s %s (%s) in %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:476
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: object corrupt or missing"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:501
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: invalid reflog entry %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:515
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Checking reflog %s->%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:549
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: invalid sha1 pointer %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:556
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: not a commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:610
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "notice: No default references"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:625
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: object corrupt or missing: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:638
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: object could not be parsed: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:658
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad sha1 file: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:673
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Checking object directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:676
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Checking object directories"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:691
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Checking %s link"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:696 builtin/index-pack.c:865
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:703
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s points to something strange (%s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:709
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: detached HEAD points at nothing"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:713
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "notice: %s points to an unborn branch (%s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:725
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Checking cache tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:730
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: invalid sha1 pointer in cache-tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:739
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "non-tree in cache-tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:770
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git fsck [<options>] [<object>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:776
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show unreachable objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:777
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show dangling objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:778
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "report tags"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:779
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "report root nodes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:780
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "make index objects head nodes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:781
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "make reflogs head nodes (default)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:782
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "also consider packs and alternate objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:783
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "check only connectivity"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:784
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "enable more strict checking"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:786
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "write dangling objects in .git/lost-found"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:787 builtin/prune.c:134
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show progress"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:788
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show verbose names for reachable objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:847 builtin/index-pack.c:261
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Checking objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:875
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: object missing"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/fsck.c:886
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid parameter: expected sha1, got '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/gc.c:36
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git gc [<options>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/gc.c:91
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to fstat %s: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/gc.c:127
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to parse '%s' value '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/gc.c:476 builtin/init-db.c:58
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot stat '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot read '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/gc.c:492
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The last gc run reported the following. Please correct the root cause\n"
|
|
|
|
|
"and remove %s.\n"
|
|
|
|
|
"Automatic cleanup will not be performed until the file is removed.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/gc.c:540
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "prune unreferenced objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/gc.c:542
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "be more thorough (increased runtime)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/gc.c:543
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "enable auto-gc mode"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/gc.c:546
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "force running gc even if there may be another gc running"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/gc.c:549
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "repack all other packs except the largest pack"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/gc.c:566
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to parse gc.logexpiry value %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/gc.c:577
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to parse prune expiry value %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/gc.c:597
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Auto packing the repository in background for optimum performance.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/gc.c:599
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Auto packing the repository for optimum performance.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/gc.c:600
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "See \"git help gc\" for manual housekeeping.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/gc.c:640
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/gc.c:695
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"There are too many unreachable loose objects; run 'git prune' to remove them."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/gc.c:705
|
|
|
|
|
msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/gc.c:812
|
|
|
|
|
msgid "failed to write commit-graph"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/gc.c:905
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "lock file '%s' exists, skipping maintenance"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/gc.c:932
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "task '%s' failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/gc.c:979
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a valid task"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/gc.c:984
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "task '%s' cannot be selected multiple times"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/gc.c:999
|
|
|
|
|
msgid "run tasks based on the state of the repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/gc.c:1001
|
|
|
|
|
msgid "do not report progress or other information over stderr"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/gc.c:1002
|
|
|
|
|
msgid "task"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/gc.c:1003
|
|
|
|
|
msgid "run a specific task"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/gc.c:1026
|
|
|
|
|
msgid "git maintenance run [<options>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/gc.c:1037
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid subcommand: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/grep.c:30
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/grep.c:225
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "grep: failed to create thread: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/grep.c:279
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid number of threads specified (%d) for %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: %s is the configuration
|
|
|
|
|
#. variable for tweaking threads, currently
|
|
|
|
|
#. grep.threads
|
|
|
|
|
#.
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766
|
|
|
|
|
#: builtin/pack-objects.c:2936
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no threads support, ignoring %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to read tree (%s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:655
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to grep from object of type %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:725
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "switch `%c' expects a numerical value"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:824
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "search in index instead of in the work tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:826
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "find in contents not managed by git"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:828
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "search in both tracked and untracked files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:830
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ignore files specified via '.gitignore'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:832
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "recursively search in each submodule"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:835
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show non-matching lines"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:837
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "case insensitive matching"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:839
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "match patterns only at word boundaries"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:841
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "process binary files as text"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:843
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "don't match patterns in binary files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:846
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "process binary files with textconv filters"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:848
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "search in subdirectories (default)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:850
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "descend at most <depth> levels"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:854
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use extended POSIX regular expressions"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:857
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use basic POSIX regular expressions (default)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:860
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "interpret patterns as fixed strings"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:863
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use Perl-compatible regular expressions"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:866
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show line numbers"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:867
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show column number of first match"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:868
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "don't show filenames"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:869
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show filenames"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:871
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show filenames relative to top directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:873
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show only filenames instead of matching lines"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:875
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "synonym for --files-with-matches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:878
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show only the names of files without match"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:880
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "print NUL after filenames"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:883
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show only matching parts of a line"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:885
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show the number of matches instead of matching lines"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:886
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "highlight matches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:888
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "print empty line between matches from different files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:890
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show filename only once above matches from same file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:893
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show <n> context lines before and after matches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:896
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show <n> context lines before matches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:898
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show <n> context lines after matches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:900
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use <n> worker threads"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:901
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "shortcut for -C NUM"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:904
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show a line with the function name before matches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:906
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show the surrounding function"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:909
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "read patterns from file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:911
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "match <pattern>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:913
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "combine patterns specified with -e"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:925
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "indicate hit with exit status without output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:927
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show only matches from files that match all patterns"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:929
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show parse tree for grep expression"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:933
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pager"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:933
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show matching files in the pager"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:937
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "allow calling of grep(1) (ignored by this build)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:1004
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no pattern given"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:1040
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--no-index or --untracked cannot be used with revs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:1048
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to resolve revision: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:1078
|
|
|
|
|
msgid "--untracked not supported with --recurse-submodules"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/grep.c:1082
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "invalid option combination, ignoring --threads"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:1085 builtin/pack-objects.c:3655
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no threads support, ignoring --threads"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid number of threads specified (%d)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:1122
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--open-files-in-pager only works on the worktree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:1148
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--cached or --untracked cannot be used with --no-index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:1154
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--[no-]exclude-standard cannot be used for tracked contents"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/grep.c:1162
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "both --cached and trees are given"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/hash-object.c:85
|
|
|
|
|
msgid ""
|
|
|
|
|
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
|
|
|
|
|
"[--] <file>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/hash-object.c:86
|
|
|
|
|
msgid "git hash-object --stdin-paths"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/hash-object.c:98
|
|
|
|
|
msgid "object type"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/hash-object.c:99
|
|
|
|
|
msgid "write the object into the object database"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/hash-object.c:101
|
|
|
|
|
msgid "read the object from stdin"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/hash-object.c:103
|
|
|
|
|
msgid "store file as is without filters"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/hash-object.c:104
|
|
|
|
|
msgid ""
|
|
|
|
|
"just hash any random garbage to create corrupt objects for debugging Git"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/hash-object.c:105
|
|
|
|
|
msgid "process file as it were from this path"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:47
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "print all available commands"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:48
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "exclude guides"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:49
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "print list of useful guides"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:50
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "print all configuration variable names"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:52
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show man page"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:53
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show manual in web browser"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:55
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show info page"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:57
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "print command description"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:62
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:163
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized help format '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:190
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Failed to start emacsclient."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:203
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Failed to parse emacsclient version."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:211
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "emacsclient version '%d' too old (< 22)."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to exec '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:307
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"'%s': path for unsupported man viewer.\n"
|
|
|
|
|
"Please consider using 'man.<tool>.cmd' instead."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:319
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"'%s': cmd for supported man viewer.\n"
|
|
|
|
|
"Please consider using 'man.<tool>.path' instead."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:436
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s': unknown man viewer."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:453
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no man viewer handled the request"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:461
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no info viewer handled the request"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:520 builtin/help.c:531 git.c:337
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is aliased to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:534 git.c:369
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad alias.%s string: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:563 builtin/help.c:593
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "usage: %s%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/help.c:577
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "'git help config' for more information"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:221
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "object type mismatch at %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:241
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "did not receive expected object %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:244
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "object %s: expected type %s, found %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:294
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot fill %d byte"
|
|
|
|
|
msgid_plural "cannot fill %d bytes"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:304
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "early EOF"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:305
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "read error on input"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:317
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "used more bytes than were available"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:324 builtin/pack-objects.c:619
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pack too large for current definition of off_t"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pack exceeds maximum allowed size"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:342 builtin/repack.c:254
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to create '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/index-pack.c:348
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot open packfile '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:362
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pack signature mismatch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:364
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "pack version %<PRIu32> unsupported"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:382
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "pack has bad object at offset %<PRIuMAX>: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:488
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "inflate returned %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:537
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "offset value overflow for delta base object"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:545
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "delta base offset is out of bound"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:553
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown object type %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:584
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot pread pack file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:586
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "premature end of pack file, %<PRIuMAX> byte missing"
|
|
|
|
|
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:612
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "serious inflate inconsistency"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787
|
|
|
|
|
#: builtin/index-pack.c:826 builtin/index-pack.c:835
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "SHA1 COLLISION FOUND WITH %s !"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:760 builtin/pack-objects.c:171
|
|
|
|
|
#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to read %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:824
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot read existing object info %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:832
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot read existing object %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:846
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid blob object %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:849 builtin/index-pack.c:868
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "fsck error in packed object"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:870
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Not all child objects of %s are reachable"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:931 builtin/index-pack.c:978
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "failed to apply delta"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1161
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Receiving objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1161
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Indexing objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1195
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pack is corrupted (SHA1 mismatch)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1200
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot fstat packfile"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1203
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pack has junk at the end"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1215
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "confusion beyond insanity in parse_pack_objects()"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1238
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Resolving deltas"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to create thread: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1282
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "confusion beyond insanity"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1288
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "completed with %d local object"
|
|
|
|
|
msgid_plural "completed with %d local objects"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1300
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Unexpected tail checksum for %s (disk corruption?)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1304
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "pack has %d unresolved delta"
|
|
|
|
|
msgid_plural "pack has %d unresolved deltas"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1328
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to deflate appended object (%d)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1424
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "local object %s is corrupt"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1444
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "packfile name '%s' does not end with '.pack'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1469
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot write %s file '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1477
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot close written %s file '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1501
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "error while closing pack file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1515
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot store pack file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1523
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot store index file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad pack.indexversion=%<PRIu32>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1631
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot open existing pack file '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1633
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot open existing pack idx file for '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1681
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "non delta: %d object"
|
|
|
|
|
msgid_plural "non delta: %d objects"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1688
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "chain length = %d: %lu object"
|
|
|
|
|
msgid_plural "chain length = %d: %lu objects"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1728
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Cannot come back to cwd"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1777 builtin/index-pack.c:1780
|
|
|
|
|
#: builtin/index-pack.c:1796 builtin/index-pack.c:1800
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown hash algorithm '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/index-pack.c:1821
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--fix-thin cannot be used without --stdin"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1823
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--stdin requires a git repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1825
|
|
|
|
|
msgid "--object-format cannot be used with --stdin"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/index-pack.c:1831
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--verify with no packfile name given"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "fsck error in pack objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:64
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot stat template '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:69
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot opendir '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:81
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot readlink '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:83
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot symlink '%s' '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:89
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot copy '%s' to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:93
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "ignoring template %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:124
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "templates not found in %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:139
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "not copying templates from '%s': %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:274
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid initial branch name: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:366
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to handle file type %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:369
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to move %s to %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:385
|
|
|
|
|
msgid "attempt to reinitialize repository with different hash"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:409 builtin/init-db.c:412
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s already exists"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:443
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "re-init: ignored --initial-branch=%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:474
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Reinitialized existing shared Git repository in %s%s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:475
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Reinitialized existing Git repository in %s%s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:479
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Initialized empty shared Git repository in %s%s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:480
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Initialized empty Git repository in %s%s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:529
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
|
|
|
|
|
"shared[=<permissions>]] [<directory>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:555
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "permissions"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:556
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "specify that the git repository is to be shared amongst several users"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:562
|
|
|
|
|
msgid "override the name of the initial branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:563 builtin/verify-pack.c:74
|
|
|
|
|
msgid "hash"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75
|
|
|
|
|
msgid "specify the hash algorithm to use"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:571
|
|
|
|
|
msgid "--separate-git-dir and --bare are mutually exclusive"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:600 builtin/init-db.c:605
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot mkdir %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:609 builtin/init-db.c:664
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot chdir to %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:636
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
|
|
|
|
|
"dir=<directory>)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:688
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot access work tree '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/init-db.c:693
|
|
|
|
|
msgid "--separate-git-dir incompatible with bare repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-01-12 00:36:56 +01:00
|
|
|
#: builtin/interpret-trailers.c:16
|
|
|
|
|
msgid ""
|
|
|
|
|
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
|
|
|
|
|
"<token>[(=|:)<value>])...] [<file>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/interpret-trailers.c:95
|
|
|
|
|
msgid "edit files in place"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/interpret-trailers.c:96
|
|
|
|
|
msgid "trim empty trailers"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/interpret-trailers.c:99
|
|
|
|
|
msgid "where to place the new trailer"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/interpret-trailers.c:101
|
|
|
|
|
msgid "action if trailer already exists"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/interpret-trailers.c:103
|
|
|
|
|
msgid "action if trailer is missing"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/interpret-trailers.c:105
|
|
|
|
|
msgid "output only the trailers"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/interpret-trailers.c:106
|
|
|
|
|
msgid "do not apply config rules"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/interpret-trailers.c:107
|
|
|
|
|
msgid "join whitespace-continued values"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/interpret-trailers.c:108
|
|
|
|
|
msgid "set parsing options"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/interpret-trailers.c:110
|
|
|
|
|
msgid "do not treat --- specially"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/interpret-trailers.c:111
|
|
|
|
|
msgid "trailer"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/interpret-trailers.c:112
|
|
|
|
|
msgid "trailer(s) to add"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/interpret-trailers.c:123
|
|
|
|
|
msgid "--trailer with --only-input does not make sense"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/interpret-trailers.c:133
|
|
|
|
|
msgid "no input file given for in-place editing"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:56
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:57
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git show [<options>] <object>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:110
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid --decorate option: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:177
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show source"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:178
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Use mail map file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:181
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "only decorate refs that match <pattern>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:183
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not decorate refs that match <pattern>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:184
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "decorate options"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:187
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Process line range n,m in file, counting from 1"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:297
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Final output: %d %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:555
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "git show %s: bad file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:570 builtin/log.c:665
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not read object %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:690
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown type: %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:839
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: invalid cover from description mode"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/log.c:846
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "format.headers without value"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:965
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "name of output directory is too long"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:981
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot open patch file %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:998
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "need exactly one range"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1008
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "not a range"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1172
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cover letter needs email format"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1178
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "failed to create cover-letter file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1259
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "insane in-reply-to: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1286
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git format-patch [<options>] [<since> | <revision-range>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1344
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "two output directories?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown commit %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1506 builtin/replace.c:58 builtin/replace.c:207
|
2020-01-12 00:36:56 +01:00
|
|
|
#: builtin/replace.c:210
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to resolve '%s' as a valid ref"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1515
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not find exact merge base"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1525
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"failed to get upstream, if you want to record base commit automatically,\n"
|
|
|
|
|
"please use git branch --set-upstream-to to track a remote branch.\n"
|
|
|
|
|
"Or you could specify base commit by --base=<base-commit-id> manually"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1548
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "failed to find exact merge base"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1565
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "base commit should be the ancestor of revision list"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1575
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "base commit shouldn't be in revision list"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1633
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot get patch id"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1690
|
|
|
|
|
msgid "failed to infer range-diff origin of current series"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/log.c:1692
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "using '%s' as range-diff origin of current series"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1736
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use [PATCH n/m] even with a single patch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1739
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use [PATCH] even with multiple patches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1743
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "print patches to standard out"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1745
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "generate a cover letter"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1747
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use simple number sequence for output file names"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1748
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "sfx"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1749
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use <sfx> instead of '.patch'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1751
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "start numbering patches at <n> instead of 1"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1753
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "mark the series as Nth re-roll"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1755
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Use [RFC PATCH] instead of [PATCH]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1758
|
|
|
|
|
msgid "cover-from-description-mode"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/log.c:1759
|
|
|
|
|
msgid "generate parts of a cover letter based on a branch's description"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/log.c:1761
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Use [<prefix>] instead of [PATCH]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1764
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "store resulting files in <dir>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1767
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "don't strip/add [PATCH]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1770
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "don't output binary diffs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1772
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "output all-zero hash in From header"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1774
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "don't include a patch matching a commit upstream"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1776
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show patch format instead of default (patch + stat)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1778
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Messaging"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1779
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "header"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1780
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add email header"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1781 builtin/log.c:1782
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "email"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1781
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add To: header"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1782
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add Cc: header"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1783
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ident"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1784
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "set From address to <ident> (or committer ident if absent)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1786
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "message-id"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1787
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "make first mail a reply to <message-id>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1788 builtin/log.c:1791
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "boundary"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1789
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "attach the patch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1792
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "inline the patch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1796
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "enable message threading, styles: shallow, deep"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1798
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "signature"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1799
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add a signature"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1800
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "base-commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1801
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add prerequisite tree info to the patch series"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1804
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add a signature from a file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1805
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "don't print the patch filenames"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1807
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show progress while generating patches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1809
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show changes against <rev> in cover letter or single patch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1812
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show changes against <refspec> in cover letter or single patch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1814
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "percentage by which creation is weighted"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1896
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid ident line: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1911
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "-n and -k are mutually exclusive"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1913
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1921
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--name-only does not make sense"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1923
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--name-status does not make sense"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1925
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--check does not make sense"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:1958
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "standard output, or directory, which one?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:2062
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--interdiff requires --cover-letter or single patch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:2066
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Interdiff:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:2067
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Interdiff against v%d:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:2073
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--creation-factor requires --range-diff"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:2077
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--range-diff requires --cover-letter or single patch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:2085
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Range-diff:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:2086
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Range-diff against v%d:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:2097
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to read signature file '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:2133
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Generating patches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:2177
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "failed to create output files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:2236
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/log.c:2290
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:471
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git ls-files [<options>] [<file>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:527
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "identify the file status with tags"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:529
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use lowercase letters for 'assume unchanged' files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:531
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use lowercase letters for 'fsmonitor clean' files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:533
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show cached files in the output (default)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:535
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show deleted files in the output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:537
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show modified files in the output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:539
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show other files in the output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:541
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show ignored files in the output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:544
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show staged contents' object name in the output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:546
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show files on the filesystem that need to be removed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:548
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show 'other' directories' names only"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:550
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show line endings of files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:552
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "don't show empty directories"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:555
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show unmerged files in the output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:557
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show resolve-undo information"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:559
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "skip files matching pattern"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:562
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "exclude patterns are read from <file>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:565
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "read additional per-directory exclude patterns in <file>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:567
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add the standard git exclusions"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:571
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "make the output relative to the project top directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:574
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "recurse through submodules"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:576
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "if any <file> is not in the index, treat this as an error"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:577
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "tree-ish"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:578
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pretend that paths removed since <tree-ish> are still present"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-files.c:580
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show debugging data"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-remote.c:9
|
|
|
|
|
msgid ""
|
|
|
|
|
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
|
|
|
|
|
" [-q | --quiet] [--exit-code] [--get-url]\n"
|
|
|
|
|
" [--symref] [<repository> [<refs>...]]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-remote.c:59
|
|
|
|
|
msgid "do not print remote URL"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "exec"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
|
|
|
|
|
msgid "path of git-upload-pack on the remote host"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-remote.c:65
|
|
|
|
|
msgid "limit to tags"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-remote.c:66
|
|
|
|
|
msgid "limit to heads"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-remote.c:67
|
|
|
|
|
msgid "do not show peeled tags"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-remote.c:69
|
|
|
|
|
msgid "take url.<base>.insteadOf into account"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-remote.c:72
|
|
|
|
|
msgid "exit with exit code 2 if no matching refs are found"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-remote.c:75
|
|
|
|
|
msgid "show underlying ref in addition to the object pointed by it"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-tree.c:30
|
|
|
|
|
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-tree.c:128
|
|
|
|
|
msgid "only show trees"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-tree.c:130
|
|
|
|
|
msgid "recurse into subtrees"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-tree.c:132
|
|
|
|
|
msgid "show trees when recursing"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-tree.c:135
|
|
|
|
|
msgid "terminate entries with NUL byte"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-tree.c:136
|
|
|
|
|
msgid "include object size"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
|
|
|
|
|
msgid "list only filenames"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-tree.c:143
|
|
|
|
|
msgid "use full path names"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-tree.c:145
|
|
|
|
|
msgid "list entire tree; not just current directory (implies --full-name)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/mailsplit.c:241
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "empty mbox: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-base.c:32
|
|
|
|
|
msgid "git merge-base [-a | --all] <commit> <commit>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-base.c:33
|
|
|
|
|
msgid "git merge-base [-a | --all] --octopus <commit>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-base.c:34
|
|
|
|
|
msgid "git merge-base --independent <commit>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-base.c:35
|
|
|
|
|
msgid "git merge-base --is-ancestor <commit> <commit>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-base.c:36
|
|
|
|
|
msgid "git merge-base --fork-point <ref> [<commit>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-base.c:143
|
|
|
|
|
msgid "output all common ancestors"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-base.c:145
|
|
|
|
|
msgid "find ancestors for a single n-way merge"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-base.c:147
|
|
|
|
|
msgid "list revs not reachable from others"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-base.c:149
|
|
|
|
|
msgid "is the first one ancestor of the other?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-base.c:151
|
|
|
|
|
msgid "find where <commit> forked from reflog of <ref>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-file.c:9
|
|
|
|
|
msgid ""
|
|
|
|
|
"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
|
|
|
|
|
"<orig-file> <file2>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-file.c:35
|
|
|
|
|
msgid "send results to standard output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-file.c:36
|
|
|
|
|
msgid "use a diff3 based merge"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-file.c:37
|
|
|
|
|
msgid "for conflicts, use our version"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-file.c:39
|
|
|
|
|
msgid "for conflicts, use their version"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-file.c:41
|
|
|
|
|
msgid "for conflicts, use a union version"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-file.c:44
|
|
|
|
|
msgid "for conflicts, use this marker size"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-file.c:45
|
|
|
|
|
msgid "do not warn about conflicts"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-file.c:47
|
|
|
|
|
msgid "set labels for file1/orig-file/file2"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-recursive.c:47
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown option %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-recursive.c:53
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not parse object '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-recursive.c:57
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot handle more than %d base. Ignoring %s."
|
|
|
|
|
msgid_plural "cannot handle more than %d bases. Ignoring %s."
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-recursive.c:65
|
|
|
|
|
msgid "not handling anything other than two heads merge."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not resolve ref '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-recursive.c:82
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Merging %s with %s\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:56
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git merge [<options>] [<commit>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:57
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git merge --abort"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:58
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git merge --continue"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:120
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "switch `m' requires a value"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:143
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "option `%s' requires a value"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:189
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not find merge strategy '%s'.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:190
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Available strategies are:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:195
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Available custom strategies are:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:246 builtin/pull.c:133
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not show a diffstat at the end of the merge"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:249 builtin/pull.c:136
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show a diffstat at the end of the merge"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:250 builtin/pull.c:139
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "(synonym to --stat)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:252 builtin/pull.c:142
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add (at most <n>) entries from shortlog to merge commit message"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:255 builtin/pull.c:148
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "create a single commit instead of doing a merge"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:257 builtin/pull.c:151
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "perform a commit if the merge succeeds (default)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:259 builtin/pull.c:154
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "edit message before committing"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:261
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "allow fast-forward (default)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:263 builtin/pull.c:161
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "abort if fast-forward is not possible"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:267 builtin/pull.c:164
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "verify that the named commit has a valid GPG signature"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168
|
|
|
|
|
#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "strategy"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:269 builtin/pull.c:169
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "merge strategy to use"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:270 builtin/pull.c:172
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "option=value"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:271 builtin/pull.c:173
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "option for selected merge strategy"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:273
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "merge commit message (for a non-fast-forward merge)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:280
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "abort the current in-progress merge"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:282
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--abort but leave index and working tree alone"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:284
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "continue the current in-progress merge"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:286 builtin/pull.c:180
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "allow merging unrelated histories"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:293
|
|
|
|
|
msgid "bypass pre-merge-commit and commit-msg hooks"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:310
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not run stash."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:315
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "stash failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:320
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "not a valid object: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:342 builtin/merge.c:359
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "read-tree failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:389
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (nothing to squash)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:400
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Squash commit -- not updating HEAD\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:450
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "No merge message -- not updating HEAD\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:501
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' does not point to a commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:588
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Bad branch.%s.mergeoptions string: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:713
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Not handling anything other than two heads merge."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:726
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Unknown option for merge-recursive: -X%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:741
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to write %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:793
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not read from '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:802
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:808
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Please enter a commit message to explain why this merge is necessary,\n"
|
|
|
|
|
"especially if it merges an updated upstream into a topic branch.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:813
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "An empty message aborts the commit.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:816
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
|
|
|
|
|
"the commit.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:869
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Empty commit message."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:884
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Wonderful.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:945
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:984
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No current branch."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:986
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No remote for the current branch."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:988
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No default upstream defined for the current branch."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:993
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "No remote-tracking branch for %s from %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1050
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Bad value '%s' in environment '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1153
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "not something we can merge in %s: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1187
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "not something we can merge"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1291
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--abort expects no arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1295
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "There is no merge to abort (MERGE_HEAD missing)."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1313
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--quit expects no arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1326
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--continue expects no arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1330
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "There is no merge in progress (MERGE_HEAD missing)."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1346
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"You have not concluded your merge (MERGE_HEAD exists).\n"
|
|
|
|
|
"Please, commit your changes before you merge."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1353
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
|
|
|
|
|
"Please, commit your changes before you merge."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1356
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1370
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You cannot combine --squash with --no-ff."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1372
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You cannot combine --squash with --commit."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1388
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No commit specified and merge.defaultToUpstream not set."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1405
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Squash commit into empty head not supported yet"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1407
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Non-fast-forward commit does not make sense into an empty head"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1412
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s - not something we can merge"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1414
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Can merge only exactly one commit into empty head"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1495
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "refusing to merge unrelated histories"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1504
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Already up to date."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1514
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Updating %s..%s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1560
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Trying really trivial in-index merge...\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1567
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Nope.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1592
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Already up to date. Yeeah!"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1598
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Not possible to fast-forward, aborting."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1626 builtin/merge.c:1691
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Rewinding the tree to pristine...\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1630
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Trying merge strategy %s...\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1682
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "No merge strategy handled the merge.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1684
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Merge with strategy %s failed.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1693
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Using the %s to prepare resolving by hand.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/merge.c:1707
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Automatic merge went well; stopped before committing as requested\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/mktree.c:66
|
|
|
|
|
msgid "git mktree [-z] [--missing] [--batch]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/mktree.c:154
|
|
|
|
|
msgid "input is NUL terminated"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/mktree.c:155 builtin/write-tree.c:26
|
|
|
|
|
msgid "allow missing objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/mktree.c:156
|
|
|
|
|
msgid "allow creation of more than one tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/multi-pack-index.c:9
|
|
|
|
|
msgid ""
|
2020-11-21 19:20:35 +01:00
|
|
|
"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
|
|
|
|
|
"size=<size>)"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/multi-pack-index.c:26
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "object directory containing set of packfile and pack-index pairs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/multi-pack-index.c:29
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"during repack, collect pack-files of smaller size into a batch that is "
|
|
|
|
|
"larger than this size"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "too many arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/multi-pack-index.c:60
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--batch-size option is only for 'repack' subcommand"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/multi-pack-index.c:69
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized subcommand: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:18
|
|
|
|
|
msgid "git mv [<options>] <source>... <destination>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:83
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Directory %s is in index and no submodule?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:85
|
|
|
|
|
msgid "Please stage your changes to .gitmodules or stash them to proceed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:103
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%.*s is in index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:125
|
|
|
|
|
msgid "force move/rename even if target exists"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:127
|
|
|
|
|
msgid "skip move/rename errors"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/mv.c:170
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "destination '%s' is not a directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/mv.c:181
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Checking rename of '%s' to '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/mv.c:185
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "bad source"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/mv.c:188
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "can not move directory into itself"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/mv.c:191
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot move directory over file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/mv.c:200
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "source directory is empty"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/mv.c:225
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "not under version control"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:227
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "conflicted"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:230
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "destination exists"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/mv.c:238
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "overwriting '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/mv.c:241
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Cannot overwrite"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/mv.c:244
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "multiple sources for the same target"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/mv.c:246
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "destination directory does not exist"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/mv.c:253
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s, source=%s, destination=%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/mv.c:274
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Renaming %s to %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "renaming '%s' failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/name-rev.c:465
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git name-rev [<options>] <commit>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/name-rev.c:466
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git name-rev [<options>] --all"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/name-rev.c:467
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git name-rev [<options>] --stdin"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/name-rev.c:524
|
|
|
|
|
msgid "print only ref-based names (no object names)"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/name-rev.c:525
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "only use tags to name the commits"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/name-rev.c:527
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "only use refs matching <pattern>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/name-rev.c:529
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ignore refs matching <pattern>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/name-rev.c:531
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "list all commits reachable from all refs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/name-rev.c:532
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "read from stdin"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/name-rev.c:533
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "allow to print `undefined` names (default)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/name-rev.c:539
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "dereference tags in the input (internal use)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:28
|
|
|
|
|
msgid "git notes [--ref <notes-ref>] [list [<object>]]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:29
|
|
|
|
|
msgid ""
|
|
|
|
|
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
|
|
|
|
|
"| (-c | -C) <object>] [<object>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:30
|
|
|
|
|
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:31
|
|
|
|
|
msgid ""
|
|
|
|
|
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
|
|
|
|
|
"(-c | -C) <object>] [<object>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:32
|
|
|
|
|
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:33
|
|
|
|
|
msgid "git notes [--ref <notes-ref>] show [<object>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:34
|
|
|
|
|
msgid ""
|
|
|
|
|
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:35
|
|
|
|
|
msgid "git notes merge --commit [-v | -q]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:36
|
|
|
|
|
msgid "git notes merge --abort [-v | -q]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:37
|
|
|
|
|
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:38
|
|
|
|
|
msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:39
|
|
|
|
|
msgid "git notes [--ref <notes-ref>] get-ref"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:44
|
|
|
|
|
msgid "git notes [list [<object>]]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:49
|
|
|
|
|
msgid "git notes add [<options>] [<object>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:54
|
|
|
|
|
msgid "git notes copy [<options>] <from-object> <to-object>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:55
|
|
|
|
|
msgid "git notes copy --stdin [<from-object> <to-object>]..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:60
|
|
|
|
|
msgid "git notes append [<options>] [<object>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:65
|
|
|
|
|
msgid "git notes edit [<object>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:70
|
|
|
|
|
msgid "git notes show [<object>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:75
|
|
|
|
|
msgid "git notes merge [<options>] <notes-ref>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:76
|
|
|
|
|
msgid "git notes merge --commit [<options>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:77
|
|
|
|
|
msgid "git notes merge --abort [<options>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:82
|
|
|
|
|
msgid "git notes remove [<object>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:87
|
|
|
|
|
msgid "git notes prune [<options>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:92
|
|
|
|
|
msgid "git notes get-ref"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:97
|
|
|
|
|
msgid "Write/edit the notes for the following object:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:150
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to start 'show' for object '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:154
|
|
|
|
|
msgid "could not read 'show' output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:162
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to finish 'show' for object '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:197
|
|
|
|
|
msgid "please supply the note contents using either -m or -F option"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:206
|
|
|
|
|
msgid "unable to write note object"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:208
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "the note contents have been left in %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/notes.c:242 builtin/tag.c:533
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not open or read '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
|
|
|
|
|
#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
|
|
|
|
|
#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to resolve '%s' as a valid ref."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:265
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to read object '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:268
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot read note data from non-blob object '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:309
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "malformed input line: '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:324
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to copy notes from '%s' to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: the first %s will be replaced by a git
|
|
|
|
|
#. notes command: 'add', 'merge', 'remove', etc.
|
|
|
|
|
#.
|
|
|
|
|
#: builtin/notes.c:356
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "refusing to %s notes in %s (outside of refs/notes/)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
|
|
|
|
|
#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
|
|
|
|
|
#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
|
|
|
|
|
msgid "too many parameters"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:389 builtin/notes.c:678
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "no note found for object %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:410 builtin/notes.c:576
|
|
|
|
|
msgid "note contents as a string"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:413 builtin/notes.c:579
|
|
|
|
|
msgid "note contents in a file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:416 builtin/notes.c:582
|
|
|
|
|
msgid "reuse and edit specified note object"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:419 builtin/notes.c:585
|
|
|
|
|
msgid "reuse specified note object"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:422 builtin/notes.c:588
|
|
|
|
|
msgid "allow storing empty note"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:423 builtin/notes.c:496
|
|
|
|
|
msgid "replace existing notes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:448
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
|
|
|
|
|
"existing notes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:463 builtin/notes.c:544
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Overwriting existing notes for object %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Removing note for object %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:497
|
|
|
|
|
msgid "read objects from stdin"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:499
|
|
|
|
|
msgid "load rewriting config for <command> (implies --stdin)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:517
|
|
|
|
|
msgid "too few parameters"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:538
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
|
|
|
|
|
"existing notes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:550
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "missing notes on source object %s. Cannot copy."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:603
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
|
|
|
|
|
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:698
|
|
|
|
|
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:700
|
|
|
|
|
msgid "failed to delete ref NOTES_MERGE_REF"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:702
|
|
|
|
|
msgid "failed to remove 'git notes merge' worktree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:722
|
|
|
|
|
msgid "failed to read ref NOTES_MERGE_PARTIAL"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:724
|
|
|
|
|
msgid "could not find commit from NOTES_MERGE_PARTIAL."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:726
|
|
|
|
|
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:739
|
|
|
|
|
msgid "failed to resolve NOTES_MERGE_REF"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:742
|
|
|
|
|
msgid "failed to finalize notes merge"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:768
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown notes merge strategy %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:784
|
|
|
|
|
msgid "General options"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:786
|
|
|
|
|
msgid "Merge options"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:788
|
|
|
|
|
msgid ""
|
|
|
|
|
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
|
|
|
|
|
"cat_sort_uniq)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:790
|
|
|
|
|
msgid "Committing unmerged notes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:792
|
|
|
|
|
msgid "finalize notes merge by committing unmerged notes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:794
|
|
|
|
|
msgid "Aborting notes merge resolution"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:796
|
|
|
|
|
msgid "abort notes merge"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:807
|
|
|
|
|
msgid "cannot mix --commit, --abort or -s/--strategy"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:812
|
|
|
|
|
msgid "must specify a notes ref to merge"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:836
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown -s/--strategy: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:873
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "a notes merge into %s is already in-progress at %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:876
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to store link to current notes ref (%s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:878
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
|
|
|
|
|
"'git notes merge --commit', or abort the merge with 'git notes merge --"
|
|
|
|
|
"abort'.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/notes.c:897 builtin/tag.c:546
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to resolve '%s' as a valid ref."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:900
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Object %s has no note\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:912
|
|
|
|
|
msgid "attempt to remove non-existent note is not an error"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:915
|
|
|
|
|
msgid "read object names from the standard input"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not remove, show only"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:955
|
|
|
|
|
msgid "report pruned notes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:998
|
|
|
|
|
msgid "notes-ref"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:999
|
|
|
|
|
msgid "use notes from <notes-ref>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/notes.c:1034 builtin/stash.c:1605
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown subcommand: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:54
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:55
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:443
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad packed object CRC for %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:454
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "corrupt packed object for %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:585
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "recursive delta detected for object %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:796
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "ordered %u objects, expected %<PRIu32>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:1004
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:1017
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Writing objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:1078 builtin/update-index.c:90
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to stat %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:1131
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:1348
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "disabling bitmap writing, as some objects are not being packed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:1796
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "delta base offset overflow in pack for %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:1805
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "delta base offset out of bound for %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:2086
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Counting objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:2231
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to parse object header of %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317
|
|
|
|
|
#: builtin/pack-objects.c:2327
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "object %s cannot be read"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:2341
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "suboptimal pack - out of memory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:2656
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Delta compression using up to %d threads"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:2795
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to pack objects reachable from tag %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:2883
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Compressing objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:2889
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "inconsistency with delta count"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:2961
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
|
|
|
|
|
"hash> <uri>' (got '%s')"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/pack-objects.c:2964
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/pack-objects.c:2993
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"expected edge object ID, got garbage:\n"
|
|
|
|
|
" %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:2999
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"expected object ID, got garbage:\n"
|
|
|
|
|
" %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3097
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "invalid value for --missing"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot open pack index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3187
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "loose object at %s could not be examined"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3272
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to force loose object"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3365
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "not a rev '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3368
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad revision '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3393
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to add recent objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3446
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unsupported index version %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3450
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad index version '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3488
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<version>[,<offset>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3489
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "write the pack index file in the specified idx format version"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3492
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "maximum size of each output pack file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3494
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ignore borrowed objects from alternate object store"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3496
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ignore packed objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3498
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "limit pack window by objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3500
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "limit pack window by memory in addition to object limit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3502
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "maximum length of delta chain allowed in the resulting pack"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3504
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "reuse existing deltas"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3506
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "reuse existing objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3508
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use OFS_DELTA objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3510
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use threads when searching for best delta matches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3512
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not create an empty pack output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3514
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "read revision arguments from standard input"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3516
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "limit the objects to those that are not yet packed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3519
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "include objects reachable from any reference"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3522
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "include objects referred by reflog entries"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3525
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "include objects referred to by the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3528
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "output pack to stdout"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3530
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "include tag objects that refer to objects to be packed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3532
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "keep unreachable objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3534
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pack loose unreachable objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3536
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unpack unreachable objects newer than <time>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3539
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use the sparse reachability algorithm"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3541
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "create thin packs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3543
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "create packs suitable for shallow fetches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3545
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ignore packs that have companion .keep file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3547
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ignore this pack"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3549
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pack compression level"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3551
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not hide commits by grafts"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3553
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use a bitmap index if available to speed up counting objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3555
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "write a bitmap index together with the pack index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3559
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "write a bitmap index if possible"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3563
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "handling for missing objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3566
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not pack objects in promisor packfiles"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3568
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "respect islands during delta compression"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3570
|
|
|
|
|
msgid "protocol"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/pack-objects.c:3571
|
|
|
|
|
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/pack-objects.c:3600
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "delta chain depth %d is too deep, forcing %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3605
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "pack.deltaCacheLimit is too high, forcing %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3659
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--max-pack-size cannot be used to build a pack for transfer"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3661
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "minimum pack size limit is 1 MiB"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3666
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--thin cannot be used to build an indexable pack"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3669
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3675
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot use --filter without --stdout"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3735
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Enumerating objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pack-objects.c:3766
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
|
|
|
|
|
"reused %<PRIu32>"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/pack-refs.c:8
|
|
|
|
|
msgid "git pack-refs [<options>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/pack-refs.c:16
|
|
|
|
|
msgid "pack everything"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/pack-refs.c:17
|
|
|
|
|
msgid "prune loose refs (default)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/prune-packed.c:6
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/prune.c:14
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/prune.c:133
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "report pruned objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/prune.c:136
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "expire objects older than <time>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/prune.c:138
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "limit traversal to objects outside promisor packfiles"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/prune.c:152
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot prune in a precious-objects repo"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:45 builtin/pull.c:47
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid value for %s: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:67
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git pull [<options>] [<repository> [<refspec>...]]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:123
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "control for recursive fetching of submodules"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:127
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Options related to merging"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:130
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "incorporate changes by rebasing rather than merging"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "allow fast-forward"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:167 parse-options.h:339
|
|
|
|
|
msgid "automatically stash/stash pop before and after"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:183
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Options related to fetching"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:193
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "force overwrite of local branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:201
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "number of submodules pulled in parallel"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:317
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid value for pull.ff: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:348
|
|
|
|
|
msgid ""
|
|
|
|
|
"Pulling without specifying how to reconcile divergent branches is\n"
|
|
|
|
|
"discouraged. You can squelch this message by running one of the following\n"
|
|
|
|
|
"commands sometime before your next pull:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git config pull.rebase false # merge (the default strategy)\n"
|
|
|
|
|
" git config pull.rebase true # rebase\n"
|
|
|
|
|
" git config pull.ff only # fast-forward only\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"You can replace \"git config\" with \"git config --global\" to set a "
|
|
|
|
|
"default\n"
|
|
|
|
|
"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
|
|
|
|
|
"or --ff-only on the command line to override the configured default per\n"
|
|
|
|
|
"invocation.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/pull.c:458
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"There is no candidate for rebasing against among the refs that you just "
|
|
|
|
|
"fetched."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:460
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"There are no candidates for merging among the refs that you just fetched."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:461
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Generally this means that you provided a wildcard refspec which had no\n"
|
|
|
|
|
"matches on the remote end."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:464
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"You asked to pull from the remote '%s', but did not specify\n"
|
|
|
|
|
"a branch. Because this is not the default configured remote\n"
|
|
|
|
|
"for your current branch, you must specify a branch on the command line."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:469 builtin/rebase.c:1240 git-parse-remote.sh:73
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You are not currently on a branch."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:471 builtin/pull.c:486 git-parse-remote.sh:79
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Please specify which branch you want to rebase against."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:473 builtin/pull.c:488 git-parse-remote.sh:82
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Please specify which branch you want to merge with."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:474 builtin/pull.c:489
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "See git-pull(1) for details."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491
|
|
|
|
|
#: builtin/rebase.c:1246 git-parse-remote.sh:64
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<remote>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496
|
2020-01-12 00:36:56 +01:00
|
|
|
#: git-parse-remote.sh:65
|
|
|
|
|
msgid "<branch>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:484 builtin/rebase.c:1238 git-parse-remote.sh:75
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "There is no tracking information for the current branch."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:493 git-parse-remote.sh:95
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"If you wish to set tracking information for this branch you can do so with:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:498
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Your configuration specifies to merge with the ref '%s'\n"
|
|
|
|
|
"from the remote, but no such ref was fetched."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:609
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to access commit %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:894
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ignoring --verify-signatures for rebase"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:954
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Updating an unborn branch with changes added to the index."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:958
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pull with rebase"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:959
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "please commit or stash them."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:984
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"fetch updated the current branch head.\n"
|
|
|
|
|
"fast-forwarding your working tree from\n"
|
|
|
|
|
"commit %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:990
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Cannot fast-forward your working tree.\n"
|
|
|
|
|
"After making sure that you saved anything precious from\n"
|
|
|
|
|
"$ git diff %s\n"
|
|
|
|
|
"output, run\n"
|
|
|
|
|
"$ git reset --hard\n"
|
|
|
|
|
"to recover."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:1005
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Cannot merge multiple branches into empty head."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:1009
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Cannot rebase onto multiple branches."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/pull.c:1017
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot rebase with locally recorded submodule modifications"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/push.c:19
|
|
|
|
|
msgid "git push [<options>] [<repository> [<refspec>...]]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: builtin/push.c:111
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "tag shorthand without <tag>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:119
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--delete only accepts plain target ref names"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:164
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"To choose either option permanently, see push.default in 'git help config'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:167
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The upstream branch of your current branch does not match\n"
|
|
|
|
|
"the name of your current branch. To push to the upstream branch\n"
|
|
|
|
|
"on the remote, use\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git push %s HEAD:%s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"To push to the branch of the same name on the remote, use\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git push %s HEAD\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:182
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"You are not currently on a branch.\n"
|
|
|
|
|
"To push the history leading to the current (detached HEAD)\n"
|
|
|
|
|
"state now, use\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git push %s HEAD:<name-of-remote-branch>\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:194
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The current branch %s has no upstream branch.\n"
|
|
|
|
|
"To push the current branch and set the remote as upstream, use\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git push --set-upstream %s %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:202
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "The current branch %s has multiple upstream branches, refusing to push."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:205
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"You are pushing to remote '%s', which is not the upstream of\n"
|
|
|
|
|
"your current branch '%s', without telling me what to push\n"
|
|
|
|
|
"to update which remote branch."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:260
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:267
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Updates were rejected because the tip of your current branch is behind\n"
|
|
|
|
|
"its remote counterpart. Integrate the remote changes (e.g.\n"
|
|
|
|
|
"'git pull ...') before pushing again.\n"
|
|
|
|
|
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:273
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Updates were rejected because a pushed branch tip is behind its remote\n"
|
|
|
|
|
"counterpart. Check out this branch and integrate the remote changes\n"
|
|
|
|
|
"(e.g. 'git pull ...') before pushing again.\n"
|
|
|
|
|
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:279
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Updates were rejected because the remote contains work that you do\n"
|
|
|
|
|
"not have locally. This is usually caused by another repository pushing\n"
|
|
|
|
|
"to the same ref. You may want to first integrate the remote changes\n"
|
|
|
|
|
"(e.g., 'git pull ...') before pushing again.\n"
|
|
|
|
|
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:286
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Updates were rejected because the tag already exists in the remote."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:289
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"You cannot update a remote ref that points at a non-commit object,\n"
|
|
|
|
|
"or update a remote ref to make it point at a non-commit object,\n"
|
|
|
|
|
"without using the '--force' option.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:351
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Pushing to %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:358
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to push some refs to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:532
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:533 builtin/send-pack.c:183
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "push all refs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:534 builtin/send-pack.c:185
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "mirror all refs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:536
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "delete refs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:537
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "push tags (can't be used with --all or --mirror)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:540 builtin/send-pack.c:186
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "force updates"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:541 builtin/send-pack.c:198
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<refname>:<expect>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:542 builtin/send-pack.c:199
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "require old value of ref to be at this value"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:545
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "control recursive pushing of submodules"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:546 builtin/send-pack.c:193
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use thin pack"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180
|
|
|
|
|
#: builtin/send-pack.c:181
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "receive pack program"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:549
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "set upstream for git pull/status"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:552
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "prune locally removed refs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:554
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "bypass pre-push hook"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:555
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "push missing but relevant tags"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:557 builtin/send-pack.c:187
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "GPG sign the push"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:559 builtin/send-pack.c:194
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "request atomic transaction on remote side"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:577
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--delete is incompatible with --all, --mirror and --tags"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:579
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--delete doesn't make sense without any refs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:599
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "bad repository '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/push.c:600
|
|
|
|
|
msgid ""
|
|
|
|
|
"No configured push destination.\n"
|
|
|
|
|
"Either specify the URL from the command-line or configure a remote "
|
|
|
|
|
"repository using\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git remote add <name> <url>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"and then push using the remote name\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git push <name>\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/push.c:615
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--all and --tags are incompatible"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:617
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--all can't be combined with refspecs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:621
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--mirror and --tags are incompatible"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:623
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--mirror can't be combined with refspecs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:626
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--all and --mirror are incompatible"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/push.c:630
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "push options must not have new line characters"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/range-diff.c:8
|
|
|
|
|
msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/range-diff.c:9
|
|
|
|
|
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/range-diff.c:10
|
|
|
|
|
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/range-diff.c:22
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Percentage by which creation is weighted"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/range-diff.c:24
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use simple diff colors"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/range-diff.c:26
|
|
|
|
|
msgid "notes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/range-diff.c:26
|
|
|
|
|
msgid "passed to 'git log'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/range-diff.c:50 builtin/range-diff.c:54
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no .. in range: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/range-diff.c:64
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "single arg format must be symmetric range"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/range-diff.c:79
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "need two commit ranges"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/read-tree.c:41
|
|
|
|
|
msgid ""
|
|
|
|
|
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
|
|
|
|
|
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
|
|
|
|
|
"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/read-tree.c:124
|
|
|
|
|
msgid "write resulting index to <file>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/read-tree.c:127
|
|
|
|
|
msgid "only empty the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/read-tree.c:129
|
|
|
|
|
msgid "Merging"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/read-tree.c:131
|
|
|
|
|
msgid "perform a merge in addition to a read"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/read-tree.c:133
|
|
|
|
|
msgid "3-way merge if no file level merging required"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/read-tree.c:135
|
|
|
|
|
msgid "3-way merge in presence of adds and removes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/read-tree.c:137
|
|
|
|
|
msgid "same as -m, but discard unmerged entries"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/read-tree.c:138
|
|
|
|
|
msgid "<subdirectory>/"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/read-tree.c:139
|
|
|
|
|
msgid "read the tree into the index under <subdirectory>/"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/read-tree.c:142
|
|
|
|
|
msgid "update working tree with merge result"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/read-tree.c:144
|
|
|
|
|
msgid "gitignore"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/read-tree.c:145
|
|
|
|
|
msgid "allow explicitly ignored files to be overwritten"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/read-tree.c:148
|
|
|
|
|
msgid "don't check the working tree after merging"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/read-tree.c:149
|
|
|
|
|
msgid "don't update the index or the work tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/read-tree.c:151
|
|
|
|
|
msgid "skip applying sparse checkout filter"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/read-tree.c:153
|
|
|
|
|
msgid "debug unpack-trees"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/read-tree.c:157
|
|
|
|
|
msgid "suppress feedback messages"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/read-tree.c:188
|
|
|
|
|
msgid "You need to resolve your current index first"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rebase.c:35
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
2020-11-21 19:20:35 +01:00
|
|
|
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
|
|
|
|
|
"[<upstream> [<branch>]]"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:37
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:39
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git rebase --continue | --abort | --skip | --edit-todo"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unusable todo list: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:304
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not create temporary %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:310
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not mark as interactive"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:364
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not generate todo list"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:405
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "a base commit must be provided with --upstream or --onto"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:474
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git rebase--interactive [<options>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:487 builtin/rebase.c:1382
|
|
|
|
|
msgid "keep commits which start empty"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:491 builtin/revert.c:128
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "allow commits with empty messages"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:493
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "rebase merge commits"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:495
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "keep original branch points of cousins"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:497
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "move commits that begin with squash!/fixup!"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:498
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "sign commits"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:500 builtin/rebase.c:1321
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "display a diffstat of what changed upstream"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:502
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "continue rebase"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:504
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "skip commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:505
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "edit the todo list"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:507
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show the current patch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:510
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "shorten commit ids in the todo list"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:512
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "expand commit ids in the todo list"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:514
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "check the todo list"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:516
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "rearrange fixup/squash lines"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:518
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "insert exec commands in todo list"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:519
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "onto"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:522
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "restrict-revision"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:522
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "restrict revision"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:524
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "squash-onto"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:525
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "squash onto"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:527
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "the upstream commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:529
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "head-name"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:529
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "head name"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:534
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "rebase strategy"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:535
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "strategy-opts"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:536
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "strategy options"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:537
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "switch-to"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:538
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "the branch or commit to checkout"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:539
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "onto-name"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:539
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "onto name"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:540
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cmd"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:540
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "the command to run"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:543 builtin/rebase.c:1415
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "automatically re-schedule any `exec` that fails"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:559
|
|
|
|
|
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:575
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "%s requires the merge backend"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:618
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "could not get 'onto': '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:635
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "invalid orig-head: '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:660
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:805 git-rebase--preserve-merges.sh:81
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Resolve all conflicts manually, mark them as resolved with\n"
|
|
|
|
|
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
|
|
|
|
|
"You can instead skip this commit: run \"git rebase --skip\".\n"
|
|
|
|
|
"To abort and get back to the state before \"git rebase\", run \"git rebase --"
|
|
|
|
|
"abort\"."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:888
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"git encountered an error while preparing the patches to replay\n"
|
|
|
|
|
"these revisions:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" %s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"As a result, git cannot rebase them."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1214
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
|
|
|
|
|
"\"."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rebase.c:1232
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"%s\n"
|
|
|
|
|
"Please specify which branch you want to rebase against.\n"
|
|
|
|
|
"See git-rebase(1) for details.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git rebase '<branch>'\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1248
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"If you wish to set tracking information for this branch you can do so with:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git branch --set-upstream-to=%s/<branch> %s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1278
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "exec commands cannot contain newlines"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1282
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "empty exec command"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1312
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "rebase onto given branch instead of upstream"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1314
|
|
|
|
|
msgid "use the merge-base of upstream and branch as the current base"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rebase.c:1316
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "allow pre-rebase hook to run"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1318
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "be quiet. implies --no-stat"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1324
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not show diffstat of what changed upstream"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1327
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add a Signed-off-by: line to each commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1330
|
|
|
|
|
msgid "make committer date match author date"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rebase.c:1332
|
|
|
|
|
msgid "ignore author date and use current date"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1334
|
|
|
|
|
msgid "synonym of --reset-author-date"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rebase.c:1336 builtin/rebase.c:1340
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "passed to 'git apply'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1338
|
|
|
|
|
msgid "ignore changes in whitespace"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rebase.c:1342 builtin/rebase.c:1345
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cherry-pick all commits, even if unchanged"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1347
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "continue"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1350
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "skip current patch and continue"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1352
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "abort and check out the original branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1355
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "abort but keep HEAD where it is"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1356
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "edit the todo list during an interactive rebase"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1359
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show the patch file being applied or merged"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1362
|
|
|
|
|
msgid "use apply strategies to rebase"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rebase.c:1366
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use merging strategies to rebase"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1370
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "let the user edit the list of commits to rebase"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1374
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1379
|
|
|
|
|
msgid "how to handle commits that become empty"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1386
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "move commits that begin with squash!/fixup! under -i"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1393
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add exec lines after each commit of the editable list"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1397
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "allow rebasing commits with empty messages"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1401
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "try to rebase merges instead of skipping them"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1404
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use 'merge-base --fork-point' to refine upstream"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1406
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use the given merge strategy"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1408 builtin/revert.c:115
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "option"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1409
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pass the argument through to the merge strategy"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1412
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "rebase all reachable commits up to the root(s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1417
|
|
|
|
|
msgid "apply all changes, even those already present upstream"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rebase.c:1434
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"the rebase.useBuiltin support has been removed!\n"
|
|
|
|
|
"See its entry in 'git help config' for details."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1440
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "It looks like 'git am' is in progress. Cannot rebase."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1481
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1486
|
|
|
|
|
msgid "cannot combine '--keep-base' with '--onto'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rebase.c:1488
|
|
|
|
|
msgid "cannot combine '--keep-base' with '--root'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rebase.c:1492
|
|
|
|
|
msgid "cannot combine '--root' with '--fork-point'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rebase.c:1495
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No rebase in progress?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1499
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "The --edit-todo action can only be used during interactive rebase."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1522
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Cannot read HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1534
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"You must edit all merge conflicts and then\n"
|
|
|
|
|
"mark them as resolved using git add"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1553
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not discard worktree changes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1572
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not move back to %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1618
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"It seems that there is already a %s directory, and\n"
|
|
|
|
|
"I wonder if you are in the middle of another rebase. If that is the\n"
|
|
|
|
|
"case, please try\n"
|
|
|
|
|
"\t%s\n"
|
|
|
|
|
"If that is not the case, please\n"
|
|
|
|
|
"\t%s\n"
|
|
|
|
|
"and run me again. I am stopping in case you still have something\n"
|
|
|
|
|
"valuable there.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1646
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "switch `C' expects a numerical value"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1688
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Unknown mode: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1727
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--strategy requires --merge or --interactive"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1757
|
|
|
|
|
msgid "cannot combine apply options with merge options"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rebase.c:1770
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Unknown rebase backend: %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1795
|
|
|
|
|
msgid "--reschedule-failed-exec requires --exec or --interactive"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1815
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1819
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1843
|
Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96
af6b65d45e Git 2.26.2
7397ca3373 Git 2.25.4
b86a4be245 Git 2.24.3
f2771efd07 Git 2.23.3
c9808fa014 Git 2.22.4
9206d27eb5 Git 2.21.3
041bc65923 Git 2.20.4
76b54ee9b9 Git 2.19.5
ba6f0905fd Git 2.18.4
df5be6dc3f Git 2.17.5
1a3609e402 fsck: reject URL with empty host in .gitmodules
e7fab62b73 credential: treat URL with empty scheme as invalid
c44088ecc4 credential: treat URL without scheme as invalid
fe29a9b7b0 credential: die() when parsing invalid urls
a2b26ffb1a fsck: convert gitmodules url to URL passed to curl
8ba8ed568e credential: refuse to operate when missing host or protocol
24036686c4 credential: parse URL without host as empty host, not unset
73aafe9bc2 t0300: use more realistic inputs
a88dbd2f8c t0300: make "quit" helper more realistic
de49261b05 Git 2.26.1
274b9cc253 Git 2.26
55a7568606 Merge branch 'en/rebase-backend'
c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git
1557364fb4 l10n: tr.po: change file mode to 644
2da1b05674 t3419: prevent failure when run with EXPENSIVE
1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0
5804c6ec40 l10n: de.po: add missing space
98cedd0233 Merge https://github.com/prati0100/git-gui
4914ba4bcf l10n: tr: Fix a couple of ambiguities
a5728022e0 Merge branch 'py/remove-tcloo'
7fcb965970 RelNotes/2.26.0: fix various typos
f0c03bcf95 l10n: Update Catalan translation
67b0a24910 Git 2.25.3
be8661a328 Sync with Git 2.25.2
0822e66b5d Git 2.25.2
65588b0b2e unicode: update the width tables to Unicode 13.0
7be274b0ff Merge branch 'js/ci-windows-update' into maint
9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint
221887a492 Merge branch 'jk/doc-credential-helper' into maint
32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint
fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint
618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint
50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint
fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint
41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint
2d7247af6f Merge branch 'am/mingw-poll-fix' into maint
4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint
76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint
569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint
16a4bf1035 Merge branch 'en/check-ignore' into maint
3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint
56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint
1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint
7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint
fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint
a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint
93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint
dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint
758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint
f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint
506223f9c5 Git 2.24.2
17a02783d8 Git 2.23.2
69fab82147 Git 2.22.3
fe22686494 Git 2.21.2
d1259ce117 Git 2.20.3
a5979d7009 Git 2.19.4
21a3e5016b Git 2.18.3
c42c0f1297 Git 2.17.4
d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u)
3891a84ccd git-gui: create a new namespace for chord script evaluation
8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5
440e7442d1 l10n: zh_CN: Revise v2.26.0 translation
2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2
6c85aac65f Git 2.26-rc2
74f172e39e Merge branch 'en/test-cleanup'
e96327c947 Merge branch 'es/outside-repo-errmsg-hints'
ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0
15fa8d9667 l10n: vi: fix translation + grammar
5c20398699 prefix_path: show gitdir if worktree unavailable
1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated)
c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated)
a4a2f64642 Merge branch 'js/askpass-coerce-utf8'
850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows
d769dcc5cd Merge branch 'py/blame-status-error'
70e24186c0 t6022, t6046: fix flaky files-are-updated checks
30e9940356 Hopefully the final batch before -rc2
b4f0038525 Merge branch 'en/rebase-backend'
25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master
07259e74ec fsck: detect gitmodules URLs with embedded newlines
c716fe4bd9 credential: detect unrepresentable values when parsing urls
17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr
9a6bbee800 credential: avoid writing values with newlines
17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2
1afe18a3bb l10n: es: 2.26.0 round#2
5ab9217a3c Merge branch of github.com:alshopov/git-po into master
c6713676d6 Merge branch of github.com:bitigchi/git-po into master
b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t)
2713dec02d l10n: tr: v2.26.0 round 2
c9ef57cc3a l10n: fr : v2.26.0 rnd 2
120b1eb731 git-rebase.txt: highlight backend differences with commit rewording
9a1b7474d6 sequencer: clear state upon dropping a become-empty commit
937d143630 i18n: unmark a message in rebase.c
a56d361f66 Merge branch 'ds/sparse-add'
5fa9169ced Merge branch 'dr/push-remote-ref-update'
cdef998b46 Merge branch 'jc/doc-single-h-is-for-help'
051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed)
52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master
9643441983 l10n: tr: Add glossary for Turkish translations
438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv
fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git
2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u)
dd2c269652 l10n: tr: Add Turkish translations
8f4f099f8b l10n: tr: Add Turkish translation team info
b4374e96c8 Git 2.26-rc1
4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch'
3658d77f8e Merge branch 'hd/show-one-mergetag-fix'
6125104b88 Merge branch 'rt/format-zero-length-fix'
1ac37deba2 Merge branch 'am/mingw-poll-fix'
cf372dc815 Merge branch 'en/test-cleanup'
d1075adfdf Merge branch 'en/merge-path-collision'
a4fd114ffc Merge branch 'kk/complete-diff-color-moved'
a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file'
0e0d717537 Merge branch 'pb/am-show-current-patch'
9b7f726dfc Merge branch 'am/pathspec-f-f-more'
4605a73073 t1091: don't grep for `strerror()` string
4d9c2902a1 l10n: fr v2.26.0 rnd1
ad182bee3f Merge branch of github.com:alshopov/git-po into master
23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1
98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t)
f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed)
76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po
076cbdcd73 Git 2.26-rc0
0d65f3fb1a t5537: adjust test_oid label
e63cefb024 Merge branch 'hi/gpg-use-check-signature'
5da7329e29 Merge branch 'rs/commit-graph-code-simplification'
0108fc1b46 Merge branch 'js/ci-windows-update'
f3ccd9f0d9 Merge branch 'be/describe-multiroot'
a6b4709302 Merge branch 'ag/rebase-remove-redundant-code'
b22db265d6 Merge branch 'es/recursive-single-branch-clone'
e8e71848ea Merge branch 'jk/nth-packed-object-id'
a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'
4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere'
49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix'
2cbb058669 Merge branch 'bc/wildcard-credential'
25063e2530 Merge branch 'mr/bisect-in-c-1'
f4d7dfce4d Merge branch 'ds/sparse-add'
4d864895a2 t2402: test worktree path when called in .git directory
af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch()
7655b4119d remote-curl: show progress for fetches over dumb HTTP
2f268890c2 The eighth batch for 2.26
aa5a7e02ad Merge branch 'ma/test-cleanup'
58595e713c Merge branch 'rs/blame-typefix-for-fingerprint'
ff41848e99 Merge branch 'rs/micro-cleanups'
4cbf1a0e22 Merge branch 'es/worktree-cleanup'
46703057c1 Merge branch 'ak/test-log-graph'
777815f5f9 Merge branch 'jk/run-command-formatfix'
444cff61b4 Merge branch 'ds/partial-clone-fixes'
48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure'
8c22bd9ff9 Merge branch 'en/rebase-backend'
cb2f5a8e97 Merge branch 'en/check-ignore'
0df82d99da Merge branch 'jk/object-filter-with-bitmap'
80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix'
29b09c518c Merge branch 'jk/doc-diff-parallel'
237a28173f show_one_mergetag: print non-parent in hex form.
5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context"
6d1210e133 l10n: Update Catalan translation
0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification"
7329d94be7 config.mak.dev: re-enable -Wformat-zero-length
7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings
94f4d01932 mingw: workaround for hangs when sending STDIN
1ff466c018 Documentation: clarify that `-h` alone stands for `help`
65bf820d0e t6020: new test with interleaved lexicographic ordering of directories
9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it
d5bb92eced t3035: prefer test_must_fail to bash negation for git commands
b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions
42d180dd01 t602[1236], t6034: modernize test formatting
802050400a merge-recursive: apply collision handling unification to recursive case
7f487ce062 Azure Pipeline: switch to the latest agent pools
5ed9fc3fc8 ci: prevent `perforce` from being quarantined
eafff6e41e t/lib-httpd: avoid using macOS' sed
d68ce906c7 commit-graph: use progress title directly
30b1c7ad9d describe: don't abort too early when searching tags
240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to'
2d2118b814 The seventh batch for 2.26
325eb66830 Merge branch 'es/doc-mentoring'
87f17d790d Merge branch 'es/bright-colors'
d0038f4b31 Merge branch 'bw/remote-rename-update-config'
132f600b06 clone: pass --single-branch during --recurse-submodules
47319576f1 submodule--helper: use C99 named initializer
ffe005576a lib-log-graph: consolidate colored graph cmp logic
989eea958b lib-log-graph: consolidate test_cmp_graph logic
bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching
bb4995fc3f worktree: add utility to find worktree by pathname
a80c4c2214 worktree: improve find_worktree() documentation
2fecc48cad packfile: drop nth_packed_object_sha1()
6ac9760a30 packed_object_info(): use object_id internally for delta base
b99b6bcc57 packed_object_info(): use object_id for returning delta base
63f4a7fc01 pack-check: push oid lookup into loop
e31c71083a pack-check: convert "internal error" die to a BUG()
500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps
f66d4e0250 pack-objects: use object_id struct in pack-reuse code
a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id
3f83fd5e44 pack-objects: read delta base oid into object_id struct
0763671b8e nth_packed_object_oid(): use customary integer return
02bbbe9df9 worktree: drop unused code from get_main_worktree()
27f182b3fc blame: provide type of fingerprints pointer
b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere
df126ca142 t3400: make test clean up after itself
3c29e21eb0 t: drop debug `cat` calls
cac439b56d t9810: drop debug `cat` call
91de82adc9 t4117: check for files using `test_path_is_file`
4ef346482d receive.denyCurrentBranch: respect all worktrees
f8692114db t5509: use a bare repository for test push target
45f274fbb1 get_main_worktree(): allow it to be called in the Git directory
fd0bc17557 completion: add diff --color-moved[-ws]
2ce6d075fa use strpbrk(3) to search for characters from a given set
2b3c430bce quote: use isalnum() to check for alphanumeric characters
a51d9e8f07 t1050: replace test -f with test_path_is_file
3e96c66805 partial-clone: avoid fetching when looking for objects
d0badf8797 partial-clone: demonstrate bugs in partial fetch
539052f42f run-command.h: fix mis-indented struct member
6c11c6a124 sparse-checkout: allow one-character directories in cone mode
aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch
f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch
e8ef1e8d6e am: convert "resume" variable to a struct
bc8620b440 parse-options: convert "command mode" to a flag
62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE()
46fd7b3900 credential: allow wildcard patterns when matching config
82eb249853 credential: use the last matching username in the config
588c70e10f t0300: add tests for some additional cases
732f934408 t1300: add test for urlmatch with multiple wildcards
3fa0e04667 mailmap: add an additional email address for brian m. carlson
8a98758a8d stash push: support the --pathspec-from-file option
8c3713cede stash: eliminate crude option parsing
3f3d8068f5 doc: stash: synchronize <pathspec> description
b22909144c doc: stash: document more options
0093abc286 doc: stash: split options from description (2)
2b7460d167 doc: stash: split options from description (1)
5f393dc3aa rm: support the --pathspec-from-file option
fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags
73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure
6c69f22233 bisect: libify `bisect_next_all`
9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents
45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents
cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents
e8e3ce6718 bisect: libify `bisect_checkout`
ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents
7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()`
680e8a01e5 bisect: add enum to represent bisect returning codes
bfacfce7d9 bisect--helper: introduce new `decide_next()` function
b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0
292731c4c2 bisect--helper: change `retval` to `res`
16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays
7ec8125fba check-ignore: fix documentation and implementation to match
2607d39da3 doc-diff: use single-colon rule in rendering Makefile
0aa6ce3094 doc/config/push: use longer "--" line for preformatted example
20a5fd881a rev-list --count: comment on the use of count_right++
63a58457e0 Merge branch 'py/missing-bracket'
51ebf55b93 The sixth batch for 2.26
f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints'
123538444f Merge branch 'jk/doc-credential-helper'
e154451a2f Merge branch 'js/mingw-open-in-gdb'
fc25a19265 Merge branch 'js/test-unc-fetch'
6365058605 Merge branch 'js/test-avoid-pipe'
966b69f02f Merge branch 'js/test-write-junit-xml-fix'
d880c3de23 Merge branch 'jk/mailinfo-cleanup'
5d55554b1d Merge branch 'mr/show-config-scope'
9f3f38769d Merge branch 'rs/strbuf-insertstr'
cbecc168d4 Merge branch 'rs/parse-options-concat-dup'
5af345a438 Merge branch 'bc/hash-independent-tests-part-8'
0460c109c3 Merge branch 'rs/name-rev-memsave'
6b9919c0a2 git-gui: add missing close bracket
5897e5ac96 Merge branch 'cs/german-translation'
cf85a32eb6 git-gui: update German translation
5096e51c54 git-gui: extend translation glossary template with more terms
8b85bb1b70 git-gui: update pot template and German translation to current source code
e68e29171c Sync with 2.25.1
c522f061d5 Git 2.25.1
10cdb9f38a rebase: rename the two primary rebase backends
2ac0d6273f rebase: change the default backend from "am" to "merge"
8295ed690b rebase: make the backend configurable via config setting
76340c8107 rebase tests: repeat some tests using the merge backend instead of am
980b482d28 rebase tests: mark tests specific to the am-backend with --am
c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases
6d04ce75c4 git-prompt: change the prompt for interactive-based rebases
52eb738d6b rebase: add an --am option
8af14f0859 rebase: move incompatibility checks between backend options a bit earlier
be50c938df git-rebase.txt: add more details about behavioral differences of backends
befb89ce7c rebase: allow more types of rebases to fast-forward
9a70f3d4ae t3432: make these tests work with either am or merge backends
93122c985a rebase: fix handling of restrict_revision
55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer
8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling
7db00f0b3b t3406: simplify an already simple test
e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty
d48e5e21da rebase (interactive-backend): make --keep-empty the default
e0020b2f82 prefix_path: show gitdir when arg is outside repo
cc4f2eb828 doc: move credential helper info into gitcredentials(7)
bfdd66e72f Sync with maint
7ae7e234c7 The fifth batch for 2.26
53c3be2c29 Merge branch 'tb/commit-graph-object-dir'
7b029ebaef Merge branch 'jk/index-pack-dupfix'
aa21cc97bd Merge branch 'jk/alloc-cleanups'
883326077a Merge branch 'jh/notes-fanout-fix'
f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule'
78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs'
df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'
433b8aac2e Merge branch 'ds/sparse-checkout-harden'
4a77434bc8 Merge branch 'ld/p4-cleanup-processes'
8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone'
09e48400a3 Merge branch 'jk/get-oid-error-message-i18n'
4dbeecba27 Merge branch 'ag/edit-todo-drop-check'
f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2'
d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout'
251187084d Merge branch 'js/rebase-i-with-colliding-hash'
c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix'
56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store'
0da63da794 Merge branch 'jn/promote-proto2-to-default'
a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup'
daef1b300b Merge branch 'hw/advice-add-nothing'
6141e0cc00 Merge branch 'js/convert-typofix' into maint
4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint
5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint
b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint
7137d6089b Merge branch 'ms/doc-bundle-format' into maint
52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint
0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint
1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint
cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint
153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint
8857657cc9 Merge branch 'jt/t5616-robustify' into maint
1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint
f468972671 Merge branch 'bc/misconception-doc' into maint
6e69042e26 Merge branch 'bc/author-committer-doc' into maint
650ed395be Merge branch 'ds/refmap-doc' into maint
80b806f1a8 Merge branch 'bc/actualmente' into maint
eceff4ba12 Merge branch 'rt/submodule-i18n' into maint
8a17eb7972 Merge branch 'jk/test-fixes' into maint
54bbadaeca Merge branch 'jk/asan-build-fix' into maint
8dbeba198e Merge branch 'ds/sparse-cone' into maint
e361f36f61 Merge branch 'nd/switch-and-restore' into maint
4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint
ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint
5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint
c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint
d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint
9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint
3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint
3ab3185f99 pack-objects: support filters with bitmaps
84243da129 pack-bitmap: implement BLOB_LIMIT filtering
4f3bd5606a pack-bitmap: implement BLOB_NONE filtering
cc4aa28506 bitmap: add bitmap_unset() function
2aaeb9ac41 rev-list: use bitmap filters for traversal
6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure
4eb707ebd6 rev-list: allow commit-only bitmap traversals
ea047a8eb4 t5310: factor out bitmap traversal comparison
608d9c9365 rev-list: allow bitmaps when counting objects
55cb10f9b5 rev-list: make --count work with --objects
792f811998 rev-list: factor out bitmap-optimized routines
d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs
08809c09aa mingw: add a helper function to attach GDB to the current process
bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths
de26f02db1 t9001, t9116: avoid pipes
a2dc43414c MyFirstContribution: rephrase contact info
e03f928e2a rev-list: fallback to non-bitmap traversal when filtering
acac50dd8c pack-bitmap: fix leak of haves/wants object lists
551cf8b655 pack-bitmap: factor out type iterator initialization
d8437c57fa The fourth batch for 2.26
a3dcf84df0 Merge branch 'js/convert-typofix'
0de2d1409b Merge branch 'js/ci-squelch-doc-warning'
0410c2ba31 Merge branch 'jb/multi-pack-index-docfix'
0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example'
e99c325bb4 Merge branch 'ms/doc-bundle-format'
afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix'
db72f8c940 Merge branch 'jb/parse-options-message-fix'
3d2471ba85 Merge branch 'ma/filter-branch-doc-caret'
b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path'
44cba9c4b3 Merge branch 'jc/skip-prefix'
556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index'
17e4a1b141 Merge branch 'hw/doc-git-dir'
4cf7f48891 Merge branch 'jk/push-default-doc'
b783391018 Merge branch 'jk/clang-sanitizer-fixes'
a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache'
3f7553acf5 Merge branch 'jt/t5616-robustify'
341f8a6476 Merge branch 'jk/escaped-wildcard-dwim'
b486d2ee81 Merge branch 'jn/pretend-object-doc'
076ee3e8a2 tests: fix --write-junit-xml with subshells
2b0f19fa7a convert: fix typo
c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors
1751b09a92 color.c: support bright aixterm colors
4a28eb0ae4 color.c: refactor color_output arguments
f696a2b1c8 mailinfo: factor out some repeated header handling
ffbea1816d mailinfo: be more liberal with header whitespace
f447d0293e mailinfo: simplify parsing of header values
b6537d83ee mailinfo: treat header values as C strings
ef07659926 sparse-checkout: work with Windows paths
2631dc879d sparse-checkout: create 'add' subcommand
4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand
6fb705abcb sparse-checkout: extract add_patterns_from_input()
b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config
f2a2327a4a config: provide access to the current line number
923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values
ceff1a1308 remote: clean-up config callback
1a83068c26 remote: clean-up by returning early to avoid one indentation
88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types
145d59f482 config: add '--show-scope' to print the scope of a config value
9a83d088ee submodule-config: add subomdule config scope
e37efa40e1 config: teach git_config_source to remember its scope
5c105a842e config: preserve scope in do_git_config_sequence
6766e41b8a config: clarify meaning of command line scoping
6dc905d974 config: split repo scope to local and worktree
a5cb4204b6 config: make scope_name non-static and rename it
30183894ea ci: ignore rubygems warning in the "Documentation" job
7a9f8ca805 parse-options: simplify parse_options_dup()
c84078573e parse-options: const parse_options_concat() parameters
f904f9025f parse-options: factor out parse_options_count()
a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat()
517b60564e mailinfo: don't insert header prefix for handle_content_type()
a91cc7fad0 strbuf: add and use strbuf_insertstr()
eb31044ff7 pack-format: correct multi-pack-index description
9299f84921 diff-options.txt: avoid "regex" overload in example
7378ec90e1 doc: describe Git bundle format
f3037657e8 t6024: update for SHA-256
edf04243b2 t6006: make hash size independent
5db24dcffd t6000: abstract away SHA-1-specific constants
d341e0805d t5703: make test work with SHA-256
88ed241a7e t5607: make hash size independent
48c10cc0e6 t5318: update for SHA-256
f7ae8e69b6 t5515: make test hash independent
e70649bb66 t5321: make test hash independent
a30f93b143 t5313: make test hash independent
a79eec220b t5309: make test hash independent
796d1383a3 t5302: make hash size independent
417e45e5e3 t4060: make test work with SHA-256
dfa5f53e78 t4211: add test cases for SHA-256
f743e8f5b3 t4211: move SHA-1-specific test cases into a directory
72f936b120 t4013: make test hash independent
5df0f11f07 t3311: make test work with SHA-256
07877f393c t3310: make test work with SHA-256
6025e898d6 t3309: make test work with SHA-256
7b1a1822fe t3308: make test work with SHA-256
94db7e3e93 t3206: make hash size independent
db12505c2c t/lib-pack: support SHA-256
303b3c1c46 submodule: add newline on invalid submodule error
887a0fd573 add: change advice config variables used by the add API
de93cc14ab The third batch for 2.26
ea46d9097b Merge branch 'mt/sparse-checkout-doc-update'
ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix'
b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend'
7ab963e122 Merge branch 'en/fill-directory-fixes-more'
f52ab33616 Merge branch 'bc/hash-independent-tests-part-7'
25794d6ce9 Merge branch 'km/submodule-add-errmsg'
d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity'
76c57fedfa Merge branch 'js/add-p-leftover-bits'
9a5315edfd Merge branch 'js/patch-mode-in-others-in-c'
381e8e9de1 Merge branch 'dl/test-must-fail-fixes'
395518cf7a parse-options: lose an unnecessary space in an error message
079f970971 name-rev: sort tip names before applying
2d53975488 name-rev: release unused name strings
977dc1912b name-rev: generate name strings only if they are better
1c56fc2084 name-rev: pre-size buffer in get_parent_name()
ddc42ec786 name-rev: factor out get_parent_name()
f13ca7cef5 name-rev: put struct rev_name into commit slab
d689d6d82f name-rev: don't _peek() in create_or_update_name()
15a4205d96 name-rev: don't leak path copy in name_ref()
36d2419c9a name-rev: respect const qualifier
71620ca86c name-rev: remove unused typedef
3e2feb0d64 name-rev: rewrite create_or_update_name()
a21781011f index-pack: downgrade twice-resolved REF_DELTA to die()
dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout
e1c5253951 t3305: check notes fanout more carefully and robustly
e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks
a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st'
ad2dd5bb63 commit-graph.c: remove path normalization, comparison
13c2499249 commit-graph.h: store object directory in 'struct commit_graph'
0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context'
f38c92452d t7400: testcase for submodule status on unregistered inner git repos
5290d45134 tree-walk.c: break circular dependency with unpack-trees
f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch
d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode
e53ffe2704 sparse-checkout: escape all glob characters on write
e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand
bd64de42de sparse-checkout: unquote C-style strings over --stdin
d585f0e799 sparse-checkout: write escaped patterns in cone mode
4f52c2ce6c sparse-checkout: properly match escaped characters
9abc60f801 sparse-checkout: warn on globs in cone patterns
145136a95a C: use skip_prefix() to avoid hardcoded string length
04e5b3f0b4 submodule foreach: replace $path with $sm_path in example
1793280e91 t5318: don't pass non-object directory to '--object-dir'
da8063522f diff: move diff.wsErrorHighlight to "basic" config
b98d188581 sha1-file: allow check_object_signature() to handle any repo
2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file()
7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare()
c8123e72f6 streaming: allow open_istream() to handle any repo
5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile()
a651946730 cache-tree: use given repo's hash_algo at verify_one()
eb999b3295 diff: make diff_populate_filespec() honor its repo argument
5b0ca878e0 Sync with maint
344ee18728 The second batch
53a83299c7 Merge branch 'bc/misconception-doc'
c9ccf9d09b Merge branch 'bc/author-committer-doc'
0d0fa20c40 Merge branch 'ss/t6025-modernize'
7050624abc Merge branch 'lh/bool-to-type-bool'
4b69f29271 Merge branch 'ds/refmap-doc'
aff812ce3c Merge branch 'bc/actualmente'
38fb56e92a Merge branch 'rt/submodule-i18n'
f0940743fa Merge branch 'js/builtin-add-i-cmds'
0afeb3fdf4 Merge branch 'jk/test-fixes'
808dab2b58 Merge branch 'jk/asan-build-fix'
fec1ff97c2 Merge branch 'sg/completion-worktree'
c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function'
11ad30b887 Merge branch 'hi/gpg-mintrustlevel'
96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases'
d52adee779 Merge branch 'ds/graph-horizontal-edges'
6909474491 Merge branch 'am/update-pathspec-f-f-tests'
043426c8fd Merge branch 'ds/sparse-cone'
34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig'
8dd40c0472 traverse_trees(): use stack array for name entries
667b76ec58 walker_fetch(): avoid raw array length computation
9734b74a8f normalize_path_copy(): document "dst" size expectations
43f33e492a git-p4: avoid leak of file handle when cloning
19fa5ac333 git-p4: check for access to remote host earlier
6026aff5bb git-p4: cleanup better on error exit
ca5b5cce62 git-p4: create helper function importRevisions()
4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable
5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce
837b3a6376 git-p4: make closeStreams() idempotent
b0418303b1 sha1-name: mark get_oid() error messages for translation
2df1aa239c fetch: forgo full connectivity check if --filter
50033772d5 connected: verify promisor-ness of partial clone
d82ad54945 git: update documentation for --git-dir
0ad7144999 .mailmap: map Yi-Jyun Pan's email
c56c48dd07 grep: ignore --recurse-submodules if --no-index is given
8b2a1928f0 doc: drop "explicitly given" from push.default description
cf82bff73f obstack: avoid computing offsets from NULL pointer
3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer
d20bc01a51 avoid computing zero offsets from NULL pointer
7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero
bc3f657f71 t1506: drop space after redirection operator
e5d7b2f65c t1400: avoid "test" string comparisons
5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c
c7a6207591 Sync with maint
7210ca4ee5 .mailmap: fix GGG authoship screwup
37a63faae5 t4124: only mark git command with test_must_fail
a8c663cf65 t3507: use test_path_is_missing()
2def7f017c t3507: fix indentation
e8a1c686ae t3504: do check for conflict marker after failed cherry-pick
1c9fd32fd2 t3419: stop losing return code of git command
c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}()
a781cd6fef t3415: stop losing return codes of git commands
86ce6e0dd1 t3310: extract common notes_merge_files_gone()
245b9ba0ba t3030: use test_path_is_missing()
4a6f11fd7b t2018: replace "sha" with "oid"
62e80fcb48 t2018: don't lose return code of git commands
30c0367668 t2018: teach do_checkout() to accept `!` arg
40caa5366a t2018: be more discerning when checking for expected exit codes
b54128bb0b t5616: make robust to delta base change
4c616c2ba1 merge-recursive: use subtraction to flip stage
ee798742bd merge-recursive: silence -Wxor-used-as-pow warning
39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule
a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin
3b2885ec9b submodule: fix status of initialized but not cloned submodules
ace912bfb8 t7400: add a testcase for submodule status on empty dirs
4bb4fd4290 MyFirstContribution: add avenues for getting help
9e6d3e6417 sparse-checkout: detect short patterns
41de0c6fbc sparse-checkout: cone mode does not recognize "**"
7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone
47dbf10d8a clone: fix --sparse option with URLs
3c754067a1 sparse-checkout: create leading directories
d622c34396 t1091: improve here-docs
522e641748 t1091: use check_files to reduce boilerplate
417be08d02 t1300: create custom config file without special characters
3de7ee369b t1300: fix over-indented HERE-DOCs
329e6ec397 config: fix typo in variable name
767a9c417e rebase -i: stop checking out the tip of the branch to rebase
dfaed02862 fsmonitor: update documentation for hook version and watchman hooks
e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2
d031049da3 completion: add support for sparse-checkout
a402723e48 doc: sparse-checkout: mention --cone option
26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck
b6992261de rebase -i: re-fix short SHA-1 collision
d859dcad94 parse_insn_line(): improve error message when parsing failed
d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects
92fb0db94c pack-objects: add checks for duplicate objects
bb514de356 pack-objects: improve partial packfile reuse
ff483026a9 builtin/pack-objects: introduce obj_is_packed()
e704fc7978 pack-objects: introduce pack.allowPackReuse
2f4af77699 csum-file: introduce hashfile_total()
8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting()
59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile
40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains()
14fbd26044 ewah/bitmap: introduce bitmap_word_alloc()
bc7a3d4dc0 The first batch post 2.25 cycle
09e393d913 Merge branch 'nd/switch-and-restore'
45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport'
0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout'
36da2a8635 Merge branch 'es/unpack-trees-oob-fix'
42096c778d Merge branch 'bc/run-command-nullness-after-free-fix'
1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted'
a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees'
e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached'
9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting'
237a83a943 Merge branch 'dl/credential-netrc'
a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir()
129510a067 t2405: clarify test descriptions and simplify test
4eaadc8493 t2405: use git -C and test_commit -C instead of subshells
773c60a45e t7410: rename to t2405-worktree-submodule.sh
7a2dc95cbc docs: mention when increasing http.postBuffer is valuable
1b13e9032f doc: dissuade users from trying to ignore tracked files
69e104d70e doc: provide guidance on user.name format
813f6025a5 docs: expand on possible and recommended user config options
bc94e5862a doc: move author and committer information to git-commit(1)
7979dfe1d4 l10n: Update Catalan translation
81e3db42f3 templates: fix deprecated type option `--bool`
c513a958b6 t6025: use helpers to replace test -f <path>
70789843bd t6025: modernize style
6a7aca6f01 doc: rm: synchronize <pathspec> description
856249c62a docs: use "currently" for the present time
b40a50264a fetch: document and test --refmap=""
a9ae8fde2e t3404: directly test the behavior of interest
22a69fda19 git-rebase.txt: update description of --allow-empty-message
f1928f04b2 grep: use no. of cores as the default no. of threads
70a9fef240 grep: move driver pre-load out of critical section
1184a95ea2 grep: re-enable threads in non-worktree case
6c307626f1 grep: protect packed_git [re-]initialization
c441ea4edc grep: allow submodule functions to run in parallel
d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules()
1d1729caeb grep: replace grep_read_mutex by internal obj read lock
31877c9aec object-store: allow threaded access to object reading
b1fc9da1c8 replace-object: make replace operations thread-safe
d5b0bac528 grep: fix racy calls in grep_objects()
faf123c730 grep: fix race conditions at grep_submodule()
c3a5bb31c1 grep: fix race conditions on userdiff calls
0222540827 fetch: emphasize failure during submodule fetch
232378479e Sync with maint
e4837b4406 t7800: don't rely on reuse_worktree_file()
fbce03d329 t4018: drop "debugging" cat from hunk-header tests
f65d07fffa Makefile: use compat regex with SANITIZE=address
849e43cc18 built-in add -i: accept open-ended ranges again
d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files
a4ffbbbb99 submodule.c: mark more strings for translation
0cbb60574e dir: point treat_leading_path() warning to the right place
ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent
22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2
f365bf40a0 clean: demonstrate a bug with pathspecs
b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x
277eb5af7c t5604: make hash independent
44b6c05b43 t5601: switch into repository to hash object
7a868c51c2 t5562: use $ZERO_OID
1b8f39fb0d t5540: make hash size independent
a8c17e3bd6 t5537: make hash size independent
832072219c t5530: compute results based on object length
74ad99b1d8 t5512: abstract away SHA-1-specific constants
ba1be1ab45 t5510: make hash size independent
cba472d3ad t5504: make hash algorithm independent
82d5aeb1e6 t5324: make hash size independent
3c5e65cac1 t5319: make test work with SHA-256
235d3cddb8 t5319: change invalid offset for SHA-256 compatibility
1d86c8f0ce t5318: update for SHA-256
525a7f1769 t4300: abstract away SHA-1-specific constants
7a1bcb251b t4204: make hash size independent
cb78f4f0fe t4202: abstract away SHA-1-specific constants
717c939d8f t4200: make hash size independent
08a9dd891c t4134: compute appropriate length constant
215b60bf07 t4066: compute index line in diffs
194264c185 t4054: make hash-size independent
7d5ecd775d completion: list paths and refs for 'git worktree add'
3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands
3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options
367efd54b3 completion: return the index of found word from __git_find_on_cmdline()
d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function
2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper
54887b4689 gpg-interface: add minTrustLevel as a configuration option
684ceae32d fetch: default to protocol version 2
33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION
8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate
b9ab170752 config doc: protocol.version is not experimental
07ef3c6604 fetch test: use more robust test for filtered objects
d6509da620 fetch test: mark test of "skipping" haves as v0-only
a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too
c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function
bf66db37f1 add: use advise function to display hints
c958d3bd0a graph: fix collapse of multiple edges
8588932e20 graph: add test to demonstrate horizontal line bug
d0d0a357a1 t: directly test parse_pathspec_file()
568cabb2fe t: fix quotes tests for --pathspec-from-file
f94f7bd00d t: add tests for error conditions with --pathspec-from-file
b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job
12acdf573a built-in add -p: handle Escape sequences more efficiently
e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode
04f816b125 built-in add -p: respect the `interactive.singlekey` config setting
a5e46e6b01 terminal: add a new function to read a single keystroke
9ea416cb51 terminal: accommodate Git for Windows' default terminal
94ac3c31f7 terminal: make the code of disable_echo() reusable
08b1ea4c39 built-in add -p: handle diff.algorithm
180f48df69 built-in add -p: support interactive.diffFilter
1e4ffc765d t3701: adjust difffilter test
c81638541c submodule add: show 'add --dry-run' stderr when aborting
8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token
56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token
d0654dc308 Git 2.25
b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po
4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'"
ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1
e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master
1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
d78a1968c5 Merge branch 'ma/config-advice-markup-fix'
a20ae3ee29 l10n: Update Catalan translation
49e268e23e mingw: safeguard better against backslashes in file names
4c6c7971e0 unpack-trees: correctly compute result count
63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1
75449c1b39 l10n: de.po: Reword generation numbers
6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t)
3901d2c6bd config/advice.txt: fix description list separator
7a6a90c6ec Git 2.25-rc2
1f5f3ffe5c Merge branch 'ds/graph-assert-fix'
a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix'
202f68b252 Merge branch 'pm/am-in-body-header-doc-update'
7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix'
c5dc20638b Merge branch 'do/gitweb-typofix-in-comments'
fe47c9cb5f Merge https://github.com/prati0100/git-gui
a1087c9367 graph: fix lack of color in horizontal lines
0d251c3291 graph: drop assert() for merge with two collapsing parents
4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper
573117dfa5 unpack-trees: watch for out-of-range index position
e701bab3e9 restore: invalidate cache-tree when removing entries with --staged
1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command
fa74180d08 checkout: don't revert file on ambiguous tracking branches
2957709bd4 parse_branchname_arg(): extract part as new function
5020f6806a t2018: improve style of if-statement
7ffb54618b t2018: add space between function name and ()
63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH
065027ee1a string-list: note in docs that callers can specify sorting function
26f924d50e unpack-trees: exit check_updates() early if updates are not wanted
042ed3e048 The final batch before -rc2
0f1930cd1b Merge branch 'ds/sparse-cone'
037f067587 Merge branch 'ds/commit-graph-set-size-mult'
f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify'
c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode'
a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
c4117fcb97 Merge branch 'pb/clarify-line-log-doc'
556f0258df Merge branch 'ew/packfile-syscall-optim'
5814d44d9b doc: submodule: fix typo for command absorbgitdirs
7047f75f22 editorconfig: indent text files with tabs
60440d72db sha1-file: document how to use pretend_object_file
7fdc5f296f l10n: es: 2.25.0 round #1
f8740c586b am: document that Date: can appear as an in-body header
4e2c4c0d4f gitweb: fix a couple spelling errors in comments
421c0ffb02 multi-pack-index: correct configuration in documentation
757ff352bd Documentation/git-sparse-checkout.txt: fix a typo
0d2116c644 Merge branch 'zs/open-current-file'
9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u)
3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master
4c5081614c l10n: fr.po v2.25.0 rnd 1
5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0
63020f175f commit-graph: prefer default size_mult when given zero
224c7d70fa mingw: only test index entries for backslashes, not tree entries
9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED
8679ef24ed Git 2.25-rc1
a82027e9e6 Merge branch 'js/use-test-tool-on-path'
13432fc6dd Merge branch 'js/mingw-reserved-filenames'
e0e1ac5db0 Merge branch 'en/rebase-signoff-fix'
b76a244c9d Merge branch 'em/freebsd-cirrus-ci'
bc855232bc Merge branch 'bk/p4-misc-usability'
763a59e71c merge-recursive: remove unnecessary oid_eq function
44143583b7 sparse-checkout: use extern for global variables
d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master
13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1
786f4d2405 git-gui: allow opening currently selected file in default app
4fd683b6a3 sparse-checkout: document interactions with submodules
de11951b03 sparse-checkout: list directories in cone mode
0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0
578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed)
173fff68da Merge tag 'v2.25.0-rc0' into git-po-master
f1842ff531 t2018: remove trailing space from test description
20a67e8ce9 t3008: find test-tool through path lookup
9e341f62ca l10n: Update Catalan translation
4e61b2214d packfile: replace lseek+read with pread
ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision
2be45868a8 doc: log, gitk: document accepted line-log diff formats
280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD
0a76bd7381 mailmap: mask accentless variant for Công Danh
99c33bed56 Git 2.25-rc0
d2189a721c Merge branch 'en/fill-directory-fixes'
8be0a428d6 Merge branch 'rs/test-cleanup'
65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string'
c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
45b96a6fa1 Merge branch 'js/add-p-in-c'
ccc292e862 Merge branch 'jc/drop-gen-hdrs'
dfee504bee Merge branch 'ja/doc-markup-cleanup'
87cbb1ca66 Merge branch 'rs/ref-read-cleanup'
20aa6d88b7 Merge branch 'rb/p4-lfs'
fcd5b55f56 Merge branch 'pb/submodule-doc-xref'
4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free'
ba6b66281e Merge branch 'ln/userdiff-elixir'
bd72a08d6c Merge branch 'ds/sparse-cone'
f3c520e17f Merge branch 'sg/name-rev-wo-recursion'
6514ad40a1 Merge branch 'ra/t5150-depends-on-perl'
17066bea38 Merge branch 'dl/format-patch-notes-config-fixup'
135365dd99 Merge branch 'am/pathspec-f-f-checkout'
ff0cb70d45 Merge branch 'am/pathspec-from-file'
4dc42c6c18 mingw: refuse paths containing reserved names
98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16
c480eeb574 commit --interactive: make it work with the built-in `add -i`
cee6cb7300 built-in add -p: implement the "worktree" patch modes
52628f94fc built-in add -p: implement the "checkout" patch modes
6610e4628a built-in stash: use the built-in `git add -p` if so configured
90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting
36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes
d2a233cb8b built-in add -p: prepare for patch modes other than "stage"
761e3d26bb sparse-checkout: improve OS ls compatibility
6579d93a97 contrib/credential/netrc: work outside a repo
1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable
b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI
b441717256 t1507: inline full_name()
9291e6329e t1507: run commands within test_expect_success
5236fce6b4 t1507: stop losing return codes of git commands
10812c2337 t1501: remove use of `test_might_fail cp`
62d58cda69 t1409: use test_path_is_missing()
b87b02cfe6 t1409: let sed open its own input file
9b92070e52 t1307: reorder `nongit test_must_fail`
3595d10c26 t1306: convert `test_might_fail rm` to `rm -f`
f511bc02ed t0020: use ! check_packed_refs_marked
f6041abdcd t0020: don't use `test_must_fail has_cr`
f46c243e66 t0003: don't use `test_must_fail attr_check`
99c049bc4c t0003: use test_must_be_empty()
3738439c77 t0003: use named parameters in attr_check()
7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err()
b8afb908c2 t/lib-git-p4: use test_path_is_missing()
4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases
6836d2fe06 dir.c: use st_add3() for allocation size
c847dfafee dir: consolidate similar code in treat_directory()
777b420347 dir: synchronize treat_leading_path() and read_directory_recursive()
b9670c1f5e dir: fix checks on common prefix directory
5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit
23cbe427c4 Merge branch 'py/console-close-esc'
124a895811 t4015: improve coverage of function context test
509efef789 commit: forbid --pathspec-from-file --all
12029dc57d t3434: mark successful test as such
e0f9095aaa notes.h: fix typos in comment
675ef6bab8 t6030: don't create unused file
01ed17dc8c t5580: don't create unused file
f670adb49b t3501: don't create unused file
1e1ccbfdd3 git-gui: allow closing console window with Escape
7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays.
b02fd2acca The sixth batch
59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex'
e3b72391d1 Merge branch 'rs/commit-export-env-simplify'
43bf44e23a Merge branch 'rs/archive-zip-code-cleanup'
4438a1a59f Merge branch 'js/t3404-indent-fix'
3a44db2ed2 Merge branch 'dr/branch-usage-casefix'
8bc481f4f6 Merge branch 'sg/t9300-robustify'
011fc2e88e Merge branch 'js/add-i-a-bit-more-tests'
d1c0fe8d9b Merge branch 'dl/range-diff-with-notes'
26c816a67d Merge branch 'hw/doc-in-header'
f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
71a7de7a99 Merge branch 'dl/rebase-with-autobase'
c9f5fc9114 Merge branch 'dl/test-cleanup'
6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap'
3beff388b2 Merge branch 'js/builtin-add-i-cmds'
4755a34c47 Merge branch 'dd/time-reentrancy'
37c2619d91 Merge branch 'ag/sequencer-todo-updates'
608e380502 git-p4: show detailed help when parsing options fail
e2aed5fd5b git-p4: yes/no prompts should sanitize user text
571fb96573 fix-typo: consecutive-word duplications
f371984613 Makefile: drop GEN_HDRS
2e4083198d built-in add -p: show helpful hint when nothing can be staged
54d9d9b2ee built-in add -p: only show the applicable parts of the help text
ade246efed built-in add -p: implement the 'q' ("quit") command
d6cf873340 built-in add -p: implement the '/' ("search regex") command
9254bdfb4f built-in add -p: implement the 'g' ("goto") command
bcdd297b78 built-in add -p: implement hunk editing
b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf"
11f2c0dae8 built-in add -p: coalesce hunks after splitting them
510aeca199 built-in add -p: implement the hunk splitting feature
0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions
5906d5de77 built-in app -p: allow selecting a mode change as a "hunk"
47dc4fd5eb built-in add -p: handle deleted empty files
80399aec5a built-in add -p: support multi-file diffs
7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed
12c24cf850 built-in add -p: color the prompt and the help text
25ea47af49 built-in add -p: adjust hunk headers as needed
e3bd11b4eb built-in add -p: show colored hunks by default
1942ee44e8 built-in add -i: wire up the new C code for the `patch` command
f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C
d1b1384d61 userdiff: remove empty subexpression from elixir regex
df5be01669 doc: indent multi-line items in list
fd5041e127 doc: remove non pure ASCII characters
190a65f9db sparse-checkout: respect core.ignoreCase in cone mode
1d7297513d notes: break set_display_notes() into smaller functions
66f79ee23d config/format.txt: clarify behavior of multiple format.notes
cc2bd5c45d gitmodules: link to gitsubmodules guide
99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed
e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed
8c02fe6060 t7004: don't create unused file
cb05d6a5ed t4256: don't create unused file
c5c4eddd56 dir: break part of read_directory_recursive() out for reuse
072a231016 dir: exit before wildcard fall-through if there is no wildcard
2f5d3847d4 dir: remove stray quote character in comment
a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories"
452efd11fb t3011: demonstrate directory traversal failures
ea94b16fb8 git-p4: honor lfs.storage configuration variable
51a0a4ed95 bisect--helper: avoid use-after-free
d32e065a91 Merge branch 'kk/branch-name-encoding'
ad05a3d8e5 The fifth batch
7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix'
b089e5e6cb Merge branch 'em/test-skip-regex-illseq'
930078ba39 Merge branch 'hi/gpg-use-check-signature'
08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode'
7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk'
55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm'
41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress'
5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise'
dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix'
d37cfe3b5c Merge branch 'dl/pretty-reference'
99c4ff1bda Merge branch 'dl/submodule-set-url'
55d607d85b Merge branch 'js/mingw-inherit-only-std-handles'
c58ae96fc4 Merge branch 'am/pathspec-from-file'
7c88714262 Merge branch 'po/bundle-doc-clonable'
5d9324e0f4 Merge branch 'ra/rebase-i-more-options'
7034cd094b Sync with Git 2.24.1
09ac67a183 format-patch: move git_config() before repo_init_revisions()
8164c961e1 format-patch: use --notes behavior for format.notes
452538c358 notes: extract logic into set_display_notes()
e6e230eeae notes: create init_display_notes() helper
1e6ed5441a notes: rename to load_display_notes()
2866fd284c name-rev: cleanup name_ref()
49f7a2fde9 name-rev: eliminate recursion in name_rev()
fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name'
e05e8cf074 archive-zip: use enum for compression method
39acfa3d22 git gui: fix branch name encoding error
11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description
8cf8f9b4aa t3404: fix indentation
4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs
147ee35558 commit: use strbuf_add() to add a length-limited string
559c6fc317 The fourth batch
56e6c16394 Merge branch 'dl/lore-is-the-archive'
3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive'
7cb0d37f6d Merge branch 'tg/perf-remove-stale-result'
403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick'
f0cf2fee5d Merge branch 'hi/grep-do-not-return-void'
391fb22ac7 Merge branch 'rs/use-skip-prefix-more'
92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd'
4ba74ca901 Merge branch 'rs/test-cleanup'
f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick'
ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9'
8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters
3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances
dd432a6ecf name-rev: restructure parsing commits and applying date cutoff
dd090a8a37 name-rev: pull out deref handling from the recursion
766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper
d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev()
bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation
e0c4da6f2a name-rev: avoid unnecessary cast in name_ref()
c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name()
c593a26348 t6120-describe: modernize the 'check_describe' helper
abcf857300 range-diff: clear `other_arg` at end of function
f8675343d7 range-diff: mark pointers as const
828765dfe0 t3206: fix incorrect test name
0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early
21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile
b4bbbbd5a2 apply --allow-overlap: fix a corner case
89c8559367 git add -p: use non-zero exit code when the diff generation failed
e91162be9c t3701: verify that the diff.algorithm config setting is handled
0c3222c4f3 t3701: verify the shown messages when nothing can be added
24be352d52 t3701: add a test for the different `add -p` prompts
8539b46534 t3701: avoid depending on the TTY prerequisite
0f0fba2cc8 t3701: add a test for advanced split-hunk editing
53a06cf39b Git 2.24.1
67af91c47a Sync with 2.23.1
a7312d1a28 Git 2.23.1
7fd9fd94fb Sync with 2.22.2
d9589d4051 Git 2.22.2
5421ddd8d0 Sync with 2.21.1
367f12b7e9 Git 2.21.1
20c71bcf67 Merge branch 'fix-msys2-quoting-bugs'
7d8b676992 mingw: sh arguments need quoting in more circumstances
d9061ed9da t7415: drop v2.20.x-specific work-around
04522edbd4 mingw: fix quoting of empty arguments for `sh`
49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts
e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly
fc346cb292 Sync with 2.20.2
4cd1cf31ef Git 2.20.2
c154745074 submodule: defend against submodule.update = !command in .gitmodules
4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x
d851d94151 Sync with 2.19.3
caccc527ca Git 2.19.3
7c9fbda6e2 Sync with 2.18.2
9877106b01 Git 2.18.2
14af7ed5a9 Sync with 2.17.3
a5ab8d0317 Git 2.17.3
bb92255ebe fsck: reject submodule.update = !command in .gitmodules
bdfef0492c Sync with 2.16.6
eb288bc455 Git 2.16.6
68440496c7 test-drop-caches: use `has_dos_drive_prefix()`
9ac92fed5b Sync with 2.15.4
7cdafcaacf Git 2.15.4
e904deb89d submodule: reject submodule.update = !command in .gitmodules
d3ac8c3f27 Sync with 2.14.6
66d2a6159f Git 2.14.6
083378cc35 The third batch
88bd37a2d0 Merge branch 'js/pkt-line-h-typofix'
473b431410 Merge branch 'us/unpack-trees-fsmonitor'
e0f9ec9027 Merge branch 'sg/test-bool-env'
fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset'
e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere'
88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory'
8feb47e882 Merge branch 'dl/t5520-cleanup'
6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree'
57d46bc602 Merge branch 'mg/doc-submodule-status-cached'
75bd003c7b Merge branch 'js/git-svn-use-rebase-merges'
f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix'
c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'
36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree'
cf91c31688 Merge branch 'sg/unpack-progress-throughput'
ef6104581d Merge branch 'pb/submodule-update-fetches'
7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix'
f3c7bfdde2 Merge branch 'dl/range-diff-with-notes'
9502b616f1 Merge branch 'jh/userdiff-python-async'
76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2'
995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label'
f7998d9793 Merge branch 'js/builtin-add-i'
917d0d6234 Merge branch 'js/rebase-r-safer-label'
56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers'
2763530048 Merge branch 'jg/revert-untracked'
fa38ab68b0 git-gui: revert untracked files by deleting them
d9c6469f38 git-gui: update status bar to track operations
29a9366052 git-gui: consolidate naming conventions
0bb313a552 xdiff: unignore changes in function context
2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names'
65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods'
5532ebdeb7 Merge branch 'fix-mingw-quoting-bug'
76a681ce9c Merge branch 'dubiously-nested-submodules'
dd53ea7220 Merge branch 'turn-on-protectntfs-by-default'
f82a97eb91 mingw: handle `subst`-ed "DOS drives"
7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams'
d2c84dad1c mingw: refuse to access paths with trailing spaces or periods
379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh
817ddd64c2 mingw: refuse to access paths with illegal characters
cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors
7530a6287e quote-stress-test: allow skipping some trials
35edce2056 t6130/t9350: prepare for stringent Win32 path validation
55953c77c0 quote-stress-test: accept arguments to test via the command-line
ad15592529 tests: add a helper to stress test argument quoting
a8dee3ca61 Disallow dubiously-nested submodule git directories
9102f958ee protect_ntfs: turn on NTFS protection by default
91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams
6d8684161e mingw: fix quoting of arguments
3a85dc7d53 is_ntfs_dotgit(): speed it up
7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses
288a74bcd2 is_ntfs_dotgit(): only verify the leading segment
a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark
cae0bc09ab rebase: fix format.useAutoBase breakage
945dc55dda format-patch: teach --no-base
700e006c5d t4014: use test_config()
a749d01e1d format-patch: fix indentation
0c47e06176 t3400: demonstrate failure with format.useAutoBase
d9b31db2c4 t7700: stop losing return codes of git commands
3699d69df0 t7700: make references to SHA-1 generic
dcf9a748ca t7700: replace egrep with grep
cfe5eda02a t7700: consolidate code into test_has_duplicate_object()
ae475afc0f t7700: consolidate code into test_no_missing_in_packs()
14b7664df8 doc: replace LKML link with lore.kernel.org
d23f9c8e04 RelNotes: replace Gmane with real Message-IDs
dcee037228 doc: replace MARC links with lore.kernel.org
a9aecc7abb checkout, restore: support the --pathspec-from-file option
cfd9376c1d doc: restore: synchronize <pathspec> description
8ea1189eac doc: checkout: synchronize <pathspec> description
6fdc9ad259 doc: checkout: fix broken text reference
1d022bb43f doc: checkout: remove duplicate synopsis
bebb5d6d6b add: support the --pathspec-from-file option
21bb3083c3 cmd_add: prepare for next patch
4778452597 Merge branch 'prevent-name-squatting-on-windows'
a7b1ad3b05 Merge branch 'jk/fast-import-unsafe'
525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()`
e1d911dd4c mingw: disallow backslash characters in tree objects' file names
0060fd1511 clone --recurse-submodules: prevent name squatting on Windows
a52ed76142 fast-import: disallow "feature import-marks" by default
68061e3470 fast-import: disallow "feature export-marks" by default
019683025f fast-import: delay creating leading directories for export-marks
e075dba372 fast-import: stop creating leading directories for import-marks
11e934d56e fast-import: tighten parsing of boolean command line options
816f806786 t9300: create marks files for double-import-marks test
f94804c1f2 t9300: drop some useless uses of cat
4f3e57ef13 submodule--helper: advise on fatal alternate error
10c64a0b3c Doc: explain submodule.alternateErrorStrategy
ec48540fe8 packfile.c: speed up loading lots of packfiles
3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value
a4fb016ba1 pkt-line: fix a typo
0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r
e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data
228f53135a The second batch
6c630f237e Merge branch 'jk/gitweb-anti-xss'
3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell'
4775e02a5c Merge branch 'ma/t7004'
a6c6f8d02a Merge branch 'js/complete-svn-recursive'
3ae8defaf9 Merge branch 'jk/send-pack-remote-failure'
aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix'
4ab9616c76 Merge branch 'sg/skip-skipped-prereq'
723a8adba5 Merge branch 'ds/test-read-graph'
9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation'
406ca29e0d Merge branch 'rs/parse-options-dup-null-fix'
fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging'
8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion'
ef8f621045 Merge branch 'dl/complete-rebase-onto'
3c3e5d0ea2 Merge branch 'tg/stash-refresh-index'
43c5fe1c1d Merge branch 'nn/doc-rebase-merges'
6511cb33c9 Merge branch 'dd/sequencer-utf8'
f165457618 Merge branch 'jk/remove-sha1-to-hex'
a774064fb0 Merge branch 'dj/typofix-merge-strat'
ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates'
d2489ce92c Merge branch 'rs/skip-iprefix'
376e7309e1 Merge branch 'ln/userdiff-elixir'
9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log'
d3096d2ba6 Merge branch 'en/doc-typofix'
26f20fa3fc Merge branch 'ns/test-desc-typofix'
ffd130a363 Merge branch 'en/t6024-style'
5149902ff9 Merge branch 'en/misc-doc-fixes'
bcb06e204c Merge branch 'js/fetch-multi-lockfix'
d08daec001 Merge branch 'rs/trace2-dots'
fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix'
bad5ed39cd Merge branch 'cb/curl-use-xmalloc'
7ab2088255 Merge branch 'rt/fetch-message-fix'
f089ddd56a Merge branch 'es/myfirstcontrib-updates'
3c90710c0c Merge branch 'hw/config-doc-in-header'
d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code'
5444d52866 Merge branch 'js/vreportf-wo-buffering'
05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add'
ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides'
532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default'
dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists'
fac9ab1419 Merge branch 'ma/bisect-doc-sample-update'
a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix'
0be5caf97c Merge branch 'jc/log-graph-simplify'
0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck'
2e697ced9d built-in add -i: offer the `quit` command
d7633578b5 built-in add -i: re-implement the `diff` command
8746e07277 built-in add -i: implement the `patch` command
ab1e1cccaf built-in add -i: re-implement `add-untracked` in C
c54ef5e424 built-in add -i: re-implement `revert` in C
a8c45be939 built-in add -i: implement the `update` command
f37c226454 built-in add -i: prepare for multi-selection commands
c08171d156 built-in add -i: allow filtering the modified files list
0c3944a628 add-interactive: make sure to release `rev.prune_data`
4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance
867fc7f310 grep: don't return an expression from pcre2_free()
c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables
72b006f4bf gpg-interface: prefer check_signature() for GPG verification
7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD
b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r
ccd469450a date.c: switch to reentrant {gm,local}time_r
271c351b2f t7811: don't create unused file
65efb42862 t9300: don't create unused file
f6b9413baf sequencer: fix a memory leak in sequencer_continue()
3eae30e464 doc: replace public-inbox links with lore.kernel.org
46c67492aa doc: recommend lore.kernel.org over public-inbox.org
5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects
17a4ae92ea t7700: s/test -f/test_path_is_file/
d2eee32a89 t7700: move keywords onto their own line
7a1c8c2346 t7700: remove spaces after redirect operators
09279086e8 t7700: drop redirections to /dev/null
756ee7fc9f t7501: stop losing return codes of git commands
38c1aa01de t7501: remove spaces after redirect operators
763b47bafa t5703: stop losing return codes of git commands
eacaa1c180 t5703: simplify one-time-sed generation logic
a29b2429e5 t5317: use ! grep to check for no matching lines
6c37f3ec1b t5317: stop losing return codes of git commands
b66e0a1773 t4138: stop losing return codes of git commands
afd43c9905 t4015: use test_write_lines()
946d2353a3 t4015: stop losing return codes of git commands
50cd31c652 t3600: comment on inducing SIGPIPE in `git rm`
3b737381d8 t3600: stop losing return codes of git commands
0d913dfa7e t3600: use test_line_count() where possible
29a40b5a67 t3301: stop losing return codes of git commands
9b5a9fa60a t0090: stop losing return codes of git commands
17aa9d9c1a t0014: remove git command upstream of pipe
77a946be98 apply-one-time-sed.sh: modernize style
176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job
ed254710ee test: use test_must_be_empty F instead of test_cmp empty F
c74b3cbb83 t7812: add missing redirects
213dabf49d test: use test_must_be_empty F instead of test -z $(cat F)
c93a5aaec8 t1400: use test_must_be_empty
6e4826ea75 t1410: use test_line_count
a5d04a3ef9 t1512: use test_line_count
54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd()
2059e79c0d name-rev: use skip_prefix() instead of starts_with()
1768aaf01d push: use skip_prefix() instead of starts_with()
ec6ee0c07a shell: use skip_prefix() instead of starts_with()
7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with()
a6293f5d28 fetch: use skip_prefix() instead of starts_with()
13ca8fb79e t5150: skip request-pull test if Perl is disabled
ecc0869080 commit-graph: use start_delayed_progress()
44a4693bfc progress: create GIT_PROGRESS_DELAY
528d9e6d01 t/perf: don't depend on Git.pm
b8dcc45387 perf-lib: use a single filename for all measurement types
fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk'
d82dfa7f5b rebase -i: finishing touches to --reset-author-date
1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory
393adf7a6f sequencer: directly call pick_commits() from complete_action()
a2dd67f105 rebase: fill `squash_onto' in get_replay_opts()
3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function
34065541e3 sequencer: update `done_nr' when skipping commands in a todo list
8638114e06 sequencer: update `total_nr' when adding an item to a todo list
0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk
ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk
ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions
9917eca794 l10n: zh_TW: add translation for v2.24.0
0a8e3036a3 reset: parse rev as tree-ish in patch mode
f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits
8d483c8408 doc: document 'git submodule status --cached'
befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick
ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later
9a780a384d mingw: spawned processes need to inherit only standard handles
c5a03b1e29 mingw: work around incorrect standard handles
eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes
a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool
43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values
2d05ef2778 sequencer: fix empty commit check when amending
ea8b7be147 git svn: stop using `rebase --preserve-merges`
67a6ea6300 gpg-interface: limit search for primary key fingerprint
392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern
cff4e9138d sparse-checkout: check for dirty status
416adc8711 sparse-checkout: update working directory in-process for 'init'
f75a69f880 sparse-checkout: cone mode should not interact with .gitignore
fb10ca5b54 sparse-checkout: write using lockfile
99dfa6f970 sparse-checkout: use in-process update for disable subcommand
e091228e17 sparse-checkout: update working directory in-process
e9de487aa3 sparse-checkout: sanitize for nested folders
4dcd4def3c unpack-trees: add progress to clear_ce_flags()
eb42feca97 unpack-trees: hash less in cone mode
af09ce24a9 sparse-checkout: init and set in cone mode
96cc8ab531 sparse-checkout: use hashmaps for cone patterns
879321eb0b sparse-checkout: add 'cone' mode
e6152e35ff trace2: add region in clear_ce_flags
72918c1ad9 sparse-checkout: create 'disable' subcommand
7bffca95ea sparse-checkout: add '--stdin' option to set subcommand
f6039a9423 sparse-checkout: 'set' subcommand
d89f09c828 clone: add --sparse mode
bab3c35908 sparse-checkout: create 'init' subcommand
94c0956b60 sparse-checkout: create builtin with 'list' subcommand
679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files
df6d3d6802 lib-bash.sh: move `then` onto its own line
2a02262078 t5520: replace `! git` with `test_must_fail git`
c245e58bb6 t5520: remove redundant lines in test cases
a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp
e959a18ee7 t5520: don't put git in upstream of pipe
5540ed27bc t5520: test single-line files by git with test_cmp
dd0f1e767b t5520: use test_cmp_rev where possible
979f8891cc t5520: replace test -{n,z} with test-lib functions
3037d3db90 t5520: use test_line_count where possible
93a9bf876b t5520: remove spaces after redirect operator
ceeef863de t5520: replace test -f with test-lib functions
4c8b046f82 t5520: let sed open its own input
53c62b9810 t5520: use sq for test case names
e8d1eaf9b4 t5520: improve test style
2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals
8cb7980382 t0000: test multiple local assignment
5b583e6a09 format-patch: pass notes configuration to range-diff
bd36191886 range-diff: pass through --notes to `git log`
9f726e1b87 range-diff: output `## Notes ##` header
3bdbdfb7a5 t3206: range-diff compares logs with commit notes
75c5aa0701 t3206: s/expected/expect/
79f3950d02 t3206: disable parameter substitution in heredoc
3a6e48e9f7 t3206: remove spaces after redirect operators
26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish
077a1fda82 userdiff: support Python async functions
3798149a74 SubmittingPatches: use `--pretty=reference`
1f0fc1db85 pretty: implement 'reference' format
618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type
0df621172d pretty: provide short date format
ac52d9410e t4205: cover `git log --reflog -z` blindspot
3e8ed3b93e pretty.c: inline initalize format_context
4982516451 revision: make get_revision_mark() return const pointer
f0f9de2bd7 completion: complete `tformat:` pretty format
fb2ffa77a6 SubmittingPatches: remove dq from commit reference
bae74c9dfb pretty-formats.txt: use generic terms for hash
bd00717eab SubmittingPatches: use generic terms for hash
9d45ac4cbf rev-list-options.txt: remove reference to --show-notes
828e829b9e argv-array: add space after `while`
e440fc5888 commit: support the --pathspec-from-file option
66a25a7242 doc: commit: synchronize <pathspec> description
64bac8df97 reset: support the `--pathspec-from-file` option
d137b50756 doc: reset: synchronize <pathspec> description
24e4750c96 pathspec: add new function to parse file
0dbc4a0edf ci(osx): update homebrew-cask repository with less noise
e02058a729 sequencer: handle rebase-merges for "onto" message
bae60ba7e9 builtin/unpack-objects.c: show throughput progress
2d92ab32fd rev-parse: make --show-toplevel without a worktree an error
9e5afdf997 fetch: add trace2 instrumentation
4c4066d95d run-command: move doc to run-command.h
6c51cb525d trace2: move doc to trace2.h
7db0305438 parse-options: add link to doc file in parse-options.h
d95a77d059 submodule-config: move doc to submodule-config.h
f3b9055624 credential: move doc to credential.h
bbcfa3002a tree-walk: move doc to tree-walk.h
971b1f24a2 argv-array: move doc to argv-array.h
f1ecbe0f53 trace: move doc to trace.h
13aa9c8b70 cache: move doc to cache.h
c0be43f898 sigchain: move doc to sigchain.h
19ef3ddd36 pathspec: move doc to pathspec.h
301d595e72 revision: move doc to revision.h
3a1b3415d9 attr: move doc to attr.h
126c1ccefb refs: move doc to refs.h
d27eb356bf remote: move doc to remote.h and refspec.h
405c6b1fbc sha1-array: move doc to sha1-array.h
d3d7172e40 merge: move doc to ll-merge.h
3f1480b745 graph: move doc to graph.h and graph.c
266f03eccd dir: move doc to dir.h
13c4d7eb22 diff: move doc to diff.h and diffcore.h
cd5522271f rebase -r: let `label` generate safer labels
867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()`
8c15904462 built-in add -i: implement the `help` command
3d965c7674 built-in add -i: use color in the main loop
68db1cbf8e built-in add -i: support `?` (prompt help)
76b743234c built-in add -i: show unique prefixes of the commands
6348bfba58 built-in add -i: implement the main loop
a376e37b2c gitweb: escape URLs generated by href()
b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI
f28bceca75 t/gitweb-lib.sh: drop confusing quotes
0eba60c9b7 t9502: pass along all arguments in xss helper
932757b0cc INSTALL: use existing shell scripts as example
b018719927 t7004: check existence of correct tag
1daaebcaa5 built-in add -i: color the header in the `status` command
5e82b9e4d2 built-in add -i: implement the `status` command
e4cb659ebd diff: export diffstat interface
f83dff60a7 Start to implement a built-in version of `git add --interactive`
df53c80822 stash: make sure we have a valid index before writing it
ad7a403268 send-pack: check remote ref status on pack-objects failure
d91ce887c9 t6120-describe: correct test repo history graph in comment
1f9247a3bd completion: tab-complete "git svn --recursive"
603960b50e promisor-remote: remove fetch_if_missing=0
e362fadcd0 clone: remove fetch_if_missing=0
169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL
51bd6be32d mingw: use COPY_ARRAY for copying array
4bd0593e0f test-tool: use 'read-graph' helper
e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway
d784d978f6 t4215: use helper function to check output
61eea521fe fsmonitor: do not compare bitmap size with size of split index
b19f3fe9dd hex: drop sha1_to_hex()
c1ce9c06d0 completion: learn to complete `git rebase --onto=`
f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls
d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase
aa6d7f93ed hex: drop sha1_to_hex_r()
52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch
5772b0c745 sequencer: reencode old merge-commit message
e0eba649e8 bundle-verify: add --quiet
79862b6b77 bundle-create: progress output control
73c3253d75 bundle: framework for options before bundle file
68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in"
b375744274 sequencer: reencode squashing commit's message
019a9d8362 sequencer: reencode revert/cherry-pick's todo list
0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list
e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding
1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary
d9f6f3b619 The first batch post 2.24 cycle
28014c1084 Merge branch 'bc/hash-independent-tests-part-6'
57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree'
c22f63c40f Merge branch 'pb/pretty-email-without-domain-part'
5731ca3657 Merge branch 'hw/remove-api-docs-placeholder'
14b58c62bc Merge branch 'sg/commit-graph-usage-fix'
eff313f8a7 Merge branch 'dl/apply-3way-diff3'
db806d7064 Merge branch 'sg/dir-trie-fixes'
f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix'
8f1119b988 Merge branch 'wb/midx-progress'
d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes'
0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges'
8f40d89783 Merge branch 'hv/bitshift-constants-in-blame'
d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head'
5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer'
b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc'
15d9f3dc66 Merge branch 'es/walken-tutorial'
026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor'
ed28358833 convert: use skip_iprefix() in validate_encoding()
89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding()
03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules
ae821ffe83 multimail: fix a few simple spelling errors
557c5895c2 sha1dc: fix trivial comment spelling error
aa74be316a Fix spelling errors in test commands
96c0caf5e3 Fix spelling errors in messages shown to users
4dc8b1c114 Fix spelling errors in names of tests
7a40cf1553 Fix spelling errors in comments of testcases
15beaaa3d1 Fix spelling errors in code comments
a807200f67 userdiff: add Elixir to supported userdiff languages
461caf3e8a git-shortlog.txt: include commit limiting options
6462d5eb9a fetch: remove fetch_if_missing=0
46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion
99b2ba35f5 t0028: eliminate non-standard usage of printf
add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul`
14c4776d75 t: fix typo in test descriptions
270de6acbe t6024: modernize style
77363a51fb name-hash.c: remove duplicate word in comment
c92faa4d22 hashmap: fix documentation misuses of -> versus .
a6d39f2efb git-filter-branch.txt: correct argument name typo
4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators
8915297925 Fix spelling errors in documentation outside of Documentation/
031fd4b93b Documentation: fix a bunch of typos, both old and new
dd0b61f577 fsmonitor: fix watchman integration
5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare()
7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph
c14e6e7903 fetch: add the command-line option `--write-commit-graph`
da72936f54 Git 2.24
1d34d425d4 Merge branch 'bc/doc-use-docbook-5'
dac1d83c91 Merge branch 'ds/commit-graph-on-fetch'
c32ca691c2 Merge branch 'jt/delay-fetch-if-missing'
ab6b50e4c8 Merge https://github.com/prati0100/git-gui
93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po
a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2
fe28ad8520 rebase: add --reset-author-date
08187b4cba rebase -i: support --ignore-date
0185c683c9 sequencer: rename amend_author to author_to_rename
cbd8db17ac rebase -i: support --committer-date-is-author-date
c068bcc59b sequencer: allow callers of read_author_script() to ignore fields
ba51d2fb24 rebase -i: add --ignore-whitespace flag
3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower
3ada78de3f myfirstcontrib: add dependency installation step
4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt
4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly
8dfb04ae96 update-index: optionally leave skip-worktree entries alone
116d1fa6c6 vreportf(): avoid relying on stdio buffering
efd5444238 RelNotes/2.24.0: fix self-contradictory note
391c7e40b5 fetch.c: fix typo in a warning message
55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template
849e43680d RelNotes/2.24.0: typofix
0115e5d929 git-diff.txt: document return code of `--no-index`
798d66e35d l10n: de.po: Update German translation
c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u)
f21f8f5d35 Git 2.24-rc2
8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix'
0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix'
f2db52c46b Merge branch 'js/mingw-needs-hiding-fix'
5b7594abdc Merge branch 'master' of github.com:vnwildman/git
034d33653a Merge branch 'next' of github.com:ChrisADR/git-po
26b061007c submodule: teach set-url subcommand
460782b7be t7519-status-fsmonitor: improve comments
d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses
4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config
1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694)
f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0
762d5b4f46 help: add gitsubmodules to the list of guides
76a53d640f git_path(): handle `.lock` files correctly
3ce47211a6 t1400: wrap setup code in test case
44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string
6c02042139 clone: rename static function `dir_exists()`.
8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command
77200e9332 l10n: es: 2.24.0 round 2
e42df36b42 Merge branch 'l10n/it/update-italian-translation'
5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2
51728480fe l10n: fr v2.24.0 rnd2
045a548698 l10n: git.pot: v2.24.0 round 2 (1 new)
468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master
b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree()
c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit()
103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag()
f648ee7088 fsck: rename vague "oid" local variables
cc579000bf fsck: don't require an object struct in verify_headers()
7854399366 fsck: don't require an object struct for fsck_ident()
b8b00f1693 fsck: drop blob struct from fsck_finish()
6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob()
38370253fd fsck: don't require an object struct for report()
f59793763d fsck: only require an oid for skiplist functions
5afc4b1dc6 fsck: only provide oid/type in fsck_error callback
82ef89b318 fsck: don't require object structs for display functions
733902905d fsck: use oids rather than objects for object_name API
d40bbc109b fsck_describe_object(): build on our get_object_name() primitive
a59cfb3230 fsck: unify object-name code
23a173a761 fsck: require an actual buffer for non-blobs
2175a0c601 fsck: stop checking tag->tagged
ec65231571 fsck: stop checking commit->parent counts
1de6007d85 fsck: stop checking commit->tree value
228c78fbd4 commit, tag: don't set parsed bit for parse failures
60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()`
8b656572ca builtin/commit-graph.c: remove subcommand-less usage string
fa26d5ede6 t4048: abstract away SHA-1-specific constants
cf02be8486 t4045: make hash-size independent
38ee26b2a3 t4044: update test to work with SHA-256
37ab8ebef1 t4039: abstract away SHA-1-specific constants
0370b35414 t4038: abstract away SHA-1 specific constants
0253e126a2 t4034: abstract away SHA-1-specific constants
45e2ef2b1d t4027: make hash-size independent
79b0edc1a0 t4015: abstract away SHA-1-specific constants
840624ff55 t4011: abstract away SHA-1-specific constants
32a6707267 t4010: abstract away SHA-1-specific constants
440bf91dfa t3429: remove SHA1 annotation
0b408ca2bd t1305: avoid comparing extensions
2eabd38313 rev-parse: add a --show-object-format option
52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode
45e206f0d8 t4203: use test-lib.sh definitions
2ae4944aac t6006: use test-lib.sh definitions
cb99a34e23 commit-graph: fix writing first commit-graph during fetch
e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug
7b4fb434b4 documentation: remove empty doc files
566a1439f6 Git 2.24-rc1
04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix'
4d6fb2beeb Merge branch 'ds/feature-macros'
5f0b6ed907 Merge branch 'js/azure-ci-osx-fix'
c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs'
1b4f85285f Merge branch 'dl/submodule-set-branch'
c7aadccba0 fetch: delay fetch_if_missing=0 until after config
c11e9966cb repo-settings: read an int for index.version
091489d068 apply: respect merge.conflictStyle in --3way
aa76ae4905 t4108: demonstrate bug in apply
95806205cd t4108: use `test_config` instead of `git config`
b0069684d4 t4108: remove git command upstream of pipe
fa87b81385 t4108: replace create_file with test_write_lines
7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job
6c96630cb0 config: move documentation to config.h
d81542e6f3 Eleventh batch
e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix'
d45d771978 Merge branch 'bc/smart-http-atomic-push'
22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix'
2e215b7959 Merge branch 'sb/userdiff-dts'
e3cf08361a Merge branch 'sg/progress-fix'
b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix'
c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc'
f45f88b2e4 path.c: don't call the match function without value in trie_find()
c72fc40d09 path.c: clarify two field names in 'struct common_dir'
8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file
7cb8c929d7 path.c: clarify trie_find()'s in-code comment
e536b1fedf Documentation: mention more worktree-specific exceptions
680cba2c2b multi-pack-index: add [--[no-]progress] option.
64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack
ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file
8dc18f8937 midx: add progress to expire_midx_packs
840cef0c70 midx: add progress to write_midx_file
efbc3aee08 midx: add MIDX_PROGRESS flag
0eb3671ed9 ci(osx): use new location of the `perforce` cask
da1e295e00 t604[236]: do not run setup in separate tests
49b8133a9e merge-recursive: fix merging a subdirectory into the root directory
d3eebaad5e merge-recursive: clean up get_renamed_dir_portion()
80736d7c5e doc: am --show-current-patch gives an entire e-mail message
a8e2c0eadc t7419: change test_must_fail to ! for grep
19c29e538e t4014: make output-directory tests self-contained
12a4aeaad8 Merge branch 'js/azure-pipelines-msvc'
399c23c046 ci(visual-studio): actually run the tests in parallel
711cd6d15c ci(visual-studio): use strict compile flags, and optimization
370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0
cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master
907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master
13bcea8c7f l10n: fr 2.24.0 rnd 1
135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master
3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed)
8da56a4848 userdiff: fix some corner cases in dts regex
86795774bb builtin/blame.c: constants into bit shift format
feebd2d256 rebase: hide --preserve-merges option
0e40a73a4c Doc: Bundle file usage
78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error
12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error
c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error
2b6f6ea1bd test-progress: fix test failures on big-endian systems
f757409e36 l10n: bg.po: Updated Bulgarian translation (4693)
176f5adfdb completion: clarify installation instruction for zsh
d966095db0 Git 2.24-rc0
90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array'
3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth'
d0258d0944 Merge branch 'rs/http-push-simplify'
bb52def6da Merge branch 'jj/stash-reset-only-toplevel'
f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs'
e5fca6b573 Merge branch 'bb/compat-util-comment-fix'
43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup'
07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely'
2d74d28ee0 Merge branch 'dl/compat-cleanup'
9b83a94829 Merge branch 'ta/t1308-typofix'
376012c919 Merge branch 'js/doc-stash-save'
10da030ab7 grep: avoid leak of chartables in PCRE2
513f2b0bbd grep: make PCRE2 aware of custom allocator
57d4660468 grep: make PCRE1 aware of custom allocator
d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand
8af69cf3e2 t3301: test diagnose messages for too few/many paramters
6f1194246a remote-curl: pass on atomic capability to remote side
bbb13e8188 graph: fix coloring of octopus dashes
92beecc136 graph: flatten edges that fuse with their right neighbor
479db18bc0 graph: smooth appearance of collapsing edges on commit lines
0195285b95 graph: rename `new_mapping` to `old_mapping`
d62893ecc1 graph: commit and post-merge lines for left-skewed merges
0f0f389f12 graph: tidy up display of left-skewed merges
458152cce1 graph: example of graph output that can be simplified
ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state
46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()`
a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()`
9157a2a032 graph: reuse `find_new_column_by_commit()`
210179a20d graph: handle line padding in `graph_next_line()`
fbccf255f9 graph: automatically track display width of graph lines
5374a290aa fetch-pack: write fetched refs to .promisor
4627bc777e sequencer: run post-commit hook
49697cb721 move run_commit_hook() to libgit and use it there
12bb7a540a sequencer.h fix placement of #endif
6a619ca03c t3404: remove uneeded calls to set_fake_editor
b2dbacbddf t3404: set $EDITOR in subshell
88a92b6c73 t3404: remove unnecessary subshell
bf8e65b30b format-patch: teach --cover-from-description option
a92331df18 format-patch: use enum variables
46273df7bf format-patch: replace erroneous and condition
3b3c79f6c9 diff-highlight: fix a whitespace nit
108b97dc37 Ninth batch
cbe8cdd3a0 Merge branch 'jk/coc'
3b9ec27919 Merge branch 'js/trace2-fetch-push'
c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch'
1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup'
eb3de5b823 Merge branch 'js/xdiffi-comment-updates'
4e8371ec26 Merge branch 'dl/t0000-skip-test-test'
b6d712fa4e Merge branch 'tg/range-diff-output-update'
77458870a5 Merge branch 'gs/sq-quote-buf-pretty'
5efabc7ed9 Merge branch 'ew/hashmap'
d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files'
6ed610b968 Merge branch 'am/t0028-utf16-tests'
5b900fb812 Merge branch 'dl/octopus-graph-bug'
16d9d7184b Merge branch 'en/fast-imexport-nested-tags'
6d5291be45 Merge branch 'js/azure-pipelines-msvc'
ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd'
d96e31e390 Merge branch 'js/fetch-jobs'
280bd44551 Merge branch 'en/merge-recursive-cleanup'
062a309d36 remote-curl: use argv_array in parse_push()
a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes
5cc6a4be11 http-push: simplify deleting a list item
556895d0c8 stash: avoid recursive hard reset on submodules
b524f6b399 Merge branch 'ka/japanese-translation'
f6f3824b4e git-gui: improve Japanese translation
61f4b407d3 Merge branch 'py/readme'
1e6880fd06 git-gui: add a readme
edefc31873 format-patch: create leading components of output directory
68b69211b2 git-compat-util: fix documentation syntax
fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth()
e0479fa073 documentation: add tutorial for object walking
3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed
4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target
9cad1c4488 pthread.h: manually align parameter lists
8c1cfd58e3 t1308-config-set: fix a test that has a typo
57d8f4b4c7 doc(stash): clarify the description of `save`
08da6496b6 Eighth batch
07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup'
f0d407e6ae Merge branch 'kt/add-i-progress'
66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree'
a4c5d9f66e Merge branch 'rs/dedup-includes'
159cdabd87 Merge branch 'js/range-diff-noprefix'
93424f1f7d Merge branch 'cb/pcre1-cleanup'
a73f91774c Merge branch 'ab/pcre-jit-fixes'
4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword'
020011f2cb Merge branch 'tk/git-svn-trim-author-name'
676278f8ea Merge branch 'bc/object-id-part17'
aafb75452b Merge branch 'en/clean-nested-with-ignored'
3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails
5cdf2301d4 add a Code of Conduct document
70bf0b755a Seventh batch
9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat'
2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary'
d17f54947d Merge branch 'rs/convert-fix-utf-without-dash'
82c80f98e6 Merge branch 'py/git-gui-has-maintainer'
6e12570822 Merge branch 'ah/cleanups'
772cad0afb Merge branch 'js/diff-rename-force-stable-sort'
424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path'
678a9ca629 Merge branch 'as/shallow-slab-use-fix'
0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix'
042a54d251 Merge branch 'am/visual-studio-config-fix'
03d3b1297c xdiffi: fix typos and touch up comments
b05b40930e t0000: cover GIT_SKIP_TESTS blindspots
d8bc1a518a send-pack: never fetch when checking exclusions
756fb0dedb t4014: treat rev-list output as the expected value
2b6a9b13ca range-diff: don't segfault with mode-only changes
360c7ba330 transport: push codepath can take arbitrary repository
ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments
b657047719 merge-recursive: fix the fix to the diff3 common ancestor label
b744c3af07 Sixth batch
417056578a Merge branch 'bw/submodule-helper-usage-fix'
9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check'
1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a'
59b19bcd9f Merge branch 'cc/multi-promisor'
1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way'
5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort'
eb35c18e42 Merge branch 'sg/travis-help-debug'
cabb145fe3 Merge branch 'rs/alias-use-copy-array'
56c7ab0f4e Merge branch 'sg/t-helper-gitignore'
e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang'
583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules'
337e3f2b49 Merge branch 'rs/nth-switch-code-simplification'
8f53fe1733 Merge branch 'hb/hg-to-git-py3'
ef93bfbd45 Merge branch 'sg/progress-fix'
980351d1ac Merge branch 'js/doc-patch-text'
80693e3f09 Merge branch 'tb/commit-graph-harden'
ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge'
3f84633563 Merge branch 'dl/cocci-everywhere'
caf150ce7d Merge branch 'gs/commit-graph-progress'
1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim'
1398171378 Merge branch 'rs/commit-graph-use-list-count'
773521df26 Merge branch 'rs/nth-parent-parse'
7f17913161 Merge branch 'dl/submodule-set-branch'
cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix'
bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees'
098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack'
37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc'
e392382f95 Merge branch 'dl/complete-rebase-and-archive'
cda8faa37e Merge branch 'jk/commit-graph-cleanup'
36d2fca82b Merge branch 'ss/get-time-cleanup'
ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude'
ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob'
ba2d451122 Merge branch 'tg/stash-refresh-index'
e2b5038d87 hashmap_entry: remove first member requirement from docs
404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry
23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators
c8e424c9c9 hashmap: introduce hashmap_free_entries
8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry *
87571c3f71 hashmap: use *_entry APIs for iteration
939af16eac hashmap_cmp_fn takes hashmap_entry params
f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *"
f0e63c4113 hashmap: use *_entry APIs to wrap container_of
6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *"
973d5eea74 introduce container_of macro
26b455f21e hashmap_put takes "struct hashmap_entry *"
28ee794128 hashmap_remove takes "const struct hashmap_entry *"
b6c5241606 hashmap_get takes "const struct hashmap_entry *"
b94e5c1df6 hashmap_add takes "struct hashmap_entry *"
f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *"
d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *"
d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry
12878c8351 coccicheck: detect hashmap_entry.hash assignment
e010a41216 diff: use hashmap_entry_init on moved_entry.ent
f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo"
de5abb5f7a git-p4: auto-delete named temporary file
c90b652afd Fifth batch
f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1'
b0f8aed48f Merge branch 'ma/user-manual-markup-update'
faf5576a8d Merge branch 'bc/doc-use-docbook-5'
314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes'
70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo'
847650798b Merge branch 'am/mailmap-andrey-mazo'
1a155f2e66 Merge branch 'jc/git-gui-has-maintainer'
1bcef51204 t/oid-info: add empty tree and empty blob values
ecde49bb8a t/oid-info: allow looking up hash algorithm name
11a3d3aadd git-rev-list.txt: prune options in synopsis
7d2f003ee4 Documentation: update the location of the git-gui repo
b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding()
46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines
b35304bf95 ci: really use shallow clones on Azure Pipelines
ab7d854aba tests: let --immediate and --write-junit-xml play well together
be5d88e112 test-tool run-command: learn to run (parts of) the testsuite
5d65ad17a9 vcxproj: include more generated files
030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built
61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable()
e4347c9434 msvc: handle DEVELOPER=1
ed712ef8d5 msvc: ignore some libraries when linking
5b8f9e2417 compat/win32/path-utils.h: add #include guards
41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning
c097b95a26 msvc: avoid using minus operator on unsigned types
dfd557c978 stash apply: report status correctly even in a worktree's subdirectory
d54dea77db fetch: let --jobs=<n> parallelize --multiple, too
87db61a436 trace2: write discard message to sentinel files
83e57b04e6 trace2: discard new traces if target directory has too many files
11c21f22de t4214: demonstrate octopus graph coloring failure
25eb905e14 t4214: explicitly list tags in log
63be8c8dd7 t4214: generate expect in their own test cases
a7a5590c6e t4214: use test_merge
94ba151300 test-lib: let test_merge() perform octopus merges
22541013d0 docs: clarify trace2 version invariants
3d4548e7e2 docs: mention trace2 target-dir mode in git-config
2fe44394c8 treewide: remove duplicate #include directives
dbcd970c27 push: do not pretend to return `int` from `die_push_simple()`
941790d7de fast-export: handle nested tags
8d7d33c1ce t9350: add tests for tags of things other than a commit
a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags
208d69246e fast-export: add support for --import-marks-if-exists
b8f50e5b60 fast-import: add support for new 'alias' command
f73b2aba05 fast-import: allow tags to be identified by mark labels
3164e6bd24 fast-import: fix handling of deleted tags
8085050ab4 add -i: show progress counter in the prompt
69fdb922ad Merge branch 'bw/diff3-conflict-style'
b436825b9b git-gui: support for diff3 conflict style
937b76ed49 range-diff: internally force `diff.noprefix=true`
411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job
25e4b8099c push: add trace2 instrumentation
5fc31180d8 fetch: add trace2 instrumentation
53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value
c3b57dc2a0 git-gui: use existing interface to query a path's attribute
45ab460d4a Merge branch 'js/git-bash-if-available'
0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command
71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only)
54a80a9ad8 wrapper: use a loop instead of repetitive statements
baed6bbb5b diffcore-break: use a goto instead of a redundant if statement
8da02ce62a commit-graph: remove a duplicate assignment
ddb3c856f3 shallow.c: don't free unallocated slabs
8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits
65904b8b2b promisor-remote: skip move_to_tail when no-op
2049b8dc65 diffcore_rename(): use a stable sort
97fff61012 Move git_sort(), a stable sort, into into libgit.a
69f272b922 dir: special case check for the possibility that pathspec is NULL
6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available
bc12974a89 Fourth batch
5a5350940b Merge branch 'ds/commit-graph-on-fetch'
974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch'
9755f70fe6 Merge branch 'ds/include-exclude'
93fc8760e7 Merge branch 'jh/trace2-pretty-output'
640f9cd599 Merge branch 'dl/rebase-i-keep-base'
026428c35e Merge branch 'sg/clean-nested-repo-with-ignored'
21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip'
d693345518 Merge branch 'dl/use-sq-from-test-lib'
d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes'
2be6ccc01a Merge branch 'sg/git-test-boolean'
cf861cd7a0 Merge branch 'rs/get-tagged-oid'
91243b019d Merge branch 'en/filter-branch-deprecation'
9bc67b6658 Merge branch 'en/merge-options-ff-and-friends'
fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden'
cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option'
8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return'
3ff6af7753 Merge branch 'nd/switch-and-restore'
aadac067aa Merge branch 'tb/file-url-to-unc-path'
b57a88a5f1 Merge branch 'js/gitdir-at-unc-root'
6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path'
430439536b Merge branch 'rs/parse-tree-indirect'
991fd97b9a Merge branch 'jk/fast-import-history-bugfix'
74a39b9bcc Merge branch 'mh/notes-duplicate-entries'
37801f0665 Merge branch 'tb/banned-vsprintf-namefix'
21ce0b48f3 Merge branch 'mh/release-commit-memory-fix'
f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup'
bf6136cab8 Merge branch 'rs/strbuf-detach'
a2e22bb3ad Merge branch 'rs/trace2-dst-warning'
1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup'
0281733483 Merge branch 'bc/hash-independent-tests-part-5'
f06fb376ed Merge branch 'jc/test-cleanup'
00bb74453d Merge branch 'dl/compat-cleanup'
59438be06c Merge branch 'js/visual-studio'
cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone'
af2abd870b fast-export: fix exporting a tag and nothing else
c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor
dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit
fd5b820d9c user-manual.txt: change header notation
e79b34533a user-manual.txt: add missing section label
b503a2d515 Makefile: emulate compile in $(HCO) target better
af26e2a9d2 pack-bitmap.h: remove magic number
b06fdead04 promisor-remote.h: include missing header
97b989ee3a apply.h: include missing header
4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name
d928a8388a t0028: add more tests
0b63fd6965 t0028: fix test for UTF-16-LE-BOM
fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration
2e09c01232 name-rev: avoid cutoff timestamp underflow
8464f94aeb promisor-remote.h: drop extern from function declaration
75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp
24c681794f doc: MyFirstContribution: fix cmd placement instructions
c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode
60c60b627e Merge branch 'py/git-git-extra-stuff'
faf420e05a treewide: correct several "up-to-date" to "up to date"
b71c6c3b64 Fix build with core.autocrlf=true
16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff
26e3d1cbea .mailmap: update email address of Andrey Mazo
27ea41c0b4 t/helper: ignore only executable files
7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()
83e3ad3b12 merge-recursive: symlink's descendants not in way
34933d0eff stash: make sure to write refreshed cache
e080b34540 merge: use refresh_and_write_cache
22184497a3 factor out refresh_and_write_cache function
7371612255 commit-graph: add --[no-]progress to write and verify
47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW
253bfe49bd SubmittingPatches: git-gui has a new maintainer
d17ae00c97 hg-to-git: make it compatible with both python3 and python2
4c86140027 Third batch
f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http'
627b826834 Merge branch 'md/list-objects-filter-combo'
b9ac6c59b8 Merge branch 'cc/multi-promisor'
de67293e74 Merge branch 'sg/line-log-tree-diff-optim'
95486229e3 Merge branch 'sg/complete-configuration-variables'
f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook'
a2e524ecf3 Merge branch 'cb/curl-use-xmalloc'
128666753b Merge branch 'jk/drop-release-pack-memory'
917a319ea5 Merge branch 'js/rebase-r-strategy'
7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui
4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout()
0d4304c124 doc: fix reference to --ignore-submodules
af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py
8a3a6817e2 Merge gitk to pick up emergency build fix
2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po
9027af58e2 Makefile: run coccicheck on more source files
43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES)
5dedf7de53 Makefile: define THIRD_PARTY_SOURCES
902b90cf42 clean: fix theoretical path corruption
ca8b5390db clean: rewrap overly long line
09487f2cba clean: avoid removing untracked files in a nested git repository
e86bbcf987 clean: disambiguate the definition of -d
3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run
29b577b960 dir: add commentary explaining match_pathspec_item's return value
89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it
a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case
404ebceda0 dir: also check directories for matching pathspecs
a5e916c745 dir: fix off-by-one error in match_pathspec_item
bbbb6b0b89 dir: fix typo in comment
7541cc5302 t7300: add testcases showing failure to clean specified pathspecs
0eb7c37a8a diff, log doc: small grammer, format, and language fixes
6fae6bd518 diff, log doc: say "patch text" instead of "patches"
2bb74b53a4 Test the progress display
bbf47568ad Revert "progress: use term_clear_line()"
cf6a2d2557 Makefile: strip leading ./ in $(LIB_H)
b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup
689a146c91 commit-graph: use commit_list_count()
59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N"
a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N"
a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base"
cf34337f98 list-objects-filter: give a more specific error sparse parsing error
4c96a77594 list-objects-filter: delay parsing of sparse oid
72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter
83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer
7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>`
226daba280 Doc/Makefile: give mansource/-version/-manual attributes
40e747e89d git-submodule.txt: fix AsciiDoc formatting error
f6461b82b9 Documentation: fix build with Asciidoctor 2
3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
f7a8834ba4 Merge branch 'bp/amend-toggle-bind'
ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit"
9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes
d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog
beffae768a gitk: Add Chinese (zh_CN) translation
56d9cbe68b packfile: expose get_delta_base()
bab28d9f97 builtin/pack-objects: report reused packfile objects
6c8ec8c30a Merge branch 'bw/commit-scrollbuffer'
acfa495519 Merge branch 'bw/amend-checkbutton'
da08d559b7 git-gui: add horizontal scrollbar to commit buffer
ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton
aeeb978ba6 completion: teach archive to use __gitcomp_builtin
2b9bd488ae completion: teach rebase to use __gitcomp_builtin
d49dffde9a completion: add missing completions for log, diff, show
6abada1880 upload-pack: disable commit graph more gently for shallow traversal
fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time
72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set
4fd39c76e6 doc: minor formatting fix
29f4332e66 Quit passing 'now' to date code
c77abf0460 Merge branch 'py/revert-hunks-lines'
5a2bb62180 Merge branch 'bp/widget-focus-hotkeys'
e07446ed5f git-gui: add hotkeys to set widget focus
f981ec18cf cache-tree: do not lazy-fetch tentative tree
f1d4a28250 Second batch
c8ada15456 Merge branch 'bc/reread-attributes-during-rebase'
8f3ba423e7 Merge branch 'tg/t0021-racefix'
a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email'
d49c2c3466 Merge branch 'sb/userdiff-dts'
2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe'
4c49dd042d Merge branch 'nd/diff-parseopt'
d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix'
8ce8a63b46 Merge branch 'ds/midx-expire-repack'
9437394661 Merge branch 'cb/fetch-set-upstream'
af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix'
fa9e7934c7 Merge branch 'bm/repository-layout-typofix'
d1a251a1fa Merge branch 'en/checkout-mismerge-fix'
e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental'
f4f8dfe127 Merge branch 'ds/feature-macros'
4a12f89865 Merge branch 'jk/eoo'
b4a1eec332 Merge branch 'jk/repo-init-cleanup'
70336bd50a Merge branch 'py/git-gui-do-quit'
ad7c543e3b grep: skip UTF8 checks explicitly
0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration()
b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration
4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor
b7e1ba5649 git-merge-index.txt: wrap shell listing in "----"
38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----"
5371813768 git-ls-remote.txt: wrap shell listing in "----"
1925fe0c8a Documentation: wrap config listings in "----"
922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor
2017956a19 Documentation: wrap blocks with "--"
dd2e50a84e commit-graph: turn off save_commit_buffer
67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits
806278dead commit-graph.c: handle corrupt/missing trees
16749b8dd2 commit-graph.c: handle commit parsing errors
23424ea759 t/t5318: introduce failing 'git commit-graph write' tests
bf1e28e0ad builtin/rebase.c: Remove pointless message
d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing
bd482d6e33 t: use common $SQ variable
3a37876b5d pack-objects: drop packlist index_pos optimization
7e6b96c73b test-read-cache: drop namelen variable
e4b369069e diff-delta: set size out-parameter to 0 for NULL delta
7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint
f1cbd033e2 pack-objects: use object_id in packlist_alloc()
0dfed92dfd git-am: handle missing "author" when parsing commit
3960290675 ci: restore running httpd tests
6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests
c77722b3ea use get_tagged_oid()
dad3f0607b tag: factor out get_tagged_oid()
468ce99b77 unpack-trees: rename 'is_excluded_from_list()'
65edd96aec treewide: rename 'exclude' methods to 'pattern'
4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_'
caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list'
ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern'
483e861111 t9902: use a non-deprecated command for testing
9df53c5de6 Recommend git-filter-repo instead of git-filter-branch
7b6ad97939 t6006: simplify, fix, and optimize empty message test
50094ca45f config/format.txt: specify default value of format.coverLetter
c1a6f21cd4 Doc: add more detail for git-format-patch
854b5cb46a t4014: stop losing return codes of git commands
dd2b6b6860 t4014: remove confusing pipe in check_threading()
6bd26f58ea t4014: use test_line_count() where possible
c6ec6dadba t4014: let sed open its own files
f2e2fa8f60 t4014: drop redirections to /dev/null
460609cbd5 t4014: use indentable here-docs
92014b69bb t4014: remove spaces after redirect operators
0ab74e979c t4014: use sq for test case names
cb46c40662 t4014: move closing sq onto its own line
b562a54c01 t4014: s/expected/expect/
e770fbfeff t3005: remove unused variable
da280f5f1a t: use LF variable defined in the test harness
7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch
552fc5016f mingw: apply array.cocci rule
476998d05b t3427: accelerate this test by using fast-export and fast-import
aac6ff7b5b .gitignore: stop ignoring `.manifest` files
2c65d90f75 am: reload .gitattributes after patching it
1577dc0f7c tree: simplify parse_tree_indirect()
50f26bd035 fetch: add fetch.writeCommitGraph config setting
8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set
27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options
0a8bc7068f clarify documentation for remote helpers
80e3658647 help: make help_unknown_ref() NORETURN
313677627a checkout: add simple check for 'git checkout -b'
3441de5b9c gitk: Make web links clickable
a4fa2f0a4c git-gui: allow undoing last revert
414d924beb rebase: teach rebase --keep-base
6330209d7d rebase tests: test linear branch topology
4effc5bc96 rebase: fast-forward --fork-point in more cases
c0efb4c1dd rebase: fast-forward --onto in more cases
2b318aa6c3 rebase: refactor can_fast_forward into goto tower
c9efc21683 t3432: test for --no-ff's interaction with fast-forward
1ebec8dfc1 fast-import: duplicate into history rather than passing ownership
9756082b3c fast-import: duplicate parsed encoding string
86ae43da6a status: mention --skip for revert and cherry-pick
b1b16bba96 completion: add --skip for cherry-pick and revert
deaa65a754 completion: merge options for cherry-pick and revert
4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
793ac7e309 t3432: test rebase fast-forward behavior
359ecebc34 t3431: add rebase --fork-point tests
502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage
ff61681b46 grep: refactor and simplify PCRE1 support
8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1
1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning()
fd99c2dd9b grep: use return value of strbuf_detach()
82f51af345 log-tree: always use return value of strbuf_detach()
7e92756751 http: don't leak urlmatch_config.vars
9784f97321 commit: free the right buffer in release_commit_memory
ce17feb1b3 path: add a function to check for path suffix
60d198d022 banned.h: fix vsprintf()'s ban message
60fe477a0b notes: avoid potential use-after-free during insertion
779ad6641b notes: avoid leaking duplicate entries
4e1a641ee3 mingw: fix launching of externals from Unicode paths
5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly
e2683d51d9 Fix .git/ discovery at the root of UNC shares
d17f2124a7 setup_git_directory(): handle UNC paths correctly
ebb8d2c90f mingw: support UNC in git clone file://server/share/repo
0c37c41d13 t4009: make hash size independent
c1f3dfcc23 t4002: make hash independent
8cc5ff83c3 t4000: make hash size independent
c784815073 t3903: abstract away SHA-1-specific constants
2ccdfb1c78 git-gui: return early when patch fails to apply
62bd99934b git-gui: allow reverting selected hunk
5f0a516de9 git-gui: allow reverting selected lines
fddf2ebe38 transport: teach all vtables to allow fetch first
ac3fda82bf transport-helper: skip ls-refs if unnecessary
745f681289 First batch after Git 2.23
d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg'
22e86e85cb Merge branch 'en/fast-import-merge-doc'
9c7573581c Merge branch 'jk/perf-no-dups'
4336fdb2ef Merge branch 'rs/nedalloc-fixlets'
8ae7a46c4d Merge branch 'sg/show-failed-test-names'
6ba06b582b Merge branch 'sg/commit-graph-validate'
072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix'
207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix'
77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests'
1b01cdbf2e Merge branch 'jk/tree-walk-overflow'
8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix'
307179732d Merge branch 'mt/grep-submodules-working-tree'
58166c2e9d t0021: make sure clean filter runs
8b3f33ef11 ref-filter: initialize empty name or email fields
3c81760bc6 userdiff: add a builtin pattern for dts files
fe49814409 t4014: drop unnecessary blank lines from test cases
a2bb801f6a line-log: avoid unnecessary full tree diffs
eef5204190 line-log: extract pathspec parsing from line ranges into a helper function
a63694f523 diff: skip GITLINK when lazy fetching missing objs
7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe
19800bdc3f parseopt: move definition of enum parse_opt_result up
415b770b88 packfile.h: drop extern from function declaration
acb49d1cc8 t3800: make hash-size independent
ca6ba94200 t3600: make hash size independent
19ce5496c2 t3506: make hash independent
9a6738c061 t3430: avoid hard-coded object IDs
4dd1b5f90f t3404: abstract away SHA-1-specific constants
b99bfc7a6c t3306: abstract away SHA-1-specific constants
e3e9d02e35 t3305: make hash size independent
b408cf8cf6 t3301: abstract away SHA-1-specific constants
b561edd213 t3206: abstract away hash size constants
a5f61c7d13 t3201: abstract away SHA-1-specific constants
1c24a54ea4 repository-layout.txt: correct pluralization of 'object'
b0a3186140 sequencer: simplify root commit creation
a47ba3c777 rebase -i: check for updated todo after squash and reword
450efe2d53 rebase -i: always update HEAD before rewording
c581e4a749 grep: under --debug, show whether PCRE JIT is enabled
aaa95dfa05 midx: switch to using the_hash_algo
be8e172e9f builtin/show-index: replace sha1_to_hex
3f34d70d40 rerere: replace sha1_to_hex
fc06be3b7f builtin/receive-pack: replace sha1_to_hex
69fa337060 builtin/index-pack: replace sha1_to_hex
3a4d7aa5ae packfile: replace sha1_to_hex
e0cb7cdb89 wt-status: convert struct wt_status to object_id
8d4d86b0f0 cache: remove null_sha1
f6ca67d673 builtin/worktree: switch null_sha1 to null_oid
dd336a5511 builtin/repack: write object IDs of the proper length
894c0f66bb pack-write: use hash_to_hex when writing checksums
4439c7a360 sequencer: convert to use the_hash_algo
95518faac1 bisect: switch to using the_hash_algo
e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo
fe9fec45f6 config: use the_hash_algo in abbrev comparison
976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
703d2d4193 bundle: switch to use the_hash_algo
9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo
7962e046ff show-index: switch hard-coded constants to the_hash_algo
fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ
7e0d029f18 builtin/rev-parse: switch to use the_hash_algo
319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo
fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo
f6af19a9ad fetch-pack: use parse_oid_hex
36261e42ec patch-id: convert to use the_hash_algo
28ba1830d0 builtin/replace: make hash size independent
24bc1a1292 pull, fetch: add --set-upstream option
71d41ff651 archive-tar: turn length miscalculation warning into BUG
17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header()
82a46af13e archive-tar: fix pax extended header length calculation
4060c1990a archive-tar: report wrong pax extended header length
4615a8cb5b merge-recursive: alphabetize include list
45ef16f77a merge-recursive: add sanity checks for relevant merge_options
f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
5bf7e5779e merge-recursive: split internal fields into a separate struct
e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output
a779fb829b merge-recursive: comment and reorder the merge_options fields
8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options
7c0a6c8e47 merge-recursive: move some definitions around to clean up the header
c749ab1da8 merge-recursive: rename merge_options argument to opt in header
bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity
ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list
4d7101e25c merge-recursive: fix some overly long lines
724dd767b2 cache-tree: share code between functions writing an index as a tree
345480d1ed merge-recursive: don't force external callers to do our logging
b4db8a2b76 merge-recursive: remove useless parameter in merge_trees()
98a1d3d888 merge-recursive: exit early if index != head
9822175d2b Ensure index matches head before invoking merge machinery, round N
10f751c06b merge-recursive: remove another implicit dependency on the_repository
f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks
8e01251694 merge-recursive: introduce an enum for detect_directory_renames values
743474cbfa merge-recursive: provide a better label for diff3 common ancestor
51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u)
5bace62582 l10n: Update Catalan translation
139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()
65c01c6442 checkout: provide better conflict hunk description with detached HEAD
d8523ca1b9 merge-recursive: be consistent with assert
acb7da05ac checkout: remove duplicate code
93b980e58f http: use xmalloc with cURL
64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental
aaf633c2ad repo-settings: create feature.experimental setting
c6cc4c5afd repo-settings: create feature.manyFiles setting
ad0fb65999 repo-settings: parse core.untrackedCache
31b1de6a09 commit-graph: turn on commit-graph by default
b068d9a250 t6501: use 'git gc' in quiet mode
7211b9e753 repo-settings: consolidate some config settings
507e5470a0 worktree remove: clarify error message on dirty worktree
5af9d5f6c8 completion: complete config variables and values for 'git clone --config='
88cd790d6a completion: complete config variables names and values for 'git clone -c'
dd33472831 completion: complete values of configuration variables after 'git -c var='
e1e00089da completion: complete configuration sections and variable names for 'git -c'
42d0efec59 completion: split _git_config()
d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp()
2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names
d9438873c4 completion: deduplicate configuration sections
7a09a8f093 completion: add tests for 'git config' completion
840d7e5b3c completion: complete more values of more 'color.*' configuration variables
08a12175d8 completion: fix a typo in a comment
9827d4c185 packfile: drop release_pack_memory()
d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed
362f8b280c t/perf: rename duplicate-numbered test script
742ed63345 trace2: cleanup whitespace in perf format
e34430556c trace2: cleanup whitespace in normal format
c2b890aca5 quote: add sq_append_quote_argv_pretty()
ad43e37839 trace2: trim trailing whitespace in normal format error message
04f10d332f trace2: remove dead code in maybe_add_string_va()
da4589ce7e trace2: trim whitespace in region messages in perf target format
0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit
5440eb0ea2 git-gui: call do_quit before destroying the main window
bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook
6098817fd7 git-merge: honor pre-merge-commit hook
a1f3dd7eb3 merge: do no-verify like commit
f78f6c7e0c t7503: verify proper hook execution
70597e8386 nedmalloc: avoid compiler warning about unused value
c9b9c09dae nedmalloc: do assignments only after the declaration section
22932d9169 config: stop checking whether the_repository is NULL
5732f2b1ef common-main: delay trace2 initialization
58ebccb478 t1309: use short branch name in includeIf.onbranch test
67feca3b1c gitcli: document --end-of-options
51b4594b40 parse-options: allow --end-of-options as a synonym for "--"
19e8789b23 revision: allow --end-of-options to end option parsing
ffe1afe67c tests: show the test name and number at the start of verbose output
96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests
7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits'
39d8831856 commit-graph: turn a group of write-related macro flags into an enum
9916073be5 t5318-commit-graph: use 'test_expect_code'
620c09e1b6 restore: add test for deleted ita files
ecd72042de checkout.c: unstage empty deleted ita files
a613d4f817 pack-refs: always refresh after taking the lock file
decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd'
371df1bea9 trace2: cleanup column alignment in perf target format
5aa02f9868 tree-walk: harden make_traverse_path() length computations
c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path()
b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len()
37806080d7 tree-walk: use size_t consistently
7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh'
12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh'
9055384710 tree-walk: drop oid from traverse_info
947208b725 setup_traverse_info(): stop copying oid
e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
a63f990d92 t3418: test `rebase -r` with merge strategies
5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges`
e145d99347 rebase -r: support merge strategies other than `recursive`
4e6023b13a t3427: fix another incorrect assumption
f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced
a9c71073da t3427: fix erroneous assumption
b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three
d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case
c248d32cdb t3427: simplify the `setup` test case significantly
8c1e24048a t3427: add a clarifying comment
5efed0ecf9 rebase: fold git-rebase--common into the -p backend
68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone
2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive`
6180b20239 t3400: stop referring to the scripted rebase
d5b581f228 Drop unused git-rebase--am.sh
814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation
6a289d45c0 grep: fix worktree case in submodules
870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching
8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data
09872f6418 grep: create a "is_fixed" member in "grep_pat"
8a35b540a9 grep: consistently use "p->fixed" in compile_regexp()
685668faaa grep: stop using a custom JIT stack with PCRE v1
34489239d0 grep: stop "using" a custom JIT stack with PCRE v2
04bef50c01 grep: remove overly paranoid BUG(...) code
b65abcafc7 grep: use PCRE v2 for optimized fixed-string search
48de2a768c grep: remove the kwset optimization
45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern>
25754125ce grep: make the behavior for NUL-byte in patterns sane
d316af059d grep tests: move binary pattern tests into their own file
471dac5d2c grep tests: move "grep binary" alongside the rest
f463beb805 grep: inline the return value of a function call used only once
b14cf112e2 t4210: skip more command-line encoding tests on MinGW
44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
4e2443b181 log tests: test regex backends in "--encode=<enc>" tests
90d21f9ebf list-objects-filter-options: make parser void
5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW
489fc9ee71 list-objects-filter-options: allow mult. --filter
c2694952e3 strbuf: give URL-encoding API a char predicate fn
cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list
f56f764279 list-objects-filter-options: move error check up
e987df5fe6 list-objects-filter: implement composite filters
842b00516a list-objects-filter-options: always supply *errbuf
7a7c7f4a6d list-objects-filter: put omits set in filter struct
9430147ca0 list-objects-filter: encapsulate filter components
4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c
60b7a92d84 Move repository_format_partial_clone to promisor-remote.c
db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
75de085211 remote: add promisor and partial clone config to the doc
7e154badc0 partial-clone: add multiple remotes in the doc
9a4c507886 t0410: test fetching from many promisor remotes
5e46139376 builtin/fetch: remove unique promisor remote limitation
fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter
b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote()
faf2abf496 promisor-remote: use repository_format_partial_clone
9cfebc1f3b promisor-remote: add promisor_remote_reinit()
9e27beaa23 promisor-remote: implement promisor_remote_get_direct()
48de315817 Add initial support for many promisor remotes
2e860675b6 fetch-object: make functions return an error code
c59c7c879e t0410: remove pipes after git commands
git-subtree-dir: third_party/git
git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
2020-05-22 18:46:45 +02:00
|
|
|
#, c-format
|
2020-05-26 01:06:52 +02:00
|
|
|
msgid "invalid upstream '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1849
|
2020-05-26 01:06:52 +02:00
|
|
|
msgid "Could not create new root commit"
|
Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96
af6b65d45e Git 2.26.2
7397ca3373 Git 2.25.4
b86a4be245 Git 2.24.3
f2771efd07 Git 2.23.3
c9808fa014 Git 2.22.4
9206d27eb5 Git 2.21.3
041bc65923 Git 2.20.4
76b54ee9b9 Git 2.19.5
ba6f0905fd Git 2.18.4
df5be6dc3f Git 2.17.5
1a3609e402 fsck: reject URL with empty host in .gitmodules
e7fab62b73 credential: treat URL with empty scheme as invalid
c44088ecc4 credential: treat URL without scheme as invalid
fe29a9b7b0 credential: die() when parsing invalid urls
a2b26ffb1a fsck: convert gitmodules url to URL passed to curl
8ba8ed568e credential: refuse to operate when missing host or protocol
24036686c4 credential: parse URL without host as empty host, not unset
73aafe9bc2 t0300: use more realistic inputs
a88dbd2f8c t0300: make "quit" helper more realistic
de49261b05 Git 2.26.1
274b9cc253 Git 2.26
55a7568606 Merge branch 'en/rebase-backend'
c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git
1557364fb4 l10n: tr.po: change file mode to 644
2da1b05674 t3419: prevent failure when run with EXPENSIVE
1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0
5804c6ec40 l10n: de.po: add missing space
98cedd0233 Merge https://github.com/prati0100/git-gui
4914ba4bcf l10n: tr: Fix a couple of ambiguities
a5728022e0 Merge branch 'py/remove-tcloo'
7fcb965970 RelNotes/2.26.0: fix various typos
f0c03bcf95 l10n: Update Catalan translation
67b0a24910 Git 2.25.3
be8661a328 Sync with Git 2.25.2
0822e66b5d Git 2.25.2
65588b0b2e unicode: update the width tables to Unicode 13.0
7be274b0ff Merge branch 'js/ci-windows-update' into maint
9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint
221887a492 Merge branch 'jk/doc-credential-helper' into maint
32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint
fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint
618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint
50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint
fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint
41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint
2d7247af6f Merge branch 'am/mingw-poll-fix' into maint
4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint
76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint
569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint
16a4bf1035 Merge branch 'en/check-ignore' into maint
3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint
56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint
1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint
7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint
fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint
a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint
93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint
dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint
758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint
f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint
506223f9c5 Git 2.24.2
17a02783d8 Git 2.23.2
69fab82147 Git 2.22.3
fe22686494 Git 2.21.2
d1259ce117 Git 2.20.3
a5979d7009 Git 2.19.4
21a3e5016b Git 2.18.3
c42c0f1297 Git 2.17.4
d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u)
3891a84ccd git-gui: create a new namespace for chord script evaluation
8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5
440e7442d1 l10n: zh_CN: Revise v2.26.0 translation
2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2
6c85aac65f Git 2.26-rc2
74f172e39e Merge branch 'en/test-cleanup'
e96327c947 Merge branch 'es/outside-repo-errmsg-hints'
ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0
15fa8d9667 l10n: vi: fix translation + grammar
5c20398699 prefix_path: show gitdir if worktree unavailable
1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated)
c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated)
a4a2f64642 Merge branch 'js/askpass-coerce-utf8'
850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows
d769dcc5cd Merge branch 'py/blame-status-error'
70e24186c0 t6022, t6046: fix flaky files-are-updated checks
30e9940356 Hopefully the final batch before -rc2
b4f0038525 Merge branch 'en/rebase-backend'
25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master
07259e74ec fsck: detect gitmodules URLs with embedded newlines
c716fe4bd9 credential: detect unrepresentable values when parsing urls
17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr
9a6bbee800 credential: avoid writing values with newlines
17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2
1afe18a3bb l10n: es: 2.26.0 round#2
5ab9217a3c Merge branch of github.com:alshopov/git-po into master
c6713676d6 Merge branch of github.com:bitigchi/git-po into master
b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t)
2713dec02d l10n: tr: v2.26.0 round 2
c9ef57cc3a l10n: fr : v2.26.0 rnd 2
120b1eb731 git-rebase.txt: highlight backend differences with commit rewording
9a1b7474d6 sequencer: clear state upon dropping a become-empty commit
937d143630 i18n: unmark a message in rebase.c
a56d361f66 Merge branch 'ds/sparse-add'
5fa9169ced Merge branch 'dr/push-remote-ref-update'
cdef998b46 Merge branch 'jc/doc-single-h-is-for-help'
051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed)
52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master
9643441983 l10n: tr: Add glossary for Turkish translations
438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv
fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git
2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u)
dd2c269652 l10n: tr: Add Turkish translations
8f4f099f8b l10n: tr: Add Turkish translation team info
b4374e96c8 Git 2.26-rc1
4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch'
3658d77f8e Merge branch 'hd/show-one-mergetag-fix'
6125104b88 Merge branch 'rt/format-zero-length-fix'
1ac37deba2 Merge branch 'am/mingw-poll-fix'
cf372dc815 Merge branch 'en/test-cleanup'
d1075adfdf Merge branch 'en/merge-path-collision'
a4fd114ffc Merge branch 'kk/complete-diff-color-moved'
a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file'
0e0d717537 Merge branch 'pb/am-show-current-patch'
9b7f726dfc Merge branch 'am/pathspec-f-f-more'
4605a73073 t1091: don't grep for `strerror()` string
4d9c2902a1 l10n: fr v2.26.0 rnd1
ad182bee3f Merge branch of github.com:alshopov/git-po into master
23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1
98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t)
f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed)
76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po
076cbdcd73 Git 2.26-rc0
0d65f3fb1a t5537: adjust test_oid label
e63cefb024 Merge branch 'hi/gpg-use-check-signature'
5da7329e29 Merge branch 'rs/commit-graph-code-simplification'
0108fc1b46 Merge branch 'js/ci-windows-update'
f3ccd9f0d9 Merge branch 'be/describe-multiroot'
a6b4709302 Merge branch 'ag/rebase-remove-redundant-code'
b22db265d6 Merge branch 'es/recursive-single-branch-clone'
e8e71848ea Merge branch 'jk/nth-packed-object-id'
a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'
4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere'
49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix'
2cbb058669 Merge branch 'bc/wildcard-credential'
25063e2530 Merge branch 'mr/bisect-in-c-1'
f4d7dfce4d Merge branch 'ds/sparse-add'
4d864895a2 t2402: test worktree path when called in .git directory
af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch()
7655b4119d remote-curl: show progress for fetches over dumb HTTP
2f268890c2 The eighth batch for 2.26
aa5a7e02ad Merge branch 'ma/test-cleanup'
58595e713c Merge branch 'rs/blame-typefix-for-fingerprint'
ff41848e99 Merge branch 'rs/micro-cleanups'
4cbf1a0e22 Merge branch 'es/worktree-cleanup'
46703057c1 Merge branch 'ak/test-log-graph'
777815f5f9 Merge branch 'jk/run-command-formatfix'
444cff61b4 Merge branch 'ds/partial-clone-fixes'
48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure'
8c22bd9ff9 Merge branch 'en/rebase-backend'
cb2f5a8e97 Merge branch 'en/check-ignore'
0df82d99da Merge branch 'jk/object-filter-with-bitmap'
80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix'
29b09c518c Merge branch 'jk/doc-diff-parallel'
237a28173f show_one_mergetag: print non-parent in hex form.
5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context"
6d1210e133 l10n: Update Catalan translation
0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification"
7329d94be7 config.mak.dev: re-enable -Wformat-zero-length
7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings
94f4d01932 mingw: workaround for hangs when sending STDIN
1ff466c018 Documentation: clarify that `-h` alone stands for `help`
65bf820d0e t6020: new test with interleaved lexicographic ordering of directories
9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it
d5bb92eced t3035: prefer test_must_fail to bash negation for git commands
b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions
42d180dd01 t602[1236], t6034: modernize test formatting
802050400a merge-recursive: apply collision handling unification to recursive case
7f487ce062 Azure Pipeline: switch to the latest agent pools
5ed9fc3fc8 ci: prevent `perforce` from being quarantined
eafff6e41e t/lib-httpd: avoid using macOS' sed
d68ce906c7 commit-graph: use progress title directly
30b1c7ad9d describe: don't abort too early when searching tags
240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to'
2d2118b814 The seventh batch for 2.26
325eb66830 Merge branch 'es/doc-mentoring'
87f17d790d Merge branch 'es/bright-colors'
d0038f4b31 Merge branch 'bw/remote-rename-update-config'
132f600b06 clone: pass --single-branch during --recurse-submodules
47319576f1 submodule--helper: use C99 named initializer
ffe005576a lib-log-graph: consolidate colored graph cmp logic
989eea958b lib-log-graph: consolidate test_cmp_graph logic
bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching
bb4995fc3f worktree: add utility to find worktree by pathname
a80c4c2214 worktree: improve find_worktree() documentation
2fecc48cad packfile: drop nth_packed_object_sha1()
6ac9760a30 packed_object_info(): use object_id internally for delta base
b99b6bcc57 packed_object_info(): use object_id for returning delta base
63f4a7fc01 pack-check: push oid lookup into loop
e31c71083a pack-check: convert "internal error" die to a BUG()
500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps
f66d4e0250 pack-objects: use object_id struct in pack-reuse code
a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id
3f83fd5e44 pack-objects: read delta base oid into object_id struct
0763671b8e nth_packed_object_oid(): use customary integer return
02bbbe9df9 worktree: drop unused code from get_main_worktree()
27f182b3fc blame: provide type of fingerprints pointer
b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere
df126ca142 t3400: make test clean up after itself
3c29e21eb0 t: drop debug `cat` calls
cac439b56d t9810: drop debug `cat` call
91de82adc9 t4117: check for files using `test_path_is_file`
4ef346482d receive.denyCurrentBranch: respect all worktrees
f8692114db t5509: use a bare repository for test push target
45f274fbb1 get_main_worktree(): allow it to be called in the Git directory
fd0bc17557 completion: add diff --color-moved[-ws]
2ce6d075fa use strpbrk(3) to search for characters from a given set
2b3c430bce quote: use isalnum() to check for alphanumeric characters
a51d9e8f07 t1050: replace test -f with test_path_is_file
3e96c66805 partial-clone: avoid fetching when looking for objects
d0badf8797 partial-clone: demonstrate bugs in partial fetch
539052f42f run-command.h: fix mis-indented struct member
6c11c6a124 sparse-checkout: allow one-character directories in cone mode
aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch
f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch
e8ef1e8d6e am: convert "resume" variable to a struct
bc8620b440 parse-options: convert "command mode" to a flag
62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE()
46fd7b3900 credential: allow wildcard patterns when matching config
82eb249853 credential: use the last matching username in the config
588c70e10f t0300: add tests for some additional cases
732f934408 t1300: add test for urlmatch with multiple wildcards
3fa0e04667 mailmap: add an additional email address for brian m. carlson
8a98758a8d stash push: support the --pathspec-from-file option
8c3713cede stash: eliminate crude option parsing
3f3d8068f5 doc: stash: synchronize <pathspec> description
b22909144c doc: stash: document more options
0093abc286 doc: stash: split options from description (2)
2b7460d167 doc: stash: split options from description (1)
5f393dc3aa rm: support the --pathspec-from-file option
fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags
73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure
6c69f22233 bisect: libify `bisect_next_all`
9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents
45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents
cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents
e8e3ce6718 bisect: libify `bisect_checkout`
ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents
7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()`
680e8a01e5 bisect: add enum to represent bisect returning codes
bfacfce7d9 bisect--helper: introduce new `decide_next()` function
b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0
292731c4c2 bisect--helper: change `retval` to `res`
16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays
7ec8125fba check-ignore: fix documentation and implementation to match
2607d39da3 doc-diff: use single-colon rule in rendering Makefile
0aa6ce3094 doc/config/push: use longer "--" line for preformatted example
20a5fd881a rev-list --count: comment on the use of count_right++
63a58457e0 Merge branch 'py/missing-bracket'
51ebf55b93 The sixth batch for 2.26
f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints'
123538444f Merge branch 'jk/doc-credential-helper'
e154451a2f Merge branch 'js/mingw-open-in-gdb'
fc25a19265 Merge branch 'js/test-unc-fetch'
6365058605 Merge branch 'js/test-avoid-pipe'
966b69f02f Merge branch 'js/test-write-junit-xml-fix'
d880c3de23 Merge branch 'jk/mailinfo-cleanup'
5d55554b1d Merge branch 'mr/show-config-scope'
9f3f38769d Merge branch 'rs/strbuf-insertstr'
cbecc168d4 Merge branch 'rs/parse-options-concat-dup'
5af345a438 Merge branch 'bc/hash-independent-tests-part-8'
0460c109c3 Merge branch 'rs/name-rev-memsave'
6b9919c0a2 git-gui: add missing close bracket
5897e5ac96 Merge branch 'cs/german-translation'
cf85a32eb6 git-gui: update German translation
5096e51c54 git-gui: extend translation glossary template with more terms
8b85bb1b70 git-gui: update pot template and German translation to current source code
e68e29171c Sync with 2.25.1
c522f061d5 Git 2.25.1
10cdb9f38a rebase: rename the two primary rebase backends
2ac0d6273f rebase: change the default backend from "am" to "merge"
8295ed690b rebase: make the backend configurable via config setting
76340c8107 rebase tests: repeat some tests using the merge backend instead of am
980b482d28 rebase tests: mark tests specific to the am-backend with --am
c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases
6d04ce75c4 git-prompt: change the prompt for interactive-based rebases
52eb738d6b rebase: add an --am option
8af14f0859 rebase: move incompatibility checks between backend options a bit earlier
be50c938df git-rebase.txt: add more details about behavioral differences of backends
befb89ce7c rebase: allow more types of rebases to fast-forward
9a70f3d4ae t3432: make these tests work with either am or merge backends
93122c985a rebase: fix handling of restrict_revision
55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer
8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling
7db00f0b3b t3406: simplify an already simple test
e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty
d48e5e21da rebase (interactive-backend): make --keep-empty the default
e0020b2f82 prefix_path: show gitdir when arg is outside repo
cc4f2eb828 doc: move credential helper info into gitcredentials(7)
bfdd66e72f Sync with maint
7ae7e234c7 The fifth batch for 2.26
53c3be2c29 Merge branch 'tb/commit-graph-object-dir'
7b029ebaef Merge branch 'jk/index-pack-dupfix'
aa21cc97bd Merge branch 'jk/alloc-cleanups'
883326077a Merge branch 'jh/notes-fanout-fix'
f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule'
78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs'
df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'
433b8aac2e Merge branch 'ds/sparse-checkout-harden'
4a77434bc8 Merge branch 'ld/p4-cleanup-processes'
8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone'
09e48400a3 Merge branch 'jk/get-oid-error-message-i18n'
4dbeecba27 Merge branch 'ag/edit-todo-drop-check'
f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2'
d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout'
251187084d Merge branch 'js/rebase-i-with-colliding-hash'
c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix'
56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store'
0da63da794 Merge branch 'jn/promote-proto2-to-default'
a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup'
daef1b300b Merge branch 'hw/advice-add-nothing'
6141e0cc00 Merge branch 'js/convert-typofix' into maint
4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint
5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint
b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint
7137d6089b Merge branch 'ms/doc-bundle-format' into maint
52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint
0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint
1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint
cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint
153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint
8857657cc9 Merge branch 'jt/t5616-robustify' into maint
1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint
f468972671 Merge branch 'bc/misconception-doc' into maint
6e69042e26 Merge branch 'bc/author-committer-doc' into maint
650ed395be Merge branch 'ds/refmap-doc' into maint
80b806f1a8 Merge branch 'bc/actualmente' into maint
eceff4ba12 Merge branch 'rt/submodule-i18n' into maint
8a17eb7972 Merge branch 'jk/test-fixes' into maint
54bbadaeca Merge branch 'jk/asan-build-fix' into maint
8dbeba198e Merge branch 'ds/sparse-cone' into maint
e361f36f61 Merge branch 'nd/switch-and-restore' into maint
4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint
ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint
5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint
c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint
d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint
9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint
3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint
3ab3185f99 pack-objects: support filters with bitmaps
84243da129 pack-bitmap: implement BLOB_LIMIT filtering
4f3bd5606a pack-bitmap: implement BLOB_NONE filtering
cc4aa28506 bitmap: add bitmap_unset() function
2aaeb9ac41 rev-list: use bitmap filters for traversal
6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure
4eb707ebd6 rev-list: allow commit-only bitmap traversals
ea047a8eb4 t5310: factor out bitmap traversal comparison
608d9c9365 rev-list: allow bitmaps when counting objects
55cb10f9b5 rev-list: make --count work with --objects
792f811998 rev-list: factor out bitmap-optimized routines
d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs
08809c09aa mingw: add a helper function to attach GDB to the current process
bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths
de26f02db1 t9001, t9116: avoid pipes
a2dc43414c MyFirstContribution: rephrase contact info
e03f928e2a rev-list: fallback to non-bitmap traversal when filtering
acac50dd8c pack-bitmap: fix leak of haves/wants object lists
551cf8b655 pack-bitmap: factor out type iterator initialization
d8437c57fa The fourth batch for 2.26
a3dcf84df0 Merge branch 'js/convert-typofix'
0de2d1409b Merge branch 'js/ci-squelch-doc-warning'
0410c2ba31 Merge branch 'jb/multi-pack-index-docfix'
0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example'
e99c325bb4 Merge branch 'ms/doc-bundle-format'
afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix'
db72f8c940 Merge branch 'jb/parse-options-message-fix'
3d2471ba85 Merge branch 'ma/filter-branch-doc-caret'
b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path'
44cba9c4b3 Merge branch 'jc/skip-prefix'
556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index'
17e4a1b141 Merge branch 'hw/doc-git-dir'
4cf7f48891 Merge branch 'jk/push-default-doc'
b783391018 Merge branch 'jk/clang-sanitizer-fixes'
a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache'
3f7553acf5 Merge branch 'jt/t5616-robustify'
341f8a6476 Merge branch 'jk/escaped-wildcard-dwim'
b486d2ee81 Merge branch 'jn/pretend-object-doc'
076ee3e8a2 tests: fix --write-junit-xml with subshells
2b0f19fa7a convert: fix typo
c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors
1751b09a92 color.c: support bright aixterm colors
4a28eb0ae4 color.c: refactor color_output arguments
f696a2b1c8 mailinfo: factor out some repeated header handling
ffbea1816d mailinfo: be more liberal with header whitespace
f447d0293e mailinfo: simplify parsing of header values
b6537d83ee mailinfo: treat header values as C strings
ef07659926 sparse-checkout: work with Windows paths
2631dc879d sparse-checkout: create 'add' subcommand
4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand
6fb705abcb sparse-checkout: extract add_patterns_from_input()
b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config
f2a2327a4a config: provide access to the current line number
923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values
ceff1a1308 remote: clean-up config callback
1a83068c26 remote: clean-up by returning early to avoid one indentation
88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types
145d59f482 config: add '--show-scope' to print the scope of a config value
9a83d088ee submodule-config: add subomdule config scope
e37efa40e1 config: teach git_config_source to remember its scope
5c105a842e config: preserve scope in do_git_config_sequence
6766e41b8a config: clarify meaning of command line scoping
6dc905d974 config: split repo scope to local and worktree
a5cb4204b6 config: make scope_name non-static and rename it
30183894ea ci: ignore rubygems warning in the "Documentation" job
7a9f8ca805 parse-options: simplify parse_options_dup()
c84078573e parse-options: const parse_options_concat() parameters
f904f9025f parse-options: factor out parse_options_count()
a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat()
517b60564e mailinfo: don't insert header prefix for handle_content_type()
a91cc7fad0 strbuf: add and use strbuf_insertstr()
eb31044ff7 pack-format: correct multi-pack-index description
9299f84921 diff-options.txt: avoid "regex" overload in example
7378ec90e1 doc: describe Git bundle format
f3037657e8 t6024: update for SHA-256
edf04243b2 t6006: make hash size independent
5db24dcffd t6000: abstract away SHA-1-specific constants
d341e0805d t5703: make test work with SHA-256
88ed241a7e t5607: make hash size independent
48c10cc0e6 t5318: update for SHA-256
f7ae8e69b6 t5515: make test hash independent
e70649bb66 t5321: make test hash independent
a30f93b143 t5313: make test hash independent
a79eec220b t5309: make test hash independent
796d1383a3 t5302: make hash size independent
417e45e5e3 t4060: make test work with SHA-256
dfa5f53e78 t4211: add test cases for SHA-256
f743e8f5b3 t4211: move SHA-1-specific test cases into a directory
72f936b120 t4013: make test hash independent
5df0f11f07 t3311: make test work with SHA-256
07877f393c t3310: make test work with SHA-256
6025e898d6 t3309: make test work with SHA-256
7b1a1822fe t3308: make test work with SHA-256
94db7e3e93 t3206: make hash size independent
db12505c2c t/lib-pack: support SHA-256
303b3c1c46 submodule: add newline on invalid submodule error
887a0fd573 add: change advice config variables used by the add API
de93cc14ab The third batch for 2.26
ea46d9097b Merge branch 'mt/sparse-checkout-doc-update'
ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix'
b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend'
7ab963e122 Merge branch 'en/fill-directory-fixes-more'
f52ab33616 Merge branch 'bc/hash-independent-tests-part-7'
25794d6ce9 Merge branch 'km/submodule-add-errmsg'
d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity'
76c57fedfa Merge branch 'js/add-p-leftover-bits'
9a5315edfd Merge branch 'js/patch-mode-in-others-in-c'
381e8e9de1 Merge branch 'dl/test-must-fail-fixes'
395518cf7a parse-options: lose an unnecessary space in an error message
079f970971 name-rev: sort tip names before applying
2d53975488 name-rev: release unused name strings
977dc1912b name-rev: generate name strings only if they are better
1c56fc2084 name-rev: pre-size buffer in get_parent_name()
ddc42ec786 name-rev: factor out get_parent_name()
f13ca7cef5 name-rev: put struct rev_name into commit slab
d689d6d82f name-rev: don't _peek() in create_or_update_name()
15a4205d96 name-rev: don't leak path copy in name_ref()
36d2419c9a name-rev: respect const qualifier
71620ca86c name-rev: remove unused typedef
3e2feb0d64 name-rev: rewrite create_or_update_name()
a21781011f index-pack: downgrade twice-resolved REF_DELTA to die()
dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout
e1c5253951 t3305: check notes fanout more carefully and robustly
e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks
a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st'
ad2dd5bb63 commit-graph.c: remove path normalization, comparison
13c2499249 commit-graph.h: store object directory in 'struct commit_graph'
0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context'
f38c92452d t7400: testcase for submodule status on unregistered inner git repos
5290d45134 tree-walk.c: break circular dependency with unpack-trees
f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch
d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode
e53ffe2704 sparse-checkout: escape all glob characters on write
e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand
bd64de42de sparse-checkout: unquote C-style strings over --stdin
d585f0e799 sparse-checkout: write escaped patterns in cone mode
4f52c2ce6c sparse-checkout: properly match escaped characters
9abc60f801 sparse-checkout: warn on globs in cone patterns
145136a95a C: use skip_prefix() to avoid hardcoded string length
04e5b3f0b4 submodule foreach: replace $path with $sm_path in example
1793280e91 t5318: don't pass non-object directory to '--object-dir'
da8063522f diff: move diff.wsErrorHighlight to "basic" config
b98d188581 sha1-file: allow check_object_signature() to handle any repo
2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file()
7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare()
c8123e72f6 streaming: allow open_istream() to handle any repo
5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile()
a651946730 cache-tree: use given repo's hash_algo at verify_one()
eb999b3295 diff: make diff_populate_filespec() honor its repo argument
5b0ca878e0 Sync with maint
344ee18728 The second batch
53a83299c7 Merge branch 'bc/misconception-doc'
c9ccf9d09b Merge branch 'bc/author-committer-doc'
0d0fa20c40 Merge branch 'ss/t6025-modernize'
7050624abc Merge branch 'lh/bool-to-type-bool'
4b69f29271 Merge branch 'ds/refmap-doc'
aff812ce3c Merge branch 'bc/actualmente'
38fb56e92a Merge branch 'rt/submodule-i18n'
f0940743fa Merge branch 'js/builtin-add-i-cmds'
0afeb3fdf4 Merge branch 'jk/test-fixes'
808dab2b58 Merge branch 'jk/asan-build-fix'
fec1ff97c2 Merge branch 'sg/completion-worktree'
c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function'
11ad30b887 Merge branch 'hi/gpg-mintrustlevel'
96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases'
d52adee779 Merge branch 'ds/graph-horizontal-edges'
6909474491 Merge branch 'am/update-pathspec-f-f-tests'
043426c8fd Merge branch 'ds/sparse-cone'
34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig'
8dd40c0472 traverse_trees(): use stack array for name entries
667b76ec58 walker_fetch(): avoid raw array length computation
9734b74a8f normalize_path_copy(): document "dst" size expectations
43f33e492a git-p4: avoid leak of file handle when cloning
19fa5ac333 git-p4: check for access to remote host earlier
6026aff5bb git-p4: cleanup better on error exit
ca5b5cce62 git-p4: create helper function importRevisions()
4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable
5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce
837b3a6376 git-p4: make closeStreams() idempotent
b0418303b1 sha1-name: mark get_oid() error messages for translation
2df1aa239c fetch: forgo full connectivity check if --filter
50033772d5 connected: verify promisor-ness of partial clone
d82ad54945 git: update documentation for --git-dir
0ad7144999 .mailmap: map Yi-Jyun Pan's email
c56c48dd07 grep: ignore --recurse-submodules if --no-index is given
8b2a1928f0 doc: drop "explicitly given" from push.default description
cf82bff73f obstack: avoid computing offsets from NULL pointer
3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer
d20bc01a51 avoid computing zero offsets from NULL pointer
7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero
bc3f657f71 t1506: drop space after redirection operator
e5d7b2f65c t1400: avoid "test" string comparisons
5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c
c7a6207591 Sync with maint
7210ca4ee5 .mailmap: fix GGG authoship screwup
37a63faae5 t4124: only mark git command with test_must_fail
a8c663cf65 t3507: use test_path_is_missing()
2def7f017c t3507: fix indentation
e8a1c686ae t3504: do check for conflict marker after failed cherry-pick
1c9fd32fd2 t3419: stop losing return code of git command
c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}()
a781cd6fef t3415: stop losing return codes of git commands
86ce6e0dd1 t3310: extract common notes_merge_files_gone()
245b9ba0ba t3030: use test_path_is_missing()
4a6f11fd7b t2018: replace "sha" with "oid"
62e80fcb48 t2018: don't lose return code of git commands
30c0367668 t2018: teach do_checkout() to accept `!` arg
40caa5366a t2018: be more discerning when checking for expected exit codes
b54128bb0b t5616: make robust to delta base change
4c616c2ba1 merge-recursive: use subtraction to flip stage
ee798742bd merge-recursive: silence -Wxor-used-as-pow warning
39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule
a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin
3b2885ec9b submodule: fix status of initialized but not cloned submodules
ace912bfb8 t7400: add a testcase for submodule status on empty dirs
4bb4fd4290 MyFirstContribution: add avenues for getting help
9e6d3e6417 sparse-checkout: detect short patterns
41de0c6fbc sparse-checkout: cone mode does not recognize "**"
7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone
47dbf10d8a clone: fix --sparse option with URLs
3c754067a1 sparse-checkout: create leading directories
d622c34396 t1091: improve here-docs
522e641748 t1091: use check_files to reduce boilerplate
417be08d02 t1300: create custom config file without special characters
3de7ee369b t1300: fix over-indented HERE-DOCs
329e6ec397 config: fix typo in variable name
767a9c417e rebase -i: stop checking out the tip of the branch to rebase
dfaed02862 fsmonitor: update documentation for hook version and watchman hooks
e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2
d031049da3 completion: add support for sparse-checkout
a402723e48 doc: sparse-checkout: mention --cone option
26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck
b6992261de rebase -i: re-fix short SHA-1 collision
d859dcad94 parse_insn_line(): improve error message when parsing failed
d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects
92fb0db94c pack-objects: add checks for duplicate objects
bb514de356 pack-objects: improve partial packfile reuse
ff483026a9 builtin/pack-objects: introduce obj_is_packed()
e704fc7978 pack-objects: introduce pack.allowPackReuse
2f4af77699 csum-file: introduce hashfile_total()
8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting()
59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile
40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains()
14fbd26044 ewah/bitmap: introduce bitmap_word_alloc()
bc7a3d4dc0 The first batch post 2.25 cycle
09e393d913 Merge branch 'nd/switch-and-restore'
45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport'
0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout'
36da2a8635 Merge branch 'es/unpack-trees-oob-fix'
42096c778d Merge branch 'bc/run-command-nullness-after-free-fix'
1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted'
a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees'
e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached'
9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting'
237a83a943 Merge branch 'dl/credential-netrc'
a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir()
129510a067 t2405: clarify test descriptions and simplify test
4eaadc8493 t2405: use git -C and test_commit -C instead of subshells
773c60a45e t7410: rename to t2405-worktree-submodule.sh
7a2dc95cbc docs: mention when increasing http.postBuffer is valuable
1b13e9032f doc: dissuade users from trying to ignore tracked files
69e104d70e doc: provide guidance on user.name format
813f6025a5 docs: expand on possible and recommended user config options
bc94e5862a doc: move author and committer information to git-commit(1)
7979dfe1d4 l10n: Update Catalan translation
81e3db42f3 templates: fix deprecated type option `--bool`
c513a958b6 t6025: use helpers to replace test -f <path>
70789843bd t6025: modernize style
6a7aca6f01 doc: rm: synchronize <pathspec> description
856249c62a docs: use "currently" for the present time
b40a50264a fetch: document and test --refmap=""
a9ae8fde2e t3404: directly test the behavior of interest
22a69fda19 git-rebase.txt: update description of --allow-empty-message
f1928f04b2 grep: use no. of cores as the default no. of threads
70a9fef240 grep: move driver pre-load out of critical section
1184a95ea2 grep: re-enable threads in non-worktree case
6c307626f1 grep: protect packed_git [re-]initialization
c441ea4edc grep: allow submodule functions to run in parallel
d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules()
1d1729caeb grep: replace grep_read_mutex by internal obj read lock
31877c9aec object-store: allow threaded access to object reading
b1fc9da1c8 replace-object: make replace operations thread-safe
d5b0bac528 grep: fix racy calls in grep_objects()
faf123c730 grep: fix race conditions at grep_submodule()
c3a5bb31c1 grep: fix race conditions on userdiff calls
0222540827 fetch: emphasize failure during submodule fetch
232378479e Sync with maint
e4837b4406 t7800: don't rely on reuse_worktree_file()
fbce03d329 t4018: drop "debugging" cat from hunk-header tests
f65d07fffa Makefile: use compat regex with SANITIZE=address
849e43cc18 built-in add -i: accept open-ended ranges again
d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files
a4ffbbbb99 submodule.c: mark more strings for translation
0cbb60574e dir: point treat_leading_path() warning to the right place
ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent
22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2
f365bf40a0 clean: demonstrate a bug with pathspecs
b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x
277eb5af7c t5604: make hash independent
44b6c05b43 t5601: switch into repository to hash object
7a868c51c2 t5562: use $ZERO_OID
1b8f39fb0d t5540: make hash size independent
a8c17e3bd6 t5537: make hash size independent
832072219c t5530: compute results based on object length
74ad99b1d8 t5512: abstract away SHA-1-specific constants
ba1be1ab45 t5510: make hash size independent
cba472d3ad t5504: make hash algorithm independent
82d5aeb1e6 t5324: make hash size independent
3c5e65cac1 t5319: make test work with SHA-256
235d3cddb8 t5319: change invalid offset for SHA-256 compatibility
1d86c8f0ce t5318: update for SHA-256
525a7f1769 t4300: abstract away SHA-1-specific constants
7a1bcb251b t4204: make hash size independent
cb78f4f0fe t4202: abstract away SHA-1-specific constants
717c939d8f t4200: make hash size independent
08a9dd891c t4134: compute appropriate length constant
215b60bf07 t4066: compute index line in diffs
194264c185 t4054: make hash-size independent
7d5ecd775d completion: list paths and refs for 'git worktree add'
3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands
3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options
367efd54b3 completion: return the index of found word from __git_find_on_cmdline()
d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function
2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper
54887b4689 gpg-interface: add minTrustLevel as a configuration option
684ceae32d fetch: default to protocol version 2
33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION
8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate
b9ab170752 config doc: protocol.version is not experimental
07ef3c6604 fetch test: use more robust test for filtered objects
d6509da620 fetch test: mark test of "skipping" haves as v0-only
a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too
c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function
bf66db37f1 add: use advise function to display hints
c958d3bd0a graph: fix collapse of multiple edges
8588932e20 graph: add test to demonstrate horizontal line bug
d0d0a357a1 t: directly test parse_pathspec_file()
568cabb2fe t: fix quotes tests for --pathspec-from-file
f94f7bd00d t: add tests for error conditions with --pathspec-from-file
b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job
12acdf573a built-in add -p: handle Escape sequences more efficiently
e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode
04f816b125 built-in add -p: respect the `interactive.singlekey` config setting
a5e46e6b01 terminal: add a new function to read a single keystroke
9ea416cb51 terminal: accommodate Git for Windows' default terminal
94ac3c31f7 terminal: make the code of disable_echo() reusable
08b1ea4c39 built-in add -p: handle diff.algorithm
180f48df69 built-in add -p: support interactive.diffFilter
1e4ffc765d t3701: adjust difffilter test
c81638541c submodule add: show 'add --dry-run' stderr when aborting
8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token
56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token
d0654dc308 Git 2.25
b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po
4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'"
ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1
e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master
1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
d78a1968c5 Merge branch 'ma/config-advice-markup-fix'
a20ae3ee29 l10n: Update Catalan translation
49e268e23e mingw: safeguard better against backslashes in file names
4c6c7971e0 unpack-trees: correctly compute result count
63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1
75449c1b39 l10n: de.po: Reword generation numbers
6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t)
3901d2c6bd config/advice.txt: fix description list separator
7a6a90c6ec Git 2.25-rc2
1f5f3ffe5c Merge branch 'ds/graph-assert-fix'
a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix'
202f68b252 Merge branch 'pm/am-in-body-header-doc-update'
7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix'
c5dc20638b Merge branch 'do/gitweb-typofix-in-comments'
fe47c9cb5f Merge https://github.com/prati0100/git-gui
a1087c9367 graph: fix lack of color in horizontal lines
0d251c3291 graph: drop assert() for merge with two collapsing parents
4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper
573117dfa5 unpack-trees: watch for out-of-range index position
e701bab3e9 restore: invalidate cache-tree when removing entries with --staged
1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command
fa74180d08 checkout: don't revert file on ambiguous tracking branches
2957709bd4 parse_branchname_arg(): extract part as new function
5020f6806a t2018: improve style of if-statement
7ffb54618b t2018: add space between function name and ()
63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH
065027ee1a string-list: note in docs that callers can specify sorting function
26f924d50e unpack-trees: exit check_updates() early if updates are not wanted
042ed3e048 The final batch before -rc2
0f1930cd1b Merge branch 'ds/sparse-cone'
037f067587 Merge branch 'ds/commit-graph-set-size-mult'
f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify'
c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode'
a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
c4117fcb97 Merge branch 'pb/clarify-line-log-doc'
556f0258df Merge branch 'ew/packfile-syscall-optim'
5814d44d9b doc: submodule: fix typo for command absorbgitdirs
7047f75f22 editorconfig: indent text files with tabs
60440d72db sha1-file: document how to use pretend_object_file
7fdc5f296f l10n: es: 2.25.0 round #1
f8740c586b am: document that Date: can appear as an in-body header
4e2c4c0d4f gitweb: fix a couple spelling errors in comments
421c0ffb02 multi-pack-index: correct configuration in documentation
757ff352bd Documentation/git-sparse-checkout.txt: fix a typo
0d2116c644 Merge branch 'zs/open-current-file'
9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u)
3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master
4c5081614c l10n: fr.po v2.25.0 rnd 1
5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0
63020f175f commit-graph: prefer default size_mult when given zero
224c7d70fa mingw: only test index entries for backslashes, not tree entries
9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED
8679ef24ed Git 2.25-rc1
a82027e9e6 Merge branch 'js/use-test-tool-on-path'
13432fc6dd Merge branch 'js/mingw-reserved-filenames'
e0e1ac5db0 Merge branch 'en/rebase-signoff-fix'
b76a244c9d Merge branch 'em/freebsd-cirrus-ci'
bc855232bc Merge branch 'bk/p4-misc-usability'
763a59e71c merge-recursive: remove unnecessary oid_eq function
44143583b7 sparse-checkout: use extern for global variables
d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master
13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1
786f4d2405 git-gui: allow opening currently selected file in default app
4fd683b6a3 sparse-checkout: document interactions with submodules
de11951b03 sparse-checkout: list directories in cone mode
0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0
578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed)
173fff68da Merge tag 'v2.25.0-rc0' into git-po-master
f1842ff531 t2018: remove trailing space from test description
20a67e8ce9 t3008: find test-tool through path lookup
9e341f62ca l10n: Update Catalan translation
4e61b2214d packfile: replace lseek+read with pread
ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision
2be45868a8 doc: log, gitk: document accepted line-log diff formats
280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD
0a76bd7381 mailmap: mask accentless variant for Công Danh
99c33bed56 Git 2.25-rc0
d2189a721c Merge branch 'en/fill-directory-fixes'
8be0a428d6 Merge branch 'rs/test-cleanup'
65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string'
c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
45b96a6fa1 Merge branch 'js/add-p-in-c'
ccc292e862 Merge branch 'jc/drop-gen-hdrs'
dfee504bee Merge branch 'ja/doc-markup-cleanup'
87cbb1ca66 Merge branch 'rs/ref-read-cleanup'
20aa6d88b7 Merge branch 'rb/p4-lfs'
fcd5b55f56 Merge branch 'pb/submodule-doc-xref'
4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free'
ba6b66281e Merge branch 'ln/userdiff-elixir'
bd72a08d6c Merge branch 'ds/sparse-cone'
f3c520e17f Merge branch 'sg/name-rev-wo-recursion'
6514ad40a1 Merge branch 'ra/t5150-depends-on-perl'
17066bea38 Merge branch 'dl/format-patch-notes-config-fixup'
135365dd99 Merge branch 'am/pathspec-f-f-checkout'
ff0cb70d45 Merge branch 'am/pathspec-from-file'
4dc42c6c18 mingw: refuse paths containing reserved names
98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16
c480eeb574 commit --interactive: make it work with the built-in `add -i`
cee6cb7300 built-in add -p: implement the "worktree" patch modes
52628f94fc built-in add -p: implement the "checkout" patch modes
6610e4628a built-in stash: use the built-in `git add -p` if so configured
90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting
36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes
d2a233cb8b built-in add -p: prepare for patch modes other than "stage"
761e3d26bb sparse-checkout: improve OS ls compatibility
6579d93a97 contrib/credential/netrc: work outside a repo
1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable
b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI
b441717256 t1507: inline full_name()
9291e6329e t1507: run commands within test_expect_success
5236fce6b4 t1507: stop losing return codes of git commands
10812c2337 t1501: remove use of `test_might_fail cp`
62d58cda69 t1409: use test_path_is_missing()
b87b02cfe6 t1409: let sed open its own input file
9b92070e52 t1307: reorder `nongit test_must_fail`
3595d10c26 t1306: convert `test_might_fail rm` to `rm -f`
f511bc02ed t0020: use ! check_packed_refs_marked
f6041abdcd t0020: don't use `test_must_fail has_cr`
f46c243e66 t0003: don't use `test_must_fail attr_check`
99c049bc4c t0003: use test_must_be_empty()
3738439c77 t0003: use named parameters in attr_check()
7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err()
b8afb908c2 t/lib-git-p4: use test_path_is_missing()
4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases
6836d2fe06 dir.c: use st_add3() for allocation size
c847dfafee dir: consolidate similar code in treat_directory()
777b420347 dir: synchronize treat_leading_path() and read_directory_recursive()
b9670c1f5e dir: fix checks on common prefix directory
5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit
23cbe427c4 Merge branch 'py/console-close-esc'
124a895811 t4015: improve coverage of function context test
509efef789 commit: forbid --pathspec-from-file --all
12029dc57d t3434: mark successful test as such
e0f9095aaa notes.h: fix typos in comment
675ef6bab8 t6030: don't create unused file
01ed17dc8c t5580: don't create unused file
f670adb49b t3501: don't create unused file
1e1ccbfdd3 git-gui: allow closing console window with Escape
7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays.
b02fd2acca The sixth batch
59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex'
e3b72391d1 Merge branch 'rs/commit-export-env-simplify'
43bf44e23a Merge branch 'rs/archive-zip-code-cleanup'
4438a1a59f Merge branch 'js/t3404-indent-fix'
3a44db2ed2 Merge branch 'dr/branch-usage-casefix'
8bc481f4f6 Merge branch 'sg/t9300-robustify'
011fc2e88e Merge branch 'js/add-i-a-bit-more-tests'
d1c0fe8d9b Merge branch 'dl/range-diff-with-notes'
26c816a67d Merge branch 'hw/doc-in-header'
f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
71a7de7a99 Merge branch 'dl/rebase-with-autobase'
c9f5fc9114 Merge branch 'dl/test-cleanup'
6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap'
3beff388b2 Merge branch 'js/builtin-add-i-cmds'
4755a34c47 Merge branch 'dd/time-reentrancy'
37c2619d91 Merge branch 'ag/sequencer-todo-updates'
608e380502 git-p4: show detailed help when parsing options fail
e2aed5fd5b git-p4: yes/no prompts should sanitize user text
571fb96573 fix-typo: consecutive-word duplications
f371984613 Makefile: drop GEN_HDRS
2e4083198d built-in add -p: show helpful hint when nothing can be staged
54d9d9b2ee built-in add -p: only show the applicable parts of the help text
ade246efed built-in add -p: implement the 'q' ("quit") command
d6cf873340 built-in add -p: implement the '/' ("search regex") command
9254bdfb4f built-in add -p: implement the 'g' ("goto") command
bcdd297b78 built-in add -p: implement hunk editing
b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf"
11f2c0dae8 built-in add -p: coalesce hunks after splitting them
510aeca199 built-in add -p: implement the hunk splitting feature
0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions
5906d5de77 built-in app -p: allow selecting a mode change as a "hunk"
47dc4fd5eb built-in add -p: handle deleted empty files
80399aec5a built-in add -p: support multi-file diffs
7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed
12c24cf850 built-in add -p: color the prompt and the help text
25ea47af49 built-in add -p: adjust hunk headers as needed
e3bd11b4eb built-in add -p: show colored hunks by default
1942ee44e8 built-in add -i: wire up the new C code for the `patch` command
f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C
d1b1384d61 userdiff: remove empty subexpression from elixir regex
df5be01669 doc: indent multi-line items in list
fd5041e127 doc: remove non pure ASCII characters
190a65f9db sparse-checkout: respect core.ignoreCase in cone mode
1d7297513d notes: break set_display_notes() into smaller functions
66f79ee23d config/format.txt: clarify behavior of multiple format.notes
cc2bd5c45d gitmodules: link to gitsubmodules guide
99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed
e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed
8c02fe6060 t7004: don't create unused file
cb05d6a5ed t4256: don't create unused file
c5c4eddd56 dir: break part of read_directory_recursive() out for reuse
072a231016 dir: exit before wildcard fall-through if there is no wildcard
2f5d3847d4 dir: remove stray quote character in comment
a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories"
452efd11fb t3011: demonstrate directory traversal failures
ea94b16fb8 git-p4: honor lfs.storage configuration variable
51a0a4ed95 bisect--helper: avoid use-after-free
d32e065a91 Merge branch 'kk/branch-name-encoding'
ad05a3d8e5 The fifth batch
7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix'
b089e5e6cb Merge branch 'em/test-skip-regex-illseq'
930078ba39 Merge branch 'hi/gpg-use-check-signature'
08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode'
7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk'
55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm'
41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress'
5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise'
dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix'
d37cfe3b5c Merge branch 'dl/pretty-reference'
99c4ff1bda Merge branch 'dl/submodule-set-url'
55d607d85b Merge branch 'js/mingw-inherit-only-std-handles'
c58ae96fc4 Merge branch 'am/pathspec-from-file'
7c88714262 Merge branch 'po/bundle-doc-clonable'
5d9324e0f4 Merge branch 'ra/rebase-i-more-options'
7034cd094b Sync with Git 2.24.1
09ac67a183 format-patch: move git_config() before repo_init_revisions()
8164c961e1 format-patch: use --notes behavior for format.notes
452538c358 notes: extract logic into set_display_notes()
e6e230eeae notes: create init_display_notes() helper
1e6ed5441a notes: rename to load_display_notes()
2866fd284c name-rev: cleanup name_ref()
49f7a2fde9 name-rev: eliminate recursion in name_rev()
fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name'
e05e8cf074 archive-zip: use enum for compression method
39acfa3d22 git gui: fix branch name encoding error
11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description
8cf8f9b4aa t3404: fix indentation
4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs
147ee35558 commit: use strbuf_add() to add a length-limited string
559c6fc317 The fourth batch
56e6c16394 Merge branch 'dl/lore-is-the-archive'
3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive'
7cb0d37f6d Merge branch 'tg/perf-remove-stale-result'
403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick'
f0cf2fee5d Merge branch 'hi/grep-do-not-return-void'
391fb22ac7 Merge branch 'rs/use-skip-prefix-more'
92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd'
4ba74ca901 Merge branch 'rs/test-cleanup'
f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick'
ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9'
8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters
3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances
dd432a6ecf name-rev: restructure parsing commits and applying date cutoff
dd090a8a37 name-rev: pull out deref handling from the recursion
766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper
d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev()
bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation
e0c4da6f2a name-rev: avoid unnecessary cast in name_ref()
c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name()
c593a26348 t6120-describe: modernize the 'check_describe' helper
abcf857300 range-diff: clear `other_arg` at end of function
f8675343d7 range-diff: mark pointers as const
828765dfe0 t3206: fix incorrect test name
0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early
21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile
b4bbbbd5a2 apply --allow-overlap: fix a corner case
89c8559367 git add -p: use non-zero exit code when the diff generation failed
e91162be9c t3701: verify that the diff.algorithm config setting is handled
0c3222c4f3 t3701: verify the shown messages when nothing can be added
24be352d52 t3701: add a test for the different `add -p` prompts
8539b46534 t3701: avoid depending on the TTY prerequisite
0f0fba2cc8 t3701: add a test for advanced split-hunk editing
53a06cf39b Git 2.24.1
67af91c47a Sync with 2.23.1
a7312d1a28 Git 2.23.1
7fd9fd94fb Sync with 2.22.2
d9589d4051 Git 2.22.2
5421ddd8d0 Sync with 2.21.1
367f12b7e9 Git 2.21.1
20c71bcf67 Merge branch 'fix-msys2-quoting-bugs'
7d8b676992 mingw: sh arguments need quoting in more circumstances
d9061ed9da t7415: drop v2.20.x-specific work-around
04522edbd4 mingw: fix quoting of empty arguments for `sh`
49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts
e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly
fc346cb292 Sync with 2.20.2
4cd1cf31ef Git 2.20.2
c154745074 submodule: defend against submodule.update = !command in .gitmodules
4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x
d851d94151 Sync with 2.19.3
caccc527ca Git 2.19.3
7c9fbda6e2 Sync with 2.18.2
9877106b01 Git 2.18.2
14af7ed5a9 Sync with 2.17.3
a5ab8d0317 Git 2.17.3
bb92255ebe fsck: reject submodule.update = !command in .gitmodules
bdfef0492c Sync with 2.16.6
eb288bc455 Git 2.16.6
68440496c7 test-drop-caches: use `has_dos_drive_prefix()`
9ac92fed5b Sync with 2.15.4
7cdafcaacf Git 2.15.4
e904deb89d submodule: reject submodule.update = !command in .gitmodules
d3ac8c3f27 Sync with 2.14.6
66d2a6159f Git 2.14.6
083378cc35 The third batch
88bd37a2d0 Merge branch 'js/pkt-line-h-typofix'
473b431410 Merge branch 'us/unpack-trees-fsmonitor'
e0f9ec9027 Merge branch 'sg/test-bool-env'
fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset'
e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere'
88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory'
8feb47e882 Merge branch 'dl/t5520-cleanup'
6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree'
57d46bc602 Merge branch 'mg/doc-submodule-status-cached'
75bd003c7b Merge branch 'js/git-svn-use-rebase-merges'
f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix'
c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'
36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree'
cf91c31688 Merge branch 'sg/unpack-progress-throughput'
ef6104581d Merge branch 'pb/submodule-update-fetches'
7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix'
f3c7bfdde2 Merge branch 'dl/range-diff-with-notes'
9502b616f1 Merge branch 'jh/userdiff-python-async'
76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2'
995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label'
f7998d9793 Merge branch 'js/builtin-add-i'
917d0d6234 Merge branch 'js/rebase-r-safer-label'
56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers'
2763530048 Merge branch 'jg/revert-untracked'
fa38ab68b0 git-gui: revert untracked files by deleting them
d9c6469f38 git-gui: update status bar to track operations
29a9366052 git-gui: consolidate naming conventions
0bb313a552 xdiff: unignore changes in function context
2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names'
65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods'
5532ebdeb7 Merge branch 'fix-mingw-quoting-bug'
76a681ce9c Merge branch 'dubiously-nested-submodules'
dd53ea7220 Merge branch 'turn-on-protectntfs-by-default'
f82a97eb91 mingw: handle `subst`-ed "DOS drives"
7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams'
d2c84dad1c mingw: refuse to access paths with trailing spaces or periods
379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh
817ddd64c2 mingw: refuse to access paths with illegal characters
cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors
7530a6287e quote-stress-test: allow skipping some trials
35edce2056 t6130/t9350: prepare for stringent Win32 path validation
55953c77c0 quote-stress-test: accept arguments to test via the command-line
ad15592529 tests: add a helper to stress test argument quoting
a8dee3ca61 Disallow dubiously-nested submodule git directories
9102f958ee protect_ntfs: turn on NTFS protection by default
91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams
6d8684161e mingw: fix quoting of arguments
3a85dc7d53 is_ntfs_dotgit(): speed it up
7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses
288a74bcd2 is_ntfs_dotgit(): only verify the leading segment
a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark
cae0bc09ab rebase: fix format.useAutoBase breakage
945dc55dda format-patch: teach --no-base
700e006c5d t4014: use test_config()
a749d01e1d format-patch: fix indentation
0c47e06176 t3400: demonstrate failure with format.useAutoBase
d9b31db2c4 t7700: stop losing return codes of git commands
3699d69df0 t7700: make references to SHA-1 generic
dcf9a748ca t7700: replace egrep with grep
cfe5eda02a t7700: consolidate code into test_has_duplicate_object()
ae475afc0f t7700: consolidate code into test_no_missing_in_packs()
14b7664df8 doc: replace LKML link with lore.kernel.org
d23f9c8e04 RelNotes: replace Gmane with real Message-IDs
dcee037228 doc: replace MARC links with lore.kernel.org
a9aecc7abb checkout, restore: support the --pathspec-from-file option
cfd9376c1d doc: restore: synchronize <pathspec> description
8ea1189eac doc: checkout: synchronize <pathspec> description
6fdc9ad259 doc: checkout: fix broken text reference
1d022bb43f doc: checkout: remove duplicate synopsis
bebb5d6d6b add: support the --pathspec-from-file option
21bb3083c3 cmd_add: prepare for next patch
4778452597 Merge branch 'prevent-name-squatting-on-windows'
a7b1ad3b05 Merge branch 'jk/fast-import-unsafe'
525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()`
e1d911dd4c mingw: disallow backslash characters in tree objects' file names
0060fd1511 clone --recurse-submodules: prevent name squatting on Windows
a52ed76142 fast-import: disallow "feature import-marks" by default
68061e3470 fast-import: disallow "feature export-marks" by default
019683025f fast-import: delay creating leading directories for export-marks
e075dba372 fast-import: stop creating leading directories for import-marks
11e934d56e fast-import: tighten parsing of boolean command line options
816f806786 t9300: create marks files for double-import-marks test
f94804c1f2 t9300: drop some useless uses of cat
4f3e57ef13 submodule--helper: advise on fatal alternate error
10c64a0b3c Doc: explain submodule.alternateErrorStrategy
ec48540fe8 packfile.c: speed up loading lots of packfiles
3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value
a4fb016ba1 pkt-line: fix a typo
0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r
e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data
228f53135a The second batch
6c630f237e Merge branch 'jk/gitweb-anti-xss'
3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell'
4775e02a5c Merge branch 'ma/t7004'
a6c6f8d02a Merge branch 'js/complete-svn-recursive'
3ae8defaf9 Merge branch 'jk/send-pack-remote-failure'
aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix'
4ab9616c76 Merge branch 'sg/skip-skipped-prereq'
723a8adba5 Merge branch 'ds/test-read-graph'
9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation'
406ca29e0d Merge branch 'rs/parse-options-dup-null-fix'
fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging'
8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion'
ef8f621045 Merge branch 'dl/complete-rebase-onto'
3c3e5d0ea2 Merge branch 'tg/stash-refresh-index'
43c5fe1c1d Merge branch 'nn/doc-rebase-merges'
6511cb33c9 Merge branch 'dd/sequencer-utf8'
f165457618 Merge branch 'jk/remove-sha1-to-hex'
a774064fb0 Merge branch 'dj/typofix-merge-strat'
ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates'
d2489ce92c Merge branch 'rs/skip-iprefix'
376e7309e1 Merge branch 'ln/userdiff-elixir'
9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log'
d3096d2ba6 Merge branch 'en/doc-typofix'
26f20fa3fc Merge branch 'ns/test-desc-typofix'
ffd130a363 Merge branch 'en/t6024-style'
5149902ff9 Merge branch 'en/misc-doc-fixes'
bcb06e204c Merge branch 'js/fetch-multi-lockfix'
d08daec001 Merge branch 'rs/trace2-dots'
fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix'
bad5ed39cd Merge branch 'cb/curl-use-xmalloc'
7ab2088255 Merge branch 'rt/fetch-message-fix'
f089ddd56a Merge branch 'es/myfirstcontrib-updates'
3c90710c0c Merge branch 'hw/config-doc-in-header'
d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code'
5444d52866 Merge branch 'js/vreportf-wo-buffering'
05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add'
ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides'
532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default'
dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists'
fac9ab1419 Merge branch 'ma/bisect-doc-sample-update'
a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix'
0be5caf97c Merge branch 'jc/log-graph-simplify'
0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck'
2e697ced9d built-in add -i: offer the `quit` command
d7633578b5 built-in add -i: re-implement the `diff` command
8746e07277 built-in add -i: implement the `patch` command
ab1e1cccaf built-in add -i: re-implement `add-untracked` in C
c54ef5e424 built-in add -i: re-implement `revert` in C
a8c45be939 built-in add -i: implement the `update` command
f37c226454 built-in add -i: prepare for multi-selection commands
c08171d156 built-in add -i: allow filtering the modified files list
0c3944a628 add-interactive: make sure to release `rev.prune_data`
4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance
867fc7f310 grep: don't return an expression from pcre2_free()
c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables
72b006f4bf gpg-interface: prefer check_signature() for GPG verification
7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD
b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r
ccd469450a date.c: switch to reentrant {gm,local}time_r
271c351b2f t7811: don't create unused file
65efb42862 t9300: don't create unused file
f6b9413baf sequencer: fix a memory leak in sequencer_continue()
3eae30e464 doc: replace public-inbox links with lore.kernel.org
46c67492aa doc: recommend lore.kernel.org over public-inbox.org
5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects
17a4ae92ea t7700: s/test -f/test_path_is_file/
d2eee32a89 t7700: move keywords onto their own line
7a1c8c2346 t7700: remove spaces after redirect operators
09279086e8 t7700: drop redirections to /dev/null
756ee7fc9f t7501: stop losing return codes of git commands
38c1aa01de t7501: remove spaces after redirect operators
763b47bafa t5703: stop losing return codes of git commands
eacaa1c180 t5703: simplify one-time-sed generation logic
a29b2429e5 t5317: use ! grep to check for no matching lines
6c37f3ec1b t5317: stop losing return codes of git commands
b66e0a1773 t4138: stop losing return codes of git commands
afd43c9905 t4015: use test_write_lines()
946d2353a3 t4015: stop losing return codes of git commands
50cd31c652 t3600: comment on inducing SIGPIPE in `git rm`
3b737381d8 t3600: stop losing return codes of git commands
0d913dfa7e t3600: use test_line_count() where possible
29a40b5a67 t3301: stop losing return codes of git commands
9b5a9fa60a t0090: stop losing return codes of git commands
17aa9d9c1a t0014: remove git command upstream of pipe
77a946be98 apply-one-time-sed.sh: modernize style
176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job
ed254710ee test: use test_must_be_empty F instead of test_cmp empty F
c74b3cbb83 t7812: add missing redirects
213dabf49d test: use test_must_be_empty F instead of test -z $(cat F)
c93a5aaec8 t1400: use test_must_be_empty
6e4826ea75 t1410: use test_line_count
a5d04a3ef9 t1512: use test_line_count
54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd()
2059e79c0d name-rev: use skip_prefix() instead of starts_with()
1768aaf01d push: use skip_prefix() instead of starts_with()
ec6ee0c07a shell: use skip_prefix() instead of starts_with()
7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with()
a6293f5d28 fetch: use skip_prefix() instead of starts_with()
13ca8fb79e t5150: skip request-pull test if Perl is disabled
ecc0869080 commit-graph: use start_delayed_progress()
44a4693bfc progress: create GIT_PROGRESS_DELAY
528d9e6d01 t/perf: don't depend on Git.pm
b8dcc45387 perf-lib: use a single filename for all measurement types
fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk'
d82dfa7f5b rebase -i: finishing touches to --reset-author-date
1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory
393adf7a6f sequencer: directly call pick_commits() from complete_action()
a2dd67f105 rebase: fill `squash_onto' in get_replay_opts()
3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function
34065541e3 sequencer: update `done_nr' when skipping commands in a todo list
8638114e06 sequencer: update `total_nr' when adding an item to a todo list
0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk
ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk
ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions
9917eca794 l10n: zh_TW: add translation for v2.24.0
0a8e3036a3 reset: parse rev as tree-ish in patch mode
f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits
8d483c8408 doc: document 'git submodule status --cached'
befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick
ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later
9a780a384d mingw: spawned processes need to inherit only standard handles
c5a03b1e29 mingw: work around incorrect standard handles
eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes
a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool
43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values
2d05ef2778 sequencer: fix empty commit check when amending
ea8b7be147 git svn: stop using `rebase --preserve-merges`
67a6ea6300 gpg-interface: limit search for primary key fingerprint
392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern
cff4e9138d sparse-checkout: check for dirty status
416adc8711 sparse-checkout: update working directory in-process for 'init'
f75a69f880 sparse-checkout: cone mode should not interact with .gitignore
fb10ca5b54 sparse-checkout: write using lockfile
99dfa6f970 sparse-checkout: use in-process update for disable subcommand
e091228e17 sparse-checkout: update working directory in-process
e9de487aa3 sparse-checkout: sanitize for nested folders
4dcd4def3c unpack-trees: add progress to clear_ce_flags()
eb42feca97 unpack-trees: hash less in cone mode
af09ce24a9 sparse-checkout: init and set in cone mode
96cc8ab531 sparse-checkout: use hashmaps for cone patterns
879321eb0b sparse-checkout: add 'cone' mode
e6152e35ff trace2: add region in clear_ce_flags
72918c1ad9 sparse-checkout: create 'disable' subcommand
7bffca95ea sparse-checkout: add '--stdin' option to set subcommand
f6039a9423 sparse-checkout: 'set' subcommand
d89f09c828 clone: add --sparse mode
bab3c35908 sparse-checkout: create 'init' subcommand
94c0956b60 sparse-checkout: create builtin with 'list' subcommand
679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files
df6d3d6802 lib-bash.sh: move `then` onto its own line
2a02262078 t5520: replace `! git` with `test_must_fail git`
c245e58bb6 t5520: remove redundant lines in test cases
a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp
e959a18ee7 t5520: don't put git in upstream of pipe
5540ed27bc t5520: test single-line files by git with test_cmp
dd0f1e767b t5520: use test_cmp_rev where possible
979f8891cc t5520: replace test -{n,z} with test-lib functions
3037d3db90 t5520: use test_line_count where possible
93a9bf876b t5520: remove spaces after redirect operator
ceeef863de t5520: replace test -f with test-lib functions
4c8b046f82 t5520: let sed open its own input
53c62b9810 t5520: use sq for test case names
e8d1eaf9b4 t5520: improve test style
2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals
8cb7980382 t0000: test multiple local assignment
5b583e6a09 format-patch: pass notes configuration to range-diff
bd36191886 range-diff: pass through --notes to `git log`
9f726e1b87 range-diff: output `## Notes ##` header
3bdbdfb7a5 t3206: range-diff compares logs with commit notes
75c5aa0701 t3206: s/expected/expect/
79f3950d02 t3206: disable parameter substitution in heredoc
3a6e48e9f7 t3206: remove spaces after redirect operators
26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish
077a1fda82 userdiff: support Python async functions
3798149a74 SubmittingPatches: use `--pretty=reference`
1f0fc1db85 pretty: implement 'reference' format
618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type
0df621172d pretty: provide short date format
ac52d9410e t4205: cover `git log --reflog -z` blindspot
3e8ed3b93e pretty.c: inline initalize format_context
4982516451 revision: make get_revision_mark() return const pointer
f0f9de2bd7 completion: complete `tformat:` pretty format
fb2ffa77a6 SubmittingPatches: remove dq from commit reference
bae74c9dfb pretty-formats.txt: use generic terms for hash
bd00717eab SubmittingPatches: use generic terms for hash
9d45ac4cbf rev-list-options.txt: remove reference to --show-notes
828e829b9e argv-array: add space after `while`
e440fc5888 commit: support the --pathspec-from-file option
66a25a7242 doc: commit: synchronize <pathspec> description
64bac8df97 reset: support the `--pathspec-from-file` option
d137b50756 doc: reset: synchronize <pathspec> description
24e4750c96 pathspec: add new function to parse file
0dbc4a0edf ci(osx): update homebrew-cask repository with less noise
e02058a729 sequencer: handle rebase-merges for "onto" message
bae60ba7e9 builtin/unpack-objects.c: show throughput progress
2d92ab32fd rev-parse: make --show-toplevel without a worktree an error
9e5afdf997 fetch: add trace2 instrumentation
4c4066d95d run-command: move doc to run-command.h
6c51cb525d trace2: move doc to trace2.h
7db0305438 parse-options: add link to doc file in parse-options.h
d95a77d059 submodule-config: move doc to submodule-config.h
f3b9055624 credential: move doc to credential.h
bbcfa3002a tree-walk: move doc to tree-walk.h
971b1f24a2 argv-array: move doc to argv-array.h
f1ecbe0f53 trace: move doc to trace.h
13aa9c8b70 cache: move doc to cache.h
c0be43f898 sigchain: move doc to sigchain.h
19ef3ddd36 pathspec: move doc to pathspec.h
301d595e72 revision: move doc to revision.h
3a1b3415d9 attr: move doc to attr.h
126c1ccefb refs: move doc to refs.h
d27eb356bf remote: move doc to remote.h and refspec.h
405c6b1fbc sha1-array: move doc to sha1-array.h
d3d7172e40 merge: move doc to ll-merge.h
3f1480b745 graph: move doc to graph.h and graph.c
266f03eccd dir: move doc to dir.h
13c4d7eb22 diff: move doc to diff.h and diffcore.h
cd5522271f rebase -r: let `label` generate safer labels
867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()`
8c15904462 built-in add -i: implement the `help` command
3d965c7674 built-in add -i: use color in the main loop
68db1cbf8e built-in add -i: support `?` (prompt help)
76b743234c built-in add -i: show unique prefixes of the commands
6348bfba58 built-in add -i: implement the main loop
a376e37b2c gitweb: escape URLs generated by href()
b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI
f28bceca75 t/gitweb-lib.sh: drop confusing quotes
0eba60c9b7 t9502: pass along all arguments in xss helper
932757b0cc INSTALL: use existing shell scripts as example
b018719927 t7004: check existence of correct tag
1daaebcaa5 built-in add -i: color the header in the `status` command
5e82b9e4d2 built-in add -i: implement the `status` command
e4cb659ebd diff: export diffstat interface
f83dff60a7 Start to implement a built-in version of `git add --interactive`
df53c80822 stash: make sure we have a valid index before writing it
ad7a403268 send-pack: check remote ref status on pack-objects failure
d91ce887c9 t6120-describe: correct test repo history graph in comment
1f9247a3bd completion: tab-complete "git svn --recursive"
603960b50e promisor-remote: remove fetch_if_missing=0
e362fadcd0 clone: remove fetch_if_missing=0
169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL
51bd6be32d mingw: use COPY_ARRAY for copying array
4bd0593e0f test-tool: use 'read-graph' helper
e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway
d784d978f6 t4215: use helper function to check output
61eea521fe fsmonitor: do not compare bitmap size with size of split index
b19f3fe9dd hex: drop sha1_to_hex()
c1ce9c06d0 completion: learn to complete `git rebase --onto=`
f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls
d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase
aa6d7f93ed hex: drop sha1_to_hex_r()
52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch
5772b0c745 sequencer: reencode old merge-commit message
e0eba649e8 bundle-verify: add --quiet
79862b6b77 bundle-create: progress output control
73c3253d75 bundle: framework for options before bundle file
68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in"
b375744274 sequencer: reencode squashing commit's message
019a9d8362 sequencer: reencode revert/cherry-pick's todo list
0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list
e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding
1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary
d9f6f3b619 The first batch post 2.24 cycle
28014c1084 Merge branch 'bc/hash-independent-tests-part-6'
57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree'
c22f63c40f Merge branch 'pb/pretty-email-without-domain-part'
5731ca3657 Merge branch 'hw/remove-api-docs-placeholder'
14b58c62bc Merge branch 'sg/commit-graph-usage-fix'
eff313f8a7 Merge branch 'dl/apply-3way-diff3'
db806d7064 Merge branch 'sg/dir-trie-fixes'
f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix'
8f1119b988 Merge branch 'wb/midx-progress'
d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes'
0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges'
8f40d89783 Merge branch 'hv/bitshift-constants-in-blame'
d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head'
5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer'
b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc'
15d9f3dc66 Merge branch 'es/walken-tutorial'
026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor'
ed28358833 convert: use skip_iprefix() in validate_encoding()
89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding()
03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules
ae821ffe83 multimail: fix a few simple spelling errors
557c5895c2 sha1dc: fix trivial comment spelling error
aa74be316a Fix spelling errors in test commands
96c0caf5e3 Fix spelling errors in messages shown to users
4dc8b1c114 Fix spelling errors in names of tests
7a40cf1553 Fix spelling errors in comments of testcases
15beaaa3d1 Fix spelling errors in code comments
a807200f67 userdiff: add Elixir to supported userdiff languages
461caf3e8a git-shortlog.txt: include commit limiting options
6462d5eb9a fetch: remove fetch_if_missing=0
46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion
99b2ba35f5 t0028: eliminate non-standard usage of printf
add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul`
14c4776d75 t: fix typo in test descriptions
270de6acbe t6024: modernize style
77363a51fb name-hash.c: remove duplicate word in comment
c92faa4d22 hashmap: fix documentation misuses of -> versus .
a6d39f2efb git-filter-branch.txt: correct argument name typo
4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators
8915297925 Fix spelling errors in documentation outside of Documentation/
031fd4b93b Documentation: fix a bunch of typos, both old and new
dd0b61f577 fsmonitor: fix watchman integration
5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare()
7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph
c14e6e7903 fetch: add the command-line option `--write-commit-graph`
da72936f54 Git 2.24
1d34d425d4 Merge branch 'bc/doc-use-docbook-5'
dac1d83c91 Merge branch 'ds/commit-graph-on-fetch'
c32ca691c2 Merge branch 'jt/delay-fetch-if-missing'
ab6b50e4c8 Merge https://github.com/prati0100/git-gui
93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po
a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2
fe28ad8520 rebase: add --reset-author-date
08187b4cba rebase -i: support --ignore-date
0185c683c9 sequencer: rename amend_author to author_to_rename
cbd8db17ac rebase -i: support --committer-date-is-author-date
c068bcc59b sequencer: allow callers of read_author_script() to ignore fields
ba51d2fb24 rebase -i: add --ignore-whitespace flag
3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower
3ada78de3f myfirstcontrib: add dependency installation step
4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt
4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly
8dfb04ae96 update-index: optionally leave skip-worktree entries alone
116d1fa6c6 vreportf(): avoid relying on stdio buffering
efd5444238 RelNotes/2.24.0: fix self-contradictory note
391c7e40b5 fetch.c: fix typo in a warning message
55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template
849e43680d RelNotes/2.24.0: typofix
0115e5d929 git-diff.txt: document return code of `--no-index`
798d66e35d l10n: de.po: Update German translation
c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u)
f21f8f5d35 Git 2.24-rc2
8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix'
0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix'
f2db52c46b Merge branch 'js/mingw-needs-hiding-fix'
5b7594abdc Merge branch 'master' of github.com:vnwildman/git
034d33653a Merge branch 'next' of github.com:ChrisADR/git-po
26b061007c submodule: teach set-url subcommand
460782b7be t7519-status-fsmonitor: improve comments
d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses
4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config
1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694)
f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0
762d5b4f46 help: add gitsubmodules to the list of guides
76a53d640f git_path(): handle `.lock` files correctly
3ce47211a6 t1400: wrap setup code in test case
44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string
6c02042139 clone: rename static function `dir_exists()`.
8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command
77200e9332 l10n: es: 2.24.0 round 2
e42df36b42 Merge branch 'l10n/it/update-italian-translation'
5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2
51728480fe l10n: fr v2.24.0 rnd2
045a548698 l10n: git.pot: v2.24.0 round 2 (1 new)
468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master
b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree()
c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit()
103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag()
f648ee7088 fsck: rename vague "oid" local variables
cc579000bf fsck: don't require an object struct in verify_headers()
7854399366 fsck: don't require an object struct for fsck_ident()
b8b00f1693 fsck: drop blob struct from fsck_finish()
6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob()
38370253fd fsck: don't require an object struct for report()
f59793763d fsck: only require an oid for skiplist functions
5afc4b1dc6 fsck: only provide oid/type in fsck_error callback
82ef89b318 fsck: don't require object structs for display functions
733902905d fsck: use oids rather than objects for object_name API
d40bbc109b fsck_describe_object(): build on our get_object_name() primitive
a59cfb3230 fsck: unify object-name code
23a173a761 fsck: require an actual buffer for non-blobs
2175a0c601 fsck: stop checking tag->tagged
ec65231571 fsck: stop checking commit->parent counts
1de6007d85 fsck: stop checking commit->tree value
228c78fbd4 commit, tag: don't set parsed bit for parse failures
60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()`
8b656572ca builtin/commit-graph.c: remove subcommand-less usage string
fa26d5ede6 t4048: abstract away SHA-1-specific constants
cf02be8486 t4045: make hash-size independent
38ee26b2a3 t4044: update test to work with SHA-256
37ab8ebef1 t4039: abstract away SHA-1-specific constants
0370b35414 t4038: abstract away SHA-1 specific constants
0253e126a2 t4034: abstract away SHA-1-specific constants
45e2ef2b1d t4027: make hash-size independent
79b0edc1a0 t4015: abstract away SHA-1-specific constants
840624ff55 t4011: abstract away SHA-1-specific constants
32a6707267 t4010: abstract away SHA-1-specific constants
440bf91dfa t3429: remove SHA1 annotation
0b408ca2bd t1305: avoid comparing extensions
2eabd38313 rev-parse: add a --show-object-format option
52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode
45e206f0d8 t4203: use test-lib.sh definitions
2ae4944aac t6006: use test-lib.sh definitions
cb99a34e23 commit-graph: fix writing first commit-graph during fetch
e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug
7b4fb434b4 documentation: remove empty doc files
566a1439f6 Git 2.24-rc1
04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix'
4d6fb2beeb Merge branch 'ds/feature-macros'
5f0b6ed907 Merge branch 'js/azure-ci-osx-fix'
c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs'
1b4f85285f Merge branch 'dl/submodule-set-branch'
c7aadccba0 fetch: delay fetch_if_missing=0 until after config
c11e9966cb repo-settings: read an int for index.version
091489d068 apply: respect merge.conflictStyle in --3way
aa76ae4905 t4108: demonstrate bug in apply
95806205cd t4108: use `test_config` instead of `git config`
b0069684d4 t4108: remove git command upstream of pipe
fa87b81385 t4108: replace create_file with test_write_lines
7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job
6c96630cb0 config: move documentation to config.h
d81542e6f3 Eleventh batch
e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix'
d45d771978 Merge branch 'bc/smart-http-atomic-push'
22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix'
2e215b7959 Merge branch 'sb/userdiff-dts'
e3cf08361a Merge branch 'sg/progress-fix'
b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix'
c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc'
f45f88b2e4 path.c: don't call the match function without value in trie_find()
c72fc40d09 path.c: clarify two field names in 'struct common_dir'
8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file
7cb8c929d7 path.c: clarify trie_find()'s in-code comment
e536b1fedf Documentation: mention more worktree-specific exceptions
680cba2c2b multi-pack-index: add [--[no-]progress] option.
64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack
ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file
8dc18f8937 midx: add progress to expire_midx_packs
840cef0c70 midx: add progress to write_midx_file
efbc3aee08 midx: add MIDX_PROGRESS flag
0eb3671ed9 ci(osx): use new location of the `perforce` cask
da1e295e00 t604[236]: do not run setup in separate tests
49b8133a9e merge-recursive: fix merging a subdirectory into the root directory
d3eebaad5e merge-recursive: clean up get_renamed_dir_portion()
80736d7c5e doc: am --show-current-patch gives an entire e-mail message
a8e2c0eadc t7419: change test_must_fail to ! for grep
19c29e538e t4014: make output-directory tests self-contained
12a4aeaad8 Merge branch 'js/azure-pipelines-msvc'
399c23c046 ci(visual-studio): actually run the tests in parallel
711cd6d15c ci(visual-studio): use strict compile flags, and optimization
370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0
cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master
907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master
13bcea8c7f l10n: fr 2.24.0 rnd 1
135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master
3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed)
8da56a4848 userdiff: fix some corner cases in dts regex
86795774bb builtin/blame.c: constants into bit shift format
feebd2d256 rebase: hide --preserve-merges option
0e40a73a4c Doc: Bundle file usage
78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error
12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error
c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error
2b6f6ea1bd test-progress: fix test failures on big-endian systems
f757409e36 l10n: bg.po: Updated Bulgarian translation (4693)
176f5adfdb completion: clarify installation instruction for zsh
d966095db0 Git 2.24-rc0
90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array'
3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth'
d0258d0944 Merge branch 'rs/http-push-simplify'
bb52def6da Merge branch 'jj/stash-reset-only-toplevel'
f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs'
e5fca6b573 Merge branch 'bb/compat-util-comment-fix'
43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup'
07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely'
2d74d28ee0 Merge branch 'dl/compat-cleanup'
9b83a94829 Merge branch 'ta/t1308-typofix'
376012c919 Merge branch 'js/doc-stash-save'
10da030ab7 grep: avoid leak of chartables in PCRE2
513f2b0bbd grep: make PCRE2 aware of custom allocator
57d4660468 grep: make PCRE1 aware of custom allocator
d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand
8af69cf3e2 t3301: test diagnose messages for too few/many paramters
6f1194246a remote-curl: pass on atomic capability to remote side
bbb13e8188 graph: fix coloring of octopus dashes
92beecc136 graph: flatten edges that fuse with their right neighbor
479db18bc0 graph: smooth appearance of collapsing edges on commit lines
0195285b95 graph: rename `new_mapping` to `old_mapping`
d62893ecc1 graph: commit and post-merge lines for left-skewed merges
0f0f389f12 graph: tidy up display of left-skewed merges
458152cce1 graph: example of graph output that can be simplified
ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state
46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()`
a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()`
9157a2a032 graph: reuse `find_new_column_by_commit()`
210179a20d graph: handle line padding in `graph_next_line()`
fbccf255f9 graph: automatically track display width of graph lines
5374a290aa fetch-pack: write fetched refs to .promisor
4627bc777e sequencer: run post-commit hook
49697cb721 move run_commit_hook() to libgit and use it there
12bb7a540a sequencer.h fix placement of #endif
6a619ca03c t3404: remove uneeded calls to set_fake_editor
b2dbacbddf t3404: set $EDITOR in subshell
88a92b6c73 t3404: remove unnecessary subshell
bf8e65b30b format-patch: teach --cover-from-description option
a92331df18 format-patch: use enum variables
46273df7bf format-patch: replace erroneous and condition
3b3c79f6c9 diff-highlight: fix a whitespace nit
108b97dc37 Ninth batch
cbe8cdd3a0 Merge branch 'jk/coc'
3b9ec27919 Merge branch 'js/trace2-fetch-push'
c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch'
1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup'
eb3de5b823 Merge branch 'js/xdiffi-comment-updates'
4e8371ec26 Merge branch 'dl/t0000-skip-test-test'
b6d712fa4e Merge branch 'tg/range-diff-output-update'
77458870a5 Merge branch 'gs/sq-quote-buf-pretty'
5efabc7ed9 Merge branch 'ew/hashmap'
d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files'
6ed610b968 Merge branch 'am/t0028-utf16-tests'
5b900fb812 Merge branch 'dl/octopus-graph-bug'
16d9d7184b Merge branch 'en/fast-imexport-nested-tags'
6d5291be45 Merge branch 'js/azure-pipelines-msvc'
ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd'
d96e31e390 Merge branch 'js/fetch-jobs'
280bd44551 Merge branch 'en/merge-recursive-cleanup'
062a309d36 remote-curl: use argv_array in parse_push()
a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes
5cc6a4be11 http-push: simplify deleting a list item
556895d0c8 stash: avoid recursive hard reset on submodules
b524f6b399 Merge branch 'ka/japanese-translation'
f6f3824b4e git-gui: improve Japanese translation
61f4b407d3 Merge branch 'py/readme'
1e6880fd06 git-gui: add a readme
edefc31873 format-patch: create leading components of output directory
68b69211b2 git-compat-util: fix documentation syntax
fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth()
e0479fa073 documentation: add tutorial for object walking
3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed
4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target
9cad1c4488 pthread.h: manually align parameter lists
8c1cfd58e3 t1308-config-set: fix a test that has a typo
57d8f4b4c7 doc(stash): clarify the description of `save`
08da6496b6 Eighth batch
07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup'
f0d407e6ae Merge branch 'kt/add-i-progress'
66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree'
a4c5d9f66e Merge branch 'rs/dedup-includes'
159cdabd87 Merge branch 'js/range-diff-noprefix'
93424f1f7d Merge branch 'cb/pcre1-cleanup'
a73f91774c Merge branch 'ab/pcre-jit-fixes'
4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword'
020011f2cb Merge branch 'tk/git-svn-trim-author-name'
676278f8ea Merge branch 'bc/object-id-part17'
aafb75452b Merge branch 'en/clean-nested-with-ignored'
3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails
5cdf2301d4 add a Code of Conduct document
70bf0b755a Seventh batch
9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat'
2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary'
d17f54947d Merge branch 'rs/convert-fix-utf-without-dash'
82c80f98e6 Merge branch 'py/git-gui-has-maintainer'
6e12570822 Merge branch 'ah/cleanups'
772cad0afb Merge branch 'js/diff-rename-force-stable-sort'
424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path'
678a9ca629 Merge branch 'as/shallow-slab-use-fix'
0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix'
042a54d251 Merge branch 'am/visual-studio-config-fix'
03d3b1297c xdiffi: fix typos and touch up comments
b05b40930e t0000: cover GIT_SKIP_TESTS blindspots
d8bc1a518a send-pack: never fetch when checking exclusions
756fb0dedb t4014: treat rev-list output as the expected value
2b6a9b13ca range-diff: don't segfault with mode-only changes
360c7ba330 transport: push codepath can take arbitrary repository
ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments
b657047719 merge-recursive: fix the fix to the diff3 common ancestor label
b744c3af07 Sixth batch
417056578a Merge branch 'bw/submodule-helper-usage-fix'
9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check'
1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a'
59b19bcd9f Merge branch 'cc/multi-promisor'
1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way'
5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort'
eb35c18e42 Merge branch 'sg/travis-help-debug'
cabb145fe3 Merge branch 'rs/alias-use-copy-array'
56c7ab0f4e Merge branch 'sg/t-helper-gitignore'
e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang'
583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules'
337e3f2b49 Merge branch 'rs/nth-switch-code-simplification'
8f53fe1733 Merge branch 'hb/hg-to-git-py3'
ef93bfbd45 Merge branch 'sg/progress-fix'
980351d1ac Merge branch 'js/doc-patch-text'
80693e3f09 Merge branch 'tb/commit-graph-harden'
ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge'
3f84633563 Merge branch 'dl/cocci-everywhere'
caf150ce7d Merge branch 'gs/commit-graph-progress'
1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim'
1398171378 Merge branch 'rs/commit-graph-use-list-count'
773521df26 Merge branch 'rs/nth-parent-parse'
7f17913161 Merge branch 'dl/submodule-set-branch'
cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix'
bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees'
098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack'
37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc'
e392382f95 Merge branch 'dl/complete-rebase-and-archive'
cda8faa37e Merge branch 'jk/commit-graph-cleanup'
36d2fca82b Merge branch 'ss/get-time-cleanup'
ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude'
ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob'
ba2d451122 Merge branch 'tg/stash-refresh-index'
e2b5038d87 hashmap_entry: remove first member requirement from docs
404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry
23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators
c8e424c9c9 hashmap: introduce hashmap_free_entries
8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry *
87571c3f71 hashmap: use *_entry APIs for iteration
939af16eac hashmap_cmp_fn takes hashmap_entry params
f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *"
f0e63c4113 hashmap: use *_entry APIs to wrap container_of
6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *"
973d5eea74 introduce container_of macro
26b455f21e hashmap_put takes "struct hashmap_entry *"
28ee794128 hashmap_remove takes "const struct hashmap_entry *"
b6c5241606 hashmap_get takes "const struct hashmap_entry *"
b94e5c1df6 hashmap_add takes "struct hashmap_entry *"
f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *"
d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *"
d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry
12878c8351 coccicheck: detect hashmap_entry.hash assignment
e010a41216 diff: use hashmap_entry_init on moved_entry.ent
f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo"
de5abb5f7a git-p4: auto-delete named temporary file
c90b652afd Fifth batch
f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1'
b0f8aed48f Merge branch 'ma/user-manual-markup-update'
faf5576a8d Merge branch 'bc/doc-use-docbook-5'
314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes'
70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo'
847650798b Merge branch 'am/mailmap-andrey-mazo'
1a155f2e66 Merge branch 'jc/git-gui-has-maintainer'
1bcef51204 t/oid-info: add empty tree and empty blob values
ecde49bb8a t/oid-info: allow looking up hash algorithm name
11a3d3aadd git-rev-list.txt: prune options in synopsis
7d2f003ee4 Documentation: update the location of the git-gui repo
b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding()
46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines
b35304bf95 ci: really use shallow clones on Azure Pipelines
ab7d854aba tests: let --immediate and --write-junit-xml play well together
be5d88e112 test-tool run-command: learn to run (parts of) the testsuite
5d65ad17a9 vcxproj: include more generated files
030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built
61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable()
e4347c9434 msvc: handle DEVELOPER=1
ed712ef8d5 msvc: ignore some libraries when linking
5b8f9e2417 compat/win32/path-utils.h: add #include guards
41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning
c097b95a26 msvc: avoid using minus operator on unsigned types
dfd557c978 stash apply: report status correctly even in a worktree's subdirectory
d54dea77db fetch: let --jobs=<n> parallelize --multiple, too
87db61a436 trace2: write discard message to sentinel files
83e57b04e6 trace2: discard new traces if target directory has too many files
11c21f22de t4214: demonstrate octopus graph coloring failure
25eb905e14 t4214: explicitly list tags in log
63be8c8dd7 t4214: generate expect in their own test cases
a7a5590c6e t4214: use test_merge
94ba151300 test-lib: let test_merge() perform octopus merges
22541013d0 docs: clarify trace2 version invariants
3d4548e7e2 docs: mention trace2 target-dir mode in git-config
2fe44394c8 treewide: remove duplicate #include directives
dbcd970c27 push: do not pretend to return `int` from `die_push_simple()`
941790d7de fast-export: handle nested tags
8d7d33c1ce t9350: add tests for tags of things other than a commit
a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags
208d69246e fast-export: add support for --import-marks-if-exists
b8f50e5b60 fast-import: add support for new 'alias' command
f73b2aba05 fast-import: allow tags to be identified by mark labels
3164e6bd24 fast-import: fix handling of deleted tags
8085050ab4 add -i: show progress counter in the prompt
69fdb922ad Merge branch 'bw/diff3-conflict-style'
b436825b9b git-gui: support for diff3 conflict style
937b76ed49 range-diff: internally force `diff.noprefix=true`
411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job
25e4b8099c push: add trace2 instrumentation
5fc31180d8 fetch: add trace2 instrumentation
53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value
c3b57dc2a0 git-gui: use existing interface to query a path's attribute
45ab460d4a Merge branch 'js/git-bash-if-available'
0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command
71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only)
54a80a9ad8 wrapper: use a loop instead of repetitive statements
baed6bbb5b diffcore-break: use a goto instead of a redundant if statement
8da02ce62a commit-graph: remove a duplicate assignment
ddb3c856f3 shallow.c: don't free unallocated slabs
8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits
65904b8b2b promisor-remote: skip move_to_tail when no-op
2049b8dc65 diffcore_rename(): use a stable sort
97fff61012 Move git_sort(), a stable sort, into into libgit.a
69f272b922 dir: special case check for the possibility that pathspec is NULL
6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available
bc12974a89 Fourth batch
5a5350940b Merge branch 'ds/commit-graph-on-fetch'
974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch'
9755f70fe6 Merge branch 'ds/include-exclude'
93fc8760e7 Merge branch 'jh/trace2-pretty-output'
640f9cd599 Merge branch 'dl/rebase-i-keep-base'
026428c35e Merge branch 'sg/clean-nested-repo-with-ignored'
21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip'
d693345518 Merge branch 'dl/use-sq-from-test-lib'
d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes'
2be6ccc01a Merge branch 'sg/git-test-boolean'
cf861cd7a0 Merge branch 'rs/get-tagged-oid'
91243b019d Merge branch 'en/filter-branch-deprecation'
9bc67b6658 Merge branch 'en/merge-options-ff-and-friends'
fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden'
cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option'
8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return'
3ff6af7753 Merge branch 'nd/switch-and-restore'
aadac067aa Merge branch 'tb/file-url-to-unc-path'
b57a88a5f1 Merge branch 'js/gitdir-at-unc-root'
6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path'
430439536b Merge branch 'rs/parse-tree-indirect'
991fd97b9a Merge branch 'jk/fast-import-history-bugfix'
74a39b9bcc Merge branch 'mh/notes-duplicate-entries'
37801f0665 Merge branch 'tb/banned-vsprintf-namefix'
21ce0b48f3 Merge branch 'mh/release-commit-memory-fix'
f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup'
bf6136cab8 Merge branch 'rs/strbuf-detach'
a2e22bb3ad Merge branch 'rs/trace2-dst-warning'
1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup'
0281733483 Merge branch 'bc/hash-independent-tests-part-5'
f06fb376ed Merge branch 'jc/test-cleanup'
00bb74453d Merge branch 'dl/compat-cleanup'
59438be06c Merge branch 'js/visual-studio'
cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone'
af2abd870b fast-export: fix exporting a tag and nothing else
c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor
dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit
fd5b820d9c user-manual.txt: change header notation
e79b34533a user-manual.txt: add missing section label
b503a2d515 Makefile: emulate compile in $(HCO) target better
af26e2a9d2 pack-bitmap.h: remove magic number
b06fdead04 promisor-remote.h: include missing header
97b989ee3a apply.h: include missing header
4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name
d928a8388a t0028: add more tests
0b63fd6965 t0028: fix test for UTF-16-LE-BOM
fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration
2e09c01232 name-rev: avoid cutoff timestamp underflow
8464f94aeb promisor-remote.h: drop extern from function declaration
75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp
24c681794f doc: MyFirstContribution: fix cmd placement instructions
c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode
60c60b627e Merge branch 'py/git-git-extra-stuff'
faf420e05a treewide: correct several "up-to-date" to "up to date"
b71c6c3b64 Fix build with core.autocrlf=true
16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff
26e3d1cbea .mailmap: update email address of Andrey Mazo
27ea41c0b4 t/helper: ignore only executable files
7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()
83e3ad3b12 merge-recursive: symlink's descendants not in way
34933d0eff stash: make sure to write refreshed cache
e080b34540 merge: use refresh_and_write_cache
22184497a3 factor out refresh_and_write_cache function
7371612255 commit-graph: add --[no-]progress to write and verify
47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW
253bfe49bd SubmittingPatches: git-gui has a new maintainer
d17ae00c97 hg-to-git: make it compatible with both python3 and python2
4c86140027 Third batch
f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http'
627b826834 Merge branch 'md/list-objects-filter-combo'
b9ac6c59b8 Merge branch 'cc/multi-promisor'
de67293e74 Merge branch 'sg/line-log-tree-diff-optim'
95486229e3 Merge branch 'sg/complete-configuration-variables'
f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook'
a2e524ecf3 Merge branch 'cb/curl-use-xmalloc'
128666753b Merge branch 'jk/drop-release-pack-memory'
917a319ea5 Merge branch 'js/rebase-r-strategy'
7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui
4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout()
0d4304c124 doc: fix reference to --ignore-submodules
af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py
8a3a6817e2 Merge gitk to pick up emergency build fix
2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po
9027af58e2 Makefile: run coccicheck on more source files
43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES)
5dedf7de53 Makefile: define THIRD_PARTY_SOURCES
902b90cf42 clean: fix theoretical path corruption
ca8b5390db clean: rewrap overly long line
09487f2cba clean: avoid removing untracked files in a nested git repository
e86bbcf987 clean: disambiguate the definition of -d
3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run
29b577b960 dir: add commentary explaining match_pathspec_item's return value
89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it
a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case
404ebceda0 dir: also check directories for matching pathspecs
a5e916c745 dir: fix off-by-one error in match_pathspec_item
bbbb6b0b89 dir: fix typo in comment
7541cc5302 t7300: add testcases showing failure to clean specified pathspecs
0eb7c37a8a diff, log doc: small grammer, format, and language fixes
6fae6bd518 diff, log doc: say "patch text" instead of "patches"
2bb74b53a4 Test the progress display
bbf47568ad Revert "progress: use term_clear_line()"
cf6a2d2557 Makefile: strip leading ./ in $(LIB_H)
b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup
689a146c91 commit-graph: use commit_list_count()
59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N"
a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N"
a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base"
cf34337f98 list-objects-filter: give a more specific error sparse parsing error
4c96a77594 list-objects-filter: delay parsing of sparse oid
72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter
83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer
7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>`
226daba280 Doc/Makefile: give mansource/-version/-manual attributes
40e747e89d git-submodule.txt: fix AsciiDoc formatting error
f6461b82b9 Documentation: fix build with Asciidoctor 2
3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
f7a8834ba4 Merge branch 'bp/amend-toggle-bind'
ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit"
9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes
d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog
beffae768a gitk: Add Chinese (zh_CN) translation
56d9cbe68b packfile: expose get_delta_base()
bab28d9f97 builtin/pack-objects: report reused packfile objects
6c8ec8c30a Merge branch 'bw/commit-scrollbuffer'
acfa495519 Merge branch 'bw/amend-checkbutton'
da08d559b7 git-gui: add horizontal scrollbar to commit buffer
ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton
aeeb978ba6 completion: teach archive to use __gitcomp_builtin
2b9bd488ae completion: teach rebase to use __gitcomp_builtin
d49dffde9a completion: add missing completions for log, diff, show
6abada1880 upload-pack: disable commit graph more gently for shallow traversal
fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time
72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set
4fd39c76e6 doc: minor formatting fix
29f4332e66 Quit passing 'now' to date code
c77abf0460 Merge branch 'py/revert-hunks-lines'
5a2bb62180 Merge branch 'bp/widget-focus-hotkeys'
e07446ed5f git-gui: add hotkeys to set widget focus
f981ec18cf cache-tree: do not lazy-fetch tentative tree
f1d4a28250 Second batch
c8ada15456 Merge branch 'bc/reread-attributes-during-rebase'
8f3ba423e7 Merge branch 'tg/t0021-racefix'
a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email'
d49c2c3466 Merge branch 'sb/userdiff-dts'
2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe'
4c49dd042d Merge branch 'nd/diff-parseopt'
d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix'
8ce8a63b46 Merge branch 'ds/midx-expire-repack'
9437394661 Merge branch 'cb/fetch-set-upstream'
af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix'
fa9e7934c7 Merge branch 'bm/repository-layout-typofix'
d1a251a1fa Merge branch 'en/checkout-mismerge-fix'
e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental'
f4f8dfe127 Merge branch 'ds/feature-macros'
4a12f89865 Merge branch 'jk/eoo'
b4a1eec332 Merge branch 'jk/repo-init-cleanup'
70336bd50a Merge branch 'py/git-gui-do-quit'
ad7c543e3b grep: skip UTF8 checks explicitly
0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration()
b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration
4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor
b7e1ba5649 git-merge-index.txt: wrap shell listing in "----"
38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----"
5371813768 git-ls-remote.txt: wrap shell listing in "----"
1925fe0c8a Documentation: wrap config listings in "----"
922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor
2017956a19 Documentation: wrap blocks with "--"
dd2e50a84e commit-graph: turn off save_commit_buffer
67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits
806278dead commit-graph.c: handle corrupt/missing trees
16749b8dd2 commit-graph.c: handle commit parsing errors
23424ea759 t/t5318: introduce failing 'git commit-graph write' tests
bf1e28e0ad builtin/rebase.c: Remove pointless message
d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing
bd482d6e33 t: use common $SQ variable
3a37876b5d pack-objects: drop packlist index_pos optimization
7e6b96c73b test-read-cache: drop namelen variable
e4b369069e diff-delta: set size out-parameter to 0 for NULL delta
7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint
f1cbd033e2 pack-objects: use object_id in packlist_alloc()
0dfed92dfd git-am: handle missing "author" when parsing commit
3960290675 ci: restore running httpd tests
6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests
c77722b3ea use get_tagged_oid()
dad3f0607b tag: factor out get_tagged_oid()
468ce99b77 unpack-trees: rename 'is_excluded_from_list()'
65edd96aec treewide: rename 'exclude' methods to 'pattern'
4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_'
caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list'
ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern'
483e861111 t9902: use a non-deprecated command for testing
9df53c5de6 Recommend git-filter-repo instead of git-filter-branch
7b6ad97939 t6006: simplify, fix, and optimize empty message test
50094ca45f config/format.txt: specify default value of format.coverLetter
c1a6f21cd4 Doc: add more detail for git-format-patch
854b5cb46a t4014: stop losing return codes of git commands
dd2b6b6860 t4014: remove confusing pipe in check_threading()
6bd26f58ea t4014: use test_line_count() where possible
c6ec6dadba t4014: let sed open its own files
f2e2fa8f60 t4014: drop redirections to /dev/null
460609cbd5 t4014: use indentable here-docs
92014b69bb t4014: remove spaces after redirect operators
0ab74e979c t4014: use sq for test case names
cb46c40662 t4014: move closing sq onto its own line
b562a54c01 t4014: s/expected/expect/
e770fbfeff t3005: remove unused variable
da280f5f1a t: use LF variable defined in the test harness
7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch
552fc5016f mingw: apply array.cocci rule
476998d05b t3427: accelerate this test by using fast-export and fast-import
aac6ff7b5b .gitignore: stop ignoring `.manifest` files
2c65d90f75 am: reload .gitattributes after patching it
1577dc0f7c tree: simplify parse_tree_indirect()
50f26bd035 fetch: add fetch.writeCommitGraph config setting
8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set
27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options
0a8bc7068f clarify documentation for remote helpers
80e3658647 help: make help_unknown_ref() NORETURN
313677627a checkout: add simple check for 'git checkout -b'
3441de5b9c gitk: Make web links clickable
a4fa2f0a4c git-gui: allow undoing last revert
414d924beb rebase: teach rebase --keep-base
6330209d7d rebase tests: test linear branch topology
4effc5bc96 rebase: fast-forward --fork-point in more cases
c0efb4c1dd rebase: fast-forward --onto in more cases
2b318aa6c3 rebase: refactor can_fast_forward into goto tower
c9efc21683 t3432: test for --no-ff's interaction with fast-forward
1ebec8dfc1 fast-import: duplicate into history rather than passing ownership
9756082b3c fast-import: duplicate parsed encoding string
86ae43da6a status: mention --skip for revert and cherry-pick
b1b16bba96 completion: add --skip for cherry-pick and revert
deaa65a754 completion: merge options for cherry-pick and revert
4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
793ac7e309 t3432: test rebase fast-forward behavior
359ecebc34 t3431: add rebase --fork-point tests
502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage
ff61681b46 grep: refactor and simplify PCRE1 support
8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1
1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning()
fd99c2dd9b grep: use return value of strbuf_detach()
82f51af345 log-tree: always use return value of strbuf_detach()
7e92756751 http: don't leak urlmatch_config.vars
9784f97321 commit: free the right buffer in release_commit_memory
ce17feb1b3 path: add a function to check for path suffix
60d198d022 banned.h: fix vsprintf()'s ban message
60fe477a0b notes: avoid potential use-after-free during insertion
779ad6641b notes: avoid leaking duplicate entries
4e1a641ee3 mingw: fix launching of externals from Unicode paths
5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly
e2683d51d9 Fix .git/ discovery at the root of UNC shares
d17f2124a7 setup_git_directory(): handle UNC paths correctly
ebb8d2c90f mingw: support UNC in git clone file://server/share/repo
0c37c41d13 t4009: make hash size independent
c1f3dfcc23 t4002: make hash independent
8cc5ff83c3 t4000: make hash size independent
c784815073 t3903: abstract away SHA-1-specific constants
2ccdfb1c78 git-gui: return early when patch fails to apply
62bd99934b git-gui: allow reverting selected hunk
5f0a516de9 git-gui: allow reverting selected lines
fddf2ebe38 transport: teach all vtables to allow fetch first
ac3fda82bf transport-helper: skip ls-refs if unnecessary
745f681289 First batch after Git 2.23
d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg'
22e86e85cb Merge branch 'en/fast-import-merge-doc'
9c7573581c Merge branch 'jk/perf-no-dups'
4336fdb2ef Merge branch 'rs/nedalloc-fixlets'
8ae7a46c4d Merge branch 'sg/show-failed-test-names'
6ba06b582b Merge branch 'sg/commit-graph-validate'
072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix'
207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix'
77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests'
1b01cdbf2e Merge branch 'jk/tree-walk-overflow'
8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix'
307179732d Merge branch 'mt/grep-submodules-working-tree'
58166c2e9d t0021: make sure clean filter runs
8b3f33ef11 ref-filter: initialize empty name or email fields
3c81760bc6 userdiff: add a builtin pattern for dts files
fe49814409 t4014: drop unnecessary blank lines from test cases
a2bb801f6a line-log: avoid unnecessary full tree diffs
eef5204190 line-log: extract pathspec parsing from line ranges into a helper function
a63694f523 diff: skip GITLINK when lazy fetching missing objs
7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe
19800bdc3f parseopt: move definition of enum parse_opt_result up
415b770b88 packfile.h: drop extern from function declaration
acb49d1cc8 t3800: make hash-size independent
ca6ba94200 t3600: make hash size independent
19ce5496c2 t3506: make hash independent
9a6738c061 t3430: avoid hard-coded object IDs
4dd1b5f90f t3404: abstract away SHA-1-specific constants
b99bfc7a6c t3306: abstract away SHA-1-specific constants
e3e9d02e35 t3305: make hash size independent
b408cf8cf6 t3301: abstract away SHA-1-specific constants
b561edd213 t3206: abstract away hash size constants
a5f61c7d13 t3201: abstract away SHA-1-specific constants
1c24a54ea4 repository-layout.txt: correct pluralization of 'object'
b0a3186140 sequencer: simplify root commit creation
a47ba3c777 rebase -i: check for updated todo after squash and reword
450efe2d53 rebase -i: always update HEAD before rewording
c581e4a749 grep: under --debug, show whether PCRE JIT is enabled
aaa95dfa05 midx: switch to using the_hash_algo
be8e172e9f builtin/show-index: replace sha1_to_hex
3f34d70d40 rerere: replace sha1_to_hex
fc06be3b7f builtin/receive-pack: replace sha1_to_hex
69fa337060 builtin/index-pack: replace sha1_to_hex
3a4d7aa5ae packfile: replace sha1_to_hex
e0cb7cdb89 wt-status: convert struct wt_status to object_id
8d4d86b0f0 cache: remove null_sha1
f6ca67d673 builtin/worktree: switch null_sha1 to null_oid
dd336a5511 builtin/repack: write object IDs of the proper length
894c0f66bb pack-write: use hash_to_hex when writing checksums
4439c7a360 sequencer: convert to use the_hash_algo
95518faac1 bisect: switch to using the_hash_algo
e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo
fe9fec45f6 config: use the_hash_algo in abbrev comparison
976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
703d2d4193 bundle: switch to use the_hash_algo
9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo
7962e046ff show-index: switch hard-coded constants to the_hash_algo
fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ
7e0d029f18 builtin/rev-parse: switch to use the_hash_algo
319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo
fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo
f6af19a9ad fetch-pack: use parse_oid_hex
36261e42ec patch-id: convert to use the_hash_algo
28ba1830d0 builtin/replace: make hash size independent
24bc1a1292 pull, fetch: add --set-upstream option
71d41ff651 archive-tar: turn length miscalculation warning into BUG
17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header()
82a46af13e archive-tar: fix pax extended header length calculation
4060c1990a archive-tar: report wrong pax extended header length
4615a8cb5b merge-recursive: alphabetize include list
45ef16f77a merge-recursive: add sanity checks for relevant merge_options
f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
5bf7e5779e merge-recursive: split internal fields into a separate struct
e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output
a779fb829b merge-recursive: comment and reorder the merge_options fields
8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options
7c0a6c8e47 merge-recursive: move some definitions around to clean up the header
c749ab1da8 merge-recursive: rename merge_options argument to opt in header
bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity
ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list
4d7101e25c merge-recursive: fix some overly long lines
724dd767b2 cache-tree: share code between functions writing an index as a tree
345480d1ed merge-recursive: don't force external callers to do our logging
b4db8a2b76 merge-recursive: remove useless parameter in merge_trees()
98a1d3d888 merge-recursive: exit early if index != head
9822175d2b Ensure index matches head before invoking merge machinery, round N
10f751c06b merge-recursive: remove another implicit dependency on the_repository
f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks
8e01251694 merge-recursive: introduce an enum for detect_directory_renames values
743474cbfa merge-recursive: provide a better label for diff3 common ancestor
51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u)
5bace62582 l10n: Update Catalan translation
139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()
65c01c6442 checkout: provide better conflict hunk description with detached HEAD
d8523ca1b9 merge-recursive: be consistent with assert
acb7da05ac checkout: remove duplicate code
93b980e58f http: use xmalloc with cURL
64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental
aaf633c2ad repo-settings: create feature.experimental setting
c6cc4c5afd repo-settings: create feature.manyFiles setting
ad0fb65999 repo-settings: parse core.untrackedCache
31b1de6a09 commit-graph: turn on commit-graph by default
b068d9a250 t6501: use 'git gc' in quiet mode
7211b9e753 repo-settings: consolidate some config settings
507e5470a0 worktree remove: clarify error message on dirty worktree
5af9d5f6c8 completion: complete config variables and values for 'git clone --config='
88cd790d6a completion: complete config variables names and values for 'git clone -c'
dd33472831 completion: complete values of configuration variables after 'git -c var='
e1e00089da completion: complete configuration sections and variable names for 'git -c'
42d0efec59 completion: split _git_config()
d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp()
2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names
d9438873c4 completion: deduplicate configuration sections
7a09a8f093 completion: add tests for 'git config' completion
840d7e5b3c completion: complete more values of more 'color.*' configuration variables
08a12175d8 completion: fix a typo in a comment
9827d4c185 packfile: drop release_pack_memory()
d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed
362f8b280c t/perf: rename duplicate-numbered test script
742ed63345 trace2: cleanup whitespace in perf format
e34430556c trace2: cleanup whitespace in normal format
c2b890aca5 quote: add sq_append_quote_argv_pretty()
ad43e37839 trace2: trim trailing whitespace in normal format error message
04f10d332f trace2: remove dead code in maybe_add_string_va()
da4589ce7e trace2: trim whitespace in region messages in perf target format
0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit
5440eb0ea2 git-gui: call do_quit before destroying the main window
bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook
6098817fd7 git-merge: honor pre-merge-commit hook
a1f3dd7eb3 merge: do no-verify like commit
f78f6c7e0c t7503: verify proper hook execution
70597e8386 nedmalloc: avoid compiler warning about unused value
c9b9c09dae nedmalloc: do assignments only after the declaration section
22932d9169 config: stop checking whether the_repository is NULL
5732f2b1ef common-main: delay trace2 initialization
58ebccb478 t1309: use short branch name in includeIf.onbranch test
67feca3b1c gitcli: document --end-of-options
51b4594b40 parse-options: allow --end-of-options as a synonym for "--"
19e8789b23 revision: allow --end-of-options to end option parsing
ffe1afe67c tests: show the test name and number at the start of verbose output
96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests
7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits'
39d8831856 commit-graph: turn a group of write-related macro flags into an enum
9916073be5 t5318-commit-graph: use 'test_expect_code'
620c09e1b6 restore: add test for deleted ita files
ecd72042de checkout.c: unstage empty deleted ita files
a613d4f817 pack-refs: always refresh after taking the lock file
decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd'
371df1bea9 trace2: cleanup column alignment in perf target format
5aa02f9868 tree-walk: harden make_traverse_path() length computations
c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path()
b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len()
37806080d7 tree-walk: use size_t consistently
7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh'
12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh'
9055384710 tree-walk: drop oid from traverse_info
947208b725 setup_traverse_info(): stop copying oid
e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
a63f990d92 t3418: test `rebase -r` with merge strategies
5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges`
e145d99347 rebase -r: support merge strategies other than `recursive`
4e6023b13a t3427: fix another incorrect assumption
f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced
a9c71073da t3427: fix erroneous assumption
b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three
d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case
c248d32cdb t3427: simplify the `setup` test case significantly
8c1e24048a t3427: add a clarifying comment
5efed0ecf9 rebase: fold git-rebase--common into the -p backend
68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone
2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive`
6180b20239 t3400: stop referring to the scripted rebase
d5b581f228 Drop unused git-rebase--am.sh
814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation
6a289d45c0 grep: fix worktree case in submodules
870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching
8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data
09872f6418 grep: create a "is_fixed" member in "grep_pat"
8a35b540a9 grep: consistently use "p->fixed" in compile_regexp()
685668faaa grep: stop using a custom JIT stack with PCRE v1
34489239d0 grep: stop "using" a custom JIT stack with PCRE v2
04bef50c01 grep: remove overly paranoid BUG(...) code
b65abcafc7 grep: use PCRE v2 for optimized fixed-string search
48de2a768c grep: remove the kwset optimization
45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern>
25754125ce grep: make the behavior for NUL-byte in patterns sane
d316af059d grep tests: move binary pattern tests into their own file
471dac5d2c grep tests: move "grep binary" alongside the rest
f463beb805 grep: inline the return value of a function call used only once
b14cf112e2 t4210: skip more command-line encoding tests on MinGW
44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
4e2443b181 log tests: test regex backends in "--encode=<enc>" tests
90d21f9ebf list-objects-filter-options: make parser void
5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW
489fc9ee71 list-objects-filter-options: allow mult. --filter
c2694952e3 strbuf: give URL-encoding API a char predicate fn
cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list
f56f764279 list-objects-filter-options: move error check up
e987df5fe6 list-objects-filter: implement composite filters
842b00516a list-objects-filter-options: always supply *errbuf
7a7c7f4a6d list-objects-filter: put omits set in filter struct
9430147ca0 list-objects-filter: encapsulate filter components
4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c
60b7a92d84 Move repository_format_partial_clone to promisor-remote.c
db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
75de085211 remote: add promisor and partial clone config to the doc
7e154badc0 partial-clone: add multiple remotes in the doc
9a4c507886 t0410: test fetching from many promisor remotes
5e46139376 builtin/fetch: remove unique promisor remote limitation
fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter
b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote()
faf2abf496 promisor-remote: use repository_format_partial_clone
9cfebc1f3b promisor-remote: add promisor_remote_reinit()
9e27beaa23 promisor-remote: implement promisor_remote_get_direct()
48de315817 Add initial support for many promisor remotes
2e860675b6 fetch-object: make functions return an error code
c59c7c879e t0410: remove pipes after git commands
git-subtree-dir: third_party/git
git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
2020-05-22 18:46:45 +02:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1875
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s': need exactly one merge base with branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rebase.c:1878
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s': need exactly one merge base"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1886
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Does not point to a valid commit '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1912
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "fatal: no such branch/commit '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1920 builtin/submodule--helper.c:40
|
|
|
|
|
#: builtin/submodule--helper.c:2414
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "No such ref: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1931
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Could not resolve HEAD to a revision"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1952
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Please commit or stash them."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1988
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not switch to %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:1999
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "HEAD is up to date."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:2001
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Current branch %s is up to date.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:2009
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "HEAD is up to date, rebase forced."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:2011
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Current branch %s is up to date, rebase forced.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:2019
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "The pre-rebase hook refused to rebase."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:2026
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Changes to %s:\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:2029
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Changes from %s to %s:\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:2054
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "First, rewinding head to replay your work on top of it...\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:2063
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Could not detach HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rebase.c:2072
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Fast-forwarded %s to %s.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/receive-pack.c:34
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git receive-pack <git-dir>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/receive-pack.c:1224
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"By default, updating the current branch in a non-bare repository\n"
|
|
|
|
|
"is denied, because it will make the index and work tree inconsistent\n"
|
|
|
|
|
"with what you pushed, and will require 'git reset --hard' to match\n"
|
|
|
|
|
"the work tree to HEAD.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"You can set the 'receive.denyCurrentBranch' configuration variable\n"
|
|
|
|
|
"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
|
|
|
|
|
"its current branch; however, this is not recommended unless you\n"
|
|
|
|
|
"arranged to update its work tree to match what you pushed in some\n"
|
|
|
|
|
"other way.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"To squelch this message and still keep the default behaviour, set\n"
|
|
|
|
|
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/receive-pack.c:1244
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"By default, deleting the current branch is denied, because the next\n"
|
|
|
|
|
"'git clone' won't result in any file checked out, causing confusion.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
|
|
|
|
|
"'warn' or 'ignore' in the remote repository to allow deleting the\n"
|
|
|
|
|
"current branch, with or without a warning message.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"To squelch this message, you can set it to 'refuse'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/receive-pack.c:2422
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "quiet"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/receive-pack.c:2436
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You must specify a directory."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/reflog.c:17
|
|
|
|
|
msgid ""
|
|
|
|
|
"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
|
|
|
|
|
"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
|
|
|
|
|
"<refs>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/reflog.c:22
|
|
|
|
|
msgid ""
|
|
|
|
|
"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
|
|
|
|
|
"<refs>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/reflog.c:25
|
|
|
|
|
msgid "git reflog exists <ref>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reflog.c:568 builtin/reflog.c:573
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a valid timestamp"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reflog.c:606
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Marking reachable objects..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reflog.c:644
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s points nowhere!"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reflog.c:696
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no reflog specified to delete"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reflog.c:705
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "not a reflog: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reflog.c:710
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no reflog for '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reflog.c:756
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid ref format: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reflog.c:765
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git reflog [ show | expire | delete | exists ]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:17
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git remote [-v | --verbose]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:18
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
|
|
|
|
|
"mirror=<fetch|push>] <name> <url>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:19 builtin/remote.c:39
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git remote rename <old> <new>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:20 builtin/remote.c:44
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git remote remove <name>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:21 builtin/remote.c:49
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:22
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git remote [-v | --verbose] show [-n] <name>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:23
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git remote prune [-n | --dry-run] <name>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:24
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:25
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git remote set-branches [--add] <name> <branch>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:26 builtin/remote.c:75
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git remote get-url [--push] [--all] <name>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:27 builtin/remote.c:80
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:28 builtin/remote.c:81
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git remote set-url --add <name> <newurl>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:29 builtin/remote.c:82
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git remote set-url --delete <name> <url>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:34
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git remote add [<options>] <name> <url>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:54
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git remote set-branches <name> <branch>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:55
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git remote set-branches --add <name> <branch>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:60
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git remote show [<options>] <name>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:65
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git remote prune [<options>] <name>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:70
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git remote update [<options>] [<group> | <remote>]..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:99
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Updating %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:131
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"--mirror is dangerous and deprecated; please\n"
|
|
|
|
|
"\t use --mirror=fetch or --mirror=push instead"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:148
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown mirror argument: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:164
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "fetch the remote branches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:166
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "import all tags and associated objects when fetching"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:169
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "or do not fetch any tag at all (--no-tags)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:171
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "branch(es) to track"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:172
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "master branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:174
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "set up remote as a mirror to push to or fetch from"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:186
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "specifying a master branch makes no sense with --mirror"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:188
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "specifying branches to track makes sense only with fetch mirrors"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:195 builtin/remote.c:697
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "remote %s already exists."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:199 builtin/remote.c:701
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a valid remote name"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:239
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not setup master '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:354
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not get fetch map for refspec %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:453 builtin/remote.c:461
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "(matching)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:465
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "(delete)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:654
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not set '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:659
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The %s configuration remote.pushDefault in:\n"
|
|
|
|
|
"\t%s:%d\n"
|
|
|
|
|
"now names the non-existent remote '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:690 builtin/remote.c:833 builtin/remote.c:941
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "No such remote: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:707
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not rename config section '%s' to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:727
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Not updating non-default fetch refspec\n"
|
|
|
|
|
"\t%s\n"
|
|
|
|
|
"\tPlease update the configuration manually if necessary."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:767
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "deleting '%s' failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:801
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "creating '%s' failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:877
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
|
|
|
|
|
"to delete it, use:"
|
|
|
|
|
msgid_plural ""
|
|
|
|
|
"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
|
|
|
|
|
"to delete them, use:"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:891
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not remove config section '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:994
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " new (next fetch will store in remotes/%s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:997
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " tracked"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:999
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " stale (use 'git remote prune' to remove)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1001
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " ???"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1042
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1051
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "rebases interactively onto remote %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1053
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "rebases interactively (with merges) onto remote %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1056
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "rebases onto remote %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1060
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " merges with remote %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1063
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "merges with remote %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1066
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%-*s and with remote %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1109
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "create"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1112
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "delete"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1116
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "up to date"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1119
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "fast-forwardable"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1122
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "local out of date"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1129
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " %-*s forces to %-*s (%s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1132
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " %-*s pushes to %-*s (%s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1136
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " %-*s forces to %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1139
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " %-*s pushes to %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1207
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not query remotes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1234
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "* remote %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1235
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " Fetch URL: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "(no URL)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: the colon ':' should align
|
|
|
|
|
#. with the one in " Fetch URL: %s"
|
|
|
|
|
#. translation.
|
|
|
|
|
#.
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1250 builtin/remote.c:1252
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " Push URL: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " HEAD branch: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1254
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "(not queried)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1256
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "(unknown)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1260
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1272
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " Remote branch:%s"
|
|
|
|
|
msgid_plural " Remote branches:%s"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1275 builtin/remote.c:1301
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " (status not queried)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1284
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " Local branch configured for 'git pull':"
|
|
|
|
|
msgid_plural " Local branches configured for 'git pull':"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1292
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " Local refs will be mirrored by 'git push'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1298
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " Local ref configured for 'git push'%s:"
|
|
|
|
|
msgid_plural " Local refs configured for 'git push'%s:"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1319
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "set refs/remotes/<name>/HEAD according to remote"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1321
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "delete refs/remotes/<name>/HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1336
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Cannot determine remote HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1338
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1348
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not delete %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1356
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Not a valid ref: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1358
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not setup %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1376
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " %s will become dangling!"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1377
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " %s has become dangling!"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1387
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Pruning %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1388
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "URL: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1404
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " * [would prune] %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1407
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid " * [pruned] %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1452
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "prune remotes after fetching"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "No such remote '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1531
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1538
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no remote specified"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1555
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "query push URLs rather than fetch URLs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1557
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "return all URLs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1585
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no URLs configured for remote '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1611
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "manipulate push URLs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1613
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add URL"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1615
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "delete URLs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1622
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--add --delete doesn't make sense"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1661
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid old URL pattern: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1669
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "No such URL found: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/remote.c:1671
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Will not delete all non-push URLs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:25
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git repack [<options>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:30
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Incremental repacks are incompatible with bitmap indexes. Use\n"
|
|
|
|
|
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:197
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not start pack-objects to repack promisor objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:236 builtin/repack.c:421
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "repack: Expecting full hex object ID lines only from pack-objects."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:260
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not finish pack-objects to repack promisor objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:297
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pack everything in a single pack"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:299
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "same as -a, and turn unreachable objects loose"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:302
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "remove redundant packs, and run git-prune-packed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:304
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pass --no-reuse-delta to git-pack-objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:306
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pass --no-reuse-object to git-pack-objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:308
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not run git-update-server-info"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:311
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pass --local to git-pack-objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:313
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "write bitmap index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:315
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "pass --delta-islands to git-pack-objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:316
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "approxidate"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:317
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "with -A, do not loosen objects older than this"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:319
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "with -a, repack unreachable objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:321
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "size of the window used for delta compression"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:322 builtin/repack.c:328
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "bytes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:323
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "same as the above, but limit memory size instead of entries count"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:325
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "limits the maximum delta depth"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:327
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "limits the maximum number of threads"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:329
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "maximum size of each packfile"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:331
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "repack objects in packs marked with .keep"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:333
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not repack this pack"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:343
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot delete packs in a precious-objects repo"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:347
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--keep-unreachable and -A are incompatible"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:430
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Nothing new to pack."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:486
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"WARNING: Some packs in use have been renamed by\n"
|
|
|
|
|
"WARNING: prefixing old- to their name, in order to\n"
|
|
|
|
|
"WARNING: replace them with the new version of the\n"
|
|
|
|
|
"WARNING: file. But the operation failed, and the\n"
|
|
|
|
|
"WARNING: attempt to rename them back to their\n"
|
|
|
|
|
"WARNING: original names also failed.\n"
|
|
|
|
|
"WARNING: Please rename them in %s manually:\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/repack.c:534
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to remove '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:22
|
|
|
|
|
msgid "git replace [-f] <object> <replacement>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:23
|
|
|
|
|
msgid "git replace [-f] --edit <object>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:24
|
|
|
|
|
msgid "git replace [-f] --graft <commit> [<parent>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:25
|
|
|
|
|
msgid "git replace [-f] --convert-graft-file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:26
|
|
|
|
|
msgid "git replace -d <object>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:27
|
|
|
|
|
msgid "git replace [--format=<format>] [-l [<pattern>]]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:90
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"invalid replace format '%s'\n"
|
|
|
|
|
"valid formats are 'short', 'medium' and 'long'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:125
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "replace ref '%s' not found"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:141
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Deleted replace ref '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:153
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a valid ref name"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:158
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "replace ref '%s' already exists"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:178
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Objects must be of the same type.\n"
|
|
|
|
|
"'%s' points to a replaced object of type '%s'\n"
|
|
|
|
|
"while '%s' points to a replacement object of type '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:229
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to open %s for writing"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:242
|
|
|
|
|
msgid "cat-file reported failure"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:258
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to open %s for reading"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:272
|
|
|
|
|
msgid "unable to spawn mktree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:276
|
|
|
|
|
msgid "unable to read from mktree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:285
|
|
|
|
|
msgid "mktree reported failure"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:289
|
|
|
|
|
msgid "mktree did not return an object name"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:298
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to fstat %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:303
|
|
|
|
|
msgid "unable to write object to database"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
|
|
|
|
|
#: builtin/replace.c:454
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "not a valid object name: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:326
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to get object type for %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:342
|
|
|
|
|
msgid "editing object file failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:351
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "new object is the same as the old one: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:384
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not parse %s as a commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:416
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "bad mergetag in commit '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:418
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "malformed mergetag in commit '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:430
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
|
|
|
|
|
"instead of --graft"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:469
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "the original commit '%s' has a gpg signature"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:470
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "the signature will be removed in the replacement commit!"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:480
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not write replacement commit for: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:488
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "graft for '%s' unnecessary"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:492
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "new commit is the same as the old one: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:527
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"could not convert the following graft(s):\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:548
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "list replace refs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:549
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "delete replace refs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:550
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "edit existing object"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:551
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "change a commit's parents"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:552
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "convert existing graft file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:553
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "replace the ref if it exists"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:555
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not pretty-print contents for --edit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:556
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use this format"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:569
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--format cannot be used when not listing"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:577
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "-f only makes sense when writing a replacement"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:581
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--raw only makes sense with --edit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:587
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "-d needs at least one argument"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:593
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "bad number of arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:599
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "-e needs exactly one argument"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:605
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "-g needs at least one argument"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:611
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--convert-graft-file takes no argument"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/replace.c:617
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "only one pattern can be given with -l"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rerere.c:13
|
|
|
|
|
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rerere.c:60
|
|
|
|
|
msgid "register clean resolutions in index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rerere.c:79
|
|
|
|
|
msgid "'git rerere forget' without paths is deprecated"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rerere.c:113
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to generate diff for '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/reset.c:32
|
|
|
|
|
msgid ""
|
|
|
|
|
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/reset.c:33
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/reset.c:34
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/reset.c:35
|
|
|
|
|
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:41
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "mixed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:41
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "soft"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:41
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "hard"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:41
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "merge"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:41
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "keep"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:83
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You do not have a valid HEAD."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:85
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Failed to find tree of HEAD."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:91
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to find tree of %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:116
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "HEAD is now at %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/reset.c:195
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot do a %s reset in the middle of a merge."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595
|
|
|
|
|
#: builtin/stash.c:619
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "be quiet, only report errors"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:297
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "reset HEAD and index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:298
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "reset only HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:300 builtin/reset.c:302
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "reset HEAD, index and working tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:304
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "reset HEAD but keep local changes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:310
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "record only the fact that removed paths will be added later"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:344
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to resolve '%s' as a valid revision."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:352
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to resolve '%s' as a valid tree."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:361
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--patch is incompatible with --{hard,mixed,soft}"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:371
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:373
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot do %s reset with paths."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:388
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s reset is not allowed in a bare repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:392
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "-N can only be used with --mixed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:413
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Unstaged changes after reset:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:416
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
|
|
|
|
|
"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
|
|
|
|
|
"to make this the default.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:434
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not reset index file to revision '%s'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/reset.c:439
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Could not write new index file."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rev-list.c:499
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot combine --exclude-promisor-objects and --missing"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rev-list.c:560
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "object filtering requires --objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rev-list.c:610
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "rev-list does not support display of notes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rev-list.c:615
|
|
|
|
|
msgid "marked counting is incompatible with --objects"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rev-parse.c:409
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rev-parse.c:414
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "keep the `--` passed as an arg"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rev-parse.c:416
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "stop parsing after the first non-option argument"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rev-parse.c:419
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "output in stuck long form"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rev-parse.c:552
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
|
|
|
|
|
" or: git rev-parse --sq-quote [<arg>...]\n"
|
|
|
|
|
" or: git rev-parse [<options>] [<arg>...]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:24
|
|
|
|
|
msgid "git revert [<options>] <commit-ish>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:25
|
|
|
|
|
msgid "git revert <subcommand>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:30
|
|
|
|
|
msgid "git cherry-pick [<options>] <commit-ish>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:31
|
|
|
|
|
msgid "git cherry-pick <subcommand>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:72
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "option `%s' expects a number greater than zero"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:92
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: %s cannot be used with %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:102
|
|
|
|
|
msgid "end revert or cherry-pick sequence"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:103
|
|
|
|
|
msgid "resume revert or cherry-pick sequence"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:104
|
|
|
|
|
msgid "cancel revert or cherry-pick sequence"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:105
|
|
|
|
|
msgid "skip current commit and continue"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:107
|
|
|
|
|
msgid "don't automatically commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:108
|
|
|
|
|
msgid "edit the commit message"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:111
|
|
|
|
|
msgid "parent-number"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:112
|
|
|
|
|
msgid "select mainline parent"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:114
|
|
|
|
|
msgid "merge strategy"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:116
|
|
|
|
|
msgid "option for merge strategy"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:125
|
|
|
|
|
msgid "append commit name"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:127
|
|
|
|
|
msgid "preserve initially empty commits"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:129
|
|
|
|
|
msgid "keep redundant, empty commits"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:232
|
|
|
|
|
msgid "revert failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:245
|
|
|
|
|
msgid "cherry-pick failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rm.c:19
|
|
|
|
|
msgid "git rm [<options>] [--] <file>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rm.c:207
|
|
|
|
|
msgid ""
|
|
|
|
|
"the following file has staged content different from both the\n"
|
|
|
|
|
"file and the HEAD:"
|
|
|
|
|
msgid_plural ""
|
|
|
|
|
"the following files have staged content different from both the\n"
|
|
|
|
|
"file and the HEAD:"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rm.c:212
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"(use -f to force removal)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rm.c:216
|
|
|
|
|
msgid "the following file has changes staged in the index:"
|
|
|
|
|
msgid_plural "the following files have changes staged in the index:"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rm.c:220 builtin/rm.c:229
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"(use --cached to keep the file, or -f to force removal)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rm.c:226
|
|
|
|
|
msgid "the following file has local modifications:"
|
|
|
|
|
msgid_plural "the following files have local modifications:"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rm.c:243
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not list removed files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rm.c:244
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "only remove from the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rm.c:245
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "override the up-to-date check"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rm.c:246
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "allow recursive removal"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rm.c:248
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "exit with a zero status even if nothing matched"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rm.c:282
|
|
|
|
|
msgid "No pathspec was given. Which files should I remove?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/rm.c:305
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "please stage your changes to .gitmodules or stash them to proceed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rm.c:323
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "not removing '%s' recursively without -r"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/rm.c:362
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "git rm: unable to remove %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/send-pack.c:20
|
|
|
|
|
msgid ""
|
|
|
|
|
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
|
|
|
|
|
"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
|
|
|
|
|
"[<ref>...]\n"
|
|
|
|
|
" --all and explicit <ref> specification are mutually exclusive."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/send-pack.c:182
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "remote name"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/send-pack.c:195
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use stateless RPC protocol"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/send-pack.c:196
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "read refs from stdin"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/send-pack.c:197
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "print status from remote helper"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/shortlog.c:15
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/shortlog.c:16
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git log --pretty=short | git shortlog [<options>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/shortlog.c:134
|
|
|
|
|
msgid "using multiple --group options with stdin is not supported"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/shortlog.c:144
|
|
|
|
|
msgid "using --group=trailer with stdin is not supported"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/shortlog.c:388
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown group type: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/shortlog.c:416
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Group by committer rather than author"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/shortlog.c:419
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "sort output according to the number of commits per author"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/shortlog.c:421
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Suppress commit descriptions, only provides commit count"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/shortlog.c:423
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Show the email address of each author"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/shortlog.c:424
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<w>[,<i1>[,<i2>]]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/shortlog.c:425
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Linewrap output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/shortlog.c:427
|
|
|
|
|
msgid "field"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/shortlog.c:428
|
|
|
|
|
msgid "Group by field"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/shortlog.c:456
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "too many arguments given outside repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:13
|
|
|
|
|
msgid ""
|
|
|
|
|
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
|
|
|
|
|
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
|
|
|
|
|
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
|
|
|
|
|
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:17
|
|
|
|
|
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:395
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "ignoring %s; cannot handle more than %d ref"
|
|
|
|
|
msgid_plural "ignoring %s; cannot handle more than %d refs"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:548
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "no matching refs with %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:645
|
|
|
|
|
msgid "show remote-tracking and local branches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:647
|
|
|
|
|
msgid "show remote-tracking branches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:649
|
|
|
|
|
msgid "color '*!+-' corresponding to the branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:651
|
|
|
|
|
msgid "show <n> more commits after the common ancestor"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:653
|
|
|
|
|
msgid "synonym to more=-1"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:654
|
|
|
|
|
msgid "suppress naming strings"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:656
|
|
|
|
|
msgid "include the current branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:658
|
|
|
|
|
msgid "name commits with their object names"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:660
|
|
|
|
|
msgid "show possible merge bases"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:662
|
|
|
|
|
msgid "show refs unreachable from any other ref"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:664
|
|
|
|
|
msgid "show commits in topological order"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:667
|
|
|
|
|
msgid "show only commits not on the first branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:669
|
|
|
|
|
msgid "show merges reachable from only one tip"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:671
|
|
|
|
|
msgid "topologically sort, maintaining date order where possible"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:674
|
|
|
|
|
msgid "<n>[,<base>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:675
|
|
|
|
|
msgid "show <n> most recent ref-log entries starting at base"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:711
|
|
|
|
|
msgid ""
|
|
|
|
|
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:735
|
|
|
|
|
msgid "no branches given, and HEAD is not valid"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:738
|
|
|
|
|
msgid "--reflog option needs one branch name"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:741
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "only %d entry can be shown at one time."
|
|
|
|
|
msgid_plural "only %d entries can be shown at one time."
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:745
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "no such ref %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:831
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot handle more than %d rev."
|
|
|
|
|
msgid_plural "cannot handle more than %d revs."
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:835
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a valid ref."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:838
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot find commit %s (%s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/show-index.c:21
|
|
|
|
|
msgid "hash-algorithm"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-index.c:31
|
|
|
|
|
msgid "Unknown hash algorithm"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-01-12 00:36:56 +01:00
|
|
|
#: builtin/show-ref.c:12
|
|
|
|
|
msgid ""
|
|
|
|
|
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
|
|
|
|
|
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-ref.c:13
|
|
|
|
|
msgid "git show-ref --exclude-existing[=<pattern>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-ref.c:162
|
|
|
|
|
msgid "only show tags (can be combined with heads)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-ref.c:163
|
|
|
|
|
msgid "only show heads (can be combined with tags)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-ref.c:164
|
|
|
|
|
msgid "stricter reference checking, requires exact ref path"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-ref.c:167 builtin/show-ref.c:169
|
|
|
|
|
msgid "show the HEAD reference, even if it would be filtered out"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-ref.c:171
|
|
|
|
|
msgid "dereference tags into object IDs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-ref.c:173
|
|
|
|
|
msgid "only show SHA1 hash using <n> digits"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-ref.c:177
|
|
|
|
|
msgid "do not print results to stdout (useful with --verify)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/show-ref.c:179
|
|
|
|
|
msgid "show refs from stdin that aren't in local repository"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/sparse-checkout.c:21
|
|
|
|
|
msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/sparse-checkout.c:50
|
|
|
|
|
msgid "git sparse-checkout list"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/sparse-checkout.c:76
|
|
|
|
|
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/sparse-checkout.c:228
|
|
|
|
|
msgid "failed to create directory for sparse-checkout file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/sparse-checkout.c:269
|
|
|
|
|
msgid "unable to upgrade repository format to enable worktreeConfig"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/sparse-checkout.c:271
|
|
|
|
|
msgid "failed to set extensions.worktreeConfig setting"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/sparse-checkout.c:288
|
|
|
|
|
msgid "git sparse-checkout init [--cone]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/sparse-checkout.c:307
|
|
|
|
|
msgid "initialize the sparse-checkout in cone mode"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/sparse-checkout.c:344
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to open '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/sparse-checkout.c:401
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not normalize path %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/sparse-checkout.c:413
|
|
|
|
|
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/sparse-checkout.c:438
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to unquote C-style string '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516
|
|
|
|
|
msgid "unable to load existing sparse-checkout patterns"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/sparse-checkout.c:561
|
|
|
|
|
msgid "read patterns from standard in"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/sparse-checkout.c:576
|
|
|
|
|
msgid "git sparse-checkout reapply"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/sparse-checkout.c:595
|
|
|
|
|
msgid "git sparse-checkout disable"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/sparse-checkout.c:623
|
|
|
|
|
msgid "error while refreshing working directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/stash.c:22 builtin/stash.c:38
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git stash list [<options>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:23 builtin/stash.c:43
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git stash show [<options>] [<stash>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:24 builtin/stash.c:48
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git stash drop [-q|--quiet] [<stash>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/stash.c:25
|
|
|
|
|
msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:26 builtin/stash.c:63
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git stash branch <branchname> [<stash>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:27 builtin/stash.c:68
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git stash clear"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:28
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
|
|
|
|
|
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
|
2020-11-21 19:20:35 +01:00
|
|
|
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
|
2020-01-12 00:36:56 +01:00
|
|
|
" [--] [<pathspec>...]]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:32 builtin/stash.c:85
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
|
|
|
|
|
" [-u|--include-untracked] [-a|--all] [<message>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:53
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:58
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:73
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:78
|
|
|
|
|
msgid ""
|
|
|
|
|
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
|
|
|
|
|
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
|
|
|
|
|
" [--] [<pathspec>...]]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/stash.c:128
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a stash-like commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:148
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Too many revisions specified:%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:162
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No stash entries found."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:176
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s is not a valid reference"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:225
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git stash clear with parameters is unimplemented"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:404
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot apply a stash in the middle of a merge"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:415
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not generate diff %s^!."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:422
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "conflicts in index.Try without --index."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:428
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not save index tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:437
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "could not restore untracked files from stash"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:451
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Merging %s with %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:461
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Index was not unstashed."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:522 builtin/stash.c:621
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "attempt to recreate the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:555
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Dropped %s (%s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:558
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: Could not drop stash entry"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:583
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a stash reference"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:633
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "The stash entry is kept in case you need it again."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:656
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No branch name specified"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:800 builtin/stash.c:837
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot update %s with %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "stash message"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:828
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "\"git stash store\" requires one <commit> argument"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:1043
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No changes selected"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:1143
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "You do not have the initial commit yet"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:1170
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Cannot save the current index state"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:1179
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Cannot save the untracked files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:1190 builtin/stash.c:1199
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Cannot save the current worktree state"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:1227
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Cannot record working tree state"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:1276
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Can't use --patch and --include-untracked or --all at the same time"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:1292
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Did you forget to 'git add'?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:1307
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No local changes to save"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:1314
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Cannot initialize stash"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:1329
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Cannot save the current status"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:1334
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Saved working directory and index state %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:1424
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Cannot remove worktree changes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:1463 builtin/stash.c:1528
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "keep index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:1465 builtin/stash.c:1530
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "stash in patch mode"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:1466 builtin/stash.c:1531
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "quiet mode"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:1468 builtin/stash.c:1533
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "include untracked files in stash"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:1470 builtin/stash.c:1535
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "include ignore files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/stash.c:1570
|
|
|
|
|
msgid ""
|
|
|
|
|
"the stash.useBuiltin support has been removed!\n"
|
|
|
|
|
"See its entry in 'git help config' for details."
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/stripspace.c:18
|
|
|
|
|
msgid "git stripspace [-s | --strip-comments]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/stripspace.c:19
|
|
|
|
|
msgid "git stripspace [-c | --comment-lines]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/stripspace.c:37
|
|
|
|
|
msgid "skip and remove all lines starting with comment character"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/stripspace.c:40
|
|
|
|
|
msgid "prepend comment character and space to each line"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Expecting a full ref name, got %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:64
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "submodule--helper print-default-remote takes no arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:102
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot strip one component off url '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "alternative anchor for relative paths"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:415
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
|
|
|
|
|
#: builtin/submodule--helper.c:652
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "No url found for submodule path '%s' in .gitmodules"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:524
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Entering '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:527
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"run_command returned non-zero status for %s\n"
|
|
|
|
|
"."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:549
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"run_command returned non-zero status while recursing in the nested "
|
|
|
|
|
"submodules of %s\n"
|
|
|
|
|
"."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:565
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Suppress output of entering each submodule command"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Recurse into nested submodules"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:572
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:599
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"could not look up configuration '%s'. Assuming this repository is its own "
|
|
|
|
|
"authoritative upstream."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:666
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to register url for submodule path '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:670
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Submodule '%s' (%s) registered for path '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:680
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "warning: command update mode suggested for submodule '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:687
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to register update mode for submodule path '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:709
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Suppress output for initializing a submodule"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:714
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git submodule--helper init [<options>] [<path>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no submodule mapping found in .gitmodules for path '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:835
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not resolve HEAD ref inside the submodule '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to recurse into submodule '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Suppress submodule status output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:887
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Use commit stored in the index instead of the one stored in the submodule "
|
|
|
|
|
"HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:888
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "recurse into nested submodules"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:893
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:917
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git submodule--helper name <path>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:989
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "* %s %s(blob)->%s(submodule)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:992
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "* %s %s(submodule)->%s(blob)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:1005
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:1055
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "couldn't hash object from '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:1059
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unexpected mode %o\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:1300
|
|
|
|
|
msgid "use the commit stored in the index instead of the submodule HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:1302
|
|
|
|
|
msgid "to compare the commit in the index with that in the submodule HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:1304
|
|
|
|
|
msgid "skip submodules with 'ignore_config' value set to 'all'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:1306
|
|
|
|
|
msgid "limit the summary size"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:1311
|
|
|
|
|
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:1335
|
|
|
|
|
msgid "could not fetch a revision for HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:1340
|
|
|
|
|
msgid "--cached and --files are mutually exclusive"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:1407
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Synchronizing submodule url for '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1413
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to register url for submodule path '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1427
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to get the default remote for submodule '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1438
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to update remote for submodule '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1485
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Suppress output of synchronizing submodule url"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1492
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1546
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
|
|
|
|
|
"really want to remove it including all of its history)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1558
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
|
|
|
|
|
"them"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1566
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Cleared directory '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1568
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not remove submodule work tree '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1579
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not create empty submodule directory %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1595
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1624
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Remove submodule working trees even if they contain local changes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1625
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Unregister all submodules"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1630
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1644
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Use '--all' if you really want to deinitialize all submodules"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1713
|
|
|
|
|
msgid ""
|
|
|
|
|
"An alternate computed from a superproject's alternate is invalid.\n"
|
|
|
|
|
"To allow Git to clone without an alternate in such a case, set\n"
|
|
|
|
|
"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
|
|
|
|
|
"'--reference-if-able' instead of '--reference'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "submodule '%s' cannot add alternate: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1791
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1798
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Value '%s' for submodule.alternateLocation is not recognized"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1822
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "where the new submodule will be cloned to"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1825
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "name of the new submodule"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1828
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "url where to clone the submodule from"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1836
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "depth for shallow clones"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "force cloning progress"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
|
|
|
|
|
msgid "disallow cloning into non-empty directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:1848
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
|
2020-11-21 19:20:35 +01:00
|
|
|
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
|
|
|
|
|
"<url> --path <path>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:1873
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "refusing to create/use '%s' in another submodule's git dir"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1884
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "clone of '%s' into submodule path '%s' failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1888
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "directory not empty: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:1900
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not get submodule directory for '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1936
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid update mode '%s' for submodule path '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:1940
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid update mode '%s' configured for submodule path '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2041
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Submodule path '%s' not initialized"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2045
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Maybe you want to use 'update --init'?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2075
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Skipping unmerged submodule %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2104
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Skipping submodule '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2254
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to clone '%s'. Retry scheduled"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2265
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to clone '%s' a second time, aborting"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "path into the working tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2330
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "path into the working tree, across nested submodule boundaries"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2334
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "rebase, merge, checkout or none"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2340
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Create a shallow clone truncated to the specified number of revisions"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2343
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "parallel jobs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2345
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "whether the initial clone should follow the shallow recommendation"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2346
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "don't print cloning progress"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2357
|
|
|
|
|
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2370
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "bad value for update parameter"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2418
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Submodule (%s) branch configured to inherit branch from superproject, but "
|
|
|
|
|
"the superproject is not on any branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2541
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not get a repository handle for submodule '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2574
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "recurse into submodules"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2580
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2636
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "check if it is safe to write to the .gitmodules file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2639
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unset the config in the .gitmodules file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2644
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git submodule--helper config <name> [<value>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2645
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git submodule--helper config --unset <name>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2646
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git submodule--helper config --check-writeable"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2665 git-submodule.sh:151
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "please make sure that the .gitmodules file is in the working tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2681
|
|
|
|
|
msgid "Suppress output for setting url of a submodule"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:2685
|
|
|
|
|
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:2718
|
|
|
|
|
msgid "set the default tracking branch to master"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:2720
|
|
|
|
|
msgid "set the default tracking branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:2724
|
|
|
|
|
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:2725
|
|
|
|
|
msgid ""
|
|
|
|
|
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:2732
|
|
|
|
|
msgid "--branch or --default required"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:2735
|
|
|
|
|
msgid "--branch and --default are mutually exclusive"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:2792 git.c:438 git.c:710
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%s doesn't support --super-prefix"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/submodule--helper.c:2798
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a valid submodule--helper subcommand"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/symbolic-ref.c:8
|
|
|
|
|
msgid "git symbolic-ref [<options>] <name> [<ref>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/symbolic-ref.c:9
|
|
|
|
|
msgid "git symbolic-ref -d [-q] <name>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/symbolic-ref.c:40
|
|
|
|
|
msgid "suppress error message for non-symbolic (detached) refs"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/symbolic-ref.c:41
|
|
|
|
|
msgid "delete symbolic ref"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/symbolic-ref.c:42
|
|
|
|
|
msgid "shorten ref output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "reason"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "reason of the update"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/tag.c:25
|
|
|
|
|
msgid ""
|
|
|
|
|
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
|
|
|
|
|
"\t\t<tagname> [<head>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/tag.c:27
|
|
|
|
|
msgid "git tag -d <tagname>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/tag.c:28
|
|
|
|
|
msgid ""
|
|
|
|
|
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
|
|
|
|
|
"points-at <object>]\n"
|
2020-11-21 19:20:35 +01:00
|
|
|
"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
|
|
|
|
|
"[<pattern>...]"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/tag.c:30
|
|
|
|
|
msgid "git tag -v [--format=<format>] <tagname>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/tag.c:89
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "tag '%s' not found."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/tag.c:105
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Deleted tag '%s' (was %s)\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/tag.c:135
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Write a message for tag:\n"
|
|
|
|
|
" %s\n"
|
|
|
|
|
"Lines starting with '%c' will be ignored.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/tag.c:139
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Write a message for tag:\n"
|
|
|
|
|
" %s\n"
|
|
|
|
|
"Lines starting with '%c' will be kept; you may remove them yourself if you "
|
|
|
|
|
"want to.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/tag.c:198
|
|
|
|
|
msgid "unable to sign the tag"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/tag.c:200
|
|
|
|
|
msgid "unable to write tag file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/tag.c:216
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"You have created a nested tag. The object referred to by your new tag is\n"
|
|
|
|
|
"already a tag. If you meant to tag the object that it points to, use:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tgit tag -f %s %s^{}"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/tag.c:232
|
|
|
|
|
msgid "bad object type."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:285
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no tag message?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:292
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "The tag message has been left in %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:403
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "list tag names"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:405
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "print <n> lines of each tag message"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:407
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "delete tags"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:408
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "verify tags"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:410
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Tag creation options"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:412
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "annotated tag, needs a message"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:414
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "tag message"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:416
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "force edit of tag message"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:417
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "annotated and GPG-signed tag"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:420
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "use another key to sign the tag"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:421
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "replace the tag if exists"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:422 builtin/update-ref.c:492
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "create a reflog"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:424
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Tag listing options"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:425
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show tag list in columns"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:426 builtin/tag.c:428
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "print only tags that contain the commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:427 builtin/tag.c:429
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "print only tags that don't contain the commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:430
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "print only tags that are merged"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:431
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "print only tags that are not merged"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:435
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "print only tags of the object"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:483
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--column and -n are incompatible"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:505
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "-n option is only allowed in list mode"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:507
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--contains option is only allowed in list mode"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:509
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--no-contains option is only allowed in list mode"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:511
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--points-at option is only allowed in list mode"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:513
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--merged and --no-merged options are only allowed in list mode"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:524
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "only one -F or -m option is allowed."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:543
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "too many params"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:549
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a valid tag name."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:554
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "tag '%s' already exists"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/tag.c:585
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Updated tag '%s' (was %s)\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/unpack-objects.c:502
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Unpacking objects"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:84
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to create directory %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:100
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to create file %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:108
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to delete file %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:115 builtin/update-index.c:221
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to delete directory %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:140
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Testing mtime in '%s' "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:154
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "directory stat info does not change after adding a new file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:167
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "directory stat info does not change after adding a new directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:180
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "directory stat info changes after updating a file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:191
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "directory stat info changes after adding a file inside subdirectory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:202
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "directory stat info does not change after deleting a file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:215
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "directory stat info does not change after deleting a directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:222
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid " OK"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:591
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git update-index [<options>] [--] [<file>...]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:974
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "continue refresh even when index needs update"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:977
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "refresh: ignore submodules"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:980
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "do not ignore new files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:982
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "let files replace directories and vice-versa"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:984
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "notice files missing from worktree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:986
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "refresh even if index contains unmerged entries"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:989
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "refresh stat information"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:993
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "like --refresh, but ignore assume-unchanged setting"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:997
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "<mode>,<object>,<path>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:998
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add the specified entry to the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1008
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "mark files as \"not changing\""
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1011
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "clear assumed-unchanged bit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1014
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "mark files as \"index-only\""
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1017
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "clear skip-worktree bit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1020
|
|
|
|
|
msgid "do not touch index-only entries"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/update-index.c:1022
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add to index only; do not add content to object database"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1024
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "remove named paths even if present in worktree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1026
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "with --stdin: input lines are terminated by null bytes"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1028
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "read list of paths to be updated from standard input"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1032
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "add entries from standard input to the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1036
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "repopulate stages #2 and #3 for the listed paths"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1040
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "only update entries that differ from HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1044
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "ignore files missing from worktree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1047
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "report actions to standard output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1049
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "(for porcelains) forget saved unresolved conflicts"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1053
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "write index in this format"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1055
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "enable or disable split index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1057
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "enable/disable untracked cache"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1059
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "test if the filesystem supports untracked cache"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1061
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "enable untracked cache without testing the filesystem"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1063
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "write out the index even if is not flagged as changed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1065
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "enable or disable file system monitor"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1067
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "mark files as fsmonitor valid"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1070
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "clear fsmonitor valid bit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1173
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"core.splitIndex is set to false; remove or change it, if you really want to "
|
|
|
|
|
"enable split index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1182
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"core.splitIndex is set to true; remove or change it, if you really want to "
|
|
|
|
|
"disable split index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1194
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"core.untrackedCache is set to true; remove or change it, if you really want "
|
|
|
|
|
"to disable the untracked cache"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1198
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Untracked cache disabled"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1206
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"core.untrackedCache is set to false; remove or change it, if you really want "
|
|
|
|
|
"to enable the untracked cache"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1210
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Untracked cache enabled for '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1218
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1222
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "fsmonitor enabled"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1225
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-index.c:1229
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "fsmonitor disabled"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/update-ref.c:10
|
|
|
|
|
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/update-ref.c:11
|
|
|
|
|
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/update-ref.c:12
|
|
|
|
|
msgid "git update-ref [<options>] --stdin [-z]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-ref.c:487
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "delete the reference"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-ref.c:489
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "update <refname> not the one it points to"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-ref.c:490
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "stdin has NUL-terminated arguments"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/update-ref.c:491
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "read updates from stdin"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/update-server-info.c:7
|
|
|
|
|
msgid "git update-server-info [--force]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/update-server-info.c:15
|
|
|
|
|
msgid "update the info files from scratch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/upload-pack.c:11
|
|
|
|
|
msgid "git upload-pack [<options>] <dir>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
|
|
|
|
|
msgid "quit after a single request/response exchange"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/upload-pack.c:25
|
|
|
|
|
msgid "exit immediately after initial ref advertisement"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/upload-pack.c:27
|
|
|
|
|
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/upload-pack.c:29
|
|
|
|
|
msgid "interrupt transfer after <n> seconds of inactivity"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/verify-commit.c:19
|
|
|
|
|
msgid "git verify-commit [-v | --verbose] <commit>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/verify-commit.c:68
|
|
|
|
|
msgid "print commit contents"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
|
|
|
|
|
msgid "print raw gpg status output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/verify-pack.c:59
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/verify-pack.c:70
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "verbose"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/verify-pack.c:72
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "show statistics only"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/verify-tag.c:18
|
|
|
|
|
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/verify-tag.c:36
|
|
|
|
|
msgid "print tag contents"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:17
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git worktree add [<options>] <path> [<commit-ish>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:18
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git worktree list [<options>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:19
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git worktree lock [<options>] <path>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:20
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git worktree move <worktree> <new-path>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:21
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git worktree prune [<options>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:22
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git worktree remove [<options>] <worktree>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:23
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git worktree unlock <path>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:60 builtin/worktree.c:970
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to delete '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:85
|
|
|
|
|
msgid "not a valid directory"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:91
|
|
|
|
|
msgid "gitdir file does not exist"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:96 builtin/worktree.c:105
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "unable to read gitdir file (%s)"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:115
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:123
|
|
|
|
|
msgid "invalid gitdir file"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:131
|
|
|
|
|
msgid "gitdir file points to non-existent location"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/worktree.c:146
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Removing %s/%s: %s"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:221
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "report pruned working trees"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:223
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "expire working trees older than <time>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:293
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' already exists"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:302
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "unusable worktree destination '%s'"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:307
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"'%s' is a missing but locked worktree;\n"
|
2020-11-21 19:20:35 +01:00
|
|
|
"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:309
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"'%s' is a missing but already registered worktree;\n"
|
2020-11-21 19:20:35 +01:00
|
|
|
"use '%s -f' to override, or 'prune' or 'remove' to clear"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:360
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not create directory of '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:494 builtin/worktree.c:500
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Preparing worktree (new branch '%s')"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:496
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:505
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Preparing worktree (checking out '%s')"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:511
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Preparing worktree (detached HEAD %s)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:552
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "checkout <branch> even if already checked out in other worktree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:555
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "create a new branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:557
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "create or reset a branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:559
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "populate the new working tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:560
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "keep the new working tree locked"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:563
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "set up tracking mode (see git-branch(1))"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:566
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "try to match the new branch name with a remote-tracking branch"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:574
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "-b, -B, and --detach are mutually exclusive"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:635
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--[no-]track can only be used if a new branch is created"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:755
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "reason for locking"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874
|
|
|
|
|
#: builtin/worktree.c:998
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a working tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:769 builtin/worktree.c:802
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "The main working tree cannot be locked or unlocked"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:774
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is already locked, reason: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:776
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is already locked"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:804
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not locked"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:845
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "working trees containing submodules cannot be moved or removed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:853
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "force move even if worktree is dirty or locked"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:876 builtin/worktree.c:1000
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is a main working tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:881
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "could not figure out destination name from '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:894
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"cannot move a locked working tree, lock reason: %s\n"
|
|
|
|
|
"use 'move -f -f' to override or unlock first"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:896
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"cannot move a locked working tree;\n"
|
|
|
|
|
"use 'move -f -f' to override or unlock first"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:899
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "validation failed, cannot move working tree: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:904
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to move '%s' to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:950
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to run 'git status' on '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:954
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "'%s' contains modified or untracked files, use --force to delete it"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:959
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to run 'git status' on '%s', code %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:982
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "force removal even if worktree is dirty or locked"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:1005
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"cannot remove a locked working tree, lock reason: %s\n"
|
|
|
|
|
"use 'remove -f -f' to override or unlock first"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:1007
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"cannot remove a locked working tree;\n"
|
|
|
|
|
"use 'remove -f -f' to override or unlock first"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:1010
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "validation failed, cannot remove working tree: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: builtin/worktree.c:1034
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "repair: %s: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/worktree.c:1037
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "error: %s: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-01-12 00:36:56 +01:00
|
|
|
#: builtin/write-tree.c:15
|
|
|
|
|
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/write-tree.c:28
|
|
|
|
|
msgid "<prefix>/"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/write-tree.c:29
|
|
|
|
|
msgid "write tree object for a subdirectory <prefix>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: builtin/write-tree.c:31
|
|
|
|
|
msgid "only useful for debugging"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: http-fetch.c:114
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "argument to --packfile must be a valid hash (got '%s')"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: http-fetch.c:122
|
|
|
|
|
msgid "not a git repository"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: t/helper/test-reach.c:154
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "commit %s is not marked reachable"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: t/helper/test-reach.c:164
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "too many commits marked reachable"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: t/helper/test-serve-v2.c:7
|
|
|
|
|
msgid "test-tool serve-v2 [<options>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: t/helper/test-serve-v2.c:19
|
|
|
|
|
msgid "exit immediately after advertising capabilities"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:28
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
|
|
|
|
|
" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
|
|
|
|
|
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
|
|
|
|
|
"bare]\n"
|
|
|
|
|
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
|
|
|
|
|
" <command> [<args>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:35
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"'git help -a' and 'git help -g' list available subcommands and some\n"
|
|
|
|
|
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
|
|
|
|
|
"to read about a specific subcommand or concept.\n"
|
|
|
|
|
"See 'git help git' for an overview of the system."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:187
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no directory given for --git-dir\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:201
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no namespace given for --namespace\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:215
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no directory given for --work-tree\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:229
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no prefix given for --super-prefix\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:251
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "-c expects a configuration string\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:289
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "no directory given for -C\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:315
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown option: %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:364
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "while expanding alias '%s': '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:373
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"alias '%s' changes environment variables.\n"
|
|
|
|
|
"You can use '!git' in the alias to do this"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:380
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "empty alias for %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:383
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "recursive alias: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:465
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "write failure on standard output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:467
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unknown write failure on standard output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:469
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "close failed on standard output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:819
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:869
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot handle %s as a builtin"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:882
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"usage: %s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:902
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git.c:914
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to run command '%s': %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: http.c:399
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "negative value for http.postbuffer; defaulting to %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: http.c:420
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Delegation control is not supported with cURL < 7.22.0"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: http.c:429
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Public key pinning not supported with cURL < 7.44.0"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: http.c:910
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: http.c:989
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Protocol restrictions not supported with cURL < 7.19.4"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: http.c:1132
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: http.c:1139
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: http.c:1143
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not set SSL backend to '%s': already set"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: http.c:2025
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"unable to update url base from redirection:\n"
|
|
|
|
|
" asked for: %s\n"
|
|
|
|
|
" redirect: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:174
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid quoting in push-option value: '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:298
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "%sinfo/refs not valid: is this a git repository?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:399
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "invalid server response; expected service, got flush packet"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:430
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid server response; got '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:490
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "repository '%s' not found"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:494
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "Authentication failed for '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:498
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to access '%s': %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:504
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "redirecting to %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:633
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "shouldn't have EOF when not gentle on EOF"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:645
|
|
|
|
|
msgid "remote server sent stateless separator"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: remote-curl.c:715
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:745
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "remote-curl: bad line length character: %.4s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: remote-curl.c:747
|
|
|
|
|
msgid "remote-curl: unexpected response end packet"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: remote-curl.c:823
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "RPC failed; %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:863
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot handle pushes this big"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:978
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot deflate request; zlib deflate error %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:982
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot deflate request; zlib end error %d"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:1032
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%d bytes of length header were received"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: remote-curl.c:1034
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%d bytes of body are still expected"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: remote-curl.c:1123
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "dumb http transport does not support shallow capabilities"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:1138
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "fetch failed."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:1184
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot fetch by sha1 over smart http"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:1228 remote-curl.c:1234
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "protocol error: expected sha/ref, got '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:1246 remote-curl.c:1361
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "http transport does not support %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:1282
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "git-http-push failed"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:1467
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:1499
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "remote-curl: error reading command stream from git"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:1506
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "remote-curl: fetch attempted without a local repo"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: remote-curl.c:1547
|
2020-01-12 00:36:56 +01:00
|
|
|
#, c-format
|
|
|
|
|
msgid "remote-curl: unknown command '%s' from git"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: compat/compiler.h:26
|
|
|
|
|
msgid "no compiler information available\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: compat/compiler.h:38
|
|
|
|
|
msgid "no libc information available\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: list-objects-filter-options.h:91
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "args"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: list-objects-filter-options.h:92
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "object filtering"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: parse-options.h:183
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "expiry-date"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: parse-options.h:197
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "no-op (backward compatibility)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: parse-options.h:309
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "be more verbose"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: parse-options.h:311
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "be more quiet"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: parse-options.h:317
|
|
|
|
|
msgid "use <n> digits to display object names"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: parse-options.h:336
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "how to strip spaces and #comments from message"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: parse-options.h:337
|
|
|
|
|
msgid "read pathspec from file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: parse-options.h:338
|
|
|
|
|
msgid ""
|
|
|
|
|
"with --pathspec-from-file, pathspec elements are separated with NUL character"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: ref-filter.h:96
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "key"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: ref-filter.h:96
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "field name to sort on"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: rerere.h:44
|
|
|
|
|
msgid "update the index with reused conflict resolution if possible"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.h:80
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "HEAD detached at "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: wt-status.h:81
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "HEAD detached from "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:50
|
|
|
|
|
msgid "Add file contents to the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:51
|
|
|
|
|
msgid "Apply a series of patches from a mailbox"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:52
|
|
|
|
|
msgid "Annotate file lines with commit information"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:53
|
|
|
|
|
msgid "Apply a patch to files and/or to the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:54
|
|
|
|
|
msgid "Import a GNU Arch repository into Git"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:55
|
|
|
|
|
msgid "Create an archive of files from a named tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:56
|
|
|
|
|
msgid "Use binary search to find the commit that introduced a bug"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:57
|
|
|
|
|
msgid "Show what revision and author last modified each line of a file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:58
|
|
|
|
|
msgid "List, create, or delete branches"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:59
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Collect information for user to file a bug report"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:60
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Move objects and refs by archive"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:61
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Provide content or type and size information for repository objects"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:62
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Display gitattributes information"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:63
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Debug gitignore / exclude files"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:64
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Show canonical names and email addresses of contacts"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:65
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Switch branches or restore working tree files"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:66
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Copy files from the index to the working tree"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:67
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Ensures that a reference name is well formed"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:68
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Find commits yet to be applied to upstream"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:69
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Apply the changes introduced by some existing commits"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:70
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Graphical alternative to git-commit"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:71
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Remove untracked files from the working tree"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:72
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Clone a repository into a new directory"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:73
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Display data in columns"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:74
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Record changes to the repository"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:75
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Write and verify Git commit-graph files"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:76
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Create a new commit object"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:77
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Get and set repository or global options"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:78
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Count unpacked number of objects and their disk consumption"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:79
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Retrieve and store user credentials"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:80
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Helper to temporarily store passwords in memory"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:81
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Helper to store credentials on disk"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:82
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Export a single commit to a CVS checkout"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:83
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Salvage your data out of another SCM people love to hate"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:84
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "A CVS server emulator for Git"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:85
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "A really simple server for Git repositories"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:86
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Give an object a human readable name based on an available ref"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:87
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Show changes between commits, commit and working tree, etc"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:88
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Compares files in the working tree and the index"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:89
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Compare a tree to the working tree or index"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:90
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Compares the content and mode of blobs found via two tree objects"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:91
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Show changes using common diff tools"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:92
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Git data exporter"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:93
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Backend for fast Git data importers"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:94
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Download objects and refs from another repository"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:95
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Receive missing objects from another repository"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:96
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Rewrite branches"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:97
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Produce a merge commit message"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:98
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Output information on each ref"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:99
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Prepare patches for e-mail submission"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:100
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Verifies the connectivity and validity of the objects in the database"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:101
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Cleanup unnecessary files and optimize the local repository"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:102
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Extract commit ID from an archive created using git-archive"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:103
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Print lines matching a pattern"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:104
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "A portable graphical interface to Git"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:105
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Compute object ID and optionally creates a blob from a file"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:106
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Display help information about Git"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:107
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Server side implementation of Git over HTTP"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:108
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Download from a remote Git repository via HTTP"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:109
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Push objects over HTTP/DAV to another repository"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:110
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Send a collection of patches from stdin to an IMAP folder"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:111
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Build pack index file for an existing packed archive"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:112
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Create an empty Git repository or reinitialize an existing one"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:113
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Instantly browse your working repository in gitweb"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:114
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Add or parse structured information in commit messages"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:115
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "The Git repository browser"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:116
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Show commit logs"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:117
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Show information about files in the index and the working tree"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:118
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "List references in a remote repository"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:119
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "List the contents of a tree object"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:120
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Extracts patch and authorship from a single e-mail message"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:121
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Simple UNIX mbox splitter program"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:122
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Run tasks to optimize Git repository data"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:123
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Join two or more development histories together"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:124
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Find as good common ancestors as possible for a merge"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:125
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Run a three-way file merge"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:126
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Run a merge for files needing merging"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:127
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "The standard helper program to use with git-merge-index"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:128
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Run merge conflict resolution tools to resolve merge conflicts"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:129
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Show three-way merge without touching index"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:130
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Write and verify multi-pack-indexes"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:131
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Creates a tag object"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:132
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Build a tree-object from ls-tree formatted text"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:133
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Move or rename a file, a directory, or a symlink"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:134
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Find symbolic names for given revs"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:135
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Add or inspect object notes"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:136
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Import from and submit to Perforce repositories"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:137
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Create a packed archive of objects"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:138
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Find redundant pack files"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:139
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Pack heads and tags for efficient repository access"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:140
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Routines to help parsing remote repository access parameters"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:141
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Compute unique ID for a patch"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:142
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Prune all unreachable objects from the object database"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:143
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Remove extra objects that are already in pack files"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:144
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Fetch from and integrate with another repository or a local branch"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:145
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Update remote refs along with associated objects"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:146
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Applies a quilt patchset onto the current branch"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:147
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Compare two commit ranges (e.g. two versions of a branch)"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:148
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Reads tree information into the index"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:149
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Reapply commits on top of another base tip"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:150
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Receive what is pushed into the repository"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:151
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Manage reflog information"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:152
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Manage set of tracked repositories"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:153
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Pack unpacked objects in a repository"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:154
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Create, list, delete refs to replace objects"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:155
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Generates a summary of pending changes"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:156
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Reuse recorded resolution of conflicted merges"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:157
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Reset current HEAD to the specified state"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:158
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Restore working tree files"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:159
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Revert some existing commits"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:160
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Lists commit objects in reverse chronological order"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:161
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Pick out and massage parameters"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:162
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Remove files from the working tree and from the index"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:163
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Send a collection of patches as emails"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:164
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Push objects over Git protocol to another repository"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:165
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Restricted login shell for Git-only SSH access"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:166
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Summarize 'git log' output"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:167
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Show various types of objects"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:168
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Show branches and their commits"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:169
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Show packed archive index"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:170
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "List references in a local repository"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:171
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Git's i18n setup code for shell scripts"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:172
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Common Git shell script setup code"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:173
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Initialize and modify the sparse-checkout"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:174
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Stash the changes in a dirty working directory away"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:175
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Add file contents to the staging area"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:176
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Show the working tree status"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:177
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Remove unnecessary whitespace"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:178
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Initialize, update or inspect submodules"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:179
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Bidirectional operation between a Subversion repository and Git"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:180
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Switch branches"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:181
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Read, modify and delete symbolic refs"
|
Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96
af6b65d45e Git 2.26.2
7397ca3373 Git 2.25.4
b86a4be245 Git 2.24.3
f2771efd07 Git 2.23.3
c9808fa014 Git 2.22.4
9206d27eb5 Git 2.21.3
041bc65923 Git 2.20.4
76b54ee9b9 Git 2.19.5
ba6f0905fd Git 2.18.4
df5be6dc3f Git 2.17.5
1a3609e402 fsck: reject URL with empty host in .gitmodules
e7fab62b73 credential: treat URL with empty scheme as invalid
c44088ecc4 credential: treat URL without scheme as invalid
fe29a9b7b0 credential: die() when parsing invalid urls
a2b26ffb1a fsck: convert gitmodules url to URL passed to curl
8ba8ed568e credential: refuse to operate when missing host or protocol
24036686c4 credential: parse URL without host as empty host, not unset
73aafe9bc2 t0300: use more realistic inputs
a88dbd2f8c t0300: make "quit" helper more realistic
de49261b05 Git 2.26.1
274b9cc253 Git 2.26
55a7568606 Merge branch 'en/rebase-backend'
c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git
1557364fb4 l10n: tr.po: change file mode to 644
2da1b05674 t3419: prevent failure when run with EXPENSIVE
1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0
5804c6ec40 l10n: de.po: add missing space
98cedd0233 Merge https://github.com/prati0100/git-gui
4914ba4bcf l10n: tr: Fix a couple of ambiguities
a5728022e0 Merge branch 'py/remove-tcloo'
7fcb965970 RelNotes/2.26.0: fix various typos
f0c03bcf95 l10n: Update Catalan translation
67b0a24910 Git 2.25.3
be8661a328 Sync with Git 2.25.2
0822e66b5d Git 2.25.2
65588b0b2e unicode: update the width tables to Unicode 13.0
7be274b0ff Merge branch 'js/ci-windows-update' into maint
9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint
221887a492 Merge branch 'jk/doc-credential-helper' into maint
32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint
fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint
618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint
50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint
fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint
41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint
2d7247af6f Merge branch 'am/mingw-poll-fix' into maint
4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint
76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint
569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint
16a4bf1035 Merge branch 'en/check-ignore' into maint
3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint
56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint
1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint
7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint
fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint
a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint
93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint
dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint
758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint
f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint
506223f9c5 Git 2.24.2
17a02783d8 Git 2.23.2
69fab82147 Git 2.22.3
fe22686494 Git 2.21.2
d1259ce117 Git 2.20.3
a5979d7009 Git 2.19.4
21a3e5016b Git 2.18.3
c42c0f1297 Git 2.17.4
d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u)
3891a84ccd git-gui: create a new namespace for chord script evaluation
8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5
440e7442d1 l10n: zh_CN: Revise v2.26.0 translation
2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2
6c85aac65f Git 2.26-rc2
74f172e39e Merge branch 'en/test-cleanup'
e96327c947 Merge branch 'es/outside-repo-errmsg-hints'
ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0
15fa8d9667 l10n: vi: fix translation + grammar
5c20398699 prefix_path: show gitdir if worktree unavailable
1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated)
c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated)
a4a2f64642 Merge branch 'js/askpass-coerce-utf8'
850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows
d769dcc5cd Merge branch 'py/blame-status-error'
70e24186c0 t6022, t6046: fix flaky files-are-updated checks
30e9940356 Hopefully the final batch before -rc2
b4f0038525 Merge branch 'en/rebase-backend'
25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master
07259e74ec fsck: detect gitmodules URLs with embedded newlines
c716fe4bd9 credential: detect unrepresentable values when parsing urls
17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr
9a6bbee800 credential: avoid writing values with newlines
17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2
1afe18a3bb l10n: es: 2.26.0 round#2
5ab9217a3c Merge branch of github.com:alshopov/git-po into master
c6713676d6 Merge branch of github.com:bitigchi/git-po into master
b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t)
2713dec02d l10n: tr: v2.26.0 round 2
c9ef57cc3a l10n: fr : v2.26.0 rnd 2
120b1eb731 git-rebase.txt: highlight backend differences with commit rewording
9a1b7474d6 sequencer: clear state upon dropping a become-empty commit
937d143630 i18n: unmark a message in rebase.c
a56d361f66 Merge branch 'ds/sparse-add'
5fa9169ced Merge branch 'dr/push-remote-ref-update'
cdef998b46 Merge branch 'jc/doc-single-h-is-for-help'
051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed)
52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master
9643441983 l10n: tr: Add glossary for Turkish translations
438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv
fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git
2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u)
dd2c269652 l10n: tr: Add Turkish translations
8f4f099f8b l10n: tr: Add Turkish translation team info
b4374e96c8 Git 2.26-rc1
4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch'
3658d77f8e Merge branch 'hd/show-one-mergetag-fix'
6125104b88 Merge branch 'rt/format-zero-length-fix'
1ac37deba2 Merge branch 'am/mingw-poll-fix'
cf372dc815 Merge branch 'en/test-cleanup'
d1075adfdf Merge branch 'en/merge-path-collision'
a4fd114ffc Merge branch 'kk/complete-diff-color-moved'
a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file'
0e0d717537 Merge branch 'pb/am-show-current-patch'
9b7f726dfc Merge branch 'am/pathspec-f-f-more'
4605a73073 t1091: don't grep for `strerror()` string
4d9c2902a1 l10n: fr v2.26.0 rnd1
ad182bee3f Merge branch of github.com:alshopov/git-po into master
23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1
98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t)
f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed)
76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po
076cbdcd73 Git 2.26-rc0
0d65f3fb1a t5537: adjust test_oid label
e63cefb024 Merge branch 'hi/gpg-use-check-signature'
5da7329e29 Merge branch 'rs/commit-graph-code-simplification'
0108fc1b46 Merge branch 'js/ci-windows-update'
f3ccd9f0d9 Merge branch 'be/describe-multiroot'
a6b4709302 Merge branch 'ag/rebase-remove-redundant-code'
b22db265d6 Merge branch 'es/recursive-single-branch-clone'
e8e71848ea Merge branch 'jk/nth-packed-object-id'
a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'
4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere'
49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix'
2cbb058669 Merge branch 'bc/wildcard-credential'
25063e2530 Merge branch 'mr/bisect-in-c-1'
f4d7dfce4d Merge branch 'ds/sparse-add'
4d864895a2 t2402: test worktree path when called in .git directory
af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch()
7655b4119d remote-curl: show progress for fetches over dumb HTTP
2f268890c2 The eighth batch for 2.26
aa5a7e02ad Merge branch 'ma/test-cleanup'
58595e713c Merge branch 'rs/blame-typefix-for-fingerprint'
ff41848e99 Merge branch 'rs/micro-cleanups'
4cbf1a0e22 Merge branch 'es/worktree-cleanup'
46703057c1 Merge branch 'ak/test-log-graph'
777815f5f9 Merge branch 'jk/run-command-formatfix'
444cff61b4 Merge branch 'ds/partial-clone-fixes'
48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure'
8c22bd9ff9 Merge branch 'en/rebase-backend'
cb2f5a8e97 Merge branch 'en/check-ignore'
0df82d99da Merge branch 'jk/object-filter-with-bitmap'
80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix'
29b09c518c Merge branch 'jk/doc-diff-parallel'
237a28173f show_one_mergetag: print non-parent in hex form.
5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context"
6d1210e133 l10n: Update Catalan translation
0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification"
7329d94be7 config.mak.dev: re-enable -Wformat-zero-length
7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings
94f4d01932 mingw: workaround for hangs when sending STDIN
1ff466c018 Documentation: clarify that `-h` alone stands for `help`
65bf820d0e t6020: new test with interleaved lexicographic ordering of directories
9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it
d5bb92eced t3035: prefer test_must_fail to bash negation for git commands
b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions
42d180dd01 t602[1236], t6034: modernize test formatting
802050400a merge-recursive: apply collision handling unification to recursive case
7f487ce062 Azure Pipeline: switch to the latest agent pools
5ed9fc3fc8 ci: prevent `perforce` from being quarantined
eafff6e41e t/lib-httpd: avoid using macOS' sed
d68ce906c7 commit-graph: use progress title directly
30b1c7ad9d describe: don't abort too early when searching tags
240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to'
2d2118b814 The seventh batch for 2.26
325eb66830 Merge branch 'es/doc-mentoring'
87f17d790d Merge branch 'es/bright-colors'
d0038f4b31 Merge branch 'bw/remote-rename-update-config'
132f600b06 clone: pass --single-branch during --recurse-submodules
47319576f1 submodule--helper: use C99 named initializer
ffe005576a lib-log-graph: consolidate colored graph cmp logic
989eea958b lib-log-graph: consolidate test_cmp_graph logic
bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching
bb4995fc3f worktree: add utility to find worktree by pathname
a80c4c2214 worktree: improve find_worktree() documentation
2fecc48cad packfile: drop nth_packed_object_sha1()
6ac9760a30 packed_object_info(): use object_id internally for delta base
b99b6bcc57 packed_object_info(): use object_id for returning delta base
63f4a7fc01 pack-check: push oid lookup into loop
e31c71083a pack-check: convert "internal error" die to a BUG()
500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps
f66d4e0250 pack-objects: use object_id struct in pack-reuse code
a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id
3f83fd5e44 pack-objects: read delta base oid into object_id struct
0763671b8e nth_packed_object_oid(): use customary integer return
02bbbe9df9 worktree: drop unused code from get_main_worktree()
27f182b3fc blame: provide type of fingerprints pointer
b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere
df126ca142 t3400: make test clean up after itself
3c29e21eb0 t: drop debug `cat` calls
cac439b56d t9810: drop debug `cat` call
91de82adc9 t4117: check for files using `test_path_is_file`
4ef346482d receive.denyCurrentBranch: respect all worktrees
f8692114db t5509: use a bare repository for test push target
45f274fbb1 get_main_worktree(): allow it to be called in the Git directory
fd0bc17557 completion: add diff --color-moved[-ws]
2ce6d075fa use strpbrk(3) to search for characters from a given set
2b3c430bce quote: use isalnum() to check for alphanumeric characters
a51d9e8f07 t1050: replace test -f with test_path_is_file
3e96c66805 partial-clone: avoid fetching when looking for objects
d0badf8797 partial-clone: demonstrate bugs in partial fetch
539052f42f run-command.h: fix mis-indented struct member
6c11c6a124 sparse-checkout: allow one-character directories in cone mode
aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch
f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch
e8ef1e8d6e am: convert "resume" variable to a struct
bc8620b440 parse-options: convert "command mode" to a flag
62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE()
46fd7b3900 credential: allow wildcard patterns when matching config
82eb249853 credential: use the last matching username in the config
588c70e10f t0300: add tests for some additional cases
732f934408 t1300: add test for urlmatch with multiple wildcards
3fa0e04667 mailmap: add an additional email address for brian m. carlson
8a98758a8d stash push: support the --pathspec-from-file option
8c3713cede stash: eliminate crude option parsing
3f3d8068f5 doc: stash: synchronize <pathspec> description
b22909144c doc: stash: document more options
0093abc286 doc: stash: split options from description (2)
2b7460d167 doc: stash: split options from description (1)
5f393dc3aa rm: support the --pathspec-from-file option
fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags
73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure
6c69f22233 bisect: libify `bisect_next_all`
9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents
45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents
cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents
e8e3ce6718 bisect: libify `bisect_checkout`
ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents
7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()`
680e8a01e5 bisect: add enum to represent bisect returning codes
bfacfce7d9 bisect--helper: introduce new `decide_next()` function
b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0
292731c4c2 bisect--helper: change `retval` to `res`
16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays
7ec8125fba check-ignore: fix documentation and implementation to match
2607d39da3 doc-diff: use single-colon rule in rendering Makefile
0aa6ce3094 doc/config/push: use longer "--" line for preformatted example
20a5fd881a rev-list --count: comment on the use of count_right++
63a58457e0 Merge branch 'py/missing-bracket'
51ebf55b93 The sixth batch for 2.26
f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints'
123538444f Merge branch 'jk/doc-credential-helper'
e154451a2f Merge branch 'js/mingw-open-in-gdb'
fc25a19265 Merge branch 'js/test-unc-fetch'
6365058605 Merge branch 'js/test-avoid-pipe'
966b69f02f Merge branch 'js/test-write-junit-xml-fix'
d880c3de23 Merge branch 'jk/mailinfo-cleanup'
5d55554b1d Merge branch 'mr/show-config-scope'
9f3f38769d Merge branch 'rs/strbuf-insertstr'
cbecc168d4 Merge branch 'rs/parse-options-concat-dup'
5af345a438 Merge branch 'bc/hash-independent-tests-part-8'
0460c109c3 Merge branch 'rs/name-rev-memsave'
6b9919c0a2 git-gui: add missing close bracket
5897e5ac96 Merge branch 'cs/german-translation'
cf85a32eb6 git-gui: update German translation
5096e51c54 git-gui: extend translation glossary template with more terms
8b85bb1b70 git-gui: update pot template and German translation to current source code
e68e29171c Sync with 2.25.1
c522f061d5 Git 2.25.1
10cdb9f38a rebase: rename the two primary rebase backends
2ac0d6273f rebase: change the default backend from "am" to "merge"
8295ed690b rebase: make the backend configurable via config setting
76340c8107 rebase tests: repeat some tests using the merge backend instead of am
980b482d28 rebase tests: mark tests specific to the am-backend with --am
c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases
6d04ce75c4 git-prompt: change the prompt for interactive-based rebases
52eb738d6b rebase: add an --am option
8af14f0859 rebase: move incompatibility checks between backend options a bit earlier
be50c938df git-rebase.txt: add more details about behavioral differences of backends
befb89ce7c rebase: allow more types of rebases to fast-forward
9a70f3d4ae t3432: make these tests work with either am or merge backends
93122c985a rebase: fix handling of restrict_revision
55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer
8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling
7db00f0b3b t3406: simplify an already simple test
e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty
d48e5e21da rebase (interactive-backend): make --keep-empty the default
e0020b2f82 prefix_path: show gitdir when arg is outside repo
cc4f2eb828 doc: move credential helper info into gitcredentials(7)
bfdd66e72f Sync with maint
7ae7e234c7 The fifth batch for 2.26
53c3be2c29 Merge branch 'tb/commit-graph-object-dir'
7b029ebaef Merge branch 'jk/index-pack-dupfix'
aa21cc97bd Merge branch 'jk/alloc-cleanups'
883326077a Merge branch 'jh/notes-fanout-fix'
f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule'
78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs'
df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'
433b8aac2e Merge branch 'ds/sparse-checkout-harden'
4a77434bc8 Merge branch 'ld/p4-cleanup-processes'
8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone'
09e48400a3 Merge branch 'jk/get-oid-error-message-i18n'
4dbeecba27 Merge branch 'ag/edit-todo-drop-check'
f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2'
d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout'
251187084d Merge branch 'js/rebase-i-with-colliding-hash'
c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix'
56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store'
0da63da794 Merge branch 'jn/promote-proto2-to-default'
a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup'
daef1b300b Merge branch 'hw/advice-add-nothing'
6141e0cc00 Merge branch 'js/convert-typofix' into maint
4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint
5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint
b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint
7137d6089b Merge branch 'ms/doc-bundle-format' into maint
52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint
0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint
1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint
cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint
153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint
8857657cc9 Merge branch 'jt/t5616-robustify' into maint
1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint
f468972671 Merge branch 'bc/misconception-doc' into maint
6e69042e26 Merge branch 'bc/author-committer-doc' into maint
650ed395be Merge branch 'ds/refmap-doc' into maint
80b806f1a8 Merge branch 'bc/actualmente' into maint
eceff4ba12 Merge branch 'rt/submodule-i18n' into maint
8a17eb7972 Merge branch 'jk/test-fixes' into maint
54bbadaeca Merge branch 'jk/asan-build-fix' into maint
8dbeba198e Merge branch 'ds/sparse-cone' into maint
e361f36f61 Merge branch 'nd/switch-and-restore' into maint
4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint
ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint
5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint
c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint
d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint
9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint
3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint
3ab3185f99 pack-objects: support filters with bitmaps
84243da129 pack-bitmap: implement BLOB_LIMIT filtering
4f3bd5606a pack-bitmap: implement BLOB_NONE filtering
cc4aa28506 bitmap: add bitmap_unset() function
2aaeb9ac41 rev-list: use bitmap filters for traversal
6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure
4eb707ebd6 rev-list: allow commit-only bitmap traversals
ea047a8eb4 t5310: factor out bitmap traversal comparison
608d9c9365 rev-list: allow bitmaps when counting objects
55cb10f9b5 rev-list: make --count work with --objects
792f811998 rev-list: factor out bitmap-optimized routines
d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs
08809c09aa mingw: add a helper function to attach GDB to the current process
bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths
de26f02db1 t9001, t9116: avoid pipes
a2dc43414c MyFirstContribution: rephrase contact info
e03f928e2a rev-list: fallback to non-bitmap traversal when filtering
acac50dd8c pack-bitmap: fix leak of haves/wants object lists
551cf8b655 pack-bitmap: factor out type iterator initialization
d8437c57fa The fourth batch for 2.26
a3dcf84df0 Merge branch 'js/convert-typofix'
0de2d1409b Merge branch 'js/ci-squelch-doc-warning'
0410c2ba31 Merge branch 'jb/multi-pack-index-docfix'
0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example'
e99c325bb4 Merge branch 'ms/doc-bundle-format'
afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix'
db72f8c940 Merge branch 'jb/parse-options-message-fix'
3d2471ba85 Merge branch 'ma/filter-branch-doc-caret'
b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path'
44cba9c4b3 Merge branch 'jc/skip-prefix'
556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index'
17e4a1b141 Merge branch 'hw/doc-git-dir'
4cf7f48891 Merge branch 'jk/push-default-doc'
b783391018 Merge branch 'jk/clang-sanitizer-fixes'
a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache'
3f7553acf5 Merge branch 'jt/t5616-robustify'
341f8a6476 Merge branch 'jk/escaped-wildcard-dwim'
b486d2ee81 Merge branch 'jn/pretend-object-doc'
076ee3e8a2 tests: fix --write-junit-xml with subshells
2b0f19fa7a convert: fix typo
c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors
1751b09a92 color.c: support bright aixterm colors
4a28eb0ae4 color.c: refactor color_output arguments
f696a2b1c8 mailinfo: factor out some repeated header handling
ffbea1816d mailinfo: be more liberal with header whitespace
f447d0293e mailinfo: simplify parsing of header values
b6537d83ee mailinfo: treat header values as C strings
ef07659926 sparse-checkout: work with Windows paths
2631dc879d sparse-checkout: create 'add' subcommand
4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand
6fb705abcb sparse-checkout: extract add_patterns_from_input()
b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config
f2a2327a4a config: provide access to the current line number
923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values
ceff1a1308 remote: clean-up config callback
1a83068c26 remote: clean-up by returning early to avoid one indentation
88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types
145d59f482 config: add '--show-scope' to print the scope of a config value
9a83d088ee submodule-config: add subomdule config scope
e37efa40e1 config: teach git_config_source to remember its scope
5c105a842e config: preserve scope in do_git_config_sequence
6766e41b8a config: clarify meaning of command line scoping
6dc905d974 config: split repo scope to local and worktree
a5cb4204b6 config: make scope_name non-static and rename it
30183894ea ci: ignore rubygems warning in the "Documentation" job
7a9f8ca805 parse-options: simplify parse_options_dup()
c84078573e parse-options: const parse_options_concat() parameters
f904f9025f parse-options: factor out parse_options_count()
a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat()
517b60564e mailinfo: don't insert header prefix for handle_content_type()
a91cc7fad0 strbuf: add and use strbuf_insertstr()
eb31044ff7 pack-format: correct multi-pack-index description
9299f84921 diff-options.txt: avoid "regex" overload in example
7378ec90e1 doc: describe Git bundle format
f3037657e8 t6024: update for SHA-256
edf04243b2 t6006: make hash size independent
5db24dcffd t6000: abstract away SHA-1-specific constants
d341e0805d t5703: make test work with SHA-256
88ed241a7e t5607: make hash size independent
48c10cc0e6 t5318: update for SHA-256
f7ae8e69b6 t5515: make test hash independent
e70649bb66 t5321: make test hash independent
a30f93b143 t5313: make test hash independent
a79eec220b t5309: make test hash independent
796d1383a3 t5302: make hash size independent
417e45e5e3 t4060: make test work with SHA-256
dfa5f53e78 t4211: add test cases for SHA-256
f743e8f5b3 t4211: move SHA-1-specific test cases into a directory
72f936b120 t4013: make test hash independent
5df0f11f07 t3311: make test work with SHA-256
07877f393c t3310: make test work with SHA-256
6025e898d6 t3309: make test work with SHA-256
7b1a1822fe t3308: make test work with SHA-256
94db7e3e93 t3206: make hash size independent
db12505c2c t/lib-pack: support SHA-256
303b3c1c46 submodule: add newline on invalid submodule error
887a0fd573 add: change advice config variables used by the add API
de93cc14ab The third batch for 2.26
ea46d9097b Merge branch 'mt/sparse-checkout-doc-update'
ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix'
b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend'
7ab963e122 Merge branch 'en/fill-directory-fixes-more'
f52ab33616 Merge branch 'bc/hash-independent-tests-part-7'
25794d6ce9 Merge branch 'km/submodule-add-errmsg'
d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity'
76c57fedfa Merge branch 'js/add-p-leftover-bits'
9a5315edfd Merge branch 'js/patch-mode-in-others-in-c'
381e8e9de1 Merge branch 'dl/test-must-fail-fixes'
395518cf7a parse-options: lose an unnecessary space in an error message
079f970971 name-rev: sort tip names before applying
2d53975488 name-rev: release unused name strings
977dc1912b name-rev: generate name strings only if they are better
1c56fc2084 name-rev: pre-size buffer in get_parent_name()
ddc42ec786 name-rev: factor out get_parent_name()
f13ca7cef5 name-rev: put struct rev_name into commit slab
d689d6d82f name-rev: don't _peek() in create_or_update_name()
15a4205d96 name-rev: don't leak path copy in name_ref()
36d2419c9a name-rev: respect const qualifier
71620ca86c name-rev: remove unused typedef
3e2feb0d64 name-rev: rewrite create_or_update_name()
a21781011f index-pack: downgrade twice-resolved REF_DELTA to die()
dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout
e1c5253951 t3305: check notes fanout more carefully and robustly
e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks
a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st'
ad2dd5bb63 commit-graph.c: remove path normalization, comparison
13c2499249 commit-graph.h: store object directory in 'struct commit_graph'
0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context'
f38c92452d t7400: testcase for submodule status on unregistered inner git repos
5290d45134 tree-walk.c: break circular dependency with unpack-trees
f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch
d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode
e53ffe2704 sparse-checkout: escape all glob characters on write
e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand
bd64de42de sparse-checkout: unquote C-style strings over --stdin
d585f0e799 sparse-checkout: write escaped patterns in cone mode
4f52c2ce6c sparse-checkout: properly match escaped characters
9abc60f801 sparse-checkout: warn on globs in cone patterns
145136a95a C: use skip_prefix() to avoid hardcoded string length
04e5b3f0b4 submodule foreach: replace $path with $sm_path in example
1793280e91 t5318: don't pass non-object directory to '--object-dir'
da8063522f diff: move diff.wsErrorHighlight to "basic" config
b98d188581 sha1-file: allow check_object_signature() to handle any repo
2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file()
7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare()
c8123e72f6 streaming: allow open_istream() to handle any repo
5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile()
a651946730 cache-tree: use given repo's hash_algo at verify_one()
eb999b3295 diff: make diff_populate_filespec() honor its repo argument
5b0ca878e0 Sync with maint
344ee18728 The second batch
53a83299c7 Merge branch 'bc/misconception-doc'
c9ccf9d09b Merge branch 'bc/author-committer-doc'
0d0fa20c40 Merge branch 'ss/t6025-modernize'
7050624abc Merge branch 'lh/bool-to-type-bool'
4b69f29271 Merge branch 'ds/refmap-doc'
aff812ce3c Merge branch 'bc/actualmente'
38fb56e92a Merge branch 'rt/submodule-i18n'
f0940743fa Merge branch 'js/builtin-add-i-cmds'
0afeb3fdf4 Merge branch 'jk/test-fixes'
808dab2b58 Merge branch 'jk/asan-build-fix'
fec1ff97c2 Merge branch 'sg/completion-worktree'
c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function'
11ad30b887 Merge branch 'hi/gpg-mintrustlevel'
96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases'
d52adee779 Merge branch 'ds/graph-horizontal-edges'
6909474491 Merge branch 'am/update-pathspec-f-f-tests'
043426c8fd Merge branch 'ds/sparse-cone'
34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig'
8dd40c0472 traverse_trees(): use stack array for name entries
667b76ec58 walker_fetch(): avoid raw array length computation
9734b74a8f normalize_path_copy(): document "dst" size expectations
43f33e492a git-p4: avoid leak of file handle when cloning
19fa5ac333 git-p4: check for access to remote host earlier
6026aff5bb git-p4: cleanup better on error exit
ca5b5cce62 git-p4: create helper function importRevisions()
4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable
5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce
837b3a6376 git-p4: make closeStreams() idempotent
b0418303b1 sha1-name: mark get_oid() error messages for translation
2df1aa239c fetch: forgo full connectivity check if --filter
50033772d5 connected: verify promisor-ness of partial clone
d82ad54945 git: update documentation for --git-dir
0ad7144999 .mailmap: map Yi-Jyun Pan's email
c56c48dd07 grep: ignore --recurse-submodules if --no-index is given
8b2a1928f0 doc: drop "explicitly given" from push.default description
cf82bff73f obstack: avoid computing offsets from NULL pointer
3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer
d20bc01a51 avoid computing zero offsets from NULL pointer
7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero
bc3f657f71 t1506: drop space after redirection operator
e5d7b2f65c t1400: avoid "test" string comparisons
5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c
c7a6207591 Sync with maint
7210ca4ee5 .mailmap: fix GGG authoship screwup
37a63faae5 t4124: only mark git command with test_must_fail
a8c663cf65 t3507: use test_path_is_missing()
2def7f017c t3507: fix indentation
e8a1c686ae t3504: do check for conflict marker after failed cherry-pick
1c9fd32fd2 t3419: stop losing return code of git command
c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}()
a781cd6fef t3415: stop losing return codes of git commands
86ce6e0dd1 t3310: extract common notes_merge_files_gone()
245b9ba0ba t3030: use test_path_is_missing()
4a6f11fd7b t2018: replace "sha" with "oid"
62e80fcb48 t2018: don't lose return code of git commands
30c0367668 t2018: teach do_checkout() to accept `!` arg
40caa5366a t2018: be more discerning when checking for expected exit codes
b54128bb0b t5616: make robust to delta base change
4c616c2ba1 merge-recursive: use subtraction to flip stage
ee798742bd merge-recursive: silence -Wxor-used-as-pow warning
39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule
a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin
3b2885ec9b submodule: fix status of initialized but not cloned submodules
ace912bfb8 t7400: add a testcase for submodule status on empty dirs
4bb4fd4290 MyFirstContribution: add avenues for getting help
9e6d3e6417 sparse-checkout: detect short patterns
41de0c6fbc sparse-checkout: cone mode does not recognize "**"
7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone
47dbf10d8a clone: fix --sparse option with URLs
3c754067a1 sparse-checkout: create leading directories
d622c34396 t1091: improve here-docs
522e641748 t1091: use check_files to reduce boilerplate
417be08d02 t1300: create custom config file without special characters
3de7ee369b t1300: fix over-indented HERE-DOCs
329e6ec397 config: fix typo in variable name
767a9c417e rebase -i: stop checking out the tip of the branch to rebase
dfaed02862 fsmonitor: update documentation for hook version and watchman hooks
e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2
d031049da3 completion: add support for sparse-checkout
a402723e48 doc: sparse-checkout: mention --cone option
26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck
b6992261de rebase -i: re-fix short SHA-1 collision
d859dcad94 parse_insn_line(): improve error message when parsing failed
d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects
92fb0db94c pack-objects: add checks for duplicate objects
bb514de356 pack-objects: improve partial packfile reuse
ff483026a9 builtin/pack-objects: introduce obj_is_packed()
e704fc7978 pack-objects: introduce pack.allowPackReuse
2f4af77699 csum-file: introduce hashfile_total()
8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting()
59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile
40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains()
14fbd26044 ewah/bitmap: introduce bitmap_word_alloc()
bc7a3d4dc0 The first batch post 2.25 cycle
09e393d913 Merge branch 'nd/switch-and-restore'
45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport'
0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout'
36da2a8635 Merge branch 'es/unpack-trees-oob-fix'
42096c778d Merge branch 'bc/run-command-nullness-after-free-fix'
1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted'
a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees'
e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached'
9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting'
237a83a943 Merge branch 'dl/credential-netrc'
a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir()
129510a067 t2405: clarify test descriptions and simplify test
4eaadc8493 t2405: use git -C and test_commit -C instead of subshells
773c60a45e t7410: rename to t2405-worktree-submodule.sh
7a2dc95cbc docs: mention when increasing http.postBuffer is valuable
1b13e9032f doc: dissuade users from trying to ignore tracked files
69e104d70e doc: provide guidance on user.name format
813f6025a5 docs: expand on possible and recommended user config options
bc94e5862a doc: move author and committer information to git-commit(1)
7979dfe1d4 l10n: Update Catalan translation
81e3db42f3 templates: fix deprecated type option `--bool`
c513a958b6 t6025: use helpers to replace test -f <path>
70789843bd t6025: modernize style
6a7aca6f01 doc: rm: synchronize <pathspec> description
856249c62a docs: use "currently" for the present time
b40a50264a fetch: document and test --refmap=""
a9ae8fde2e t3404: directly test the behavior of interest
22a69fda19 git-rebase.txt: update description of --allow-empty-message
f1928f04b2 grep: use no. of cores as the default no. of threads
70a9fef240 grep: move driver pre-load out of critical section
1184a95ea2 grep: re-enable threads in non-worktree case
6c307626f1 grep: protect packed_git [re-]initialization
c441ea4edc grep: allow submodule functions to run in parallel
d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules()
1d1729caeb grep: replace grep_read_mutex by internal obj read lock
31877c9aec object-store: allow threaded access to object reading
b1fc9da1c8 replace-object: make replace operations thread-safe
d5b0bac528 grep: fix racy calls in grep_objects()
faf123c730 grep: fix race conditions at grep_submodule()
c3a5bb31c1 grep: fix race conditions on userdiff calls
0222540827 fetch: emphasize failure during submodule fetch
232378479e Sync with maint
e4837b4406 t7800: don't rely on reuse_worktree_file()
fbce03d329 t4018: drop "debugging" cat from hunk-header tests
f65d07fffa Makefile: use compat regex with SANITIZE=address
849e43cc18 built-in add -i: accept open-ended ranges again
d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files
a4ffbbbb99 submodule.c: mark more strings for translation
0cbb60574e dir: point treat_leading_path() warning to the right place
ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent
22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2
f365bf40a0 clean: demonstrate a bug with pathspecs
b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x
277eb5af7c t5604: make hash independent
44b6c05b43 t5601: switch into repository to hash object
7a868c51c2 t5562: use $ZERO_OID
1b8f39fb0d t5540: make hash size independent
a8c17e3bd6 t5537: make hash size independent
832072219c t5530: compute results based on object length
74ad99b1d8 t5512: abstract away SHA-1-specific constants
ba1be1ab45 t5510: make hash size independent
cba472d3ad t5504: make hash algorithm independent
82d5aeb1e6 t5324: make hash size independent
3c5e65cac1 t5319: make test work with SHA-256
235d3cddb8 t5319: change invalid offset for SHA-256 compatibility
1d86c8f0ce t5318: update for SHA-256
525a7f1769 t4300: abstract away SHA-1-specific constants
7a1bcb251b t4204: make hash size independent
cb78f4f0fe t4202: abstract away SHA-1-specific constants
717c939d8f t4200: make hash size independent
08a9dd891c t4134: compute appropriate length constant
215b60bf07 t4066: compute index line in diffs
194264c185 t4054: make hash-size independent
7d5ecd775d completion: list paths and refs for 'git worktree add'
3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands
3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options
367efd54b3 completion: return the index of found word from __git_find_on_cmdline()
d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function
2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper
54887b4689 gpg-interface: add minTrustLevel as a configuration option
684ceae32d fetch: default to protocol version 2
33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION
8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate
b9ab170752 config doc: protocol.version is not experimental
07ef3c6604 fetch test: use more robust test for filtered objects
d6509da620 fetch test: mark test of "skipping" haves as v0-only
a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too
c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function
bf66db37f1 add: use advise function to display hints
c958d3bd0a graph: fix collapse of multiple edges
8588932e20 graph: add test to demonstrate horizontal line bug
d0d0a357a1 t: directly test parse_pathspec_file()
568cabb2fe t: fix quotes tests for --pathspec-from-file
f94f7bd00d t: add tests for error conditions with --pathspec-from-file
b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job
12acdf573a built-in add -p: handle Escape sequences more efficiently
e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode
04f816b125 built-in add -p: respect the `interactive.singlekey` config setting
a5e46e6b01 terminal: add a new function to read a single keystroke
9ea416cb51 terminal: accommodate Git for Windows' default terminal
94ac3c31f7 terminal: make the code of disable_echo() reusable
08b1ea4c39 built-in add -p: handle diff.algorithm
180f48df69 built-in add -p: support interactive.diffFilter
1e4ffc765d t3701: adjust difffilter test
c81638541c submodule add: show 'add --dry-run' stderr when aborting
8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token
56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token
d0654dc308 Git 2.25
b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po
4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'"
ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1
e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master
1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
d78a1968c5 Merge branch 'ma/config-advice-markup-fix'
a20ae3ee29 l10n: Update Catalan translation
49e268e23e mingw: safeguard better against backslashes in file names
4c6c7971e0 unpack-trees: correctly compute result count
63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1
75449c1b39 l10n: de.po: Reword generation numbers
6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t)
3901d2c6bd config/advice.txt: fix description list separator
7a6a90c6ec Git 2.25-rc2
1f5f3ffe5c Merge branch 'ds/graph-assert-fix'
a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix'
202f68b252 Merge branch 'pm/am-in-body-header-doc-update'
7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix'
c5dc20638b Merge branch 'do/gitweb-typofix-in-comments'
fe47c9cb5f Merge https://github.com/prati0100/git-gui
a1087c9367 graph: fix lack of color in horizontal lines
0d251c3291 graph: drop assert() for merge with two collapsing parents
4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper
573117dfa5 unpack-trees: watch for out-of-range index position
e701bab3e9 restore: invalidate cache-tree when removing entries with --staged
1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command
fa74180d08 checkout: don't revert file on ambiguous tracking branches
2957709bd4 parse_branchname_arg(): extract part as new function
5020f6806a t2018: improve style of if-statement
7ffb54618b t2018: add space between function name and ()
63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH
065027ee1a string-list: note in docs that callers can specify sorting function
26f924d50e unpack-trees: exit check_updates() early if updates are not wanted
042ed3e048 The final batch before -rc2
0f1930cd1b Merge branch 'ds/sparse-cone'
037f067587 Merge branch 'ds/commit-graph-set-size-mult'
f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify'
c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode'
a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
c4117fcb97 Merge branch 'pb/clarify-line-log-doc'
556f0258df Merge branch 'ew/packfile-syscall-optim'
5814d44d9b doc: submodule: fix typo for command absorbgitdirs
7047f75f22 editorconfig: indent text files with tabs
60440d72db sha1-file: document how to use pretend_object_file
7fdc5f296f l10n: es: 2.25.0 round #1
f8740c586b am: document that Date: can appear as an in-body header
4e2c4c0d4f gitweb: fix a couple spelling errors in comments
421c0ffb02 multi-pack-index: correct configuration in documentation
757ff352bd Documentation/git-sparse-checkout.txt: fix a typo
0d2116c644 Merge branch 'zs/open-current-file'
9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u)
3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master
4c5081614c l10n: fr.po v2.25.0 rnd 1
5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0
63020f175f commit-graph: prefer default size_mult when given zero
224c7d70fa mingw: only test index entries for backslashes, not tree entries
9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED
8679ef24ed Git 2.25-rc1
a82027e9e6 Merge branch 'js/use-test-tool-on-path'
13432fc6dd Merge branch 'js/mingw-reserved-filenames'
e0e1ac5db0 Merge branch 'en/rebase-signoff-fix'
b76a244c9d Merge branch 'em/freebsd-cirrus-ci'
bc855232bc Merge branch 'bk/p4-misc-usability'
763a59e71c merge-recursive: remove unnecessary oid_eq function
44143583b7 sparse-checkout: use extern for global variables
d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master
13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1
786f4d2405 git-gui: allow opening currently selected file in default app
4fd683b6a3 sparse-checkout: document interactions with submodules
de11951b03 sparse-checkout: list directories in cone mode
0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0
578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed)
173fff68da Merge tag 'v2.25.0-rc0' into git-po-master
f1842ff531 t2018: remove trailing space from test description
20a67e8ce9 t3008: find test-tool through path lookup
9e341f62ca l10n: Update Catalan translation
4e61b2214d packfile: replace lseek+read with pread
ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision
2be45868a8 doc: log, gitk: document accepted line-log diff formats
280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD
0a76bd7381 mailmap: mask accentless variant for Công Danh
99c33bed56 Git 2.25-rc0
d2189a721c Merge branch 'en/fill-directory-fixes'
8be0a428d6 Merge branch 'rs/test-cleanup'
65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string'
c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
45b96a6fa1 Merge branch 'js/add-p-in-c'
ccc292e862 Merge branch 'jc/drop-gen-hdrs'
dfee504bee Merge branch 'ja/doc-markup-cleanup'
87cbb1ca66 Merge branch 'rs/ref-read-cleanup'
20aa6d88b7 Merge branch 'rb/p4-lfs'
fcd5b55f56 Merge branch 'pb/submodule-doc-xref'
4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free'
ba6b66281e Merge branch 'ln/userdiff-elixir'
bd72a08d6c Merge branch 'ds/sparse-cone'
f3c520e17f Merge branch 'sg/name-rev-wo-recursion'
6514ad40a1 Merge branch 'ra/t5150-depends-on-perl'
17066bea38 Merge branch 'dl/format-patch-notes-config-fixup'
135365dd99 Merge branch 'am/pathspec-f-f-checkout'
ff0cb70d45 Merge branch 'am/pathspec-from-file'
4dc42c6c18 mingw: refuse paths containing reserved names
98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16
c480eeb574 commit --interactive: make it work with the built-in `add -i`
cee6cb7300 built-in add -p: implement the "worktree" patch modes
52628f94fc built-in add -p: implement the "checkout" patch modes
6610e4628a built-in stash: use the built-in `git add -p` if so configured
90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting
36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes
d2a233cb8b built-in add -p: prepare for patch modes other than "stage"
761e3d26bb sparse-checkout: improve OS ls compatibility
6579d93a97 contrib/credential/netrc: work outside a repo
1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable
b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI
b441717256 t1507: inline full_name()
9291e6329e t1507: run commands within test_expect_success
5236fce6b4 t1507: stop losing return codes of git commands
10812c2337 t1501: remove use of `test_might_fail cp`
62d58cda69 t1409: use test_path_is_missing()
b87b02cfe6 t1409: let sed open its own input file
9b92070e52 t1307: reorder `nongit test_must_fail`
3595d10c26 t1306: convert `test_might_fail rm` to `rm -f`
f511bc02ed t0020: use ! check_packed_refs_marked
f6041abdcd t0020: don't use `test_must_fail has_cr`
f46c243e66 t0003: don't use `test_must_fail attr_check`
99c049bc4c t0003: use test_must_be_empty()
3738439c77 t0003: use named parameters in attr_check()
7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err()
b8afb908c2 t/lib-git-p4: use test_path_is_missing()
4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases
6836d2fe06 dir.c: use st_add3() for allocation size
c847dfafee dir: consolidate similar code in treat_directory()
777b420347 dir: synchronize treat_leading_path() and read_directory_recursive()
b9670c1f5e dir: fix checks on common prefix directory
5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit
23cbe427c4 Merge branch 'py/console-close-esc'
124a895811 t4015: improve coverage of function context test
509efef789 commit: forbid --pathspec-from-file --all
12029dc57d t3434: mark successful test as such
e0f9095aaa notes.h: fix typos in comment
675ef6bab8 t6030: don't create unused file
01ed17dc8c t5580: don't create unused file
f670adb49b t3501: don't create unused file
1e1ccbfdd3 git-gui: allow closing console window with Escape
7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays.
b02fd2acca The sixth batch
59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex'
e3b72391d1 Merge branch 'rs/commit-export-env-simplify'
43bf44e23a Merge branch 'rs/archive-zip-code-cleanup'
4438a1a59f Merge branch 'js/t3404-indent-fix'
3a44db2ed2 Merge branch 'dr/branch-usage-casefix'
8bc481f4f6 Merge branch 'sg/t9300-robustify'
011fc2e88e Merge branch 'js/add-i-a-bit-more-tests'
d1c0fe8d9b Merge branch 'dl/range-diff-with-notes'
26c816a67d Merge branch 'hw/doc-in-header'
f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
71a7de7a99 Merge branch 'dl/rebase-with-autobase'
c9f5fc9114 Merge branch 'dl/test-cleanup'
6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap'
3beff388b2 Merge branch 'js/builtin-add-i-cmds'
4755a34c47 Merge branch 'dd/time-reentrancy'
37c2619d91 Merge branch 'ag/sequencer-todo-updates'
608e380502 git-p4: show detailed help when parsing options fail
e2aed5fd5b git-p4: yes/no prompts should sanitize user text
571fb96573 fix-typo: consecutive-word duplications
f371984613 Makefile: drop GEN_HDRS
2e4083198d built-in add -p: show helpful hint when nothing can be staged
54d9d9b2ee built-in add -p: only show the applicable parts of the help text
ade246efed built-in add -p: implement the 'q' ("quit") command
d6cf873340 built-in add -p: implement the '/' ("search regex") command
9254bdfb4f built-in add -p: implement the 'g' ("goto") command
bcdd297b78 built-in add -p: implement hunk editing
b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf"
11f2c0dae8 built-in add -p: coalesce hunks after splitting them
510aeca199 built-in add -p: implement the hunk splitting feature
0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions
5906d5de77 built-in app -p: allow selecting a mode change as a "hunk"
47dc4fd5eb built-in add -p: handle deleted empty files
80399aec5a built-in add -p: support multi-file diffs
7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed
12c24cf850 built-in add -p: color the prompt and the help text
25ea47af49 built-in add -p: adjust hunk headers as needed
e3bd11b4eb built-in add -p: show colored hunks by default
1942ee44e8 built-in add -i: wire up the new C code for the `patch` command
f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C
d1b1384d61 userdiff: remove empty subexpression from elixir regex
df5be01669 doc: indent multi-line items in list
fd5041e127 doc: remove non pure ASCII characters
190a65f9db sparse-checkout: respect core.ignoreCase in cone mode
1d7297513d notes: break set_display_notes() into smaller functions
66f79ee23d config/format.txt: clarify behavior of multiple format.notes
cc2bd5c45d gitmodules: link to gitsubmodules guide
99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed
e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed
8c02fe6060 t7004: don't create unused file
cb05d6a5ed t4256: don't create unused file
c5c4eddd56 dir: break part of read_directory_recursive() out for reuse
072a231016 dir: exit before wildcard fall-through if there is no wildcard
2f5d3847d4 dir: remove stray quote character in comment
a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories"
452efd11fb t3011: demonstrate directory traversal failures
ea94b16fb8 git-p4: honor lfs.storage configuration variable
51a0a4ed95 bisect--helper: avoid use-after-free
d32e065a91 Merge branch 'kk/branch-name-encoding'
ad05a3d8e5 The fifth batch
7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix'
b089e5e6cb Merge branch 'em/test-skip-regex-illseq'
930078ba39 Merge branch 'hi/gpg-use-check-signature'
08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode'
7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk'
55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm'
41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress'
5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise'
dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix'
d37cfe3b5c Merge branch 'dl/pretty-reference'
99c4ff1bda Merge branch 'dl/submodule-set-url'
55d607d85b Merge branch 'js/mingw-inherit-only-std-handles'
c58ae96fc4 Merge branch 'am/pathspec-from-file'
7c88714262 Merge branch 'po/bundle-doc-clonable'
5d9324e0f4 Merge branch 'ra/rebase-i-more-options'
7034cd094b Sync with Git 2.24.1
09ac67a183 format-patch: move git_config() before repo_init_revisions()
8164c961e1 format-patch: use --notes behavior for format.notes
452538c358 notes: extract logic into set_display_notes()
e6e230eeae notes: create init_display_notes() helper
1e6ed5441a notes: rename to load_display_notes()
2866fd284c name-rev: cleanup name_ref()
49f7a2fde9 name-rev: eliminate recursion in name_rev()
fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name'
e05e8cf074 archive-zip: use enum for compression method
39acfa3d22 git gui: fix branch name encoding error
11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description
8cf8f9b4aa t3404: fix indentation
4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs
147ee35558 commit: use strbuf_add() to add a length-limited string
559c6fc317 The fourth batch
56e6c16394 Merge branch 'dl/lore-is-the-archive'
3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive'
7cb0d37f6d Merge branch 'tg/perf-remove-stale-result'
403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick'
f0cf2fee5d Merge branch 'hi/grep-do-not-return-void'
391fb22ac7 Merge branch 'rs/use-skip-prefix-more'
92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd'
4ba74ca901 Merge branch 'rs/test-cleanup'
f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick'
ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9'
8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters
3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances
dd432a6ecf name-rev: restructure parsing commits and applying date cutoff
dd090a8a37 name-rev: pull out deref handling from the recursion
766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper
d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev()
bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation
e0c4da6f2a name-rev: avoid unnecessary cast in name_ref()
c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name()
c593a26348 t6120-describe: modernize the 'check_describe' helper
abcf857300 range-diff: clear `other_arg` at end of function
f8675343d7 range-diff: mark pointers as const
828765dfe0 t3206: fix incorrect test name
0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early
21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile
b4bbbbd5a2 apply --allow-overlap: fix a corner case
89c8559367 git add -p: use non-zero exit code when the diff generation failed
e91162be9c t3701: verify that the diff.algorithm config setting is handled
0c3222c4f3 t3701: verify the shown messages when nothing can be added
24be352d52 t3701: add a test for the different `add -p` prompts
8539b46534 t3701: avoid depending on the TTY prerequisite
0f0fba2cc8 t3701: add a test for advanced split-hunk editing
53a06cf39b Git 2.24.1
67af91c47a Sync with 2.23.1
a7312d1a28 Git 2.23.1
7fd9fd94fb Sync with 2.22.2
d9589d4051 Git 2.22.2
5421ddd8d0 Sync with 2.21.1
367f12b7e9 Git 2.21.1
20c71bcf67 Merge branch 'fix-msys2-quoting-bugs'
7d8b676992 mingw: sh arguments need quoting in more circumstances
d9061ed9da t7415: drop v2.20.x-specific work-around
04522edbd4 mingw: fix quoting of empty arguments for `sh`
49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts
e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly
fc346cb292 Sync with 2.20.2
4cd1cf31ef Git 2.20.2
c154745074 submodule: defend against submodule.update = !command in .gitmodules
4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x
d851d94151 Sync with 2.19.3
caccc527ca Git 2.19.3
7c9fbda6e2 Sync with 2.18.2
9877106b01 Git 2.18.2
14af7ed5a9 Sync with 2.17.3
a5ab8d0317 Git 2.17.3
bb92255ebe fsck: reject submodule.update = !command in .gitmodules
bdfef0492c Sync with 2.16.6
eb288bc455 Git 2.16.6
68440496c7 test-drop-caches: use `has_dos_drive_prefix()`
9ac92fed5b Sync with 2.15.4
7cdafcaacf Git 2.15.4
e904deb89d submodule: reject submodule.update = !command in .gitmodules
d3ac8c3f27 Sync with 2.14.6
66d2a6159f Git 2.14.6
083378cc35 The third batch
88bd37a2d0 Merge branch 'js/pkt-line-h-typofix'
473b431410 Merge branch 'us/unpack-trees-fsmonitor'
e0f9ec9027 Merge branch 'sg/test-bool-env'
fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset'
e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere'
88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory'
8feb47e882 Merge branch 'dl/t5520-cleanup'
6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree'
57d46bc602 Merge branch 'mg/doc-submodule-status-cached'
75bd003c7b Merge branch 'js/git-svn-use-rebase-merges'
f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix'
c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'
36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree'
cf91c31688 Merge branch 'sg/unpack-progress-throughput'
ef6104581d Merge branch 'pb/submodule-update-fetches'
7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix'
f3c7bfdde2 Merge branch 'dl/range-diff-with-notes'
9502b616f1 Merge branch 'jh/userdiff-python-async'
76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2'
995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label'
f7998d9793 Merge branch 'js/builtin-add-i'
917d0d6234 Merge branch 'js/rebase-r-safer-label'
56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers'
2763530048 Merge branch 'jg/revert-untracked'
fa38ab68b0 git-gui: revert untracked files by deleting them
d9c6469f38 git-gui: update status bar to track operations
29a9366052 git-gui: consolidate naming conventions
0bb313a552 xdiff: unignore changes in function context
2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names'
65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods'
5532ebdeb7 Merge branch 'fix-mingw-quoting-bug'
76a681ce9c Merge branch 'dubiously-nested-submodules'
dd53ea7220 Merge branch 'turn-on-protectntfs-by-default'
f82a97eb91 mingw: handle `subst`-ed "DOS drives"
7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams'
d2c84dad1c mingw: refuse to access paths with trailing spaces or periods
379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh
817ddd64c2 mingw: refuse to access paths with illegal characters
cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors
7530a6287e quote-stress-test: allow skipping some trials
35edce2056 t6130/t9350: prepare for stringent Win32 path validation
55953c77c0 quote-stress-test: accept arguments to test via the command-line
ad15592529 tests: add a helper to stress test argument quoting
a8dee3ca61 Disallow dubiously-nested submodule git directories
9102f958ee protect_ntfs: turn on NTFS protection by default
91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams
6d8684161e mingw: fix quoting of arguments
3a85dc7d53 is_ntfs_dotgit(): speed it up
7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses
288a74bcd2 is_ntfs_dotgit(): only verify the leading segment
a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark
cae0bc09ab rebase: fix format.useAutoBase breakage
945dc55dda format-patch: teach --no-base
700e006c5d t4014: use test_config()
a749d01e1d format-patch: fix indentation
0c47e06176 t3400: demonstrate failure with format.useAutoBase
d9b31db2c4 t7700: stop losing return codes of git commands
3699d69df0 t7700: make references to SHA-1 generic
dcf9a748ca t7700: replace egrep with grep
cfe5eda02a t7700: consolidate code into test_has_duplicate_object()
ae475afc0f t7700: consolidate code into test_no_missing_in_packs()
14b7664df8 doc: replace LKML link with lore.kernel.org
d23f9c8e04 RelNotes: replace Gmane with real Message-IDs
dcee037228 doc: replace MARC links with lore.kernel.org
a9aecc7abb checkout, restore: support the --pathspec-from-file option
cfd9376c1d doc: restore: synchronize <pathspec> description
8ea1189eac doc: checkout: synchronize <pathspec> description
6fdc9ad259 doc: checkout: fix broken text reference
1d022bb43f doc: checkout: remove duplicate synopsis
bebb5d6d6b add: support the --pathspec-from-file option
21bb3083c3 cmd_add: prepare for next patch
4778452597 Merge branch 'prevent-name-squatting-on-windows'
a7b1ad3b05 Merge branch 'jk/fast-import-unsafe'
525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()`
e1d911dd4c mingw: disallow backslash characters in tree objects' file names
0060fd1511 clone --recurse-submodules: prevent name squatting on Windows
a52ed76142 fast-import: disallow "feature import-marks" by default
68061e3470 fast-import: disallow "feature export-marks" by default
019683025f fast-import: delay creating leading directories for export-marks
e075dba372 fast-import: stop creating leading directories for import-marks
11e934d56e fast-import: tighten parsing of boolean command line options
816f806786 t9300: create marks files for double-import-marks test
f94804c1f2 t9300: drop some useless uses of cat
4f3e57ef13 submodule--helper: advise on fatal alternate error
10c64a0b3c Doc: explain submodule.alternateErrorStrategy
ec48540fe8 packfile.c: speed up loading lots of packfiles
3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value
a4fb016ba1 pkt-line: fix a typo
0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r
e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data
228f53135a The second batch
6c630f237e Merge branch 'jk/gitweb-anti-xss'
3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell'
4775e02a5c Merge branch 'ma/t7004'
a6c6f8d02a Merge branch 'js/complete-svn-recursive'
3ae8defaf9 Merge branch 'jk/send-pack-remote-failure'
aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix'
4ab9616c76 Merge branch 'sg/skip-skipped-prereq'
723a8adba5 Merge branch 'ds/test-read-graph'
9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation'
406ca29e0d Merge branch 'rs/parse-options-dup-null-fix'
fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging'
8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion'
ef8f621045 Merge branch 'dl/complete-rebase-onto'
3c3e5d0ea2 Merge branch 'tg/stash-refresh-index'
43c5fe1c1d Merge branch 'nn/doc-rebase-merges'
6511cb33c9 Merge branch 'dd/sequencer-utf8'
f165457618 Merge branch 'jk/remove-sha1-to-hex'
a774064fb0 Merge branch 'dj/typofix-merge-strat'
ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates'
d2489ce92c Merge branch 'rs/skip-iprefix'
376e7309e1 Merge branch 'ln/userdiff-elixir'
9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log'
d3096d2ba6 Merge branch 'en/doc-typofix'
26f20fa3fc Merge branch 'ns/test-desc-typofix'
ffd130a363 Merge branch 'en/t6024-style'
5149902ff9 Merge branch 'en/misc-doc-fixes'
bcb06e204c Merge branch 'js/fetch-multi-lockfix'
d08daec001 Merge branch 'rs/trace2-dots'
fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix'
bad5ed39cd Merge branch 'cb/curl-use-xmalloc'
7ab2088255 Merge branch 'rt/fetch-message-fix'
f089ddd56a Merge branch 'es/myfirstcontrib-updates'
3c90710c0c Merge branch 'hw/config-doc-in-header'
d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code'
5444d52866 Merge branch 'js/vreportf-wo-buffering'
05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add'
ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides'
532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default'
dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists'
fac9ab1419 Merge branch 'ma/bisect-doc-sample-update'
a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix'
0be5caf97c Merge branch 'jc/log-graph-simplify'
0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck'
2e697ced9d built-in add -i: offer the `quit` command
d7633578b5 built-in add -i: re-implement the `diff` command
8746e07277 built-in add -i: implement the `patch` command
ab1e1cccaf built-in add -i: re-implement `add-untracked` in C
c54ef5e424 built-in add -i: re-implement `revert` in C
a8c45be939 built-in add -i: implement the `update` command
f37c226454 built-in add -i: prepare for multi-selection commands
c08171d156 built-in add -i: allow filtering the modified files list
0c3944a628 add-interactive: make sure to release `rev.prune_data`
4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance
867fc7f310 grep: don't return an expression from pcre2_free()
c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables
72b006f4bf gpg-interface: prefer check_signature() for GPG verification
7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD
b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r
ccd469450a date.c: switch to reentrant {gm,local}time_r
271c351b2f t7811: don't create unused file
65efb42862 t9300: don't create unused file
f6b9413baf sequencer: fix a memory leak in sequencer_continue()
3eae30e464 doc: replace public-inbox links with lore.kernel.org
46c67492aa doc: recommend lore.kernel.org over public-inbox.org
5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects
17a4ae92ea t7700: s/test -f/test_path_is_file/
d2eee32a89 t7700: move keywords onto their own line
7a1c8c2346 t7700: remove spaces after redirect operators
09279086e8 t7700: drop redirections to /dev/null
756ee7fc9f t7501: stop losing return codes of git commands
38c1aa01de t7501: remove spaces after redirect operators
763b47bafa t5703: stop losing return codes of git commands
eacaa1c180 t5703: simplify one-time-sed generation logic
a29b2429e5 t5317: use ! grep to check for no matching lines
6c37f3ec1b t5317: stop losing return codes of git commands
b66e0a1773 t4138: stop losing return codes of git commands
afd43c9905 t4015: use test_write_lines()
946d2353a3 t4015: stop losing return codes of git commands
50cd31c652 t3600: comment on inducing SIGPIPE in `git rm`
3b737381d8 t3600: stop losing return codes of git commands
0d913dfa7e t3600: use test_line_count() where possible
29a40b5a67 t3301: stop losing return codes of git commands
9b5a9fa60a t0090: stop losing return codes of git commands
17aa9d9c1a t0014: remove git command upstream of pipe
77a946be98 apply-one-time-sed.sh: modernize style
176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job
ed254710ee test: use test_must_be_empty F instead of test_cmp empty F
c74b3cbb83 t7812: add missing redirects
213dabf49d test: use test_must_be_empty F instead of test -z $(cat F)
c93a5aaec8 t1400: use test_must_be_empty
6e4826ea75 t1410: use test_line_count
a5d04a3ef9 t1512: use test_line_count
54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd()
2059e79c0d name-rev: use skip_prefix() instead of starts_with()
1768aaf01d push: use skip_prefix() instead of starts_with()
ec6ee0c07a shell: use skip_prefix() instead of starts_with()
7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with()
a6293f5d28 fetch: use skip_prefix() instead of starts_with()
13ca8fb79e t5150: skip request-pull test if Perl is disabled
ecc0869080 commit-graph: use start_delayed_progress()
44a4693bfc progress: create GIT_PROGRESS_DELAY
528d9e6d01 t/perf: don't depend on Git.pm
b8dcc45387 perf-lib: use a single filename for all measurement types
fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk'
d82dfa7f5b rebase -i: finishing touches to --reset-author-date
1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory
393adf7a6f sequencer: directly call pick_commits() from complete_action()
a2dd67f105 rebase: fill `squash_onto' in get_replay_opts()
3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function
34065541e3 sequencer: update `done_nr' when skipping commands in a todo list
8638114e06 sequencer: update `total_nr' when adding an item to a todo list
0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk
ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk
ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions
9917eca794 l10n: zh_TW: add translation for v2.24.0
0a8e3036a3 reset: parse rev as tree-ish in patch mode
f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits
8d483c8408 doc: document 'git submodule status --cached'
befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick
ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later
9a780a384d mingw: spawned processes need to inherit only standard handles
c5a03b1e29 mingw: work around incorrect standard handles
eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes
a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool
43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values
2d05ef2778 sequencer: fix empty commit check when amending
ea8b7be147 git svn: stop using `rebase --preserve-merges`
67a6ea6300 gpg-interface: limit search for primary key fingerprint
392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern
cff4e9138d sparse-checkout: check for dirty status
416adc8711 sparse-checkout: update working directory in-process for 'init'
f75a69f880 sparse-checkout: cone mode should not interact with .gitignore
fb10ca5b54 sparse-checkout: write using lockfile
99dfa6f970 sparse-checkout: use in-process update for disable subcommand
e091228e17 sparse-checkout: update working directory in-process
e9de487aa3 sparse-checkout: sanitize for nested folders
4dcd4def3c unpack-trees: add progress to clear_ce_flags()
eb42feca97 unpack-trees: hash less in cone mode
af09ce24a9 sparse-checkout: init and set in cone mode
96cc8ab531 sparse-checkout: use hashmaps for cone patterns
879321eb0b sparse-checkout: add 'cone' mode
e6152e35ff trace2: add region in clear_ce_flags
72918c1ad9 sparse-checkout: create 'disable' subcommand
7bffca95ea sparse-checkout: add '--stdin' option to set subcommand
f6039a9423 sparse-checkout: 'set' subcommand
d89f09c828 clone: add --sparse mode
bab3c35908 sparse-checkout: create 'init' subcommand
94c0956b60 sparse-checkout: create builtin with 'list' subcommand
679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files
df6d3d6802 lib-bash.sh: move `then` onto its own line
2a02262078 t5520: replace `! git` with `test_must_fail git`
c245e58bb6 t5520: remove redundant lines in test cases
a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp
e959a18ee7 t5520: don't put git in upstream of pipe
5540ed27bc t5520: test single-line files by git with test_cmp
dd0f1e767b t5520: use test_cmp_rev where possible
979f8891cc t5520: replace test -{n,z} with test-lib functions
3037d3db90 t5520: use test_line_count where possible
93a9bf876b t5520: remove spaces after redirect operator
ceeef863de t5520: replace test -f with test-lib functions
4c8b046f82 t5520: let sed open its own input
53c62b9810 t5520: use sq for test case names
e8d1eaf9b4 t5520: improve test style
2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals
8cb7980382 t0000: test multiple local assignment
5b583e6a09 format-patch: pass notes configuration to range-diff
bd36191886 range-diff: pass through --notes to `git log`
9f726e1b87 range-diff: output `## Notes ##` header
3bdbdfb7a5 t3206: range-diff compares logs with commit notes
75c5aa0701 t3206: s/expected/expect/
79f3950d02 t3206: disable parameter substitution in heredoc
3a6e48e9f7 t3206: remove spaces after redirect operators
26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish
077a1fda82 userdiff: support Python async functions
3798149a74 SubmittingPatches: use `--pretty=reference`
1f0fc1db85 pretty: implement 'reference' format
618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type
0df621172d pretty: provide short date format
ac52d9410e t4205: cover `git log --reflog -z` blindspot
3e8ed3b93e pretty.c: inline initalize format_context
4982516451 revision: make get_revision_mark() return const pointer
f0f9de2bd7 completion: complete `tformat:` pretty format
fb2ffa77a6 SubmittingPatches: remove dq from commit reference
bae74c9dfb pretty-formats.txt: use generic terms for hash
bd00717eab SubmittingPatches: use generic terms for hash
9d45ac4cbf rev-list-options.txt: remove reference to --show-notes
828e829b9e argv-array: add space after `while`
e440fc5888 commit: support the --pathspec-from-file option
66a25a7242 doc: commit: synchronize <pathspec> description
64bac8df97 reset: support the `--pathspec-from-file` option
d137b50756 doc: reset: synchronize <pathspec> description
24e4750c96 pathspec: add new function to parse file
0dbc4a0edf ci(osx): update homebrew-cask repository with less noise
e02058a729 sequencer: handle rebase-merges for "onto" message
bae60ba7e9 builtin/unpack-objects.c: show throughput progress
2d92ab32fd rev-parse: make --show-toplevel without a worktree an error
9e5afdf997 fetch: add trace2 instrumentation
4c4066d95d run-command: move doc to run-command.h
6c51cb525d trace2: move doc to trace2.h
7db0305438 parse-options: add link to doc file in parse-options.h
d95a77d059 submodule-config: move doc to submodule-config.h
f3b9055624 credential: move doc to credential.h
bbcfa3002a tree-walk: move doc to tree-walk.h
971b1f24a2 argv-array: move doc to argv-array.h
f1ecbe0f53 trace: move doc to trace.h
13aa9c8b70 cache: move doc to cache.h
c0be43f898 sigchain: move doc to sigchain.h
19ef3ddd36 pathspec: move doc to pathspec.h
301d595e72 revision: move doc to revision.h
3a1b3415d9 attr: move doc to attr.h
126c1ccefb refs: move doc to refs.h
d27eb356bf remote: move doc to remote.h and refspec.h
405c6b1fbc sha1-array: move doc to sha1-array.h
d3d7172e40 merge: move doc to ll-merge.h
3f1480b745 graph: move doc to graph.h and graph.c
266f03eccd dir: move doc to dir.h
13c4d7eb22 diff: move doc to diff.h and diffcore.h
cd5522271f rebase -r: let `label` generate safer labels
867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()`
8c15904462 built-in add -i: implement the `help` command
3d965c7674 built-in add -i: use color in the main loop
68db1cbf8e built-in add -i: support `?` (prompt help)
76b743234c built-in add -i: show unique prefixes of the commands
6348bfba58 built-in add -i: implement the main loop
a376e37b2c gitweb: escape URLs generated by href()
b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI
f28bceca75 t/gitweb-lib.sh: drop confusing quotes
0eba60c9b7 t9502: pass along all arguments in xss helper
932757b0cc INSTALL: use existing shell scripts as example
b018719927 t7004: check existence of correct tag
1daaebcaa5 built-in add -i: color the header in the `status` command
5e82b9e4d2 built-in add -i: implement the `status` command
e4cb659ebd diff: export diffstat interface
f83dff60a7 Start to implement a built-in version of `git add --interactive`
df53c80822 stash: make sure we have a valid index before writing it
ad7a403268 send-pack: check remote ref status on pack-objects failure
d91ce887c9 t6120-describe: correct test repo history graph in comment
1f9247a3bd completion: tab-complete "git svn --recursive"
603960b50e promisor-remote: remove fetch_if_missing=0
e362fadcd0 clone: remove fetch_if_missing=0
169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL
51bd6be32d mingw: use COPY_ARRAY for copying array
4bd0593e0f test-tool: use 'read-graph' helper
e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway
d784d978f6 t4215: use helper function to check output
61eea521fe fsmonitor: do not compare bitmap size with size of split index
b19f3fe9dd hex: drop sha1_to_hex()
c1ce9c06d0 completion: learn to complete `git rebase --onto=`
f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls
d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase
aa6d7f93ed hex: drop sha1_to_hex_r()
52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch
5772b0c745 sequencer: reencode old merge-commit message
e0eba649e8 bundle-verify: add --quiet
79862b6b77 bundle-create: progress output control
73c3253d75 bundle: framework for options before bundle file
68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in"
b375744274 sequencer: reencode squashing commit's message
019a9d8362 sequencer: reencode revert/cherry-pick's todo list
0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list
e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding
1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary
d9f6f3b619 The first batch post 2.24 cycle
28014c1084 Merge branch 'bc/hash-independent-tests-part-6'
57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree'
c22f63c40f Merge branch 'pb/pretty-email-without-domain-part'
5731ca3657 Merge branch 'hw/remove-api-docs-placeholder'
14b58c62bc Merge branch 'sg/commit-graph-usage-fix'
eff313f8a7 Merge branch 'dl/apply-3way-diff3'
db806d7064 Merge branch 'sg/dir-trie-fixes'
f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix'
8f1119b988 Merge branch 'wb/midx-progress'
d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes'
0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges'
8f40d89783 Merge branch 'hv/bitshift-constants-in-blame'
d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head'
5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer'
b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc'
15d9f3dc66 Merge branch 'es/walken-tutorial'
026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor'
ed28358833 convert: use skip_iprefix() in validate_encoding()
89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding()
03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules
ae821ffe83 multimail: fix a few simple spelling errors
557c5895c2 sha1dc: fix trivial comment spelling error
aa74be316a Fix spelling errors in test commands
96c0caf5e3 Fix spelling errors in messages shown to users
4dc8b1c114 Fix spelling errors in names of tests
7a40cf1553 Fix spelling errors in comments of testcases
15beaaa3d1 Fix spelling errors in code comments
a807200f67 userdiff: add Elixir to supported userdiff languages
461caf3e8a git-shortlog.txt: include commit limiting options
6462d5eb9a fetch: remove fetch_if_missing=0
46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion
99b2ba35f5 t0028: eliminate non-standard usage of printf
add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul`
14c4776d75 t: fix typo in test descriptions
270de6acbe t6024: modernize style
77363a51fb name-hash.c: remove duplicate word in comment
c92faa4d22 hashmap: fix documentation misuses of -> versus .
a6d39f2efb git-filter-branch.txt: correct argument name typo
4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators
8915297925 Fix spelling errors in documentation outside of Documentation/
031fd4b93b Documentation: fix a bunch of typos, both old and new
dd0b61f577 fsmonitor: fix watchman integration
5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare()
7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph
c14e6e7903 fetch: add the command-line option `--write-commit-graph`
da72936f54 Git 2.24
1d34d425d4 Merge branch 'bc/doc-use-docbook-5'
dac1d83c91 Merge branch 'ds/commit-graph-on-fetch'
c32ca691c2 Merge branch 'jt/delay-fetch-if-missing'
ab6b50e4c8 Merge https://github.com/prati0100/git-gui
93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po
a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2
fe28ad8520 rebase: add --reset-author-date
08187b4cba rebase -i: support --ignore-date
0185c683c9 sequencer: rename amend_author to author_to_rename
cbd8db17ac rebase -i: support --committer-date-is-author-date
c068bcc59b sequencer: allow callers of read_author_script() to ignore fields
ba51d2fb24 rebase -i: add --ignore-whitespace flag
3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower
3ada78de3f myfirstcontrib: add dependency installation step
4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt
4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly
8dfb04ae96 update-index: optionally leave skip-worktree entries alone
116d1fa6c6 vreportf(): avoid relying on stdio buffering
efd5444238 RelNotes/2.24.0: fix self-contradictory note
391c7e40b5 fetch.c: fix typo in a warning message
55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template
849e43680d RelNotes/2.24.0: typofix
0115e5d929 git-diff.txt: document return code of `--no-index`
798d66e35d l10n: de.po: Update German translation
c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u)
f21f8f5d35 Git 2.24-rc2
8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix'
0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix'
f2db52c46b Merge branch 'js/mingw-needs-hiding-fix'
5b7594abdc Merge branch 'master' of github.com:vnwildman/git
034d33653a Merge branch 'next' of github.com:ChrisADR/git-po
26b061007c submodule: teach set-url subcommand
460782b7be t7519-status-fsmonitor: improve comments
d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses
4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config
1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694)
f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0
762d5b4f46 help: add gitsubmodules to the list of guides
76a53d640f git_path(): handle `.lock` files correctly
3ce47211a6 t1400: wrap setup code in test case
44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string
6c02042139 clone: rename static function `dir_exists()`.
8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command
77200e9332 l10n: es: 2.24.0 round 2
e42df36b42 Merge branch 'l10n/it/update-italian-translation'
5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2
51728480fe l10n: fr v2.24.0 rnd2
045a548698 l10n: git.pot: v2.24.0 round 2 (1 new)
468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master
b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree()
c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit()
103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag()
f648ee7088 fsck: rename vague "oid" local variables
cc579000bf fsck: don't require an object struct in verify_headers()
7854399366 fsck: don't require an object struct for fsck_ident()
b8b00f1693 fsck: drop blob struct from fsck_finish()
6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob()
38370253fd fsck: don't require an object struct for report()
f59793763d fsck: only require an oid for skiplist functions
5afc4b1dc6 fsck: only provide oid/type in fsck_error callback
82ef89b318 fsck: don't require object structs for display functions
733902905d fsck: use oids rather than objects for object_name API
d40bbc109b fsck_describe_object(): build on our get_object_name() primitive
a59cfb3230 fsck: unify object-name code
23a173a761 fsck: require an actual buffer for non-blobs
2175a0c601 fsck: stop checking tag->tagged
ec65231571 fsck: stop checking commit->parent counts
1de6007d85 fsck: stop checking commit->tree value
228c78fbd4 commit, tag: don't set parsed bit for parse failures
60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()`
8b656572ca builtin/commit-graph.c: remove subcommand-less usage string
fa26d5ede6 t4048: abstract away SHA-1-specific constants
cf02be8486 t4045: make hash-size independent
38ee26b2a3 t4044: update test to work with SHA-256
37ab8ebef1 t4039: abstract away SHA-1-specific constants
0370b35414 t4038: abstract away SHA-1 specific constants
0253e126a2 t4034: abstract away SHA-1-specific constants
45e2ef2b1d t4027: make hash-size independent
79b0edc1a0 t4015: abstract away SHA-1-specific constants
840624ff55 t4011: abstract away SHA-1-specific constants
32a6707267 t4010: abstract away SHA-1-specific constants
440bf91dfa t3429: remove SHA1 annotation
0b408ca2bd t1305: avoid comparing extensions
2eabd38313 rev-parse: add a --show-object-format option
52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode
45e206f0d8 t4203: use test-lib.sh definitions
2ae4944aac t6006: use test-lib.sh definitions
cb99a34e23 commit-graph: fix writing first commit-graph during fetch
e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug
7b4fb434b4 documentation: remove empty doc files
566a1439f6 Git 2.24-rc1
04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix'
4d6fb2beeb Merge branch 'ds/feature-macros'
5f0b6ed907 Merge branch 'js/azure-ci-osx-fix'
c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs'
1b4f85285f Merge branch 'dl/submodule-set-branch'
c7aadccba0 fetch: delay fetch_if_missing=0 until after config
c11e9966cb repo-settings: read an int for index.version
091489d068 apply: respect merge.conflictStyle in --3way
aa76ae4905 t4108: demonstrate bug in apply
95806205cd t4108: use `test_config` instead of `git config`
b0069684d4 t4108: remove git command upstream of pipe
fa87b81385 t4108: replace create_file with test_write_lines
7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job
6c96630cb0 config: move documentation to config.h
d81542e6f3 Eleventh batch
e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix'
d45d771978 Merge branch 'bc/smart-http-atomic-push'
22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix'
2e215b7959 Merge branch 'sb/userdiff-dts'
e3cf08361a Merge branch 'sg/progress-fix'
b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix'
c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc'
f45f88b2e4 path.c: don't call the match function without value in trie_find()
c72fc40d09 path.c: clarify two field names in 'struct common_dir'
8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file
7cb8c929d7 path.c: clarify trie_find()'s in-code comment
e536b1fedf Documentation: mention more worktree-specific exceptions
680cba2c2b multi-pack-index: add [--[no-]progress] option.
64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack
ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file
8dc18f8937 midx: add progress to expire_midx_packs
840cef0c70 midx: add progress to write_midx_file
efbc3aee08 midx: add MIDX_PROGRESS flag
0eb3671ed9 ci(osx): use new location of the `perforce` cask
da1e295e00 t604[236]: do not run setup in separate tests
49b8133a9e merge-recursive: fix merging a subdirectory into the root directory
d3eebaad5e merge-recursive: clean up get_renamed_dir_portion()
80736d7c5e doc: am --show-current-patch gives an entire e-mail message
a8e2c0eadc t7419: change test_must_fail to ! for grep
19c29e538e t4014: make output-directory tests self-contained
12a4aeaad8 Merge branch 'js/azure-pipelines-msvc'
399c23c046 ci(visual-studio): actually run the tests in parallel
711cd6d15c ci(visual-studio): use strict compile flags, and optimization
370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0
cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master
907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master
13bcea8c7f l10n: fr 2.24.0 rnd 1
135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master
3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed)
8da56a4848 userdiff: fix some corner cases in dts regex
86795774bb builtin/blame.c: constants into bit shift format
feebd2d256 rebase: hide --preserve-merges option
0e40a73a4c Doc: Bundle file usage
78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error
12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error
c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error
2b6f6ea1bd test-progress: fix test failures on big-endian systems
f757409e36 l10n: bg.po: Updated Bulgarian translation (4693)
176f5adfdb completion: clarify installation instruction for zsh
d966095db0 Git 2.24-rc0
90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array'
3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth'
d0258d0944 Merge branch 'rs/http-push-simplify'
bb52def6da Merge branch 'jj/stash-reset-only-toplevel'
f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs'
e5fca6b573 Merge branch 'bb/compat-util-comment-fix'
43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup'
07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely'
2d74d28ee0 Merge branch 'dl/compat-cleanup'
9b83a94829 Merge branch 'ta/t1308-typofix'
376012c919 Merge branch 'js/doc-stash-save'
10da030ab7 grep: avoid leak of chartables in PCRE2
513f2b0bbd grep: make PCRE2 aware of custom allocator
57d4660468 grep: make PCRE1 aware of custom allocator
d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand
8af69cf3e2 t3301: test diagnose messages for too few/many paramters
6f1194246a remote-curl: pass on atomic capability to remote side
bbb13e8188 graph: fix coloring of octopus dashes
92beecc136 graph: flatten edges that fuse with their right neighbor
479db18bc0 graph: smooth appearance of collapsing edges on commit lines
0195285b95 graph: rename `new_mapping` to `old_mapping`
d62893ecc1 graph: commit and post-merge lines for left-skewed merges
0f0f389f12 graph: tidy up display of left-skewed merges
458152cce1 graph: example of graph output that can be simplified
ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state
46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()`
a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()`
9157a2a032 graph: reuse `find_new_column_by_commit()`
210179a20d graph: handle line padding in `graph_next_line()`
fbccf255f9 graph: automatically track display width of graph lines
5374a290aa fetch-pack: write fetched refs to .promisor
4627bc777e sequencer: run post-commit hook
49697cb721 move run_commit_hook() to libgit and use it there
12bb7a540a sequencer.h fix placement of #endif
6a619ca03c t3404: remove uneeded calls to set_fake_editor
b2dbacbddf t3404: set $EDITOR in subshell
88a92b6c73 t3404: remove unnecessary subshell
bf8e65b30b format-patch: teach --cover-from-description option
a92331df18 format-patch: use enum variables
46273df7bf format-patch: replace erroneous and condition
3b3c79f6c9 diff-highlight: fix a whitespace nit
108b97dc37 Ninth batch
cbe8cdd3a0 Merge branch 'jk/coc'
3b9ec27919 Merge branch 'js/trace2-fetch-push'
c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch'
1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup'
eb3de5b823 Merge branch 'js/xdiffi-comment-updates'
4e8371ec26 Merge branch 'dl/t0000-skip-test-test'
b6d712fa4e Merge branch 'tg/range-diff-output-update'
77458870a5 Merge branch 'gs/sq-quote-buf-pretty'
5efabc7ed9 Merge branch 'ew/hashmap'
d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files'
6ed610b968 Merge branch 'am/t0028-utf16-tests'
5b900fb812 Merge branch 'dl/octopus-graph-bug'
16d9d7184b Merge branch 'en/fast-imexport-nested-tags'
6d5291be45 Merge branch 'js/azure-pipelines-msvc'
ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd'
d96e31e390 Merge branch 'js/fetch-jobs'
280bd44551 Merge branch 'en/merge-recursive-cleanup'
062a309d36 remote-curl: use argv_array in parse_push()
a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes
5cc6a4be11 http-push: simplify deleting a list item
556895d0c8 stash: avoid recursive hard reset on submodules
b524f6b399 Merge branch 'ka/japanese-translation'
f6f3824b4e git-gui: improve Japanese translation
61f4b407d3 Merge branch 'py/readme'
1e6880fd06 git-gui: add a readme
edefc31873 format-patch: create leading components of output directory
68b69211b2 git-compat-util: fix documentation syntax
fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth()
e0479fa073 documentation: add tutorial for object walking
3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed
4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target
9cad1c4488 pthread.h: manually align parameter lists
8c1cfd58e3 t1308-config-set: fix a test that has a typo
57d8f4b4c7 doc(stash): clarify the description of `save`
08da6496b6 Eighth batch
07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup'
f0d407e6ae Merge branch 'kt/add-i-progress'
66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree'
a4c5d9f66e Merge branch 'rs/dedup-includes'
159cdabd87 Merge branch 'js/range-diff-noprefix'
93424f1f7d Merge branch 'cb/pcre1-cleanup'
a73f91774c Merge branch 'ab/pcre-jit-fixes'
4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword'
020011f2cb Merge branch 'tk/git-svn-trim-author-name'
676278f8ea Merge branch 'bc/object-id-part17'
aafb75452b Merge branch 'en/clean-nested-with-ignored'
3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails
5cdf2301d4 add a Code of Conduct document
70bf0b755a Seventh batch
9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat'
2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary'
d17f54947d Merge branch 'rs/convert-fix-utf-without-dash'
82c80f98e6 Merge branch 'py/git-gui-has-maintainer'
6e12570822 Merge branch 'ah/cleanups'
772cad0afb Merge branch 'js/diff-rename-force-stable-sort'
424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path'
678a9ca629 Merge branch 'as/shallow-slab-use-fix'
0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix'
042a54d251 Merge branch 'am/visual-studio-config-fix'
03d3b1297c xdiffi: fix typos and touch up comments
b05b40930e t0000: cover GIT_SKIP_TESTS blindspots
d8bc1a518a send-pack: never fetch when checking exclusions
756fb0dedb t4014: treat rev-list output as the expected value
2b6a9b13ca range-diff: don't segfault with mode-only changes
360c7ba330 transport: push codepath can take arbitrary repository
ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments
b657047719 merge-recursive: fix the fix to the diff3 common ancestor label
b744c3af07 Sixth batch
417056578a Merge branch 'bw/submodule-helper-usage-fix'
9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check'
1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a'
59b19bcd9f Merge branch 'cc/multi-promisor'
1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way'
5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort'
eb35c18e42 Merge branch 'sg/travis-help-debug'
cabb145fe3 Merge branch 'rs/alias-use-copy-array'
56c7ab0f4e Merge branch 'sg/t-helper-gitignore'
e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang'
583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules'
337e3f2b49 Merge branch 'rs/nth-switch-code-simplification'
8f53fe1733 Merge branch 'hb/hg-to-git-py3'
ef93bfbd45 Merge branch 'sg/progress-fix'
980351d1ac Merge branch 'js/doc-patch-text'
80693e3f09 Merge branch 'tb/commit-graph-harden'
ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge'
3f84633563 Merge branch 'dl/cocci-everywhere'
caf150ce7d Merge branch 'gs/commit-graph-progress'
1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim'
1398171378 Merge branch 'rs/commit-graph-use-list-count'
773521df26 Merge branch 'rs/nth-parent-parse'
7f17913161 Merge branch 'dl/submodule-set-branch'
cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix'
bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees'
098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack'
37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc'
e392382f95 Merge branch 'dl/complete-rebase-and-archive'
cda8faa37e Merge branch 'jk/commit-graph-cleanup'
36d2fca82b Merge branch 'ss/get-time-cleanup'
ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude'
ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob'
ba2d451122 Merge branch 'tg/stash-refresh-index'
e2b5038d87 hashmap_entry: remove first member requirement from docs
404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry
23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators
c8e424c9c9 hashmap: introduce hashmap_free_entries
8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry *
87571c3f71 hashmap: use *_entry APIs for iteration
939af16eac hashmap_cmp_fn takes hashmap_entry params
f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *"
f0e63c4113 hashmap: use *_entry APIs to wrap container_of
6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *"
973d5eea74 introduce container_of macro
26b455f21e hashmap_put takes "struct hashmap_entry *"
28ee794128 hashmap_remove takes "const struct hashmap_entry *"
b6c5241606 hashmap_get takes "const struct hashmap_entry *"
b94e5c1df6 hashmap_add takes "struct hashmap_entry *"
f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *"
d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *"
d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry
12878c8351 coccicheck: detect hashmap_entry.hash assignment
e010a41216 diff: use hashmap_entry_init on moved_entry.ent
f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo"
de5abb5f7a git-p4: auto-delete named temporary file
c90b652afd Fifth batch
f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1'
b0f8aed48f Merge branch 'ma/user-manual-markup-update'
faf5576a8d Merge branch 'bc/doc-use-docbook-5'
314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes'
70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo'
847650798b Merge branch 'am/mailmap-andrey-mazo'
1a155f2e66 Merge branch 'jc/git-gui-has-maintainer'
1bcef51204 t/oid-info: add empty tree and empty blob values
ecde49bb8a t/oid-info: allow looking up hash algorithm name
11a3d3aadd git-rev-list.txt: prune options in synopsis
7d2f003ee4 Documentation: update the location of the git-gui repo
b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding()
46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines
b35304bf95 ci: really use shallow clones on Azure Pipelines
ab7d854aba tests: let --immediate and --write-junit-xml play well together
be5d88e112 test-tool run-command: learn to run (parts of) the testsuite
5d65ad17a9 vcxproj: include more generated files
030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built
61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable()
e4347c9434 msvc: handle DEVELOPER=1
ed712ef8d5 msvc: ignore some libraries when linking
5b8f9e2417 compat/win32/path-utils.h: add #include guards
41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning
c097b95a26 msvc: avoid using minus operator on unsigned types
dfd557c978 stash apply: report status correctly even in a worktree's subdirectory
d54dea77db fetch: let --jobs=<n> parallelize --multiple, too
87db61a436 trace2: write discard message to sentinel files
83e57b04e6 trace2: discard new traces if target directory has too many files
11c21f22de t4214: demonstrate octopus graph coloring failure
25eb905e14 t4214: explicitly list tags in log
63be8c8dd7 t4214: generate expect in their own test cases
a7a5590c6e t4214: use test_merge
94ba151300 test-lib: let test_merge() perform octopus merges
22541013d0 docs: clarify trace2 version invariants
3d4548e7e2 docs: mention trace2 target-dir mode in git-config
2fe44394c8 treewide: remove duplicate #include directives
dbcd970c27 push: do not pretend to return `int` from `die_push_simple()`
941790d7de fast-export: handle nested tags
8d7d33c1ce t9350: add tests for tags of things other than a commit
a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags
208d69246e fast-export: add support for --import-marks-if-exists
b8f50e5b60 fast-import: add support for new 'alias' command
f73b2aba05 fast-import: allow tags to be identified by mark labels
3164e6bd24 fast-import: fix handling of deleted tags
8085050ab4 add -i: show progress counter in the prompt
69fdb922ad Merge branch 'bw/diff3-conflict-style'
b436825b9b git-gui: support for diff3 conflict style
937b76ed49 range-diff: internally force `diff.noprefix=true`
411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job
25e4b8099c push: add trace2 instrumentation
5fc31180d8 fetch: add trace2 instrumentation
53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value
c3b57dc2a0 git-gui: use existing interface to query a path's attribute
45ab460d4a Merge branch 'js/git-bash-if-available'
0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command
71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only)
54a80a9ad8 wrapper: use a loop instead of repetitive statements
baed6bbb5b diffcore-break: use a goto instead of a redundant if statement
8da02ce62a commit-graph: remove a duplicate assignment
ddb3c856f3 shallow.c: don't free unallocated slabs
8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits
65904b8b2b promisor-remote: skip move_to_tail when no-op
2049b8dc65 diffcore_rename(): use a stable sort
97fff61012 Move git_sort(), a stable sort, into into libgit.a
69f272b922 dir: special case check for the possibility that pathspec is NULL
6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available
bc12974a89 Fourth batch
5a5350940b Merge branch 'ds/commit-graph-on-fetch'
974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch'
9755f70fe6 Merge branch 'ds/include-exclude'
93fc8760e7 Merge branch 'jh/trace2-pretty-output'
640f9cd599 Merge branch 'dl/rebase-i-keep-base'
026428c35e Merge branch 'sg/clean-nested-repo-with-ignored'
21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip'
d693345518 Merge branch 'dl/use-sq-from-test-lib'
d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes'
2be6ccc01a Merge branch 'sg/git-test-boolean'
cf861cd7a0 Merge branch 'rs/get-tagged-oid'
91243b019d Merge branch 'en/filter-branch-deprecation'
9bc67b6658 Merge branch 'en/merge-options-ff-and-friends'
fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden'
cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option'
8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return'
3ff6af7753 Merge branch 'nd/switch-and-restore'
aadac067aa Merge branch 'tb/file-url-to-unc-path'
b57a88a5f1 Merge branch 'js/gitdir-at-unc-root'
6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path'
430439536b Merge branch 'rs/parse-tree-indirect'
991fd97b9a Merge branch 'jk/fast-import-history-bugfix'
74a39b9bcc Merge branch 'mh/notes-duplicate-entries'
37801f0665 Merge branch 'tb/banned-vsprintf-namefix'
21ce0b48f3 Merge branch 'mh/release-commit-memory-fix'
f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup'
bf6136cab8 Merge branch 'rs/strbuf-detach'
a2e22bb3ad Merge branch 'rs/trace2-dst-warning'
1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup'
0281733483 Merge branch 'bc/hash-independent-tests-part-5'
f06fb376ed Merge branch 'jc/test-cleanup'
00bb74453d Merge branch 'dl/compat-cleanup'
59438be06c Merge branch 'js/visual-studio'
cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone'
af2abd870b fast-export: fix exporting a tag and nothing else
c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor
dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit
fd5b820d9c user-manual.txt: change header notation
e79b34533a user-manual.txt: add missing section label
b503a2d515 Makefile: emulate compile in $(HCO) target better
af26e2a9d2 pack-bitmap.h: remove magic number
b06fdead04 promisor-remote.h: include missing header
97b989ee3a apply.h: include missing header
4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name
d928a8388a t0028: add more tests
0b63fd6965 t0028: fix test for UTF-16-LE-BOM
fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration
2e09c01232 name-rev: avoid cutoff timestamp underflow
8464f94aeb promisor-remote.h: drop extern from function declaration
75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp
24c681794f doc: MyFirstContribution: fix cmd placement instructions
c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode
60c60b627e Merge branch 'py/git-git-extra-stuff'
faf420e05a treewide: correct several "up-to-date" to "up to date"
b71c6c3b64 Fix build with core.autocrlf=true
16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff
26e3d1cbea .mailmap: update email address of Andrey Mazo
27ea41c0b4 t/helper: ignore only executable files
7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()
83e3ad3b12 merge-recursive: symlink's descendants not in way
34933d0eff stash: make sure to write refreshed cache
e080b34540 merge: use refresh_and_write_cache
22184497a3 factor out refresh_and_write_cache function
7371612255 commit-graph: add --[no-]progress to write and verify
47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW
253bfe49bd SubmittingPatches: git-gui has a new maintainer
d17ae00c97 hg-to-git: make it compatible with both python3 and python2
4c86140027 Third batch
f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http'
627b826834 Merge branch 'md/list-objects-filter-combo'
b9ac6c59b8 Merge branch 'cc/multi-promisor'
de67293e74 Merge branch 'sg/line-log-tree-diff-optim'
95486229e3 Merge branch 'sg/complete-configuration-variables'
f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook'
a2e524ecf3 Merge branch 'cb/curl-use-xmalloc'
128666753b Merge branch 'jk/drop-release-pack-memory'
917a319ea5 Merge branch 'js/rebase-r-strategy'
7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui
4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout()
0d4304c124 doc: fix reference to --ignore-submodules
af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py
8a3a6817e2 Merge gitk to pick up emergency build fix
2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po
9027af58e2 Makefile: run coccicheck on more source files
43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES)
5dedf7de53 Makefile: define THIRD_PARTY_SOURCES
902b90cf42 clean: fix theoretical path corruption
ca8b5390db clean: rewrap overly long line
09487f2cba clean: avoid removing untracked files in a nested git repository
e86bbcf987 clean: disambiguate the definition of -d
3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run
29b577b960 dir: add commentary explaining match_pathspec_item's return value
89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it
a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case
404ebceda0 dir: also check directories for matching pathspecs
a5e916c745 dir: fix off-by-one error in match_pathspec_item
bbbb6b0b89 dir: fix typo in comment
7541cc5302 t7300: add testcases showing failure to clean specified pathspecs
0eb7c37a8a diff, log doc: small grammer, format, and language fixes
6fae6bd518 diff, log doc: say "patch text" instead of "patches"
2bb74b53a4 Test the progress display
bbf47568ad Revert "progress: use term_clear_line()"
cf6a2d2557 Makefile: strip leading ./ in $(LIB_H)
b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup
689a146c91 commit-graph: use commit_list_count()
59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N"
a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N"
a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base"
cf34337f98 list-objects-filter: give a more specific error sparse parsing error
4c96a77594 list-objects-filter: delay parsing of sparse oid
72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter
83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer
7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>`
226daba280 Doc/Makefile: give mansource/-version/-manual attributes
40e747e89d git-submodule.txt: fix AsciiDoc formatting error
f6461b82b9 Documentation: fix build with Asciidoctor 2
3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
f7a8834ba4 Merge branch 'bp/amend-toggle-bind'
ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit"
9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes
d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog
beffae768a gitk: Add Chinese (zh_CN) translation
56d9cbe68b packfile: expose get_delta_base()
bab28d9f97 builtin/pack-objects: report reused packfile objects
6c8ec8c30a Merge branch 'bw/commit-scrollbuffer'
acfa495519 Merge branch 'bw/amend-checkbutton'
da08d559b7 git-gui: add horizontal scrollbar to commit buffer
ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton
aeeb978ba6 completion: teach archive to use __gitcomp_builtin
2b9bd488ae completion: teach rebase to use __gitcomp_builtin
d49dffde9a completion: add missing completions for log, diff, show
6abada1880 upload-pack: disable commit graph more gently for shallow traversal
fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time
72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set
4fd39c76e6 doc: minor formatting fix
29f4332e66 Quit passing 'now' to date code
c77abf0460 Merge branch 'py/revert-hunks-lines'
5a2bb62180 Merge branch 'bp/widget-focus-hotkeys'
e07446ed5f git-gui: add hotkeys to set widget focus
f981ec18cf cache-tree: do not lazy-fetch tentative tree
f1d4a28250 Second batch
c8ada15456 Merge branch 'bc/reread-attributes-during-rebase'
8f3ba423e7 Merge branch 'tg/t0021-racefix'
a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email'
d49c2c3466 Merge branch 'sb/userdiff-dts'
2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe'
4c49dd042d Merge branch 'nd/diff-parseopt'
d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix'
8ce8a63b46 Merge branch 'ds/midx-expire-repack'
9437394661 Merge branch 'cb/fetch-set-upstream'
af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix'
fa9e7934c7 Merge branch 'bm/repository-layout-typofix'
d1a251a1fa Merge branch 'en/checkout-mismerge-fix'
e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental'
f4f8dfe127 Merge branch 'ds/feature-macros'
4a12f89865 Merge branch 'jk/eoo'
b4a1eec332 Merge branch 'jk/repo-init-cleanup'
70336bd50a Merge branch 'py/git-gui-do-quit'
ad7c543e3b grep: skip UTF8 checks explicitly
0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration()
b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration
4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor
b7e1ba5649 git-merge-index.txt: wrap shell listing in "----"
38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----"
5371813768 git-ls-remote.txt: wrap shell listing in "----"
1925fe0c8a Documentation: wrap config listings in "----"
922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor
2017956a19 Documentation: wrap blocks with "--"
dd2e50a84e commit-graph: turn off save_commit_buffer
67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits
806278dead commit-graph.c: handle corrupt/missing trees
16749b8dd2 commit-graph.c: handle commit parsing errors
23424ea759 t/t5318: introduce failing 'git commit-graph write' tests
bf1e28e0ad builtin/rebase.c: Remove pointless message
d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing
bd482d6e33 t: use common $SQ variable
3a37876b5d pack-objects: drop packlist index_pos optimization
7e6b96c73b test-read-cache: drop namelen variable
e4b369069e diff-delta: set size out-parameter to 0 for NULL delta
7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint
f1cbd033e2 pack-objects: use object_id in packlist_alloc()
0dfed92dfd git-am: handle missing "author" when parsing commit
3960290675 ci: restore running httpd tests
6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests
c77722b3ea use get_tagged_oid()
dad3f0607b tag: factor out get_tagged_oid()
468ce99b77 unpack-trees: rename 'is_excluded_from_list()'
65edd96aec treewide: rename 'exclude' methods to 'pattern'
4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_'
caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list'
ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern'
483e861111 t9902: use a non-deprecated command for testing
9df53c5de6 Recommend git-filter-repo instead of git-filter-branch
7b6ad97939 t6006: simplify, fix, and optimize empty message test
50094ca45f config/format.txt: specify default value of format.coverLetter
c1a6f21cd4 Doc: add more detail for git-format-patch
854b5cb46a t4014: stop losing return codes of git commands
dd2b6b6860 t4014: remove confusing pipe in check_threading()
6bd26f58ea t4014: use test_line_count() where possible
c6ec6dadba t4014: let sed open its own files
f2e2fa8f60 t4014: drop redirections to /dev/null
460609cbd5 t4014: use indentable here-docs
92014b69bb t4014: remove spaces after redirect operators
0ab74e979c t4014: use sq for test case names
cb46c40662 t4014: move closing sq onto its own line
b562a54c01 t4014: s/expected/expect/
e770fbfeff t3005: remove unused variable
da280f5f1a t: use LF variable defined in the test harness
7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch
552fc5016f mingw: apply array.cocci rule
476998d05b t3427: accelerate this test by using fast-export and fast-import
aac6ff7b5b .gitignore: stop ignoring `.manifest` files
2c65d90f75 am: reload .gitattributes after patching it
1577dc0f7c tree: simplify parse_tree_indirect()
50f26bd035 fetch: add fetch.writeCommitGraph config setting
8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set
27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options
0a8bc7068f clarify documentation for remote helpers
80e3658647 help: make help_unknown_ref() NORETURN
313677627a checkout: add simple check for 'git checkout -b'
3441de5b9c gitk: Make web links clickable
a4fa2f0a4c git-gui: allow undoing last revert
414d924beb rebase: teach rebase --keep-base
6330209d7d rebase tests: test linear branch topology
4effc5bc96 rebase: fast-forward --fork-point in more cases
c0efb4c1dd rebase: fast-forward --onto in more cases
2b318aa6c3 rebase: refactor can_fast_forward into goto tower
c9efc21683 t3432: test for --no-ff's interaction with fast-forward
1ebec8dfc1 fast-import: duplicate into history rather than passing ownership
9756082b3c fast-import: duplicate parsed encoding string
86ae43da6a status: mention --skip for revert and cherry-pick
b1b16bba96 completion: add --skip for cherry-pick and revert
deaa65a754 completion: merge options for cherry-pick and revert
4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
793ac7e309 t3432: test rebase fast-forward behavior
359ecebc34 t3431: add rebase --fork-point tests
502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage
ff61681b46 grep: refactor and simplify PCRE1 support
8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1
1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning()
fd99c2dd9b grep: use return value of strbuf_detach()
82f51af345 log-tree: always use return value of strbuf_detach()
7e92756751 http: don't leak urlmatch_config.vars
9784f97321 commit: free the right buffer in release_commit_memory
ce17feb1b3 path: add a function to check for path suffix
60d198d022 banned.h: fix vsprintf()'s ban message
60fe477a0b notes: avoid potential use-after-free during insertion
779ad6641b notes: avoid leaking duplicate entries
4e1a641ee3 mingw: fix launching of externals from Unicode paths
5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly
e2683d51d9 Fix .git/ discovery at the root of UNC shares
d17f2124a7 setup_git_directory(): handle UNC paths correctly
ebb8d2c90f mingw: support UNC in git clone file://server/share/repo
0c37c41d13 t4009: make hash size independent
c1f3dfcc23 t4002: make hash independent
8cc5ff83c3 t4000: make hash size independent
c784815073 t3903: abstract away SHA-1-specific constants
2ccdfb1c78 git-gui: return early when patch fails to apply
62bd99934b git-gui: allow reverting selected hunk
5f0a516de9 git-gui: allow reverting selected lines
fddf2ebe38 transport: teach all vtables to allow fetch first
ac3fda82bf transport-helper: skip ls-refs if unnecessary
745f681289 First batch after Git 2.23
d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg'
22e86e85cb Merge branch 'en/fast-import-merge-doc'
9c7573581c Merge branch 'jk/perf-no-dups'
4336fdb2ef Merge branch 'rs/nedalloc-fixlets'
8ae7a46c4d Merge branch 'sg/show-failed-test-names'
6ba06b582b Merge branch 'sg/commit-graph-validate'
072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix'
207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix'
77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests'
1b01cdbf2e Merge branch 'jk/tree-walk-overflow'
8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix'
307179732d Merge branch 'mt/grep-submodules-working-tree'
58166c2e9d t0021: make sure clean filter runs
8b3f33ef11 ref-filter: initialize empty name or email fields
3c81760bc6 userdiff: add a builtin pattern for dts files
fe49814409 t4014: drop unnecessary blank lines from test cases
a2bb801f6a line-log: avoid unnecessary full tree diffs
eef5204190 line-log: extract pathspec parsing from line ranges into a helper function
a63694f523 diff: skip GITLINK when lazy fetching missing objs
7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe
19800bdc3f parseopt: move definition of enum parse_opt_result up
415b770b88 packfile.h: drop extern from function declaration
acb49d1cc8 t3800: make hash-size independent
ca6ba94200 t3600: make hash size independent
19ce5496c2 t3506: make hash independent
9a6738c061 t3430: avoid hard-coded object IDs
4dd1b5f90f t3404: abstract away SHA-1-specific constants
b99bfc7a6c t3306: abstract away SHA-1-specific constants
e3e9d02e35 t3305: make hash size independent
b408cf8cf6 t3301: abstract away SHA-1-specific constants
b561edd213 t3206: abstract away hash size constants
a5f61c7d13 t3201: abstract away SHA-1-specific constants
1c24a54ea4 repository-layout.txt: correct pluralization of 'object'
b0a3186140 sequencer: simplify root commit creation
a47ba3c777 rebase -i: check for updated todo after squash and reword
450efe2d53 rebase -i: always update HEAD before rewording
c581e4a749 grep: under --debug, show whether PCRE JIT is enabled
aaa95dfa05 midx: switch to using the_hash_algo
be8e172e9f builtin/show-index: replace sha1_to_hex
3f34d70d40 rerere: replace sha1_to_hex
fc06be3b7f builtin/receive-pack: replace sha1_to_hex
69fa337060 builtin/index-pack: replace sha1_to_hex
3a4d7aa5ae packfile: replace sha1_to_hex
e0cb7cdb89 wt-status: convert struct wt_status to object_id
8d4d86b0f0 cache: remove null_sha1
f6ca67d673 builtin/worktree: switch null_sha1 to null_oid
dd336a5511 builtin/repack: write object IDs of the proper length
894c0f66bb pack-write: use hash_to_hex when writing checksums
4439c7a360 sequencer: convert to use the_hash_algo
95518faac1 bisect: switch to using the_hash_algo
e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo
fe9fec45f6 config: use the_hash_algo in abbrev comparison
976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
703d2d4193 bundle: switch to use the_hash_algo
9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo
7962e046ff show-index: switch hard-coded constants to the_hash_algo
fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ
7e0d029f18 builtin/rev-parse: switch to use the_hash_algo
319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo
fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo
f6af19a9ad fetch-pack: use parse_oid_hex
36261e42ec patch-id: convert to use the_hash_algo
28ba1830d0 builtin/replace: make hash size independent
24bc1a1292 pull, fetch: add --set-upstream option
71d41ff651 archive-tar: turn length miscalculation warning into BUG
17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header()
82a46af13e archive-tar: fix pax extended header length calculation
4060c1990a archive-tar: report wrong pax extended header length
4615a8cb5b merge-recursive: alphabetize include list
45ef16f77a merge-recursive: add sanity checks for relevant merge_options
f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
5bf7e5779e merge-recursive: split internal fields into a separate struct
e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output
a779fb829b merge-recursive: comment and reorder the merge_options fields
8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options
7c0a6c8e47 merge-recursive: move some definitions around to clean up the header
c749ab1da8 merge-recursive: rename merge_options argument to opt in header
bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity
ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list
4d7101e25c merge-recursive: fix some overly long lines
724dd767b2 cache-tree: share code between functions writing an index as a tree
345480d1ed merge-recursive: don't force external callers to do our logging
b4db8a2b76 merge-recursive: remove useless parameter in merge_trees()
98a1d3d888 merge-recursive: exit early if index != head
9822175d2b Ensure index matches head before invoking merge machinery, round N
10f751c06b merge-recursive: remove another implicit dependency on the_repository
f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks
8e01251694 merge-recursive: introduce an enum for detect_directory_renames values
743474cbfa merge-recursive: provide a better label for diff3 common ancestor
51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u)
5bace62582 l10n: Update Catalan translation
139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()
65c01c6442 checkout: provide better conflict hunk description with detached HEAD
d8523ca1b9 merge-recursive: be consistent with assert
acb7da05ac checkout: remove duplicate code
93b980e58f http: use xmalloc with cURL
64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental
aaf633c2ad repo-settings: create feature.experimental setting
c6cc4c5afd repo-settings: create feature.manyFiles setting
ad0fb65999 repo-settings: parse core.untrackedCache
31b1de6a09 commit-graph: turn on commit-graph by default
b068d9a250 t6501: use 'git gc' in quiet mode
7211b9e753 repo-settings: consolidate some config settings
507e5470a0 worktree remove: clarify error message on dirty worktree
5af9d5f6c8 completion: complete config variables and values for 'git clone --config='
88cd790d6a completion: complete config variables names and values for 'git clone -c'
dd33472831 completion: complete values of configuration variables after 'git -c var='
e1e00089da completion: complete configuration sections and variable names for 'git -c'
42d0efec59 completion: split _git_config()
d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp()
2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names
d9438873c4 completion: deduplicate configuration sections
7a09a8f093 completion: add tests for 'git config' completion
840d7e5b3c completion: complete more values of more 'color.*' configuration variables
08a12175d8 completion: fix a typo in a comment
9827d4c185 packfile: drop release_pack_memory()
d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed
362f8b280c t/perf: rename duplicate-numbered test script
742ed63345 trace2: cleanup whitespace in perf format
e34430556c trace2: cleanup whitespace in normal format
c2b890aca5 quote: add sq_append_quote_argv_pretty()
ad43e37839 trace2: trim trailing whitespace in normal format error message
04f10d332f trace2: remove dead code in maybe_add_string_va()
da4589ce7e trace2: trim whitespace in region messages in perf target format
0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit
5440eb0ea2 git-gui: call do_quit before destroying the main window
bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook
6098817fd7 git-merge: honor pre-merge-commit hook
a1f3dd7eb3 merge: do no-verify like commit
f78f6c7e0c t7503: verify proper hook execution
70597e8386 nedmalloc: avoid compiler warning about unused value
c9b9c09dae nedmalloc: do assignments only after the declaration section
22932d9169 config: stop checking whether the_repository is NULL
5732f2b1ef common-main: delay trace2 initialization
58ebccb478 t1309: use short branch name in includeIf.onbranch test
67feca3b1c gitcli: document --end-of-options
51b4594b40 parse-options: allow --end-of-options as a synonym for "--"
19e8789b23 revision: allow --end-of-options to end option parsing
ffe1afe67c tests: show the test name and number at the start of verbose output
96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests
7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits'
39d8831856 commit-graph: turn a group of write-related macro flags into an enum
9916073be5 t5318-commit-graph: use 'test_expect_code'
620c09e1b6 restore: add test for deleted ita files
ecd72042de checkout.c: unstage empty deleted ita files
a613d4f817 pack-refs: always refresh after taking the lock file
decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd'
371df1bea9 trace2: cleanup column alignment in perf target format
5aa02f9868 tree-walk: harden make_traverse_path() length computations
c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path()
b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len()
37806080d7 tree-walk: use size_t consistently
7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh'
12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh'
9055384710 tree-walk: drop oid from traverse_info
947208b725 setup_traverse_info(): stop copying oid
e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
a63f990d92 t3418: test `rebase -r` with merge strategies
5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges`
e145d99347 rebase -r: support merge strategies other than `recursive`
4e6023b13a t3427: fix another incorrect assumption
f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced
a9c71073da t3427: fix erroneous assumption
b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three
d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case
c248d32cdb t3427: simplify the `setup` test case significantly
8c1e24048a t3427: add a clarifying comment
5efed0ecf9 rebase: fold git-rebase--common into the -p backend
68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone
2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive`
6180b20239 t3400: stop referring to the scripted rebase
d5b581f228 Drop unused git-rebase--am.sh
814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation
6a289d45c0 grep: fix worktree case in submodules
870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching
8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data
09872f6418 grep: create a "is_fixed" member in "grep_pat"
8a35b540a9 grep: consistently use "p->fixed" in compile_regexp()
685668faaa grep: stop using a custom JIT stack with PCRE v1
34489239d0 grep: stop "using" a custom JIT stack with PCRE v2
04bef50c01 grep: remove overly paranoid BUG(...) code
b65abcafc7 grep: use PCRE v2 for optimized fixed-string search
48de2a768c grep: remove the kwset optimization
45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern>
25754125ce grep: make the behavior for NUL-byte in patterns sane
d316af059d grep tests: move binary pattern tests into their own file
471dac5d2c grep tests: move "grep binary" alongside the rest
f463beb805 grep: inline the return value of a function call used only once
b14cf112e2 t4210: skip more command-line encoding tests on MinGW
44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
4e2443b181 log tests: test regex backends in "--encode=<enc>" tests
90d21f9ebf list-objects-filter-options: make parser void
5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW
489fc9ee71 list-objects-filter-options: allow mult. --filter
c2694952e3 strbuf: give URL-encoding API a char predicate fn
cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list
f56f764279 list-objects-filter-options: move error check up
e987df5fe6 list-objects-filter: implement composite filters
842b00516a list-objects-filter-options: always supply *errbuf
7a7c7f4a6d list-objects-filter: put omits set in filter struct
9430147ca0 list-objects-filter: encapsulate filter components
4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c
60b7a92d84 Move repository_format_partial_clone to promisor-remote.c
db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
75de085211 remote: add promisor and partial clone config to the doc
7e154badc0 partial-clone: add multiple remotes in the doc
9a4c507886 t0410: test fetching from many promisor remotes
5e46139376 builtin/fetch: remove unique promisor remote limitation
fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter
b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote()
faf2abf496 promisor-remote: use repository_format_partial_clone
9cfebc1f3b promisor-remote: add promisor_remote_reinit()
9e27beaa23 promisor-remote: implement promisor_remote_get_direct()
48de315817 Add initial support for many promisor remotes
2e860675b6 fetch-object: make functions return an error code
c59c7c879e t0410: remove pipes after git commands
git-subtree-dir: third_party/git
git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
2020-05-22 18:46:45 +02:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:182
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Create, list, delete or verify a tag object signed with GPG"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:183
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Creates a temporary file with a blob's contents"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:184
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Unpack objects from a packed archive"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:185
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Register file contents in the working tree to the index"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:186
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Update the object name stored in a ref safely"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:187
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Update auxiliary info file to help dumb servers"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:188
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Send archive back to git-archive"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:189
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Send objects packed back to git-fetch-pack"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:190
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Show a Git logical variable"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:191
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Check the GPG signature of commits"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:192
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Validate packed Git archive files"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:193
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Check the GPG signature of tags"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:194
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Git web interface (web frontend to Git repositories)"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:195
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Show logs with difference each commit introduces"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:196
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Manage multiple working trees"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:197
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Create a tree object from the current index"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:198
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Defining attributes per path"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:199
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Git command-line interface and conventions"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:200
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "A Git core tutorial for developers"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:201
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Providing usernames and passwords to Git"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:202
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Git for CVS users"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:203
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Tweaking diff output"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:204
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "A useful minimum set of commands for Everyday Git"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:205
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Frequently asked questions about using Git"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:206
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "A Git Glossary"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:207
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Hooks used by Git"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:208
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Specifies intentionally untracked files to ignore"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:209
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Defining submodule properties"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-05-26 01:06:52 +02:00
|
|
|
#: command-list.h:210
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Git namespaces"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: command-list.h:211
|
|
|
|
|
msgid "Helper programs to interact with remote repositories"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: command-list.h:212
|
|
|
|
|
msgid "Git Repository Layout"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:213
|
|
|
|
|
msgid "Specifying revisions and ranges for Git"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:214
|
|
|
|
|
msgid "Mounting one repository inside another"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:215
|
|
|
|
|
msgid "A tutorial introduction to Git: part two"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:216
|
|
|
|
|
msgid "A tutorial introduction to Git"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: command-list.h:217
|
|
|
|
|
msgid "An overview of recommended workflows with Git"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-bisect.sh:79
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Bad rev input: $arg"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-bisect.sh:99
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Bad rev input: $bisected_head"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-bisect.sh:108
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Bad rev input: $rev"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-bisect.sh:117
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "'git bisect $TERM_BAD' can take only one argument."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-bisect.sh:149
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No logfile given"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-bisect.sh:150
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "cannot read $file for replaying"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-bisect.sh:173
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "?? what are you talking about?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-bisect.sh:183
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "bisect run failed: no command provided."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-bisect.sh:188
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "running $command"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-bisect.sh:195
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"bisect run failed:\n"
|
|
|
|
|
"exit code $res from '$command' is < 0 or >= 128"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-bisect.sh:221
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "bisect run cannot continue any more"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-bisect.sh:227
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"bisect run failed:\n"
|
|
|
|
|
"'bisect_state $state' exited with error code $res"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-bisect.sh:234
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "bisect run success"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-bisect.sh:242
|
|
|
|
|
msgid "We are not bisecting."
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-merge-octopus.sh:46
|
|
|
|
|
msgid ""
|
|
|
|
|
"Error: Your local changes to the following files would be overwritten by "
|
|
|
|
|
"merge"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-merge-octopus.sh:61
|
|
|
|
|
msgid "Automated merge did not work."
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-merge-octopus.sh:62
|
|
|
|
|
msgid "Should not be doing an octopus."
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-merge-octopus.sh:73
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Unable to find common commit with $pretty_name"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-merge-octopus.sh:77
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Already up to date with $pretty_name"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-merge-octopus.sh:89
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Fast-forwarding to: $pretty_name"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-merge-octopus.sh:97
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Trying simple merge with $pretty_name"
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-merge-octopus.sh:102
|
|
|
|
|
msgid "Simple merge did not work, trying automatic merge."
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:180
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Relative path can only be used from the toplevel of the working tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:190
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:209
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "'$sm_path' already exists in the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:212
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "'$sm_path' already exists in the index and is not a submodule"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:219
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "'$sm_path' does not have a commit checked out"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:250
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Adding existing repo at '$sm_path' to the index"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:252
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "'$sm_path' already exists and is not a valid git repo"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:260
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "A git directory for '$sm_name' is found locally with remote(s):"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:262
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"If you want to reuse this local git directory instead of cloning again from\n"
|
|
|
|
|
" $realrepo\n"
|
|
|
|
|
"use the '--force' option. If the local git directory is not the correct "
|
|
|
|
|
"repo\n"
|
|
|
|
|
"or you are unsure what this means choose another name with the '--name' "
|
|
|
|
|
"option."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:268
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Reactivating local git directory for submodule '$sm_name'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:280
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Unable to checkout submodule '$sm_path'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:285
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Failed to add submodule '$sm_path'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:294
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Failed to register submodule '$sm_path'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:567
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Unable to find current revision in submodule path '$displaypath'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:577
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Unable to fetch in submodule path '$sm_path'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:582
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Unable to find current ${remote_name}/${branch} revision in submodule path "
|
|
|
|
|
"'$sm_path'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:600
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
|
|
|
|
|
"$sha1:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:606
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
|
|
|
|
|
"Direct fetching of that commit failed."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:613
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:614
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Submodule path '$displaypath': checked out '$sha1'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:618
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:619
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Submodule path '$displaypath': rebased into '$sha1'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:624
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:625
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Submodule path '$displaypath': merged in '$sha1'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:630
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:631
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Submodule path '$displaypath': '$command $sha1'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-submodule.sh:662
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Failed to recurse into submodule path '$displaypath'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-parse-remote.sh:89
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "See git-${cmd}(1) for details."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-rebase--preserve-merges.sh:109
|
|
|
|
|
msgid "Applied autostash."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-rebase--preserve-merges.sh:112
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Cannot store $stash_sha1"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:113
|
|
|
|
|
msgid ""
|
|
|
|
|
"Applying autostash resulted in conflicts.\n"
|
|
|
|
|
"Your changes are safe in the stash.\n"
|
|
|
|
|
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-01-12 00:36:56 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:191
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Rebasing ($new_count/$total)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:197
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Commands:\n"
|
|
|
|
|
"p, pick <commit> = use commit\n"
|
|
|
|
|
"r, reword <commit> = use commit, but edit the commit message\n"
|
|
|
|
|
"e, edit <commit> = use commit, but stop for amending\n"
|
|
|
|
|
"s, squash <commit> = use commit, but meld into previous commit\n"
|
|
|
|
|
"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
|
|
|
|
|
"x, exec <commit> = run command (the rest of the line) using shell\n"
|
|
|
|
|
"d, drop <commit> = remove commit\n"
|
|
|
|
|
"l, label <label> = label current HEAD with a name\n"
|
|
|
|
|
"t, reset <label> = reset HEAD to a label\n"
|
|
|
|
|
"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
|
|
|
|
|
". create a merge commit using the original merge commit's\n"
|
|
|
|
|
". message (or the oneline, if no original merge commit was\n"
|
|
|
|
|
". specified). Use -c <commit> to reword the commit message.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"These lines can be re-ordered; they are executed from top to bottom.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:260
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"You can amend the commit now, with\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tgit commit --amend $gpg_sign_opt_quoted\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Once you are satisfied with your changes, run\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tgit rebase --continue"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:285
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "$sha1: not a commit that can be picked"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:324
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Invalid commit name: $sha1"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:354
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Cannot write current commit's replacement sha1"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:405
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Fast-forward to $sha1"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:407
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Cannot fast-forward to $sha1"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:416
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Cannot move HEAD to $first_parent"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:421
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Refusing to squash a merge: $sha1"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:439
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Error redoing merge $sha1"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:448
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Could not pick $sha1"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:457
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "This is the commit message #${n}:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:462
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "The commit message #${n} will be skipped:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:473
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "This is a combination of $count commit."
|
|
|
|
|
msgid_plural "This is a combination of $count commits."
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:482
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Cannot write $fixup_msg"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:485
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "This is a combination of 2 commits."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
|
|
|
|
|
#: git-rebase--preserve-merges.sh:572
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Could not apply $sha1... $rest"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:601
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Could not amend commit after successfully picking $sha1... $rest\n"
|
|
|
|
|
"This is most likely due to an empty commit message, or the pre-commit hook\n"
|
|
|
|
|
"failed. If the pre-commit hook failed, you may need to resolve the issue "
|
|
|
|
|
"before\n"
|
|
|
|
|
"you are able to reword the commit."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:616
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Stopped at $sha1_abbrev... $rest"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:631
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Cannot '$squash_style' without a previous commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:673
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Executing: $rest"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:681
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Execution failed: $rest"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:683
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "and made changes to the index and/or the working tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:685
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"You can fix the problem, and then run\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tgit rebase --continue"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: after these lines is a command to be issued by the user
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:698
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Execution succeeded: $rest\n"
|
|
|
|
|
"but left changes to the index and/or the working tree\n"
|
|
|
|
|
"Commit or stash your changes, and then run\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tgit rebase --continue"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:709
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Unknown command: $command $sha1 $rest"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:710
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Please fix this using 'git rebase --edit-todo'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:745
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Successfully rebased and updated $head_name."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:802
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Could not remove CHERRY_PICK_HEAD"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:807
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"You have staged changes in your working tree.\n"
|
|
|
|
|
"If these changes are meant to be\n"
|
|
|
|
|
"squashed into the previous commit, run:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git commit --amend $gpg_sign_opt_quoted\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"If they are meant to go into a new commit, run:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git commit $gpg_sign_opt_quoted\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"In both cases, once you're done, continue with:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git rebase --continue\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:824
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Error trying to find the author identity to amend commit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:829
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"You have uncommitted changes in your working tree. Please commit them\n"
|
|
|
|
|
"first and then run 'git rebase --continue' again."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Could not commit staged changes."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Could not execute editor"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:890
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Could not checkout $switch_to"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:897
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No HEAD?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:898
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Could not create temporary $state_dir"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:901
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Could not mark as interactive"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:933
|
2020-01-12 00:36:56 +01:00
|
|
|
#, sh-format
|
|
|
|
|
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
|
|
|
|
|
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-rebase--preserve-merges.sh:945
|
|
|
|
|
msgid "Note that empty commits are commented out"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Could not init rewritten commits"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:89 git-sh-setup.sh:94
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "usage: $dashless $USAGE"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:191
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:200 git-sh-setup.sh:207
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "fatal: $program_name cannot be used without a working tree."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:221
|
|
|
|
|
msgid "Cannot rebase: You have unstaged changes."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:224
|
|
|
|
|
msgid "Cannot rewrite branches: You have unstaged changes."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:227
|
|
|
|
|
msgid "Cannot pull with rebase: You have unstaged changes."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:230
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Cannot $action: You have unstaged changes."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:243
|
|
|
|
|
msgid "Cannot rebase: Your index contains uncommitted changes."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:246
|
|
|
|
|
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:249
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Cannot $action: Your index contains uncommitted changes."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:253
|
|
|
|
|
msgid "Additionally, your index contains uncommitted changes."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:373
|
|
|
|
|
msgid "You need to run this command from the toplevel of the working tree."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:378
|
|
|
|
|
msgid "Unable to determine absolute path of git directory"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:212
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "%12s %12s %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:634
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "touched %d path\n"
|
|
|
|
|
msgid_plural "touched %d paths\n"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1058
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"If the patch applies cleanly, the edited hunk will immediately be\n"
|
|
|
|
|
"marked for staging."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1061
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"If the patch applies cleanly, the edited hunk will immediately be\n"
|
|
|
|
|
"marked for stashing."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1064
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"If the patch applies cleanly, the edited hunk will immediately be\n"
|
|
|
|
|
"marked for unstaging."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1067 git-add--interactive.perl:1076
|
|
|
|
|
#: git-add--interactive.perl:1082
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"If the patch applies cleanly, the edited hunk will immediately be\n"
|
|
|
|
|
"marked for applying."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1070 git-add--interactive.perl:1073
|
|
|
|
|
#: git-add--interactive.perl:1079
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"If the patch applies cleanly, the edited hunk will immediately be\n"
|
|
|
|
|
"marked for discarding."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1116
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "failed to open hunk edit file for writing: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1123
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"---\n"
|
|
|
|
|
"To remove '%s' lines, make them ' ' lines (context).\n"
|
|
|
|
|
"To remove '%s' lines, delete them.\n"
|
|
|
|
|
"Lines starting with %s will be removed.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1145
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "failed to open hunk edit file for reading: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1253
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"y - stage this hunk\n"
|
|
|
|
|
"n - do not stage this hunk\n"
|
|
|
|
|
"q - quit; do not stage this hunk or any of the remaining ones\n"
|
|
|
|
|
"a - stage this hunk and all later hunks in the file\n"
|
|
|
|
|
"d - do not stage this hunk or any of the later hunks in the file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1259
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"y - stash this hunk\n"
|
|
|
|
|
"n - do not stash this hunk\n"
|
|
|
|
|
"q - quit; do not stash this hunk or any of the remaining ones\n"
|
|
|
|
|
"a - stash this hunk and all later hunks in the file\n"
|
|
|
|
|
"d - do not stash this hunk or any of the later hunks in the file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1265
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"y - unstage this hunk\n"
|
|
|
|
|
"n - do not unstage this hunk\n"
|
|
|
|
|
"q - quit; do not unstage this hunk or any of the remaining ones\n"
|
|
|
|
|
"a - unstage this hunk and all later hunks in the file\n"
|
|
|
|
|
"d - do not unstage this hunk or any of the later hunks in the file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1271
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"y - apply this hunk to index\n"
|
|
|
|
|
"n - do not apply this hunk to index\n"
|
|
|
|
|
"q - quit; do not apply this hunk or any of the remaining ones\n"
|
|
|
|
|
"a - apply this hunk and all later hunks in the file\n"
|
|
|
|
|
"d - do not apply this hunk or any of the later hunks in the file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"y - discard this hunk from worktree\n"
|
|
|
|
|
"n - do not discard this hunk from worktree\n"
|
|
|
|
|
"q - quit; do not discard this hunk or any of the remaining ones\n"
|
|
|
|
|
"a - discard this hunk and all later hunks in the file\n"
|
|
|
|
|
"d - do not discard this hunk or any of the later hunks in the file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1283
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"y - discard this hunk from index and worktree\n"
|
|
|
|
|
"n - do not discard this hunk from index and worktree\n"
|
|
|
|
|
"q - quit; do not discard this hunk or any of the remaining ones\n"
|
|
|
|
|
"a - discard this hunk and all later hunks in the file\n"
|
|
|
|
|
"d - do not discard this hunk or any of the later hunks in the file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1289
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"y - apply this hunk to index and worktree\n"
|
|
|
|
|
"n - do not apply this hunk to index and worktree\n"
|
|
|
|
|
"q - quit; do not apply this hunk or any of the remaining ones\n"
|
|
|
|
|
"a - apply this hunk and all later hunks in the file\n"
|
|
|
|
|
"d - do not apply this hunk or any of the later hunks in the file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1301
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"y - apply this hunk to worktree\n"
|
|
|
|
|
"n - do not apply this hunk to worktree\n"
|
|
|
|
|
"q - quit; do not apply this hunk or any of the remaining ones\n"
|
|
|
|
|
"a - apply this hunk and all later hunks in the file\n"
|
|
|
|
|
"d - do not apply this hunk or any of the later hunks in the file"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1316
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"g - select a hunk to go to\n"
|
|
|
|
|
"/ - search for a hunk matching the given regex\n"
|
|
|
|
|
"j - leave this hunk undecided, see next undecided hunk\n"
|
|
|
|
|
"J - leave this hunk undecided, see next hunk\n"
|
|
|
|
|
"k - leave this hunk undecided, see previous undecided hunk\n"
|
|
|
|
|
"K - leave this hunk undecided, see previous hunk\n"
|
|
|
|
|
"s - split the current hunk into smaller hunks\n"
|
|
|
|
|
"e - manually edit the current hunk\n"
|
|
|
|
|
"? - print help\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1347
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "The selected hunks do not apply to the index!\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1362
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "ignoring unmerged: %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1481
|
2020-05-26 01:06:52 +02:00
|
|
|
#, perl-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
|
2020-05-26 01:06:52 +02:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1482
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1483
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
2020-11-21 19:20:35 +01:00
|
|
|
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
|
2020-01-12 00:36:56 +01:00
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1484
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1601
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No other hunks to goto\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1619
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "Invalid number: '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1624
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "Sorry, only %d hunk available.\n"
|
|
|
|
|
msgid_plural "Sorry, only %d hunks available.\n"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1659
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No other hunks to search\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1676
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "Malformed search regexp %s: %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1686
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No hunk matches the given pattern\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No previous hunk\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "No next hunk\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1732
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Sorry, cannot split this hunk\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1738
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "Split into %d hunk.\n"
|
|
|
|
|
msgid_plural "Split into %d hunks.\n"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1748
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Sorry, cannot edit this hunk\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: please do not translate the command names
|
|
|
|
|
#. 'status', 'update', 'revert', etc.
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1813
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"status - show paths with changes\n"
|
|
|
|
|
"update - add working tree state to the staged set of changes\n"
|
|
|
|
|
"revert - revert staged set of changes back to the HEAD version\n"
|
|
|
|
|
"patch - pick hunks and update selectively\n"
|
|
|
|
|
"diff - view diff between HEAD and index\n"
|
|
|
|
|
"add untracked - add contents of untracked files to the staged set of "
|
|
|
|
|
"changes\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1830 git-add--interactive.perl:1835
|
|
|
|
|
#: git-add--interactive.perl:1838 git-add--interactive.perl:1845
|
|
|
|
|
#: git-add--interactive.perl:1848 git-add--interactive.perl:1855
|
|
|
|
|
#: git-add--interactive.perl:1859 git-add--interactive.perl:1865
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "missing --"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1861
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "unknown --patch mode: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-add--interactive.perl:1867 git-add--interactive.perl:1873
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "invalid argument %s, expecting --"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-send-email.perl:138
|
|
|
|
|
msgid "local zone differs from GMT by a non-minute interval\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-send-email.perl:145 git-send-email.perl:151
|
|
|
|
|
msgid "local time offset greater than or equal to 24 hours\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-send-email.perl:223 git-send-email.perl:229
|
|
|
|
|
msgid "the editor exited uncleanly, aborting everything"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:312
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"'%s' contains an intermediate version of the email you were composing.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:317
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "'%s.final' contains the composed email.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:410
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "--dump-aliases incompatible with other options\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:484
|
|
|
|
|
msgid ""
|
|
|
|
|
"fatal: found configuration options for 'sendmail'\n"
|
|
|
|
|
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
|
|
|
|
|
"Set sendemail.forbidSendmailVariables to false to disable this check.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-send-email.perl:489 git-send-email.perl:691
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Cannot run git format-patch from outside a repository\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:492
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"`batch-size` and `relogin` must be specified together (via command-line or "
|
|
|
|
|
"configuration option)\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:505
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "Unknown --suppress-cc field: '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:536
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "Unknown --confirm setting: '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:564
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "warning: sendmail alias with quotes is not supported: %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:566
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "warning: `:include:` not supported: %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:568
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:573
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "warning: sendmail line is not recognized: %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:657
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"File '%s' exists but it could also be the range of commits\n"
|
|
|
|
|
"to produce patches for. Please disambiguate by...\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" * Saying \"./%s\" if you mean a file; or\n"
|
|
|
|
|
" * Giving --format-patch option if you mean a range.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:678
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "Failed to opendir %s: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:702
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"fatal: %s: %s\n"
|
|
|
|
|
"warning: no patches were sent\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:713
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"No patch files specified!\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:726
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "No subject line in %s?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:736
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "Failed to open for writing %s: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:747
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"Lines beginning in \"GIT:\" will be removed.\n"
|
|
|
|
|
"Consider including an overall diffstat or table of contents\n"
|
|
|
|
|
"for the patch you are writing.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Clear the body content if you don't wish to send a summary.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:771
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "Failed to open %s: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:788
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "Failed to open %s.final: %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:831
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Summary email is empty, skipping it\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: please keep [y/N] as is.
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:866
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "Are you sure you want to use <%s> [y/N]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:921
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
"The following files are 8bit, but do not declare a Content-Transfer-"
|
|
|
|
|
"Encoding.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:926
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Which 8bit encoding should I declare [UTF-8]? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:934
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Refusing to send because the patch\n"
|
|
|
|
|
"\t%s\n"
|
|
|
|
|
"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
|
|
|
|
|
"want to send.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:953
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "To whom should the emails be sent (if anyone)?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:971
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "fatal: alias '%s' expands to itself\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:983
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1041 git-send-email.perl:1049
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "error: unable to extract a valid address from: %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
|
|
|
|
|
#. translation. The program will only accept English input
|
|
|
|
|
#. at this point.
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1053
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1370
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "CA path \"%s\" does not exist"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1453
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid ""
|
|
|
|
|
" The Cc list above has been expanded by additional\n"
|
|
|
|
|
" addresses found in the patch commit message. By default\n"
|
|
|
|
|
" send-email prompts before sending whenever this occurs.\n"
|
|
|
|
|
" This behavior is controlled by the sendemail.confirm\n"
|
|
|
|
|
" configuration setting.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" For additional information, run 'git send-email --help'.\n"
|
|
|
|
|
" To retain the current behavior, but squelch this message,\n"
|
|
|
|
|
" run 'git config --global sendemail.confirm auto'.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
|
|
|
|
|
#. translation. The program will only accept English input
|
|
|
|
|
#. at this point.
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1468
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1471
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Send this email reply required"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1499
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "The required SMTP server is not properly defined."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1546
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "Server does not support STARTTLS! %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1551 git-send-email.perl:1555
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "STARTTLS failed! %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1564
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1582
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "Failed to send %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1585
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "Dry-Sent %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1585
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "Sent %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1587
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Dry-OK. Log says:\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1587
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "OK. Log says:\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1599
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Result: "
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1602
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "Result: OK\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1620
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "can't open file %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1667 git-send-email.perl:1687
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "(mbox) Adding cc: %s from line '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1673
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "(mbox) Adding to: %s from line '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1730
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1765
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "(body) Adding cc: %s from line '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1876
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "(%s) Could not execute '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1883
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "(%s) Adding %s: %s from: '%s'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1887
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "(%s) failed to close pipe to '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1917
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "cannot send message as 7bit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1925
|
2020-01-12 00:36:56 +01:00
|
|
|
msgid "invalid transfer encoding"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "unable to open %s: %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1969
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "%s: patch contains a line longer than 998 characters"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1986
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "Skipping %s with backup suffix '%s'.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: please keep "[y|N]" as is.
|
2020-11-21 19:20:35 +01:00
|
|
|
#: git-send-email.perl:1990
|
2020-01-12 00:36:56 +01:00
|
|
|
#, perl-format
|
|
|
|
|
msgid "Do you really want to send %s? [y|N]: "
|
|
|
|
|
msgstr ""
|
