tvl-depot/third_party/git/po/de.po

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

26006 lines
755 KiB
Text
Raw Normal View History

# German translations for Git.
# Copyright (C) 2019 Matthias Rüster <matthias.ruester@gmail.com>
# This file is distributed under the same license as the Git package.
# Matthias Rüster <matthias.ruester@gmail.com>, 2019-2020.
# Ralf Thielow <ralf.thielow@gmail.com>, 2010-2019.
#
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2020-10-10 09:32+0800\n"
"PO-Revision-Date: 2020-10-15 19:16+0200\n"
"Last-Translator: Matthias Rüster <matthias.ruester@gmail.com>\n"
"Language-Team: Matthias Rüster <matthias.ruester@gmail.com>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#: add-interactive.c:368
#, c-format
msgid "Huh (%s)?"
msgstr "Wie bitte (%s)?"
#: 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 "Index konnte nicht gelesen werden"
#: add-interactive.c:576 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "Binär"
#: add-interactive.c:634 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "Nichts"
#: add-interactive.c:635 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "unverändert"
#: add-interactive.c:672 git-add--interactive.perl:643
msgid "Update"
msgstr "Aktualisieren"
#: add-interactive.c:689 add-interactive.c:877
#, c-format
msgid "could not stage '%s'"
msgstr "Konnte '%s' nicht zum Commit vormerken."
#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444
msgid "could not write index"
msgstr "Konnte Index nicht schreiben."
#: 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] "%d Pfad aktualisiert\n"
msgstr[1] "%d Pfade aktualisiert\n"
#: add-interactive.c:716 git-add--interactive.perl:678
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "Hinweis: %s ist nun unversioniert.\n"
#: 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 "make_cache_entry für Pfad '%s' fehlgeschlagen"
#: add-interactive.c:751 git-add--interactive.perl:655
msgid "Revert"
msgstr "Revert"
#: add-interactive.c:767
msgid "Could not parse HEAD^{tree}"
msgstr "Konnte HEAD^{tree} nicht parsen."
#: 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] "%d Pfad wiederhergestellt\n"
msgstr[1] "%d Pfade wiederhergestellt\n"
#: add-interactive.c:856 git-add--interactive.perl:695
#, c-format
msgid "No untracked files.\n"
msgstr "Keine unversionierten Dateien.\n"
#: add-interactive.c:860 git-add--interactive.perl:689
msgid "Add untracked"
msgstr "unversionierte Dateien hinzufügen"
#: 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] "%d Pfad hinzugefügt\n"
msgstr[1] "%d Pfade hinzugefügt\n"
#: add-interactive.c:917
#, c-format
msgid "ignoring unmerged: %s"
msgstr "Ignoriere nicht zusammengeführte Datei: %s"
#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
msgstr "Nur Binärdateien geändert.\n"
#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
msgstr "Keine Änderungen.\n"
#: add-interactive.c:935 git-add--interactive.perl:1381
msgid "Patch update"
msgstr "Patch Aktualisierung"
#: add-interactive.c:974 git-add--interactive.perl:1794
msgid "Review diff"
msgstr "Diff überprüfen"
#: add-interactive.c:1002
msgid "show paths with changes"
msgstr "Zeige Pfade mit Änderungen"
#: add-interactive.c:1004
msgid "add working tree state to the staged set of changes"
msgstr "Zustand des Arbeitsverzeichnisses zum Commit vormerken"
#: add-interactive.c:1006
msgid "revert staged set of changes back to the HEAD version"
msgstr "Zum Commit vorgemerkte Änderungen auf HEAD-Version zurücksetzen"
#: add-interactive.c:1008
msgid "pick hunks and update selectively"
msgstr "Blöcke und Änderung gezielt auswählen"
#: add-interactive.c:1010
msgid "view diff between HEAD and index"
msgstr "Differenz zwischen HEAD und Index ansehen"
#: add-interactive.c:1012
msgid "add contents of untracked files to the staged set of changes"
msgstr "Inhalte von unversionierten Dateien zum Commit vormerken"
#: add-interactive.c:1020 add-interactive.c:1069
msgid "Prompt help:"
msgstr "Hilfe für Eingaben:"
#: add-interactive.c:1022
msgid "select a single item"
msgstr "Ein einzelnes Element auswählen"
#: add-interactive.c:1024
msgid "select a range of items"
msgstr "Eine Reihe von Elementen auswählen"
#: add-interactive.c:1026
msgid "select multiple ranges"
msgstr "Mehrere Reihen auswählen"
#: add-interactive.c:1028 add-interactive.c:1073
msgid "select item based on unique prefix"
msgstr "Element basierend auf eindeutigen Präfix auswählen"
#: add-interactive.c:1030
msgid "unselect specified items"
msgstr "Angegebene Elemente abwählen"
#: add-interactive.c:1032
msgid "choose all items"
msgstr "Alle Elemente auswählen"
#: add-interactive.c:1034
msgid "(empty) finish selecting"
msgstr "(leer) Auswählen beenden"
#: add-interactive.c:1071
msgid "select a numbered item"
msgstr "Ein nummeriertes Element auswählen"
#: add-interactive.c:1075
msgid "(empty) select nothing"
msgstr "(leer) nichts auswählen"
#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891
msgid "*** Commands ***"
msgstr "*** Befehle ***"
#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888
msgid "What now"
msgstr "Was nun"
#: add-interactive.c:1136 git-add--interactive.perl:213
msgid "staged"
msgstr "zur Staging-Area hinzugefügt"
#: add-interactive.c:1136 git-add--interactive.perl:213
msgid "unstaged"
msgstr "aus Staging-Area entfernt"
#: 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 "Pfad"
#: add-interactive.c:1143
msgid "could not refresh index"
msgstr "Index konnte nicht aktualisiert werden"
#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr "Tschüss.\n"
#: add-patch.c:34 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Modusänderung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
#: add-patch.c:35 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Löschung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
#: add-patch.c:36 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr "Ergänzung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
#: add-patch.c:37 git-add--interactive.perl:1436
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Diesen Patch-Block der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
#: add-patch.c:39
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
msgstr ""
"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
"Block direkt für die Staging-Area markiert."
#: 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 ""
"y - diesen Patch-Block zum Commit vormerken\n"
"n - diesen Patch-Block nicht zum Commit vormerken\n"
"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht zum Commit "
"vormerken\n"
"a - diesen und alle weiteren Patch-Blöcke dieser Datei zum Commit vormerken\n"
"d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit "
"vormerken\n"
#: add-patch.c:56 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Modusänderung stashen [y,n,q,a,d%s,?]? "
#: add-patch.c:57 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Löschung stashen [y,n,q,a,d%s,?]? "
#: add-patch.c:58 git-add--interactive.perl:1441
#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr "Ergänzung stashen [y,n,q,a,d%s,?]? "
#: add-patch.c:59 git-add--interactive.perl:1442
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Diesen Patch-Block stashen [y,n,q,a,d%s,?]? "
#: add-patch.c:61
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
msgstr ""
"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
"Block direkt zum Stashen markiert."
#: 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 ""
"y - diesen Patch-Block stashen\n"
"n - diesen Patch-Block nicht stashen\n"
"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht stashen\n"
"a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n"
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen\n"
#: add-patch.c:80 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Modusänderung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
#: add-patch.c:81 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Löschung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
#: add-patch.c:82 git-add--interactive.perl:1447
#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr "Ergänzung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
#: add-patch.c:83 git-add--interactive.perl:1448
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Diesen Patch-Block aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
#: add-patch.c:85
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
msgstr ""
"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
"Block direkt zum Entfernen aus der Staging-Area markiert."
#: 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 ""
"y - diesen Patch-Block aus Staging-Area entfernen\n"
"n - diesen Patch-Block nicht aus Staging-Area entfernen\n"
"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht aus Staging-"
"Area entfernen\n"
"a - diesen und alle weiteren Patch-Blöcke dieser Datei aus Staging-Area "
"entfernen\n"
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht aus Staging-"
"Area entfernen\n"
#: 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 "Modusänderung auf Index anwenden [y,n,q,a,d%s,?]? "
#: 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 "Löschung auf Index anwenden [y,n,q,a,d%s,?]? "
#: 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 "Ergänzung auf Index anwenden [y,n,q,a,d%s,?]? "
#: 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 "Diesen Patch-Block auf Index anwenden [y,n,q,a,d%s,?]? "
#: 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 ""
"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
"Block direkt zum Anwenden markiert."
#: 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 ""
"y - diesen Patch-Block auf den Index anwenden\n"
"n - diesen Patch-Block nicht auf den Index anwenden\n"
"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht auf den Index "
"anwenden\n"
"a - diesen und alle weiteren Patch-Blöcke dieser Datei auf den Index "
"anwenden\n"
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index "
"anwenden\n"
#: 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 "Modusänderung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
#: 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 "Löschung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
#: 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 "Ergänzung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
#: 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 "Diesen Patch-Block im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
#: 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 ""
"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
"Block direkt zum Verwerfen markiert."
#: 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 ""
"y - diesen Patch-Block im Arbeitsverzeichnis verwerfen\n"
"n - diesen Patch-Block im Arbeitsverzeichnis nicht verwerfen\n"
"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht im "
"Arbeitsverzeichnis verwerfen\n"
"a - diesen und alle weiteren Patch-Blöcke dieser Datei im Arbeitsverzeichnis "
"verwerfen\n"
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im "
"Arbeitsverzeichnis verwerfen\n"
#: 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 ""
"Modusänderung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
#: 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 "Löschung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
#: 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 "Ergänzung im Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
#: 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 ""
"Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d"
"%s,?]? "
#: 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 ""
"y - diesen Patch-Block im Index und Arbeitsverzeichnis verwerfen\n"
"n - diesen Patch-Block nicht im Index und Arbeitsverzeichnis verwerfen\n"
"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht verwerfen\n"
"a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n"
"d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen\n"
#: 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 ""
"Modusänderung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
#: 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 "Löschung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
#: 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 "Ergänzung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
#: 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 ""
"Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d"
"%s,?]? "
#: 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 ""
"y - diesen Patch-Block im Index und auf das Arbeitsverzeichnis anwenden\n"
"n - diesen Patch-Block nicht im Index und auf das Arbeitsverzeichnis "
"anwenden\n"
"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht anwenden\n"
"a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
"d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden\n"
#: 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 ""
"y - diesen Patch-Block auf das Arbeitsverzeichnis anwenden\n"
"n - diesen Patch-Block nicht auf das Arbeitsverzeichnis anwenden\n"
"q - Beenden; diesen und alle verbleibenden Patch-Blöcke nicht anwenden\n"
"a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
"d - diesen und alle weiteren Patch-Blöcke in der Datei nicht anwenden\n"
#: add-patch.c:342
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr "Konnte Block-Header '%.*s' nicht parsen."
#: add-patch.c:361 add-patch.c:365
#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr "Konnte farbigen Block-Header '%.*s' nicht parsen."
#: add-patch.c:419
msgid "could not parse diff"
msgstr "Konnte Differenz nicht parsen."
#: add-patch.c:438
msgid "could not parse colored diff"
msgstr "Konnte farbige Differenz nicht parsen."
#: add-patch.c:452
#, c-format
msgid "failed to run '%s'"
msgstr "'%s' konnte nicht ausgeführt werden"
#: add-patch.c:611
msgid "mismatched output from interactive.diffFilter"
msgstr "nicht übereinstimmende Ausgabe von interactive.diffFilter"
#: add-patch.c:612
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
msgstr ""
"Der Filter muss eine Eins-zu-Eins-Beziehung\n"
"zwischen den Ein- und Ausgabe-Zeilen einhalten."
#: add-patch.c:785
#, c-format
msgid ""
"expected context line #%d in\n"
"%.*s"
msgstr ""
"Erwartete Kontextzeile #%d in\n"
"%.*s"
#: add-patch.c:800
#, c-format
msgid ""
"hunks do not overlap:\n"
"%.*s\n"
"\tdoes not end with:\n"
"%.*s"
msgstr ""
"Patch-Blöcke überlappen sich nicht:\n"
"%.*s\n"
"\tendet nicht mit:\n"
"%.*s"
#: add-patch.c:1076 git-add--interactive.perl:1117
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
"Manueller Editiermodus für Patch-Blöcke -- siehe nach unten für eine\n"
"Kurzanleitung.\n"
#: 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 ""
"---\n"
"Um '%c' Zeilen zu entfernen, machen Sie aus diesen ' ' Zeilen (Kontext).\n"
"Um '%c' Zeilen zu entfernen, löschen Sie diese.\n"
"Zeilen, die mit %c beginnen, werden entfernt.\n"
#. 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 ""
"Wenn das nicht sauber angewendet werden kann, haben Sie die Möglichkeit\n"
"einer erneuten Bearbeitung. Wenn alle Zeilen des Patch-Blocks entfernt "
"werden,\n"
"wird die Bearbeitung abgebrochen und der Patch-Block bleibt unverändert.\n"
#: add-patch.c:1127
msgid "could not parse hunk header"
msgstr "Konnte Block-Header nicht parsen."
#: add-patch.c:1172
msgid "'git apply --cached' failed"
msgstr "'git apply --cached' schlug fehl."
#. 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 ""
"Ihr bearbeiteter Patch-Block kann nicht angewendet werden.\n"
"Erneut bearbeiten? (\"n\" verwirft Bearbeitung!) [y/n]?"
#: add-patch.c:1284
msgid "The selected hunks do not apply to the index!"
msgstr ""
"Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet werden!"
#: add-patch.c:1285 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
msgstr "Trotzdem auf Arbeitsverzeichnis anwenden? "
#: add-patch.c:1292 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr "Nichts angewendet.\n"
#: 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 ""
"j - diesen Patch-Block unbestimmt lassen, nächsten unbestimmten Patch-Block "
"anzeigen\n"
"J - diesen Patch-Block unbestimmt lassen, nächsten Patch-Block anzeigen\n"
"k - diesen Patch-Block unbestimmt lassen, vorherigen unbestimmten Patch-"
"Block anzeigen\n"
"K - diesen Patch-Block unbestimmt lassen, vorherigen Patch-Block anzeigen\n"
"g - Patch-Block zum Hinspringen auswählen\n"
"/ - nach Patch-Block suchen, der gegebenem regulärem Ausdruck entspricht\n"
"s - aktuellen Patch-Block in kleinere Patch-Blöcke aufteilen\n"
"e - aktuellen Patch-Block manuell editieren\n"
"? - Hilfe anzeigen\n"
#: add-patch.c:1511 add-patch.c:1521
msgid "No previous hunk"
msgstr "Kein vorheriger Patch-Block"
#: add-patch.c:1516 add-patch.c:1526
msgid "No next hunk"
msgstr "Kein folgender Patch-Block"
#: add-patch.c:1532
msgid "No other hunks to goto"
msgstr "Keine anderen Patch-Blöcke verbleibend"
#: add-patch.c:1543 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
msgstr "zu welchem Patch-Block springen (<Enter> für mehr Informationen)? "
#: add-patch.c:1544 git-add--interactive.perl:1610
msgid "go to which hunk? "
msgstr "zu welchem Patch-Block springen? "
#: add-patch.c:1555
#, c-format
msgid "Invalid number: '%s'"
msgstr "Ungültige Nummer: '%s'"
#: add-patch.c:1560
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "Entschuldigung, nur %d Patch-Block verfügbar."
msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar."
#: add-patch.c:1569
msgid "No other hunks to search"
msgstr "Keine anderen Patch-Blöcke zum Durchsuchen"
#: add-patch.c:1575 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr "Suche nach regulärem Ausdruck? "
#: add-patch.c:1590
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s"
#: add-patch.c:1607
msgid "No hunk matches the given pattern"
msgstr "Kein Patch-Block entspricht dem angegebenen Muster"
#: add-patch.c:1614
msgid "Sorry, cannot split this hunk"
msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen"
#: add-patch.c:1618
#, c-format
msgid "Split into %d hunks."
msgstr "In %d Patch-Block aufgeteilt."
#: add-patch.c:1622
msgid "Sorry, cannot edit this hunk"
msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten"
#: add-patch.c:1674
msgid "'git apply' failed"
msgstr "'git apply' schlug fehl"
#: advice.c:140
#, c-format
msgid ""
"\n"
"Disable this message with \"git config advice.%s false\""
msgstr ""
"\n"
"Deaktivieren Sie diese Nachricht mit \"git config advice.%s false\""
#: advice.c:156
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sHinweis: %.*s%s\n"
#: advice.c:247
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"Cherry-Picken ist nicht möglich, weil Sie nicht zusammengeführte Dateien "
"haben."
#: advice.c:249
msgid "Committing is not possible because you have unmerged files."
msgstr ""
"Committen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
#: advice.c:251
msgid "Merging is not possible because you have unmerged files."
msgstr ""
"Mergen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
#: advice.c:253
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
"Pullen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
#: advice.c:255
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
"Reverten ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
#: advice.c:257
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "%s ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
#: advice.c:265
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 ""
"Korrigieren Sie dies im Arbeitsverzeichnis, und benutzen Sie\n"
"dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n"
"und zu committen."
#: advice.c:273
msgid "Exiting because of an unresolved conflict."
msgstr "Beende wegen unaufgelöstem Konflikt."
#: advice.c:278 builtin/merge.c:1349
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)."
#: advice.c:280
msgid "Please, commit your changes before merging."
msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie mergen."
#: advice.c:281
msgid "Exiting because of unfinished merge."
msgstr "Beende wegen nicht abgeschlossenem Merge."
#: advice.c:287
#, 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 ""
"Hinweis: Wechsle zu '%s'.\n"
"\n"
"Sie befinden sich im Zustand eines 'losgelösten HEAD'. Sie können sich\n"
"umschauen, experimentelle Änderungen vornehmen und diese committen, und\n"
"Sie können alle möglichen Commits, die Sie in diesem Zustand machen,\n"
"ohne Auswirkungen auf irgendeinen Branch verwerfen, indem Sie zu einem\n"
"anderen Branch wechseln.\n"
"\n"
"Wenn Sie einen neuen Branch erstellen möchten, um Ihre erstellten Commits\n"
"zu behalten, können Sie das (jetzt oder später) durch Nutzung von\n"
"'switch' mit der Option -c tun. Beispiel:\n"
"\n"
" git switch -c <neuer-Branchname>\n"
"\n"
"Oder um diese Operation rückgängig zu machen:\n"
" git switch -\n"
"\n"
"Sie können diesen Hinweis ausschalten, indem Sie die Konfigurationsvariable\n"
"'advice.detachedHead' auf 'false' setzen.\n"
"\n"
#: alias.c:50
msgid "cmdline ends with \\"
msgstr "Befehlszeile endet mit \\"
#: alias.c:51
msgid "unclosed quote"
msgstr "Nicht geschlossene Anführungszeichen."
#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "Nicht erkannte Whitespace-Option: '%s'"
#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "nicht erkannte Option zum Ignorieren von Whitespace: '%s'"
#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "--reject und --3way können nicht gemeinsam verwendet werden."
#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "--cached und --3way können nicht gemeinsam verwendet werden."
#: apply.c:140
msgid "--3way outside a repository"
msgstr ""
"Die Option --3way kann nicht außerhalb eines Repositories verwendet werden."
#: apply.c:151
msgid "--index outside a repository"
msgstr ""
"Die Option --index kann nicht außerhalb eines Repositories verwendet werden."
#: apply.c:154
msgid "--cached outside a repository"
msgstr ""
"Die Option --cached kann nicht außerhalb eines Repositories verwendet werden."
#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten"
#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s"
#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden."
#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile "
"%d"
#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d"
#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d"
#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d"
#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "Ungültiger Modus in Zeile %d: %s"
#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "Inkonsistente Kopfzeilen %d und %d."
#: apply.c:1372
#, 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] ""
"Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn "
"%d vorangestellter Teil des Pfades entfernt wird (Zeile %d)"
msgstr[1] ""
"Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn "
"%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)"
#: apply.c:1385
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
"Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen (Zeile "
"%d)"
#: apply.c:1481
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: unerwartete Zeile: %.*s"
#: apply.c:1550
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s"
#: apply.c:1753
msgid "new file depends on old contents"
msgstr "neue Datei hängt von alten Inhalten ab"
#: apply.c:1755
msgid "deleted file still has contents"
msgstr "entfernte Datei hat noch Inhalte"
#: apply.c:1789
#, c-format
msgid "corrupt patch at line %d"
msgstr "fehlerhafter Patch bei Zeile %d"
#: apply.c:1826
#, c-format
msgid "new file %s depends on old contents"
msgstr "neue Datei %s hängt von alten Inhalten ab"
#: apply.c:1828
#, c-format
msgid "deleted file %s still has contents"
msgstr "entfernte Datei %s hat noch Inhalte"
#: apply.c:1831
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt."
#: apply.c:1978
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s"
#: apply.c:2015
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "nicht erkannter Binär-Patch bei Zeile %d"
#: apply.c:2177
#, c-format
msgid "patch with only garbage at line %d"
msgstr "Patch mit nutzlosen Informationen bei Zeile %d"
#: apply.c:2263
#, c-format
msgid "unable to read symlink %s"
msgstr "konnte symbolische Verknüpfung %s nicht lesen"
#: apply.c:2267
#, c-format
msgid "unable to open or read %s"
msgstr "konnte %s nicht öffnen oder lesen"
#: apply.c:2936
#, c-format
msgid "invalid start of line: '%c'"
msgstr "Ungültiger Zeilenanfang: '%c'"
#: apply.c:3057
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)"
msgstr[1] ""
"Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)"
#: apply.c:3069
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Kontext reduziert zu (%ld/%ld), um Patch-Bereich bei %d anzuwenden"
#: apply.c:3075
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
"bei der Suche nach:\n"
"%.*s"
#: apply.c:3097
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "keine Daten in Binär-Patch für '%s'"
#: apply.c:3105
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"kann binären Patch nicht in umgekehrter Reihenfolge anwenden ohne einen\n"
"umgekehrten Patch-Block auf '%s'"
#: apply.c:3152
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"kann binären Patch auf '%s' nicht ohne eine vollständige Index-Zeile anwenden"
#: apply.c:3163
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
"der Patch wird angewendet auf '%s' (%s), was nicht den aktuellen Inhalten\n"
"entspricht"
#: apply.c:3171
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "der Patch wird auf ein leeres '%s' angewendet, was aber nicht leer ist"
#: apply.c:3189
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "das erforderliche Postimage %s für '%s' kann nicht gelesen werden"
#: apply.c:3202
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "Konnte Binär-Patch nicht auf '%s' anwenden"
#: apply.c:3209
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"Binär-Patch für '%s' erzeugt falsches Ergebnis (erwartete %s, bekam %s)"
#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld"
#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
msgstr "kann %s nicht auschecken"
#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "Fehler beim Lesen von %s"
#: apply.c:3413
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "'%s' ist hinter einer symbolischen Verknüpfung"
#: apply.c:3442 apply.c:3685
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "Pfad %s wurde umbenannt/gelöscht"
#: apply.c:3528 apply.c:3700
#, c-format
msgid "%s: does not exist in index"
msgstr "%s ist nicht im Index"
#: apply.c:3537 apply.c:3708 apply.c:3953
#, c-format
msgid "%s: does not match index"
msgstr "%s entspricht nicht der Version im Index"
#: apply.c:3572
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"Dem Repository fehlt der notwendige Blob, um auf einen 3-Wege-Merge\n"
"zurückzufallen."
#: apply.c:3575
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Falle zurück auf 3-Wege-Merge ...\n"
#: apply.c:3591 apply.c:3595
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "kann aktuelle Inhalte von '%s' nicht lesen"
#: apply.c:3607
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Fehler beim Zurückfallen auf 3-Wege-Merge...\n"
#: apply.c:3621
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Patch auf '%s' mit Konflikten angewendet.\n"
#: apply.c:3626
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Patch auf '%s' sauber angewendet.\n"
#: apply.c:3652
msgid "removal patch leaves file contents"
msgstr "Lösch-Patch hinterlässt Dateiinhalte"
#: apply.c:3725
#, c-format
msgid "%s: wrong type"
msgstr "%s: falscher Typ"
#: apply.c:3727
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s ist vom Typ %o, erwartete %o"
#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858
#: read-cache.c:1313
#, c-format
msgid "invalid path '%s'"
msgstr "Ungültiger Pfad '%s'"
#: apply.c:3950
#, c-format
msgid "%s: already exists in index"
msgstr "%s ist bereits bereitgestellt"
#: apply.c:3956
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s existiert bereits im Arbeitsverzeichnis"
#: apply.c:3976
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)"
#: apply.c:3981
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o) von %s"
#: apply.c:4001
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung"
#: apply.c:4005
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: Patch konnte nicht angewendet werden"
#: apply.c:4020
#, c-format
msgid "Checking patch %s..."
msgstr "Prüfe Patch %s ..."
#: apply.c:4112
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "SHA-1 Information fehlt oder ist unbrauchbar für Submodul %s"
#: apply.c:4119
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "Modusänderung für %s, was sich nicht im aktuellen HEAD befindet"
#: apply.c:4122
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)."
#: apply.c:4131
#, c-format
msgid "could not add %s to temporary index"
msgstr "konnte %s nicht zum temporären Index hinzufügen"
#: apply.c:4141
#, c-format
msgid "could not write temporary index to %s"
msgstr "konnte temporären Index nicht nach %s schreiben"
#: apply.c:4279
#, c-format
msgid "unable to remove %s from index"
msgstr "konnte %s nicht aus dem Index entfernen"
#: apply.c:4313
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "fehlerhafter Patch für Submodul %s"
#: apply.c:4319
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "konnte neu erstellte Datei '%s' nicht lesen"
#: apply.c:4327
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "kann internen Speicher für eben erstellte Datei %s nicht erzeugen"
#: apply.c:4333 apply.c:4478
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen"
#: apply.c:4376 builtin/bisect--helper.c:537
#, c-format
msgid "failed to write to '%s'"
msgstr "Fehler beim Schreiben nach '%s'"
#: apply.c:4380
#, c-format
msgid "closing file '%s'"
msgstr "schließe Datei '%s'"
#: apply.c:4450
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "konnte Datei '%s' mit Modus %o nicht schreiben"
#: apply.c:4548
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s sauber angewendet"
#: apply.c:4556
msgid "internal error"
msgstr "interner Fehler"
#: apply.c:4559
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Wende Patch %%s mit %d Zurückweisung an..."
msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..."
#: apply.c:4570
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228
#, c-format
msgid "cannot open %s"
msgstr "kann '%s' nicht öffnen"
#: apply.c:4592
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Patch-Bereich #%d sauber angewendet."
#: apply.c:4596
#, c-format
msgid "Rejected hunk #%d."
msgstr "Patch-Block #%d zurückgewiesen."
#: apply.c:4715
#, c-format
msgid "Skipped patch '%s'."
msgstr "Patch '%s' ausgelassen."
#: apply.c:4723
msgid "unrecognized input"
msgstr "nicht erkannte Eingabe"
#: apply.c:4743
msgid "unable to read index file"
msgstr "Konnte Index-Datei nicht lesen"
#: apply.c:4900
#, c-format
msgid "can't open patch '%s': %s"
msgstr "kann Patch '%s' nicht öffnen: %s"
#: apply.c:4927
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "unterdrückte %d Whitespace-Fehler"
msgstr[1] "unterdrückte %d Whitespace-Fehler"
#: apply.c:4933 apply.c:4948
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d Zeile fügt Whitespace-Fehler hinzu."
msgstr[1] "%d Zeilen fügen Whitespace-Fehler hinzu."
#: apply.c:4941
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d Zeile nach Behebung von Whitespace-Fehlern angewendet."
msgstr[1] "%d Zeilen nach Behebung von Whitespace-Fehlern angewendet."
#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406
msgid "Unable to write new index file"
msgstr "Konnte neue Index-Datei nicht schreiben."
#: apply.c:4985
msgid "don't apply changes matching the given path"
msgstr "keine Änderungen im angegebenen Pfad anwenden"
#: apply.c:4988
msgid "apply changes matching the given path"
msgstr "Änderungen nur im angegebenen Pfad anwenden"
#: apply.c:4990 builtin/am.c:2279
msgid "num"
msgstr "Anzahl"
#: apply.c:4991
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden "
"entfernen"
#: apply.c:4994
msgid "ignore additions made by the patch"
msgstr "hinzugefügte Zeilen des Patches ignorieren"
#: apply.c:4996
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe "
"ausgegeben"
#: apply.c:5000
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen"
#: apply.c:5002
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
"anstatt der Anwendung des Patches, eine Zusammenfassung für die Eingabe "
"ausgeben"
#: apply.c:5004
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
"anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann"
#: apply.c:5006
msgid "make sure the patch is applicable to the current index"
msgstr ""
"sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann"
#: apply.c:5008
msgid "mark new files with `git add --intent-to-add`"
msgstr "neue Dateien mit `git add --intent-to-add` markieren"
#: apply.c:5010
msgid "apply a patch without touching the working tree"
msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen"
#: apply.c:5012
msgid "accept a patch that touches outside the working area"
msgstr ""
"Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt"
#: apply.c:5015
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
#: apply.c:5017
msgid "attempt three-way merge if a patch does not apply"
msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte"
#: apply.c:5019
msgid "build a temporary index based on embedded index information"
msgstr ""
"einen temporären Index, basierend auf den integrierten Index-Informationen, "
"erstellen"
#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525
msgid "paths are separated with NUL character"
msgstr "Pfade sind getrennt durch NUL Zeichen"
#: apply.c:5024
msgid "ensure at least <n> lines of context match"
msgstr ""
"sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen"
#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
#: builtin/pack-objects.c:3562 builtin/rebase.c:1340
msgid "action"
msgstr "Aktion"
#: apply.c:5026
msgid "detect new or modified lines that have whitespace errors"
msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln"
#: apply.c:5029 apply.c:5032
msgid "ignore changes in whitespace when finding context"
msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren"
#: apply.c:5035
msgid "apply the patch in reverse"
msgstr "den Patch in umgekehrter Reihenfolge anwenden"
#: apply.c:5037
msgid "don't expect at least one line of context"
msgstr "keinen Kontext erwarten"
#: apply.c:5039
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
"zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen"
#: apply.c:5041
msgid "allow overlapping hunks"
msgstr "sich überlappende Patch-Blöcke erlauben"
#: 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
msgid "be verbose"
msgstr "erweiterte Ausgaben"
#: apply.c:5044
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren"
#: apply.c:5047
msgid "do not trust the line counts in the hunk headers"
msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen"
#: apply.c:5049 builtin/am.c:2267
msgid "root"
msgstr "Wurzelverzeichnis"
#: apply.c:5050
msgid "prepend <root> to all filenames"
msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen"
#: archive-tar.c:125 archive-zip.c:345
#, c-format
msgid "cannot stream blob %s"
msgstr "Kann Blob %s nicht streamen."
#: archive-tar.c:265 archive-zip.c:358
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "Nicht unterstützter Dateimodus: 0%o (SHA1: %s)"
#: archive-tar.c:449
#, c-format
msgid "unable to start '%s' filter"
msgstr "Konnte '%s' Filter nicht starten."
#: archive-tar.c:452
msgid "unable to redirect descriptor"
msgstr "Konnte Descriptor nicht umleiten."
#: archive-tar.c:459
#, c-format
msgid "'%s' filter reported error"
msgstr "'%s' Filter meldete Fehler."
#: archive-zip.c:318
#, c-format
msgid "path is not valid UTF-8: %s"
msgstr "Pfad ist kein gültiges UTF-8: %s"
#: archive-zip.c:322
#, c-format
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "Pfad zu lang (%d Zeichen, SHA1: %s): %s"
#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
#, c-format
msgid "deflate error (%d)"
msgstr "Fehler beim Komprimieren (%d)"
#: archive-zip.c:603
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "Timestamp zu groß für dieses System: %<PRIuMAX>"
#: archive.c:14
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<Optionen>] <Commit-Referenz> [<Pfad>...]"
#: archive.c:15
msgid "git archive --list"
msgstr "git archive --list"
#: archive.c:16
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
"git archive --remote <Repository> [--exec <Programm>] [<Optionen>] <Commit-"
"Referenz> [<Pfad>...]"
#: archive.c:17
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <Repository> [--exec <Programm>] --list"
#: archive.c:192
#, c-format
msgid "cannot read %s"
msgstr "Kann %s nicht lesen."
#: 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 "Konnte '%s' nicht lesen"
#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein"
#: archive.c:454
#, c-format
msgid "no such ref: %.*s"
msgstr "Keine solche Referenz: %.*s"
#: archive.c:460
#, c-format
msgid "not a valid object name: %s"
msgstr "Kein gültiger Objektname: %s"
#: archive.c:473
#, c-format
msgid "not a tree object: %s"
msgstr "Kein Tree-Objekt: %s"
#: archive.c:485
msgid "current working directory is untracked"
msgstr "Aktuelles Arbeitsverzeichnis ist unversioniert."
#: archive.c:526
#, c-format
msgid "File not found: %s"
msgstr "Datei nicht gefunden: %s"
#: archive.c:528
#, c-format
msgid "Not a regular file: %s"
msgstr "Keine reguläre Datei: %s"
#: archive.c:553
msgid "fmt"
msgstr "Format"
#: archive.c:553
msgid "archive format"
msgstr "Archivformat"
#: archive.c:554 builtin/log.c:1760
msgid "prefix"
msgstr "Präfix"
#: archive.c:555
msgid "prepend prefix to each pathname in the archive"
msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen"
#: 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
msgid "file"
msgstr "Datei"
#: archive.c:557
msgid "add untracked file to archive"
msgstr "unversionierte Datei zum Archiv hinzufügen"
#: archive.c:560 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "das Archiv in diese Datei schreiben"
#: archive.c:562
msgid "read .gitattributes in working directory"
msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen"
#: archive.c:563
msgid "report archived files on stderr"
msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben"
#: archive.c:564
msgid "store only"
msgstr "nur speichern"
#: archive.c:565
msgid "compress faster"
msgstr "schneller komprimieren"
#: archive.c:573
msgid "compress better"
msgstr "besser komprimieren"
#: archive.c:576
msgid "list supported archive formats"
msgstr "unterstützte Archivformate auflisten"
#: 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"
msgstr "Repository"
#: archive.c:579 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "Archiv vom Remote-Repository <Repository> abrufen"
#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715
#: builtin/notes.c:498
msgid "command"
msgstr "Programm"
#: archive.c:581 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "Pfad zum externen \"git-upload-archive\"-Programm"
#: archive.c:588
msgid "Unexpected option --remote"
msgstr "Unerwartete Option --remote"
#: archive.c:590
msgid "Option --exec can only be used together with --remote"
msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden."
#: archive.c:592
msgid "Unexpected option --output"
msgstr "Unerwartete Option --output"
#: archive.c:594
msgid "Options --add-file and --remote cannot be used together"
msgstr ""
"Die Optionen --add-file und --remote können nicht gemeinsam verwendet werden."
#: archive.c:616
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Unbekanntes Archivformat '%s'"
#: archive.c:623
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argument für Format '%s' nicht unterstützt: -%d"
#: attr.c:212
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s ist kein gültiger Attributname"
#: attr.c:369
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s nicht erlaubt: %s:%d"
#: attr.c:409
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
"Verneinende Muster werden in Git-Attributen ignoriert.\n"
"Benutzen Sie '\\!' für führende Ausrufezeichen."
#: bisect.c:476
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Ungültiger Inhalt bzgl. Anführungszeichen in Datei '%s': %s"
#: bisect.c:686
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Keine binäre Suche mehr möglich!\n"
#: bisect.c:753
#, c-format
msgid "Not a valid commit name %s"
msgstr "%s ist kein gültiger Commit-Name"
#: bisect.c:778
#, c-format
msgid ""
"The merge base %s is bad.\n"
"This means the bug has been fixed between %s and [%s].\n"
msgstr ""
"Die Merge-Basis %s ist fehlerhaft.\n"
"Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n"
#: bisect.c:783
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr ""
"Die Merge-Basis %s ist neu.\n"
"Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geändert.\n"
#: bisect.c:788
#, c-format
msgid ""
"The merge base %s is %s.\n"
"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
"Die Merge-Basis %s ist %s.\n"
"Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s].\n"
#: bisect.c:796
#, 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 ""
"Manche %s Commits sind keine Vorgänger des %s Commits.\n"
"git bisect kann in diesem Fall nicht richtig arbeiten.\n"
"Vielleicht verwechselten Sie %s und %s Commits?\n"
#: bisect.c:809
#, 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 ""
"Die Merge-Basis zwischen %s und [%s] muss ausgelassen werden.\n"
"Es kann daher nicht sichergestellt werden, dass sich der\n"
"erste %s Commit zwischen %s und %s befindet.\n"
"Es wird dennoch fortgesetzt."
#: bisect.c:848
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "binäre Suche: eine Merge-Basis muss geprüft werden\n"
#: bisect.c:898
#, c-format
msgid "a %s revision is needed"
msgstr "ein %s Commit wird benötigt"
#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "konnte Datei '%s' nicht erstellen"
#: bisect.c:974 builtin/merge.c:150
#, c-format
msgid "could not read file '%s'"
msgstr "Konnte Datei '%s' nicht lesen"
#: bisect.c:1014
msgid "reading bisect refs failed"
msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen"
#: bisect.c:1044
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s war sowohl %s als auch %s\n"
#: bisect.c:1053
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
"Kein testbarer Commit gefunden.\n"
"Vielleicht starteten Sie mit falschen Pfad-Parametern?\n"
#: bisect.c:1082
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
msgstr[0] "(ungefähr %d Schritt)"
msgstr[1] "(ungefähr %d Schritte)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
#: bisect.c:1088
#, 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] "binäre Suche: danach noch %d Commit zum Testen übrig %s\n"
msgstr[1] "binäre Suche: danach noch %d Commits zum Testen übrig %s\n"
#: blame.c:2778
msgid "--contents and --reverse do not blend well."
msgstr "--contents und --reverse funktionieren gemeinsam nicht."
#: blame.c:2792
msgid "cannot use --contents with final commit object name"
msgstr ""
"kann --contents nicht mit endgültigem Namen des Commit-Objektes benutzen"
#: blame.c:2813
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse und --first-parent zusammen erfordern die Angabe eines "
"endgültigen\n"
"Commits"
#: 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
msgid "revision walk setup failed"
msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
#: blame.c:2840
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse und --first-parent zusammen erfordern einen Bereich entlang der\n"
"\"first-parent\"-Kette"
#: blame.c:2851
#, c-format
msgid "no such path %s in %s"
msgstr "Pfad %s nicht in %s"
#: blame.c:2862
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "kann Blob %s für Pfad '%s' nicht lesen"
#: 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 ""
"\n"
"Nachdem Sie die Fehlerursache behoben haben, können Sie\n"
"die Tracking-Informationen mit\n"
"\"git branch --set-upstream-to=%s%s%s\"\n"
"erneut setzen."
#: branch.c:67
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "Branch %s kann nicht sein eigener Upstream-Branch sein."
#: branch.c:93
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr "Branch '%s' folgt nun Remote-Branch '%s' von '%s' durch Rebase."
#: branch.c:94
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr "Branch '%s' folgt nun Remote-Branch '%s' von '%s'."
#: branch.c:98
#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr "Branch '%s' folgt nun lokalem Branch '%s' durch Rebase."
#: branch.c:99
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr "Branch '%s' folgt nun lokalem Branch '%s'."
#: branch.c:104
#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr "Branch '%s' folgt nun Remote-Referenz '%s' durch Rebase."
#: branch.c:105
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr "Branch '%s' folgt nun Remote-Referenz '%s'."
#: branch.c:109
#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr "Branch '%s' folgt nun lokaler Referenz '%s' durch Rebase."
#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr "Branch '%s' folgt nun lokaler Referenz '%s'."
#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgstr "Konnte Konfiguration zu Upstream-Branch nicht schreiben."
#: branch.c:156
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr ""
"Konfiguration zum Folgen von Branch nicht eingerichtet. Referenz %s ist "
"mehrdeutig."
#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s' ist kein gültiger Branchname."
#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Branch '%s' existiert bereits."
#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "Kann Aktualisierung des aktuellen Branches nicht erzwingen."
#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
"Kann Tracking-Informationen nicht einrichten; Startpunkt '%s' ist kein "
"Branch."
#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "der angeforderte Upstream-Branch '%s' existiert nicht"
#: 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 ""
"\n"
"Falls Sie vorhaben, Ihre Arbeit auf einem bereits existierenden\n"
"Upstream-Branch aufzubauen, sollten Sie \"git fetch\"\n"
"ausführen, um diesen abzurufen.\n"
"\n"
"Falls Sie vorhaben, einen neuen lokalen Branch zu versenden\n"
"der seinem externen Gegenstück folgen soll, können Sie\n"
"\"git push -u\" verwenden, um den Upstream-Branch beim \"push\"\n"
"zu konfigurieren."
#: branch.c:281
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Ungültiger Objekt-Name: '%s'"
#: branch.c:301
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "mehrdeutiger Objekt-Name: '%s'"
#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Ungültiger Branchpunkt: '%s'"
#: branch.c:365
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' ist bereits in '%s' ausgecheckt"
#: branch.c:388
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert."
#: bundle.c:41
#, c-format
msgid "unrecognized bundle hash algorithm: %s"
msgstr "unbekannter Paket-Hash-Algorithmus: %s"
#: bundle.c:45
#, c-format
msgid "unknown capability '%s'"
msgstr "unbekannte Fähigkeit '%s'"
#: bundle.c:71
#, c-format
msgid "'%s' does not look like a v2 or v3 bundle file"
msgstr "'%s' sieht nicht wie eine v2 oder v3 Paketdatei aus"
#: bundle.c:110
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142
#: builtin/commit.c:814
#, c-format
msgid "could not open '%s'"
msgstr "Konnte '%s' nicht öffnen"
#: bundle.c:189
msgid "Repository lacks these prerequisite commits:"
msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:"
#: bundle.c:192
msgid "need a repository to verify a bundle"
msgstr "Um ein Paket zu überprüfen wird ein Repository benötigt."
#: bundle.c:243
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "Das Paket enthält diese Referenz:"
msgstr[1] "Das Paket enthält diese %d Referenzen:"
#: bundle.c:250
msgid "The bundle records a complete history."
msgstr "Das Paket speichert eine komplette Historie."
#: bundle.c:252
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Das Paket benötigt diese Referenz:"
msgstr[1] "Das Paket benötigt diese %d Referenzen:"
#: bundle.c:319
msgid "unable to dup bundle descriptor"
msgstr "Konnte dup für Descriptor des Pakets nicht ausführen."
#: bundle.c:326
msgid "Could not spawn pack-objects"
msgstr "Konnte Paketobjekte nicht erstellen"
#: bundle.c:337
msgid "pack-objects died"
msgstr "Erstellung der Paketobjekte abgebrochen"
#: bundle.c:379
msgid "rev-list died"
msgstr "\"rev-list\" abgebrochen"
#: bundle.c:428
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen"
#: bundle.c:498
#, c-format
msgid "unsupported bundle version %d"
msgstr "nicht unterstützte Paket-Version %d"
#: bundle.c:500
#, c-format
msgid "cannot write bundle version %d with algorithm %s"
msgstr "kann Paket-Version %d nicht mit Algorithmus %s schreiben"
#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461
#, c-format
msgid "unrecognized argument: %s"
msgstr "nicht erkanntes Argument: %s"
#: bundle.c:530
msgid "Refusing to create empty bundle."
msgstr "Erstellung eines leeren Pakets zurückgewiesen."
#: bundle.c:540
#, c-format
msgid "cannot create '%s'"
msgstr "kann '%s' nicht erstellen"
#: bundle.c:565
msgid "index-pack died"
msgstr "Erstellung der Paketindexdatei abgebrochen"
#: color.c:329
#, c-format
msgid "invalid color value: %.*s"
msgstr "Ungültiger Farbwert: %.*s"
#: commit-graph.c:188 midx.c:46
msgid "invalid hash version"
msgstr "ungültige Hash-Version"
#: commit-graph.c:246
msgid "commit-graph file is too small"
msgstr "Commit-Graph-Datei ist zu klein."
#: commit-graph.c:311
#, c-format
msgid "commit-graph signature %X does not match signature %X"
msgstr "Commit-Graph-Signatur %X stimmt nicht mit Signatur %X überein."
#: commit-graph.c:318
#, c-format
msgid "commit-graph version %X does not match version %X"
msgstr "Commit-Graph-Version %X stimmt nicht mit Version %X überein."
#: commit-graph.c:325
#, c-format
msgid "commit-graph hash version %X does not match version %X"
msgstr "Hash-Version des Commit-Graph %X stimmt nicht mit Version %X überein."
#: commit-graph.c:342
#, c-format
msgid "commit-graph file is too small to hold %u chunks"
msgstr "Commit-Graph-Datei ist zu klein, um %u Chunks zu enthalten"
#: commit-graph.c:361
#, c-format
msgid "commit-graph improper chunk offset %08x%08x"
msgstr "Unzulässiger Commit-Graph Chunk-Offset %08x%08x"
#: commit-graph.c:433
#, c-format
msgid "commit-graph chunk id %08x appears multiple times"
msgstr "Commit-Graph Chunk-Id %08x kommt mehrfach vor."
#: commit-graph.c:499
msgid "commit-graph has no base graphs chunk"
msgstr "Commit-Graph hat keinen Basis-Graph-Chunk"
#: commit-graph.c:509
msgid "commit-graph chain does not match"
msgstr "Commit-Graph Verkettung stimmt nicht überein."
#: commit-graph.c:557
#, c-format
msgid "invalid commit-graph chain: line '%s' not a hash"
msgstr "Ungültige Commit-Graph Verkettung: Zeile '%s' ist kein Hash"
#: commit-graph.c:581
msgid "unable to find all commit-graph files"
msgstr "Konnte nicht alle Commit-Graph-Dateien finden."
#: commit-graph.c:721 commit-graph.c:785
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "Ungültige Commit-Position. Commit-Graph ist wahrscheinlich beschädigt."
#: commit-graph.c:742
#, c-format
msgid "could not find commit %s"
msgstr "Konnte Commit %s nicht finden."
#: commit-graph.c:1042 builtin/am.c:1306
#, c-format
msgid "unable to parse commit %s"
msgstr "Konnte Commit '%s' nicht parsen."
#: commit-graph.c:1265 builtin/pack-objects.c:2864
#, c-format
msgid "unable to get type of object %s"
msgstr "Konnte Art von Objekt '%s' nicht bestimmen."
#: commit-graph.c:1301
msgid "Loading known commits in commit graph"
msgstr "Lade bekannte Commits in Commit-Graph"
#: commit-graph.c:1318
msgid "Expanding reachable commits in commit graph"
msgstr "Erweitere erreichbare Commits in Commit-Graph"
#: commit-graph.c:1338
msgid "Clearing commit marks in commit graph"
msgstr "Lösche Commit-Markierungen in Commit-Graph"
#: commit-graph.c:1357
msgid "Computing commit graph generation numbers"
msgstr "Commit-Graph Generationsnummern berechnen"
#: commit-graph.c:1424
msgid "Computing commit changed paths Bloom filters"
msgstr "Berechnung der Bloom-Filter für veränderte Pfade des Commits"
#: commit-graph.c:1501
msgid "Collecting referenced commits"
msgstr "Sammle referenzierte Commits"
#: commit-graph.c:1526
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "Suche Commits für Commit-Graph in %d Paket"
msgstr[1] "Suche Commits für Commit-Graph in %d Paketen"
#: commit-graph.c:1539
#, c-format
msgid "error adding pack %s"
msgstr "Fehler beim Hinzufügen von Paket %s."
#: commit-graph.c:1543
#, c-format
msgid "error opening index for %s"
msgstr "Fehler beim Öffnen des Index für %s."
#: commit-graph.c:1582
msgid "Finding commits for commit graph among packed objects"
msgstr "Suche Commits für Commit-Graph in gepackten Objekten"
#: commit-graph.c:1597
msgid "Counting distinct commits in commit graph"
msgstr "Zähle Commits in Commit-Graph"
#: commit-graph.c:1629
msgid "Finding extra edges in commit graph"
msgstr "Suche zusätzliche Ränder in Commit-Graph"
#: commit-graph.c:1678
msgid "failed to write correct number of base graph ids"
msgstr "Fehler beim Schreiben der korrekten Anzahl von Basis-Graph-IDs."
#: commit-graph.c:1720 midx.c:826
#, c-format
msgid "unable to create leading directories of %s"
msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
#: commit-graph.c:1733
msgid "unable to create temporary graph layer"
msgstr "konnte temporäre Graphen-Schicht nicht erstellen"
#: commit-graph.c:1738
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "konnte geteilte Zugriffsberechtigungen für '%s' nicht ändern"
#: commit-graph.c:1808
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Schreibe Commit-Graph in %d Durchgang"
msgstr[1] "Schreibe Commit-Graph in %d Durchgängen"
#: commit-graph.c:1853
msgid "unable to open commit-graph chain file"
msgstr "Konnte Commit-Graph Chain-Datei nicht öffnen."
#: commit-graph.c:1869
msgid "failed to rename base commit-graph file"
msgstr "Konnte Basis-Commit-Graph-Datei nicht umbenennen."
#: commit-graph.c:1889
msgid "failed to rename temporary commit-graph file"
msgstr "Konnte temporäre Commit-Graph-Datei nicht umbenennen."
#: commit-graph.c:2015
msgid "Scanning merged commits"
msgstr "Durchsuche zusammengeführte Commits"
#: commit-graph.c:2026
#, c-format
msgid "unexpected duplicate commit id %s"
msgstr "Unerwartete doppelte Commit-ID %s"
#: commit-graph.c:2049
msgid "Merging commit-graph"
msgstr "Zusammenführen von Commit-Graph"
#: commit-graph.c:2259
#, c-format
msgid "the commit graph format cannot write %d commits"
msgstr "Das Commit-Graph Format kann nicht %d Commits schreiben."
#: commit-graph.c:2270
msgid "too many commits to write graph"
msgstr "Zu viele Commits zum Schreiben des Graphen."
#: commit-graph.c:2363
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"Die Commit-Graph-Datei hat eine falsche Prüfsumme und ist wahrscheinlich "
"beschädigt."
#: commit-graph.c:2373
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "Commit-Graph hat fehlerhafte OID-Reihenfolge: %s dann %s"
#: commit-graph.c:2383 commit-graph.c:2398
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "Commit-Graph hat fehlerhaften Fanout-Wert: fanout[%d] = %u != %u"
#: commit-graph.c:2390
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "Konnte Commit %s von Commit-Graph nicht parsen."
#: commit-graph.c:2408
msgid "Verifying commits in commit graph"
msgstr "Commit in Commit-Graph überprüfen"
#: commit-graph.c:2423
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"Fehler beim Parsen des Commits %s von Objekt-Datenbank für Commit-Graph"
#: commit-graph.c:2430
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
"OID des Wurzelverzeichnisses für Commit %s in Commit-Graph ist %s != %s"
#: commit-graph.c:2440
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "Commit-Graph Vorgänger-Liste für Commit %s ist zu lang"
#: commit-graph.c:2449
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "Commit-Graph-Vorgänger für %s ist %s != %s"
#: commit-graph.c:2463
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "Commit-Graph Vorgänger-Liste für Commit %s endet zu früh"
#: commit-graph.c:2468
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
"Commit-Graph hat Generationsnummer null für Commit %s, aber sonst ungleich "
"null"
#: commit-graph.c:2472
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
"Commit-Graph hat Generationsnummer ungleich null für Commit %s, aber sonst "
"null"
#: commit-graph.c:2488
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
msgstr "Commit-Graph Erstellung für Commit %s ist %u != %u"
#: commit-graph.c:2494
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"Commit-Datum für Commit %s in Commit-Graph ist %<PRIuMAX> != %<PRIuMAX>"
#: 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 "konnte %s nicht parsen"
#: commit.c:54
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s ist kein Commit!"
#: 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 ""
"Die Unterstützung für <GIT_DIR>/info/grafts ist veraltet\n"
"und wird in zukünftigen Git Versionen entfernt.\n"
"\n"
"Bitte benutzen Sie \"git replace --convert-graft-file\"\n"
"zum Konvertieren der künstlichen Vorgänger (\"grafts\")\n"
"in ersetzende Referenzen.<\n"
"\n"
"Sie können diese Meldung unterdrücken, indem Sie\n"
"\"git config advice.graftFileDeprecated false\" ausführen."
#: commit.c:1172
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Commit %s hat eine nicht vertrauenswürdige GPG-Signatur, angeblich von %s."
#: commit.c:1176
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Commit %s hat eine ungültige GPG-Signatur, angeblich von %s."
#: commit.c:1179
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Commit %s hat keine GPG-Signatur."
#: commit.c:1182
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Commit %s hat eine gültige GPG-Signatur von %s\n"
#: 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 ""
"Warnung: Die Commit-Beschreibung ist nicht UTF-8 konform.\n"
"Sie können das nachbessern, nachdem Sie die Beschreibung korrigiert haben,\n"
"oder Sie setzen die Konfigurationsvariable i18n.commitencoding auf das "
"Encoding,\n"
"welches von ihrem Projekt verwendet wird.\n"
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "Speicher verbraucht"
#: config.c:125
#, 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 ""
"Maximale Include-Tiefe (%d) beim Einbinden von\n"
"\t%s\n"
"von\n"
"\t%s\n"
"überschritten.\n"
"Das könnte durch zirkulare Includes entstanden sein."
#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "Konnte Include-Pfad '%s' nicht erweitern."
#: config.c:152
msgid "relative config includes must come from files"
msgstr "Relative Includes von Konfigurationen müssen aus Dateien kommen."
#: config.c:198
msgid "relative config include conditionals must come from files"
msgstr ""
"Bedingungen für das Einbinden von Konfigurationen aus relativen Pfaden "
"müssen\n"
"aus Dateien kommen."
#: config.c:378
#, c-format
msgid "key does not contain a section: %s"
msgstr "Schlüssel enthält keine Sektion: %s"
#: config.c:384
#, c-format
msgid "key does not contain variable name: %s"
msgstr "Schlüssel enthält keinen Variablennamen: %s"
#: config.c:408 sequencer.c:2547
#, c-format
msgid "invalid key: %s"
msgstr "Ungültiger Schlüssel: %s"
#: config.c:414
#, c-format
msgid "invalid key (newline): %s"
msgstr "Ungültiger Schlüssel (neue Zeile): %s"
#: config.c:450 config.c:462
#, c-format
msgid "bogus config parameter: %s"
msgstr "Fehlerhafter Konfigurationsparameter: %s"
#: config.c:497
#, c-format
msgid "bogus format in %s"
msgstr "Fehlerhaftes Format in %s"
#: config.c:836
#, c-format
msgid "bad config line %d in blob %s"
msgstr "Ungültige Konfigurationszeile %d in Blob %s"
#: config.c:840
#, c-format
msgid "bad config line %d in file %s"
msgstr "Ungültige Konfigurationszeile %d in Datei %s"
#: config.c:844
#, c-format
msgid "bad config line %d in standard input"
msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe"
#: config.c:848
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "Ungültige Konfigurationszeile %d in Submodul-Blob %s"
#: config.c:852
#, c-format
msgid "bad config line %d in command line %s"
msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s"
#: config.c:856
#, c-format
msgid "bad config line %d in %s"
msgstr "Ungültige Konfigurationszeile %d in %s"
#: config.c:993
msgid "out of range"
msgstr "Außerhalb des Bereichs"
#: config.c:993
msgid "invalid unit"
msgstr "Ungültige Einheit"
#: config.c:994
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s"
#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Blob %s: %s"
#: config.c:1016
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Datei %s: %s"
#: config.c:1019
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Standard-Eingabe: "
"%s"
#: config.c:1022
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Submodul-Blob %s: "
"%s"
#: config.c:1025
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Befehlszeile %s: "
"%s"
#: config.c:1028
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in %s: %s"
#: config.c:1123
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'"
#: config.c:1132
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' ist kein gültiger Zeitstempel für '%s'"
#: config.c:1223
#, c-format
msgid "abbrev length out of range: %d"
msgstr "Länge für Abkürzung von Commit-IDs außerhalb des Bereichs: %d"
#: config.c:1237 config.c:1248
#, c-format
msgid "bad zlib compression level %d"
msgstr "ungültiger zlib Komprimierungsgrad %d"
#: config.c:1340
msgid "core.commentChar should only be one character"
msgstr "core.commentChar sollte nur ein Zeichen sein"
#: config.c:1373
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "Ungültiger Modus für Objekterstellung: %s"
#: config.c:1445
#, c-format
msgid "malformed value for %s"
msgstr "Ungültiger Wert für %s."
#: config.c:1471
#, c-format
msgid "malformed value for %s: %s"
msgstr "Ungültiger Wert für %s: %s"
#: config.c:1472
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
"Muss einer von diesen sein: nothing, matching, simple, upstream, current"
#: config.c:1533 builtin/pack-objects.c:3649
#, c-format
msgid "bad pack compression level %d"
msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung"
#: config.c:1655
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "Konnte Blob-Objekt '%s' für Konfiguration nicht laden."
#: config.c:1658
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "Referenz '%s' zeigt auf keinen Blob."
#: config.c:1675
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "Konnte Blob '%s' für Konfiguration nicht auflösen."
#: config.c:1705
#, c-format
msgid "failed to parse %s"
msgstr "Fehler beim Parsen von %s."
#: config.c:1759
msgid "unable to parse command-line config"
msgstr ""
"Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
#: config.c:2122
msgid "unknown error occurred while reading the configuration files"
msgstr ""
"Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
#: config.c:2296
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Ungültiger %s: '%s'"
#: config.c:2341
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"Der Wert '%d' von splitIndex.maxPercentChange sollte zwischen 0 und 100 "
"liegen."
#: config.c:2387
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
"Konnte Wert '%s' aus der über die Befehlszeile angegebenen Konfiguration\n"
"nicht parsen."
#: config.c:2389
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d"
#: config.c:2470
#, c-format
msgid "invalid section name '%s'"
msgstr "Ungültiger Sektionsname '%s'"
#: config.c:2502
#, c-format
msgid "%s has multiple values"
msgstr "%s hat mehrere Werte"
#: config.c:2531
#, c-format
msgid "failed to write new configuration file %s"
msgstr "Konnte neue Konfigurationsdatei '%s' nicht schreiben."
#: config.c:2783 config.c:3107
#, c-format
msgid "could not lock config file %s"
msgstr "Konnte Konfigurationsdatei '%s' nicht sperren."
#: config.c:2794
#, c-format
msgid "opening %s"
msgstr "Öffne %s"
#: config.c:2829 builtin/config.c:354
#, c-format
msgid "invalid pattern: %s"
msgstr "Ungültiges Muster: %s"
#: config.c:2854
#, c-format
msgid "invalid config file %s"
msgstr "Ungültige Konfigurationsdatei %s"
#: config.c:2867 config.c:3120
#, c-format
msgid "fstat on %s failed"
msgstr "fstat auf %s fehlgeschlagen"
#: config.c:2878
#, c-format
msgid "unable to mmap '%s'"
msgstr "mmap für '%s' fehlgeschlagen"
#: config.c:2887 config.c:3125
#, c-format
msgid "chmod on %s failed"
msgstr "chmod auf %s fehlgeschlagen"
#: config.c:2972 config.c:3222
#, c-format
msgid "could not write config file %s"
msgstr "Konnte Konfigurationsdatei %s nicht schreiben."
#: config.c:3006
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "Konnte '%s' nicht zu '%s' setzen."
#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858
#, c-format
msgid "could not unset '%s'"
msgstr "Konnte '%s' nicht aufheben."
#: config.c:3098
#, c-format
msgid "invalid section name: %s"
msgstr "Ungültiger Sektionsname: %s"
#: config.c:3265
#, c-format
msgid "missing value for '%s'"
msgstr "Fehlender Wert für '%s'"
#: connect.c:61
msgid "the remote end hung up upon initial contact"
msgstr "Die Gegenseite hat nach dem ersten Kontakt abgebrochen."
#: 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 ""
"Konnte nicht vom Remote-Repository lesen.\n"
"\n"
"Bitte stellen Sie sicher, dass die korrekten Zugriffsberechtigungen "
"bestehen\n"
"und das Repository existiert."
#: connect.c:81
#, c-format
msgid "server doesn't support '%s'"
msgstr "Der Server unterstützt kein '%s'."
#: connect.c:118
#, c-format
msgid "server doesn't support feature '%s'"
msgstr "Der Server unterstützt das Feature '%s' nicht."
#: connect.c:129
msgid "expected flush after capabilities"
msgstr "Erwartete Flush nach Fähigkeiten."
#: connect.c:263
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "Ignoriere Fähigkeiten nach der ersten Zeile '%s'."
#: connect.c:284
msgid "protocol error: unexpected capabilities^{}"
msgstr "Protokollfehler: unerwartetes capabilities^{}"
#: connect.c:306
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "Protokollfehler: shallow SHA-1 erwartet, '%s' bekommen"
#: connect.c:308
msgid "repository on the other end cannot be shallow"
msgstr ""
"Repository auf der Gegenseite kann keine unvollständige Historie (shallow) "
"enthalten"
#: connect.c:347
msgid "invalid packet"
msgstr "ungültiges Paket"
#: connect.c:367
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "Protokollfehler: unerwartetes '%s'"
#: connect.c:473
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "unbekanntes Objekt-Format '%s' vom Server angegeben"
#: connect.c:500
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "ungültige ls-refs Antwort: %s"
#: connect.c:504
msgid "expected flush after ref listing"
msgstr "Flush nach Auflistung der Referenzen erwartet"
#: connect.c:507
msgid "expected response end packet after ref listing"
msgstr "Antwort-Endpaket nach Auflistung der Referenzen erwartet"
#: connect.c:640
#, c-format
msgid "protocol '%s' is not supported"
msgstr "Protokoll '%s' wird nicht unterstützt"
#: connect.c:691
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "kann SO_KEEPALIVE bei Socket nicht setzen"
#: connect.c:731 connect.c:794
#, c-format
msgid "Looking up %s ... "
msgstr "Suche nach %s ..."
#: connect.c:735
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "Fehler bei Suche nach %s (Port %s) (%s)."
#. TRANSLATORS: this is the end of "Looking up %s ... "
#: connect.c:739 connect.c:810
#, c-format
msgid ""
"done.\n"
"Connecting to %s (port %s) ... "
msgstr ""
"Fertig.\n"
"Verbinde nach %s (Port %s) ... "
#: connect.c:761 connect.c:838
#, c-format
msgid ""
"unable to connect to %s:\n"
"%s"
msgstr ""
"Konnte nicht nach %s verbinden:\n"
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
#: connect.c:767 connect.c:844
msgid "done."
msgstr "Fertig."
#: connect.c:798
#, c-format
msgid "unable to look up %s (%s)"
msgstr "Fehler bei der Suche nach %s (%s)"
#: connect.c:804
#, c-format
msgid "unknown port %s"
msgstr "Unbekannter Port %s"
#: connect.c:941 connect.c:1271
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "Merkwürdigen Hostnamen '%s' blockiert."
#: connect.c:943
#, c-format
msgid "strange port '%s' blocked"
msgstr "Merkwürdigen Port '%s' blockiert."
#: connect.c:953
#, c-format
msgid "cannot start proxy %s"
msgstr "Kann Proxy %s nicht starten."
#: connect.c:1024
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
"Kein Pfad angegeben; siehe 'git help pull' für eine gültige URL-Syntax."
#: connect.c:1219
msgid "ssh variant 'simple' does not support -4"
msgstr "SSH-Variante 'simple' unterstützt kein -4."
#: connect.c:1231
msgid "ssh variant 'simple' does not support -6"
msgstr "SSH-Variante 'simple' unterstützt kein -6."
#: connect.c:1248
msgid "ssh variant 'simple' does not support setting port"
msgstr "SSH-Variante 'simple' unterstützt nicht das Setzen eines Ports."
#: connect.c:1360
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "Merkwürdigen Pfadnamen '%s' blockiert."
#: connect.c:1408
msgid "unable to fork"
msgstr "Kann Prozess nicht starten."
#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Prüfe Konnektivität"
#: connected.c:120
msgid "Could not run 'git rev-list'"
msgstr "Konnte 'git rev-list' nicht ausführen"
#: connected.c:144
msgid "failed write to rev-list"
msgstr "Fehler beim Schreiben nach rev-list"
#: connected.c:149
msgid "failed to close rev-list's stdin"
msgstr "Fehler beim Schließen von rev-lists Standard-Eingabe"
#: convert.c:194
#, c-format
msgid "illegal crlf_action %d"
msgstr "Unerlaubte crlf_action %d"
#: convert.c:207
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr "CRLF würde in %s durch LF ersetzt werden."
#: convert.c:209
#, 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 ""
"CRLF wird in %s durch LF ersetzt.\n"
"Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis "
"behalten."
#: convert.c:217
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr "LF würde in %s durch CRLF ersetzt werden."
#: convert.c:219
#, 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 ""
"LF wird in %s durch CRLF ersetzt.\n"
"Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis "
"behalten."
#: convert.c:284
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr "BOM ist in '%s' unzulässig, wenn als %s codiert."
#: convert.c:291
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
"working-tree-encoding."
msgstr ""
"Die Datei '%s' enthält ein Byte-Order-Mark (BOM). Bitte benutzen Sie\n"
"UTF-%.*s als Codierung im Arbeitsverzeichnis."
#: convert.c:304
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr "BOM ist erforderlich in '%s', wenn als %s codiert."
#: 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 ""
"Der Datei '%s' fehlt ein Byte-Order-Mark (BOM). Bitte benutzen Sie UTF-%sBE\n"
"oder UTF-%sLE (abhängig von der Byte-Reihenfolge) als Codierung im\n"
"Arbeitsverzeichnis."
#: convert.c:419 convert.c:490
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr "Fehler beim Codieren von '%s' von %s nach %s."
#: convert.c:462
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr "Die Codierung '%s' von %s nach %s und zurück ist nicht dasselbe."
#: convert.c:665
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr "Kann externen Filter '%s' nicht starten."
#: convert.c:685
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr "Kann Eingaben nicht an externen Filter '%s' übergeben."
#: convert.c:692
#, c-format
msgid "external filter '%s' failed %d"
msgstr "Externer Filter '%s' fehlgeschlagen %d"
#: convert.c:727 convert.c:730
#, c-format
msgid "read from external filter '%s' failed"
msgstr "Lesen von externem Filter '%s' fehlgeschlagen."
#: convert.c:733 convert.c:788
#, c-format
msgid "external filter '%s' failed"
msgstr "Externer Filter '%s' fehlgeschlagen."
#: convert.c:837
msgid "unexpected filter type"
msgstr "Unerwartete Filterart."
#: convert.c:848
msgid "path name too long for external filter"
msgstr "Pfadname zu lang für externen Filter."
#: convert.c:940
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
"been filtered"
msgstr ""
"Externer Filter '%s' nicht mehr verfügbar. Nicht alle Pfade wurden gefiltert."
#: convert.c:1240
msgid "true/false are no valid working-tree-encodings"
msgstr "true/false sind keine gültigen Codierungen im Arbeitsverzeichnis."
#: convert.c:1428 convert.c:1462
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s: clean-Filter '%s' fehlgeschlagen."
#: convert.c:1508
#, c-format
msgid "%s: smudge filter %s failed"
msgstr "%s: smudge-Filter '%s' fehlgeschlagen."
#: credential.c:96
#, c-format
msgid "skipping credential lookup for key: credential.%s"
msgstr "überspringe Suche nach Zugangsdaten für Schlüssel: credential.%s"
#: credential.c:112
msgid "refusing to work with credential missing host field"
msgstr "Weigerung, mit fehlendem Hostnamen in Zugangsdaten zu arbeiten"
#: credential.c:114
msgid "refusing to work with credential missing protocol field"
msgstr "Weigerung, mit fehlendem Protokoll in Zugangsdaten zu arbeiten"
#: credential.c:394
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "URL enthält Zeilenumbruch in der %s Komponente: %s"
#: credential.c:438
#, c-format
msgid "url has no scheme: %s"
msgstr "URL hat kein Schema: %s"
#: credential.c:511
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "URL mit Zugangsdaten konnte nicht geparst werden: %s"
#: date.c:138
msgid "in the future"
msgstr "in der Zukunft"
#: date.c:144
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "vor %<PRIuMAX> Sekunde"
msgstr[1] "vor %<PRIuMAX> Sekunden"
#: date.c:151
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "vor %<PRIuMAX> Minute"
msgstr[1] "vor %<PRIuMAX> Minuten"
#: date.c:158
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "vor %<PRIuMAX> Stunde"
msgstr[1] "vor %<PRIuMAX> Stunden"
#: date.c:165
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "vor %<PRIuMAX> Tag"
msgstr[1] "vor %<PRIuMAX> Tagen"
#: date.c:171
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "vor %<PRIuMAX> Woche"
msgstr[1] "vor %<PRIuMAX> Wochen"
#: date.c:178
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "vor %<PRIuMAX> Monat"
msgstr[1] "vor %<PRIuMAX> Monaten"
#: date.c:189
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
msgstr[0] "vor %<PRIuMAX> Jahr"
msgstr[1] "vor %<PRIuMAX> Jahren"
#. TRANSLATORS: "%s" is "<n> years"
#: date.c:192
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "%s, und %<PRIuMAX> Monat"
msgstr[1] "%s, und %<PRIuMAX> Monaten"
#: date.c:197 date.c:202
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgstr[0] "vor %<PRIuMAX> Jahr"
msgstr[1] "vor %<PRIuMAX> Jahren"
#: delta-islands.c:272
msgid "Propagating island marks"
msgstr "Erzeuge Delta-Island Markierungen"
#: delta-islands.c:290
#, c-format
msgid "bad tree object %s"
msgstr "Ungültiges Tree-Objekt %s."
#: delta-islands.c:334
#, c-format
msgid "failed to load island regex for '%s': %s"
msgstr ""
"Fehler beim Laden des regulären Ausdrucks des Delta-Island für '%s': %s"
#: delta-islands.c:390
#, c-format
msgid "island regex from config has too many capture groups (max=%d)"
msgstr ""
"Regulärer Ausdruck des Delta-Island aus Konfiguration hat zu\n"
"viele Capture-Gruppen (maximal %d)."
#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "%d Delta-Islands markiert, fertig.\n"
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
msgstr "git diff --no-index [<Optionen>] <Pfad> <Pfad>"
#: diff-no-index.c:263
msgid ""
"Not a git repository. Use --no-index to compare two paths outside a working "
"tree"
msgstr ""
"Kein Git-Repository. Nutzen Sie --no-index, um zwei Pfade außerhalb des "
"Arbeitsverzeichnisses zu vergleichen."
#: diff.c:156
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n"
#: diff.c:161
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Unbekannter \"dirstat\" Parameter '%s'\n"
#: diff.c:297
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
msgstr ""
"\"color moved\"-Einstellung muss eines von diesen sein: 'no', 'default', "
"'blocks', 'zebra', 'dimmed_zebra', 'plain'"
#: diff.c:325
#, 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 ""
"Unbekannter color-moved-ws Modus '%s', mögliche Werte sind 'ignore-space-"
"change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-identation-change'"
#: diff.c:333
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
msgstr ""
"color-moved-ws: allow-indentation-change kann nicht mit anderen\n"
"Whitespace-Modi kombiniert werden."
#: diff.c:410
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'"
#: diff.c:470
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
"Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
"%s"
#: diff.c:4269
#, c-format
msgid "external diff died, stopping at %s"
msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
#: diff.c:4618
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
"--name-only, --name-status, --check und -s schließen sich gegenseitig aus"
#: diff.c:4621
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S und --find-object schließen sich gegenseitig aus"
#: diff.c:4699
msgid "--follow requires exactly one pathspec"
msgstr "--follow erfordert genau eine Pfadspezifikation"
#: diff.c:4747
#, c-format
msgid "invalid --stat value: %s"
msgstr "Ungültiger --stat Wert: %s"
#: 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
#, c-format
msgid "%s expects a numerical value"
msgstr "%s erwartet einen numerischen Wert."
#: diff.c:4784
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
"Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
"%s"
#: diff.c:4869
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "Unbekannte Änderungsklasse '%c' in --diff-filter=%s"
#: diff.c:4893
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "Unbekannter Wert nach ws-error-highlight=%.*s"
#: diff.c:4907
#, c-format
msgid "unable to resolve '%s'"
msgstr "konnte '%s' nicht auflösen"
#: diff.c:4957 diff.c:4963
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s erwartet die Form <n>/<m>"
#: diff.c:4975
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s erwartet ein Zeichen, '%s' bekommen"
#: diff.c:4996
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "Ungültiges --color-moved Argument: %s"
#: diff.c:5015
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "Ungültiger Modus '%s' in --color-moved-ws"
#: diff.c:5055
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
"Option diff-algorithm akzeptiert: \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
#: diff.c:5091 diff.c:5111
#, c-format
msgid "invalid argument to %s"
msgstr "Ungültiges Argument für %s"
#: diff.c:5248
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
#: diff.c:5304
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "Ungültiges --word-diff Argument: %s"
#: diff.c:5327
msgid "Diff output format options"
msgstr "Diff-Optionen zu Ausgabeformaten"
#: diff.c:5329 diff.c:5335
msgid "generate patch"
msgstr "Erzeuge Patch"
#: diff.c:5332 builtin/log.c:176
msgid "suppress diff output"
msgstr "Ausgabe der Unterschiede unterdrücken"
#: diff.c:5337 diff.c:5451 diff.c:5458
msgid "<n>"
msgstr "<n>"
#: diff.c:5338 diff.c:5341
msgid "generate diffs with <n> lines context"
msgstr "Erstelle Unterschiede mit <n> Zeilen des Kontextes"
#: diff.c:5343
msgid "generate the diff in raw format"
msgstr "Erstelle Unterschiede im Rohformat"
#: diff.c:5346
msgid "synonym for '-p --raw'"
msgstr "Synonym für '-p --raw'"
#: diff.c:5350
msgid "synonym for '-p --stat'"
msgstr "Synonym für '-p --stat'"
#: diff.c:5354
msgid "machine friendly --stat"
msgstr "maschinenlesbare Ausgabe von --stat"
#: diff.c:5357
msgid "output only the last line of --stat"
msgstr "nur die letzte Zeile von --stat ausgeben"
#: diff.c:5359 diff.c:5367
msgid "<param1,param2>..."
msgstr "<Parameter1,Parameter2>..."
#: diff.c:5360
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"Gebe die Verteilung des relativen Umfangs der Änderungen für jedes "
"Unterverzeichnis aus"
#: diff.c:5364
msgid "synonym for --dirstat=cumulative"
msgstr "Synonym für --dirstat=cumulative"
#: diff.c:5368
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "Synonym für --dirstat=files,Parameter1,Parameter2..."
#: diff.c:5372
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"Warnen, wenn Änderungen Konfliktmarker oder Whitespace-Fehler einbringen"
#: diff.c:5375
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"Gekürzte Zusammenfassung, wie z.B. Erstellungen, Umbenennungen und "
"Änderungen der Datei-Rechte"
#: diff.c:5378
msgid "show only names of changed files"
msgstr "nur Dateinamen der geänderten Dateien anzeigen"
#: diff.c:5381
msgid "show only names and status of changed files"
msgstr "nur Dateinamen und Status der geänderten Dateien anzeigen"
#: diff.c:5383
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<Breite>[,<Namens-Breite>[,<Anzahl>]]"
#: diff.c:5384
msgid "generate diffstat"
msgstr "Generiere Zusammenfassung der Unterschiede"
#: diff.c:5386 diff.c:5389 diff.c:5392
msgid "<width>"
msgstr "<Breite>"
#: diff.c:5387
msgid "generate diffstat with a given width"
msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Breite"
#: diff.c:5390
msgid "generate diffstat with a given name width"
msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Namens-Breite"
#: diff.c:5393
msgid "generate diffstat with a given graph width"
msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Graph-Breite"
#: diff.c:5395
msgid "<count>"
msgstr "<Anzahl>"
#: diff.c:5396
msgid "generate diffstat with limited lines"
msgstr "Erzeuge Zusammenfassung der Unterschiede mit begrenzten Zeilen"
#: diff.c:5399
msgid "generate compact summary in diffstat"
msgstr "Erzeuge kompakte Zusammenstellung in Zusammenfassung der Unterschiede"
#: diff.c:5402
msgid "output a binary diff that can be applied"
msgstr "Gebe eine binäre Differenz aus, dass angewendet werden kann"
#: diff.c:5405
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "Zeige vollständige Objekt-Namen in den \"index\"-Zeilen"
#: diff.c:5407
msgid "show colored diff"
msgstr "Zeige farbige Unterschiede"
#: diff.c:5408
msgid "<kind>"
msgstr "<Art>"
#: diff.c:5409
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
"Hebe Whitespace-Fehler in den Zeilen 'context', 'old' oder 'new' bei den "
"Unterschieden hervor"
#: diff.c:5412
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgstr ""
"Verschleiere nicht die Pfadnamen und nutze NUL-Zeichen als Schlusszeichen in "
"Ausgabefeldern bei --raw oder --numstat"
#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527
msgid "<prefix>"
msgstr "<Präfix>"
#: diff.c:5416
msgid "show the given source prefix instead of \"a/\""
msgstr "Zeige den gegebenen Quell-Präfix statt \"a/\""
#: diff.c:5419
msgid "show the given destination prefix instead of \"b/\""
msgstr "Zeige den gegebenen Ziel-Präfix statt \"b/\""
#: diff.c:5422
msgid "prepend an additional prefix to every line of output"
msgstr "Stelle einen zusätzlichen Präfix bei jeder Ausgabezeile voran"
#: diff.c:5425
msgid "do not show any source or destination prefix"
msgstr "Zeige keine Quell- oder Ziel-Präfixe an"
#: diff.c:5428
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"Zeige Kontext zwischen Unterschied-Blöcken bis zur angegebenen Anzahl von "
"Zeilen."
#: diff.c:5432 diff.c:5437 diff.c:5442
msgid "<char>"
msgstr "<Zeichen>"
#: diff.c:5433
msgid "specify the character to indicate a new line instead of '+'"
msgstr "Das Zeichen festlegen, das eine neue Zeile kennzeichnet (statt '+')"
#: diff.c:5438
msgid "specify the character to indicate an old line instead of '-'"
msgstr "Das Zeichen festlegen, das eine alte Zeile kennzeichnet (statt '-')"
#: diff.c:5443
msgid "specify the character to indicate a context instead of ' '"
msgstr "Das Zeichen festlegen, das den Kontext kennzeichnet (statt ' ')"
#: diff.c:5446
msgid "Diff rename options"
msgstr "Diff-Optionen zur Umbenennung"
#: diff.c:5447
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
#: diff.c:5448
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"Teile komplette Rewrite-Änderungen in Änderungen mit \"löschen\" und "
"\"erstellen\""
#: diff.c:5452
msgid "detect renames"
msgstr "Umbenennungen erkennen"
#: diff.c:5456
msgid "omit the preimage for deletes"
msgstr "Preimage für Löschungen weglassen."
#: diff.c:5459
msgid "detect copies"
msgstr "Kopien erkennen"
#: diff.c:5463
msgid "use unmodified files as source to find copies"
msgstr "Nutze ungeänderte Dateien als Quelle zum Finden von Kopien"
#: diff.c:5465
msgid "disable rename detection"
msgstr "Erkennung von Umbenennungen deaktivieren"
#: diff.c:5468
msgid "use empty blobs as rename source"
msgstr "Nutze leere Blobs als Quelle von Umbennungen"
#: diff.c:5470
msgid "continue listing the history of a file beyond renames"
msgstr "Fortführen der Auflistung der Historie einer Datei nach Umbennung"
#: diff.c:5473
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
"Verhindere die Erkennung von Umbennungen und Kopien, wenn die Anzahl der "
"Ziele für Umbennungen und Kopien das gegebene Limit überschreitet"
#: diff.c:5475
msgid "Diff algorithm options"
msgstr "Diff Algorithmus-Optionen"
#: diff.c:5477
msgid "produce the smallest possible diff"
msgstr "Erzeuge die kleinstmöglichen Änderungen"
#: diff.c:5480
msgid "ignore whitespace when comparing lines"
msgstr "Whitespace-Änderungen beim Vergleich von Zeilen ignorieren"
#: diff.c:5483
msgid "ignore changes in amount of whitespace"
msgstr "Änderungen bei der Anzahl von Whitespace ignorieren"
#: diff.c:5486
msgid "ignore changes in whitespace at EOL"
msgstr "Whitespace-Änderungen am Zeilenende ignorieren"
#: diff.c:5489
msgid "ignore carrier-return at the end of line"
msgstr "Ignoriere den Zeilenumbruch am Ende der Zeile"
#: diff.c:5492
msgid "ignore changes whose lines are all blank"
msgstr "Ignoriere Änderungen in leeren Zeilen"
#: diff.c:5495
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"Heuristik, um Grenzen der Änderungsblöcke für bessere Lesbarkeit zu "
"verschieben"
#: diff.c:5498
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Patience Diff\""
#: diff.c:5502
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Histogram Diff\""
#: diff.c:5504
msgid "<algorithm>"
msgstr "<Algorithmus>"
#: diff.c:5505
msgid "choose a diff algorithm"
msgstr "Ein Algorithmus für Änderungen wählen"
#: diff.c:5507
msgid "<text>"
msgstr "<Text>"
#: diff.c:5508
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Anchored Diff\""
#: diff.c:5510 diff.c:5519 diff.c:5522
msgid "<mode>"
msgstr "<Modus>"
#: diff.c:5511
msgid "show word diff, using <mode> to delimit changed words"
msgstr "Zeige Wort-Änderungen, nutze <Modus>, um Wörter abzugrenzen"
#: diff.c:5513 diff.c:5516 diff.c:5561
msgid "<regex>"
msgstr "<Regex>"
#: diff.c:5514
msgid "use <regex> to decide what a word is"
msgstr "Nutze <Regex>, um zu entscheiden, was ein Wort ist"
#: diff.c:5517
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "Entsprechend wie --word-diff=color --word-diff-regex=<Regex>"
#: diff.c:5520
msgid "moved lines of code are colored differently"
msgstr "Verschobene Codezeilen sind andersfarbig"
#: diff.c:5523
msgid "how white spaces are ignored in --color-moved"
msgstr "Wie Whitespaces in --color-moved ignoriert werden"
#: diff.c:5526
msgid "Other diff options"
msgstr "Andere Diff-Optionen"
#: diff.c:5528
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"Wenn vom Unterverzeichnis aufgerufen, schließe Änderungen außerhalb aus und "
"zeige relative Pfade an"
#: diff.c:5532
msgid "treat all files as text"
msgstr "alle Dateien als Text behandeln"
#: diff.c:5534
msgid "swap two inputs, reverse the diff"
msgstr "Vertausche die beiden Eingaben und drehe die Änderungen um"
#: diff.c:5536
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
"Beende mit Exit-Status 1, wenn Änderungen vorhanden sind, andernfalls mit 0"
#: diff.c:5538
msgid "disable all output of the program"
msgstr "Keine Ausgaben vom Programm"
#: diff.c:5540
msgid "allow an external diff helper to be executed"
msgstr "Erlaube die Ausführung eines externes Programms für Änderungen"
#: diff.c:5542
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"Führe externe Text-Konvertierungsfilter aus, wenn binäre Dateien vergleicht "
"werden"
#: diff.c:5544
msgid "<when>"
msgstr "<wann>"
#: diff.c:5545
msgid "ignore changes to submodules in the diff generation"
msgstr ""
"Änderungen in Submodulen während der Erstellung der Unterschiede ignorieren"
#: diff.c:5548
msgid "<format>"
msgstr "<Format>"
#: diff.c:5549
msgid "specify how differences in submodules are shown"
msgstr "Angeben, wie Unterschiede in Submodulen gezeigt werden"
#: diff.c:5553
msgid "hide 'git add -N' entries from the index"
msgstr "verstecke 'git add -N' Einträge vom Index"
#: diff.c:5556
msgid "treat 'git add -N' entries as real in the index"
msgstr "Behandle 'git add -N' Einträge im Index als echt"
#: diff.c:5558
msgid "<string>"
msgstr "<Zeichenkette>"
#: diff.c:5559
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr ""
"Suche nach Unterschieden, welche die Anzahl des Vorkommens der angegebenen "
"Zeichenkette verändern"
#: diff.c:5562
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr ""
"Suche nach Unterschieden, welche die Anzahl des Vorkommens des angegebenen "
"regulären Ausdrucks verändern"
#: diff.c:5565
msgid "show all changes in the changeset with -S or -G"
msgstr "zeige alle Änderungen im Changeset mit -S oder -G"
#: diff.c:5568
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
"behandle <Zeichenkette> bei -S als erweiterten POSIX regulären Ausdruck"
#: diff.c:5571
msgid "control the order in which files appear in the output"
msgstr ""
"kontrolliere die Reihenfolge, in der die Dateien in der Ausgabe erscheinen"
#: diff.c:5572
msgid "<object-id>"
msgstr "<Objekt-ID>"
#: diff.c:5573
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr ""
"Suche nach Unterschieden, welche die Anzahl des Vorkommens des angegebenen "
"Objektes verändern"
#: diff.c:5575
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
#: diff.c:5576
msgid "select files by diff type"
msgstr "Wähle Dateien anhand der Art der Änderung"
#: diff.c:5578
msgid "<file>"
msgstr "<Datei>"
#: diff.c:5579
msgid "Output to a specific file"
msgstr "Ausgabe zu einer bestimmten Datei"
#: diff.c:6236
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"Ungenaue Erkennung für Umbenennungen wurde aufgrund zu vieler Dateien\n"
"übersprungen."
#: diff.c:6239
msgid "only found copies from modified paths due to too many files."
msgstr "nur Kopien von geänderten Pfaden, aufgrund zu vieler Dateien, gefunden"
#: diff.c:6242
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
"Sie könnten die Variable %s auf mindestens %d setzen und den Befehl\n"
"erneut versuchen."
#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'."
#: diffcore-rename.c:592
msgid "Performing inexact rename detection"
msgstr "Führe Erkennung für ungenaue Umbenennung aus"
#: dir.c:578
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
"Pfadspezifikation '%s' stimmt mit keinen git-bekannten Dateien überein."
#: dir.c:718 dir.c:747 dir.c:760
#, c-format
msgid "unrecognized pattern: '%s'"
msgstr "Unbekanntes Muster: '%s'"
#: dir.c:777 dir.c:791
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "Unbekanntes verneinendes Muster: '%s'"
#: dir.c:809
#, c-format
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr ""
"Ihre Datei für den partiellen Checkout hat eventuell Probleme:\n"
"Muster '%s' wiederholt sich."
#: dir.c:819
msgid "disabling cone pattern matching"
msgstr "Deaktiviere Cone-Muster-Übereinstimmung"
#: dir.c:1198
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "Kann %s nicht als exclude-Filter benutzen."
#: dir.c:2305
#, c-format
msgid "could not open directory '%s'"
msgstr "Konnte Verzeichnis '%s' nicht öffnen."
#: dir.c:2605
msgid "failed to get kernel name and information"
msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
#: dir.c:2729
msgid "untracked cache is disabled on this system or location"
msgstr ""
"Cache für unversionierte Dateien ist auf diesem System oder\n"
"für dieses Verzeichnis deaktiviert."
#: dir.c:3520
#, c-format
msgid "index file corrupt in repo %s"
msgstr "Index-Datei in Repository %s beschädigt."
#: dir.c:3565 dir.c:3570
#, c-format
msgid "could not create directories for %s"
msgstr "Konnte Verzeichnisse für '%s' nicht erstellen."
#: dir.c:3599
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren."
#: editor.c:74
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "Hinweis: Warte auf das Schließen der Datei durch Ihren Editor...%c"
#: entry.c:177
msgid "Filtering content"
msgstr "Filtere Inhalt"
#: entry.c:478
#, c-format
msgid "could not stat file '%s'"
msgstr "Konnte Datei '%s' nicht lesen."
#: environment.c:150
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "Ungültiger Git-Namespace-Pfad \"%s\""
#: environment.c:337
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "Konnte GIT_DIR nicht zu '%s' setzen."
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "Zu viele Argumente angegeben, um %s auszuführen."
#: fetch-pack.c:176
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: erwartete shallow-Liste"
#: fetch-pack.c:179
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: erwartete ein Flush-Paket nach der shallow-Liste"
#: fetch-pack.c:190
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: ACK/NAK erwartet, Flush-Paket bekommen"
#: fetch-pack.c:210
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen"
#: fetch-pack.c:221
msgid "unable to write to remote"
msgstr "konnte nicht zum Remote schreiben"
#: fetch-pack.c:282
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc benötigt multi_ack_detailed"
#: fetch-pack.c:375 fetch-pack.c:1397
#, c-format
msgid "invalid shallow line: %s"
msgstr "Ungültige shallow-Zeile: %s"
#: fetch-pack.c:381 fetch-pack.c:1403
#, c-format
msgid "invalid unshallow line: %s"
msgstr "Ungültige unshallow-Zeile: %s"
#: fetch-pack.c:383 fetch-pack.c:1405
#, c-format
msgid "object not found: %s"
msgstr "Objekt nicht gefunden: %s"
#: fetch-pack.c:386 fetch-pack.c:1408
#, c-format
msgid "error in object: %s"
msgstr "Fehler in Objekt: %s"
#: fetch-pack.c:388 fetch-pack.c:1410
#, c-format
msgid "no shallow found: %s"
msgstr "Kein shallow-Objekt gefunden: %s"
#: fetch-pack.c:391 fetch-pack.c:1414
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "shallow/unshallow erwartet, %s bekommen"
#: fetch-pack.c:431
#, c-format
msgid "got %s %d %s"
msgstr "%s %d %s bekommen"
#: fetch-pack.c:448
#, c-format
msgid "invalid commit %s"
msgstr "Ungültiger Commit %s"
#: fetch-pack.c:479
msgid "giving up"
msgstr "Gebe auf"
#: fetch-pack.c:492 progress.c:339
msgid "done"
msgstr "Fertig"
#: fetch-pack.c:504
#, c-format
msgid "got %s (%d) %s"
msgstr "%s (%d) %s bekommen"
#: fetch-pack.c:540
#, c-format
msgid "Marking %s as complete"
msgstr "Markiere %s als vollständig"
#: fetch-pack.c:755
#, c-format
msgid "already have %s (%s)"
msgstr "habe %s (%s) bereits"
#: fetch-pack.c:824
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer"
#: fetch-pack.c:832
msgid "protocol error: bad pack header"
msgstr "Protokollfehler: ungültiger Pack-Header"
#: fetch-pack.c:916
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: konnte %s nicht starten"
#: fetch-pack.c:933
#, c-format
msgid "%s failed"
msgstr "%s fehlgeschlagen"
#: fetch-pack.c:935
msgid "error in sideband demultiplexer"
msgstr "Fehler in sideband demultiplexer"
#: fetch-pack.c:978
#, c-format
msgid "Server version is %.*s"
msgstr "Server-Version ist %.*s"
#: 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
#, c-format
msgid "Server supports %s"
msgstr "Server unterstützt %s"
#: fetch-pack.c:985
msgid "Server does not support shallow clients"
msgstr "Server unterstützt keine shallow-Clients"
#: fetch-pack.c:1045
msgid "Server does not support --shallow-since"
msgstr "Server unterstützt kein --shallow-since"
#: fetch-pack.c:1050
msgid "Server does not support --shallow-exclude"
msgstr "Server unterstützt kein --shallow-exclude"
#: fetch-pack.c:1054
msgid "Server does not support --deepen"
msgstr "Server unterstützt kein --deepen"
#: fetch-pack.c:1056
msgid "Server does not support this repository's object format"
msgstr "Server unterstützt das Objekt-Format dieses Repositories nicht"
#: fetch-pack.c:1069
msgid "no common commits"
msgstr "keine gemeinsamen Commits"
#: fetch-pack.c:1081 fetch-pack.c:1619
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: Abholen fehlgeschlagen."
#: fetch-pack.c:1205
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "Algorithmen stimmen nicht überein: Client %s; Server %s"
#: fetch-pack.c:1209
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "der Server unterstützt Algorithmus '%s' nicht"
#: fetch-pack.c:1229
msgid "Server does not support shallow requests"
msgstr "Server unterstützt keine shallow-Anfragen"
#: fetch-pack.c:1236
msgid "Server supports filter"
msgstr "Server unterstützt Filter"
#: fetch-pack.c:1275
msgid "unable to write request to remote"
msgstr "konnte Anfrage nicht zum Remote schreiben"
#: fetch-pack.c:1293
#, c-format
msgid "error reading section header '%s'"
msgstr "Fehler beim Lesen von Sektionskopf '%s'."
#: fetch-pack.c:1299
#, c-format
msgid "expected '%s', received '%s'"
msgstr "'%s' erwartet, '%s' empfangen"
#: fetch-pack.c:1360
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "Unerwartete Acknowledgment-Zeile: '%s'"
#: fetch-pack.c:1365
#, c-format
msgid "error processing acks: %d"
msgstr "Fehler beim Verarbeiten von ACKS: %d"
#: fetch-pack.c:1375
msgid "expected packfile to be sent after 'ready'"
msgstr "Erwartete Versand einer Packdatei nach 'ready'."
#: fetch-pack.c:1377
msgid "expected no other sections to be sent after no 'ready'"
msgstr "Erwartete keinen Versand einer anderen Sektion ohne 'ready'."
#: fetch-pack.c:1419
#, c-format
msgid "error processing shallow info: %d"
msgstr "Fehler beim Verarbeiten von Shallow-Informationen: %d"
#: fetch-pack.c:1466
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "wanted-ref erwartet, '%s' bekommen"
#: fetch-pack.c:1471
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "unerwartetes wanted-ref: '%s'"
#: fetch-pack.c:1476
#, c-format
msgid "error processing wanted refs: %d"
msgstr "Fehler beim Verarbeiten von wanted-refs: %d"
#: fetch-pack.c:1506
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: Antwort-Endpaket erwartet"
#: fetch-pack.c:1887
msgid "no matching remote head"
msgstr "kein übereinstimmender Remote-Branch"
#: fetch-pack.c:1910 builtin/clone.c:692
msgid "remote did not send all necessary objects"
msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet"
#: fetch-pack.c:1937
#, c-format
msgid "no such remote ref %s"
msgstr "keine solche Remote-Referenz %s"
#: fetch-pack.c:1940
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Der Server lehnt Anfrage nach nicht angebotenem Objekt %s ab."
#: gpg-interface.c:272
msgid "could not create temporary file"
msgstr "konnte temporäre Datei nicht erstellen"
#: gpg-interface.c:275
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'"
#: gpg-interface.c:457
msgid "gpg failed to sign the data"
msgstr "gpg beim Signieren der Daten fehlgeschlagen"
#: graph.c:98
#, c-format
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "Ignoriere ungültige Farbe '%.*s' in log.graphColors"
#: grep.c:668
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
msgstr ""
"Angegebenes Muster enthält NULL Byte (über -f <Datei>). Das wird nur mit -"
"Punter PCRE v2 unterstützt."
#: grep.c:2128
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': konnte %s nicht lesen"
#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "Konnte '%s' nicht lesen"
#: grep.c:2156
#, c-format
msgid "'%s': short read"
msgstr "'%s': read() zu kurz"
#: help.c:23
msgid "start a working area (see also: git help tutorial)"
msgstr "Arbeitsverzeichnis anlegen (siehe auch: git help tutorial)"
#: help.c:24
msgid "work on the current change (see also: git help everyday)"
msgstr "an aktuellen Änderungen arbeiten (siehe auch: git help everyday)"
#: help.c:25
msgid "examine the history and state (see also: git help revisions)"
msgstr "Historie und Status untersuchen (siehe auch: git help revisions)"
#: help.c:26
msgid "grow, mark and tweak your common history"
msgstr "Historie erweitern und bearbeiten"
#: help.c:27
msgid "collaborate (see also: git help workflows)"
msgstr "mit anderen zusammenarbeiten (siehe auch: git help workflows)"
#: help.c:31
msgid "Main Porcelain Commands"
msgstr "Hauptbefehle"
#: help.c:32
msgid "Ancillary Commands / Manipulators"
msgstr "Nebenbefehle / Manipulationen"
#: help.c:33
msgid "Ancillary Commands / Interrogators"
msgstr "Nebenbefehle / Abfragen"
#: help.c:34
msgid "Interacting with Others"
msgstr "mit anderen interagieren"
#: help.c:35
msgid "Low-level Commands / Manipulators"
msgstr "Systembefehle / Manipulationen"
#: help.c:36
msgid "Low-level Commands / Interrogators"
msgstr "Systembefehle / Abfragen"
#: help.c:37
msgid "Low-level Commands / Syncing Repositories"
msgstr "Systembefehle / Repositories synchronisieren"
#: help.c:38
msgid "Low-level Commands / Internal Helpers"
msgstr "Systembefehle / Interne Hilfsbefehle"
#: help.c:300
#, c-format
msgid "available git commands in '%s'"
msgstr "Vorhandene Git-Befehle in '%s'"
#: help.c:307
msgid "git commands available from elsewhere on your $PATH"
msgstr "Vorhandene Git-Befehle anderswo in Ihrem $PATH"
#: help.c:316
msgid "These are common Git commands used in various situations:"
msgstr "Allgemeine Git-Befehle, verwendet in verschiedenen Situationen:"
#: help.c:365 git.c:99
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "Nicht unterstützte Art zur Befehlsauflistung '%s'."
#: help.c:405
msgid "The Git concept guides are:"
msgstr "Die Git-Konzeptanleitungen sind:"
#: help.c:429
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr ""
"Siehe 'git help <Befehl>', um mehr über einen spezifischen Unterbefehl zu "
"lesen."
#: help.c:434
msgid "External commands"
msgstr "Externe Befehle"
#: help.c:449
msgid "Command aliases"
msgstr "Alias-Befehle"
#: help.c:513
#, 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 ""
"'%s' scheint ein git-Befehl zu sein, konnte aber\n"
"nicht ausgeführt werden. Vielleicht ist git-%s fehlerhaft?"
#: help.c:572
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Uh oh. Keine Git-Befehle auf Ihrem System vorhanden."
#: help.c:594
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
"WARNUNG: Sie haben Git-Befehl '%s' ausgeführt, welcher nicht existiert."
#: help.c:599
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Setze fort unter der Annahme, dass Sie '%s' meinten."
#: help.c:604
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "Setze in %0.1f Sekunden fort unter der Annahme, dass Sie '%s' meinten."
#: help.c:612
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s' ist kein Git-Befehl. Siehe 'git --help'."
#: help.c:616
msgid ""
"\n"
"The most similar command is"
msgid_plural ""
"\n"
"The most similar commands are"
msgstr[0] ""
"\n"
"Der ähnlichste Befehl ist"
msgstr[1] ""
"\n"
"Die ähnlichsten Befehle sind"
#: help.c:656
msgid "git version [<options>]"
msgstr "git version [<Optionen>]"
#: help.c:711
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
#: help.c:715
msgid ""
"\n"
"Did you mean this?"
msgid_plural ""
"\n"
"Did you mean one of these?"
msgstr[0] ""
"\n"
"Haben Sie das gemeint?"
msgstr[1] ""
"\n"
"Haben Sie eines von diesen gemeint?"
#: ident.c:353
msgid "Author identity unknown\n"
msgstr "Identität des Autors unbekannt\n"
#: ident.c:356
msgid "Committer identity unknown\n"
msgstr "Identität des Commit-Erstellers unbekannt\n"
#: ident.c:362
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 ""
"\n"
"*** Bitte geben Sie an, wer Sie sind.\n"
"\n"
"Führen Sie\n"
"\n"
" git config --global user.email \"you@example.com\"\n"
" git config --global user.name \"Your Name\"\n"
"\n"
"aus, um das als Ihre standardmäßige Identität zu setzen.\n"
"Lassen Sie die Option \"--global\" weg, um die Identität nur\n"
"für dieses Repository zu setzen.\n"
#: ident.c:397
msgid "no email was given and auto-detection is disabled"
msgstr "keine E-Mail angegeben und automatische Erkennung ist deaktiviert"
#: ident.c:402
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "Konnte die E-Mail-Adresse nicht automatisch erkennen ('%s' erhalten)"
#: ident.c:419
msgid "no name was given and auto-detection is disabled"
msgstr "kein Name angegeben und automatische Erkennung ist deaktiviert"
#: ident.c:425
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "konnte Namen nicht automatisch erkennen ('%s' erhalten)"
#: ident.c:433
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "Leerer Name in Identifikation (für <%s>) nicht erlaubt."
#: ident.c:439
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "Name besteht nur aus nicht erlaubten Zeichen: %s"
#: ident.c:454 builtin/commit.c:634
#, c-format
msgid "invalid date format: %s"
msgstr "Ungültiges Datumsformat: %s"
#: list-objects-filter-options.c:81
msgid "expected 'tree:<depth>'"
msgstr "'tree:<Tiefe>' erwartet"
#: list-objects-filter-options.c:96
msgid "sparse:path filters support has been dropped"
msgstr "Keine Unterstützung für sparse:path Filter mehr"
#: list-objects-filter-options.c:109
#, c-format
msgid "invalid filter-spec '%s'"
msgstr "Ungültige filter-spec '%s'"
#: list-objects-filter-options.c:125
#, c-format
msgid "must escape char in sub-filter-spec: '%c'"
msgstr "Zeichen in sub-filter-spec muss maskiert werden: '%c'"
#: list-objects-filter-options.c:167
msgid "expected something after combine:"
msgstr "erwartete etwas nach 'combine:'"
#: list-objects-filter-options.c:249
msgid "multiple filter-specs cannot be combined"
msgstr "mehrere filter-specs können nicht kombiniert werden"
#: list-objects-filter-options.c:361
msgid "unable to upgrade repository format to support partial clone"
msgstr ""
"Repository-Format konnte nicht erweitert werden, um partielles Klonen zu "
"unterstützen"
#: list-objects-filter.c:492
#, c-format
msgid "unable to access sparse blob in '%s'"
msgstr "konnte nicht auf partiellen Blob '%s' zugreifen"
#: list-objects-filter.c:495
#, c-format
msgid "unable to parse sparse filter data in %s"
msgstr "konnte partielle Filter-Daten in %s nicht parsen"
#: list-objects.c:127
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr ""
"Eintrag '%s' im Tree-Objekt %s hat Tree-Modus, aber ist kein Tree-Objekt"
#: list-objects.c:140
#, c-format
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr "Eintrag '%s' im Tree-Objekt %s hat Blob-Modus, aber ist kein Blob"
#: list-objects.c:375
#, c-format
msgid "unable to load root tree for commit %s"
msgstr "Konnte Root-Tree-Objekt für Commit %s nicht laden."
#: lockfile.c:152
#, 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 ""
"Konnte '%s.lock' nicht erstellen: %s.\n"
"\n"
"Ein anderer Git-Prozess scheint in diesem Repository ausgeführt\n"
"zu werden, zum Beispiel ein noch offener Editor von 'git commit'.\n"
"Bitte stellen Sie sicher, dass alle Prozesse beendet wurden und\n"
"versuchen Sie es erneut. Falls es immer noch fehlschlägt, könnte\n"
"ein früherer Git-Prozess in diesem Repository abgestürzt sein:\n"
"Löschen Sie die Datei manuell um fortzufahren."
#: lockfile.c:160
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "Konnte '%s.lock' nicht erstellen: %s"
#: ls-refs.c:109
msgid "expected flush after ls-refs arguments"
msgstr "erwartete Flush nach Argumenten für die Auflistung der Referenzen"
#: merge-recursive.c:356
msgid "(bad commit)\n"
msgstr "(ungültiger Commit)\n"
#: merge-recursive.c:379
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo für Pfad '%s' fehlgeschlagen; Merge wird abgebrochen."
#: merge-recursive.c:388
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
"add_cacheinfo zur Aktualisierung für Pfad '%s' fehlgeschlagen;\n"
"Merge wird abgebrochen."
#: merge-recursive.c:874
#, c-format
msgid "failed to create path '%s'%s"
msgstr "Fehler beim Erstellen des Pfades '%s'%s"
#: merge-recursive.c:885
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Entferne %s, um Platz für Unterverzeichnis zu schaffen\n"
#: merge-recursive.c:899 merge-recursive.c:918
msgid ": perhaps a D/F conflict?"
msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?"
#: merge-recursive.c:908
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden"
#: merge-recursive.c:949 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr "kann Objekt %s '%s' nicht lesen"
#: merge-recursive.c:954
#, c-format
msgid "blob expected for %s '%s'"
msgstr "Blob erwartet für %s '%s'"
#: merge-recursive.c:979
#, c-format
msgid "failed to open '%s': %s"
msgstr "Fehler beim Öffnen von '%s': %s"
#: merge-recursive.c:990
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s"
#: merge-recursive.c:995
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "weiß nicht was mit %06o %s '%s' zu machen ist"
#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)."
#: merge-recursive.c:1198
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)."
#: merge-recursive.c:1205
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "Fehler beim Merge von Submodul %s (Commits folgen keiner Merge-Basis)"
#: merge-recursive.c:1213 merge-recursive.c:1225
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Spule Submodul %s zu dem folgenden Commit vor:"
#: merge-recursive.c:1216 merge-recursive.c:1228
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Spule Submodul %s vor"
#: merge-recursive.c:1251
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Fehler beim Merge von Submodule %s (dem Merge nachfolgende Commits nicht "
"gefunden)"
#: merge-recursive.c:1255
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Fehler beim Merge von Submodul %s (kein Vorspulen)"
#: merge-recursive.c:1256
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Mögliche Auflösung des Merges für Submodul gefunden:\n"
#: merge-recursive.c:1259
#, 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 ""
"Falls das korrekt ist, fügen Sie es einfach der Staging-Area, zum Beispiel "
"mit:\n"
"\n"
" git update-index --cacheinfo 160000 %s \"%s\"\n"
"\n"
"hinzu, um diesen Vorschlag zu akzeptieren.\n"
#: merge-recursive.c:1268
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Fehler beim Merge von Submodul %s (mehrere Merges gefunden)"
#: merge-recursive.c:1341
msgid "Failed to execute internal merge"
msgstr "Fehler bei Ausführung des internen Merges"
#: merge-recursive.c:1346
#, c-format
msgid "Unable to add %s to database"
msgstr "Konnte %s nicht zur Datenbank hinzufügen"
#: merge-recursive.c:1378
#, c-format
msgid "Auto-merging %s"
msgstr "automatischer Merge von %s"
#: merge-recursive.c:1402
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Fehler: Verweigere unversionierte Datei bei %s zu verlieren;\n"
"schreibe stattdessen nach %s."
#: merge-recursive.c:1474
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
"im Arbeitsbereich gelassen."
#: merge-recursive.c:1479
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree."
msgstr ""
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von "
"%s wurde im Arbeitsbereich gelassen."
#: merge-recursive.c:1486
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
"im Arbeitsbereich bei %s gelassen."
#: merge-recursive.c:1491
#, 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 ""
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von "
"%s wurde im Arbeitsbereich bei %s gelassen."
#: merge-recursive.c:1526
msgid "rename"
msgstr "umbenennen"
#: merge-recursive.c:1526
msgid "renamed"
msgstr "umbenannt"
#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Verweigere geänderte Datei bei %s zu verlieren."
#: merge-recursive.c:1587
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"Verweigere unversionierte Datei bei %s zu verlieren, auch wenn diese im Weg "
"ist."
#: merge-recursive.c:1645
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in "
"%s"
#: merge-recursive.c:1676
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s ist ein Verzeichnis in %s, füge es stattdessen als %s hinzu"
#: merge-recursive.c:1681
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"Verweigere unversionierte Datei bei %s zu verlieren; füge stattdessen %s "
"hinzu"
#: merge-recursive.c:1708
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
"KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" "
"und \"%s\"->\"%s\" in Branch \"%s\"%s"
#: merge-recursive.c:1713
msgid " (left unresolved)"
msgstr " (bleibt unaufgelöst)"
#: merge-recursive.c:1805
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. Benenne um %s->%s "
"in %s"
#: merge-recursive.c:2068
#, 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 ""
"KONFLIKT (Aufteilung Verzeichnisumbenennung): Unklar, wo %s zu platzieren "
"ist,\n"
"weil Verzeichnis %s zu mehreren anderen Verzeichnissen umbenannt wurde, "
"wobei\n"
"keines dieser Ziele die Mehrheit der Dateien erhielt."
#: merge-recursive.c:2100
#, 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 ""
"KONFLIKT (implizite Verzeichnisumbenennung): Existierende Datei/Pfad bei %s "
"im\n"
"Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n"
"Pfade dahin zu setzen: %s."
#: merge-recursive.c:2110
#, 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 ""
"KONFLIKT (implizite Verzeichnisumbenennung): Kann nicht mehr als ein Pfad "
"zu\n"
"%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n"
"zu setzen: %s"
#: merge-recursive.c:2202
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
">%s in %s"
msgstr ""
"KONFLIKT (umbenennen/umbenennen): Benenne Verzeichnis um %s->%s in %s.\n"
"Benenne Verzeichnis um %s->%s in %s"
#: merge-recursive.c:2447
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr ""
"WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt "
"wurde."
#: merge-recursive.c:2973
#, c-format
msgid "cannot read object %s"
msgstr "kann Objekt %s nicht lesen"
#: merge-recursive.c:2976
#, c-format
msgid "object %s is not a blob"
msgstr "Objekt %s ist kein Blob"
#: merge-recursive.c:3040
msgid "modify"
msgstr "ändern"
#: merge-recursive.c:3040
msgid "modified"
msgstr "geändert"
#: merge-recursive.c:3052
msgid "content"
msgstr "Inhalt"
#: merge-recursive.c:3056
msgid "add/add"
msgstr "hinzufügen/hinzufügen"
#: merge-recursive.c:3079
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
#: merge-recursive.c:3101
msgid "submodule"
msgstr "Submodul"
#: merge-recursive.c:3102
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
#: merge-recursive.c:3132
#, c-format
msgid "Adding as %s instead"
msgstr "Füge stattdessen als %s hinzu"
#: merge-recursive.c:3215
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"moving it to %s."
msgstr ""
"Pfad aktualisiert: %s hinzugefügt in %s innerhalb eines Verzeichnisses, das "
"umbenannt wurde in %s; Verschiebe es nach %s."
#: merge-recursive.c:3218
#, 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 ""
"KONFLIKT (Speicherort): %s hinzugefügt in %s innerhalb eines Verzeichnisses, "
"das umbenannt wurde in %s, es sollte vielleicht nach %s verschoben werden."
#: merge-recursive.c:3222
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"%s; moving it to %s."
msgstr ""
"Pfad aktualisiert: %s umbenannt nach %s in %s, innerhalb eines "
"Verzeichnisses, das umbenannt wurde in %s; Verschiebe es nach %s."
#: merge-recursive.c:3225
#, 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 ""
"KONFLIKT (Speicherort): %s umbenannt nach %s in %s, innerhalb eines "
"Verzeichnisses, das umbenannt wurde in %s, es sollte vielleicht nach %s "
"verschoben werden."
#: merge-recursive.c:3339
#, c-format
msgid "Removing %s"
msgstr "Entferne %s"
#: merge-recursive.c:3362
msgid "file/directory"
msgstr "Datei/Verzeichnis"
#: merge-recursive.c:3367
msgid "directory/file"
msgstr "Verzeichnis/Datei"
#: merge-recursive.c:3374
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s "
"hinzu."
#: merge-recursive.c:3383
#, c-format
msgid "Adding %s"
msgstr "Füge %s hinzu"
#: merge-recursive.c:3392
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "KONFLIKT (hinzufügen/hinzufügen): Merge-Konflikt in %s"
#: merge-recursive.c:3436
msgid "Already up to date!"
msgstr "Bereits aktuell!"
#: merge-recursive.c:3445
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen"
#: merge-recursive.c:3550
msgid "Merging:"
msgstr "Merge:"
#: merge-recursive.c:3563
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u gemeinsamen Vorgänger-Commit gefunden"
msgstr[1] "%u gemeinsame Vorgänger-Commits gefunden"
#: merge-recursive.c:3613
msgid "merge returned no commit"
msgstr "Merge hat keinen Commit zurückgegeben"
#: merge-recursive.c:3672
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
" %s"
msgstr ""
"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n"
"überschrieben werden:\n"
" %s"
#: merge-recursive.c:3769
#, c-format
msgid "Could not parse object '%s'"
msgstr "Konnte Objekt '%s' nicht parsen."
#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881
msgid "Unable to write index."
msgstr "Konnte Index nicht schreiben."
#: merge.c:41
msgid "failed to read the cache"
msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
#: 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 "Konnte neue Index-Datei nicht schreiben."
#: midx.c:79
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "multi-pack-index-Datei %s ist zu klein."
#: midx.c:95
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
"multi-pack-index-Signatur 0x%08x stimmt nicht mit Signatur 0x%08x überein."
#: midx.c:100
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index-Version %d nicht erkannt."
#: midx.c:105
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr "multi-pack-index Hash-Version %u stimmt nicht mit Version %u überein"
#: midx.c:122
msgid "invalid chunk offset (too large)"
msgstr "Ungültiger Chunk-Offset (zu groß)"
#: midx.c:146
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr "Abschließende multi-pack-index Chunk-Id erscheint eher als erwartet."
#: midx.c:159
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index fehlt erforderlicher pack-name Chunk."
#: midx.c:161
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index fehlt erforderlicher OID fanout Chunk."
#: midx.c:163
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index fehlt erforderlicher OID lookup Chunk."
#: midx.c:165
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index fehlt erforderlicher object offset Chunk."
#: midx.c:179
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "Falsche Reihenfolge bei multi-pack-index Pack-Namen: '%s' vor '%s'"
#: midx.c:222
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "Ungültige pack-int-id: %u (%u Pakete insgesamt)"
#: midx.c:272
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"multi-pack-index speichert einen 64-Bit Offset, aber off_t ist zu klein."
#: midx.c:300
msgid "error preparing packfile from multi-pack-index"
msgstr "Fehler bei Vorbereitung der Packdatei aus multi-pack-index."
#: midx.c:485
#, c-format
msgid "failed to add packfile '%s'"
msgstr "Fehler beim Hinzufügen von Packdatei '%s'."
#: midx.c:491
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "Fehler beim Öffnen von pack-index '%s'"
#: midx.c:551
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "Fehler beim Lokalisieren von Objekt %d in Packdatei."
#: midx.c:853
msgid "Adding packfiles to multi-pack-index"
msgstr "Packdateien zum multi-pack-index hinzufügen"
#: midx.c:886
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "Pack-Datei %s zum Weglassen nicht gefunden"
#: midx.c:938
msgid "no pack files to index."
msgstr "keine Packdateien zum Indizieren."
#: midx.c:990
msgid "Writing chunks to multi-pack-index"
msgstr "Chunks zum multi-pack-index schreiben"
#: midx.c:1068
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "Fehler beim Löschen des multi-pack-index bei %s"
#: midx.c:1124
msgid "multi-pack-index file exists, but failed to parse"
msgstr "multi-pack-index-Datei existiert, aber das Parsen schlug fehl"
#: midx.c:1132
msgid "Looking for referenced packfiles"
msgstr "Suche nach referenzierten Pack-Dateien"
#: midx.c:1147
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
"Ungültige oid fanout Reihenfolge: fanout[%d] = %<PRIx32> > %<PRIx32> = "
"fanout[%d]"
#: midx.c:1152
msgid "the midx contains no oid"
msgstr "das midx enthält keine oid"
#: midx.c:1161
msgid "Verifying OID order in multi-pack-index"
msgstr "Verifiziere OID-Reihenfolge im multi-pack-index"
#: midx.c:1170
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "Ungültige oid lookup Reihenfolge: oid[%d] = %s >= %s = oid[%d]"
#: midx.c:1190
msgid "Sorting objects by packfile"
msgstr "Sortiere Objekte nach Pack-Datei"
#: midx.c:1197
msgid "Verifying object offsets"
msgstr "Überprüfe Objekt-Offsets"
#: midx.c:1213
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "Fehler beim Laden des Pack-Eintrags für oid[%d] = %s"
#: midx.c:1219
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "Fehler beim Laden des Pack-Index für Packdatei %s"
#: midx.c:1228
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "Falscher Objekt-Offset für oid[%d] = %s: %<PRIx64> != %<PRIx64>"
#: midx.c:1253
msgid "Counting referenced objects"
msgstr "Referenzierte Objekte zählen"
#: midx.c:1263
msgid "Finding and deleting unreferenced packfiles"
msgstr "Suchen und Löschen von unreferenzierten Pack-Dateien"
#: midx.c:1454
msgid "could not start pack-objects"
msgstr "Konnte 'pack-objects' nicht ausführen"
#: midx.c:1474
msgid "could not finish pack-objects"
msgstr "Konnte 'pack-objects' nicht beenden"
#: name-hash.c:537
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "Kann lazy_dir Thread nicht erzeugen: %s"
#: name-hash.c:559
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "Kann lazy_name Thread nicht erzeugen: %s"
#: name-hash.c:565
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "Kann lazy_name Thread nicht beitreten: %s"
#: 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 ""
"Sie haben Ihren vorherigen Merge von Notizen nicht abgeschlossen (%s "
"existiert).\n"
"Bitte benutzen Sie 'git notes merge --commit' oder 'git notes merge --"
"abort', um\n"
"den vorherigen Merge zu committen bzw. abzubrechen, bevor Sie einen neuen "
"Merge\n"
"von Notizen beginnen."
#: notes-merge.c:284
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "Sie haben Ihren Merge von Notizen nicht abgeschlossen (%s existiert)."
#: notes-utils.c:46
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
"Kann uninitialisiertes/unreferenziertes Notiz-Verzeichnis nicht committen."
#: notes-utils.c:105
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "Ungültiger notes.rewriteMode Wert: '%s'"
#: notes-utils.c:115
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
"Umschreiben der Notizen in %s zurückgewiesen (außerhalb von refs/notes/)"
#. 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 "Ungültiger %s Wert: '%s'"
#: object.c:53
#, c-format
msgid "invalid object type \"%s\""
msgstr "Ungültiger Objekttyp \"%s\""
#: object.c:173
#, c-format
msgid "object %s is a %s, not a %s"
msgstr "Objekt %s ist ein %s, kein %s"
#: object.c:233
#, c-format
msgid "object %s has unknown type id %d"
msgstr "Objekt %s hat eine unbekannte Typ-Identifikation %d"
#: object.c:246
#, c-format
msgid "unable to parse object: %s"
msgstr "Konnte Objekt '%s' nicht parsen."
#: object.c:266 object.c:278
#, c-format
msgid "hash mismatch %s"
msgstr "Hash stimmt nicht mit %s überein."
#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216
#, c-format
msgid "unable to get size of %s"
msgstr "Konnte Größe von %s nicht bestimmen."
#: packfile.c:630
msgid "offset before end of packfile (broken .idx?)"
msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
#: packfile.c:1922
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "Offset vor Beginn des Pack-Index für %s (beschädigter Index?)"
#: packfile.c:1926
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "Offset hinter Ende des Pack-Index für %s (abgeschnittener Index?)"
#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "Option `%s' erwartet einen numerischen Wert."
#: parse-options-cb.c:41
#, c-format
msgid "malformed expiration date '%s'"
msgstr "Fehlerhaftes Ablaufdatum '%s'"
#: parse-options-cb.c:54
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr "Option `%s' erwartet \"always\", \"auto\" oder \"never\"."
#: parse-options-cb.c:132 parse-options-cb.c:149
#, c-format
msgid "malformed object name '%s'"
msgstr "fehlerhafter Objekt-Name '%s'"
#: parse-options.c:38
#, c-format
msgid "%s requires a value"
msgstr "%s erfordert einen Wert."
#: parse-options.c:73
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s ist inkompatibel mit %s."
#: parse-options.c:78
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s: inkompatibel mit etwas anderem"
#: parse-options.c:92 parse-options.c:96 parse-options.c:317
#, c-format
msgid "%s takes no value"
msgstr "%s erwartet keinen Wert"
#: parse-options.c:94
#, c-format
msgid "%s isn't available"
msgstr "%s ist nicht verfügbar."
#: parse-options.c:217
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
"%s erwartet einen nicht-negativen Integer-Wert mit einem optionalen k/m/g "
"Suffix"
#: parse-options.c:386
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "Mehrdeutige Option: %s (kann --%s%s oder --%s%s sein)"
#: parse-options.c:420 parse-options.c:428
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "Meinten Sie `--%s` (mit zwei Strichen)?"
#: parse-options.c:666 parse-options.c:971
#, c-format
msgid "alias of --%s"
msgstr "Alias für --%s"
#: parse-options.c:862
#, c-format
msgid "unknown option `%s'"
msgstr "Unbekannte Option: `%s'"
#: parse-options.c:864
#, c-format
msgid "unknown switch `%c'"
msgstr "Unbekannter Schalter `%c'"
#: parse-options.c:866
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "Unbekannte nicht-Ascii Option in String: `%s'"
#: parse-options.c:890
msgid "..."
msgstr "..."
#: parse-options.c:909
#, c-format
msgid "usage: %s"
msgstr "Verwendung: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
#: parse-options.c:915
#, c-format
msgid " or: %s"
msgstr " oder: %s"
#: parse-options.c:918
#, c-format
msgid " %s"
msgstr " %s"
#: parse-options.c:957
msgid "-NUM"
msgstr "-NUM"
#: path.c:915
#, c-format
msgid "Could not make %s writable by group"
msgstr "Konnte Gruppenschreibrecht für %s nicht setzen."
#: pathspec.c:130
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "Escape-Zeichen '\\' als letztes Zeichen in Attributwert nicht erlaubt"
#: pathspec.c:148
msgid "Only one 'attr:' specification is allowed."
msgstr "Es ist nur eine Angabe von 'attr:' erlaubt."
#: pathspec.c:151
msgid "attr spec must not be empty"
msgstr "Angabe von 'attr:' darf nicht leer sein"
#: pathspec.c:194
#, c-format
msgid "invalid attribute name %s"
msgstr "Ungültiger Attributname %s"
#: pathspec.c:259
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"Globale Einstellungen zur Pfadspezifikation 'glob' und 'noglob' sind "
"inkompatibel."
#: pathspec.c:266
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr ""
"Globale Einstellung zur Pfadspezifikation 'literal' ist inkompatibel\n"
"mit allen anderen Optionen."
#: pathspec.c:306
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "ungültiger Parameter für Pfadspezifikationsangabe 'prefix'"
#: pathspec.c:327
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "ungültige Pfadspezifikationsangabe '%.*s' in '%s'"
#: pathspec.c:332
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Fehlendes ')' am Ende der Pfadspezifikationsangabe in '%s'"
#: pathspec.c:370
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "nicht unterstützte Pfadspezifikationsangabe '%c' in '%s'"
#: pathspec.c:429
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: 'literal' und 'glob' sind inkompatibel"
#: pathspec.c:445
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: '%s' liegt außerhalb des Repositories von '%s'"
#: pathspec.c:521
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (Kürzel: '%c')"
#: pathspec.c:531
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
"%s: Pfadspezifikationsangabe wird von diesem Befehl nicht unterstützt: %s"
#: pathspec.c:598
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung"
#: pathspec.c:643
#, c-format
msgid "line is badly quoted: %s"
msgstr "Zeile enthält falsche Anführungszeichen: %s"
#: pkt-line.c:92
msgid "unable to write flush packet"
msgstr "konnte Flush-Paket nicht schreiben"
#: pkt-line.c:99
msgid "unable to write delim packet"
msgstr "konnte Delim-Paket nicht schreiben"
#: pkt-line.c:106
msgid "unable to write stateless separator packet"
msgstr "konnte zustandsloses Separator-Paket nicht schreiben"
#: pkt-line.c:113
msgid "flush packet write failed"
msgstr "Flush beim Schreiben des Pakets fehlgeschlagen."
#: pkt-line.c:153 pkt-line.c:239
msgid "protocol error: impossibly long line"
msgstr "Protokollfehler: unmöglich lange Zeile"
#: pkt-line.c:169 pkt-line.c:171
msgid "packet write with format failed"
msgstr "Schreiben des Pakets mit Format fehlgeschlagen."
#: pkt-line.c:203
msgid "packet write failed - data exceeds max packet size"
msgstr ""
"Schreiben des Pakets fehlgeschlagen - Daten überschreiten maximale Paketgröße"
#: pkt-line.c:210 pkt-line.c:217
msgid "packet write failed"
msgstr "Schreiben des Pakets fehlgeschlagen."
#: pkt-line.c:302
msgid "read error"
msgstr "Lesefehler"
#: pkt-line.c:310
msgid "the remote end hung up unexpectedly"
msgstr "Die Gegenseite hat unerwartet abgebrochen."
#: pkt-line.c:338
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "Protokollfehler: ungültiges Zeichen für Zeilenlänge: %.4s"
#: pkt-line.c:352 pkt-line.c:357
#, c-format
msgid "protocol error: bad line length %d"
msgstr "Protokollfehler: ungültige Zeilenlänge %d"
#: pkt-line.c:373 sideband.c:150
#, c-format
msgid "remote error: %s"
msgstr "Fehler am anderen Ende: %s"
#: preload-index.c:119
msgid "Refreshing index"
msgstr "Aktualisiere Index"
#: preload-index.c:138
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "Kann Thread für lstat nicht erzeugen: %s"
#: pretty.c:983
msgid "unable to parse --pretty format"
msgstr "Konnte --pretty Format nicht parsen."
#: promisor-remote.c:30
msgid "promisor-remote: unable to fork off fetch subprocess"
msgstr "Promisor-Remote: konnte Fetch-Subprozess nicht abspalten"
#: promisor-remote.c:35 promisor-remote.c:37
msgid "promisor-remote: could not write to fetch subprocess"
msgstr "Promisor-Remote: konnte nicht zum Fetch-Subprozess schreiben"
#: promisor-remote.c:41
msgid "promisor-remote: could not close stdin to fetch subprocess"
msgstr ""
"Promisor-Remote: konnte Standard-Eingabe des Fetch-Subprozesses nicht "
"schließen"
#: promisor-remote.c:53
#, c-format
msgid "promisor remote name cannot begin with '/': %s"
msgstr "Promisor-Remote-Name kann nicht mit '/' beginnen: %s"
#: prune-packed.c:35
msgid "Removing duplicate objects"
msgstr "Lösche doppelte Objekte"
#: range-diff.c:77
msgid "could not start `log`"
msgstr "Konnte `log` nicht starten."
#: range-diff.c:79
msgid "could not read `log` output"
msgstr "Konnte Ausgabe von `log` nicht lesen."
#: range-diff.c:98 sequencer.c:5283
#, c-format
msgid "could not parse commit '%s'"
msgstr "Konnte Commit '%s' nicht parsen."
#: range-diff.c:112
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
"'%s'"
msgstr ""
"konnte erste Zeile der Ausgabe von `log` nicht parsen: fängt nicht mit "
"'commit ' an: '%s'"
#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "Konnte Git-Header '%.*s' nicht parsen."
#: range-diff.c:301
msgid "failed to generate diff"
msgstr "Fehler beim Generieren des Diffs."
#: range-diff.c:534 range-diff.c:536
#, c-format
msgid "could not parse log for '%s'"
msgstr "Konnte Log für '%s' nicht parsen."
#: read-cache.c:682
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr ""
"Dateialias '%s' wird nicht hinzugefügt ('%s' existiert bereits im Index)."
#: read-cache.c:698
msgid "cannot create an empty blob in the object database"
msgstr "Kann keinen leeren Blob in die Objektdatenbank schreiben."
#: read-cache.c:720
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
"%s: Kann nur reguläre Dateien, symbolische Links oder Git-Verzeichnisse "
"hinzufügen."
#: read-cache.c:725
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "'%s' hat keinen Commit ausgecheckt"
#: read-cache.c:777
#, c-format
msgid "unable to index file '%s'"
msgstr "Konnte Datei '%s' nicht indizieren."
#: read-cache.c:796
#, c-format
msgid "unable to add '%s' to index"
msgstr "Konnte '%s' nicht dem Index hinzufügen."
#: read-cache.c:807
#, c-format
msgid "unable to stat '%s'"
msgstr "Konnte '%s' nicht lesen."
#: read-cache.c:1318
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' scheint eine Datei und ein Verzeichnis zu sein."
#: read-cache.c:1524
msgid "Refresh index"
msgstr "Aktualisiere Index"
#: read-cache.c:1639
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
"index.version gesetzt, aber Wert ungültig.\n"
"Verwende Version %i"
#: read-cache.c:1649
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
"GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
"Verwende Version %i"
#: read-cache.c:1705
#, c-format
msgid "bad signature 0x%08x"
msgstr "Ungültige Signatur 0x%08x"
#: read-cache.c:1708
#, c-format
msgid "bad index version %d"
msgstr "Ungültige Index-Version %d"
#: read-cache.c:1717
msgid "bad index file sha1 signature"
msgstr "Ungültige SHA1-Signatur der Index-Datei."
#: read-cache.c:1747
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "Index verwendet Erweiterung %.4s, welche wir nicht unterstützen."
#: read-cache.c:1749
#, c-format
msgid "ignoring %.4s extension"
msgstr "Ignoriere Erweiterung %.4s"
#: read-cache.c:1786
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "Unbekanntes Format für Index-Eintrag 0x%08x"
#: read-cache.c:1802
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "Ungültiges Namensfeld im Index, in der Nähe von Pfad '%s'."
#: read-cache.c:1859
msgid "unordered stage entries in index"
msgstr "Ungeordnete Stage-Einträge im Index."
#: read-cache.c:1862
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "Mehrere Stage-Einträge für zusammengeführte Datei '%s'."
#: read-cache.c:1865
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "Ungeordnete Stage-Einträge für '%s'."
#: 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
msgid "index file corrupt"
msgstr "Index-Datei beschädigt"
#: read-cache.c:2115
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "Kann Thread für load_cache_entries nicht erzeugen: %s"
#: read-cache.c:2128
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "Kann Thread für load_cache_entries nicht erzeugen: %s"
#: read-cache.c:2161
#, c-format
msgid "%s: index file open failed"
msgstr "%s: Öffnen der Index-Datei fehlgeschlagen."
#: read-cache.c:2165
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: Kann geöffneten Index nicht lesen."
#: read-cache.c:2169
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: Index-Datei ist kleiner als erwartet."
#: read-cache.c:2173
#, c-format
msgid "%s: unable to map index file"
msgstr "%s: Konnte Index-Datei nicht einlesen."
#: read-cache.c:2215
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "Kann Thread für load_index_extensions nicht erzeugen: %s"
#: read-cache.c:2242
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "Kann Thread für load_index_extensions nicht beitreten: %s"
#: read-cache.c:2274
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "Konnte geteilten Index '%s' nicht aktualisieren."
#: read-cache.c:2321
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "Fehlerhafter Index. Erwartete %s in %s, erhielt %s."
#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126
#, c-format
msgid "could not close '%s'"
msgstr "Konnte '%s' nicht schließen."
#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185
#, c-format
msgid "could not stat '%s'"
msgstr "Konnte '%s' nicht lesen."
#: read-cache.c:3133
#, c-format
msgid "unable to open git dir: %s"
msgstr "konnte Git-Verzeichnis nicht öffnen: %s"
#: read-cache.c:3145
#, c-format
msgid "unable to unlink: %s"
msgstr "Konnte '%s' nicht entfernen."
#: read-cache.c:3170
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
#: read-cache.c:3319
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: Kann nicht auf Stufe #0 wechseln."
#: 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 ""
"Sie können das mit 'git rebase --edit-todo' beheben. Führen Sie danach\n"
"'git rebase --continue' aus.\n"
"Oder Sie können den Rebase mit 'git rebase --abort' abbrechen.\n"
#: rebase-interactive.c:33
#, c-format
msgid ""
"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
"Nicht erkannte Einstellung %s für Option rebase.missingCommitsCheck. "
"Ignoriere."
#: rebase-interactive.c:42
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 ""
"\n"
"Befehle:\n"
"p, pick <Commit> = Commit verwenden\n"
"r, reword <Commit> = Commit verwenden, aber Commit-Beschreibung bearbeiten\n"
"e, edit <Commit> = Commit verwenden, aber zum Nachbessern anhalten\n"
"s, squash <Commit> = Commit verwenden, aber mit vorherigem Commit vereinen\n"
"f, fixup <Commit> = wie \"squash\", aber diese Commit-Beschreibung "
"verwerfen\n"
"x, exec <Commit> = Befehl (Rest der Zeile) mittels Shell ausführen\n"
"b, break = hier anhalten (Rebase später mit 'git rebase --continue' "
"fortsetzen)\n"
"d, drop <Commit> = Commit entfernen\n"
"l, label <Label> = aktuellen HEAD mit Label versehen\n"
"t, reset <Label> = HEAD zu einem Label umsetzen\n"
"m, merge [-C <Commit> | -c <Commit>] <Label> [# <eineZeile>]\n"
". Merge-Commit mit der originalen Merge-Commit-Beschreibung erstellen\n"
". (oder die eine Zeile, wenn keine originale Merge-Commit-"
"Beschreibung\n"
". spezifiziert ist). Benutzen Sie -c <Commit> zum Bearbeiten der\n"
". Commit-Beschreibung.\n"
"\n"
"Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n"
"ausgeführt.\n"
#: rebase-interactive.c:63
#, c-format
msgid "Rebase %s onto %s (%d command)"
msgid_plural "Rebase %s onto %s (%d commands)"
msgstr[0] "Rebase von %s auf %s (%d Kommando)"
msgstr[1] "Rebase von %s auf %s (%d Kommandos)"
#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
"\n"
"Keine Zeile entfernen. Benutzen Sie 'drop', um explizit einen Commit zu\n"
"entfernen.\n"
#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr ""
"\n"
"Wenn Sie hier eine Zeile entfernen, wird DIESER COMMIT VERLOREN GEHEN.\n"
#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861
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 ""
"\n"
"Sie bearbeiten gerade die TODO-Datei eines laufenden interaktiven Rebase.\n"
"Um den Rebase nach dem Editieren fortzusetzen, führen Sie aus:\n"
" git rebase --continue\n"
"\n"
#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr ""
"\n"
"Wenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n"
"\n"
#: 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
#, c-format
msgid "could not write '%s'"
msgstr "Konnte '%s' nicht schreiben."
#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222
#: builtin/rebase.c:246
#, c-format
msgid "could not write '%s'."
msgstr "Konnte '%s' nicht schreiben."
#: rebase-interactive.c:193
#, c-format
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):\n"
msgstr ""
"Warnung: Einige Commits könnten aus Versehen entfernt worden sein.\n"
"Entfernte Commits (neu zu alt):\n"
#: rebase-interactive.c:200
#, 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 ""
"Um diese Meldung zu vermeiden, benutzen Sie \"drop\", um exlizit Commits zu\n"
"entfernen.\n"
"\n"
"Benutzen Sie 'git config rebase.missingCommitsCheck', um die Stufe der\n"
"Warnungen zu ändern.\n"
"Die möglichen Verhaltensweisen sind: ignore, warn, error.\n"
#: 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
#, c-format
msgid "could not read '%s'."
msgstr "Konnte '%s' nicht lesen."
#: ref-filter.c:42 wt-status.c:1973
msgid "gone"
msgstr "entfernt"
#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "%d voraus"
#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "%d hinterher"
#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "%d voraus, %d hinterher"
#: ref-filter.c:169
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "Erwartetes Format: %%(color:<Farbe>)"
#: ref-filter.c:171
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "nicht erkannte Farbe: %%(color:%s)"
#: ref-filter.c:193
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Positiver Wert erwartet refname:lstrip=%s"
#: ref-filter.c:197
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Positiver Wert erwartet refname:rstrip=%s"
#: ref-filter.c:199
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "nicht erkanntes %%(%s) Argument: %s"
#: ref-filter.c:254
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) akzeptiert keine Argumente"
#: ref-filter.c:276
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "nicht erkanntes %%(objectsize) Argument: %s"
#: ref-filter.c:284
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) akzeptiert keine Argumente"
#: ref-filter.c:296
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) akzeptiert keine Argumente"
#: ref-filter.c:309
#, c-format
msgid "unrecognized %%(subject) argument: %s"
msgstr "nicht erkanntes %%(subject) Argument: %s"
#: ref-filter.c:330
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "unbekanntes %%(trailers) Argument: %s"
#: ref-filter.c:363
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "Positiver Wert erwartet contents:lines=%s"
#: ref-filter.c:365
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "nicht erkanntes %%(contents) Argument: %s"
#: ref-filter.c:380
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "positiver Wert erwartet '%s' in %%(%s)"
#: ref-filter.c:384
#, c-format
msgid "unrecognized argument '%s' in %%(%s)"
msgstr "nicht erkanntes Argument '%s' in %%(%s)"
#: ref-filter.c:398
#, c-format
msgid "unrecognized email option: %s"
msgstr "nicht erkannte E-Mail Option: %s"
#: ref-filter.c:428
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "erwartetes Format: %%(align:<Breite>,<Position>)"
#: ref-filter.c:440
#, c-format
msgid "unrecognized position:%s"
msgstr "nicht erkannte Position:%s"
#: ref-filter.c:447
#, c-format
msgid "unrecognized width:%s"
msgstr "nicht erkannte Breite:%s"
#: ref-filter.c:456
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "nicht erkanntes %%(align) Argument: %s"
#: ref-filter.c:464
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "Positive Breitenangabe für %%(align) erwartet"
#: ref-filter.c:482
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "nicht erkanntes %%(if) Argument: %s"
#: ref-filter.c:584
#, c-format
msgid "malformed field name: %.*s"
msgstr "Fehlerhafter Feldname: %.*s"
#: ref-filter.c:611
#, c-format
msgid "unknown field name: %.*s"
msgstr "Unbekannter Feldname: %.*s"
#: ref-filter.c:615
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
"Kein Git-Repository, aber das Feld '%.*s' erfordert Zugriff auf Objektdaten."
#: ref-filter.c:739
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet"
#: ref-filter.c:802
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet"
#: ref-filter.c:804
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: %%(then) Atom mehr als einmal verwendet"
#: ref-filter.c:806
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: %%(then) Atom nach %%(else) verwendet"
#: ref-filter.c:834
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet"
#: ref-filter.c:836
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet"
#: ref-filter.c:838
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "Format: %%(end) Atom mehr als einmal verwendet"
#: ref-filter.c:853
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet"
#: ref-filter.c:910
#, c-format
msgid "malformed format string %s"
msgstr "Fehlerhafter Formatierungsstring %s"
#: ref-filter.c:1541
#, c-format
msgid "no branch, rebasing %s"
msgstr "kein Branch, Rebase von %s"
#: ref-filter.c:1544
#, c-format
msgid "no branch, rebasing detached HEAD %s"
msgstr "kein Branch, Rebase von losgelöstem HEAD %s"
#: ref-filter.c:1547
#, c-format
msgid "no branch, bisect started on %s"
msgstr "kein Branch, binäre Suche begonnen bei %s"
#: ref-filter.c:1557
msgid "no branch"
msgstr "kein Branch"
#: ref-filter.c:1591 ref-filter.c:1800
#, c-format
msgid "missing object %s for %s"
msgstr "Objekt %s fehlt für %s"
#: ref-filter.c:1601
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer bei %s für %s fehlgeschlagen"
#: ref-filter.c:2054
#, c-format
msgid "malformed object at '%s'"
msgstr "fehlerhaftes Objekt bei '%s'"
#: ref-filter.c:2143
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s"
#: ref-filter.c:2148 refs.c:657
#, c-format
msgid "ignoring broken ref %s"
msgstr "Ignoriere fehlerhafte Referenz %s"
#: ref-filter.c:2464
#, c-format
msgid "format: %%(end) atom missing"
msgstr "Format: %%(end) Atom fehlt"
#: ref-filter.c:2563
#, c-format
msgid "malformed object name %s"
msgstr "missgebildeter Objektname %s"
#: ref-filter.c:2568
#, c-format
msgid "option `%s' must point to a commit"
msgstr "die Option `%s' muss auf einen Commit zeigen"
#: refs.c:264
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s zeigt auf kein gültiges Objekt!"
#: refs.c:572
#, c-format
msgid "could not retrieve `%s`"
msgstr "konnte `%s` nicht abrufen"
#: refs.c:579
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "ungültiger Branchname: %s = %s"
#: refs.c:655
#, c-format
msgid "ignoring dangling symref %s"
msgstr "Ignoriere unreferenzierte symbolische Referenz %s"
#: refs.c:892
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "Log für Referenz %s hat eine Lücke nach %s."
#: refs.c:898
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "Log für Referenz %s unerwartet bei %s beendet."
#: refs.c:957
#, c-format
msgid "log for %s is empty"
msgstr "Log für %s ist leer."
#: refs.c:1049
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "verweigere Aktualisierung einer Referenz mit fehlerhaftem Namen '%s'"
#: refs.c:1120
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref für Referenz '%s' fehlgeschlagen: %s"
#: refs.c:1944
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "mehrere Aktualisierungen für Referenz '%s' nicht erlaubt"
#: refs.c:2024
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
"Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung "
"verboten"
#: refs.c:2035
msgid "ref updates aborted by hook"
msgstr "Aktualisierungen von Referenzen durch Hook abgebrochen"
#: refs.c:2135 refs.c:2165
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' existiert; kann '%s' nicht erstellen"
#: refs.c:2141 refs.c:2176
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "kann '%s' und '%s' nicht zur selben Zeit verarbeiten"
#: refs/files-backend.c:1228
#, c-format
msgid "could not remove reference %s"
msgstr "konnte Referenz %s nicht löschen"
#: 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 "konnte Referenz %s nicht entfernen: %s"
#: refs/files-backend.c:1245 refs/packed-backend.c:1555
#, c-format
msgid "could not delete references: %s"
msgstr "konnte Referenzen nicht entfernen: %s"
#: refspec.c:167
#, c-format
msgid "invalid refspec '%s'"
msgstr "ungültige Refspec '%s'"
#: remote.c:351
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
"Kürzel für Remote-Repository in der Konfiguration kann nicht mit '/' "
"beginnen: %s"
#: remote.c:399
msgid "more than one receivepack given, using the first"
msgstr "Mehr als ein receivepack-Befehl angegeben, benutze den ersten."
#: remote.c:407
msgid "more than one uploadpack given, using the first"
msgstr "Mehr als ein uploadpack-Befehl angegeben, benutze den ersten."
#: remote.c:590
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Kann 'fetch' nicht für sowohl %s als auch %s nach %s ausführen."
#: remote.c:594
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s folgt üblicherweise %s, nicht %s"
#: remote.c:598
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s folgt sowohl %s als auch %s"
#: remote.c:666
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "Schlüssel '%s' des Musters hatte kein '*'."
#: remote.c:676
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "Wert '%s' des Musters hat kein '*'."
#: remote.c:1073
#, c-format
msgid "src refspec %s does not match any"
msgstr "Src-Refspec %s entspricht keiner Referenz."
#: remote.c:1078
#, c-format
msgid "src refspec %s matches more than one"
msgstr "Src-Refspec %s entspricht mehr als einer Referenz."
#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
#: remote.c:1093
#, 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 ""
"Das angegebene Ziel ist kein vollständiger Referenzname (startet mit \"refs/"
"\").\n"
"Wir versuchten zu erraten, was Sie meinten, mit:\n"
"\n"
"- Suche einer Referenz, die mit '%s' übereinstimmt, auf der Remote-Seite\n"
"- Prüfung, ob die versendete <Quelle> ('%s') eine Referenz in \"refs/{heads,"
"tags}\"\n"
" ist, in dessen Falle wir einen entsprechenden refs/{heads,tags} Präfix "
"auf\n"
" der Remote-Seite hinzufügen würden.\n"
"\n"
"Keines hat funktioniert, sodass wir aufgegeben haben. Sie müssen die\n"
"Referenz mit vollqualifizierten Namen angeben."
#: remote.c:1113
#, 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 ""
"Der <Quelle> Teil der Refspec ist ein Commit-Objekt.\n"
"Meinten Sie, einen neuen Branch mittels Push nach\n"
"'%s:refs/heads/%s' zu erstellen?"
#: remote.c:1118
#, 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 ""
"Der <Quelle> Teil der Refspec ist ein Tag-Objekt.\n"
"Meinten Sie, einen neuen Tag mittels Push nach\n"
"'%s:refs/tags/%s' zu erstellen?"
#: remote.c:1123
#, 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 ""
"Der <Quelle> Teil der Refspec ist ein Tree-Objekt.\n"
"Meinten Sie, einen Tag für ein neues Tree-Objekt\n"
"mittels Push nach '%s:refs/tags/'%s' zu erstellen?"
#: remote.c:1128
#, 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 ""
"Der <Quelle> Teil der Refspec ist ein Blob-Objekt.\n"
"Meinten Sie, einen Tag für ein neues Blob-Objekt\n"
"mittels Push nach '%s:refs/tags/%s' zu erstellen?"
#: remote.c:1164
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s kann nicht zu Branch aufgelöst werden."
#: remote.c:1175
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "Konnte '%s' nicht löschen: Remote-Referenz existiert nicht."
#: remote.c:1187
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "Dst-Refspec %s entspricht mehr als einer Referenz."
#: remote.c:1194
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "Dst-Referenz %s empfängt von mehr als einer Quelle"
#: remote.c:1703 remote.c:1804
msgid "HEAD does not point to a branch"
msgstr "HEAD zeigt auf keinen Branch"
#: remote.c:1712
#, c-format
msgid "no such branch: '%s'"
msgstr "Kein solcher Branch: '%s'"
#: remote.c:1715
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert."
#: remote.c:1721
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert"
#: remote.c:1736
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"Ziel für \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten "
"Branch"
#: remote.c:1748
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
#: remote.c:1758
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'"
#: remote.c:1771
msgid "push has no destination (push.default is 'nothing')"
msgstr "kein Ziel für \"push\" (push.default ist 'nothing')"
#: remote.c:1793
msgid "cannot resolve 'simple' push to a single destination"
msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen"
#: remote.c:1922
#, c-format
msgid "couldn't find remote ref %s"
msgstr "Konnte Remote-Referenz %s nicht finden."
#: remote.c:1935
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Ignoriere sonderbare Referenz '%s' lokal"
#: remote.c:2098
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
"Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n"
#: remote.c:2102
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n"
#: remote.c:2105
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Ihr Branch ist auf demselben Stand wie '%s'.\n"
#: remote.c:2109
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Ihr Branch und '%s' zeigen auf unterschiedliche Commits.\n"
#: remote.c:2112
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (benutzen Sie \"%s\" für Details)\n"
#: remote.c:2116
#, 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] "Ihr Branch ist %2$d Commit vor '%1$s'.\n"
msgstr[1] "Ihr Branch ist %2$d Commits vor '%1$s'.\n"
#: remote.c:2122
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n"
#: remote.c:2125
#, 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] ""
"Ihr Branch ist %2$d Commit hinter '%1$s', und kann vorgespult werden.\n"
msgstr[1] ""
"Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n"
#: remote.c:2133
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
" (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n"
#: remote.c:2136
#, 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] ""
"Ihr Branch und '%s' sind divergiert,\n"
"und haben jeweils %d und %d unterschiedliche Commits.\n"
msgstr[1] ""
"Ihr Branch und '%s' sind divergiert,\n"
"und haben jeweils %d und %d unterschiedliche Commits.\n"
#: remote.c:2146
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch "
"zusammenzuführen)\n"
#: remote.c:2337
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "Kann erwarteten Objektnamen '%s' nicht parsen."
#: replace-object.c:21
#, c-format
msgid "bad replace ref name: %s"
msgstr "ungültiger Name für ersetzende Referenz: %s"
#: replace-object.c:30
#, c-format
msgid "duplicate replace ref: %s"
msgstr "doppelte ersetzende Referenz: %s"
#: replace-object.c:82
#, c-format
msgid "replace depth too high for object %s"
msgstr "Ersetzungstiefe zu hoch für Objekt %s"
#: rerere.c:217 rerere.c:226 rerere.c:229
msgid "corrupt MERGE_RR"
msgstr "Fehlerhaftes MERGE_RR"
#: rerere.c:264 rerere.c:269
msgid "unable to write rerere record"
msgstr "Konnte Rerere-Eintrag nicht schreiben."
#: rerere.c:495
#, c-format
msgid "there were errors while writing '%s' (%s)"
msgstr "Fehler beim Schreiben von '%s' (%s)."
#: rerere.c:498
#, c-format
msgid "failed to flush '%s'"
msgstr "Flush bei '%s' fehlgeschlagen."
#: rerere.c:503 rerere.c:1039
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "Konnte Konflikt-Blöcke in '%s' nicht parsen."
#: rerere.c:684
#, c-format
msgid "failed utime() on '%s'"
msgstr "Fehler beim Aufruf von utime() auf '%s'."
#: rerere.c:694
#, c-format
msgid "writing '%s' failed"
msgstr "Schreiben von '%s' fehlgeschlagen."
#: rerere.c:714
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr "'%s' mit vorheriger Konfliktauflösung zum Commit vorgemerkt."
#: rerere.c:753
#, c-format
msgid "Recorded resolution for '%s'."
msgstr "Konfliktauflösung für '%s' aufgezeichnet."
#: rerere.c:788
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr "Konflikte in '%s' mit vorheriger Konfliktauflösung beseitigt."
#: rerere.c:803
#, c-format
msgid "cannot unlink stray '%s'"
msgstr "Kann '%s' nicht löschen."
#: rerere.c:807
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "Preimage für '%s' aufgezeichnet."
#: rerere.c:881 submodule.c:2082 builtin/log.c:1975
#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
#, c-format
msgid "could not create directory '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
#: rerere.c:1057
#, c-format
msgid "failed to update conflicted state in '%s'"
msgstr "Fehler beim Aktualisieren des Konflikt-Status in '%s'."
#: rerere.c:1068 rerere.c:1075
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "Keine aufgezeichnete Konfliktauflösung für '%s'."
#: rerere.c:1077
#, c-format
msgid "cannot unlink '%s'"
msgstr "Kann '%s' nicht löschen."
#: rerere.c:1087
#, c-format
msgid "Updated preimage for '%s'"
msgstr "Preimage für '%s' aktualisiert."
#: rerere.c:1096
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "Aufgezeichnete Konfliktauflösung für '%s' gelöscht.\n"
#: rerere.c:1199
msgid "unable to open rr-cache directory"
msgstr "Konnte rr-cache Verzeichnis nicht öffnen."
#: reset.c:42
msgid "could not determine HEAD revision"
msgstr "Konnte HEAD-Commit nicht bestimmen."
#: reset.c:70 reset.c:76 sequencer.c:3426
#, c-format
msgid "failed to find tree of %s"
msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
#: revision.c:2344
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<Pack-Datei> wird nicht länger unterstützt"
#: revision.c:2364
#, c-format
msgid "unknown value for --diff-merges: %s"
msgstr "unbekannter Wert für --diff-merges: %s"
#: revision.c:2702
msgid "your current branch appears to be broken"
msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
#: revision.c:2705
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
#: revision.c:2915
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L unterstützt noch keine anderen Diff-Formate außer -p und -s"
#: run-command.c:763
msgid "open /dev/null failed"
msgstr "Öffnen von /dev/null fehlgeschlagen"
#: run-command.c:1270
#, c-format
msgid "cannot create async thread: %s"
msgstr "Konnte Thread für async nicht erzeugen: %s"
#: run-command.c:1334
#, 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 ""
"Der '%s' Hook wurde ignoriert, weil er nicht als ausführbar markiert ist.\n"
"Sie können diese Warnung mit `git config advice.ignoredHook false` "
"deaktivieren."
#: send-pack.c:145
msgid "unexpected flush packet while reading remote unpack status"
msgstr "Unerwartetes Flush-Paket beim Lesen des Remote-Unpack-Status."
#: send-pack.c:147
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "Konnte Status des Entpackens der Gegenseite nicht parsen: %s"
#: send-pack.c:149
#, c-format
msgid "remote unpack failed: %s"
msgstr "Entpacken auf der Gegenseite fehlgeschlagen: %s"
#: send-pack.c:372
msgid "failed to sign the push certificate"
msgstr "Fehler beim Signieren des \"push\"-Zertifikates"
#: send-pack.c:460
msgid "the receiving end does not support this repository's hash algorithm"
msgstr ""
"die Gegenseite unterstützt nicht den Hash-Algorithmus dieses Repositories"
#: send-pack.c:469
msgid "the receiving end does not support --signed push"
msgstr ""
"die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")"
#: send-pack.c:471
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
"kein Versand des \"push\"-Zertifikates, da die Gegenseite keinen signierten\n"
"Versand (\"--signed push\") unterstützt"
#: send-pack.c:483
msgid "the receiving end does not support --atomic push"
msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")"
#: send-pack.c:488
msgid "the receiving end does not support push options"
msgstr "die Gegenseite unterstützt keine Push-Optionen"
#: sequencer.c:194
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "Ungültiger \"cleanup\"-Modus '%s' für Commit-Beschreibungen."
#: sequencer.c:308
#, c-format
msgid "could not delete '%s'"
msgstr "Konnte '%s' nicht löschen."
#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr "Konnte '%s' nicht löschen"
#: sequencer.c:339
msgid "revert"
msgstr "Revert"
#: sequencer.c:341
msgid "cherry-pick"
msgstr "Cherry-Pick"
#: sequencer.c:343
msgid "rebase"
msgstr "Rebase"
#: sequencer.c:345
#, c-format
msgid "unknown action: %d"
msgstr "Unbekannte Aktion: %d"
#: sequencer.c:404
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
"nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n"
"mit 'git add <Pfade>' oder 'git rm <Pfade>'"
#: sequencer.c:407
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 ""
"nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n"
"mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit\n"
"'git commit' ein"
#: sequencer.c:420 sequencer.c:3028
#, c-format
msgid "could not lock '%s'"
msgstr "Konnte '%s' nicht sperren"
#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046
#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631
#, c-format
msgid "could not write to '%s'"
msgstr "Konnte nicht nach '%s' schreiben."
#: sequencer.c:427
#, c-format
msgid "could not write eol to '%s'"
msgstr "Konnte EOL nicht nach '%s' schreiben."
#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048
#: sequencer.c:3311
#, c-format
msgid "failed to finalize '%s'"
msgstr "Fehler beim Fertigstellen von '%s'."
#: sequencer.c:471
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "Ihre lokalen Änderungen würden durch den %s überschrieben werden."
#: sequencer.c:475
msgid "commit your changes or stash them to proceed."
msgstr ""
"Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren."
#: sequencer.c:507
#, c-format
msgid "%s: fast-forward"
msgstr "%s: Vorspulen"
#: sequencer.c:546 builtin/tag.c:566
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Ungültiger \"cleanup\" Modus %s"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
#: sequencer.c:640
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Konnte neue Index-Datei nicht schreiben"
#: sequencer.c:657
msgid "unable to update cache tree"
msgstr "Konnte Cache-Verzeichnis nicht aktualisieren."
#: sequencer.c:671
msgid "could not resolve HEAD commit"
msgstr "Konnte HEAD-Commit nicht auflösen."
#: sequencer.c:751
#, c-format
msgid "no key present in '%.*s'"
msgstr "Kein Schlüssel in '%.*s' vorhanden."
#: sequencer.c:762
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "Konnte Anführungszeichen von '%s' nicht entfernen."
#: 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
#, c-format
msgid "could not open '%s' for reading"
msgstr "Konnte '%s' nicht zum Lesen öffnen."
#: sequencer.c:809
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' bereits angegeben."
#: sequencer.c:814
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' bereits angegeben."
#: sequencer.c:819
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' bereits angegeben."
#: sequencer.c:823
#, c-format
msgid "unknown variable '%s'"
msgstr "Unbekannte Variable '%s'"
#: sequencer.c:828
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "'GIT_AUTHOR_NAME' fehlt."
#: sequencer.c:830
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "'GIT_AUTHOR_EMAIL' fehlt."
#: sequencer.c:832
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "'GIT_AUTHOR_DATE' fehlt."
#: sequencer.c:897
#, 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 ""
"Es befinden sich zum Commit vorgemerkte Änderungen in Ihrem "
"Arbeitsverzeichnis.\n"
"Wenn diese Änderungen in den vorherigen Commit aufgenommen werden sollen,\n"
"führen Sie aus:\n"
"\n"
" git commit --amend %s\n"
"\n"
"Wenn daraus ein neuer Commit erzeugt werden soll, führen Sie aus:\n"
"\n"
" git commit %s\n"
"\n"
"Im Anschluss führen Sie zum Fortfahren aus:\n"
"\n"
" git rebase --continue\n"
#: sequencer.c:1178
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' Hook fehlgeschlagen."
#: sequencer.c:1184
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 ""
"Ihr Name und E-Mail Adresse wurden automatisch auf Basis\n"
"Ihres Benutzer- und Rechnernamens konfiguriert. Bitte prüfen Sie, dass\n"
"diese zutreffend sind. Sie können diese Meldung unterdrücken, indem Sie\n"
"diese explizit setzen. Führen Sie dazu den folgenden Befehl aus und folgen\n"
"Sie den Anweisungen in Ihrem Editor, um die Konfigurationsdatei zu "
"bearbeiten:\n"
"\n"
" git config --global --edit\n"
"\n"
"Nachdem Sie das getan haben, können Sie Ihre Identität für diesen Commit\n"
"ändern mit:\n"
"\n"
" git commit --amend --reset-author\n"
#: sequencer.c:1197
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 ""
"Ihr Name und E-Mail Adresse wurden automatisch auf Basis\n"
"Ihres Benutzer- und Rechnernamens konfiguriert. Bitte prüfen Sie, dass\n"
"diese zutreffend sind. Sie können diese Meldung unterdrücken, indem Sie\n"
"diese explizit setzen:\n"
"\n"
" git config --global user.name \"Ihr Name\"\n"
" git config --global user.email ihre@emailadresse.de\n"
"\n"
"Nachdem Sie das getan haben, können Sie Ihre Identität für diesen Commit "
"ändern:\n"
"\n"
" git commit --amend --reset-author\n"
#: sequencer.c:1239
msgid "couldn't look up newly created commit"
msgstr "Konnte neu erstellten Commit nicht nachschlagen."
#: sequencer.c:1241
msgid "could not parse newly created commit"
msgstr "Konnte neu erstellten Commit nicht analysieren."
#: sequencer.c:1287
msgid "unable to resolve HEAD after creating commit"
msgstr "Konnte HEAD nicht auflösen, nachdem der Commit erstellt wurde."
#: sequencer.c:1289
msgid "detached HEAD"
msgstr "losgelöster HEAD"
#: sequencer.c:1293
msgid " (root-commit)"
msgstr " (Root-Commit)"
#: sequencer.c:1314
msgid "could not parse HEAD"
msgstr "Konnte HEAD nicht parsen."
#: sequencer.c:1316
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s ist kein Commit!"
#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577
msgid "could not parse HEAD commit"
msgstr "Konnte Commit von HEAD nicht analysieren."
#: sequencer.c:1373 sequencer.c:2067
msgid "unable to parse commit author"
msgstr "Konnte Commit-Autor nicht parsen."
#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692
msgid "git write-tree failed to write a tree"
msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
#: sequencer.c:1417 sequencer.c:1535
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "Konnte Commit-Beschreibung von '%s' nicht lesen."
#: sequencer.c:1446 sequencer.c:1478
#, c-format
msgid "invalid author identity '%s'"
msgstr "ungültige Autor-Identität '%s'"
#: sequencer.c:1452
msgid "corrupt author: missing date information"
msgstr "unbrauchbarer Autor: Datumsinformationen fehlen"
#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890
#: builtin/merge.c:915
msgid "failed to write commit object"
msgstr "Fehler beim Schreiben des Commit-Objektes."
#: sequencer.c:1518 sequencer.c:4237
#, c-format
msgid "could not update %s"
msgstr "Konnte %s nicht aktualisieren."
#: sequencer.c:1567
#, c-format
msgid "could not parse commit %s"
msgstr "Konnte Commit %s nicht parsen."
#: sequencer.c:1572
#, c-format
msgid "could not parse parent commit %s"
msgstr "Konnte Eltern-Commit %s nicht parsen."
#: sequencer.c:1655 sequencer.c:1766
#, c-format
msgid "unknown command: %d"
msgstr "Unbekannter Befehl: %d"
#: sequencer.c:1713 sequencer.c:1738
#, c-format
msgid "This is a combination of %d commits."
msgstr "Das ist eine Kombination aus %d Commits."
#: sequencer.c:1723
msgid "need a HEAD to fixup"
msgstr "benötige HEAD für fixup"
#: sequencer.c:1725 sequencer.c:3338
msgid "could not read HEAD"
msgstr "Konnte HEAD nicht lesen"
#: sequencer.c:1727
msgid "could not read HEAD's commit message"
msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen"
#: sequencer.c:1733
#, c-format
msgid "cannot write '%s'"
msgstr "kann '%s' nicht schreiben"
#: sequencer.c:1740 git-rebase--preserve-merges.sh:486
msgid "This is the 1st commit message:"
msgstr "Das ist die erste Commit-Beschreibung:"
#: sequencer.c:1748
#, c-format
msgid "could not read commit message of %s"
msgstr "Konnte Commit-Beschreibung von %s nicht lesen."
#: sequencer.c:1755
#, c-format
msgid "This is the commit message #%d:"
msgstr "Das ist Commit-Beschreibung #%d:"
#: sequencer.c:1761
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Die Commit-Beschreibung #%d wird ausgelassen:"
#: sequencer.c:1849
msgid "your index file is unmerged."
msgstr "Ihre Index-Datei ist nicht zusammengeführt."
#: sequencer.c:1856
msgid "cannot fixup root commit"
msgstr "kann fixup nicht auf Root-Commit anwenden"
#: sequencer.c:1875
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "Commit %s ist ein Merge, aber die Option -m wurde nicht angegeben."
#: sequencer.c:1883 sequencer.c:1891
#, c-format
msgid "commit %s does not have parent %d"
msgstr "Commit %s hat keinen Eltern-Commit %d"
#: sequencer.c:1897
#, c-format
msgid "cannot get commit message for %s"
msgstr "Kann keine Commit-Beschreibung für %s bekommen."
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
#: sequencer.c:1916
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kann Eltern-Commit %s nicht parsen"
#: sequencer.c:1981
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "Konnte '%s' nicht zu '%s' umbenennen."
#: sequencer.c:2038
#, c-format
msgid "could not revert %s... %s"
msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen"
#: sequencer.c:2039
#, c-format
msgid "could not apply %s... %s"
msgstr "Konnte %s... (%s) nicht anwenden"
#: sequencer.c:2059
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "Weglassen von %s %s -- Patch-Inhalte sind bereits im Upstream-Branch\n"
#: sequencer.c:2117
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: Fehler beim Lesen des Index"
#: sequencer.c:2124
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: Fehler beim Aktualisieren des Index"
#: sequencer.c:2201
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s akzeptiert keine Argumente: '%s'"
#: sequencer.c:2210
#, c-format
msgid "missing arguments for %s"
msgstr "Fehlende Argumente für %s."
#: sequencer.c:2241
#, c-format
msgid "could not parse '%s'"
msgstr "Konnte '%s' nicht parsen."
#: sequencer.c:2302
#, c-format
msgid "invalid line %d: %.*s"
msgstr "Ungültige Zeile %d: %.*s"
#: sequencer.c:2313
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen"
#: sequencer.c:2399
msgid "cancelling a cherry picking in progress"
msgstr "Abbrechen eines laufenden \"cherry-pick\""
#: sequencer.c:2408
msgid "cancelling a revert in progress"
msgstr "Abbrechen eines laufenden \"revert\""
#: sequencer.c:2452
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
"Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen."
#: sequencer.c:2454
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "Unbenutzbares Instruktionsblatt: '%s'"
#: sequencer.c:2459
msgid "no commits parsed."
msgstr "Keine Commits geparst."
#: sequencer.c:2470
msgid "cannot cherry-pick during a revert."
msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen."
#: sequencer.c:2472
msgid "cannot revert during a cherry-pick."
msgstr "Kann Revert nicht während eines Cherry-Picks ausführen."
#: sequencer.c:2550
#, c-format
msgid "invalid value for %s: %s"
msgstr "Ungültiger Wert für %s: %s"
#: sequencer.c:2657
msgid "unusable squash-onto"
msgstr "Unbenutzbares squash-onto."
#: sequencer.c:2677
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "Fehlerhaftes Optionsblatt: '%s'"
#: sequencer.c:2769 sequencer.c:4609
msgid "empty commit set passed"
msgstr "leere Menge von Commits übergeben"
#: sequencer.c:2786
msgid "revert is already in progress"
msgstr "\"revert\" ist bereits im Gange"
#: sequencer.c:2788
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "Versuchen Sie \"git revert (--continue | %s--abort | --quit)\""
#: sequencer.c:2791
msgid "cherry-pick is already in progress"
msgstr "\"cherry-pick\" wird bereits durchgeführt"
#: sequencer.c:2793
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "Versuchen Sie \"git cherry-pick (--continue | %s--abort | --quit)\""
#: sequencer.c:2807
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "Konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen."
#: sequencer.c:2822
msgid "could not lock HEAD"
msgstr "Konnte HEAD nicht sperren"
#: sequencer.c:2882 sequencer.c:4325
msgid "no cherry-pick or revert in progress"
msgstr "kein \"cherry-pick\" oder \"revert\" im Gange"
#: sequencer.c:2884 sequencer.c:2895
msgid "cannot resolve HEAD"
msgstr "kann HEAD nicht auflösen"
#: sequencer.c:2886 sequencer.c:2930
msgid "cannot abort from a branch yet to be born"
msgstr "kann nicht abbrechen: bin auf einem Branch, der noch nicht geboren ist"
#: sequencer.c:2916 builtin/grep.c:745
#, c-format
msgid "cannot open '%s'"
msgstr "kann '%s' nicht öffnen"
#: sequencer.c:2918
#, c-format
msgid "cannot read '%s': %s"
msgstr "Kann '%s' nicht lesen: %s"
#: sequencer.c:2919
msgid "unexpected end of file"
msgstr "Unerwartetes Dateiende"
#: sequencer.c:2925
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt"
#: sequencer.c:2936
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Sie scheinen HEAD verändert zu haben. Keine Rückspulung, prüfen Sie HEAD."
#: sequencer.c:2977
msgid "no revert in progress"
msgstr "Kein Revert im Gange"
#: sequencer.c:2986
msgid "no cherry-pick in progress"
msgstr "kein \"cherry-pick\" im Gange"
#: sequencer.c:2996
msgid "failed to skip the commit"
msgstr "Überspringen des Commits fehlgeschlagen"
#: sequencer.c:3003
msgid "there is nothing to skip"
msgstr "Nichts zum Überspringen vorhanden"
#: sequencer.c:3006
#, c-format
msgid ""
"have you committed already?\n"
"try \"git %s --continue\""
msgstr ""
"Haben Sie bereits committet?\n"
"Versuchen Sie \"git %s --continue\""
#: sequencer.c:3168 sequencer.c:4217
msgid "cannot read HEAD"
msgstr "Kann HEAD nicht lesen"
#: sequencer.c:3185
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "Konnte '%s' nicht nach '%s' kopieren."
#: sequencer.c:3193
#, 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 ""
"Sie können den Commit nun nachbessern mit:\n"
"\n"
" git commit --amend %s\n"
"\n"
"Sobald Sie mit Ihren Änderungen zufrieden sind, führen Sie aus:\n"
"\n"
" git rebase --continue\n"
#: sequencer.c:3203
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Konnte %s... (%.*s) nicht anwenden"
#: sequencer.c:3210
#, c-format
msgid "Could not merge %.*s"
msgstr "Konnte \"%.*s\" nicht zusammenführen."
#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "Konnte '%s' nicht nach '%s' kopieren."
#: sequencer.c:3240
#, c-format
msgid "Executing: %s\n"
msgstr "Führe aus: %s\n"
#: sequencer.c:3255
#, c-format
msgid ""
"execution failed: %s\n"
"%sYou can fix the problem, and then run\n"
"\n"
" git rebase --continue\n"
"\n"
msgstr ""
"Ausführung fehlgeschlagen: %s\n"
"%sSie können das Problem beheben, und dann\n"
"\n"
"\tgit rebase --continue\n"
"\n"
"ausführen.\n"
#: sequencer.c:3261
msgid "and made changes to the index and/or the working tree\n"
msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert.\n"
#: sequencer.c:3267
#, 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 ""
"Ausführung erfolgreich: %s\n"
"Aber Änderungen in Index oder Arbeitsverzeichnis verblieben.\n"
"Committen Sie Ihre Änderungen oder benutzen Sie \"stash\".\n"
"Führen Sie dann aus:\n"
"\n"
" git rebase --continue\n"
"\n"
#: sequencer.c:3328
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "Unerlaubter Beschriftungsname: '%.*s'"
#: sequencer.c:3382
msgid "writing fake root commit"
msgstr "unechten Root-Commit schreiben"
#: sequencer.c:3387
msgid "writing squash-onto"
msgstr "squash-onto schreiben"
#: sequencer.c:3471
#, c-format
msgid "could not resolve '%s'"
msgstr "Konnte '%s' nicht auflösen."
#: sequencer.c:3502
msgid "cannot merge without a current revision"
msgstr "Kann nicht ohne einen aktuellen Commit mergen."
#: sequencer.c:3524
#, c-format
msgid "unable to parse '%.*s'"
msgstr "Konnte '%.*s' nicht parsen."
#: sequencer.c:3533
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "Nichts zum Zusammenführen: '%.*s'"
#: sequencer.c:3545
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
"Oktopus-Merge kann nicht auf Basis von [neuem Root-Commit] ausgeführt werden."
#: sequencer.c:3561
#, c-format
msgid "could not get commit message of '%s'"
msgstr "Konnte keine Commit-Beschreibung von '%s' bekommen."
#: sequencer.c:3730
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "Konnte nicht einmal versuchen '%.*s' zu mergen."
#: sequencer.c:3746
msgid "merge: Unable to write new index file"
msgstr "merge: Konnte neue Index-Datei nicht schreiben."
#: sequencer.c:3820
msgid "Cannot autostash"
msgstr "Kann automatischen Stash nicht erzeugen."
#: sequencer.c:3823
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Unerwartete 'stash'-Antwort: '%s'"
#: sequencer.c:3829
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Konnte Verzeichnis für '%s' nicht erstellen."
#: sequencer.c:3832
#, c-format
msgid "Created autostash: %s\n"
msgstr "Automatischen Stash erzeugt: %s\n"
#: sequencer.c:3836
msgid "could not reset --hard"
msgstr "Konnte 'reset --hard' nicht ausführen."
#: sequencer.c:3861
#, c-format
msgid "Applied autostash.\n"
msgstr "Automatischen Stash angewendet.\n"
#: sequencer.c:3873
#, c-format
msgid "cannot store %s"
msgstr "kann %s nicht speichern"
#: sequencer.c:3876
#, c-format
msgid ""
"%s\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
"%s\n"
"Ihre Änderungen sind im Stash sicher.\n"
"Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
#: sequencer.c:3881
msgid "Applying autostash resulted in conflicts."
msgstr "Beim Anwenden des automatischen Stash traten Konflikte auf."
#: sequencer.c:3882
msgid "Autostash exists; creating a new stash entry."
msgstr "Automatischer Stash existiert; ein neuer Stash-Eintrag wird erstellt."
#: sequencer.c:3974
#, c-format
msgid "%s: not a valid OID"
msgstr "%s: keine gültige OID"
#: sequencer.c:3979 git-rebase--preserve-merges.sh:769
msgid "could not detach HEAD"
msgstr "Konnte HEAD nicht loslösen"
#: sequencer.c:3994
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Angehalten bei HEAD\n"
#: sequencer.c:3996
#, c-format
msgid "Stopped at %s\n"
msgstr "Angehalten bei %s\n"
#: sequencer.c:4004
#, 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 ""
"Konnte TODO-Befehl nicht ausführen\n"
"\n"
" %.*s\n"
"Dieser wurde neu angesetzt; Um den Befehl zu bearbeiten, bevor fortgesetzt "
"wird,\n"
"bearbeiten Sie bitte zuerst die TODO-Liste:\n"
"\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
#: sequencer.c:4050
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Rebase (%d/%d)%s"
#: sequencer.c:4095
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Angehalten bei %s... %.*s\n"
#: sequencer.c:4166
#, c-format
msgid "unknown command %d"
msgstr "Unbekannter Befehl %d"
#: sequencer.c:4225
msgid "could not read orig-head"
msgstr "Konnte orig-head nicht lesen."
#: sequencer.c:4230
msgid "could not read 'onto'"
msgstr "Konnte 'onto' nicht lesen."
#: sequencer.c:4244
#, c-format
msgid "could not update HEAD to %s"
msgstr "Konnte HEAD nicht auf %s aktualisieren."
#: sequencer.c:4304
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "Erfolgreich Rebase ausgeführt und %s aktualisiert.\n"
#: sequencer.c:4337
msgid "cannot rebase: You have unstaged changes."
msgstr ""
"Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n"
"vorgemerkt sind."
#: sequencer.c:4346
msgid "cannot amend non-existing commit"
msgstr "Kann nicht existierenden Commit nicht nachbessern."
#: sequencer.c:4348
#, c-format
msgid "invalid file: '%s'"
msgstr "Ungültige Datei: '%s'"
#: sequencer.c:4350
#, c-format
msgid "invalid contents: '%s'"
msgstr "Ungültige Inhalte: '%s'"
#: sequencer.c:4353
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
"\n"
"Sie haben nicht committete Änderungen in Ihrem Arbeitsverzeichnis. Bitte\n"
"committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n"
"erneut aus."
#: sequencer.c:4389 sequencer.c:4428
#, c-format
msgid "could not write file: '%s'"
msgstr "Konnte Datei nicht schreiben: '%s'"
#: sequencer.c:4444
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "Konnte CHERRY_PICK_HEAD nicht löschen."
#: sequencer.c:4451
msgid "could not commit staged changes."
msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
#: sequencer.c:4477
#, c-format
msgid "invalid committer '%s'"
msgstr "ungültiger Commit-Ersteller '%s'"
#: sequencer.c:4586
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
#: sequencer.c:4590
#, c-format
msgid "%s: bad revision"
msgstr "%s: ungültiger Commit"
#: sequencer.c:4625
msgid "can't revert as initial commit"
msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
#: sequencer.c:5102
msgid "make_script: unhandled options"
msgstr "make_script: unbehandelte Optionen"
#: sequencer.c:5105
msgid "make_script: error preparing revisions"
msgstr "make_script: Fehler beim Vorbereiten der Commits"
#: sequencer.c:5347 sequencer.c:5364
msgid "nothing to do"
msgstr "Nichts zu tun."
#: sequencer.c:5383
msgid "could not skip unnecessary pick commands"
msgstr "Konnte unnötige \"pick\"-Befehle nicht auslassen."
#: sequencer.c:5480
msgid "the script was already rearranged."
msgstr "Das Script wurde bereits umgeordnet."
#: setup.c:133
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "'%s' liegt außerhalb des Repositories von '%s'"
#: setup.c:185
#, 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 ""
"%s: kein solcher Pfad im Arbeitsverzeichnis.\n"
"Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n"
"nicht existieren."
#: setup.c:198
#, 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 ""
"mehrdeutiges Argument '%s': unbekannter Commit oder Pfad existiert nicht\n"
"im Arbeitsverzeichnis\n"
"Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
"'git <Befehl> [<Commit>...] -- [<Datei>...]'"
#: setup.c:264
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr ""
"Die Option '%s' muss vor den Argumenten kommen, die keine Optionen sind."
#: setup.c:283
#, 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 ""
"mehrdeutiges Argument '%s': sowohl Commit als auch Dateiname\n"
"Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
"'git <Befehl> [<Commit>...] -- [<Datei>...]'"
#: setup.c:419
msgid "unable to set up work tree using invalid config"
msgstr ""
"Konnte Arbeitsverzeichnis mit ungültiger Konfiguration nicht einrichten."
#: setup.c:423
msgid "this operation must be run in a work tree"
msgstr "Diese Operation muss in einem Arbeitsverzeichnis ausgeführt werden."
#: setup.c:661
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden"
#: setup.c:669
msgid "unknown repository extensions found:"
msgstr "Unbekannte Repository-Erweiterungen gefunden:"
#: setup.c:681
msgid "repo version is 0, but v1-only extensions found:"
msgstr "Repository-Version ist 0, aber Erweiterungen nur für v1 gefunden:"
#: setup.c:700
#, c-format
msgid "error opening '%s'"
msgstr "Fehler beim Öffnen von '%s'."
#: setup.c:702
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "Zu groß, um eine .git-Datei zu sein: '%s'"
#: setup.c:704
#, c-format
msgid "error reading %s"
msgstr "Fehler beim Lesen von '%s'."
#: setup.c:706
#, c-format
msgid "invalid gitfile format: %s"
msgstr "Ungültiges gitfile-Format: %s"
#: setup.c:708
#, c-format
msgid "no path in gitfile: %s"
msgstr "Kein Pfad in gitfile: %s"
#: setup.c:710
#, c-format
msgid "not a git repository: %s"
msgstr "Kein Git-Repository: %s"
#: setup.c:812
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' zu groß"
#: setup.c:826
#, c-format
msgid "not a git repository: '%s'"
msgstr "Kein Git-Repository: '%s'"
#: setup.c:855 setup.c:857 setup.c:888
#, c-format
msgid "cannot chdir to '%s'"
msgstr "Kann nicht in Verzeichnis '%s' wechseln."
#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
msgid "cannot come back to cwd"
msgstr "Kann nicht zum aktuellen Arbeitsverzeichnis zurückwechseln."
#: setup.c:987
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "Konnte '%*s%s%s' nicht lesen."
#: setup.c:1225
msgid "Unable to read current working directory"
msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen."
#: setup.c:1234 setup.c:1240
#, c-format
msgid "cannot change to '%s'"
msgstr "Kann nicht nach '%s' wechseln."
#: setup.c:1245
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "Kein Git-Repository (oder irgendeines der Elternverzeichnisse): %s"
#: setup.c:1251
#, 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 ""
"Kein Git-Repository (oder irgendein Elternverzeichnis bis zum Einhängepunkt "
"%s)\n"
"Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)."
#: setup.c:1362
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"The owner of files must always have read and write permissions."
msgstr ""
"Problem mit Wert für Dateimodus (0%.3o) von core.sharedRepository.\n"
"Der Besitzer der Dateien muss immer Lese- und Schreibrechte haben."
#: setup.c:1409
msgid "open /dev/null or dup failed"
msgstr "Öffnen von /dev/null oder dup fehlgeschlagen."
#: setup.c:1424
msgid "fork failed"
msgstr "fork fehlgeschlagen"
#: setup.c:1429
msgid "setsid failed"
msgstr "setsid fehlgeschlagen"
#: sha1-file.c:470
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"Objektverzeichnis %s existiert nicht; prüfe .git/objects/info/alternates"
#: sha1-file.c:521
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "Konnte alternativen Objektpfad '%s' nicht normalisieren."
#: sha1-file.c:593
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s: ignoriere alternative Objektspeicher - Verschachtelung zu tief"
#: sha1-file.c:600
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "Konnte Objektverzeichnis '%s' nicht normalisieren."
#: sha1-file.c:643
msgid "unable to fdopen alternates lockfile"
msgstr "Konnte fdopen nicht auf Lock-Datei für \"alternates\" aufrufen."
#: sha1-file.c:661
msgid "unable to read alternates file"
msgstr "Konnte \"alternates\"-Datei nicht lesen."
#: sha1-file.c:668
msgid "unable to move new alternates file into place"
msgstr "Konnte neue \"alternates\"-Datei nicht übernehmen."
#: sha1-file.c:703
#, c-format
msgid "path '%s' does not exist"
msgstr "Pfad '%s' existiert nicht"
#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"Referenziertes Repository '%s' wird noch nicht als verknüpftes\n"
"Arbeitsverzeichnis unterstützt."
#: sha1-file.c:730
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
#: sha1-file.c:736
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
"Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
#: sha1-file.c:744
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
"eingehängt."
#: sha1-file.c:804
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s"
#: sha1-file.c:954
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "Versuche mmap %<PRIuMAX> über Limit %<PRIuMAX>."
#: sha1-file.c:975
msgid "mmap failed"
msgstr "mmap fehlgeschlagen"
#: sha1-file.c:1139
#, c-format
msgid "object file %s is empty"
msgstr "Objektdatei %s ist leer."
#: sha1-file.c:1274 sha1-file.c:2467
#, c-format
msgid "corrupt loose object '%s'"
msgstr "Fehlerhaftes loses Objekt '%s'."
#: sha1-file.c:1276 sha1-file.c:2471
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "Nutzlose Daten am Ende von losem Objekt '%s'."
#: sha1-file.c:1318
msgid "invalid object type"
msgstr "ungültiger Objekt-Typ"
#: sha1-file.c:1402
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "Konnte %s Kopfbereich nicht mit --allow-unknown-type entpacken."
#: sha1-file.c:1405
#, c-format
msgid "unable to unpack %s header"
msgstr "Konnte %s Kopfbereich nicht entpacken."
#: sha1-file.c:1411
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "Konnte %s Kopfbereich mit --allow-unknown-type nicht parsen."
#: sha1-file.c:1414
#, c-format
msgid "unable to parse %s header"
msgstr "Konnte %s Kopfbereich nicht parsen."
#: sha1-file.c:1641
#, c-format
msgid "failed to read object %s"
msgstr "Konnte Objekt %s nicht lesen."
#: sha1-file.c:1645
#, c-format
msgid "replacement %s not found for %s"
msgstr "Ersetzung %s für %s nicht gefunden."
#: sha1-file.c:1649
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "Loses Objekt %s (gespeichert in %s) ist beschädigt."
#: sha1-file.c:1653
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "Gepacktes Objekt %s (gespeichert in %s) ist beschädigt."
#: sha1-file.c:1758
#, c-format
msgid "unable to write file %s"
msgstr "Konnte Datei %s nicht schreiben."
#: sha1-file.c:1765
#, c-format
msgid "unable to set permission to '%s'"
msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
#: sha1-file.c:1772
msgid "file write error"
msgstr "Fehler beim Schreiben einer Datei."
#: sha1-file.c:1792
msgid "error when closing loose object file"
msgstr "Fehler beim Schließen der Datei für lose Objekte."
#: sha1-file.c:1857
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"Unzureichende Berechtigung zum Hinzufügen eines Objektes zur Repository-"
"Datenbank %s"
#: sha1-file.c:1859
msgid "unable to create temporary file"
msgstr "Konnte temporäre Datei nicht erstellen."
#: sha1-file.c:1883
msgid "unable to write loose object file"
msgstr "Fehler beim Schreiben der Datei für lose Objekte."
#: sha1-file.c:1889
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "Konnte neues Objekt %s (%d) nicht komprimieren."
#: sha1-file.c:1893
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd auf Objekt %s fehlgeschlagen (%d)"
#: sha1-file.c:1897
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "Fehler wegen instabilen Objektquelldaten für %s"
#: sha1-file.c:1907 builtin/pack-objects.c:1086
#, c-format
msgid "failed utime() on %s"
msgstr "Fehler beim Aufruf von utime() auf '%s'."
#: sha1-file.c:1984
#, c-format
msgid "cannot read object for %s"
msgstr "Kann Objekt für %s nicht lesen."
#: sha1-file.c:2035
msgid "corrupt commit"
msgstr "fehlerhafter Commit"
#: sha1-file.c:2043
msgid "corrupt tag"
msgstr "fehlerhaftes Tag"
#: sha1-file.c:2143
#, c-format
msgid "read error while indexing %s"
msgstr "Lesefehler beim Indizieren von '%s'."
#: sha1-file.c:2146
#, c-format
msgid "short read while indexing %s"
msgstr "read() zu kurz beim Indizieren von '%s'."
#: sha1-file.c:2219 sha1-file.c:2229
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: Fehler beim Einfügen in die Datenbank"
#: sha1-file.c:2235
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: nicht unterstützte Dateiart"
#: sha1-file.c:2259
#, c-format
msgid "%s is not a valid object"
msgstr "%s ist kein gültiges Objekt"
#: sha1-file.c:2261
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s ist kein gültiges '%s' Objekt"
#: sha1-file.c:2288 builtin/index-pack.c:192
#, c-format
msgid "unable to open %s"
msgstr "kann %s nicht öffnen"
#: sha1-file.c:2478 sha1-file.c:2531
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "Hash für %s stimmt nicht überein (%s erwartet)."
#: sha1-file.c:2502
#, c-format
msgid "unable to mmap %s"
msgstr "Konnte mmap nicht auf %s ausführen."
#: sha1-file.c:2507
#, c-format
msgid "unable to unpack header of %s"
msgstr "Konnte Kopfbereich von %s nicht entpacken."
#: sha1-file.c:2513
#, c-format
msgid "unable to parse header of %s"
msgstr "Konnte Kopfbereich von %s nicht parsen."
#: sha1-file.c:2524
#, c-format
msgid "unable to unpack contents of %s"
msgstr "Konnte Inhalt von %s nicht entpacken."
#: sha1-name.c:486
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "Kurzer SHA-1 %s ist mehrdeutig."
#: sha1-name.c:497
msgid "The candidates are:"
msgstr "Die Kandidaten sind:"
#: sha1-name.c:796
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 ""
"Git erzeugt normalerweise keine Referenzen die mit\n"
"40 Hex-Zeichen enden, da diese ignoriert werden wenn\n"
"Sie diese angeben. Diese Referenzen könnten aus Versehen\n"
"erzeugt worden sein. Zum Beispiel,\n"
"\n"
" git switch -c $br $(git rev-parse ...)\n"
"\n"
"wobei \"$br\" leer ist und eine 40-Hex-Referenz erzeugt\n"
"wurde. Bitte prüfen Sie diese Referenzen und löschen\n"
"Sie sie gegebenenfalls. Unterdrücken Sie diese Meldung\n"
"indem Sie \"git config advice.objectNameWarning false\"\n"
"ausführen."
#: sha1-name.c:916
#, c-format
msgid "log for '%.*s' only goes back to %s"
msgstr "Log für '%.*s' geht nur bis %s zurück"
#: sha1-name.c:924
#, c-format
msgid "log for '%.*s' only has %d entries"
msgstr "Log für '%.*s' hat nur %d Einträge"
#: sha1-name.c:1702
#, c-format
msgid "path '%s' exists on disk, but not in '%.*s'"
msgstr "Pfad '%s' befindet sich im Dateisystem, aber nicht in '%.*s'"
#: sha1-name.c:1708
#, c-format
msgid ""
"path '%s' exists, but not '%s'\n"
"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
msgstr ""
"Pfad '%s' existiert, aber nicht '%s'\n"
"Hinweis: Meinten Sie '%.*s:%s' auch bekannt als '%.*s:./%s'?"
#: sha1-name.c:1717
#, c-format
msgid "path '%s' does not exist in '%.*s'"
msgstr "Pfad '%s' existiert nicht in '%.*s'"
#: 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 ""
"Pfad '%s' ist im Index, aber nicht in Stufe %d\n"
"Hinweis: Meinten Sie ':%d:%s'?"
#: 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 ""
"Pfad '%s' ist im Index, aber nicht '%s'\n"
"Hinweis: Meinten Sie ':%d:%s' auch bekannt als ':%d:./%s'?"
#: sha1-name.c:1769
#, c-format
msgid "path '%s' exists on disk, but not in the index"
msgstr "Pfad '%s' existiert im Dateisystem, aber nicht im Index"
#: sha1-name.c:1771
#, c-format
msgid "path '%s' does not exist (neither on disk nor in the index)"
msgstr "Pfad '%s' existiert nicht (weder im Dateisystem noch im Index)"
#: sha1-name.c:1784
msgid "relative path syntax can't be used outside working tree"
msgstr ""
"Die Syntax für relative Pfade kann nicht außerhalb des Arbeitsverzeichnisses "
"benutzt werden."
#: sha1-name.c:1922
#, c-format
msgid "invalid object name '%.*s'."
msgstr "ungültiger Objektname '%.*s'."
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
#: strbuf.c:848
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
#: strbuf.c:850
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr "%u.%2.2u GiB/s"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
#: strbuf.c:858
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
#: strbuf.c:860
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr "%u.%2.2u MiB/s"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
#: strbuf.c:867
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
#: strbuf.c:869
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr "%u.%2.2u KiB/s"
#. TRANSLATORS: IEC 80000-13:2008 byte
#: strbuf.c:875
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
msgstr[0] "%u Byte"
msgstr[1] "%u Bytes"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
#: strbuf.c:877
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "%u Byte/s"
msgstr[1] "%u Bytes/s"
#: 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"
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
#: strbuf.c:1175
#, c-format
msgid "could not edit '%s'"
msgstr "Konnte '%s' nicht editieren."
#: submodule-config.c:237
#, c-format
msgid "ignoring suspicious submodule name: %s"
msgstr "Ignoriere verdächtigen Submodulnamen: %s"
#: submodule-config.c:304
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "Negative Werte für submodule.fetchjobs nicht erlaubt."
#: submodule-config.c:402
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
"Ignoriere '%s', was als eine Befehlszeilenoption '%s' interpretiert werden "
"würde."
#: submodule-config.c:499
#, c-format
msgid "invalid value for %s"
msgstr "Ungültiger Wert für %s"
#: submodule-config.c:766
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren"
#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Kann nicht zusammengeführte .gitmodules-Datei nicht ändern, lösen\n"
"Sie zuerst die Konflikte auf"
#: submodule.c:118 submodule.c:147
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Konnte keine Sektion in .gitmodules mit Pfad \"%s\" finden"
#: submodule.c:154
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen"
#: submodule.c:165
msgid "staging updated .gitmodules failed"
msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken"
#: submodule.c:327
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "In nicht ausgechecktem Submodul '%s'."
#: submodule.c:358
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'"
#: submodule.c:434
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "ungültiges --ignore-submodules Argument: %s"
#: submodule.c:816
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
"same. Skipping it."
msgstr ""
"Submodul in Commit %s beim Pfad: '%s' hat den gleichen Namen wie ein "
"Submodul. Wird übersprungen."
#: submodule.c:919
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "Submodul-Eintrag '%s' (%s) ist ein %s, kein Commit."
#: submodule.c:1004
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
"submodule %s"
msgstr ""
"Konnte 'git rev-list <Commits> --not --remotes -n 1' nicht in Submodul '%s' "
"ausführen."
#: submodule.c:1127
#, c-format
msgid "process for submodule '%s' failed"
msgstr "Prozess für Submodul '%s' fehlgeschlagen"
#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
#: submodule.c:1167
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Pushe Submodul '%s'\n"
#: submodule.c:1170
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Kann Push für Submodul '%s' nicht ausführen\n"
#: submodule.c:1462
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Anfordern des Submoduls %s%s\n"
#: submodule.c:1492
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Konnte nicht auf Submodul '%s' zugreifen\n"
#: submodule.c:1646
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
msgid ""
"Errors during submodule fetch:\n"
"%s"
msgstr ""
"Fehler während des Anforderns der Submodule:\n"
"%s"
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
#: submodule.c:1671
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' nicht als Git-Repository erkannt"
#: submodule.c:1688
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "Konnte 'git status --porcelain=2' nicht in Submodul %s ausführen"
#: submodule.c:1729
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "'git status --porcelain=2' ist in Submodul %s fehlgeschlagen"
#: submodule.c:1804
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "Konnte 'git status' in Submodul '%s' nicht starten."
#: submodule.c:1817
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen."
#: submodule.c:1832
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "Konnte core.worktree Einstellung in Submodul '%s' nicht aufheben."
#: submodule.c:1859 submodule.c:2169
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'"
#: submodule.c:1880
msgid "could not reset submodule index"
msgstr "konnte Index des Submoduls nicht zurücksetzen"
#: submodule.c:1922
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "Submodul '%s' hat einen geänderten Index."
#: submodule.c:1974
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Submodule '%s' konnte nicht aktualisiert werden."
#: submodule.c:2042
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr ""
"Git-Verzeichnis des Submoduls '%s' ist im Git-Verzeichnis '%.*s' enthalten."
#: submodule.c:2063
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
"relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n"
"wird nicht unterstützt"
#: submodule.c:2075 submodule.c:2134
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "Konnte Name für Submodul '%s' nicht nachschlagen."
#: submodule.c:2079
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "Verschieben von '%s' in ein existierendes Git-Verzeichnis verweigert."
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
#: submodule.c:2086
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s' to\n"
"'%s'\n"
msgstr ""
"Migriere Git-Verzeichnis von '%s%s' von\n"
"'%s' nach\n"
"'%s'\n"
#: submodule.c:2214
msgid "could not start ls-files in .."
msgstr "Konnte 'ls-files' nicht in .. starten"
#: submodule.c:2254
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet"
#: trailer.c:236
#, c-format
msgid "running trailer command '%s' failed"
msgstr "Ausführen des Anhang-Befehls '%s' fehlgeschlagen"
#: 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'"
msgstr "unbekannter Wert '%s' für Schlüssel %s"
#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323
#, c-format
msgid "more than one %s"
msgstr "mehr als ein %s"
#: trailer.c:728
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "leerer Anhang-Token in Anhang '%.*s'"
#: trailer.c:748
#, c-format
msgid "could not read input file '%s'"
msgstr "Konnte Eingabe-Datei '%s' nicht lesen"
#: trailer.c:751
msgid "could not read from stdin"
msgstr "konnte nicht von der Standard-Eingabe lesen"
#: trailer.c:1009 wrapper.c:676
#, c-format
msgid "could not stat %s"
msgstr "Konnte '%s' nicht lesen"
#: trailer.c:1011
#, c-format
msgid "file %s is not a regular file"
msgstr "Datei '%s' ist keine reguläre Datei"
#: trailer.c:1013
#, c-format
msgid "file %s is not writable by user"
msgstr "Datei %s ist vom Benutzer nicht beschreibbar."
#: trailer.c:1025
msgid "could not open temporary file"
msgstr "konnte temporäre Datei '%s' nicht öffnen"
#: trailer.c:1065
#, c-format
msgid "could not rename temporary file to %s"
msgstr "konnte temporäre Datei nicht zu %s umbenennen"
#: transport-helper.c:62 transport-helper.c:91
msgid "full write to remote helper failed"
msgstr "Vollständiges Schreiben zu Remote-Helper fehlgeschlagen."
#: transport-helper.c:145
#, c-format
msgid "unable to find remote helper for '%s'"
msgstr "Konnte Remote-Helper für '%s' nicht finden."
#: transport-helper.c:161 transport-helper.c:575
msgid "can't dup helper output fd"
msgstr ""
"Konnte dup() auf Dateideskriptor für Ausgaben des Remote-Helpers nicht "
"ausführen."
#: transport-helper.c:214
#, c-format
msgid ""
"unknown mandatory capability %s; this remote helper probably needs newer "
"version of Git"
msgstr ""
"Unbekannte erforderliche Fähigkeit %s; dieser Remote-Helper benötigt\n"
"wahrscheinlich eine neuere Version von Git."
#: transport-helper.c:220
msgid "this remote helper should implement refspec capability"
msgstr "Dieser Remote-Helper sollte die \"refspec\"-Fähigkeit implementieren."
#: transport-helper.c:287 transport-helper.c:429
#, c-format
msgid "%s unexpectedly said: '%s'"
msgstr "unerwartete Ausgabe von %s: '%s'"
#: transport-helper.c:417
#, c-format
msgid "%s also locked %s"
msgstr "%s sperrte auch %s"
#: transport-helper.c:497
msgid "couldn't run fast-import"
msgstr "Konnte \"fast-import\" nicht ausführen."
#: transport-helper.c:520
msgid "error while running fast-import"
msgstr "Fehler beim Ausführen von 'fast-import'."
#: transport-helper.c:549 transport-helper.c:1226
#, c-format
msgid "could not read ref %s"
msgstr "Konnte Referenz %s nicht lesen."
#: transport-helper.c:594
#, c-format
msgid "unknown response to connect: %s"
msgstr "Unbekannte Antwort auf 'connect': %s"
#: transport-helper.c:616
msgid "setting remote service path not supported by protocol"
msgstr ""
"Setzen des Remote-Service Pfads wird von dem Protokoll nicht unterstützt."
#: transport-helper.c:618
msgid "invalid remote service path"
msgstr "Ungültiger Remote-Service Pfad."
#: transport-helper.c:661 transport.c:1428
msgid "operation not supported by protocol"
msgstr "Die Operation wird von dem Protokoll nicht unterstützt."
#: transport-helper.c:664
#, c-format
msgid "can't connect to subservice %s"
msgstr "Kann keine Verbindung zu Subservice %s herstellen."
#: transport-helper.c:745
msgid "'option' without a matching 'ok/error' directive"
msgstr "'option' ohne passende 'ok/error' Direktive"
#: transport-helper.c:788
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "Erwartete ok/error, Remote-Helper gab '%s' aus."
#: transport-helper.c:841
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "Remote-Helper meldete unerwarteten Status von %s."
#: transport-helper.c:924
#, c-format
msgid "helper %s does not support dry-run"
msgstr "Remote-Helper %s unterstützt kein Trockenlauf."
#: transport-helper.c:927
#, c-format
msgid "helper %s does not support --signed"
msgstr "Remote-Helper %s unterstützt kein --signed."
#: transport-helper.c:930
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "Remote-Helper %s unterstützt kein --signed=if-asked."
#: transport-helper.c:935
#, c-format
msgid "helper %s does not support --atomic"
msgstr "Remote-Helper %s unterstützt kein --atomic."
#: transport-helper.c:941
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "Remote-Helper %s unterstützt nicht 'push-option'."
#: transport-helper.c:1040
msgid "remote-helper doesn't support push; refspec needed"
msgstr "Remote-Helper unterstützt kein Push; Refspec benötigt"
#: transport-helper.c:1045
#, c-format
msgid "helper %s does not support 'force'"
msgstr "Remote-Helper %s unterstützt kein 'force'."
#: transport-helper.c:1092
msgid "couldn't run fast-export"
msgstr "Konnte \"fast-export\" nicht ausführen."
#: transport-helper.c:1097
msgid "error while running fast-export"
msgstr "Fehler beim Ausführen von \"fast-export\"."
#: transport-helper.c:1122
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"Perhaps you should specify a branch.\n"
msgstr ""
"Keine gemeinsamen Referenzen und nichts spezifiziert; keine Ausführung.\n"
"Vielleicht sollten Sie einen Branch angeben.\n"
#: transport-helper.c:1203
#, c-format
msgid "unsupported object format '%s'"
msgstr "nicht unterstütztes Objekt-Format '%s'"
#: transport-helper.c:1212
#, c-format
msgid "malformed response in ref list: %s"
msgstr "Ungültige Antwort in Referenzliste: %s"
#: transport-helper.c:1364
#, c-format
msgid "read(%s) failed"
msgstr "Lesen von %s fehlgeschlagen."
#: transport-helper.c:1391
#, c-format
msgid "write(%s) failed"
msgstr "Schreiben von %s fehlgeschlagen."
#: transport-helper.c:1440
#, c-format
msgid "%s thread failed"
msgstr "Thread %s fehlgeschlagen."
#: transport-helper.c:1444
#, c-format
msgid "%s thread failed to join: %s"
msgstr "Fehler beim Beitreten zu Thread %s: %s"
#: transport-helper.c:1463 transport-helper.c:1467
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "Kann Thread zum Kopieren von Daten nicht starten: %s"
#: transport-helper.c:1504
#, c-format
msgid "%s process failed to wait"
msgstr "Fehler beim Warten von Prozess %s."
#: transport-helper.c:1508
#, c-format
msgid "%s process failed"
msgstr "Prozess %s fehlgeschlagen"
#: transport-helper.c:1526 transport-helper.c:1535
msgid "can't start thread for copying data"
msgstr "Kann Thread zum Kopieren von Daten nicht starten."
#: transport.c:116
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr "Würde Upstream-Branch von '%s' zu '%s' von '%s' setzen\n"
#: transport.c:145
#, c-format
msgid "could not read bundle '%s'"
msgstr "Konnte Paket '%s' nicht lesen."
#: transport.c:220
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: ungültige --depth Option '%s'"
#: transport.c:269
msgid "see protocol.version in 'git help config' for more details"
msgstr "Siehe protocol.version in 'git help config' für weitere Informationen"
#: transport.c:270
msgid "server options require protocol version 2 or later"
msgstr "Server-Optionen benötigen Protokoll-Version 2 oder höher"
#: transport.c:712
msgid "could not parse transport.color.* config"
msgstr "Konnte transport.color.* Konfiguration nicht parsen."
#: transport.c:785
msgid "support for protocol v2 not implemented yet"
msgstr "Unterstützung für Protokoll v2 noch nicht implementiert."
#: transport.c:919
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "Unbekannter Wert für Konfiguration '%s': %s"
#: transport.c:985
#, c-format
msgid "transport '%s' not allowed"
msgstr "Übertragungsart '%s' nicht erlaubt."
#: transport.c:1038
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync wird nicht länger unterstützt."
#: transport.c:1140
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
"Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n"
"Remote-Repository gefunden wurden:\n"
#: 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 ""
"\n"
"Bitte versuchen Sie\n"
"\n"
"\tgit push --recurse-submodules=on-demand\n"
"\n"
"oder wechseln Sie in das Verzeichnis und benutzen Sie\n"
"\n"
"\tgit push\n"
"\n"
"zum Versenden zu einem Remote-Repository.\n"
"\n"
#: transport.c:1152
msgid "Aborting."
msgstr "Abbruch."
#: transport.c:1297
msgid "failed to push all needed submodules"
msgstr "Fehler beim Versand aller erforderlichen Submodule."
#: tree-walk.c:32
msgid "too-short tree object"
msgstr "zu kurzes Tree-Objekt"
#: tree-walk.c:38
msgid "malformed mode in tree entry"
msgstr "fehlerhafter Modus in Tree-Eintrag"
#: tree-walk.c:42
msgid "empty filename in tree entry"
msgstr "leerer Dateiname in Tree-Eintrag"
#: tree-walk.c:117
msgid "too-short tree file"
msgstr "zu kurze Tree-Datei"
#: unpack-trees.c:113
#, 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 ""
"Ihre lokalen Änderungen in den folgenden Dateien würden beim Auschecken\n"
"überschrieben werden:\n"
"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches\n"
"wechseln."
#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
"Ihre lokalen Änderungen in den folgenden Dateien würden beim Auschecken\n"
"überschrieben werden:\n"
"%%s"
#: unpack-trees.c:118
#, 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 ""
"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n"
"überschrieben werden:\n"
"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen."
#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr ""
"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n"
"überschrieben werden:\n"
"%%s"
#: unpack-trees.c:123
#, 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 ""
"Ihre lokalen Änderungen in den folgenden Dateien würden durch %s\n"
"überschrieben werden:\n"
"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen."
#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%s"
msgstr ""
"Ihre lokalen Änderungen würden durch %s überschrieben werden.\n"
"%%s"
#: unpack-trees.c:130
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
"Durch die Aktualisierung der folgenden Verzeichnisse würden unversionierte\n"
"Dateien in diesen Verzeichnissen verloren gehen:\n"
"%s"
#: unpack-trees.c:134
#, 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 ""
"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
"den Checkout entfernt werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
#: unpack-trees.c:136
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch "
"den\n"
"Checkout entfernt werden:\n"
"%%s"
#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
"den Merge entfernt werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen."
#: unpack-trees.c:141
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr ""
"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch "
"den\n"
"Merge entfernt werden:\n"
"%%s"
#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
"den %s entfernt werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%s"
msgstr ""
"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
"den %s entfernt werden:\n"
"%%s"
#: unpack-trees.c:152
#, 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 ""
"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
"den Checkout überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
"%%s"
msgstr ""
"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch "
"den\n"
"Checkout überschrieben werden:\n"
"%%s"
#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
"den Merge überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen."
#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
"den Merge überschrieben werden:\n"
"%%s"
#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
"den %s überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
#: unpack-trees.c:164
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch "
"den\n"
"%s überschrieben werden:\n"
"%%s"
#: unpack-trees.c:172
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden."
#: unpack-trees.c:175
#, c-format
msgid ""
"Cannot update submodule:\n"
"%s"
msgstr ""
"Kann Submodul nicht aktualisieren:\n"
"%s"
#: unpack-trees.c:178
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
"patterns:\n"
"%s"
msgstr ""
"Die folgenden Pfade sind nicht aktuell und wurden trotz partieller Muster\n"
"übrig gelassen:\n"
"%s"
#: unpack-trees.c:180
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
"%s"
msgstr ""
"Die folgenden Pfade sind nicht zusammengeführt und wurden trotz\n"
"partieller Muster übrig gelassen:\n"
"%s"
#: unpack-trees.c:182
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
"patterns:\n"
"%s"
msgstr ""
"Die folgenden Pfade waren bereits vorhanden und wurden deshalb trotz\n"
"partieller Muster nicht aktualisiert:\n"
"%s"
#: unpack-trees.c:262
#, c-format
msgid "Aborting\n"
msgstr "Abbruch\n"
#: unpack-trees.c:289
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
"reapply`.\n"
msgstr ""
"Nachdem die obigen Pfade behoben sind, können Sie `git sparse-checkout "
"reapply` ausführen.\n"
#: unpack-trees.c:350
msgid "Updating files"
msgstr "Aktualisiere Dateien"
#: unpack-trees.c:382
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 ""
"Die folgenden Pfade haben kollidiert (z.B. case-sensitive Pfade\n"
"auf einem case-insensitiven Dateisystem) und nur einer von der\n"
"selben Kollissionsgruppe ist im Arbeitsverzeichnis:\n"
#: unpack-trees.c:1498
msgid "Updating index flags"
msgstr "Aktualisiere Index-Markierungen"
#: upload-pack.c:1516
msgid "expected flush after fetch arguments"
msgstr "erwartete Flush nach Abrufen der Argumente"
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "Ungültiges URL-Schema oder Suffix '://' fehlt"
#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
#, c-format
msgid "invalid %XX escape sequence"
msgstr "ungültige Escape-Sequenz %XX"
#: urlmatch.c:215
msgid "missing host and scheme is not 'file:'"
msgstr "fehlender Host und Schema ist nicht 'file:'"
#: urlmatch.c:232
msgid "a 'file:' URL may not have a port number"
msgstr "eine 'file:' URL darf keine Portnummer enthalten"
#: urlmatch.c:247
msgid "invalid characters in host name"
msgstr "Hostname enthält ungültige Zeichen"
#: urlmatch.c:292 urlmatch.c:303
msgid "invalid port number"
msgstr "ungültige Portnummer"
#: urlmatch.c:371
msgid "invalid '..' path segment"
msgstr "ungültiges '..' Pfadsegment"
#: walker.c:170
msgid "Fetching objects"
msgstr "Anfordern der Objekte"
#: worktree.c:236 builtin/am.c:2116
#, c-format
msgid "failed to read '%s'"
msgstr "Fehler beim Lesen von '%s'"
#: worktree.c:283
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "'%s' im Hauptarbeitsverzeichnis ist nicht das Repository-Verzeichnis."
#: worktree.c:294
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "'%s' Datei enthält nicht den absoluten Pfad zum Arbeitsverzeichnis."
#: worktree.c:306
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' existiert nicht."
#: worktree.c:312
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' ist keine .git-Datei, Fehlercode %d"
#: worktree.c:321
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' zeigt nicht zurück auf '%s'"
#: worktree.c:587
msgid "not a directory"
msgstr "kein Verzeichnis"
#: worktree.c:596
msgid ".git is not a file"
msgstr ".git ist keine Datei"
#: worktree.c:598
msgid ".git file broken"
msgstr ".git-Datei kaputt"
#: worktree.c:600
msgid ".git file incorrect"
msgstr ".git-Datei fehlerhaft"
#: worktree.c:670
msgid "not a valid path"
msgstr "kein gültiger Pfad"
#: worktree.c:676
msgid "unable to locate repository; .git is not a file"
msgstr "Konnte Repository nicht finden; .git ist keine Datei"
#: worktree.c:679
msgid "unable to locate repository; .git file broken"
msgstr "Konnte Repository nicht finden; .git-Datei ist kaputt"
#: worktree.c:685
msgid "gitdir unreadable"
msgstr "gitdir nicht lesbar"
#: worktree.c:689
msgid "gitdir incorrect"
msgstr "gitdir fehlerhaft"
#: wrapper.c:197 wrapper.c:367
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "konnte '%s' nicht zum Lesen und Schreiben öffnen"
#: wrapper.c:398 wrapper.c:599
#, c-format
msgid "unable to access '%s'"
msgstr "konnte nicht auf '%s' zugreifen"
#: wrapper.c:607
msgid "unable to get current working directory"
msgstr "konnte aktuelles Arbeitsverzeichnis nicht bekommen"
#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "Nicht zusammengeführte Pfade:"
#: wt-status.c:187 wt-status.c:219
msgid " (use \"git restore --staged <file>...\" to unstage)"
msgstr ""
" (benutzen Sie \"git restore --staged <Datei>...\" zum Entfernen aus der "
"Staging-Area)"
#: wt-status.c:190 wt-status.c:222
#, c-format
msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
msgstr ""
" (benutzen Sie \"git restore --source=%s --staged <Datei>...\" zum "
"Entfernen aus der Staging-Area)"
#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
" (benutzen Sie \"git rm --cached <Datei>...\" zum Entfernen aus der Staging-"
"Area)"
#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung entsprechend zu "
"markieren)"
#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
#: wt-status.c:211 wt-status.c:1070
msgid "Changes to be committed:"
msgstr "Zum Commit vorgemerkte Änderungen:"
#: wt-status.c:234 wt-status.c:1079
msgid "Changes not staged for commit:"
msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (benutzen Sie \"git add <Datei>...\", um die Änderungen zum Commit "
"vorzumerken)"
#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Änderungen zum Commit "
"vorzumerken)"
#: wt-status.c:241
msgid ""
" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
" (benutzen Sie \"git restore <Datei>...\", um die Änderungen im "
"Arbeitsverzeichnis zu verwerfen)"
#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (committen oder verwerfen Sie den unversionierten oder geänderten Inhalt "
"in den Submodulen)"
#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (benutzen Sie \"git %s <Datei>...\", um die Änderungen zum Commit "
"vorzumerken)"
#: wt-status.c:266
msgid "both deleted:"
msgstr "beide gelöscht:"
#: wt-status.c:268
msgid "added by us:"
msgstr "von uns hinzugefügt:"
#: wt-status.c:270
msgid "deleted by them:"
msgstr "von denen gelöscht:"
#: wt-status.c:272
msgid "added by them:"
msgstr "von denen hinzugefügt:"
#: wt-status.c:274
msgid "deleted by us:"
msgstr "von uns gelöscht:"
#: wt-status.c:276
msgid "both added:"
msgstr "von beiden hinzugefügt:"
#: wt-status.c:278
msgid "both modified:"
msgstr "von beiden geändert:"
#: wt-status.c:288
msgid "new file:"
msgstr "neue Datei:"
#: wt-status.c:290
msgid "copied:"
msgstr "kopiert:"
#: wt-status.c:292
msgid "deleted:"
msgstr "gelöscht:"
#: wt-status.c:294
msgid "modified:"
msgstr "geändert:"
#: wt-status.c:296
msgid "renamed:"
msgstr "umbenannt:"
#: wt-status.c:298
msgid "typechange:"
msgstr "Typänderung:"
#: wt-status.c:300
msgid "unknown:"
msgstr "unbekannt:"
#: wt-status.c:302
msgid "unmerged:"
msgstr "nicht gemerged:"
#: wt-status.c:382
msgid "new commits, "
msgstr "neue Commits, "
#: wt-status.c:384
msgid "modified content, "
msgstr "geänderter Inhalt, "
#: wt-status.c:386
msgid "untracked content, "
msgstr "unversionierter Inhalt, "
#: wt-status.c:903
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Ihr Stash hat gerade %d Eintrag"
msgstr[1] "Ihr Stash hat gerade %d Einträge"
#: wt-status.c:934
msgid "Submodules changed but not updated:"
msgstr "Submodule geändert, aber nicht aktualisiert:"
#: wt-status.c:936
msgid "Submodule changes to be committed:"
msgstr "Änderungen in Submodul zum Committen:"
#: wt-status.c:1018
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
msgstr ""
"Ändern oder entfernen Sie nicht die obige Zeile.\n"
"Alles unterhalb von ihr wird ignoriert."
#: wt-status.c:1110
#, 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 ""
"\n"
"Es wurden %.2f Sekunden benötigt, um die voraus/hinterher-Werte zu "
"berechnen.\n"
"Sie können '--no-ahead-behind' benutzen, um das zu verhindern.\n"
#: wt-status.c:1140
msgid "You have unmerged paths."
msgstr "Sie haben nicht zusammengeführte Pfade."
#: wt-status.c:1143
msgid " (fix conflicts and run \"git commit\")"
msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
#: wt-status.c:1145
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)"
#: wt-status.c:1149
msgid "All conflicts fixed but you are still merging."
msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge."
#: wt-status.c:1152
msgid " (use \"git commit\" to conclude merge)"
msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)"
#: wt-status.c:1161
msgid "You are in the middle of an am session."
msgstr "Eine \"am\"-Sitzung ist im Gange."
#: wt-status.c:1164
msgid "The current patch is empty."
msgstr "Der aktuelle Patch ist leer."
#: wt-status.c:1168
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git am --continue\" aus)"
#: wt-status.c:1170
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)"
#: wt-status.c:1172
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
" (benutzen Sie \"git am --abort\", um den ursprünglichen Branch "
"wiederherzustellen)"
#: wt-status.c:1305
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo fehlt."
#: wt-status.c:1307
msgid "No commands done."
msgstr "Keine Befehle ausgeführt."
#: wt-status.c:1310
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Zuletzt ausgeführter Befehl (%d Befehl ausgeführt):"
msgstr[1] "Zuletzt ausgeführte Befehle (%d Befehle ausgeführt):"
#: wt-status.c:1321
#, c-format
msgid " (see more in file %s)"
msgstr " (mehr Informationen in Datei %s)"
#: wt-status.c:1326
msgid "No commands remaining."
msgstr "Keine Befehle verbleibend."
#: wt-status.c:1329
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Nächster auszuführender Befehl (%d Befehle verbleibend):"
msgstr[1] "Nächste auszuführende Befehle (%d Befehle verbleibend):"
#: wt-status.c:1337
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)"
#: wt-status.c:1349
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Sie sind gerade beim Rebase von Branch '%s' auf '%s'."
#: wt-status.c:1354
msgid "You are currently rebasing."
msgstr "Sie sind gerade beim Rebase."
#: wt-status.c:1367
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" "
"aus)"
#: wt-status.c:1369
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)"
#: wt-status.c:1371
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
" (benutzen Sie \"git rebase --abort\", um den ursprünglichen Branch "
"auszuchecken)"
#: wt-status.c:1378
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)"
#: wt-status.c:1382
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf "
"'%s' im Gange ist."
#: wt-status.c:1387
msgid "You are currently splitting a commit during a rebase."
msgstr "Sie teilen gerade einen Commit während eines Rebase auf."
#: wt-status.c:1390
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Sobald Ihr Arbeitsverzeichnis unverändert ist, führen Sie \"git rebase --"
"continue\" aus)"
#: wt-status.c:1394
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Sie editieren gerade einen Commit während eines Rebase von Branch '%s' auf "
"'%s'."
#: wt-status.c:1399
msgid "You are currently editing a commit during a rebase."
msgstr "Sie editieren gerade einen Commit während eines Rebase."
#: wt-status.c:1402
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (benutzen Sie \"git commit --amend\", um den aktuellen Commit "
"nachzubessern)"
#: wt-status.c:1404
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen "
"abgeschlossen sind)"
#: wt-status.c:1415
msgid "Cherry-pick currently in progress."
msgstr "Cherry-pick zurzeit im Gange."
#: wt-status.c:1418
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus."
#: wt-status.c:1425
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --continue"
"\" aus)"
#: wt-status.c:1428
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (Führen Sie \"git cherry-pick --continue\" aus, um weiterzumachen)"
#: wt-status.c:1431
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)"
#: wt-status.c:1433
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr ""
" (benutzen Sie \"git cherry-pick --skip\", um diesen Patch auszulassen)"
#: wt-status.c:1435
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (benutzen Sie \"git cherry-pick --abort\", um die Cherry-Pick-Operation "
"abzubrechen)"
#: wt-status.c:1445
msgid "Revert currently in progress."
msgstr "Revert zurzeit im Gange."
#: wt-status.c:1448
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Sie sind gerade beim Revert von Commit '%s'."
#: wt-status.c:1454
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git revert --continue\" "
"aus)"
#: wt-status.c:1457
msgid " (run \"git revert --continue\" to continue)"
msgstr " (Führen Sie \"git revert --continue\", um weiterzumachen)"
#: wt-status.c:1460
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)"
#: wt-status.c:1462
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (benutzen Sie \"git revert --skip\", um diesen Patch auszulassen)"
#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)"
#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Sie sind gerade bei einer binären Suche, gestartet von Branch '%s'."
#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "Sie sind gerade bei einer binären Suche."
#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch "
"zurückzukehren)"
#: wt-status.c:1492
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr ""
"Sie sind in einem partiellen Checkout mit %d%% vorhandenen versionierten "
"Dateien."
#: wt-status.c:1731
msgid "On branch "
msgstr "Auf Branch "
#: wt-status.c:1738
msgid "interactive rebase in progress; onto "
msgstr "interaktives Rebase im Gange; auf "
#: wt-status.c:1740
msgid "rebase in progress; onto "
msgstr "Rebase im Gange; auf "
#: wt-status.c:1750
msgid "Not currently on any branch."
msgstr "Im Moment auf keinem Branch."
#: wt-status.c:1767
msgid "Initial commit"
msgstr "Initialer Commit"
#: wt-status.c:1768
msgid "No commits yet"
msgstr "Noch keine Commits"
#: wt-status.c:1782
msgid "Untracked files"
msgstr "Unversionierte Dateien"
#: wt-status.c:1784
msgid "Ignored files"
msgstr "Ignorierte Dateien"
#: wt-status.c:1788
#, 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 ""
"Es dauerte %.2f Sekunden die unversionierten Dateien zu bestimmen.\n"
"'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n"
"neue Dateien selbstständig hinzuzufügen (siehe 'git help status')."
#: wt-status.c:1794
#, c-format
msgid "Untracked files not listed%s"
msgstr "Unversionierte Dateien nicht aufgelistet%s"
#: wt-status.c:1796
msgid " (use -u option to show untracked files)"
msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)"
#: wt-status.c:1802
msgid "No changes"
msgstr "Keine Änderungen"
#: wt-status.c:1807
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder "
"\"git commit -a\")\n"
#: wt-status.c:1811
#, c-format
msgid "no changes added to commit\n"
msgstr "keine Änderungen zum Commit vorgemerkt\n"
#: wt-status.c:1815
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
"nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
"(benutzen Sie \"git add\" zum Versionieren)\n"
#: wt-status.c:1819
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
#: wt-status.c:1823
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"nichts zu committen (erstellen/kopieren Sie Dateien und benutzen\n"
"Sie \"git add\" zum Versionieren)\n"
#: wt-status.c:1827 wt-status.c:1833
#, c-format
msgid "nothing to commit\n"
msgstr "nichts zu committen\n"
#: wt-status.c:1830
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien "
"anzuzeigen)\n"
#: wt-status.c:1835
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
#: wt-status.c:1940
msgid "No commits yet on "
msgstr "Noch keine Commits in "
#: wt-status.c:1944
msgid "HEAD (no branch)"
msgstr "HEAD (kein Branch)"
#: wt-status.c:1975
msgid "different"
msgstr "unterschiedlich"
#: wt-status.c:1977 wt-status.c:1985
msgid "behind "
msgstr "hinterher "
#: wt-status.c:1980 wt-status.c:1983
msgid "ahead "
msgstr "voraus "
#. TRANSLATORS: the action is e.g. "pull with rebase"
#: wt-status.c:2505
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr ""
"%s nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt sind."
#: wt-status.c:2511
msgid "additionally, your index contains uncommitted changes."
msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen."
#: wt-status.c:2513
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
"%s nicht möglich: Die Staging-Area enthält nicht committete Änderungen."
#: compat/precompose_utf8.c:58 builtin/clone.c:456
#, c-format
msgid "failed to unlink '%s'"
msgstr "Konnte '%s' nicht entfernen."
#: builtin/add.c:26
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..."
#: builtin/add.c:88
#, c-format
msgid "unexpected diff status %c"
msgstr "unerwarteter Differenz-Status %c"
#: builtin/add.c:93 builtin/commit.c:285
msgid "updating files failed"
msgstr "Aktualisierung der Dateien fehlgeschlagen"
#: builtin/add.c:103
#, c-format
msgid "remove '%s'\n"
msgstr "lösche '%s'\n"
#: builtin/add.c:178
msgid "Unstaged changes after refreshing the index:"
msgstr ""
"Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
#: builtin/add.c:272 builtin/rev-parse.c:904
msgid "Could not read the index"
msgstr "Konnte den Index nicht lesen"
#: builtin/add.c:283
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
#: builtin/add.c:287
msgid "Could not write patch"
msgstr "Konnte Patch nicht schreiben"
#: builtin/add.c:290
msgid "editing patch failed"
msgstr "Bearbeitung des Patches fehlgeschlagen"
#: builtin/add.c:293
#, c-format
msgid "Could not stat '%s'"
msgstr "Konnte Verzeichnis '%s' nicht lesen"
#: builtin/add.c:295
msgid "Empty patch. Aborted."
msgstr "Leerer Patch. Abgebrochen."
#: builtin/add.c:300
#, c-format
msgid "Could not apply '%s'"
msgstr "Konnte '%s' nicht anwenden."
#: builtin/add.c:308
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien "
"ignoriert:\n"
#: 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
msgid "dry run"
msgstr "Probelauf"
#: builtin/add.c:331
msgid "interactive picking"
msgstr "interaktives Auswählen"
#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "Blöcke interaktiv auswählen"
#: builtin/add.c:333
msgid "edit current diff and apply"
msgstr "aktuelle Unterschiede editieren und anwenden"
#: builtin/add.c:334
msgid "allow adding otherwise ignored files"
msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben"
#: builtin/add.c:335
msgid "update tracked files"
msgstr "versionierte Dateien aktualisieren"
#: builtin/add.c:336
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
"erneutes Normalisieren der Zeilenenden von versionierten Dateien (impliziert "
"-u)"
#: builtin/add.c:337
msgid "record only the fact that the path will be added later"
msgstr "nur speichern, dass der Pfad später hinzugefügt werden soll"
#: builtin/add.c:338
msgid "add changes from all tracked and untracked files"
msgstr ""
"Änderungen von allen versionierten und unversionierten Dateien hinzufügen"
#: builtin/add.c:341
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "gelöschte Pfade im Arbeitsverzeichnis ignorieren (genau wie --no-all)"
#: builtin/add.c:343
msgid "don't add, only refresh the index"
msgstr "nichts hinzufügen, nur den Index aktualisieren"
#: builtin/add.c:344
msgid "just skip files which cannot be added because of errors"
msgstr ""
"Dateien überspringen, die aufgrund von Fehlern nicht hinzugefügt werden "
"konnten"
#: builtin/add.c:345
msgid "check if - even missing - files are ignored in dry run"
msgstr "prüfen ob - auch fehlende - Dateien im Probelauf ignoriert werden"
#: builtin/add.c:347 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben"
#: builtin/add.c:349
msgid "warn when adding an embedded repository"
msgstr "warnen wenn eingebettetes Repository hinzugefügt wird"
#: builtin/add.c:351
msgid "backend for `git stash -p`"
msgstr "Backend für `git stash -p`"
#: builtin/add.c:369
#, 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 ""
"Sie haben ein Git-Repository innerhalb ihres aktuellen Repositories "
"hinzugefügt.\n"
"Klone des äußeren Repositories werden die Inhalte des eingebetteten "
"Repositories\n"
"weder enthalten, noch wissen, wie diese zu beschaffen sind.\n"
"Wenn Sie ein Submodul hinzufügen wollten, benutzen Sie:\n"
"\n"
"\tgit submodule add <URL> %s\n"
"\n"
"Wenn Sie diesen Pfad aus Versehen hinzugefügt haben, können Sie diesen mit\n"
"\n"
"\tgit rm --cached %s\n"
"\n"
"vom Index entfernen.\n"
"\n"
"Siehe \"git help submodule\" für weitere Informationen."
#: builtin/add.c:397
#, c-format
msgid "adding embedded git repository: %s"
msgstr "Füge eingebettetes Repository hinzu: %s"
#: 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\""
msgstr ""
"Nutzen Sie die Option -f, wenn sie wirklich hinzugefügt werden sollen.\n"
"Um diese Meldung abzuschalten, führen Sie folgenden Befehl aus:\n"
"\"git config advice.addIgnoredFile false\""
#: builtin/add.c:425
msgid "adding files failed"
msgstr "Hinzufügen von Dateien fehlgeschlagen"
#: builtin/add.c:453 builtin/commit.c:345
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr ""
"Die Optionen --pathspec-from-file und --interactive/--patch sind "
"inkompatibel."
#: builtin/add.c:470
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "Die Optionen --pathspec-from-file und --edit sind inkompatibel."
#: builtin/add.c:482
msgid "-A and -u are mutually incompatible"
msgstr "Die Optionen -A und -u sind zueinander inkompatibel."
#: builtin/add.c:485
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
"Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden."
#: builtin/add.c:489
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod Parameter '%s' muss entweder -x oder +x sein"
#: 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 ""
"Die Option --pathspec-from-file ist inkompatibel mit\n"
"Pfadspezifikation-Argumenten."
#: 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 "Die Option --pathspec-file-nul benötigt --pathspec-from-file"
#: builtin/add.c:518
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
#: 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 ""
"Eventuell meinten Sie 'git add .'?\n"
"Um diese Meldung abzuschalten, führen Sie folgenden Befehl aus:\n"
"\"git config advice.addEmptyPathspec false\""
#: builtin/am.c:160
#, c-format
msgid "invalid committer: %s"
msgstr "ungültiger Commit-Ersteller: %s"
#: builtin/am.c:366
msgid "could not parse author script"
msgstr "konnte Autor-Skript nicht parsen"
#: builtin/am.c:450
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' wurde durch den applypatch-msg Hook entfernt"
#: builtin/am.c:492
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Fehlerhafte Eingabezeile: '%s'."
#: builtin/am.c:530
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
#: builtin/am.c:556
msgid "fseek failed"
msgstr "\"fseek\" fehlgeschlagen"
#: builtin/am.c:744
#, c-format
msgid "could not parse patch '%s'"
msgstr "konnte Patch '%s' nicht parsen"
#: builtin/am.c:809
msgid "Only one StGIT patch series can be applied at once"
msgstr "Es kann nur eine StGIT Patch-Serie auf einmal angewendet werden."
#: builtin/am.c:857
msgid "invalid timestamp"
msgstr "ungültiger Zeitstempel"
#: builtin/am.c:862 builtin/am.c:874
msgid "invalid Date line"
msgstr "Ungültige \"Date\"-Zeile"
#: builtin/am.c:869
msgid "invalid timezone offset"
msgstr "Ungültiger Offset in der Zeitzone"
#: builtin/am.c:962
msgid "Patch format detection failed."
msgstr "Patch-Formaterkennung fehlgeschlagen."
#: builtin/am.c:967 builtin/clone.c:409
#, c-format
msgid "failed to create directory '%s'"
msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
#: builtin/am.c:972
msgid "Failed to split patches."
msgstr "Fehler beim Aufteilen der Patches."
#: builtin/am.c:1103
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
"Wenn Sie das Problem aufgelöst haben, führen Sie \"%s --continue\" aus."
#: builtin/am.c:1104
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
"Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"%s --skip"
"\" aus."
#: builtin/am.c:1105
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Um den ursprünglichen Branch wiederherzustellen und die Anwendung der "
"Patches abzubrechen, führen Sie \"%s --abort\" aus."
#: builtin/am.c:1188
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Patch mit format=flowed versendet; Leerzeichen am Ende von Zeilen könnte "
"verloren gehen."
#: builtin/am.c:1216
msgid "Patch is empty."
msgstr "Patch ist leer."
#: builtin/am.c:1281
#, c-format
msgid "missing author line in commit %s"
msgstr "Autor-Zeile fehlt in Commit %s"
#: builtin/am.c:1284
#, c-format
msgid "invalid ident line: %.*s"
msgstr "Ungültige Identifikationszeile: %.*s"
#: builtin/am.c:1503
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Dem Repository fehlen notwendige Blobs um auf einen 3-Wege-Merge "
"zurückzufallen."
#: builtin/am.c:1505
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
"nachzustellen ..."
#: builtin/am.c:1524
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
"Haben Sie den Patch per Hand editiert?\n"
"Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden."
#: builtin/am.c:1530
msgid "Falling back to patching base and 3-way merge..."
msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..."
#: builtin/am.c:1556
msgid "Failed to merge in the changes."
msgstr "Merge der Änderungen fehlgeschlagen."
#: builtin/am.c:1588
msgid "applying to an empty history"
msgstr "auf leere Historie anwenden"
#: builtin/am.c:1639 builtin/am.c:1643
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "Kann nicht fortsetzen: %s existiert nicht"
#: builtin/am.c:1661
msgid "Commit Body is:"
msgstr "Commit-Beschreibung ist:"
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
#. in your translation. The program will only accept English
#. input at this point.
#.
#: builtin/am.c:1671
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
#: builtin/am.c:1717 builtin/commit.c:395
msgid "unable to write index file"
msgstr "Konnte Index-Datei nicht schreiben."
#: builtin/am.c:1721
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)"
#: builtin/am.c:1761 builtin/am.c:1829
#, c-format
msgid "Applying: %.*s"
msgstr "Wende an: %.*s"
#: builtin/am.c:1778
msgid "No changes -- Patch already applied."
msgstr "Keine Änderungen -- Patches bereits angewendet."
#: builtin/am.c:1784
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
#: builtin/am.c:1788
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
"Benutzen Sie 'git am --show-current-patch=diff', um den\n"
"fehlgeschlagenen Patch zu sehen"
#: builtin/am.c:1832
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 ""
"Keine Änderungen - haben Sie vergessen 'git add' zu benutzen?\n"
"Wenn keine Änderungen mehr zum Commit vorzumerken sind, könnten\n"
"diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n"
"auslassen."
#: builtin/am.c:1839
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 ""
"Sie haben noch immer nicht zusammengeführte Pfade in Ihrem Index.\n"
"Sie sollten 'git add' für jede Datei mit aufgelösten Konflikten ausführen,\n"
"um diese als solche zu markieren.\n"
"Sie können 'git rm' auf Dateien ausführen, um \"von denen gelöscht\" für\n"
"diese zu akzeptieren."
#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347
#: builtin/reset.c:355
#, c-format
msgid "Could not parse object '%s'."
msgstr "Konnte Objekt '%s' nicht parsen."
#: builtin/am.c:1998
msgid "failed to clean index"
msgstr "Fehler beim Bereinigen des Index"
#: builtin/am.c:2042
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
"Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n"
"Keine Zurücksetzung zu ORIG_HEAD."
#: builtin/am.c:2149
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Ungültiger Wert für --patch-format: %s"
#: builtin/am.c:2191
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Ungültiger Wert für --show-current-patch: %s"
#: builtin/am.c:2195
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s ist inkombatibel mit --show-current-patch=%s"
#: builtin/am.c:2226
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]"
#: builtin/am.c:2227
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
#: builtin/am.c:2233
msgid "run interactively"
msgstr "interaktiv ausführen"
#: builtin/am.c:2235
msgid "historical option -- no-op"
msgstr "historische Option -- kein Effekt"
#: builtin/am.c:2237
msgid "allow fall back on 3way merging if needed"
msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge"
#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16
#: builtin/repack.c:309 builtin/stash.c:816
msgid "be quiet"
msgstr "weniger Ausgaben"
#: builtin/am.c:2240
msgid "add a Signed-off-by line to the commit message"
msgstr "der Commit-Beschreibung eine Signed-off-by Zeile hinzufügen"
#: builtin/am.c:2243
msgid "recode into utf8 (default)"
msgstr "nach UTF-8 umkodieren (Standard)"
#: builtin/am.c:2245
msgid "pass -k flag to git-mailinfo"
msgstr "-k an git-mailinfo übergeben"
#: builtin/am.c:2247
msgid "pass -b flag to git-mailinfo"
msgstr "-b an git-mailinfo übergeben"
#: builtin/am.c:2249
msgid "pass -m flag to git-mailinfo"
msgstr "-m an git-mailinfo übergeben"
#: builtin/am.c:2251
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "--keep-cr an git-mailsplit für mbox-Format übergeben"
#: builtin/am.c:2254
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "kein --keep-cr an git-mailsplit übergeben, unabhängig von am.keepcr"
#: builtin/am.c:2257
msgid "strip everything before a scissors line"
msgstr "alles vor einer Scheren-Zeile entfernen"
#: 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
msgid "pass it through git-apply"
msgstr "an git-apply übergeben"
#: 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
msgid "n"
msgstr "Anzahl"
#: 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
msgid "format"
msgstr "Format"
#: builtin/am.c:2283
msgid "format the patch(es) are in"
msgstr "Patch-Format"
#: builtin/am.c:2289
msgid "override error message when patch failure occurs"
msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
#: builtin/am.c:2291
msgid "continue applying patches after resolving a conflict"
msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen"
#: builtin/am.c:2294
msgid "synonyms for --continue"
msgstr "Synonyme für --continue"
#: builtin/am.c:2297
msgid "skip the current patch"
msgstr "den aktuellen Patch auslassen"
#: builtin/am.c:2300
msgid "restore the original branch and abort the patching operation."
msgstr ""
"ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
#: builtin/am.c:2303
msgid "abort the patching operation but keep HEAD where it is."
msgstr "Patch-Operation abbrechen, aber HEAD an aktueller Stelle belassen"
#: builtin/am.c:2307
msgid "show the patch being applied"
msgstr "den Patch, der gerade angewendet wird, anzeigen"
#: builtin/am.c:2312
msgid "lie about committer date"
msgstr "Autor-Datum als Commit-Datum verwenden"
#: builtin/am.c:2314
msgid "use current timestamp for author date"
msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
#: 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
msgid "key-id"
msgstr "GPG-Schlüsselkennung"
#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389
msgid "GPG-sign commits"
msgstr "Commits mit GPG signieren"
#: builtin/am.c:2320
msgid "(internal use for git-rebase)"
msgstr "(intern für git-rebase verwendet)"
#: builtin/am.c:2338
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 ""
"Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
"entfernt. Bitte verwenden Sie diese nicht mehr."
#: builtin/am.c:2345
msgid "failed to read the index"
msgstr "Fehler beim Lesen des Index"
#: builtin/am.c:2360
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "Vorheriges Rebase-Verzeichnis %s existiert noch, aber mbox gegeben."
#: builtin/am.c:2384
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
"Stray %s Verzeichnis gefunden.\n"
"Benutzen Sie \"git am --abort\", um es zu entfernen."
#: builtin/am.c:2390
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt."
#: builtin/am.c:2400
msgid "interactive mode requires patches on the command line"
msgstr "Interaktiver Modus benötigt Patches über die Kommandozeile"
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<Optionen>] [<Patch>...]"
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
msgstr "Konnte Archiv-Datei '%s' nicht erstellen."
#: builtin/archive.c:20
msgid "could not redirect output"
msgstr "Konnte Ausgabe nicht umleiten."
#: builtin/archive.c:37
msgid "git archive: Remote with no URL"
msgstr "git archive: Externes Archiv ohne URL"
#: builtin/archive.c:61
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: ACK/NAK erwartet, Flush-Paket bekommen"
#: builtin/archive.c:64
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
#: builtin/archive.c:65
msgid "git archive: protocol error"
msgstr "git archive: Protokollfehler"
#: builtin/archive.c:69
msgid "git archive: expected a flush"
msgstr "git archive: erwartete eine Spülung (flush)"
#: builtin/bisect--helper.c:23
msgid "git bisect--helper --next-all"
msgstr "git bisect--helper --next-all"
#: builtin/bisect--helper.c:24
msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr "git bisect--helper --write-terms <bad_term> <good_term>"
#: builtin/bisect--helper.c:25
msgid "git bisect--helper --bisect-clean-state"
msgstr "git bisect--helper --bisect-clean-state"
#: builtin/bisect--helper.c:26
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<Commit>]"
#: builtin/bisect--helper.c:27
msgid ""
"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
"<bad_term>"
msgstr ""
"git bisect--helper --bisect-write [--no-log] <Zustand> <Revision> "
"<Begriff_gut> <Begriff_schlecht>"
#: builtin/bisect--helper.c:28
msgid ""
"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
"<bad_term>"
msgstr ""
"git bisect--helper --bisect-check-and-set-terms <Befehl> <Begriff_gut> "
"<Begriff_schlecht>"
#: builtin/bisect--helper.c:29
msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
msgstr ""
"git bisect--helper --bisect-next-check <Begriff_gut> <Begriff_schlecht> "
"[<Begriff>]"
#: builtin/bisect--helper.c:30
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
msgstr ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
#: builtin/bisect--helper.c:31
msgid ""
"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
"[<paths>...]"
msgstr ""
"git bisect--helper --bisect-start [--term-{new,bad}=<Begriff> --term-{old,"
"good}=<Begriff>] [--no-checkout] [--first-parent] [<schlecht> [<gut>...]] "
"[--] [<Pfade>...]"
#: builtin/bisect--helper.c:33
msgid "git bisect--helper --bisect-next"
msgstr "git bisect--helper --bisect-next"
#: builtin/bisect--helper.c:34
msgid "git bisect--helper --bisect-auto-next"
msgstr "git bisect--helper --bisect-auto-next"
#: builtin/bisect--helper.c:35
msgid "git bisect--helper --bisect-autostart"
msgstr "git bisect--helper --bisect-autostart"
#: builtin/bisect--helper.c:97
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "kann Datei '%s' nicht im Modus '%s' öffnen"
#: builtin/bisect--helper.c:104
#, c-format
msgid "could not write to file '%s'"
msgstr "konnte nicht in Datei '%s' schreiben"
#: builtin/bisect--helper.c:143
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' ist kein gültiger Begriff"
#: builtin/bisect--helper.c:147
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "kann den eingebauten Befehl '%s' nicht als Begriff verwenden"
#: builtin/bisect--helper.c:157
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "kann die Bedeutung von dem Begriff '%s' nicht ändern"
#: builtin/bisect--helper.c:167
msgid "please use two different terms"
msgstr "bitte verwenden Sie zwei verschiedene Begriffe"
#: builtin/bisect--helper.c:207
#, c-format
msgid "We are not bisecting.\n"
msgstr "Keine binäre Suche im Gange.\n"
#: builtin/bisect--helper.c:215
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' ist kein gültiger Commit"
#: builtin/bisect--helper.c:224
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
"Konnte den ursprünglichen HEAD '%s' nicht auschecken.\n"
"Versuchen Sie 'git bisect reset <Commit>'."
#: builtin/bisect--helper.c:268
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Ungültiges \"bisect_write\" Argument: %s"
#: builtin/bisect--helper.c:273
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "Konnte die OID der Revision '%s' nicht erhalten."
#: builtin/bisect--helper.c:285
#, c-format
msgid "couldn't open the file '%s'"
msgstr "Konnte die Datei '%s' nicht öffnen."
#: builtin/bisect--helper.c:311
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Ungültiger Befehl: Sie sind gerade bei einer binären %s/%s Suche."
#: builtin/bisect--helper.c:338
#, 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 ""
"Sie müssen mindestens einen \"%s\" und einen \"%s\" Commit angeben.\n"
"Sie können dafür \"git bisect %s\" und \"git bisect %s\" benutzen."
#: builtin/bisect--helper.c:342
#, 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 ""
"Sie müssen mit \"git bisect start\" beginnen.\n"
"Danach müssen Sie mindestens einen \"%s\" und einen \"%s\" Commit angeben.\n"
"Sie können dafür \"git bisect %s\" und \"git bisect %s\" benutzen."
#: builtin/bisect--helper.c:362
#, c-format
msgid "bisecting only with a %s commit"
msgstr "Binäre Suche nur mit einem %s Commit."
#. 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:370
msgid "Are you sure [Y/n]? "
msgstr "Sind Sie sicher [Y/n]? "
#: builtin/bisect--helper.c:431
msgid "no terms defined"
msgstr "Keine Begriffe definiert."
#: builtin/bisect--helper.c:434
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
"and %s for the new state.\n"
msgstr ""
"Ihre aktuellen Begriffe sind %s für den alten Zustand\n"
"und %s für den neuen Zustand.\n"
#: builtin/bisect--helper.c:444
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr ""
"Ungültiges Argument %s für 'git bisect terms'.\n"
"Unterstützte Optionen sind: --term-good|--term-old und --term-bad|--term-new."
#: builtin/bisect--helper.c:511
msgid "revision walk setup failed\n"
msgstr "Einrichtung des Revisionsgangs fehlgeschlagen\n"
#: builtin/bisect--helper.c:533
#, c-format
msgid "could not open '%s' for appending"
msgstr "konnte '%s' nicht zum Anhängen öffnen"
#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664
msgid "'' is not a valid term"
msgstr "'' ist kein gültiger Begriff"
#: builtin/bisect--helper.c:674
#, c-format
msgid "unrecognized option: '%s'"
msgstr "nicht erkannte Option: '%s'"
#: builtin/bisect--helper.c:678
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' scheint kein gültiger Commit zu sein"
#: builtin/bisect--helper.c:709
msgid "bad HEAD - I need a HEAD"
msgstr "ungültiger HEAD - HEAD wird benötigt"
#: builtin/bisect--helper.c:724
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
"Auschecken von '%s' fehlgeschlagen. Versuchen Sie 'git bisect start "
"<gültiger-Branch>'."
#: builtin/bisect--helper.c:745
msgid "won't bisect on cg-seek'ed tree"
msgstr ""
"binäre Suche auf einem durch 'cg-seek' geändertem Verzeichnis nicht möglich"
#: builtin/bisect--helper.c:748
msgid "bad HEAD - strange symbolic ref"
msgstr "ungültiger HEAD - merkwürdige symbolische Referenz"
#: builtin/bisect--helper.c:775
#, c-format
msgid "invalid ref: '%s'"
msgstr "ungültige Referenz: '%s'"
#: builtin/bisect--helper.c:827
msgid "You need to start by \"git bisect start\"\n"
msgstr "Sie müssen mit \"git bisect start\" beginnen\n"
#. 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 "Wollen Sie, dass ich es für Sie mache [Y/n]? "
#: builtin/bisect--helper.c:866
msgid "perform 'git bisect next'"
msgstr "'git bisect next' ausführen"
#: builtin/bisect--helper.c:868
msgid "write the terms to .git/BISECT_TERMS"
msgstr "die Begriffe nach .git/BISECT_TERMS schreiben"
#: builtin/bisect--helper.c:870
msgid "cleanup the bisection state"
msgstr "den Zustand der binären Suche aufräumen"
#: builtin/bisect--helper.c:872
msgid "check for expected revs"
msgstr "auf erwartete Commits prüfen"
#: builtin/bisect--helper.c:874
msgid "reset the bisection state"
msgstr "den Zustand der binären Suche zurücksetzen"
#: builtin/bisect--helper.c:876
msgid "write out the bisection state in BISECT_LOG"
msgstr "den Zustand der binären Suche nach BISECT_LOG schreiben"
#: builtin/bisect--helper.c:878
msgid "check and set terms in a bisection state"
msgstr "Begriffe innerhalb einer binären Suche prüfen und setzen"
#: builtin/bisect--helper.c:880
msgid "check whether bad or good terms exist"
msgstr "prüfen, ob Begriffe für gute und schlechte Commits existieren"
#: builtin/bisect--helper.c:882
msgid "print out the bisect terms"
msgstr "die Begriffe für die binäre Suche ausgeben"
#: builtin/bisect--helper.c:884
msgid "start the bisect session"
msgstr "Sitzung für binäre Suche starten"
#: builtin/bisect--helper.c:886
msgid "find the next bisection commit"
msgstr "nächsten Commit für die binäre Suche finden"
#: builtin/bisect--helper.c:888
msgid "verify the next bisection state then checkout the next bisection commit"
msgstr ""
"überprüfe den nächsten Zustand der binären Suche, checke dann den nächsten "
"Commit der binären Suche aus"
#: builtin/bisect--helper.c:890
msgid "start the bisection if it has not yet been started"
msgstr "starte die binäre Suche, wenn diese noch nicht begonnen hat"
#: builtin/bisect--helper.c:892
msgid "no log for BISECT_WRITE"
msgstr "kein Log für BISECT_WRITE"
#: builtin/bisect--helper.c:910
msgid "--write-terms requires two arguments"
msgstr "--write-terms benötigt zwei Argumente"
#: builtin/bisect--helper.c:914
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state erwartet keine Argumente"
#: builtin/bisect--helper.c:921
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset benötigt entweder kein Argument oder ein Commit"
#: builtin/bisect--helper.c:925
msgid "--bisect-write requires either 4 or 5 arguments"
msgstr "--bisect-write benötigt entweder 4 oder 5 Argumente"
#: builtin/bisect--helper.c:931
msgid "--check-and-set-terms requires 3 arguments"
msgstr "--check-and-set-terms benötigt 3 Argumente"
#: builtin/bisect--helper.c:937
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "--bisect-next-check benötigt 2 oder 3 Argumente"
#: builtin/bisect--helper.c:943
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms benötigt 0 oder 1 Argument"
#: builtin/bisect--helper.c:952
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next benötigt 0 Argumente"
#: builtin/bisect--helper.c:958
msgid "--bisect-auto-next requires 0 arguments"
msgstr "--bisect-auto-next benötigt 0 Argumente"
#: builtin/bisect--helper.c:964
msgid "--bisect-autostart does not accept arguments"
msgstr "--bisect-autostart erwartet keine Argumente"
#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>"
#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)"
#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "erwarte eine Farbe: %s"
#: builtin/blame.c:417
msgid "must end with a color"
msgstr "muss mit einer Farbe enden"
#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "ungültige Farbe '%s' in color.blame.repeatedLines"
#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr "ungültiger Wert für blame.coloring"
#: builtin/blame.c:845
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "konnte Commit %s zum Ignorieren nicht finden"
#: builtin/blame.c:867
msgid "Show blame entries as we find them, incrementally"
msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren"
#: builtin/blame.c:868
msgid "Do not show object names of boundary commits (Default: off)"
msgstr "Zeige keine Objektnamen für Grenz-Commits an (Standard: aus)"
#: builtin/blame.c:869
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Root-Commits nicht als Grenzen behandeln (Standard: aus)"
#: builtin/blame.c:870
msgid "Show work cost statistics"
msgstr "Statistiken zum Arbeitsaufwand anzeigen"
#: builtin/blame.c:871
msgid "Force progress reporting"
msgstr "Fortschrittsanzeige erzwingen"
#: builtin/blame.c:872
msgid "Show output score for blame entries"
msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen"
#: builtin/blame.c:873
msgid "Show original filename (Default: auto)"
msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)"
#: builtin/blame.c:874
msgid "Show original linenumber (Default: off)"
msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)"
#: builtin/blame.c:875
msgid "Show in a format designed for machine consumption"
msgstr "Anzeige in einem Format für maschinelle Auswertung"
#: builtin/blame.c:876
msgid "Show porcelain format with per-line commit information"
msgstr ""
"Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile"
#: builtin/blame.c:877
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)"
#: builtin/blame.c:878
msgid "Show raw timestamp (Default: off)"
msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)"
#: builtin/blame.c:879
msgid "Show long commit SHA1 (Default: off)"
msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)"
#: builtin/blame.c:880
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)"
#: builtin/blame.c:881
msgid "Show author email instead of name (Default: off)"
msgstr ""
"Anstatt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)"
#: builtin/blame.c:882
msgid "Ignore whitespace differences"
msgstr "Unterschiede im Whitespace ignorieren"
#: builtin/blame.c:883 builtin/log.c:1808
msgid "rev"
msgstr "Commit"
#: builtin/blame.c:883
msgid "Ignore <rev> when blaming"
msgstr "Ignoriere <rev> beim Ausführen von 'blame'"
#: builtin/blame.c:884
msgid "Ignore revisions from <file>"
msgstr "Ignoriere Commits aus <Datei>"
#: builtin/blame.c:885
msgid "color redundant metadata from previous line differently"
msgstr "redundante Metadaten der vorherigen Zeile unterschiedlich einfärben"
#: builtin/blame.c:886
msgid "color lines by age"
msgstr "Zeilen nach Alter einfärben"
#: builtin/blame.c:887
msgid "Spend extra cycles to find better match"
msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden"
#: builtin/blame.c:888
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen"
#: builtin/blame.c:889
msgid "Use <file>'s contents as the final image"
msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen"
#: builtin/blame.c:890 builtin/blame.c:891
msgid "score"
msgstr "Bewertung"
#: builtin/blame.c:890
msgid "Find line copies within and across files"
msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden"
#: builtin/blame.c:891
msgid "Find line movements within and across files"
msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden"
#: builtin/blame.c:892
msgid "n,m"
msgstr "n,m"
#: builtin/blame.c:892
msgid "Process only line range n,m, counting from 1"
msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1"
#: builtin/blame.c:944
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress kann nicht mit --incremental oder Formaten für Fremdprogramme\n"
"verwendet werden"
#. 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.
#.
#: builtin/blame.c:995
msgid "4 years, 11 months ago"
msgstr "vor 4 Jahren und 11 Monaten"
#: builtin/blame.c:1110
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "Datei %s hat nur %lu Zeile"
msgstr[1] "Datei %s hat nur %lu Zeilen"
#: builtin/blame.c:1156
msgid "Blaming lines"
msgstr "Verarbeite Zeilen"
#: builtin/branch.c:29
msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
msgstr "git branch [<Optionen>] [-r | -a] [--merged] [--no-merged]"
#: builtin/branch.c:30
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<Optionen>] [-l] [-f] <Branchname> [<Startpunkt>]"
#: builtin/branch.c:31
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<Optionen>] [-r] (-d | -D) <Branchname>..."
#: builtin/branch.c:32
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<Optionen>] (-m | -M) [<alter-Branch>] <neuer-Branch>"
#: builtin/branch.c:33
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr "git branch [<Optionen>] (-c | -C) [<alter-Branch>] <neuer-Branch>"
#: builtin/branch.c:34
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<Optionen>] [-r | -a] [--points-at]"
#: builtin/branch.c:35
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<Optionen>] [-r | -a] [--format]"
#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
"entferne Branch '%s', der zusammengeführt wurde mit\n"
" '%s', aber noch nicht mit HEAD zusammengeführt wurde."
#: 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 ""
"entferne Branch '%s' nicht, der noch nicht zusammengeführt wurde mit\n"
" '%s', obwohl er mit HEAD zusammengeführt wurde."
#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Konnte Commit-Objekt für '%s' nicht nachschlagen."
#: 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 ""
"Der Branch '%s' ist nicht vollständig zusammengeführt.\n"
"Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git branch -D "
"%s' aus."
#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen."
#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "kann -a nicht mit -d benutzen"
#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen."
#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'."
#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "Remote-Tracking-Branch '%s' nicht gefunden"
#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "Branch '%s' nicht gefunden."
#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Fehler beim Entfernen des Remote-Tracking-Branches '%s'"
#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Fehler beim Entfernen des Branches '%s'"
#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n"
#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Branch %s entfernt (war %s).\n"
#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "Konnte Formatierungsstring nicht parsen."
#: builtin/branch.c:460
msgid "could not resolve HEAD"
msgstr "Konnte HEAD-Commit nicht auflösen."
#: builtin/branch.c:466
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) wurde nicht unter \"refs/heads/\" gefunden!"
#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Branch %s wird auf %s umgesetzt"
#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Binäre Suche von Branch %s zu %s im Gange"
#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr ""
"Kann den aktuellen Branch nicht kopieren, solange Sie sich auf keinem "
"befinden."
#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr ""
"Kann aktuellen Branch nicht umbenennen, solange Sie sich auf keinem befinden."
#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Ungültiger Branchname: '%s'"
#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr "Umbenennung des Branches fehlgeschlagen"
#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr "Kopie des Branches fehlgeschlagen"
#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Kopie eines falsch benannten Branches '%s' erstellt."
#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "falsch benannten Branch '%s' umbenannt"
#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Branch umbenannt zu %s, aber HEAD ist nicht aktualisiert!"
#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist "
"fehlgeschlagen."
#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"Branch wurde kopiert, aber die Aktualisierung der Konfigurationsdatei ist\n"
"fehlgeschlagen."
#: 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 ""
"Bitte ändern Sie die Beschreibung für den Branch\n"
" %s\n"
"Zeilen, die mit '%c' beginnen, werden entfernt.\n"
#: builtin/branch.c:618
msgid "Generic options"
msgstr "Allgemeine Optionen"
#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch"
#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr "Informationsmeldungen unterdrücken"
#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr "Modus zum Folgen von Branches einstellen (siehe git-pull(1))"
#: builtin/branch.c:624
msgid "do not use"
msgstr "nicht verwenden"
#: builtin/branch.c:626 builtin/rebase.c:526
msgid "upstream"
msgstr "Upstream"
#: builtin/branch.c:626
msgid "change the upstream info"
msgstr "Informationen zum Upstream-Branch ändern"
#: builtin/branch.c:627
msgid "unset the upstream info"
msgstr "Informationen zum Upstream-Branch entfernen"
#: builtin/branch.c:628
msgid "use colored output"
msgstr "farbige Ausgaben verwenden"
#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr "auf Remote-Tracking-Branches wirken"
#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr "nur Branches ausgeben, die diesen Commit enthalten"
#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr "nur Branches ausgeben, die diesen Commit nicht enthalten"
#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr "spezifische Aktionen für \"git-branch\":"
#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr "Remote-Tracking und lokale Branches auflisten"
#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr "vollständig zusammengeführten Branch entfernen"
#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr "Branch löschen (auch wenn nicht zusammengeführt)"
#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr "einen Branch und dessen Reflog verschieben/umbenennen"
#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr ""
"einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert"
#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr "einen Branch und dessen Reflog kopieren"
#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr "einen Branch kopieren, auch wenn das Ziel bereits existiert"
#: builtin/branch.c:646
msgid "list branch names"
msgstr "Branchnamen auflisten"
#: builtin/branch.c:647
msgid "show current branch name"
msgstr "Zeige aktuellen Branch-Namen."
#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr "das Reflog des Branches erzeugen"
#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr "die Beschreibung für den Branch bearbeiten"
#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen"
#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr "nur zusammengeführte Branches ausgeben"
#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr "nur nicht zusammengeführte Branches ausgeben"
#: builtin/branch.c:654
msgid "list branches in columns"
msgstr "Branches in Spalten auflisten"
#: 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 "Objekt"
#: builtin/branch.c:657
msgid "print only branches of the object"
msgstr "nur Branches von diesem Objekt ausgeben"
#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441
msgid "sorting and filtering are case insensitive"
msgstr "Sortierung und Filterung sind unabhängig von Groß- und Kleinschreibung"
#: 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 "für die Ausgabe zu verwendendes Format"
#: builtin/branch.c:682 builtin/clone.c:789
msgid "HEAD not found below refs/heads!"
msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
#: builtin/branch.c:706
msgid "--column and --verbose are incompatible"
msgstr "Die Optionen --column und --verbose sind inkompatibel."
#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784
msgid "branch name required"
msgstr "Branchname erforderlich"
#: builtin/branch.c:751
msgid "Cannot give description to detached HEAD"
msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden"
#: builtin/branch.c:756
msgid "cannot edit description of more than one branch"
msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden"
#: builtin/branch.c:763
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Noch kein Commit in Branch '%s'."
#: builtin/branch.c:766
#, c-format
msgid "No branch named '%s'."
msgstr "Branch '%s' nicht vorhanden."
#: builtin/branch.c:781
msgid "too many branches for a copy operation"
msgstr "zu viele Branches für eine Kopieroperation angegeben"
#: builtin/branch.c:790
msgid "too many arguments for a rename operation"
msgstr "zu viele Argumente für eine Umbenennen-Operation angegeben"
#: builtin/branch.c:795
msgid "too many arguments to set new upstream"
msgstr "zu viele Argumente angegeben, um Upstream-Branch zu setzen"
#: builtin/branch.c:799
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
"Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n"
"keinen Branch zeigt."
#: builtin/branch.c:802 builtin/branch.c:825
#, c-format
msgid "no such branch '%s'"
msgstr "Kein solcher Branch '%s'"
#: builtin/branch.c:806
#, c-format
msgid "branch '%s' does not exist"
msgstr "Branch '%s' existiert nicht"
#: builtin/branch.c:819
msgid "too many arguments to unset upstream"
msgstr ""
"zu viele Argumente angegeben, um Konfiguration zu Upstream-Branch zu "
"entfernen"
#: builtin/branch.c:823
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"Konnte Konfiguration zu Upstream-Branch von HEAD nicht entfernen, da dieser\n"
"auf keinen Branch zeigt."
#: builtin/branch.c:829
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
#: 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 ""
"Die Optionen -a und -r bei 'git branch' können nicht mit einem Branchnamen "
"verwendet werden.\n"
"Wollten Sie -a|-r --list <Muster> benutzen?"
#: builtin/branch.c:843
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgstr ""
"Die '--set-upstream' Option wird nicht länger unterstützt.\n"
"Bitte benutzen Sie stattdessen '--track' oder '--set-upstream-to'."
#: builtin/bugreport.c:15
msgid "git version:\n"
msgstr "git Version:\n"
#: builtin/bugreport.c:21
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() ist fehlgeschlagen mit Fehler '%s' (%d)\n"
#: builtin/bugreport.c:31
msgid "compiler info: "
msgstr "Compiler Info: "
#: builtin/bugreport.c:34
msgid "libc info: "
msgstr "libc Info: "
#: builtin/bugreport.c:80
msgid "not run from a git repository - no hooks to show\n"
msgstr "nicht in einem Git-Repository ausgeführt - keine Hooks zum Anzeigen\n"
#: builtin/bugreport.c:90
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr "git bugreport [-o|--output-directory <Datei>] [-s|--suffix <Format>]"
#: 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"
msgstr ""
"Vielen Dank für das Ausfüllen eines Git-Fehlerberichts!\n"
"Bitte antworten Sie auf die folgenden Fragen, um uns dabei zu helfen, Ihr\n"
"Problem zu verstehen.\n"
"\n"
"Was haben Sie gemacht, bevor der Fehler auftrat? (Schritte, um Ihr Fehler\n"
"zu reproduzieren)\n"
"\n"
"Was haben Sie erwartet, was passieren soll? (Erwartetes Verhalten)\n"
"\n"
"Was ist stattdessen passiert? (Wirkliches Verhalten)\n"
"\n"
"Was ist der Unterschied zwischen dem, was Sie erwartet haben und was\n"
"wirklich passiert ist?\n"
"\n"
"Sonstige Anmerkungen, die Sie hinzufügen möchten:\n"
"\n"
"Bitte überprüfen Sie den restlichen Teil des Fehlerberichts unten.\n"
"Sie können jede Zeile löschen, die Sie nicht mitteilen möchten.\n"
#: builtin/bugreport.c:134
msgid "specify a destination for the bugreport file"
msgstr "Speicherort für die Datei des Fehlerberichts angeben"
#: builtin/bugreport.c:136
msgid "specify a strftime format suffix for the filename"
msgstr "Dateiendung im strftime-Format für den Dateinamen angeben"
#: builtin/bugreport.c:158
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "konnte vorangehende Verzeichnisse für '%s' nicht erstellen"
#: builtin/bugreport.c:165
msgid "System Info"
msgstr "System Info"
#: builtin/bugreport.c:168
msgid "Enabled Hooks"
msgstr "Aktivierte Hooks"
#: builtin/bugreport.c:175
#, c-format
msgid "couldn't create a new file at '%s'"
msgstr "konnte keine neue Datei unter '%s' erstellen"
#: builtin/bugreport.c:178
#, c-format
msgid "unable to write to %s"
msgstr "konnte nicht nach %s schreiben"
#: builtin/bugreport.c:188
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "Neuer Bericht unter '%s' erstellt.\n"
#: builtin/bundle.c:15 builtin/bundle.c:23
msgid "git bundle create [<options>] <file> <git-rev-list args>"
msgstr "git bundle create [<Optionen>] <Datei> <git-rev-list Argumente>"
#: builtin/bundle.c:16 builtin/bundle.c:28
msgid "git bundle verify [<options>] <file>"
msgstr "git bundle verify [<Optionen>] <Datei>"
#: builtin/bundle.c:17 builtin/bundle.c:33
msgid "git bundle list-heads <file> [<refname>...]"
msgstr "git bundle list-heads <Datei> [<Referenzname>...]"
#: builtin/bundle.c:18 builtin/bundle.c:38
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <Datei> [<Referenzname>...]"
#: builtin/bundle.c:67 builtin/pack-objects.c:3480
msgid "do not show progress meter"
msgstr "keine Fortschrittsanzeige anzeigen"
#: builtin/bundle.c:69 builtin/pack-objects.c:3482
msgid "show progress meter"
msgstr "Fortschrittsanzeige anzeigen"
#: builtin/bundle.c:71 builtin/pack-objects.c:3484
msgid "show progress meter during object writing phase"
msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen"
#: builtin/bundle.c:74 builtin/pack-objects.c:3487
msgid "similar to --all-progress when progress meter is shown"
msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
#: builtin/bundle.c:76
msgid "specify bundle format version"
msgstr "Version des Paket-Formats angeben"
#: builtin/bundle.c:96
msgid "Need a repository to create a bundle."
msgstr "Um ein Paket zu erstellen wird ein Repository benötigt."
#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr "Keine Bundle-Details anzeigen"
#: builtin/bundle.c:122
#, c-format
msgid "%s is okay\n"
msgstr "%s ist in Ordnung\n"
#: builtin/bundle.c:163
msgid "Need a repository to unbundle."
msgstr "Zum Entpacken wird ein Repository benötigt."
#: builtin/bundle.c:171 builtin/remote.c:1687
msgid "be verbose; must be placed before a subcommand"
msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
#: builtin/bundle.c:193 builtin/remote.c:1718
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Unbekannter Unterbefehl: %s"
#: builtin/cat-file.c:598
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
msgstr ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <Art> | --textconv | --filters) [--path=<Pfad>] <Objekt>"
#: builtin/cat-file.c:599
msgid ""
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
msgstr ""
"git cat-file (--batch[=<Format>] | --batch-check[=<Format>]) [--follow-"
"symlinks] [--textconv | --filters]"
#: builtin/cat-file.c:620
msgid "only one batch option may be specified"
msgstr "Nur eine Batch-Option erlaubt."
#: builtin/cat-file.c:638
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<Art> kann sein: blob, tree, commit, tag"
#: builtin/cat-file.c:639
msgid "show object type"
msgstr "Objektart anzeigen"
#: builtin/cat-file.c:640
msgid "show object size"
msgstr "Objektgröße anzeigen"
#: builtin/cat-file.c:642
msgid "exit with zero when there's no error"
msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist"
#: builtin/cat-file.c:643
msgid "pretty-print object's content"
msgstr "ansprechende Anzeige des Objektinhaltes"
#: builtin/cat-file.c:645
msgid "for blob objects, run textconv on object's content"
msgstr "eine Textkonvertierung auf den Inhalt von Blob-Objekten ausführen"
#: builtin/cat-file.c:647
msgid "for blob objects, run filters on object's content"
msgstr "für Blob-Objekte, Filter auf Objekt-Inhalte ausführen"
#: builtin/cat-file.c:648
msgid "blob"
msgstr "Blob"
#: builtin/cat-file.c:649
msgid "use a specific path for --textconv/--filters"
msgstr "einen bestimmten Pfad für --textconv/--filters verwenden"
#: builtin/cat-file.c:651
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "-s und -t mit beschädigten Objekten erlauben"
#: builtin/cat-file.c:652
msgid "buffer --batch output"
msgstr "Ausgabe von --batch puffern"
#: builtin/cat-file.c:654
msgid "show info and content of objects fed from the standard input"
msgstr ""
"Anzeige von Informationen und Inhalt von Objekten, gelesen von der Standard-"
"Eingabe"
#: builtin/cat-file.c:658
msgid "show info about objects fed from the standard input"
msgstr ""
"Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe"
#: builtin/cat-file.c:662
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"symbolischen Verknüpfungen innerhalb des Repositories folgen (verwendet mit "
"--batch oder --batch-check)"
#: builtin/cat-file.c:664
msgid "show all objects with --batch or --batch-check"
msgstr "alle Objekte mit --batch oder --batch-check anzeigen"
#: builtin/cat-file.c:666
msgid "do not order --batch-all-objects output"
msgstr "Ausgabe von --batch-all-objects nicht ordnen"
#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <Attribut>...] [--] <Pfadname>..."
#: builtin/check-attr.c:14
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr "git check-attr --stdin [-z] [-a | --all | <Attribut>...]"
#: builtin/check-attr.c:21
msgid "report all attributes set on file"
msgstr "alle Attribute einer Datei ausgeben"
#: builtin/check-attr.c:22
msgid "use .gitattributes only from the index"
msgstr "nur .gitattributes vom Index verwenden"
#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
msgid "read file names from stdin"
msgstr "Dateinamen von der Standard-Eingabe lesen"
#: builtin/check-attr.c:25 builtin/check-ignore.c:27
msgid "terminate input and output records by a NUL character"
msgstr "Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen"
#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538
#: builtin/worktree.c:561
msgid "suppress progress reporting"
msgstr "Fortschrittsanzeige unterdrücken"
#: builtin/check-ignore.c:29
msgid "show non-matching input paths"
msgstr "Eingabe-Pfade ohne Übereinstimmungen anzeigen"
#: builtin/check-ignore.c:31
msgid "ignore index when checking"
msgstr "Index bei der Prüfung ignorieren"
#: builtin/check-ignore.c:163
msgid "cannot specify pathnames with --stdin"
msgstr "Angabe von Pfadnamen kann nicht gemeinsam mit --stdin verwendet werden"
#: builtin/check-ignore.c:166
msgid "-z only makes sense with --stdin"
msgstr "Die Option -z kann nur mit --stdin verwendet werden."
#: builtin/check-ignore.c:168
msgid "no path specified"
msgstr "kein Pfad angegeben"
#: builtin/check-ignore.c:172
msgid "--quiet is only valid with a single pathname"
msgstr "Die Option --quiet ist nur mit einem einzelnen Pfadnamen gültig."
#: builtin/check-ignore.c:174
msgid "cannot have both --quiet and --verbose"
msgstr ""
"Die Optionen --quiet und --verbose können nicht gemeinsam verwendet werden."
#: builtin/check-ignore.c:177
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching ist nur mit --verbose zulässig"
#: builtin/check-mailmap.c:9
msgid "git check-mailmap [<options>] <contact>..."
msgstr "git check-mailmap [<Optionen>] <Kontakt>..."
#: builtin/check-mailmap.c:14
msgid "also read contacts from stdin"
msgstr "ebenfalls Kontakte von der Standard-Eingabe lesen"
#: builtin/check-mailmap.c:25
#, c-format
msgid "unable to parse contact: %s"
msgstr "Konnte Kontakt '%s' nicht parsen."
#: builtin/check-mailmap.c:48
msgid "no contacts specified"
msgstr "keine Kontakte angegeben"
#: builtin/checkout-index.c:131
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<Optionen>] [--] [<Datei>...]"
#: builtin/checkout-index.c:148
msgid "stage should be between 1 and 3 or all"
msgstr "--stage sollte zwischen 1 und 3 oder 'all' sein"
#: builtin/checkout-index.c:164
msgid "check out all files in the index"
msgstr "alle Dateien im Index auschecken"
#: builtin/checkout-index.c:165
msgid "force overwrite of existing files"
msgstr "das Überschreiben bereits existierender Dateien erzwingen"
#: builtin/checkout-index.c:167
msgid "no warning for existing files and files not in index"
msgstr ""
"keine Warnung für existierende Dateien, und Dateien, die sich nicht im Index "
"befinden"
#: builtin/checkout-index.c:169
msgid "don't checkout new files"
msgstr "keine neuen Dateien auschecken"
#: builtin/checkout-index.c:171
msgid "update stat information in the index file"
msgstr "Dateiinformationen in der Index-Datei aktualisieren"
#: builtin/checkout-index.c:175
msgid "read list of paths from the standard input"
msgstr "eine Liste von Pfaden von der Standard-Eingabe lesen"
#: builtin/checkout-index.c:177
msgid "write the content to temporary files"
msgstr "den Inhalt in temporäre Dateien schreiben"
#: builtin/checkout-index.c:178 builtin/column.c:31
#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827
#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333
#: builtin/worktree.c:754
msgid "string"
msgstr "Zeichenkette"
#: builtin/checkout-index.c:179
msgid "when creating files, prepend <string>"
msgstr ""
"wenn Dateien erzeugt werden, stelle <Zeichenkette> dem Dateinamen voran"
#: builtin/checkout-index.c:181
msgid "copy out the files from named stage"
msgstr "Dateien von dem benannten Stand kopieren"
#: builtin/checkout.c:31
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<Optionen>] <Branch>"
#: builtin/checkout.c:32
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<Optionen>] [<Branch>] -- <Datei>..."
#: builtin/checkout.c:37
msgid "git switch [<options>] [<branch>]"
msgstr "git switch [<Optionen>] [<Branch>]"
#: builtin/checkout.c:42
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<Optionen>] [--source=<Branch>] <Datei>..."
#: builtin/checkout.c:188 builtin/checkout.c:227
#, c-format
msgid "path '%s' does not have our version"
msgstr "Pfad '%s' hat nicht unsere Version."
#: builtin/checkout.c:190 builtin/checkout.c:229
#, c-format
msgid "path '%s' does not have their version"
msgstr "Pfad '%s' hat nicht deren Version."
#: builtin/checkout.c:206
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "Pfad '%s' hat nicht alle notwendigen Versionen."
#: builtin/checkout.c:258
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "Pfad '%s' hat nicht die notwendigen Versionen."
#: builtin/checkout.c:275
#, c-format
msgid "path '%s': cannot merge"
msgstr "Pfad '%s': kann nicht zusammenführen"
#: builtin/checkout.c:291
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen."
#: builtin/checkout.c:396
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "%d Merge-Konflikt wieder erstellt"
msgstr[1] "%d Merge-Konflikte wieder erstellt"
#: builtin/checkout.c:401
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "%d Pfad von %s aktualisiert"
msgstr[1] "%d Pfade von %s aktualisiert"
#: builtin/checkout.c:408
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "%d Pfad vom Index aktualisiert"
msgstr[1] "%d Pfade vom Index aktualisiert"
#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437
#: builtin/checkout.c:441
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden"
#: builtin/checkout.c:444 builtin/checkout.c:447
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
#: builtin/checkout.c:451
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln"
#: builtin/checkout.c:455
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "Weder '%s' noch '%s' ist angegeben"
#: builtin/checkout.c:459
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "'%s' kann nur genutzt werden, wenn '%s' nicht verwendet wird"
#: builtin/checkout.c:464 builtin/checkout.c:469
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' oder '%s' kann nicht mit %s verwendet werden"
#: builtin/checkout.c:528 builtin/checkout.c:535
#, c-format
msgid "path '%s' is unmerged"
msgstr "Pfad '%s' ist nicht zusammengeführt."
#: builtin/checkout.c:703
msgid "you need to resolve your current index first"
msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen."
#: builtin/checkout.c:757
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
"Kann nicht mit vorgemerkten Änderungen in folgenden Dateien fortsetzen:\n"
"%s"
#: builtin/checkout.c:853
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Kann \"reflog\" für '%s' nicht durchführen: %s\n"
#: builtin/checkout.c:895
msgid "HEAD is now at"
msgstr "HEAD ist jetzt bei"
#: builtin/checkout.c:899 builtin/clone.c:720
msgid "unable to update HEAD"
msgstr "Konnte HEAD nicht aktualisieren."
#: builtin/checkout.c:903
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Setze Branch '%s' neu\n"
#: builtin/checkout.c:906
#, c-format
msgid "Already on '%s'\n"
msgstr "Bereits auf '%s'\n"
#: builtin/checkout.c:910
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
#: builtin/checkout.c:912 builtin/checkout.c:1338
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Zu neuem Branch '%s' gewechselt\n"
#: builtin/checkout.c:914
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Zu Branch '%s' gewechselt\n"
#: builtin/checkout.c:965
#, c-format
msgid " ... and %d more.\n"
msgstr " ... und %d weitere.\n"
#: builtin/checkout.c:971
#, 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] ""
"Warnung: Sie lassen %d Commit zurück. Folgender Commit ist in\n"
"keinem Ihrer Branches enthalten:\n"
"\n"
"%s\n"
msgstr[1] ""
"Warnung: Sie lassen %d Commits zurück. Folgende Commits sind in\n"
"keinem Ihrer Branches enthalten:\n"
"\n"
"%s\n"
#: builtin/checkout.c:990
#, 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] ""
"Wenn Sie diese durch einen neuen Branch behalten möchten, dann könnte jetzt\n"
"ein guter Zeitpunkt sein, dies zu tun mit:\n"
"\n"
" git branch <neuer-Branchname> %s\n"
"\n"
msgstr[1] ""
"Wenn Sie diese durch einen neuen Branch behalten möchten, dann könnte jetzt\n"
"ein guter Zeitpunkt sein, dies zu tun mit:\n"
"\n"
" git branch <neuer-Branchname> %s\n"
"\n"
#: builtin/checkout.c:1025
msgid "internal error in revision walk"
msgstr "interner Fehler im Revisionsgang"
#: builtin/checkout.c:1029
msgid "Previous HEAD position was"
msgstr "Vorherige Position von HEAD war"
#: builtin/checkout.c:1069 builtin/checkout.c:1333
msgid "You are on a branch yet to be born"
msgstr "Sie sind auf einem Branch, der noch nicht geboren ist"
#: 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 ""
"'%s' könnte eine lokale Datei und ein Tracking-Branch sein.\n"
"Bitte benutzen Sie -- (und optional --no-guess), um diese\n"
"eindeutig voneinander zu unterscheiden."
#: 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."
msgstr ""
"Falls Sie einen Remote-Tracking-Branch, z.B. von 'origin', auschecken "
"wollten,\n"
"können Sie das tun, indem Sie den vollständig qualifizierten Namen mit der\n"
"--track Option angeben:\n"
"\n"
" git checkout --track origin/<Name>\n"
"\n"
"Falls Sie beim Auschecken mit mehrdeutigen <Namen> immer ein Remote-"
"Repository\n"
"bevorzugen möchten, z.B. 'origin', können Sie die Einstellung\n"
"checkout.defaultRemote=origin in Ihrer Konfiguration setzen."
#: builtin/checkout.c:1163
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' entspricht mehreren (%d) Remote-Tracking-Branches"
#: builtin/checkout.c:1229
msgid "only one reference expected"
msgstr "nur eine Referenz erwartet"
#: builtin/checkout.c:1246
#, c-format
msgid "only one reference expected, %d given."
msgstr "nur eine Referenz erwartet, %d gegeben."
#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510
#, c-format
msgid "invalid reference: %s"
msgstr "Ungültige Referenz: %s"
#: builtin/checkout.c:1305 builtin/checkout.c:1671
#, c-format
msgid "reference is not a tree: %s"
msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
#: builtin/checkout.c:1352
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "Ein Branch wird erwartet, Tag '%s' bekommen"
#: builtin/checkout.c:1354
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "Ein Branch wird erwartet, Remote-Branch '%s' bekommen"
#: builtin/checkout.c:1355 builtin/checkout.c:1363
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "Ein Branch wird erwartet, '%s' bekommen"
#: builtin/checkout.c:1358
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "Ein Branch wird erwartet, Commit '%s' bekommen"
#: builtin/checkout.c:1374
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
msgstr ""
"Der Branch kann nicht während eines Merges gewechselt werden.\n"
"Ziehen Sie \"git merge --quit\" oder \"git worktree add\" in Betracht."
#: builtin/checkout.c:1378
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
msgstr ""
"Der Branch kann nicht während eines laufenden 'am'-Befehls gewechselt "
"werden.\n"
"Ziehen Sie \"git am --quit\" oder \"git worktree add\" in Betracht."
#: builtin/checkout.c:1382
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
msgstr ""
"Der Branch kann nicht während eines laufenden 'revert'-Befehls gewechselt "
"werden.\n"
"Ziehen Sie \"git rebase --quit\" oder \"git worktree add\" in Betracht."
#: builtin/checkout.c:1386
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
msgstr ""
"Der Branch kann nicht während eines laufenden 'cherry-pick'-Befehls "
"gewechselt werden.\n"
"Ziehen Sie \"git cherry-pick --quit\" oder \"git worktree add\" in Betracht."
#: builtin/checkout.c:1390
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
msgstr ""
"Der Branch kann nicht während eines laufenden 'revert'-Befehls gewechselt "
"werden.\n"
"Ziehen Sie \"git revert --quit\" oder \"git worktree add\" in Betracht."
#: builtin/checkout.c:1394
msgid "you are switching branch while bisecting"
msgstr "Sie wechseln den Branch während einer binären Suche"
#: builtin/checkout.c:1401
msgid "paths cannot be used with switching branches"
msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422
#: builtin/checkout.c:1427 builtin/checkout.c:1432
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
#: builtin/checkout.c:1429
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' kann nicht <Startpunkt> bekommen"
#: builtin/checkout.c:1437
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
#: builtin/checkout.c:1444
msgid "missing branch or commit argument"
msgstr "Branch- oder Commit-Argument fehlt"
#: 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
msgid "force progress reporting"
msgstr "Fortschrittsanzeige erzwingen"
#: builtin/checkout.c:1487
msgid "perform a 3-way merge with the new branch"
msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322
msgid "style"
msgstr "Stil"
#: builtin/checkout.c:1489
msgid "conflict style (merge or diff3)"
msgstr "Konfliktstil (merge oder diff3)"
#: builtin/checkout.c:1501 builtin/worktree.c:558
msgid "detach HEAD at named commit"
msgstr "HEAD bei benanntem Commit loslösen"
#: builtin/checkout.c:1502
msgid "set upstream info for new branch"
msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen"
#: builtin/checkout.c:1504
msgid "force checkout (throw away local modifications)"
msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
#: builtin/checkout.c:1506
msgid "new-branch"
msgstr "neuer Branch"
#: builtin/checkout.c:1506
msgid "new unparented branch"
msgstr "neuer Branch ohne Eltern-Commit"
#: builtin/checkout.c:1508 builtin/merge.c:291
msgid "update ignored files (default)"
msgstr "ignorierte Dateien aktualisieren (Standard)"
#: builtin/checkout.c:1511
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"Prüfung, ob die Referenz bereits in einem anderen Arbeitsverzeichnis "
"ausgecheckt wurde, deaktivieren"
#: builtin/checkout.c:1524
msgid "checkout our version for unmerged files"
msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
#: builtin/checkout.c:1527
msgid "checkout their version for unmerged files"
msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
#: builtin/checkout.c:1531
msgid "do not limit pathspecs to sparse entries only"
msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
#: builtin/checkout.c:1586
#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr "die Optionen -%c, -%c und --orphan schließen sich gegenseitig aus"
#: builtin/checkout.c:1590
msgid "-p and --overlay are mutually exclusive"
msgstr "-p und --overlay schließen sich gegenseitig aus."
#: builtin/checkout.c:1627
msgid "--track needs a branch name"
msgstr "Bei der Option --track muss ein Branchname angegeben werden."
#: builtin/checkout.c:1632
#, c-format
msgid "missing branch name; try -%c"
msgstr "kein Branchname; versuchen Sie -%c"
#: builtin/checkout.c:1664
#, c-format
msgid "could not resolve %s"
msgstr "Konnte %s nicht auflösen."
#: builtin/checkout.c:1680
msgid "invalid path specification"
msgstr "ungültige Pfadspezifikation"
#: builtin/checkout.c:1687
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"'%s' ist kein Commit und es kann kein Branch '%s' aus diesem erstellt werden."
#: builtin/checkout.c:1691
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach nimmt kein Pfad-Argument '%s'"
#: builtin/checkout.c:1700
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "Die Optionen --pathspec-from-file und --detach sind inkompatibel."
#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "Die Optionen --pathspec-from-file und --patch sind inkompatibel."
#: builtin/checkout.c:1716
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
"git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n"
"Sie aus dem Index auschecken."
#: builtin/checkout.c:1721
msgid "you must specify path(s) to restore"
msgstr "Sie müssen Pfad(e) zur Wiederherstellung angeben."
#: 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
msgid "branch"
msgstr "Branch"
#: builtin/checkout.c:1748
msgid "create and checkout a new branch"
msgstr "einen neuen Branch erzeugen und auschecken"
#: builtin/checkout.c:1750
msgid "create/reset and checkout a branch"
msgstr "einen Branch erstellen/umsetzen und auschecken"
#: builtin/checkout.c:1751
msgid "create reflog for new branch"
msgstr "das Reflog für den neuen Branch erzeugen"
#: builtin/checkout.c:1753
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "Zweite Vermutung 'git checkout <kein-solcher-Branch>' (Standard)"
#: builtin/checkout.c:1754
msgid "use overlay mode (default)"
msgstr "benutze Overlay-Modus (Standard)"
#: builtin/checkout.c:1799
msgid "create and switch to a new branch"
msgstr "einen neuen Branch erzeugen und dahin wechseln"
#: builtin/checkout.c:1801
msgid "create/reset and switch to a branch"
msgstr "einen Branch erstellen/umsetzen und dahin wechseln"
#: builtin/checkout.c:1803
msgid "second guess 'git switch <no-such-branch>'"
msgstr "Zweite Vermutung 'git switch <kein-solcher-Branch>'"
#: builtin/checkout.c:1805
msgid "throw away local modifications"
msgstr "lokale Änderungen verwerfen"
#: builtin/checkout.c:1839
msgid "which tree-ish to checkout from"
msgstr "Von welcher Commit-Referenz ausgecheckt werden soll"
#: builtin/checkout.c:1841
msgid "restore the index"
msgstr "Index wiederherstellen"
#: builtin/checkout.c:1843
msgid "restore the working tree (default)"
msgstr "das Arbeitsverzeichnis wiederherstellen (Standard)"
#: builtin/checkout.c:1845
msgid "ignore unmerged entries"
msgstr "ignoriere nicht zusammengeführte Einträge"
#: builtin/checkout.c:1846
msgid "use overlay mode"
msgstr "benutze Overlay-Modus"
#: builtin/clean.c:29
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <Muster>] [-x | -X] [--] <Pfade>..."
#: builtin/clean.c:33
#, c-format
msgid "Removing %s\n"
msgstr "Lösche %s\n"
#: builtin/clean.c:34
#, c-format
msgid "Would remove %s\n"
msgstr "Würde %s löschen\n"
#: builtin/clean.c:35
#, c-format
msgid "Skipping repository %s\n"
msgstr "Überspringe Repository %s\n"
#: builtin/clean.c:36
#, c-format
msgid "Would skip repository %s\n"
msgstr "Würde Repository %s überspringen\n"
#: builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "Fehler beim Löschen von %s"
#: builtin/clean.c:38
#, c-format
msgid "could not lstat %s\n"
msgstr "Konnte 'lstat' nicht für %s ausführen\n"
#: builtin/clean.c:302 git-add--interactive.perl:595
#, 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 ""
"Eingabehilfe:\n"
"1 - nummeriertes Element auswählen\n"
"foo - Element anhand eines eindeutigen Präfix auswählen\n"
" - (leer) nichts auswählen\n"
#: builtin/clean.c:306 git-add--interactive.perl:604
#, 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 ""
"Eingabehilfe:\n"
"1 - einzelnes Element auswählen\n"
"3-5 - Bereich von Elementen auswählen\n"
"2-3,6-9 - mehrere Bereiche auswählen\n"
"foo - Element anhand eines eindeutigen Präfix auswählen\n"
"-... - angegebenes Element abwählen\n"
"* - alle Elemente auswählen\n"
" - (leer) Auswahl beenden\n"
#: builtin/clean.c:521 git-add--interactive.perl:570
#: git-add--interactive.perl:575
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Wie bitte (%s)?\n"
#: builtin/clean.c:661
#, c-format
msgid "Input ignore patterns>> "
msgstr "Ignorier-Muster eingeben>> "
#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "WARNUNG: Kann keine Einträge finden die Muster entsprechen: %s"
#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "Wählen Sie Einträge zum Löschen"
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "'%s' löschen [y/N]? "
#: builtin/clean.c:789
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 ""
"clean - Clean starten\n"
"filter by pattern - Einträge von Löschung ausschließen\n"
"select by numbers - Auswahl von Einträgen über Nummern\n"
"ask each - jede Löschung bestätigen (wie \"rm -i\")\n"
"quit - Clean beenden\n"
"help - diese Meldung anzeigen\n"
"? - Hilfe zur Auswahl mittels Eingabe anzeigen"
#: builtin/clean.c:825
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Würde das folgende Element entfernen:"
msgstr[1] "Würde die folgenden Elemente entfernen:"
#: builtin/clean.c:841
msgid "No more files to clean, exiting."
msgstr "Keine Dateien mehr zum Löschen, beende."
#: builtin/clean.c:903
msgid "do not print names of files removed"
msgstr "keine Namen von gelöschten Dateien ausgeben"
#: builtin/clean.c:905
msgid "force"
msgstr "Aktion erzwingen"
#: builtin/clean.c:906
msgid "interactive cleaning"
msgstr "interaktives Clean"
#: builtin/clean.c:908
msgid "remove whole directories"
msgstr "ganze Verzeichnisse löschen"
#: 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
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "Muster"
#: builtin/clean.c:910
msgid "add <pattern> to ignore rules"
msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen"
#: builtin/clean.c:911
msgid "remove ignored files, too"
msgstr "auch ignorierte Dateien löschen"
#: builtin/clean.c:913
msgid "remove only ignored files"
msgstr "nur ignorierte Dateien löschen"
#: builtin/clean.c:929
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
"clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; "
"\"clean\" verweigert"
#: builtin/clean.c:932
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
"clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -"
"f gegeben; \"clean\" verweigert"
#: builtin/clean.c:944
msgid "-x and -X cannot be used together"
msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden."
#: builtin/clone.c:45
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr "kein Auschecken"
#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553
msgid "create a bare repository"
msgstr "ein Bare-Repository erstellen"
#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr "ein Spiegelarchiv erstellen (impliziert --bare)"
#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr "von einem lokalen Repository klonen"
#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr "lokal keine harten Verweise verwenden, immer Kopien"
#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr "als verteiltes Repository einrichten"
#: builtin/clone.c:106
msgid "pathspec"
msgstr "Pfadspezifikation"
#: builtin/clone.c:106
msgid "initialize submodules in the clone"
msgstr "Submodule im Klon initialisieren"
#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr "Anzahl der parallel zu klonenden Submodule"
#: builtin/clone.c:111 builtin/init-db.c:550
msgid "template-directory"
msgstr "Vorlagenverzeichnis"
#: builtin/clone.c:112 builtin/init-db.c:551
msgid "directory from which templates will be used"
msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden"
#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831
#: builtin/submodule--helper.c:2336
msgid "reference repository"
msgstr "Repository referenzieren"
#: builtin/clone.c:118 builtin/submodule--helper.c:1833
#: builtin/submodule--helper.c:2338
msgid "use --reference only while cloning"
msgstr "--reference nur während des Klonens benutzen"
#: 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
msgid "name"
msgstr "Name"
#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr "<Name> statt 'origin' für Upstream-Repository verwenden"
#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories"
#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849
#: builtin/pull.c:208
msgid "depth"
msgstr "Tiefe"
#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr ""
"einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen"
#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535
#: builtin/pull.c:211
msgid "time"
msgstr "Zeit"
#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr ""
"einen Klon mit unvollständiger Historie (shallow) seit einer bestimmten "
"Zeit\n"
"erstellen"
#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200
#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311
msgid "revision"
msgstr "Commit"
#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
"die Historie eines Klons mit unvollständiger Historie (shallow) mittels\n"
"Ausschluss eines Commits vertiefen"
#: builtin/clone.c:132 builtin/submodule--helper.c:1843
#: builtin/submodule--helper.c:2352
msgid "clone only one branch, HEAD or --branch"
msgstr "nur einen Branch klonen, HEAD oder --branch"
#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "keine Tags klonen, und auch bei späteren Abrufen nicht beachten"
#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)"
#: builtin/clone.c:137 builtin/init-db.c:559
msgid "gitdir"
msgstr ".git-Verzeichnis"
#: builtin/clone.c:138 builtin/init-db.c:560
msgid "separate git dir from working tree"
msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren"
#: builtin/clone.c:139
msgid "key=value"
msgstr "Schlüssel=Wert"
#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr "Konfiguration innerhalb des neuen Repositories setzen"
#: 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
msgid "server-specific"
msgstr "serverspezifisch"
#: 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
msgid "option to transmit"
msgstr "Option übertragen"
#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234
#: builtin/push.c:561
msgid "use IPv4 addresses only"
msgstr "nur IPv4-Adressen benutzen"
#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237
#: builtin/push.c:563
msgid "use IPv6 addresses only"
msgstr "nur IPv6-Adressen benutzen"
#: builtin/clone.c:149
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "jedes geklonte Submodul nutzt seinen Remote-Tracking-Branch"
#: builtin/clone.c:151
msgid "initialize sparse-checkout file to include only files at root"
msgstr ""
"Initialisiere Datei für partiellen Checkout, um nur Dateien im\n"
"Root-Verzeichnis einzubeziehen"
#: builtin/clone.c:287
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr ""
"Konnte keinen Verzeichnisnamen erraten.\n"
"Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
#: builtin/clone.c:340
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Konnte Alternative für '%s' nicht hinzufügen: %s\n"
#: builtin/clone.c:413
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existiert und ist kein Verzeichnis"
#: builtin/clone.c:431
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "Fehler beim Starten der Iteration über '%s'"
#: builtin/clone.c:462
#, c-format
msgid "failed to create link '%s'"
msgstr "Konnte Verweis '%s' nicht erstellen"
#: builtin/clone.c:466
#, c-format
msgid "failed to copy file to '%s'"
msgstr "Konnte Datei nicht nach '%s' kopieren"
#: builtin/clone.c:471
#, c-format
msgid "failed to iterate over '%s'"
msgstr "Fehler beim Iterieren über '%s'"
#: builtin/clone.c:498
#, c-format
msgid "done.\n"
msgstr "Fertig.\n"
#: builtin/clone.c:512
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 ""
"Klonen erfolgreich, Auschecken ist aber fehlgeschlagen.\n"
"Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n"
"und das Auschecken mit 'git restore --source=HEAD :/' erneut versuchen.\n"
#: builtin/clone.c:589
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
#: builtin/clone.c:708
#, c-format
msgid "unable to update %s"
msgstr "kann %s nicht aktualisieren"
#: builtin/clone.c:756
msgid "failed to initialize sparse-checkout"
msgstr "Fehler beim Initialisieren vom partiellen Checkout."
#: builtin/clone.c:779
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"Externer HEAD bezieht sich auf eine nicht existierende Referenz und kann "
"nicht ausgecheckt werden.\n"
#: builtin/clone.c:811
msgid "unable to checkout working tree"
msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
#: builtin/clone.c:868
msgid "unable to write parameters to config file"
msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben"
#: builtin/clone.c:931
msgid "cannot repack to clean up"
msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
#: builtin/clone.c:933
msgid "cannot unlink temporary alternates file"
msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
#: builtin/clone.c:970 builtin/receive-pack.c:2434
msgid "Too many arguments."
msgstr "Zu viele Argumente."
#: builtin/clone.c:974
msgid "You must specify a repository to clone."
msgstr "Sie müssen ein Repository zum Klonen angeben."
#: builtin/clone.c:987
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
#: builtin/clone.c:990
msgid "--bare and --separate-git-dir are incompatible."
msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel."
#: builtin/clone.c:1006
#, c-format
msgid "repository '%s' does not exist"
msgstr "Repository '%s' existiert nicht."
#: builtin/clone.c:1010 builtin/fetch.c:1841
#, c-format
msgid "depth %s is not a positive number"
msgstr "Tiefe %s ist keine positive Zahl"
#: builtin/clone.c:1020
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis."
#: builtin/clone.c:1026
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr ""
"Pfad des Repositories '%s' existiert bereits und ist kein leeres Verzeichnis."
#: builtin/clone.c:1040
#, c-format
msgid "working tree '%s' already exists."
msgstr "Arbeitsverzeichnis '%s' existiert bereits."
#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271
#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
#: builtin/clone.c:1060
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
#: builtin/clone.c:1080
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klone in Bare-Repository '%s' ...\n"
#: builtin/clone.c:1082
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klone nach '%s' ...\n"
#: builtin/clone.c:1106
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
"'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-"
"able"
#: builtin/clone.c:1170
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie "
"stattdessen file://"
#: builtin/clone.c:1172
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since wird in lokalen Klonen ignoriert; benutzen Sie stattdessen "
"file://"
#: builtin/clone.c:1174
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude wird in lokalen Klonen ignoriert; benutzen Sie stattdessen "
"file://"
#: builtin/clone.c:1176
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
"--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen file://"
#: builtin/clone.c:1179
msgid "source repository is shallow, ignoring --local"
msgstr ""
"Quelle ist ein Repository mit unvollständiger Historie (shallow),\n"
"ignoriere --local"
#: builtin/clone.c:1184
msgid "--local is ignored"
msgstr "--local wird ignoriert"
#: builtin/clone.c:1268 builtin/clone.c:1276
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
#: builtin/clone.c:1279
msgid "You appear to have cloned an empty repository."
msgstr "Sie scheinen ein leeres Repository geklont zu haben."
#: builtin/column.c:10
msgid "git column [<options>]"
msgstr "git column [<Optionen>]"
#: builtin/column.c:27
msgid "lookup config vars"
msgstr "Konfigurationsvariablen nachschlagen"
#: builtin/column.c:28 builtin/column.c:29
msgid "layout to use"
msgstr "zu verwendende Anordnung"
#: builtin/column.c:30
msgid "Maximum width"
msgstr "maximale Breite"
#: builtin/column.c:31
msgid "Padding space on left border"
msgstr "Abstand zum linken Rand"
#: builtin/column.c:32
msgid "Padding space on right border"
msgstr "Abstand zum rechten Rand"
#: builtin/column.c:33
msgid "Padding space between columns"
msgstr "Abstand zwischen Spalten"
#: builtin/column.c:51
msgid "--command must be the first argument"
msgstr "Die Option --command muss an erster Stelle stehen."
#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir <Objektverzeichnis>] [--shallow] [--"
"[no-]progress]"
#: 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 ""
"git commit-graph write [--object-dir <Objektverzeichnis>] [--append] [--"
"split[=<Strategie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <Anzahl>] [--[no-]progress] <Split-Optionen>"
#: builtin/commit-graph.c:64
#, c-format
msgid "could not find object directory matching %s"
msgstr "konnte Objekt-Verzeichnis nicht finden, dass '%s' entsprechen soll"
#: 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 "Verzeichnis"
#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
#: builtin/commit-graph.c:317
msgid "The object directory to store the graph"
msgstr "Das Objektverzeichnis zum Speichern des Graphen."
#: builtin/commit-graph.c:83
msgid "if the commit-graph is split, only verify the tip file"
msgstr ""
"Wenn der Commit-Graph aufgeteilt ist, nur die Datei an der Spitze überprüfen"
#: builtin/commit-graph.c:106
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "Konnte Commit-Graph '%s' nicht öffnen."
#: builtin/commit-graph.c:142
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "nicht erkanntes --split Argument, %s"
#: builtin/commit-graph.c:155
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "unerwartete nicht-hexadezimale Objekt-ID: %s"
#: builtin/commit-graph.c:160
#, c-format
msgid "invalid object: %s"
msgstr "ungültiges Objekt: %s"
#: builtin/commit-graph.c:213
msgid "start walk at all refs"
msgstr "Durchlauf auf allen Referenzen beginnen"
#: builtin/commit-graph.c:215
msgid "scan pack-indexes listed by stdin for commits"
msgstr "durch Standard-Eingabe gelistete Pack-Indexe nach Commits scannen"
#: builtin/commit-graph.c:217
msgid "start walk at commits listed by stdin"
msgstr "Lauf bei Commits beginnen, die über die Standard-Eingabe gelistet sind"
#: builtin/commit-graph.c:219
msgid "include all commits already in the commit-graph file"
msgstr ""
"alle Commits einschließen, die sich bereits in der Commit-Graph-Datei "
"befinden"
#: builtin/commit-graph.c:221
msgid "enable computation for changed paths"
msgstr "Berechnung für veränderte Pfade aktivieren"
#: builtin/commit-graph.c:224
msgid "allow writing an incremental commit-graph file"
msgstr "erlaube das Schreiben einer inkrementellen Commit-Graph-Datei"
#: builtin/commit-graph.c:228
msgid "maximum number of commits in a non-base split commit-graph"
msgstr ""
"maximale Anzahl von Commits in einem aufgeteilten Commit-Graph ohne Basis"
#: builtin/commit-graph.c:230
msgid "maximum ratio between two levels of a split commit-graph"
msgstr ""
"maximales Verhältnis zwischen zwei Ebenen eines aufgeteilten Commit-Graph"
#: builtin/commit-graph.c:232
msgid "only expire files older than a given date-time"
msgstr "nur Objekte älter als angegebene Zeit verfallen lassen"
#: builtin/commit-graph.c:234
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "maximale Anzahl der zu berechnenden Bloom-Filter für veränderte Pfade"
#: builtin/commit-graph.c:255
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
"benutzen Sie mindestens eine der folgenden Optionen: --reachable, "
"--stdin-commits, oder --stdin-packs"
#: builtin/commit-graph.c:287
msgid "Collecting commits from input"
msgstr "Sammle Commits von der Standard-Eingabe"
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
"<file>)...] <tree>"
msgstr ""
"git commit-tree [(-p <Eltern-Commit>)...] [-S[<Key-ID>]] [(-m "
"<Nachricht>)...] [(-F <Datei>)...] <Tree-Objekt>"
#: builtin/commit-tree.c:31
#, c-format
msgid "duplicate parent %s ignored"
msgstr "doppelter Vorgänger %s ignoriert"
#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546
#, c-format
msgid "not a valid object name %s"
msgstr "Kein gültiger Objektname: %s"
#: builtin/commit-tree.c:93
#, c-format
msgid "git commit-tree: failed to open '%s'"
msgstr "git commit-tree: Fehler beim Öffnen von '%s'"
#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree: Fehler beim Lesen von '%s'"
#: builtin/commit-tree.c:98
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree: Fehler beim Schließen von '%s'"
#: builtin/commit-tree.c:111
msgid "parent"
msgstr "Eltern-Commit"
#: builtin/commit-tree.c:112
msgid "id of a parent commit object"
msgstr "ID eines Eltern-Commit-Objektes."
#: 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
msgid "message"
msgstr "Beschreibung"
#: builtin/commit-tree.c:115 builtin/commit.c:1504
msgid "commit message"
msgstr "Commit-Beschreibung"
#: builtin/commit-tree.c:118
msgid "read commit log message from file"
msgstr "Commit-Beschreibung von Datei lesen"
#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289
#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "Commit mit GPG signieren"
#: builtin/commit-tree.c:133
msgid "must give exactly one tree"
msgstr "Brauche genau ein Tree-Objekt."
#: builtin/commit-tree.c:140
msgid "git commit-tree: failed to read"
msgstr "git commit-tree: Fehler beim Lesen"
#: builtin/commit.c:41
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<Optionen>] [--] <Pfadspezifikation>..."
#: builtin/commit.c:46
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<Optionen>] [--] <Pfadspezifikation>..."
#: 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 ""
"Sie fragten den jüngsten Commit nachzubessern, aber das würde diesen leer\n"
"machen. Sie können Ihren Befehl mit --allow-empty wiederholen, oder diesen\n"
"Commit mit \"git reset HEAD^\" vollständig entfernen.\n"
#: 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 ""
"Der letzte \"cherry-pick\" ist jetzt leer, möglicherweise durch eine "
"Konfliktauflösung.\n"
"Wenn Sie dies trotzdem committen wollen, benutzen Sie:\n"
"\n"
" git commit --allow-empty\n"
"\n"
#: builtin/commit.c:63
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "Andernfalls benutzen Sie bitte 'git rebase --skip'\n"
#: builtin/commit.c:66
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "Andernfalls benutzen Sie bitte 'git cherry-pick --skip'\n"
#: builtin/commit.c:69
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 ""
"Und dann nutzen Sie:\n"
"\n"
" git cherry-pick --continue\n"
"\n"
"um das Cherry-Picking mit den übrigen Commits fortzusetzen.\n"
"Wenn dieser Commit übersprungen werden soll, nutzen Sie:\n"
"\n"
" git cherry-pick --skip\n"
"\n"
#: builtin/commit.c:312
msgid "failed to unpack HEAD tree object"
msgstr "Fehler beim Entpacken des Tree-Objektes von HEAD."
#: builtin/commit.c:348
msgid "--pathspec-from-file with -a does not make sense"
msgstr "Option --pathspec-from-file mit -a ist nicht sinnvoll."
#: builtin/commit.c:361
msgid "No paths with --include/--only does not make sense."
msgstr "Keine Pfade mit der Option --include/--only ist nicht sinnvoll."
#: builtin/commit.c:373
msgid "unable to create temporary index"
msgstr "Konnte temporären Index nicht erstellen."
#: builtin/commit.c:382
msgid "interactive add failed"
msgstr "interaktives Hinzufügen fehlgeschlagen"
#: builtin/commit.c:397
msgid "unable to update temporary index"
msgstr "Konnte temporären Index nicht aktualisieren."
#: builtin/commit.c:399
msgid "Failed to update main cache tree"
msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren"
#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495
msgid "unable to write new_index file"
msgstr "Konnte new_index Datei nicht schreiben"
#: builtin/commit.c:476
msgid "cannot do a partial commit during a merge."
msgstr "Kann keinen Teil-Commit durchführen, während ein Merge im Gange ist."
#: builtin/commit.c:478
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
"Kann keinen Teil-Commit durchführen, während \"cherry-pick\" im Gange ist."
#: builtin/commit.c:480
msgid "cannot do a partial commit during a rebase."
msgstr "kann keinen Teil-Commit durchführen, während ein Rebase im Gange ist."
#: builtin/commit.c:488
msgid "cannot read the index"
msgstr "Kann Index nicht lesen"
#: builtin/commit.c:507
msgid "unable to write temporary index file"
msgstr "Konnte temporäre Index-Datei nicht schreiben."
#: builtin/commit.c:605
#, c-format
msgid "commit '%s' lacks author header"
msgstr "Commit '%s' fehlt Autor-Kopfbereich"
#: builtin/commit.c:607
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "Commit '%s' hat fehlerhafte Autor-Zeile"
#: builtin/commit.c:626
msgid "malformed --author parameter"
msgstr "Fehlerhafter --author Parameter"
#: builtin/commit.c:679
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr ""
"Konnte kein Kommentar-Zeichen auswählen, das nicht in\n"
"der aktuellen Commit-Beschreibung verwendet wird."
#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097
#, c-format
msgid "could not lookup commit %s"
msgstr "Konnte Commit %s nicht nachschlagen"
#: builtin/commit.c:729 builtin/shortlog.c:478
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lese Log-Nachricht von Standard-Eingabe)\n"
#: builtin/commit.c:731
msgid "could not read log from standard input"
msgstr "Konnte Log nicht von Standard-Eingabe lesen."
#: builtin/commit.c:735
#, c-format
msgid "could not read log file '%s'"
msgstr "Konnte Log-Datei '%s' nicht lesen"
#: builtin/commit.c:766 builtin/commit.c:782
msgid "could not read SQUASH_MSG"
msgstr "Konnte SQUASH_MSG nicht lesen"
#: builtin/commit.c:773
msgid "could not read MERGE_MSG"
msgstr "Konnte MERGE_MSG nicht lesen"
#: builtin/commit.c:833
msgid "could not write commit template"
msgstr "Konnte Commit-Vorlage nicht schreiben"
#: builtin/commit.c:853
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
"If this is not correct, please run\n"
"\tgit update-ref -d MERGE_HEAD\n"
"and try again.\n"
msgstr ""
"\n"
"Es sieht so aus, als committen Sie einen Merge.\n"
"Falls das nicht korrekt ist, führen Sie bitte\n"
"\tgit update-ref -d MERGE_HEAD\n"
"aus und versuchen Sie es erneut.\n"
#: builtin/commit.c:858
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
"If this is not correct, please run\n"
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"and try again.\n"
msgstr ""
"\n"
"Es sieht so aus, als committen Sie einen \"cherry-pick\".\n"
"Falls das nicht korrekt ist, führen Sie bitte\n"
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"aus und versuchen Sie es erneut.\n"
#: builtin/commit.c:868
#, 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 ""
"Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,\n"
"die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n"
"bricht den Commit ab.\n"
#: builtin/commit.c:876
#, 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 ""
"Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen, "
"die\n"
"mit '%c' beginnen, werden beibehalten; wenn Sie möchten, können Sie diese "
"entfernen.\n"
"Eine leere Beschreibung bricht den Commit ab.\n"
#: builtin/commit.c:893
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
#: builtin/commit.c:901
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
#: builtin/commit.c:908
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommit-Ersteller: %.*s <%.*s>"
#: builtin/commit.c:926
msgid "Cannot read index"
msgstr "Kann Index nicht lesen"
#: builtin/commit.c:997
msgid "Error building trees"
msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
#: builtin/commit.c:1011 builtin/tag.c:276
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
"Bitte liefern Sie eine Beschreibung entweder mit der Option -m oder -F.\n"
#: builtin/commit.c:1055
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' ist nicht im Format 'Name <E-Mail>' und stimmt mit keinem "
"vorhandenen Autor überein"
#: builtin/commit.c:1069
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Ungültiger ignored-Modus '%s'."
#: builtin/commit.c:1087 builtin/commit.c:1331
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ungültiger Modus '%s' für unversionierte Dateien"
#: builtin/commit.c:1127
msgid "--long and -z are incompatible"
msgstr "Die Optionen --long und -z sind inkompatibel."
#: builtin/commit.c:1171
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
"Die Optionen --reset-author und --author können nicht gemeinsam verwendet "
"werden."
#: builtin/commit.c:1180
msgid "You have nothing to amend."
msgstr "Sie haben nichts für \"--amend\"."
#: builtin/commit.c:1183
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Ein Merge ist im Gange -- kann \"--amend\" nicht ausführen."
#: builtin/commit.c:1185
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "\"cherry-pick\" ist im Gange -- kann \"--amend\" nicht ausführen."
#: builtin/commit.c:1187
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Ein Rebase ist im Gange -- kann \"--amend\" nicht ausführen."
#: builtin/commit.c:1190
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
"Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden."
#: builtin/commit.c:1200
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Es kann nur eine Option von -c/-C/-F/--fixup verwendet werden."
#: builtin/commit.c:1202
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Die Option -m kann nicht mit -c/-C/-F kombiniert werden."
#: builtin/commit.c:1211
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
"Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden."
#: builtin/commit.c:1229
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Es kann nur eine Option von --include/--only/--all/--interactive/--patch "
"verwendet werden."
#: builtin/commit.c:1235
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "Pfade '%s ...' mit -a sind nicht sinnvoll"
#: builtin/commit.c:1366 builtin/commit.c:1527
msgid "show status concisely"
msgstr "Status im Kurzformat anzeigen"
#: builtin/commit.c:1368 builtin/commit.c:1529
msgid "show branch information"
msgstr "Branchinformationen anzeigen"
#: builtin/commit.c:1370
msgid "show stash information"
msgstr "Stashinformationen anzeigen"
#: builtin/commit.c:1372 builtin/commit.c:1531
msgid "compute full ahead/behind values"
msgstr "voraus/hinterher-Werte berechnen"
#: builtin/commit.c:1374
msgid "version"
msgstr "Version"
#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539
#: builtin/worktree.c:722
msgid "machine-readable output"
msgstr "maschinenlesbare Ausgabe"
#: builtin/commit.c:1377 builtin/commit.c:1535
msgid "show status in long format (default)"
msgstr "Status im Langformat anzeigen (Standard)"
#: builtin/commit.c:1380 builtin/commit.c:1538
msgid "terminate entries with NUL"
msgstr "Einträge mit NUL-Zeichen abschließen"
#: 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
msgid "mode"
msgstr "Modus"
#: builtin/commit.c:1383 builtin/commit.c:1541
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"unversionierte Dateien anzeigen, optionale Modi: all, normal, no. (Standard: "
"all)"
#: builtin/commit.c:1387
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
"ignorierte Dateien anzeigen, optionale Modi: traditional, matching, no. "
"(Standard: traditional)"
#: builtin/commit.c:1389 parse-options.h:192
msgid "when"
msgstr "wann"
#: builtin/commit.c:1390
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. "
"(Standard: all)"
#: builtin/commit.c:1392
msgid "list untracked files in columns"
msgstr "unversionierte Dateien in Spalten auflisten"
#: builtin/commit.c:1393
msgid "do not detect renames"
msgstr "keine Umbenennungen ermitteln"
#: builtin/commit.c:1395
msgid "detect renames, optionally set similarity index"
msgstr "Umbenennungen erkennen, optional Index für Gleichheit setzen"
#: builtin/commit.c:1415
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Nicht unterstützte Kombination von ignored und untracked-files Argumenten."
#: builtin/commit.c:1497
msgid "suppress summary after successful commit"
msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken"
#: builtin/commit.c:1498
msgid "show diff in commit message template"
msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen"
#: builtin/commit.c:1500
msgid "Commit message options"
msgstr "Optionen für Commit-Beschreibung"
#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415
msgid "read message from file"
msgstr "Beschreibung von Datei lesen"
#: builtin/commit.c:1502
msgid "author"
msgstr "Autor"
#: builtin/commit.c:1502
msgid "override author for commit"
msgstr "Autor eines Commits überschreiben"
#: builtin/commit.c:1503 builtin/gc.c:539
msgid "date"
msgstr "Datum"
#: builtin/commit.c:1503
msgid "override date for commit"
msgstr "Datum eines Commits überschreiben"
#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87
msgid "commit"
msgstr "Commit"
#: builtin/commit.c:1505
msgid "reuse and edit message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren"
#: builtin/commit.c:1506
msgid "reuse message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden"
#: builtin/commit.c:1507
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"eine automatisch zusammengesetzte Beschreibung zum Nachbessern des "
"angegebenen Commits verwenden"
#: builtin/commit.c:1508
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"eine automatisch zusammengesetzte Beschreibung beim \"squash\" des "
"angegebenen Commits verwenden"
#: builtin/commit.c:1509
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "Sie als Autor des Commits setzen (verwendet mit -C/-c/--amend)"
#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292
#: builtin/pull.c:145 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "'Signed-off-by:'-Zeile hinzufügen"
#: builtin/commit.c:1511
msgid "use specified template file"
msgstr "angegebene Vorlagendatei verwenden"
#: builtin/commit.c:1512
msgid "force edit of commit"
msgstr "Bearbeitung des Commits erzwingen"
#: builtin/commit.c:1514
msgid "include status in commit message template"
msgstr "Status in die Commit-Beschreibungsvorlage einfügen"
#: builtin/commit.c:1519
msgid "Commit contents options"
msgstr "Optionen für Commit-Inhalt"
#: builtin/commit.c:1520
msgid "commit all changed files"
msgstr "alle geänderten Dateien committen"
#: builtin/commit.c:1521
msgid "add specified files to index for commit"
msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken"
#: builtin/commit.c:1522
msgid "interactively add files"
msgstr "interaktives Hinzufügen von Dateien"
#: builtin/commit.c:1523
msgid "interactively add changes"
msgstr "interaktives Hinzufügen von Änderungen"
#: builtin/commit.c:1524
msgid "commit only specified files"
msgstr "nur die angegebenen Dateien committen"
#: builtin/commit.c:1525
msgid "bypass pre-commit and commit-msg hooks"
msgstr "Hooks pre-commit und commit-msg umgehen"
#: builtin/commit.c:1526
msgid "show what would be committed"
msgstr "anzeigen, was committet werden würde"
#: builtin/commit.c:1539
msgid "amend previous commit"
msgstr "vorherigen Commit ändern"
#: builtin/commit.c:1540
msgid "bypass post-rewrite hook"
msgstr "\"post-rewrite hook\" umgehen"
#: builtin/commit.c:1547
msgid "ok to record an empty change"
msgstr "Aufzeichnung einer leeren Änderung erlauben"
#: builtin/commit.c:1549
msgid "ok to record a change with an empty message"
msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben"
#: builtin/commit.c:1622
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
#: builtin/commit.c:1629
msgid "could not read MERGE_MODE"
msgstr "Konnte MERGE_MODE nicht lesen"
#: builtin/commit.c:1650
#, c-format
msgid "could not read commit message: %s"
msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
#: builtin/commit.c:1657
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n"
#: builtin/commit.c:1662
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Commit abgebrochen; Sie haben die Beschreibung nicht editiert.\n"
#: builtin/commit.c:1696
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 ""
"Das Repository wurde aktualisiert, aber die \"new_index\"-Datei\n"
"konnte nicht geschrieben werden. Prüfen Sie, dass Ihre Festplatte nicht\n"
"voll und Ihr Kontingent nicht aufgebraucht ist und führen Sie\n"
"anschließend \"git restore HEAD --staged :/\" zur Wiederherstellung aus."
#: builtin/config.c:11
msgid "git config [<options>]"
msgstr "git config [<Optionen>]"
#: builtin/config.c:107 builtin/env--helper.c:27
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "nicht erkanntes --type Argument, %s"
#: builtin/config.c:119
msgid "only one type at a time"
msgstr "nur ein Typ erlaubt"
#: builtin/config.c:128
msgid "Config file location"
msgstr "Ort der Konfigurationsdatei"
#: builtin/config.c:129
msgid "use global config file"
msgstr "globale Konfigurationsdatei verwenden"
#: builtin/config.c:130
msgid "use system config file"
msgstr "systemweite Konfigurationsdatei verwenden"
#: builtin/config.c:131
msgid "use repository config file"
msgstr "Konfigurationsdatei des Repositories verwenden"
#: builtin/config.c:132
msgid "use per-worktree config file"
msgstr "Konfigurationsdatei pro Arbeitsverzeichnis verwenden"
#: builtin/config.c:133
msgid "use given config file"
msgstr "die angegebene Konfigurationsdatei verwenden"
#: builtin/config.c:134
msgid "blob-id"
msgstr "Blob-Id"
#: builtin/config.c:134
msgid "read config from given blob object"
msgstr "Konfiguration von angegebenem Blob-Objekt lesen"
#: builtin/config.c:135
msgid "Action"
msgstr "Aktion"
#: builtin/config.c:136
msgid "get value: name [value-regex]"
msgstr "Wert zurückgeben: Name [Wert-regex]"
#: builtin/config.c:137
msgid "get all values: key [value-regex]"
msgstr "alle Werte zurückgeben: Schlüssel [Wert-regex]"
#: builtin/config.c:138
msgid "get values for regexp: name-regex [value-regex]"
msgstr "Werte für den regulären Ausdruck zurückgeben: Name-regex [Wert-regex]"
#: builtin/config.c:139
msgid "get value specific for the URL: section[.var] URL"
msgstr "Wert spezifisch für eine URL zurückgeben: section[.var] URL"
#: builtin/config.c:140
msgid "replace all matching variables: name value [value_regex]"
msgstr "alle passenden Variablen ersetzen: Name Wert [Wert-regex] "
#: builtin/config.c:141
msgid "add a new variable: name value"
msgstr "neue Variable hinzufügen: Name Wert"
#: builtin/config.c:142
msgid "remove a variable: name [value-regex]"
msgstr "eine Variable entfernen: Name [Wert-regex]"
#: builtin/config.c:143
msgid "remove all matches: name [value-regex]"
msgstr "alle Übereinstimmungen entfernen: Name [Wert-regex]"
#: builtin/config.c:144
msgid "rename section: old-name new-name"
msgstr "eine Sektion umbenennen: alter-Name neuer-Name"
#: builtin/config.c:145
msgid "remove a section: name"
msgstr "eine Sektion entfernen: Name"
#: builtin/config.c:146
msgid "list all"
msgstr "alles auflisten"
#: builtin/config.c:147
msgid "open an editor"
msgstr "einen Editor öffnen"
#: builtin/config.c:148
msgid "find the color configured: slot [default]"
msgstr "die konfigurierte Farbe finden: Slot [Standard]"
#: builtin/config.c:149
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "die Farbeinstellung finden: Slot [Standard-Ausgabe-ist-Terminal]"
#: builtin/config.c:150
msgid "Type"
msgstr "Typ"
#: builtin/config.c:151 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "Wert ist mit diesem Typ angegeben"
#: builtin/config.c:152
msgid "value is \"true\" or \"false\""
msgstr "Wert ist \"true\" oder \"false\""
#: builtin/config.c:153
msgid "value is decimal number"
msgstr "Wert ist eine Dezimalzahl"
#: builtin/config.c:154
msgid "value is --bool or --int"
msgstr "Wert ist --bool oder --int"
#: builtin/config.c:155
msgid "value is --bool or string"
msgstr "Wert ist --bool oder string"
#: builtin/config.c:156
msgid "value is a path (file or directory name)"
msgstr "Wert ist ein Pfad (Datei oder Verzeichnisname)"
#: builtin/config.c:157
msgid "value is an expiry date"
msgstr "Wert ist ein Verfallsdatum"
#: builtin/config.c:158
msgid "Other"
msgstr "Sonstiges"
#: builtin/config.c:159
msgid "terminate values with NUL byte"
msgstr "schließt Werte mit NUL-Byte ab"
#: builtin/config.c:160
msgid "show variable names only"
msgstr "nur Variablennamen anzeigen"
#: builtin/config.c:161
msgid "respect include directives on lookup"
msgstr "beachtet \"include\"-Direktiven beim Nachschlagen"
#: builtin/config.c:162
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"Ursprung der Konfiguration anzeigen (Datei, Standard-Eingabe, Blob, "
"Befehlszeile)"
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
#: builtin/config.c:163
msgid "show scope of config (worktree, local, global, system, command)"
msgstr ""
"Zeige Geltungsbereich der Konfiguration (Arbeitsverzeichnis, lokal, global, "
"systemweit, Befehl)"
#: builtin/config.c:164 builtin/env--helper.c:45
msgid "value"
msgstr "Wert"
#: builtin/config.c:164
msgid "with --get, use default value when missing entry"
msgstr "mit --get, benutze den Standardwert, wenn der Eintrag fehlt"
#: builtin/config.c:178
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr "Falsche Anzahl von Argumenten - sollte %d sein."
#: builtin/config.c:180
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr "falsche Anzahl von Argumenten - sollte zwischen %d und %d sein"
#: builtin/config.c:334
#, c-format
msgid "invalid key pattern: %s"
msgstr "Ungültiges Schlüsselmuster: %s"
#: builtin/config.c:370
#, c-format
msgid "failed to format default config value: %s"
msgstr "Fehler beim Formatieren des Standardkonfigurationswertes: %s"
#: builtin/config.c:434
#, c-format
msgid "cannot parse color '%s'"
msgstr "kann Farbe '%s' nicht parsen"
#: builtin/config.c:476
msgid "unable to parse default color value"
msgstr "konnte Standard-Farbwert nicht parsen"
#: builtin/config.c:529 builtin/config.c:789
msgid "not in a git directory"
msgstr "nicht in einem Git-Repository"
#: builtin/config.c:532
msgid "writing to stdin is not supported"
msgstr "das Schreiben in die Standard-Eingabe wird nicht unterstützt"
#: builtin/config.c:535
msgid "writing config blobs is not supported"
msgstr ""
"das Schreiben von Blob-Objekten für Konfigurationen wird nicht unterstützt"
#: builtin/config.c:620
#, 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 ""
"# Das ist Gits benutzerspezifische Konfigurationsdatei.\n"
"[user]\n"
"# Bitte passen Sie die folgenden Zeilen an und kommentieren Sie diese aus:\n"
"#\tname = %s\n"
"#\temail = %s\n"
#: builtin/config.c:644
msgid "only one config file at a time"
msgstr "nur eine Konfigurationsdatei zu einer Zeit möglich"
#: builtin/config.c:650
msgid "--local can only be used inside a git repository"
msgstr "--local kann nur innerhalb eines Git-Repositories verwendet werden"
#: builtin/config.c:652
msgid "--blob can only be used inside a git repository"
msgstr "--blob kann nur innerhalb eines Git-Repositories verwendet werden"
#: builtin/config.c:654
msgid "--worktree can only be used inside a git repository"
msgstr "--worktree kann nur innerhalb eines Git-Repositories verwendet werden"
#: builtin/config.c:676
msgid "$HOME not set"
msgstr "$HOME nicht gesetzt"
#: builtin/config.c:700
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 ""
"--worktree kann nicht mit mehreren Arbeitsverzeichnissen verwendet werden,\n"
"außer die Konfigurationserweiterung worktreeConfig ist aktiviert. Bitte\n"
"lesen Sie die Sektion \"CONFIGURATION_FILE\" in \"git help worktree\" für "
"Details"
#: builtin/config.c:735
msgid "--get-color and variable type are incoherent"
msgstr "Angabe von --get-color und Variablentyp sind ungültig."
#: builtin/config.c:740
msgid "only one action at a time"
msgstr "Nur eine Aktion erlaubt."
#: builtin/config.c:753
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr "--name-only ist nur anwendbar auf --list oder --get-regexp"
#: builtin/config.c:759
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
msgstr ""
"--show-origin ist nur anwendbar auf --get, --get-all, --get-regexp und --list"
#: builtin/config.c:765
msgid "--default is only applicable to --get"
msgstr "--default ist nur anwendbar auf --get"
#: builtin/config.c:778
#, c-format
msgid "unable to read config file '%s'"
msgstr "Konnte Konfigurationsdatei '%s' nicht lesen."
#: builtin/config.c:781
msgid "error processing config file(s)"
msgstr "Fehler beim Verarbeiten der Konfigurationsdatei(en)."
#: builtin/config.c:791
msgid "editing stdin is not supported"
msgstr "Das Bearbeiten der Standard-Eingabe wird nicht unterstützt."
#: builtin/config.c:793
msgid "editing blobs is not supported"
msgstr "Das Bearbeiten von Blobs wird nicht unterstützt."
#: builtin/config.c:807
#, c-format
msgid "cannot create configuration file %s"
msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen."
#: builtin/config.c:820
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
" Use a regexp, --add or --replace-all to change %s."
msgstr ""
"kann nicht mehrere Werte mit einem einzigen Wert überschreiben\n"
" Benutzen Sie einen regulären Ausdruck, --add oder --replace, um %s\n"
" zu ändern."
#: builtin/config.c:894 builtin/config.c:905
#, c-format
msgid "no such section: %s"
msgstr "Keine solche Sektion: %s"
#: builtin/count-objects.c:90
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
#: builtin/count-objects.c:100
msgid "print sizes in human readable format"
msgstr "gibt Größenangaben in menschenlesbaren Format aus"
#: 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 ""
"Die Berechtigungen auf Ihr Socket-Verzeichnis sind zu schwach; andere\n"
"Nutzer könnten Ihre zwischengespeicherten Anmeldeinformationen lesen.\n"
"Ziehen Sie in Betracht\n"
"\n"
"\tchmod 0700 %s\n"
"\n"
"auszuführen."
#: builtin/credential-cache--daemon.c:275
msgid "print debugging messages to stderr"
msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben"
#: builtin/credential-cache--daemon.c:315
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr ""
"credential-cache--daemon nicht verfügbar; Unix-Socket wird nicht unterstützt"
#: builtin/credential-cache.c:154
msgid "credential-cache unavailable; no unix socket support"
msgstr "credential-cache nicht verfügbar; Unix-Socket wird nicht unterstützt"
#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<Optionen>] [<Commit-Angabe>...]"
#: builtin/describe.c:27
msgid "git describe [<options>] --dirty"
msgstr "git describe [<Optionen>] --dirty"
#: builtin/describe.c:63
msgid "head"
msgstr "Branch"
#: builtin/describe.c:63
msgid "lightweight"
msgstr "nicht-annotiert"
#: builtin/describe.c:63
msgid "annotated"
msgstr "annotiert"
#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s not available"
msgstr "annotiertes Tag %s ist nicht verfügbar"
#: builtin/describe.c:281
#, c-format
msgid "tag '%s' is externally known as '%s'"
msgstr "Tag '%s' ist extern bekannt als '%s'"
#: builtin/describe.c:328
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "kein Tag entspricht exakt '%s'"
#: builtin/describe.c:330
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
"Keine exakte Übereinstimmung bei Referenzen oder Tags, Suche zum "
"Beschreiben\n"
#: builtin/describe.c:397
#, c-format
msgid "finished search at %s\n"
msgstr "beendete Suche bei %s\n"
#: builtin/describe.c:424
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr ""
"Keine annotierten Tags können '%s' beschreiben.\n"
"Jedoch gab es nicht-annotierte Tags: versuchen Sie --tags."
#: builtin/describe.c:428
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
"Keine Tags können '%s' beschreiben.\n"
"Versuchen Sie --always oder erstellen Sie einige Tags."
#: builtin/describe.c:458
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu Commits durchlaufen\n"
#: builtin/describe.c:461
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr ""
"mehr als %i Tags gefunden; führe die ersten %i auf\n"
"Suche bei %s aufgegeben\n"
#: builtin/describe.c:529
#, c-format
msgid "describe %s\n"
msgstr "Beschreibe %s\n"
#: builtin/describe.c:532
#, c-format
msgid "Not a valid object name %s"
msgstr "%s ist kein gültiger Objekt-Name"
#: builtin/describe.c:540
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "%s ist weder ein Commit, noch ein Blob."
#: builtin/describe.c:554
msgid "find the tag that comes after the commit"
msgstr "das Tag finden, das nach dem Commit kommt"
#: builtin/describe.c:555
msgid "debug search strategy on stderr"
msgstr "die Suchstrategie in der Standard-Fehlerausgabe protokollieren"
#: builtin/describe.c:556
msgid "use any ref"
msgstr "alle Referenzen verwenden"
#: builtin/describe.c:557
msgid "use any tag, even unannotated"
msgstr "jedes Tag verwenden, auch nicht-annotierte"
#: builtin/describe.c:558
msgid "always use long format"
msgstr "immer langes Format verwenden"
#: builtin/describe.c:559
msgid "only follow first parent"
msgstr "nur erstem Elternteil folgen"
#: builtin/describe.c:562
msgid "only output exact matches"
msgstr "nur exakte Übereinstimmungen ausgeben"
#: builtin/describe.c:564
msgid "consider <n> most recent tags (default: 10)"
msgstr "die jüngsten <n> Tags betrachten (Standard: 10)"
#: builtin/describe.c:566
msgid "only consider tags matching <pattern>"
msgstr "nur Tags, die <Muster> entsprechen, betrachten"
#: builtin/describe.c:568
msgid "do not consider tags matching <pattern>"
msgstr "keine Tags betrachten, die <Muster> entsprechen"
#: builtin/describe.c:570 builtin/name-rev.c:535
msgid "show abbreviated commit object as fallback"
msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft"
#: builtin/describe.c:571 builtin/describe.c:574
msgid "mark"
msgstr "Markierung"
#: builtin/describe.c:572
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
"<Markierung> bei geändertem Arbeitsverzeichnis anhängen (Standard: \"-dirty"
"\")"
#: builtin/describe.c:575
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
"<Markierung> bei defektem Arbeitsverzeichnis anhängen (Standard: \"-broken\")"
#: builtin/describe.c:593
msgid "--long is incompatible with --abbrev=0"
msgstr "Die Optionen --long und --abbrev=0 sind inkompatibel."
#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "Keine Namen gefunden, kann nichts beschreiben."
#: builtin/describe.c:673
msgid "--dirty is incompatible with commit-ishes"
msgstr "Die Option --dirty kann nicht mit Commits verwendet werden."
#: builtin/describe.c:675
msgid "--broken is incompatible with commit-ishes"
msgstr "Die Option --broken kann nicht mit Commits verwendet werden."
#: builtin/diff.c:91
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "'%s': keine reguläre Datei oder symbolische Verknüpfung"
#: builtin/diff.c:241
#, c-format
msgid "invalid option: %s"
msgstr "Ungültige Option: %s"
#: builtin/diff.c:358
#, c-format
msgid "%s...%s: no merge base"
msgstr "%s...%s: keine Merge-Basis"
#: builtin/diff.c:468
msgid "Not a git repository"
msgstr "Kein Git-Repository"
#: builtin/diff.c:513
#, c-format
msgid "invalid object '%s' given."
msgstr "Objekt '%s' ist ungültig."
#: builtin/diff.c:524
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "Mehr als zwei Blobs angegeben: '%s'"
#: builtin/diff.c:529
#, c-format
msgid "unhandled object '%s' given."
msgstr "unbehandeltes Objekt '%s' angegeben"
#: builtin/diff.c:563
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr "%s...%s: mehrere Merge-Basen, nutze %s"
#: builtin/difftool.c:30
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<Optionen>] [<Commit> [<Commit>]] [--] [<Pfad>...]"
#: builtin/difftool.c:260
#, c-format
msgid "failed: %d"
msgstr "fehlgeschlagen: %d"
#: builtin/difftool.c:302
#, c-format
msgid "could not read symlink %s"
msgstr "konnte symbolische Verknüpfung %s nicht lesen"
#: builtin/difftool.c:304
#, c-format
msgid "could not read symlink file %s"
msgstr "Konnte Datei von symbolischer Verknüpfung '%s' nicht lesen."
#: builtin/difftool.c:312
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "Konnte Objekt '%s' für symbolische Verknüpfung '%s' nicht lesen."
#: builtin/difftool.c:413
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
msgstr ""
"Kombinierte Diff-Formate('-c' und '--cc') werden im Verzeichnis-\n"
"Diff-Modus('-d' und '--dir-diff') nicht unterstützt."
#: builtin/difftool.c:634
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "beide Dateien geändert: '%s' und '%s'."
#: builtin/difftool.c:636
msgid "working tree file has been left."
msgstr "Datei im Arbeitsverzeichnis belassen."
#: builtin/difftool.c:647
#, c-format
msgid "temporary files exist in '%s'."
msgstr "Es existieren temporäre Dateien in '%s'."
#: builtin/difftool.c:648
msgid "you may want to cleanup or recover these."
msgstr "Sie könnten diese aufräumen oder wiederherstellen."
#: builtin/difftool.c:697
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "`diff.guitool` anstatt `diff.tool` benutzen"
#: builtin/difftool.c:699
msgid "perform a full-directory diff"
msgstr "Diff über ganzes Verzeichnis ausführen"
#: builtin/difftool.c:701
msgid "do not prompt before launching a diff tool"
msgstr "keine Eingabeaufforderung vor Ausführung eines Diff-Tools"
#: builtin/difftool.c:706
msgid "use symlinks in dir-diff mode"
msgstr "symbolische Verknüpfungen im dir-diff Modus verwenden"
#: builtin/difftool.c:707
msgid "tool"
msgstr "Tool"
#: builtin/difftool.c:708
msgid "use the specified diff tool"
msgstr "das angegebene Diff-Tool benutzen"
#: builtin/difftool.c:710
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"eine Liste mit Diff-Tools darstellen, die mit `--tool` benutzt werden können"
#: builtin/difftool.c:713
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr ""
"'git-difftool' beenden, wenn das aufgerufene Diff-Tool mit einem "
"Rückkehrwert\n"
"verschieden 0 ausgeführt wurde"
#: builtin/difftool.c:716
msgid "specify a custom command for viewing diffs"
msgstr "eigenen Befehl zur Anzeige von Unterschieden angeben"
#: builtin/difftool.c:717
msgid "passed to `diff`"
msgstr "an 'diff' übergeben"
#: builtin/difftool.c:732
msgid "difftool requires worktree or --no-index"
msgstr "difftool benötigt Arbeitsverzeichnis oder --no-index"
#: builtin/difftool.c:739
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff kann nicht mit --no-index verwendet werden"
#: builtin/difftool.c:742
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui, --tool und --extcmd schließen sich gegenseitig aus"
#: builtin/difftool.c:750
msgid "no <tool> given for --tool=<tool>"
msgstr "kein <Tool> für --tool=<Tool> angegeben"
#: builtin/difftool.c:757
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "kein <Programm> für --extcmd=<Programm> angegeben"
#: builtin/env--helper.c:6
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <Optionen> <Umgebungsvariable>"
#: builtin/env--helper.c:42 builtin/hash-object.c:98
msgid "type"
msgstr "Art"
#: builtin/env--helper.c:46
msgid "default for git_env_*(...) to fall back on"
msgstr "Standard für git_env_*(...), um darauf zurückzugreifen"
#: builtin/env--helper.c:48
msgid "be quiet only use git_env_*() value as exit code"
msgstr "Ausgaben unterdrücken; nur git_env_*() Werte als Exit-Code verwenden"
#: builtin/env--helper.c:67
#, c-format
msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
msgstr ""
"Option `--default' erwartet einen booleschen Wert bei `--type=bool', nicht `"
"%s`"
#: builtin/env--helper.c:82
#, c-format
msgid ""
"option `--default' expects an unsigned long value with `--type=ulong`, not `"
"%s`"
msgstr ""
"Option `--default' erwartet einen vorzeichenlosen Long-Wert bei `--"
"type=ulong`, nicht `%s`"
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
#: builtin/fast-export.c:868
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
"Fehler: Verschachtelte Tags können nicht exportiert werden, außer --mark-"
"tags wurde angegeben."
#: builtin/fast-export.c:1178
msgid "--anonymize-map token cannot be empty"
msgstr "Token für --anonymize-map kann nicht leer sein"
#: builtin/fast-export.c:1198
msgid "show progress after <n> objects"
msgstr "Fortschritt nach <n> Objekten anzeigen"
#: builtin/fast-export.c:1200
msgid "select handling of signed tags"
msgstr "Behandlung von signierten Tags wählen"
#: builtin/fast-export.c:1203
msgid "select handling of tags that tag filtered objects"
msgstr "Behandlung von Tags wählen, die gefilterte Objekte markieren"
#: builtin/fast-export.c:1206
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
"Auswählen der Behandlung von Commit-Beschreibungen bei wechselndem Encoding"
#: builtin/fast-export.c:1209
msgid "Dump marks to this file"
msgstr "Markierungen in diese Datei schreiben"
#: builtin/fast-export.c:1211
msgid "Import marks from this file"
msgstr "Markierungen von dieser Datei importieren"
#: builtin/fast-export.c:1215
msgid "Import marks from this file if it exists"
msgstr "Markierungen von dieser Datei importieren, wenn diese existiert"
#: builtin/fast-export.c:1217
msgid "Fake a tagger when tags lack one"
msgstr "künstlich einen Tag-Ersteller erzeugen, wenn das Tag keinen hat"
#: builtin/fast-export.c:1219
msgid "Output full tree for each commit"
msgstr "für jeden Commit das gesamte Verzeichnis ausgeben"
#: builtin/fast-export.c:1221
msgid "Use the done feature to terminate the stream"
msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschließen"
#: builtin/fast-export.c:1222
msgid "Skip output of blob data"
msgstr "Ausgabe von Blob-Daten überspringen"
#: builtin/fast-export.c:1223 builtin/log.c:1811
msgid "refspec"
msgstr "Refspec"
#: builtin/fast-export.c:1224
msgid "Apply refspec to exported refs"
msgstr "Refspec auf exportierte Referenzen anwenden"
#: builtin/fast-export.c:1225
msgid "anonymize output"
msgstr "Ausgabe anonymisieren"
#: builtin/fast-export.c:1226
msgid "from:to"
msgstr "von:nach"
#: builtin/fast-export.c:1227
msgid "convert <from> to <to> in anonymized output"
msgstr "konvertiere <von> zu <nach> in anonymisierter Ausgabe"
#: builtin/fast-export.c:1230
msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
"Eltern, die nicht im Fast-Export-Stream sind, anhand ihrer Objekt-ID "
"referenzieren"
#: builtin/fast-export.c:1232
msgid "Show original object ids of blobs/commits"
msgstr "originale Objekt-IDs von Blobs/Commits anzeigen"
#: builtin/fast-export.c:1234
msgid "Label tags with mark ids"
msgstr "Tags mit Markierungs-IDs beschriften"
#: builtin/fast-export.c:1257
msgid "--anonymize-map without --anonymize does not make sense"
msgstr "--anonymize-map ohne --anonymize ist nicht sinnvoll"
#: builtin/fast-export.c:1272
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr ""
"--import-marks und --import-marks-if-exists können nicht zusammen "
"weitergegeben werden"
#: builtin/fast-import.c:3086
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr "Fehlende 'from'-Markierungen für Submodul '%s'"
#: builtin/fast-import.c:3088
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr "Fehlende 'to'-Markierungen für Submodul '%s'"
#: builtin/fast-import.c:3223
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "'mark' Befehl erwartet, '%s' bekommen"
#: builtin/fast-import.c:3228
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "'to' Befehl erwartet, '%s' bekommen"
#: builtin/fast-import.c:3320
msgid "Expected format name:filename for submodule rewrite option"
msgstr "Format 'Name:Dateiname' für Submodul-Rewrite-Option erwartet"
#: builtin/fast-import.c:3374
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "Feature '%s' verboten in Eingabe ohne Option --allow-unsafe-features"
#: builtin/fetch-pack.c:241
#, c-format
msgid "Lockfile created but not reported: %s"
msgstr "Lock-Datei erstellt, aber nicht gemeldet: %s"
#: builtin/fetch.c:35
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<Optionen>] [<Repository> [<Refspec>...]]"
#: builtin/fetch.c:36
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<Optionen>] <Gruppe>"
#: builtin/fetch.c:37
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]"
#: builtin/fetch.c:38
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<Optionen>]"
#: builtin/fetch.c:119
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel kann nicht negativ sein"
#: builtin/fetch.c:142 builtin/pull.c:185
msgid "fetch from all remotes"
msgstr "fordert von allen Remote-Repositories an"
#: builtin/fetch.c:144 builtin/pull.c:245
msgid "set upstream for git pull/fetch"
msgstr "Upstream für \"git pull/fetch\" setzen"
#: builtin/fetch.c:146 builtin/pull.c:188
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben"
#: builtin/fetch.c:148 builtin/pull.c:191
msgid "path to upload pack on remote end"
msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite"
#: builtin/fetch.c:149
msgid "force overwrite of local reference"
msgstr "das Überschreiben einer lokalen Referenz erzwingen"
#: builtin/fetch.c:151
msgid "fetch from multiple remotes"
msgstr "von mehreren Remote-Repositories anfordern"
#: builtin/fetch.c:153 builtin/pull.c:195
msgid "fetch all tags and associated objects"
msgstr "alle Tags und verbundene Objekte anfordern"
#: builtin/fetch.c:155
msgid "do not fetch all tags (--no-tags)"
msgstr "nicht alle Tags anfordern (--no-tags)"
#: builtin/fetch.c:157
msgid "number of submodules fetched in parallel"
msgstr "Anzahl der parallel anzufordernden Submodule"
#: builtin/fetch.c:159 builtin/pull.c:198
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
"Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository "
"befinden"
#: builtin/fetch.c:161
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"lokale Tags entfernen, die sich nicht mehr im Remote-Repository befinden, "
"und geänderte Tags aktualisieren"
#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122
msgid "on-demand"
msgstr "bei-Bedarf"
#: builtin/fetch.c:163
msgid "control recursive fetching of submodules"
msgstr "rekursive Anforderungen von Submodulen kontrollieren"
#: builtin/fetch.c:168
msgid "write fetched references to the FETCH_HEAD file"
msgstr "schreibe angeforderte Referenzen in die FETCH_HEAD-Datei"
#: builtin/fetch.c:169 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr "heruntergeladenes Paket behalten"
#: builtin/fetch.c:171
msgid "allow updating of HEAD ref"
msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben"
#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209
#: builtin/pull.c:218
msgid "deepen history of shallow clone"
msgstr ""
"die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen"
#: builtin/fetch.c:176 builtin/pull.c:212
msgid "deepen history of shallow repository based on time"
msgstr ""
"die Historie eines Klons mit unvollständiger Historie (shallow) auf "
"Zeitbasis\n"
"vertiefen"
#: builtin/fetch.c:182 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr "zu einem vollständigen Repository konvertieren"
#: builtin/fetch.c:185
msgid "prepend this to submodule path output"
msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen"
#: builtin/fetch.c:188
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
"Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n"
"als Konfigurationsdateien)"
#: builtin/fetch.c:192 builtin/pull.c:224
msgid "accept refs that update .git/shallow"
msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren"
#: builtin/fetch.c:193 builtin/pull.c:226
msgid "refmap"
msgstr "Refmap"
#: builtin/fetch.c:194 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr "Refmap für 'fetch' angeben"
#: builtin/fetch.c:201 builtin/pull.c:240
msgid "report that we have only objects reachable from this object"
msgstr ""
"ausgeben, dass wir nur Objekte haben, die von diesem Objekt aus erreichbar "
"sind"
#: builtin/fetch.c:204 builtin/fetch.c:206
msgid "run 'maintenance --auto' after fetching"
msgstr "führe 'maintenance --auto' nach \"fetch\" aus"
#: builtin/fetch.c:208 builtin/pull.c:243
msgid "check for forced-updates on all updated branches"
msgstr "Prüfe auf erzwungene Aktualisierungen in allen aktualisierten Branches"
#: builtin/fetch.c:210
msgid "write the commit-graph after fetching"
msgstr "Schreibe den Commit-Graph nach \"fetch\""
#: builtin/fetch.c:212
msgid "accept refspecs from stdin"
msgstr "akzeptiere Refspecs von der Standard-Eingabe"
#: builtin/fetch.c:523
msgid "Couldn't find remote ref HEAD"
msgstr "Konnte Remote-Referenz von HEAD nicht finden."
#: builtin/fetch.c:677
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "Konfiguration fetch.output enthält ungültigen Wert %s"
#: builtin/fetch.c:775
#, c-format
msgid "object %s not found"
msgstr "Objekt %s nicht gefunden"
#: builtin/fetch.c:779
msgid "[up to date]"
msgstr "[aktuell]"
#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880
msgid "[rejected]"
msgstr "[zurückgewiesen]"
#: builtin/fetch.c:793
msgid "can't fetch in current branch"
msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen"
#: builtin/fetch.c:803
msgid "[tag update]"
msgstr "[Tag Aktualisierung]"
#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863
#: builtin/fetch.c:875
msgid "unable to update local ref"
msgstr "kann lokale Referenz nicht aktualisieren"
#: builtin/fetch.c:808
msgid "would clobber existing tag"
msgstr "würde bestehende Tags verändern"
#: builtin/fetch.c:830
msgid "[new tag]"
msgstr "[neues Tag]"
#: builtin/fetch.c:833
msgid "[new branch]"
msgstr "[neuer Branch]"
#: builtin/fetch.c:836
msgid "[new ref]"
msgstr "[neue Referenz]"
#: builtin/fetch.c:875
msgid "forced update"
msgstr "Aktualisierung erzwungen"
#: builtin/fetch.c:880
msgid "non-fast-forward"
msgstr "kein Vorspulen"
#: builtin/fetch.c:901
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 ""
"Normalerweise zeigt 'fetch' welche Branches eine erzwungene Aktualisierung\n"
"hatten, aber diese Überprüfung wurde deaktiviert. Um diese wieder zu\n"
"aktivieren, nutzen Sie die Option '--show-forced-updated' oder führen\n"
"Sie 'git config fetch.showForcedUpdates true' aus."
#: builtin/fetch.c:905
#, 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 ""
"Es brauchte %.2f Sekunden, um erzwungene Aktualisierungen zu überprüfen.\n"
"Sie können die Option '--no-show-forced-updates' benutzen oder\n"
"'git config fetch.showForcedUpdates false' ausführen, um diese Überprüfung\n"
"zu umgehen.\n"
#: builtin/fetch.c:939
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n"
#: builtin/fetch.c:960
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"%s wurde zurückgewiesen, da Root-Commits von Repositories mit "
"unvollständiger\n"
"Historie (shallow) nicht aktualisiert werden dürfen."
#: builtin/fetch.c:1053 builtin/fetch.c:1191
#, c-format
msgid "From %.*s\n"
msgstr "Von %.*s\n"
#: builtin/fetch.c:1064
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
"Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n"
"'git remote prune %s', um jeden älteren, widersprüchlichen Branch zu löschen."
#: builtin/fetch.c:1161
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s wird unreferenziert)"
#: builtin/fetch.c:1162
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s wurde unreferenziert)"
#: builtin/fetch.c:1194
msgid "[deleted]"
msgstr "[gelöscht]"
#: builtin/fetch.c:1195 builtin/remote.c:1113
msgid "(none)"
msgstr "(nichts)"
#: builtin/fetch.c:1218
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
"Der \"fetch\" in den aktuellen Branch %s von einem Nicht-Bare-Repository "
"wurde verweigert."
#: builtin/fetch.c:1237
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s"
#: builtin/fetch.c:1240
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Option \"%s\" wird ignoriert für %s\n"
#: builtin/fetch.c:1448
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "Mehrere Branches erkannt, inkompatibel mit --set-upstream"
#: builtin/fetch.c:1463
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "Setze keinen Upstream für einen entfernten Remote-Tracking-Branch."
#: builtin/fetch.c:1465
msgid "not setting upstream for a remote tag"
msgstr "Setze keinen Upstream für einen Tag eines Remote-Repositories."
#: builtin/fetch.c:1467
msgid "unknown branch type"
msgstr "Unbekannter Branch-Typ"
#: builtin/fetch.c:1469
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
msgstr ""
"Keinen Quell-Branch gefunden.\n"
"Sie müssen bei der Option --set-upstream genau einen Branch angeben."
#: builtin/fetch.c:1598 builtin/fetch.c:1661
#, c-format
msgid "Fetching %s\n"
msgstr "Fordere an von %s\n"
#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "Konnte nicht von %s anfordern"
#: builtin/fetch.c:1620
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "Konnte '%s' nicht anfordern (Exit-Code: %d)\n"
#: builtin/fetch.c:1724
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
"Kein Remote-Repository angegeben. Bitte geben Sie entweder eine URL\n"
"oder den Namen des Remote-Repositories an, von welchem neue\n"
"Commits angefordert werden sollen."
#: builtin/fetch.c:1760
msgid "You need to specify a tag name."
msgstr "Sie müssen den Namen des Tags angeben."
#: builtin/fetch.c:1825
msgid "Negative depth in --deepen is not supported"
msgstr "Negative Tiefe wird von --deepen nicht unterstützt."
#: builtin/fetch.c:1827
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen und --depth schließen sich gegenseitig aus"
#: builtin/fetch.c:1832
msgid "--depth and --unshallow cannot be used together"
msgstr ""
"Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden."
#: builtin/fetch.c:1834
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
"Die Option --unshallow kann nicht in einem Repository mit vollständiger "
"Historie verwendet werden."
#: builtin/fetch.c:1851
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all akzeptiert kein Repository als Argument"
#: builtin/fetch.c:1853
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kann nicht mit Refspecs verwendet werden."
#: builtin/fetch.c:1862
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s"
#: builtin/fetch.c:1869
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
"Das Abholen einer Gruppe von Remote-Repositories kann nicht mit der Angabe\n"
"von Refspecs verwendet werden."
#: builtin/fetch.c:1887
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr ""
"--filter kann nur mit den Remote-Repositories verwendet werden,\n"
"die in extensions.partialclone konfiguriert sind"
#: builtin/fetch.c:1891
msgid "--stdin can only be used when fetching from one remote"
msgstr ""
"die Option --stdin kann nur verwendet werden, wenn nur von einem Remote-\n"
"Repository abgefragt wird"
#: builtin/fmt-merge-msg.c:7
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
"git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>] | --no-log] [--file "
"<Datei>]"
#: builtin/fmt-merge-msg.c:18
msgid "populate log with at most <n> entries from shortlog"
msgstr "Historie mit höchstens <n> Einträgen von \"shortlog\" hinzufügen"
#: builtin/fmt-merge-msg.c:21
msgid "alias for --log (deprecated)"
msgstr "Alias für --log (veraltet)"
#: builtin/fmt-merge-msg.c:24
msgid "text"
msgstr "Text"
#: builtin/fmt-merge-msg.c:25
msgid "use <text> as start of message"
msgstr "<Text> als Beschreibungsanfang verwenden"
#: builtin/fmt-merge-msg.c:26
msgid "file to read from"
msgstr "Datei zum Einlesen"
#: builtin/for-each-ref.c:10
msgid "git for-each-ref [<options>] [<pattern>]"
msgstr "git for-each-ref [<Optionen>] [<Muster>]"
#: builtin/for-each-ref.c:11
msgid "git for-each-ref [--points-at <object>]"
msgstr "git for-each-ref [--points-at <Objekt>]"
#: builtin/for-each-ref.c:12
msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
msgstr "git for-each-ref [--merged [<Commit>]] [--no-merged [<Commit>]]"
#: builtin/for-each-ref.c:13
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr "git for-each-ref [--contains [<Objekt>]] [--no-contains [<Commit>]]"
#: builtin/for-each-ref.c:28
msgid "quote placeholders suitably for shells"
msgstr "Platzhalter als Shell-String formatieren"
#: builtin/for-each-ref.c:30
msgid "quote placeholders suitably for perl"
msgstr "Platzhalter als Perl-String formatieren"
#: builtin/for-each-ref.c:32
msgid "quote placeholders suitably for python"
msgstr "Platzhalter als Python-String formatieren"
#: builtin/for-each-ref.c:34
msgid "quote placeholders suitably for Tcl"
msgstr "Platzhalter als Tcl-String formatieren"
#: builtin/for-each-ref.c:37
msgid "show only <n> matched refs"
msgstr "nur <n> passende Referenzen anzeigen"
#: builtin/for-each-ref.c:39 builtin/tag.c:440
msgid "respect format colors"
msgstr "Formatfarben beachten"
#: builtin/for-each-ref.c:42
msgid "print only refs which points at the given object"
msgstr "nur auf dieses Objekt zeigende Referenzen ausgeben"
#: builtin/for-each-ref.c:44
msgid "print only refs that are merged"
msgstr "nur zusammengeführte Referenzen ausgeben"
#: builtin/for-each-ref.c:45
msgid "print only refs that are not merged"
msgstr "nur nicht zusammengeführte Referenzen ausgeben"
#: builtin/for-each-ref.c:46
msgid "print only refs which contain the commit"
msgstr "nur Referenzen ausgeben, die diesen Commit enthalten"
#: builtin/for-each-ref.c:47
msgid "print only refs which don't contain the commit"
msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten"
#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149
msgid "unknown"
msgstr "unbekannt"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
#: builtin/fsck.c:101 builtin/fsck.c:121
#, c-format
msgid "error in %s %s: %s"
msgstr "Fehler in %s %s: %s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
#: builtin/fsck.c:115
#, c-format
msgid "warning in %s %s: %s"
msgstr "Warnung in %s %s: %s"
#: builtin/fsck.c:144 builtin/fsck.c:147
#, c-format
msgid "broken link from %7s %s"
msgstr "Fehlerhafte Verknüpfung von %7s %s"
#: builtin/fsck.c:156
msgid "wrong object type in link"
msgstr "Falscher Objekttyp in Verknüpfung."
#: builtin/fsck.c:172
#, c-format
msgid ""
"broken link from %7s %s\n"
" to %7s %s"
msgstr ""
"Fehlerhafte Verknüpfung von %7s %s\n"
" nach %7s %s"
#: builtin/fsck.c:283
#, c-format
msgid "missing %s %s"
msgstr "%s %s fehlt"
#: builtin/fsck.c:310
#, c-format
msgid "unreachable %s %s"
msgstr "%s %s nicht erreichbar"
#: builtin/fsck.c:330
#, c-format
msgid "dangling %s %s"
msgstr "%s %s unreferenziert"
#: builtin/fsck.c:340
msgid "could not create lost-found"
msgstr "Konnte lost-found nicht erstellen."
#: builtin/fsck.c:351
#, c-format
msgid "could not finish '%s'"
msgstr "Konnte '%s' nicht abschließen."
#: builtin/fsck.c:368
#, c-format
msgid "Checking %s"
msgstr "Prüfe %s"
#: builtin/fsck.c:406
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "Prüfe Konnektivität (%d Objekte)"
#: builtin/fsck.c:425
#, c-format
msgid "Checking %s %s"
msgstr "Prüfe %s %s"
#: builtin/fsck.c:430
msgid "broken links"
msgstr "Fehlerhafte Verknüpfungen"
#: builtin/fsck.c:439
#, c-format
msgid "root %s"
msgstr "Wurzel %s"
#: builtin/fsck.c:447
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr "%s %s (%s) in %s getaggt"
#: builtin/fsck.c:476
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s: Objekt fehlerhaft oder nicht vorhanden"
#: builtin/fsck.c:501
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr "%s: Ungültiger Reflog-Eintrag %s"
#: builtin/fsck.c:515
#, c-format
msgid "Checking reflog %s->%s"
msgstr "Prüfe Reflog %s->%s"
#: builtin/fsck.c:549
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "%s: Ungültiger SHA1-Zeiger %s"
#: builtin/fsck.c:556
#, c-format
msgid "%s: not a commit"
msgstr "%s: kein Commit"
#: builtin/fsck.c:610
msgid "notice: No default references"
msgstr "Notiz: Keine Standardreferenzen"
#: builtin/fsck.c:625
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: Objekt fehlerhaft oder nicht vorhanden: %s"
#: builtin/fsck.c:638
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: Objekt konnte nicht geparst werden: %s"
#: builtin/fsck.c:658
#, c-format
msgid "bad sha1 file: %s"
msgstr "Ungültige SHA1-Datei: %s"
#: builtin/fsck.c:673
msgid "Checking object directory"
msgstr "Prüfe Objekt-Verzeichnis"
#: builtin/fsck.c:676
msgid "Checking object directories"
msgstr "Prüfe Objekt-Verzeichnisse"
#: builtin/fsck.c:691
#, c-format
msgid "Checking %s link"
msgstr "Prüfe %s Verknüpfung"
#: builtin/fsck.c:696 builtin/index-pack.c:865
#, c-format
msgid "invalid %s"
msgstr "Ungültiger Objekt-Typ %s"
#: builtin/fsck.c:703
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s zeigt auf etwas seltsames (%s)"
#: builtin/fsck.c:709
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: losgelöster HEAD zeigt auf nichts"
#: builtin/fsck.c:713
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "Notiz: %s zeigt auf einen ungeborenen Branch (%s)"
#: builtin/fsck.c:725
msgid "Checking cache tree"
msgstr "Prüfe Cache-Verzeichnis"
#: builtin/fsck.c:730
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: Ungültiger SHA1-Zeiger in Cache-Verzeichnis"
#: builtin/fsck.c:739
msgid "non-tree in cache-tree"
msgstr "non-tree in Cache-Verzeichnis"
#: builtin/fsck.c:770
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<Optionen>] [<Objekt>...]"
#: builtin/fsck.c:776
msgid "show unreachable objects"
msgstr "unerreichbare Objekte anzeigen"
#: builtin/fsck.c:777
msgid "show dangling objects"
msgstr "unreferenzierte Objekte anzeigen"
#: builtin/fsck.c:778
msgid "report tags"
msgstr "Tags melden"
#: builtin/fsck.c:779
msgid "report root nodes"
msgstr "Hauptwurzeln melden"
#: builtin/fsck.c:780
msgid "make index objects head nodes"
msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen"
#: builtin/fsck.c:781
msgid "make reflogs head nodes (default)"
msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)"
#: builtin/fsck.c:782
msgid "also consider packs and alternate objects"
msgstr "ebenso Pakete und alternative Objekte betrachten"
#: builtin/fsck.c:783
msgid "check only connectivity"
msgstr "nur Konnektivität prüfen"
#: builtin/fsck.c:784
msgid "enable more strict checking"
msgstr "genauere Prüfung aktivieren"
#: builtin/fsck.c:786
msgid "write dangling objects in .git/lost-found"
msgstr "unreferenzierte Objekte nach .git/lost-found schreiben"
#: builtin/fsck.c:787 builtin/prune.c:134
msgid "show progress"
msgstr "Fortschrittsanzeige anzeigen"
#: builtin/fsck.c:788
msgid "show verbose names for reachable objects"
msgstr "ausführliche Namen für erreichbare Objekte anzeigen"
#: builtin/fsck.c:847 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Prüfe Objekte"
#: builtin/fsck.c:875
#, c-format
msgid "%s: object missing"
msgstr "%s: Objekt nicht vorhanden"
#: builtin/fsck.c:886
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "Ungültiger Parameter: SHA-1 erwartet, '%s' bekommen"
#: builtin/gc.c:36
msgid "git gc [<options>]"
msgstr "git gc [<Optionen>]"
#: builtin/gc.c:91
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "Konnte '%s' nicht lesen: %s"
#: builtin/gc.c:127
#, c-format
msgid "failed to parse '%s' value '%s'"
msgstr "Fehler beim Parsen von '%s' mit dem Wert '%s'"
#: builtin/gc.c:476 builtin/init-db.c:58
#, c-format
msgid "cannot stat '%s'"
msgstr "Kann '%s' nicht lesen"
#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530
#, c-format
msgid "cannot read '%s'"
msgstr "kann '%s' nicht lesen"
#: builtin/gc.c:492
#, 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 ""
"Die letzte Ausführung von \"gc run\" enthielt die folgenden Meldungen.\n"
"Bitte beheben Sie das Hauptproblem und löschen Sie %s.\n"
"Ein automatischer Cleanup wird nicht ausgeführt, bis diese Datei entfernt\n"
"wurde.\n"
"\n"
"%s"
#: builtin/gc.c:540
msgid "prune unreferenced objects"
msgstr "unreferenzierte Objekte entfernen"
#: builtin/gc.c:542
msgid "be more thorough (increased runtime)"
msgstr "mehr Gründlichkeit (erhöht Laufzeit)"
#: builtin/gc.c:543
msgid "enable auto-gc mode"
msgstr "\"auto-gc\" Modus aktivieren"
#: builtin/gc.c:546
msgid "force running gc even if there may be another gc running"
msgstr ""
"Ausführung von \"git gc\" erzwingen, selbst wenn ein anderes\n"
"\"git gc\" bereits ausgeführt wird"
#: builtin/gc.c:549
msgid "repack all other packs except the largest pack"
msgstr "alle anderen Pakete, außer das größte Paket, neu packen"
#: builtin/gc.c:566
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry."
#: builtin/gc.c:577
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "Fehler beim Parsen des \"prune expiry\" Wertes %s"
#: builtin/gc.c:597
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Die Datenbank des Repositories wird für eine optimale Performance im\n"
"Hintergrund komprimiert.\n"
#: builtin/gc.c:599
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
"Die Datenbank des Projektarchivs wird für eine optimale Performance "
"komprimiert.\n"
#: builtin/gc.c:600
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Siehe \"git help gc\" für manuelles Aufräumen.\n"
#: builtin/gc.c:640
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
"\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n"
"(benutzen Sie --force falls nicht)"
#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Es gibt zu viele unerreichbare lose Objekte; führen Sie 'git prune' aus, um "
"diese zu löschen."
#: builtin/gc.c:705
msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]"
msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=<Aufgabe>]"
#: builtin/gc.c:812
msgid "failed to write commit-graph"
msgstr "Fehler beim Schreiben des Commit-Graph"
#: builtin/gc.c:905
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "Sperrdatei '%s' existiert, Wartung wird übersprungen"
#: builtin/gc.c:932
#, c-format
msgid "task '%s' failed"
msgstr "Aufgabe '%s' fehlgeschlagen"
#: builtin/gc.c:979
#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' ist keine gültige Aufgabe"
#: builtin/gc.c:984
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "Aufgabe '%s' kann nicht mehrfach ausgewählt werden"
#: builtin/gc.c:999
msgid "run tasks based on the state of the repository"
msgstr "Aufgaben abhängig vom Zustand des Repositories ausführen"
#: builtin/gc.c:1001
msgid "do not report progress or other information over stderr"
msgstr "zeige keinen Fortschritt oder andere Informationen über stderr"
#: builtin/gc.c:1002
msgid "task"
msgstr "Aufgabe"
#: builtin/gc.c:1003
msgid "run a specific task"
msgstr "eine bestimmte Aufgabe ausführen"
#: builtin/gc.c:1026
msgid "git maintenance run [<options>]"
msgstr "git maintenance run [<Optionen>]"
#: builtin/gc.c:1037
#, c-format
msgid "invalid subcommand: %s"
msgstr "ungültiger Unterbefehl: %s"
#: builtin/grep.c:30
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<Optionen>] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]"
#: builtin/grep.c:225
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: Fehler beim Erzeugen eines Thread: %s"
#: builtin/grep.c:279
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "ungültige Anzahl von Threads (%d) für %s angegeben"
#. TRANSLATORS: %s is the configuration
#. variable for tweaking threads, currently
#. grep.threads
#.
#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766
#: builtin/pack-objects.c:2936
#, c-format
msgid "no threads support, ignoring %s"
msgstr "keine Unterstützung von Threads, '%s' wird ignoriert"
#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640
#, c-format
msgid "unable to read tree (%s)"
msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen"
#: builtin/grep.c:655
#, c-format
msgid "unable to grep from object of type %s"
msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen"
#: builtin/grep.c:725
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "Schalter '%c' erwartet einen numerischen Wert"
#: builtin/grep.c:824
msgid "search in index instead of in the work tree"
msgstr "im Index anstatt im Arbeitsverzeichnis suchen"
#: builtin/grep.c:826
msgid "find in contents not managed by git"
msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden"
#: builtin/grep.c:828
msgid "search in both tracked and untracked files"
msgstr "in versionierten und unversionierten Dateien suchen"
#: builtin/grep.c:830
msgid "ignore files specified via '.gitignore'"
msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren"
#: builtin/grep.c:832
msgid "recursively search in each submodule"
msgstr "rekursive Suche in jedem Submodul"
#: builtin/grep.c:835
msgid "show non-matching lines"
msgstr "Zeilen ohne Übereinstimmungen anzeigen"
#: builtin/grep.c:837
msgid "case insensitive matching"
msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden"
#: builtin/grep.c:839
msgid "match patterns only at word boundaries"
msgstr "nur ganze Wörter suchen"
#: builtin/grep.c:841
msgid "process binary files as text"
msgstr "binäre Dateien als Text verarbeiten"
#: builtin/grep.c:843
msgid "don't match patterns in binary files"
msgstr "keine Muster in Binärdateien finden"
#: builtin/grep.c:846
msgid "process binary files with textconv filters"
msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten"
#: builtin/grep.c:848
msgid "search in subdirectories (default)"
msgstr "in Unterverzeichnissen suchen (Standard)"
#: builtin/grep.c:850
msgid "descend at most <depth> levels"
msgstr "höchstens <Tiefe> Ebenen durchlaufen"
#: builtin/grep.c:854
msgid "use extended POSIX regular expressions"
msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden"
#: builtin/grep.c:857
msgid "use basic POSIX regular expressions (default)"
msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)"
#: builtin/grep.c:860
msgid "interpret patterns as fixed strings"
msgstr "Muster als feste Zeichenketten interpretieren"
#: builtin/grep.c:863
msgid "use Perl-compatible regular expressions"
msgstr "Perl-kompatible reguläre Ausdrücke verwenden"
#: builtin/grep.c:866
msgid "show line numbers"
msgstr "Zeilennummern anzeigen"
#: builtin/grep.c:867
msgid "show column number of first match"
msgstr "Nummer der Spalte des ersten Treffers anzeigen"
#: builtin/grep.c:868
msgid "don't show filenames"
msgstr "keine Dateinamen anzeigen"
#: builtin/grep.c:869
msgid "show filenames"
msgstr "Dateinamen anzeigen"
#: builtin/grep.c:871
msgid "show filenames relative to top directory"
msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen"
#: builtin/grep.c:873
msgid "show only filenames instead of matching lines"
msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen"
#: builtin/grep.c:875
msgid "synonym for --files-with-matches"
msgstr "Synonym für --files-with-matches"
#: builtin/grep.c:878
msgid "show only the names of files without match"
msgstr "nur die Dateinamen ohne Übereinstimmungen anzeigen"
#: builtin/grep.c:880
msgid "print NUL after filenames"
msgstr "NUL-Zeichen nach Dateinamen ausgeben"
#: builtin/grep.c:883
msgid "show only matching parts of a line"
msgstr "nur übereinstimmende Teile der Zeile anzeigen"
#: builtin/grep.c:885
msgid "show the number of matches instead of matching lines"
msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen"
#: builtin/grep.c:886
msgid "highlight matches"
msgstr "Übereinstimmungen hervorheben"
#: builtin/grep.c:888
msgid "print empty line between matches from different files"
msgstr ""
"eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien ausgeben"
#: builtin/grep.c:890
msgid "show filename only once above matches from same file"
msgstr ""
"den Dateinamen nur einmal oberhalb der Übereinstimmungen aus dieser Datei "
"anzeigen"
#: builtin/grep.c:893
msgid "show <n> context lines before and after matches"
msgstr "<n> Zeilen vor und nach den Übereinstimmungen anzeigen"
#: builtin/grep.c:896
msgid "show <n> context lines before matches"
msgstr "<n> Zeilen vor den Übereinstimmungen anzeigen"
#: builtin/grep.c:898
msgid "show <n> context lines after matches"
msgstr "<n> Zeilen nach den Übereinstimmungen anzeigen"
#: builtin/grep.c:900
msgid "use <n> worker threads"
msgstr "<n> Threads benutzen"
#: builtin/grep.c:901
msgid "shortcut for -C NUM"
msgstr "Kurzform für -C NUM"
#: builtin/grep.c:904
msgid "show a line with the function name before matches"
msgstr "eine Zeile mit dem Funktionsnamen vor Übereinstimmungen anzeigen"
#: builtin/grep.c:906
msgid "show the surrounding function"
msgstr "die umgebende Funktion anzeigen"
#: builtin/grep.c:909
msgid "read patterns from file"
msgstr "Muster von einer Datei lesen"
#: builtin/grep.c:911
msgid "match <pattern>"
msgstr "<Muster> finden"
#: builtin/grep.c:913
msgid "combine patterns specified with -e"
msgstr "Muster kombinieren, die mit -e angegeben wurden"
#: builtin/grep.c:925
msgid "indicate hit with exit status without output"
msgstr "Übereinstimmungen nur durch Beendigungsstatus anzeigen"
#: builtin/grep.c:927
msgid "show only matches from files that match all patterns"
msgstr ""
"nur Übereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen"
#: builtin/grep.c:929
msgid "show parse tree for grep expression"
msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen"
#: builtin/grep.c:933
msgid "pager"
msgstr "Anzeigeprogramm"
#: builtin/grep.c:933
msgid "show matching files in the pager"
msgstr "Dateien mit Übereinstimmungen im Anzeigeprogramm anzeigen"
#: builtin/grep.c:937
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)"
#: builtin/grep.c:1004
msgid "no pattern given"
msgstr "Kein Muster angegeben."
#: builtin/grep.c:1040
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index oder --untracked können nicht mit Commits verwendet werden"
#: builtin/grep.c:1048
#, c-format
msgid "unable to resolve revision: %s"
msgstr "Konnte Commit nicht auflösen: %s"
#: builtin/grep.c:1078
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked zusammen mit --recurse-submodules wird nicht unterstützt"
#: builtin/grep.c:1082
msgid "invalid option combination, ignoring --threads"
msgstr "Ungültige Kombination von Optionen, --threads wird ignoriert."
#: builtin/grep.c:1085 builtin/pack-objects.c:3655
msgid "no threads support, ignoring --threads"
msgstr "Keine Unterstützung für Threads, --threads wird ignoriert."
#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "ungültige Anzahl von Threads angegeben (%d)"
#: builtin/grep.c:1122
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
"Die Option --open-files-in-pager kann nur innerhalb des "
"Arbeitsverzeichnisses verwendet werden."
#: builtin/grep.c:1148
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached und --untracked können nicht mit --no-index verwendet werden."
#: builtin/grep.c:1154
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
"--[no-]exclude-standard kann nicht mit versionierten Inhalten verwendet "
"werden."
#: builtin/grep.c:1162
msgid "both --cached and trees are given"
msgstr "--cached und \"Tree\"-Objekte angegeben"
#: builtin/hash-object.c:85
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
msgstr ""
"git hash-object [-t <Art>] [-w] [--path=<Datei> | --no-filters] [--stdin] "
"[--] <Datei>..."
#: builtin/hash-object.c:86
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
#: builtin/hash-object.c:98
msgid "object type"
msgstr "Art des Objektes"
#: builtin/hash-object.c:99
msgid "write the object into the object database"
msgstr "das Objekt in die Objektdatenbank schreiben"
#: builtin/hash-object.c:101
msgid "read the object from stdin"
msgstr "das Objekt von der Standard-Eingabe lesen"
#: builtin/hash-object.c:103
msgid "store file as is without filters"
msgstr "Datei wie sie ist speichern, ohne Filter"
#: builtin/hash-object.c:104
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"Hash über zufällige Daten, zur Erzeugung von beschädigten Objekten zur\n"
"Fehlersuche in Git, erzeugen"
#: builtin/hash-object.c:105
msgid "process file as it were from this path"
msgstr "Datei verarbeiten, als ob sie von diesem Pfad wäre"
#: builtin/help.c:47
msgid "print all available commands"
msgstr "alle vorhandenen Befehle anzeigen"
#: builtin/help.c:48
msgid "exclude guides"
msgstr "Anleitungen ausschließen"
#: builtin/help.c:49
msgid "print list of useful guides"
msgstr "Liste von allgemein verwendeten Anleitungen anzeigen"
#: builtin/help.c:50
msgid "print all configuration variable names"
msgstr "alle Namen der Konfigurationsvariablen ausgeben"
#: builtin/help.c:52
msgid "show man page"
msgstr "Handbuch anzeigen"
#: builtin/help.c:53
msgid "show manual in web browser"
msgstr "Handbuch in einem Webbrowser anzeigen"
#: builtin/help.c:55
msgid "show info page"
msgstr "Info-Seite anzeigen"
#: builtin/help.c:57
msgid "print command description"
msgstr "Beschreibung des Befehls ausgeben"
#: builtin/help.c:62
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<Befehl>]"
#: builtin/help.c:163
#, c-format
msgid "unrecognized help format '%s'"
msgstr "nicht erkanntes Hilfeformat: %s"
#: builtin/help.c:190
msgid "Failed to start emacsclient."
msgstr "Konnte emacsclient nicht starten."
#: builtin/help.c:203
msgid "Failed to parse emacsclient version."
msgstr "Konnte Version des emacsclient nicht parsen."
#: builtin/help.c:211
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "Version des emacsclient '%d' ist zu alt (< 22)."
#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
#, c-format
msgid "failed to exec '%s'"
msgstr "Fehler beim Ausführen von '%s'"
#: builtin/help.c:307
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
"'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n"
"Sie könnten stattdessen 'man.<Werkzeug>.cmd' benutzen."
#: builtin/help.c:319
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
"'%s': Programm für unterstützten Handbuchbetrachter.\n"
"Sie könnten stattdessen 'man.<Werkzeug>.path' benutzen."
#: builtin/help.c:436
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': unbekannter Handbuch-Betrachter."
#: builtin/help.c:453
msgid "no man viewer handled the request"
msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen"
#: builtin/help.c:461
msgid "no info viewer handled the request"
msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen"
#: builtin/help.c:520 builtin/help.c:531 git.c:337
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "Für '%s' wurde der Alias '%s' angelegt."
#: builtin/help.c:534 git.c:369
#, c-format
msgid "bad alias.%s string: %s"
msgstr "Ungültiger alias.%s String: %s"
#: builtin/help.c:563 builtin/help.c:593
#, c-format
msgid "usage: %s%s"
msgstr "Verwendung: %s%s"
#: builtin/help.c:577
msgid "'git help config' for more information"
msgstr "'git help config' für weitere Informationen"
#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "Objekt-Typen passen bei %s nicht zusammen"
#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "konnte erwartetes Objekt %s nicht empfangen"
#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "Objekt %s: erwarteter Typ %s, %s gefunden"
#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "kann %d Byte nicht lesen"
msgstr[1] "kann %d Bytes nicht lesen"
#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "zu frühes Dateiende"
#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "Fehler beim Lesen der Eingabe"
#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "verwendete mehr Bytes als verfügbar waren"
#: builtin/index-pack.c:324 builtin/pack-objects.c:619
msgid "pack too large for current definition of off_t"
msgstr "Paket ist zu groß für die aktuelle Definition von off_t"
#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr "Paket überschreitet die maximal erlaubte Größe"
#: builtin/index-pack.c:342 builtin/repack.c:254
#, c-format
msgid "unable to create '%s'"
msgstr "konnte '%s' nicht erstellen"
#: builtin/index-pack.c:348
#, c-format
msgid "cannot open packfile '%s'"
msgstr "Kann Paketdatei '%s' nicht öffnen"
#: builtin/index-pack.c:362
msgid "pack signature mismatch"
msgstr "Paketsignatur stimmt nicht überein"
#: builtin/index-pack.c:364
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "Paketversion %<PRIu32> nicht unterstützt"
#: builtin/index-pack.c:382
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "Paket hat ein ungültiges Objekt bei Versatz %<PRIuMAX>: %s"
#: builtin/index-pack.c:488
#, c-format
msgid "inflate returned %d"
msgstr "Dekomprimierung gab %d zurück"
#: builtin/index-pack.c:537
msgid "offset value overflow for delta base object"
msgstr "Wert für Versatz bei Differenzobjekt übergelaufen"
#: builtin/index-pack.c:545
msgid "delta base offset is out of bound"
msgstr ""
"Wert für Versatz bei Differenzobjekt liegt außerhalb des gültigen Bereichs"
#: builtin/index-pack.c:553
#, c-format
msgid "unknown object type %d"
msgstr "Unbekannter Objekt-Typ %d"
#: builtin/index-pack.c:584
msgid "cannot pread pack file"
msgstr "Kann Paketdatei %s nicht lesen"
#: builtin/index-pack.c:586
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Byte"
msgstr[1] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Bytes"
#: builtin/index-pack.c:612
msgid "serious inflate inconsistency"
msgstr "ernsthafte Inkonsistenz nach Dekomprimierung"
#: 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
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !"
#: builtin/index-pack.c:760 builtin/pack-objects.c:171
#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
#, c-format
msgid "unable to read %s"
msgstr "kann %s nicht lesen"
#: builtin/index-pack.c:824
#, c-format
msgid "cannot read existing object info %s"
msgstr "Kann existierende Informationen zu Objekt %s nicht lesen."
#: builtin/index-pack.c:832
#, c-format
msgid "cannot read existing object %s"
msgstr "Kann existierendes Objekt %s nicht lesen."
#: builtin/index-pack.c:846
#, c-format
msgid "invalid blob object %s"
msgstr "ungültiges Blob-Objekt %s"
#: builtin/index-pack.c:849 builtin/index-pack.c:868
msgid "fsck error in packed object"
msgstr "fsck Fehler in gepacktem Objekt"
#: builtin/index-pack.c:870
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Nicht alle Kind-Objekte von %s sind erreichbar"
#: builtin/index-pack.c:931 builtin/index-pack.c:978
msgid "failed to apply delta"
msgstr "Konnte Dateiunterschied nicht anwenden"
#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "Empfange Objekte"
#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "Indiziere Objekte"
#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "Paket ist beschädigt (SHA1 unterschiedlich)"
#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "kann Paketdatei nicht lesen"
#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "Paketende enthält nicht verwendbaren Inhalt"
#: builtin/index-pack.c:1215
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "Fehler beim Ausführen von \"parse_pack_objects()\""
#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "Löse Unterschiede auf"
#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697
#, c-format
msgid "unable to create thread: %s"
msgstr "kann Thread nicht erzeugen: %s"
#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "Fehler beim Auflösen der Unterschiede"
#: builtin/index-pack.c:1288
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "abgeschlossen mit %d lokalem Objekt"
msgstr[1] "abgeschlossen mit %d lokalen Objekten"
#: builtin/index-pack.c:1300
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)"
#: builtin/index-pack.c:1304
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "Paket hat %d unaufgelösten Unterschied"
msgstr[1] "Paket hat %d unaufgelöste Unterschiede"
#: builtin/index-pack.c:1328
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren"
#: builtin/index-pack.c:1424
#, c-format
msgid "local object %s is corrupt"
msgstr "lokales Objekt %s ist beschädigt"
#: builtin/index-pack.c:1444
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'"
#: builtin/index-pack.c:1469
#, c-format
msgid "cannot write %s file '%s'"
msgstr "Kann %s Datei '%s' nicht schreiben."
#: builtin/index-pack.c:1477
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "Kann eben geschriebene %s Datei '%s' nicht schließen."
#: builtin/index-pack.c:1501
msgid "error while closing pack file"
msgstr "Fehler beim Schließen der Paketdatei"
#: builtin/index-pack.c:1515
msgid "cannot store pack file"
msgstr "Kann Paketdatei nicht speichern"
#: builtin/index-pack.c:1523
msgid "cannot store index file"
msgstr "Kann Indexdatei nicht speichern"
#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig"
#: builtin/index-pack.c:1631
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kann existierende Paketdatei '%s' nicht öffnen"
#: builtin/index-pack.c:1633
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen"
#: builtin/index-pack.c:1681
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "kein Unterschied: %d Objekt"
msgstr[1] "kein Unterschied: %d Objekte"
#: builtin/index-pack.c:1688
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt"
msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte"
#: builtin/index-pack.c:1728
msgid "Cannot come back to cwd"
msgstr "Kann nicht zurück zum Arbeitsverzeichnis wechseln"
#: builtin/index-pack.c:1777 builtin/index-pack.c:1780
#: builtin/index-pack.c:1796 builtin/index-pack.c:1800
#, c-format
msgid "bad %s"
msgstr "%s ist ungültig"
#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "unbekannter Hash-Algorithmus '%s'"
#: builtin/index-pack.c:1821
msgid "--fix-thin cannot be used without --stdin"
msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden."
#: builtin/index-pack.c:1823
msgid "--stdin requires a git repository"
msgstr "--stdin erfordert ein Git-Repository"
#: builtin/index-pack.c:1825
msgid "--object-format cannot be used with --stdin"
msgstr "Die Option --object-format kann nicht mit --stdin verwendet werden."
#: builtin/index-pack.c:1831
msgid "--verify with no packfile name given"
msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben."
#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582
msgid "fsck error in pack objects"
msgstr "fsck Fehler beim Packen von Objekten"
#: builtin/init-db.c:64
#, c-format
msgid "cannot stat template '%s'"
msgstr "kann Vorlage '%s' nicht lesen"
#: builtin/init-db.c:69
#, c-format
msgid "cannot opendir '%s'"
msgstr "kann Verzeichnis '%s' nicht öffnen"
#: builtin/init-db.c:81
#, c-format
msgid "cannot readlink '%s'"
msgstr "kann Verweis '%s' nicht lesen"
#: builtin/init-db.c:83
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "kann symbolische Verknüpfung '%s' auf '%s' nicht erstellen"
#: builtin/init-db.c:89
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "kann '%s' nicht nach '%s' kopieren"
#: builtin/init-db.c:93
#, c-format
msgid "ignoring template %s"
msgstr "ignoriere Vorlage %s"
#: builtin/init-db.c:124
#, c-format
msgid "templates not found in %s"
msgstr "Keine Vorlagen in %s gefunden."
#: builtin/init-db.c:139
#, c-format
msgid "not copying templates from '%s': %s"
msgstr "kopiere keine Vorlagen von '%s': %s"
#: builtin/init-db.c:274
#, c-format
msgid "invalid initial branch name: '%s'"
msgstr "ungültiger initialer Branchname: '%s'"
#: builtin/init-db.c:366
#, c-format
msgid "unable to handle file type %d"
msgstr "kann nicht mit Dateityp %d umgehen"
#: builtin/init-db.c:369
#, c-format
msgid "unable to move %s to %s"
msgstr "Konnte %s nicht nach %s verschieben"
#: builtin/init-db.c:385
msgid "attempt to reinitialize repository with different hash"
msgstr "Versuch, das Repository mit einem anderen Hash zu reinitialisieren"
#: builtin/init-db.c:409 builtin/init-db.c:412
#, c-format
msgid "%s already exists"
msgstr "%s existiert bereits"
#: builtin/init-db.c:443
#, c-format
msgid "re-init: ignored --initial-branch=%s"
msgstr "Neu-Initialisierung: --initial-branch=%s ignoriert"
#: builtin/init-db.c:474
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "Bestehendes verteiltes Git-Repository in %s%s neuinitialisiert\n"
#: builtin/init-db.c:475
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "Bestehendes Git-Repository in %s%s neuinitialisiert\n"
#: builtin/init-db.c:479
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "Leeres verteiltes Git-Repository in %s%s initialisiert\n"
#: builtin/init-db.c:480
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "Leeres Git-Repository in %s%s initialisiert\n"
#: builtin/init-db.c:529
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
msgstr ""
"git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--"
"shared[=<Berechtigungen>]] [<Verzeichnis>]"
#: builtin/init-db.c:555
msgid "permissions"
msgstr "Berechtigungen"
#: builtin/init-db.c:556
msgid "specify that the git repository is to be shared amongst several users"
msgstr "angeben, dass das Git-Repository mit mehreren Benutzern geteilt wird"
#: builtin/init-db.c:562
msgid "override the name of the initial branch"
msgstr "den Namen des initialen Branches überschreiben"
#: builtin/init-db.c:563 builtin/verify-pack.c:74
msgid "hash"
msgstr "Hash"
#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75
msgid "specify the hash algorithm to use"
msgstr "den zu verwendenen Hash-Algorithmus angeben"
#: builtin/init-db.c:571
msgid "--separate-git-dir and --bare are mutually exclusive"
msgstr "--separate-git-dir und --bare schließen sich gegenseitig aus"
#: builtin/init-db.c:600 builtin/init-db.c:605
#, c-format
msgid "cannot mkdir %s"
msgstr "kann Verzeichnis %s nicht erstellen"
#: builtin/init-db.c:609 builtin/init-db.c:664
#, c-format
msgid "cannot chdir to %s"
msgstr "kann nicht in Verzeichnis %s wechseln"
#: builtin/init-db.c:636
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
"%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s "
"(oder --git-dir=<Verzeichnis>)"
#: builtin/init-db.c:688
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen."
#: builtin/init-db.c:693
msgid "--separate-git-dir incompatible with bare repository"
msgstr "--separate-git-dir nicht kompatibel mit Bare-Repository"
#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
msgstr ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<Token>[(=|:)<Wert>])...] [<Datei>...]"
#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "vorhandene Dateien direkt bearbeiten"
#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "kürzt leere Anhänge"
#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "wo der neue Anhang platziert wird"
#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "Aktion, wenn Anhang bereits existiert"
#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "Aktion, wenn Anhang fehlt"
#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "nur Anhänge ausgeben"
#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "Regeln aus Konfiguration nicht anwenden"
#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "durch Leerzeichen fortgesetzte Werte verbinden"
#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "Optionen für das Parsen setzen"
#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr "--- nicht speziell behandeln"
#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "Anhang"
#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "Anhang/Anhänge hinzufügen"
#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr ""
"Die Optionen --trailer und --only-input können nicht gemeinsam verwendet "
"werden."
#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "keine Datei zur direkten Bearbeitung angegeben"
#: builtin/log.c:56
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]"
#: builtin/log.c:57
msgid "git show [<options>] <object>..."
msgstr "git show [<Optionen>] <Objekt>..."
#: builtin/log.c:110
#, c-format
msgid "invalid --decorate option: %s"
msgstr "Ungültige Option für --decorate: %s"
#: builtin/log.c:177
msgid "show source"
msgstr "Quelle anzeigen"
#: builtin/log.c:178
msgid "Use mail map file"
msgstr "\"mailmap\"-Datei verwenden"
#: builtin/log.c:181
msgid "only decorate refs that match <pattern>"
msgstr "\"decorate\" nur bei Referenzen anwenden, die <Muster> entsprechen"
#: builtin/log.c:183
msgid "do not decorate refs that match <pattern>"
msgstr "\"decorate\" nicht bei Referenzen anwenden, die <Muster> entsprechen"
#: builtin/log.c:184
msgid "decorate options"
msgstr "decorate-Optionen"
#: builtin/log.c:187
msgid "Process line range n,m in file, counting from 1"
msgstr "Verarbeitet nur Zeilen im Bereich n,m in der Datei, gezählt von 1"
#: builtin/log.c:297
#, c-format
msgid "Final output: %d %s\n"
msgstr "letzte Ausgabe: %d %s\n"
#: builtin/log.c:555
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: ungültige Datei"
#: builtin/log.c:570 builtin/log.c:665
#, c-format
msgid "could not read object %s"
msgstr "Konnte Objekt %s nicht lesen."
#: builtin/log.c:690
#, c-format
msgid "unknown type: %d"
msgstr "Unbekannter Typ: %d"
#: builtin/log.c:839
#, c-format
msgid "%s: invalid cover from description mode"
msgstr ""
"%s: Ungültiger Modus für Erstellung des Deckblattes aus der Beschreibung"
#: builtin/log.c:846
msgid "format.headers without value"
msgstr "format.headers ohne Wert"
#: builtin/log.c:965
msgid "name of output directory is too long"
msgstr "Name des Ausgabeverzeichnisses ist zu lang."
#: builtin/log.c:981
#, c-format
msgid "cannot open patch file %s"
msgstr "Kann Patch-Datei %s nicht öffnen"
#: builtin/log.c:998
msgid "need exactly one range"
msgstr "Brauche genau einen Commit-Bereich."
#: builtin/log.c:1008
msgid "not a range"
msgstr "Kein Commit-Bereich."
#: builtin/log.c:1172
msgid "cover letter needs email format"
msgstr "Anschreiben benötigt E-Mail-Format"
#: builtin/log.c:1178
msgid "failed to create cover-letter file"
msgstr "Fehler beim Erstellen der Datei für das Anschreiben."
#: builtin/log.c:1259
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ungültiges in-reply-to: %s"
#: builtin/log.c:1286
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]"
#: builtin/log.c:1344
msgid "two output directories?"
msgstr "Zwei Ausgabeverzeichnisse?"
#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315
#, c-format
msgid "unknown commit %s"
msgstr "Unbekannter Commit %s"
#: builtin/log.c:1506 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
#: builtin/log.c:1515
msgid "could not find exact merge base"
msgstr "Konnte keine exakte Merge-Basis finden."
#: builtin/log.c:1525
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 ""
"Fehler beim Bestimmen des Upstream-Branches. Wenn Sie den Basis-Commit\n"
"automatisch speichern lassen möchten, benutzen Sie bitte\n"
"'git branch --set-upstream-to', um einem Remote-Branch zu folgen.\n"
"Oder geben Sie den Basis-Commit mit '--base=<Basis-Commit-Id>' manuell an."
#: builtin/log.c:1548
msgid "failed to find exact merge base"
msgstr "Fehler beim Finden einer exakten Merge-Basis."
#: builtin/log.c:1565
msgid "base commit should be the ancestor of revision list"
msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein."
#: builtin/log.c:1575
msgid "base commit shouldn't be in revision list"
msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein."
#: builtin/log.c:1633
msgid "cannot get patch id"
msgstr "kann Patch-Id nicht lesen"
#: builtin/log.c:1690
msgid "failed to infer range-diff origin of current series"
msgstr "Fehler beim Ableiten des range-diff Ursprungs der aktuellen Serie"
#: builtin/log.c:1692
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr "nutze '%s' als range-diff Ursprung der aktuellen Serie"
#: builtin/log.c:1736
msgid "use [PATCH n/m] even with a single patch"
msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden"
#: builtin/log.c:1739
msgid "use [PATCH] even with multiple patches"
msgstr "[PATCH] auch mit mehreren Patches verwenden"
#: builtin/log.c:1743
msgid "print patches to standard out"
msgstr "Ausgabe der Patches in Standard-Ausgabe"
#: builtin/log.c:1745
msgid "generate a cover letter"
msgstr "ein Deckblatt erzeugen"
#: builtin/log.c:1747
msgid "use simple number sequence for output file names"
msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden"
#: builtin/log.c:1748
msgid "sfx"
msgstr "Dateiendung"
#: builtin/log.c:1749
msgid "use <sfx> instead of '.patch'"
msgstr "<Dateiendung> anstatt '.patch' verwenden"
#: builtin/log.c:1751
msgid "start numbering patches at <n> instead of 1"
msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen"
#: builtin/log.c:1753
msgid "mark the series as Nth re-roll"
msgstr "die Serie als n-te Fassung kennzeichnen"
#: builtin/log.c:1755
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "[RFC PATCH] anstatt [PATCH] verwenden"
#: builtin/log.c:1758
msgid "cover-from-description-mode"
msgstr "Modus für Erstellung des Deckblattes aus der Beschreibung"
#: builtin/log.c:1759
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
"Erzeuge Teile des Deckblattes basierend auf der Beschreibung des Branches"
#: builtin/log.c:1761
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Nutze [<Präfix>] statt [PATCH]"
#: builtin/log.c:1764
msgid "store resulting files in <dir>"
msgstr "erzeugte Dateien in <Verzeichnis> speichern"
#: builtin/log.c:1767
msgid "don't strip/add [PATCH]"
msgstr "[PATCH] nicht entfernen/hinzufügen"
#: builtin/log.c:1770
msgid "don't output binary diffs"
msgstr "keine binären Unterschiede ausgeben"
#: builtin/log.c:1772
msgid "output all-zero hash in From header"
msgstr "Hash mit Nullen in \"From\"-Header ausgeben"
#: builtin/log.c:1774
msgid "don't include a patch matching a commit upstream"
msgstr ""
"keine Patches einschließen, die einem Commit im Upstream-Branch entsprechen"
#: builtin/log.c:1776
msgid "show patch format instead of default (patch + stat)"
msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)"
#: builtin/log.c:1778
msgid "Messaging"
msgstr "E-Mail-Einstellungen"
#: builtin/log.c:1779
msgid "header"
msgstr "Header"
#: builtin/log.c:1780
msgid "add email header"
msgstr "E-Mail-Header hinzufügen"
#: builtin/log.c:1781 builtin/log.c:1782
msgid "email"
msgstr "E-Mail"
#: builtin/log.c:1781
msgid "add To: header"
msgstr "\"To:\"-Header hinzufügen"
#: builtin/log.c:1782
msgid "add Cc: header"
msgstr "\"Cc:\"-Header hinzufügen"
#: builtin/log.c:1783
msgid "ident"
msgstr "Ident"
#: builtin/log.c:1784
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"\"From\"-Adresse auf <Ident> setzen (oder Ident des Commit-Erstellers, wenn "
"fehlend)"
#: builtin/log.c:1786
msgid "message-id"
msgstr "message-id"
#: builtin/log.c:1787
msgid "make first mail a reply to <message-id>"
msgstr "aus erster E-Mail eine Antwort zu <message-id> machen"
#: builtin/log.c:1788 builtin/log.c:1791
msgid "boundary"
msgstr "Grenze"
#: builtin/log.c:1789
msgid "attach the patch"
msgstr "den Patch anhängen"
#: builtin/log.c:1792
msgid "inline the patch"
msgstr "den Patch direkt in die Nachricht einfügen"
#: builtin/log.c:1796
msgid "enable message threading, styles: shallow, deep"
msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep"
#: builtin/log.c:1798
msgid "signature"
msgstr "Signatur"
#: builtin/log.c:1799
msgid "add a signature"
msgstr "eine Signatur hinzufügen"
#: builtin/log.c:1800
msgid "base-commit"
msgstr "Basis-Commit"
#: builtin/log.c:1801
msgid "add prerequisite tree info to the patch series"
msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen"
#: builtin/log.c:1804
msgid "add a signature from a file"
msgstr "eine Signatur aus einer Datei hinzufügen"
#: builtin/log.c:1805
msgid "don't print the patch filenames"
msgstr "keine Dateinamen der Patches anzeigen"
#: builtin/log.c:1807
msgid "show progress while generating patches"
msgstr "Forschrittsanzeige während der Erzeugung der Patches"
#: builtin/log.c:1809
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"Änderungen gegenüber <Commit> im Deckblatt oder einzelnem Patch anzeigen"
#: builtin/log.c:1812
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"Änderungen gegenüber <Refspec> im Deckblatt oder einzelnem Patch anzeigen"
#: builtin/log.c:1814
msgid "percentage by which creation is weighted"
msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird"
#: builtin/log.c:1896
#, c-format
msgid "invalid ident line: %s"
msgstr "Ungültige Identifikationszeile: %s"
#: builtin/log.c:1911
msgid "-n and -k are mutually exclusive"
msgstr "-n und -k schließen sich gegenseitig aus."
#: builtin/log.c:1913
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus."
#: builtin/log.c:1921
msgid "--name-only does not make sense"
msgstr "Die Option --name-only kann nicht verwendet werden."
#: builtin/log.c:1923
msgid "--name-status does not make sense"
msgstr "Die Option --name-status kann nicht verwendet werden."
#: builtin/log.c:1925
msgid "--check does not make sense"
msgstr "Die Option --check kann nicht verwendet werden."
#: builtin/log.c:1958
msgid "standard output, or directory, which one?"
msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?"
#: builtin/log.c:2062
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff erfordert --cover-letter oder einzelnen Patch."
#: builtin/log.c:2066
msgid "Interdiff:"
msgstr "Interdiff:"
#: builtin/log.c:2067
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff gegen v%d:"
#: builtin/log.c:2073
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor erfordert --range-diff"
#: builtin/log.c:2077
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff erfordert --cover-letter oder einzelnen Patch."
#: builtin/log.c:2085
msgid "Range-diff:"
msgstr "Range-Diff:"
#: builtin/log.c:2086
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-Diff gegen v%d:"
#: builtin/log.c:2097
#, c-format
msgid "unable to read signature file '%s'"
msgstr "Konnte Signatur-Datei '%s' nicht lesen"
#: builtin/log.c:2133
msgid "Generating patches"
msgstr "Erzeuge Patches"
#: builtin/log.c:2177
msgid "failed to create output files"
msgstr "Fehler beim Erstellen der Ausgabedateien."
#: builtin/log.c:2236
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
#: builtin/log.c:2290
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
"Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> "
"manuell an.\n"
#: builtin/ls-files.c:471
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<Optionen>] [<Datei>...]"
#: builtin/ls-files.c:527
msgid "identify the file status with tags"
msgstr "den Dateistatus mit Tags anzeigen"
#: builtin/ls-files.c:529
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
"Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung verwenden"
#: builtin/ls-files.c:531
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "Kleinbuchstaben für 'fsmonitor clean' Dateien verwenden"
#: builtin/ls-files.c:533
msgid "show cached files in the output (default)"
msgstr "zwischengespeicherte Dateien in der Ausgabe anzeigen (Standard)"
#: builtin/ls-files.c:535
msgid "show deleted files in the output"
msgstr "entfernte Dateien in der Ausgabe anzeigen"
#: builtin/ls-files.c:537
msgid "show modified files in the output"
msgstr "geänderte Dateien in der Ausgabe anzeigen"
#: builtin/ls-files.c:539
msgid "show other files in the output"
msgstr "sonstige Dateien in der Ausgabe anzeigen"
#: builtin/ls-files.c:541
msgid "show ignored files in the output"
msgstr "ignorierte Dateien in der Ausgabe anzeigen"
#: builtin/ls-files.c:544
msgid "show staged contents' object name in the output"
msgstr ""
"Objektnamen von Inhalten, die zum Commit vorgemerkt sind, in der Ausgabe "
"anzeigen"
#: builtin/ls-files.c:546
msgid "show files on the filesystem that need to be removed"
msgstr "Dateien im Dateisystem, die gelöscht werden müssen, anzeigen"
#: builtin/ls-files.c:548
msgid "show 'other' directories' names only"
msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen"
#: builtin/ls-files.c:550
msgid "show line endings of files"
msgstr "Zeilenenden von Dateien anzeigen"
#: builtin/ls-files.c:552
msgid "don't show empty directories"
msgstr "keine leeren Verzeichnisse anzeigen"
#: builtin/ls-files.c:555
msgid "show unmerged files in the output"
msgstr "nicht zusammengeführte Dateien in der Ausgabe anzeigen"
#: builtin/ls-files.c:557
msgid "show resolve-undo information"
msgstr "'resolve-undo' Informationen anzeigen"
#: builtin/ls-files.c:559
msgid "skip files matching pattern"
msgstr "Dateien auslassen, die einem Muster entsprechen"
#: builtin/ls-files.c:562
msgid "exclude patterns are read from <file>"
msgstr "Muster, gelesen von <Datei>, ausschließen"
#: builtin/ls-files.c:565
msgid "read additional per-directory exclude patterns in <file>"
msgstr "zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei> auslesen"
#: builtin/ls-files.c:567
msgid "add the standard git exclusions"
msgstr "die standardmäßigen Git-Ausschlüsse hinzufügen"
#: builtin/ls-files.c:571
msgid "make the output relative to the project top directory"
msgstr "Ausgabe relativ zum Projektverzeichnis"
#: builtin/ls-files.c:574
msgid "recurse through submodules"
msgstr "Rekursion in Submodulen durchführen"
#: builtin/ls-files.c:576
msgid "if any <file> is not in the index, treat this as an error"
msgstr "als Fehler behandeln, wenn sich eine <Datei> nicht im Index befindet"
#: builtin/ls-files.c:577
msgid "tree-ish"
msgstr "Commit-Referenz"
#: builtin/ls-files.c:578
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"vorgeben, dass Pfade, die seit <Commit-Referenz> gelöscht wurden, immer noch "
"vorhanden sind"
#: builtin/ls-files.c:580
msgid "show debugging data"
msgstr "Ausgaben zur Fehlersuche anzeigen"
#: 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 ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<Programm>]\n"
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<Repository> [<Referenzen>...]]"
#: builtin/ls-remote.c:59
msgid "do not print remote URL"
msgstr "URL des Remote-Repositories nicht ausgeben"
#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392
msgid "exec"
msgstr "Programm"
#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
msgid "path of git-upload-pack on the remote host"
msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
#: builtin/ls-remote.c:65
msgid "limit to tags"
msgstr "auf Tags einschränken"
#: builtin/ls-remote.c:66
msgid "limit to heads"
msgstr "auf Branches einschränken"
#: builtin/ls-remote.c:67
msgid "do not show peeled tags"
msgstr "keine Tags anzeigen, die andere Tags enthalten"
#: builtin/ls-remote.c:69
msgid "take url.<base>.insteadOf into account"
msgstr "url.<Basis>.insteadOf berücksichtigen"
#: builtin/ls-remote.c:72
msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
"mit Exit-Code 2 beenden, wenn keine übereinstimmenden Referenzen\n"
"gefunden wurden"
#: builtin/ls-remote.c:75
msgid "show underlying ref in addition to the object pointed by it"
msgstr "zusätzlich zum Objekt die darauf verweisenden Referenzen anzeigen"
#: builtin/ls-tree.c:30
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<Optionen>] <Commit-Referenz> [<Pfad>...]"
#: builtin/ls-tree.c:128
msgid "only show trees"
msgstr "nur Verzeichnisse anzeigen"
#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
msgstr "Rekursion in Unterverzeichnissen durchführen"
#: builtin/ls-tree.c:132
msgid "show trees when recursing"
msgstr "Verzeichnisse bei Rekursion anzeigen"
#: builtin/ls-tree.c:135
msgid "terminate entries with NUL byte"
msgstr "Einträge mit NUL-Byte abschließen"
#: builtin/ls-tree.c:136
msgid "include object size"
msgstr "Objektgröße einschließen"
#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
msgid "list only filenames"
msgstr "nur Dateinamen auflisten"
#: builtin/ls-tree.c:143
msgid "use full path names"
msgstr "vollständige Pfadnamen verwenden"
#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
"das gesamte Verzeichnis auflisten; nicht nur das aktuelle Verzeichnis "
"(impliziert --full-name)"
#: builtin/mailsplit.c:241
#, c-format
msgid "empty mbox: '%s'"
msgstr "Leere mbox: '%s'"
#: builtin/merge-base.c:32
msgid "git merge-base [-a | --all] <commit> <commit>..."
msgstr "git merge-base [-a | --all] <Commit> <Commit>..."
#: builtin/merge-base.c:33
msgid "git merge-base [-a | --all] --octopus <commit>..."
msgstr "git merge-base [-a | --all] --octopus <Commit>..."
#: builtin/merge-base.c:34
msgid "git merge-base --independent <commit>..."
msgstr "git merge-base --independent <Commit>..."
#: builtin/merge-base.c:35
msgid "git merge-base --is-ancestor <commit> <commit>"
msgstr "git merge-base --is-ancestor <Commit> <Commit>"
#: builtin/merge-base.c:36
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <Referenz> [<Commit>]"
#: builtin/merge-base.c:143
msgid "output all common ancestors"
msgstr "Ausgabe aller gemeinsamen Vorgänger-Commits"
#: builtin/merge-base.c:145
msgid "find ancestors for a single n-way merge"
msgstr "Vorgänger-Commits für einen einzelnen n-Wege-Merge finden"
#: builtin/merge-base.c:147
msgid "list revs not reachable from others"
msgstr "Commits auflisten, die nicht durch Andere erreichbar sind"
#: builtin/merge-base.c:149
msgid "is the first one ancestor of the other?"
msgstr "ist der Erste ein Vorgänger-Commit des Anderen?"
#: builtin/merge-base.c:151
msgid "find where <commit> forked from reflog of <ref>"
msgstr "<Commit> finden, von wo Reflog von <Referenz> abgespalten wurde"
#: builtin/merge-file.c:9
msgid ""
"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
"<orig-file> <file2>"
msgstr ""
"git merge-file [<Optionen>] [-L <Name1> [-L <orig> [-L <Name2>]]] <Datei1> "
"<orig-Datei> <Datei2>"
#: builtin/merge-file.c:35
msgid "send results to standard output"
msgstr "Ergebnisse zur Standard-Ausgabe senden"
#: builtin/merge-file.c:36
msgid "use a diff3 based merge"
msgstr "einen diff3 basierten Merge verwenden"
#: builtin/merge-file.c:37
msgid "for conflicts, use our version"
msgstr "bei Konflikten unsere Variante verwenden"
#: builtin/merge-file.c:39
msgid "for conflicts, use their version"
msgstr "bei Konflikten ihre Variante verwenden"
#: builtin/merge-file.c:41
msgid "for conflicts, use a union version"
msgstr "bei Konflikten eine gemeinsame Variante verwenden"
#: builtin/merge-file.c:44
msgid "for conflicts, use this marker size"
msgstr "bei Konflikten diese Kennzeichnungslänge verwenden"
#: builtin/merge-file.c:45
msgid "do not warn about conflicts"
msgstr "keine Warnung bei Konflikten"
#: builtin/merge-file.c:47
msgid "set labels for file1/orig-file/file2"
msgstr "Beschriftung für Datei1/orig-Datei/Datei2 setzen"
#: builtin/merge-recursive.c:47
#, c-format
msgid "unknown option %s"
msgstr "unbekannte Option: %s"
#: builtin/merge-recursive.c:53
#, c-format
msgid "could not parse object '%s'"
msgstr "Konnte Objekt '%s' nicht parsen."
#: 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] "kann nicht mit mehr als %d Merge-Basis umgehen. Ignoriere %s."
msgstr[1] "kann nicht mit mehr als %d Merge-Basen umgehen. Ignoriere %s."
#: builtin/merge-recursive.c:65
msgid "not handling anything other than two heads merge."
msgstr "Es wird nur der Merge von zwei Branches behandelt."
#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
#, c-format
msgid "could not resolve ref '%s'"
msgstr "Konnte Referenz '%s' nicht auflösen"
#: builtin/merge-recursive.c:82
#, c-format
msgid "Merging %s with %s\n"
msgstr "Führe %s mit %s zusammen\n"
#: builtin/merge.c:56
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<Optionen>] [<Commit>...]"
#: builtin/merge.c:57
msgid "git merge --abort"
msgstr "git merge --abort"
#: builtin/merge.c:58
msgid "git merge --continue"
msgstr "git merge --continue"
#: builtin/merge.c:120
msgid "switch `m' requires a value"
msgstr "Schalter 'm' erfordert einen Wert."
#: builtin/merge.c:143
#, c-format
msgid "option `%s' requires a value"
msgstr "Option `%s' erfordert einen Wert."
#: builtin/merge.c:189
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Konnte Merge-Strategie '%s' nicht finden.\n"
#: builtin/merge.c:190
#, c-format
msgid "Available strategies are:"
msgstr "Verfügbare Strategien sind:"
#: builtin/merge.c:195
#, c-format
msgid "Available custom strategies are:"
msgstr "Verfügbare benutzerdefinierte Strategien sind:"
#: builtin/merge.c:246 builtin/pull.c:133
msgid "do not show a diffstat at the end of the merge"
msgstr "keine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
#: builtin/merge.c:249 builtin/pull.c:136
msgid "show a diffstat at the end of the merge"
msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
#: builtin/merge.c:250 builtin/pull.c:139
msgid "(synonym to --stat)"
msgstr "(Synonym für --stat)"
#: builtin/merge.c:252 builtin/pull.c:142
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"(höchstens <n>) Einträge von \"shortlog\" zur Beschreibung des Merge-Commits "
"hinzufügen"
#: builtin/merge.c:255 builtin/pull.c:148
msgid "create a single commit instead of doing a merge"
msgstr "einen einzelnen Commit anstatt eines Merges erzeugen"
#: builtin/merge.c:257 builtin/pull.c:151
msgid "perform a commit if the merge succeeds (default)"
msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)"
#: builtin/merge.c:259 builtin/pull.c:154
msgid "edit message before committing"
msgstr "Bearbeitung der Beschreibung vor dem Commit"
#: builtin/merge.c:261
msgid "allow fast-forward (default)"
msgstr "Vorspulen erlauben (Standard)"
#: builtin/merge.c:263 builtin/pull.c:161
msgid "abort if fast-forward is not possible"
msgstr "abbrechen, wenn kein Vorspulen möglich ist"
#: builtin/merge.c:267 builtin/pull.c:164
msgid "verify that the named commit has a valid GPG signature"
msgstr "den genannten Commit auf eine gültige GPG-Signatur überprüfen"
#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168
#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114
msgid "strategy"
msgstr "Strategie"
#: builtin/merge.c:269 builtin/pull.c:169
msgid "merge strategy to use"
msgstr "zu verwendende Merge-Strategie"
#: builtin/merge.c:270 builtin/pull.c:172
msgid "option=value"
msgstr "Option=Wert"
#: builtin/merge.c:271 builtin/pull.c:173
msgid "option for selected merge strategy"
msgstr "Option für ausgewählte Merge-Strategie"
#: builtin/merge.c:273
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"Commit-Beschreibung zusammenführen (für einen Merge, der kein Vorspulen war)"
#: builtin/merge.c:280
msgid "abort the current in-progress merge"
msgstr "den sich im Gange befindlichen Merge abbrechen"
#: builtin/merge.c:282
msgid "--abort but leave index and working tree alone"
msgstr "--abort, aber Index und Arbeitsverzeichnis unverändert lassen"
#: builtin/merge.c:284
msgid "continue the current in-progress merge"
msgstr "den sich im Gange befindlichen Merge fortsetzen"
#: builtin/merge.c:286 builtin/pull.c:180
msgid "allow merging unrelated histories"
msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien"
#: builtin/merge.c:293
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "Hooks pre-merge-commit und commit-msg umgehen"
#: builtin/merge.c:310
msgid "could not run stash."
msgstr "Konnte \"stash\" nicht ausführen."
#: builtin/merge.c:315
msgid "stash failed"
msgstr "\"stash\" fehlgeschlagen"
#: builtin/merge.c:320
#, c-format
msgid "not a valid object: %s"
msgstr "kein gültiges Objekt: %s"
#: builtin/merge.c:342 builtin/merge.c:359
msgid "read-tree failed"
msgstr "read-tree fehlgeschlagen"
#: builtin/merge.c:389
msgid " (nothing to squash)"
msgstr " (nichts zu quetschen)"
#: builtin/merge.c:400
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n"
#: builtin/merge.c:450
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n"
#: builtin/merge.c:501
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' zeigt auf keinen Commit"
#: builtin/merge.c:588
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Ungültiger branch.%s.mergeoptions String: %s"
#: builtin/merge.c:713
msgid "Not handling anything other than two heads merge."
msgstr "Es wird nur der Merge von zwei Branches behandelt."
#: builtin/merge.c:726
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Unbekannte Option für merge-recursive: -X%s"
#: builtin/merge.c:741
#, c-format
msgid "unable to write %s"
msgstr "konnte %s nicht schreiben"
#: builtin/merge.c:793
#, c-format
msgid "Could not read from '%s'"
msgstr "konnte nicht von '%s' lesen"
#: builtin/merge.c:802
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Merge wurde nicht committet; benutzen Sie 'git commit', um den Merge "
"abzuschließen.\n"
#: builtin/merge.c:808
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 ""
"Bitte geben Sie eine Commit-Beschreibung ein, um zu erklären, warum dieser\n"
"Merge erforderlich ist, insbesondere wenn es einen aktualisierten\n"
"Upstream-Branch mit einem Thema-Branch zusammenführt.\n"
"\n"
#: builtin/merge.c:813
msgid "An empty message aborts the commit.\n"
msgstr "Eine leere Commit-Beschreibung bricht den Commit ab.\n"
#: builtin/merge.c:816
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr ""
"Zeilen, die mit '%c' beginnen, werden ignoriert,\n"
"und eine leere Beschreibung bricht den Commit ab.\n"
#: builtin/merge.c:869
msgid "Empty commit message."
msgstr "Leere Commit-Beschreibung"
#: builtin/merge.c:884
#, c-format
msgid "Wonderful.\n"
msgstr "Wunderbar.\n"
#: builtin/merge.c:945
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen "
"Sie dann das Ergebnis.\n"
#: builtin/merge.c:984
msgid "No current branch."
msgstr "Sie befinden sich auf keinem Branch."
#: builtin/merge.c:986
msgid "No remote for the current branch."
msgstr "Kein Remote-Repository für den aktuellen Branch."
#: builtin/merge.c:988
msgid "No default upstream defined for the current branch."
msgstr ""
"Es ist kein Standard-Upstream-Branch für den aktuellen Branch definiert."
#: builtin/merge.c:993
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Kein Remote-Tracking-Branch für %s von %s"
#: builtin/merge.c:1050
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'"
#: builtin/merge.c:1153
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "nichts was wir in %s zusammenführen können: %s"
#: builtin/merge.c:1187
msgid "not something we can merge"
msgstr "nichts was wir zusammenführen können"
#: builtin/merge.c:1291
msgid "--abort expects no arguments"
msgstr "--abort akzeptiert keine Argumente"
#: builtin/merge.c:1295
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)"
#: builtin/merge.c:1313
msgid "--quit expects no arguments"
msgstr "--quit erwartet keine Argumente"
#: builtin/merge.c:1326
msgid "--continue expects no arguments"
msgstr "--continue erwartet keine Argumente"
#: builtin/merge.c:1330
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)."
#: builtin/merge.c:1346
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
"Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n"
"Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
#: builtin/merge.c:1353
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
"Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n"
"Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
#: builtin/merge.c:1356
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
"Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)."
#: builtin/merge.c:1370
msgid "You cannot combine --squash with --no-ff."
msgstr "Sie können --squash nicht mit --no-ff kombinieren."
#: builtin/merge.c:1372
msgid "You cannot combine --squash with --commit."
msgstr "Sie können --squash nicht mit --commit kombinieren."
#: builtin/merge.c:1388
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt."
#: builtin/merge.c:1405
msgid "Squash commit into empty head not supported yet"
msgstr ""
"Bin auf einem Commit, der noch geboren wird; kann \"squash\" nicht ausführen."
#: builtin/merge.c:1407
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"Nicht vorzuspulender Commit kann nicht in einem leeren Branch verwendet "
"werden."
#: builtin/merge.c:1412
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - nichts was wir zusammenführen können"
#: builtin/merge.c:1414
msgid "Can merge only exactly one commit into empty head"
msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenführen."
#: builtin/merge.c:1495
msgid "refusing to merge unrelated histories"
msgstr "Verweigere den Merge von nicht zusammenhängenden Historien."
#: builtin/merge.c:1504
msgid "Already up to date."
msgstr "Bereits aktuell."
#: builtin/merge.c:1514
#, c-format
msgid "Updating %s..%s\n"
msgstr "Aktualisiere %s..%s\n"
#: builtin/merge.c:1560
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n"
#: builtin/merge.c:1567
#, c-format
msgid "Nope.\n"
msgstr "Nein.\n"
#: builtin/merge.c:1592
msgid "Already up to date. Yeeah!"
msgstr "Bereits aktuell."
#: builtin/merge.c:1598
msgid "Not possible to fast-forward, aborting."
msgstr "Vorspulen nicht möglich, breche ab."
#: builtin/merge.c:1626 builtin/merge.c:1691
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n"
#: builtin/merge.c:1630
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Probiere Merge-Strategie %s ...\n"
#: builtin/merge.c:1682
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
#: builtin/merge.c:1684
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
#: builtin/merge.c:1693
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Benutzen Sie \"%s\", um die Auflösung per Hand vorzubereiten.\n"
#: builtin/merge.c:1707
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
"Automatischer Merge abgeschlossen; halte, wie gewünscht, vor dem Commit an\n"
#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
#: builtin/mktree.c:154
msgid "input is NUL terminated"
msgstr "Eingabe ist durch NUL-Zeichen abgeschlossen"
#: builtin/mktree.c:155 builtin/write-tree.c:26
msgid "allow missing objects"
msgstr "fehlende Objekte erlauben"
#: builtin/mktree.c:156
msgid "allow creation of more than one tree"
msgstr "die Erstellung von mehr als einem \"Tree\"-Objekt erlauben"
#: builtin/multi-pack-index.c:9
msgid ""
"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
"size=<size>)"
msgstr ""
"git multi-pack-index [<Optionen>] (write|verify|expire|repack --batch-"
"size=<Größe>)"
#: builtin/multi-pack-index.c:26
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
"Objekt-Verzeichnis, welches Paare von Packdateien und pack-index enthält"
#: builtin/multi-pack-index.c:29
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgstr ""
"Während des Umpackens, sammle Paket-Dateien von geringerer Größe in "
"einenStapel, welcher größer ist als diese Größe"
#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25
msgid "too many arguments"
msgstr "Zu viele Argumente."
#: builtin/multi-pack-index.c:60
msgid "--batch-size option is only for 'repack' subcommand"
msgstr "Option --batch-size ist nur für den Unterbefehl 'repack'"
#: builtin/multi-pack-index.c:69
#, c-format
msgid "unrecognized subcommand: %s"
msgstr "Nicht erkannter Unterbefehl: %s"
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<Optionen>] <Quelle>... <Ziel>"
#: builtin/mv.c:83
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr "Verzeichnis %s ist zum Commit vorgemerkt und kein Submodul?"
#: builtin/mv.c:85
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder "
"benutzen\n"
"Sie \"stash\", um fortzufahren."
#: builtin/mv.c:103
#, c-format
msgid "%.*s is in index"
msgstr "%.*s ist zum Commit vorgemerkt"
#: builtin/mv.c:125
msgid "force move/rename even if target exists"
msgstr "Verschieben/Umbenennen erzwingen, auch wenn das Ziel existiert"
#: builtin/mv.c:127
msgid "skip move/rename errors"
msgstr "Fehler beim Verschieben oder Umbenennen überspringen"
#: builtin/mv.c:170
#, c-format
msgid "destination '%s' is not a directory"
msgstr "Ziel '%s' ist kein Verzeichnis"
#: builtin/mv.c:181
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Prüfe Umbenennung von '%s' nach '%s'\n"
#: builtin/mv.c:185
msgid "bad source"
msgstr "ungültige Quelle"
#: builtin/mv.c:188
msgid "can not move directory into itself"
msgstr "kann Verzeichnis nicht in sich selbst verschieben"
#: builtin/mv.c:191
msgid "cannot move directory over file"
msgstr "kann Verzeichnis nicht über Datei verschieben"
#: builtin/mv.c:200
msgid "source directory is empty"
msgstr "Quellverzeichnis ist leer"
#: builtin/mv.c:225
msgid "not under version control"
msgstr "nicht unter Versionskontrolle"
#: builtin/mv.c:227
msgid "conflicted"
msgstr "in Konflikt"
#: builtin/mv.c:230
msgid "destination exists"
msgstr "Ziel existiert bereits"
#: builtin/mv.c:238
#, c-format
msgid "overwriting '%s'"
msgstr "überschreibe '%s'"
#: builtin/mv.c:241
msgid "Cannot overwrite"
msgstr "Kann nicht überschreiben"
#: builtin/mv.c:244
msgid "multiple sources for the same target"
msgstr "mehrere Quellen für dasselbe Ziel"
#: builtin/mv.c:246
msgid "destination directory does not exist"
msgstr "Zielverzeichnis existiert nicht"
#: builtin/mv.c:253
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, Quelle=%s, Ziel=%s"
#: builtin/mv.c:274
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Benenne %s nach %s um\n"
#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518
#, c-format
msgid "renaming '%s' failed"
msgstr "Umbenennung von '%s' fehlgeschlagen"
#: builtin/name-rev.c:465
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<Optionen>] <Commit>..."
#: builtin/name-rev.c:466
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<Optionen>] --all"
#: builtin/name-rev.c:467
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<Optionen>] --stdin"
#: builtin/name-rev.c:524
msgid "print only ref-based names (no object names)"
msgstr "nur Referenzen-basierte Namen ausgeben (keine Objektnamen)"
#: builtin/name-rev.c:525
msgid "only use tags to name the commits"
msgstr "nur Tags verwenden, um die Commits zu benennen"
#: builtin/name-rev.c:527
msgid "only use refs matching <pattern>"
msgstr "nur Referenzen verwenden, die <Muster> entsprechen"
#: builtin/name-rev.c:529
msgid "ignore refs matching <pattern>"
msgstr "ignoriere Referenzen die <Muster> entsprechen"
#: builtin/name-rev.c:531
msgid "list all commits reachable from all refs"
msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind"
#: builtin/name-rev.c:532
msgid "read from stdin"
msgstr "von der Standard-Eingabe lesen"
#: builtin/name-rev.c:533
msgid "allow to print `undefined` names (default)"
msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)"
#: builtin/name-rev.c:539
msgid "dereference tags in the input (internal use)"
msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)"
#: builtin/notes.c:28
msgid "git notes [--ref <notes-ref>] [list [<object>]]"
msgstr "git notes [--ref <Notiz-Referenz>] [list [<Objekt>]]"
#: builtin/notes.c:29
msgid ""
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
"| (-c | -C) <object>] [<object>]"
msgstr ""
"git notes [--ref <Notiz-Referenz>] add [-f] [--allow-empty] [-m "
"<Beschreibung> | -F <Datei> | (-c | -C) <Objekt>] [<Objekt>]"
#: builtin/notes.c:30
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
msgstr ""
"git notes [--ref <Notiz-Referenz>] copy [-f] <von-Objekt> <nach-Objekt>"
#: builtin/notes.c:31
msgid ""
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
"(-c | -C) <object>] [<object>]"
msgstr ""
"git notes [--ref <Notiz-Referenz>] append [--allow-empty] [-m <Beschreibung> "
"| -F <Datei> | (-c | -C) <Objekt>] [<Objekt>]"
#: builtin/notes.c:32
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
msgstr "git notes [--ref <Notiz-Referenz>] edit [--allow-empty] [<Objekt>]"
#: builtin/notes.c:33
msgid "git notes [--ref <notes-ref>] show [<object>]"
msgstr "git notes [--ref <Notiz-Referenz>] show [<Objekt>]"
#: builtin/notes.c:34
msgid ""
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr ""
"git notes [--ref <Notiz-Referenz>] merge [-v | -q] [-s <Strategie>] <Notiz-"
"Referenz>"
#: builtin/notes.c:35
msgid "git notes merge --commit [-v | -q]"
msgstr "git notes merge --commit [-v | -q]"
#: builtin/notes.c:36
msgid "git notes merge --abort [-v | -q]"
msgstr "git notes merge --abort [-v | -q]"
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr "git notes [--ref <Notiz-Referenz>] remove [<Objekt>...]"
#: builtin/notes.c:38
msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
msgstr "git notes [--ref <Notiz-Referenz>] prune [-n] [-v]"
#: builtin/notes.c:39
msgid "git notes [--ref <notes-ref>] get-ref"
msgstr "git notes [--ref <Notiz-Referenz>] get-ref"
#: builtin/notes.c:44
msgid "git notes [list [<object>]]"
msgstr "git notes [list [<Objekt>]]"
#: builtin/notes.c:49
msgid "git notes add [<options>] [<object>]"
msgstr "git notes add [<Optionen>] [<Objekt>]"
#: builtin/notes.c:54
msgid "git notes copy [<options>] <from-object> <to-object>"
msgstr "git notes copy [<Optionen>] <von-Objekt> <nach-Objekt>"
#: builtin/notes.c:55
msgid "git notes copy --stdin [<from-object> <to-object>]..."
msgstr "git notes copy --stdin [<von-Objekt> <nach-Objekt>]..."
#: builtin/notes.c:60
msgid "git notes append [<options>] [<object>]"
msgstr "git notes append [<Optionen>] [<Objekt>]"
#: builtin/notes.c:65
msgid "git notes edit [<object>]"
msgstr "git notes edit [<Objekt>]"
#: builtin/notes.c:70
msgid "git notes show [<object>]"
msgstr "git notes show [<Objekt>]"
#: builtin/notes.c:75
msgid "git notes merge [<options>] <notes-ref>"
msgstr "git notes merge [<Optionen>] <Notiz-Referenz>"
#: builtin/notes.c:76
msgid "git notes merge --commit [<options>]"
msgstr "git notes merge --commit [<Optionen>]"
#: builtin/notes.c:77
msgid "git notes merge --abort [<options>]"
msgstr "git notes merge --abort [<Optionen>]"
#: builtin/notes.c:82
msgid "git notes remove [<object>]"
msgstr "git notes remove [<Objekt>]"
#: builtin/notes.c:87
msgid "git notes prune [<options>]"
msgstr "git notes prune [<Optionen>]"
#: builtin/notes.c:92
msgid "git notes get-ref"
msgstr "git notes get-ref"
#: builtin/notes.c:97
msgid "Write/edit the notes for the following object:"
msgstr "Schreiben/Bearbeiten der Notizen für das folgende Objekt:"
#: builtin/notes.c:150
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "konnte 'show' für Objekt '%s' nicht starten"
#: builtin/notes.c:154
msgid "could not read 'show' output"
msgstr "Konnte Ausgabe von 'show' nicht lesen."
#: builtin/notes.c:162
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "konnte 'show' für Objekt '%s' nicht abschließen"
#: builtin/notes.c:197
msgid "please supply the note contents using either -m or -F option"
msgstr ""
"Bitte liefern Sie die Notiz-Inhalte unter Verwendung der Option -m oder -F."
#: builtin/notes.c:206
msgid "unable to write note object"
msgstr "Konnte Notiz-Objekt nicht schreiben"
#: builtin/notes.c:208
#, c-format
msgid "the note contents have been left in %s"
msgstr "Die Notiz-Inhalte wurden in %s belassen."
#: builtin/notes.c:242 builtin/tag.c:533
#, c-format
msgid "could not open or read '%s'"
msgstr "konnte '%s' nicht öffnen oder lesen"
#: 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 "Konnte '%s' nicht als gültige Referenz auflösen."
#: builtin/notes.c:265
#, c-format
msgid "failed to read object '%s'."
msgstr "Fehler beim Lesen des Objektes '%s'."
#: builtin/notes.c:268
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "Kann Notiz-Daten nicht von Nicht-Blob Objekt '%s' lesen."
#: builtin/notes.c:309
#, c-format
msgid "malformed input line: '%s'."
msgstr "Fehlerhafte Eingabezeile: '%s'."
#: builtin/notes.c:324
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
#. 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 ""
"Ausführung von %s auf Notizen in %s (außerhalb von refs/notes/) "
"zurückgewiesen"
#: 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 "zu viele Parameter"
#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
msgid "no note found for object %s."
msgstr "Keine Notiz für Objekt %s gefunden."
#: builtin/notes.c:410 builtin/notes.c:576
msgid "note contents as a string"
msgstr "Notizinhalte als Zeichenkette"
#: builtin/notes.c:413 builtin/notes.c:579
msgid "note contents in a file"
msgstr "Notizinhalte in einer Datei"
#: builtin/notes.c:416 builtin/notes.c:582
msgid "reuse and edit specified note object"
msgstr "Wiederverwendung und Bearbeitung des angegebenen Notiz-Objektes"
#: builtin/notes.c:419 builtin/notes.c:585
msgid "reuse specified note object"
msgstr "Wiederverwendung des angegebenen Notiz-Objektes"
#: builtin/notes.c:422 builtin/notes.c:588
msgid "allow storing empty note"
msgstr "Speichern leerer Notiz erlauben"
#: builtin/notes.c:423 builtin/notes.c:496
msgid "replace existing notes"
msgstr "existierende Notizen ersetzen"
#: builtin/notes.c:448
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
"Konnte Notizen nicht hinzufügen. Existierende Notizen für Objekt %s "
"gefunden. Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
#: builtin/notes.c:463 builtin/notes.c:544
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Überschreibe existierende Notizen für Objekt %s\n"
#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
#, c-format
msgid "Removing note for object %s\n"
msgstr "Entferne Notiz für Objekt %s\n"
#: builtin/notes.c:497
msgid "read objects from stdin"
msgstr "Objekte von der Standard-Eingabe lesen"
#: builtin/notes.c:499
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"Konfiguration für <Befehl> zum Umschreiben von Commits laden (impliziert --"
"stdin)"
#: builtin/notes.c:517
msgid "too few parameters"
msgstr "zu wenig Parameter"
#: builtin/notes.c:538
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
"Kann Notizen nicht kopieren. Existierende Notizen für Objekt %s gefunden. "
"Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
#: builtin/notes.c:550
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "Keine Notizen für Quell-Objekt %s. Kopie nicht möglich."
#: 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 ""
"Die Optionen -m/-F/-c/-C sind für den Unterbefehl 'edit' veraltet.\n"
"Bitte benutzen Sie stattdessen 'git notes add -f -m/-F/-c/-C'.\n"
#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_PARTIAL"
#: builtin/notes.c:700
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_REF"
#: builtin/notes.c:702
msgid "failed to remove 'git notes merge' worktree"
msgstr "Fehler beim Löschen des Arbeitsverzeichnisses von 'git notes merge'."
#: builtin/notes.c:722
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "Fehler beim Lesen der Referenz NOTES_MERGE_PARTIAL"
#: builtin/notes.c:724
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht finden."
#: builtin/notes.c:726
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht parsen."
#: builtin/notes.c:739
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "Fehler beim Auflösen von NOTES_MERGE_REF"
#: builtin/notes.c:742
msgid "failed to finalize notes merge"
msgstr "Fehler beim Abschließen der Zusammenführung der Notizen."
#: builtin/notes.c:768
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "unbekannte Merge-Strategie '%s' für Notizen"
#: builtin/notes.c:784
msgid "General options"
msgstr "Allgemeine Optionen"
#: builtin/notes.c:786
msgid "Merge options"
msgstr "Merge-Optionen"
#: builtin/notes.c:788
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
"löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/"
"theirs/union/cat_sort_uniq)"
#: builtin/notes.c:790
msgid "Committing unmerged notes"
msgstr "nicht zusammengeführte Notizen eintragen"
#: builtin/notes.c:792
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"Merge von Notizen abschließen, in dem nicht zusammengeführte Notizen "
"committet werden"
#: builtin/notes.c:794
msgid "Aborting notes merge resolution"
msgstr "Konfliktauflösung beim Merge von Notizen abbrechen"
#: builtin/notes.c:796
msgid "abort notes merge"
msgstr "Merge von Notizen abbrechen"
#: builtin/notes.c:807
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "Kann --commit, --abort oder -s/--strategy nicht kombinieren."
#: builtin/notes.c:812
msgid "must specify a notes ref to merge"
msgstr "Sie müssen eine Notiz-Referenz zum Mergen angeben."
#: builtin/notes.c:836
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "Unbekannter Wert für -s/--strategy: %s"
#: builtin/notes.c:873
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "Ein Merge von Notizen nach %s ist bereits im Gange bei %s"
#: builtin/notes.c:876
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
"Fehler beim Speichern der Verknüpfung zur aktuellen Notes-Referenz (%s)"
#: 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 ""
"Automatisches Zusammenführen der Notizen fehlgeschlagen. Beheben Sie die\n"
"Konflikte in %s und committen Sie das Ergebnis mit 'git notes merge --"
"commit',\n"
"oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n"
#: builtin/notes.c:897 builtin/tag.c:546
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
#: builtin/notes.c:900
#, c-format
msgid "Object %s has no note\n"
msgstr "Objekt %s hat keine Notiz\n"
#: builtin/notes.c:912
msgid "attempt to remove non-existent note is not an error"
msgstr "der Versuch, eine nicht existierende Notiz zu löschen, ist kein Fehler"
#: builtin/notes.c:915
msgid "read object names from the standard input"
msgstr "Objektnamen von der Standard-Eingabe lesen"
#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220
msgid "do not remove, show only"
msgstr "nicht löschen, nur anzeigen"
#: builtin/notes.c:955
msgid "report pruned notes"
msgstr "gelöschte Notizen melden"
#: builtin/notes.c:998
msgid "notes-ref"
msgstr "Notiz-Referenz"
#: builtin/notes.c:999
msgid "use notes from <notes-ref>"
msgstr "Notizen von <Notiz-Referenz> verwenden"
#: builtin/notes.c:1034 builtin/stash.c:1605
#, c-format
msgid "unknown subcommand: %s"
msgstr "Unbekannter Unterbefehl: %s"
#: builtin/pack-objects.c:54
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<Optionen>...] [< <Referenzliste> | < "
"<Objektliste>]"
#: builtin/pack-objects.c:55
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < "
"<Objektliste>]"
#: builtin/pack-objects.c:443
#, c-format
msgid "bad packed object CRC for %s"
msgstr "Ungültiges CRC für gepacktes Objekt %s."
#: builtin/pack-objects.c:454
#, c-format
msgid "corrupt packed object for %s"
msgstr "Fehlerhaftes gepacktes Objekt für %s."
#: builtin/pack-objects.c:585
#, c-format
msgid "recursive delta detected for object %s"
msgstr "Rekursiver Unterschied für Objekt %s festgestellt."
#: builtin/pack-objects.c:796
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u Objekte geordnet, %<PRIu32> erwartet."
#: builtin/pack-objects.c:1004
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"Deaktiviere Schreiben der Bitmap, Pakete wurden durch pack.packSizeLimit\n"
"aufgetrennt."
#: builtin/pack-objects.c:1017
msgid "Writing objects"
msgstr "Schreibe Objekte"
#: builtin/pack-objects.c:1078 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "Konnte '%s' nicht lesen"
#: builtin/pack-objects.c:1131
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "Schrieb %<PRIu32> Objekte während %<PRIu32> erwartet waren."
#: builtin/pack-objects.c:1348
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"Deaktiviere Schreiben der Bitmap, da einige Objekte nicht in eine Pack-"
"Datei\n"
"geschrieben wurden."
#: builtin/pack-objects.c:1796
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "\"delta base offset\" Überlauf in Paket für %s"
#: builtin/pack-objects.c:1805
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "\"delta base offset\" liegt außerhalb des gültigen Bereichs für %s"
#: builtin/pack-objects.c:2086
msgid "Counting objects"
msgstr "Zähle Objekte"
#: builtin/pack-objects.c:2231
#, c-format
msgid "unable to parse object header of %s"
msgstr "Konnte Kopfbereich von Objekt '%s' nicht parsen."
#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317
#: builtin/pack-objects.c:2327
#, c-format
msgid "object %s cannot be read"
msgstr "Objekt %s kann nicht gelesen werden."
#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "Inkonsistente Objektlänge bei Objekt %s (%<PRIuMAX> vs %<PRIuMAX>)"
#: builtin/pack-objects.c:2341
msgid "suboptimal pack - out of memory"
msgstr "ungünstiges Packet - Speicher voll"
#: builtin/pack-objects.c:2656
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Delta-Kompression verwendet bis zu %d Threads."
#: builtin/pack-objects.c:2795
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "Konnte keine Objekte packen, die von Tag %s erreichbar sind."
#: builtin/pack-objects.c:2883
msgid "Compressing objects"
msgstr "Komprimiere Objekte"
#: builtin/pack-objects.c:2889
msgid "inconsistency with delta count"
msgstr "Inkonsistenz mit der Anzahl von Deltas"
#: 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 ""
"Wert für uploadpack.blobpackfileuri muss in der Form '<Objekt-Hash> <Pack-"
"Hash> <URI>' vorliegen ('%s' erhalten)"
#: builtin/pack-objects.c:2964
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
msgstr ""
"Objekt bereits in einem anderen uploadpack.blobpackfileuri konfiguriert "
"('%s' erhalten)"
#: builtin/pack-objects.c:2993
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
"erwartete Randobjekt-ID, erhielt nutzlose Daten:\n"
" %s"
#: builtin/pack-objects.c:2999
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
"erwartete Objekt-ID, erhielt nutzlose Daten:\n"
" %s"
#: builtin/pack-objects.c:3097
msgid "invalid value for --missing"
msgstr "ungültiger Wert für --missing"
#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264
msgid "cannot open pack index"
msgstr "kann Paketindex nicht öffnen"
#: builtin/pack-objects.c:3187
#, c-format
msgid "loose object at %s could not be examined"
msgstr "loses Objekt bei %s konnte nicht untersucht werden"
#: builtin/pack-objects.c:3272
msgid "unable to force loose object"
msgstr "konnte loses Objekt nicht erzwingen"
#: builtin/pack-objects.c:3365
#, c-format
msgid "not a rev '%s'"
msgstr "'%s' ist kein Commit"
#: builtin/pack-objects.c:3368
#, c-format
msgid "bad revision '%s'"
msgstr "ungültiger Commit '%s'"
#: builtin/pack-objects.c:3393
msgid "unable to add recent objects"
msgstr "konnte neuere Objekte nicht hinzufügen"
#: builtin/pack-objects.c:3446
#, c-format
msgid "unsupported index version %s"
msgstr "nicht unterstützte Index-Version %s"
#: builtin/pack-objects.c:3450
#, c-format
msgid "bad index version '%s'"
msgstr "ungültige Index-Version '%s'"
#: builtin/pack-objects.c:3488
msgid "<version>[,<offset>]"
msgstr "<Version>[,<Offset>]"
#: builtin/pack-objects.c:3489
msgid "write the pack index file in the specified idx format version"
msgstr ""
"die Index-Datei des Paketes in der angegebenen Indexformat-Version schreiben"
#: builtin/pack-objects.c:3492
msgid "maximum size of each output pack file"
msgstr "maximale Größe für jede ausgegebene Paketdatei"
#: builtin/pack-objects.c:3494
msgid "ignore borrowed objects from alternate object store"
msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren"
#: builtin/pack-objects.c:3496
msgid "ignore packed objects"
msgstr "gepackte Objekte ignorieren"
#: builtin/pack-objects.c:3498
msgid "limit pack window by objects"
msgstr "Paketfenster durch Objekte begrenzen"
#: builtin/pack-objects.c:3500
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen"
#: builtin/pack-objects.c:3502
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"maximale Länge der erlaubten Differenzverkettung im resultierenden Paket"
#: builtin/pack-objects.c:3504
msgid "reuse existing deltas"
msgstr "existierende Unterschiede wiederverwenden"
#: builtin/pack-objects.c:3506
msgid "reuse existing objects"
msgstr "existierende Objekte wiederverwenden"
#: builtin/pack-objects.c:3508
msgid "use OFS_DELTA objects"
msgstr "OFS_DELTA Objekte verwenden"
#: builtin/pack-objects.c:3510
msgid "use threads when searching for best delta matches"
msgstr ""
"Threads bei der Suche nach den besten Übereinstimmungen bei Unterschieden "
"verwenden"
#: builtin/pack-objects.c:3512
msgid "do not create an empty pack output"
msgstr "keine leeren Pakete erzeugen"
#: builtin/pack-objects.c:3514
msgid "read revision arguments from standard input"
msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen"
#: builtin/pack-objects.c:3516
msgid "limit the objects to those that are not yet packed"
msgstr "die Objekte zu solchen, die noch nicht gepackt wurden, begrenzen"
#: builtin/pack-objects.c:3519
msgid "include objects reachable from any reference"
msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind"
#: builtin/pack-objects.c:3522
msgid "include objects referred by reflog entries"
msgstr ""
"Objekte einschließen, die von Einträgen des Reflogs referenziert werden"
#: builtin/pack-objects.c:3525
msgid "include objects referred to by the index"
msgstr "Objekte einschließen, die vom Index referenziert werden"
#: builtin/pack-objects.c:3528
msgid "output pack to stdout"
msgstr "Paket in die Standard-Ausgabe schreiben"
#: builtin/pack-objects.c:3530
msgid "include tag objects that refer to objects to be packed"
msgstr "Tag-Objekte einschließen, die auf gepackte Objekte referenzieren"
#: builtin/pack-objects.c:3532
msgid "keep unreachable objects"
msgstr "nicht erreichbare Objekte behalten"
#: builtin/pack-objects.c:3534
msgid "pack loose unreachable objects"
msgstr "nicht erreichbare lose Objekte packen"
#: builtin/pack-objects.c:3536
msgid "unpack unreachable objects newer than <time>"
msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind"
#: builtin/pack-objects.c:3539
msgid "use the sparse reachability algorithm"
msgstr "den \"sparse\" Algorithmus zur Bestimmung der Erreichbarkeit benutzen"
#: builtin/pack-objects.c:3541
msgid "create thin packs"
msgstr "dünnere Pakete erzeugen"
#: builtin/pack-objects.c:3543
msgid "create packs suitable for shallow fetches"
msgstr ""
"Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen"
#: builtin/pack-objects.c:3545
msgid "ignore packs that have companion .keep file"
msgstr "Pakete ignorieren, die .keep Dateien haben"
#: builtin/pack-objects.c:3547
msgid "ignore this pack"
msgstr "dieses Paket ignorieren"
#: builtin/pack-objects.c:3549
msgid "pack compression level"
msgstr "Komprimierungsgrad für Paketierung"
#: builtin/pack-objects.c:3551
msgid "do not hide commits by grafts"
msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen"
#: builtin/pack-objects.c:3553
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"Bitmap-Index (falls verfügbar) zur Optimierung der Objektzählung benutzen"
#: builtin/pack-objects.c:3555
msgid "write a bitmap index together with the pack index"
msgstr "Bitmap-Index zusammen mit Pack-Index schreiben"
#: builtin/pack-objects.c:3559
msgid "write a bitmap index if possible"
msgstr "Bitmap-Index schreiben, wenn möglich"
#: builtin/pack-objects.c:3563
msgid "handling for missing objects"
msgstr "Behandlung für fehlende Objekte"
#: builtin/pack-objects.c:3566
msgid "do not pack objects in promisor packfiles"
msgstr ""
"keine Objekte aus Packdateien von partiell geklonten Remote-Repositories "
"packen"
#: builtin/pack-objects.c:3568
msgid "respect islands during delta compression"
msgstr "Delta-Islands bei Delta-Kompression beachten"
#: builtin/pack-objects.c:3570
msgid "protocol"
msgstr "Protokoll"
#: builtin/pack-objects.c:3571
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr ""
"jegliche konfigurierte uploadpack.blobpackfileuri für dieses Protkoll "
"ausschließen"
#: builtin/pack-objects.c:3600
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "Tiefe für Verkettung von Unterschieden %d ist zu tief, erzwinge %d"
#: builtin/pack-objects.c:3605
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit ist zu hoch, erzwinge %d"
#: builtin/pack-objects.c:3659
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size kann nicht für die Erstellung eines Pakets für eine "
"Übertragung\n"
"benutzt werden."
#: builtin/pack-objects.c:3661
msgid "minimum pack size limit is 1 MiB"
msgstr "Minimales Limit für die Paketgröße ist 1 MiB."
#: builtin/pack-objects.c:3666
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
"--thin kann nicht benutzt werden, um ein indizierbares Paket zu erstellen."
#: builtin/pack-objects.c:3669
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable und --unpack-unreachable sind inkompatibel"
#: builtin/pack-objects.c:3675
msgid "cannot use --filter without --stdout"
msgstr "Kann --filter nicht ohne --stdout benutzen."
#: builtin/pack-objects.c:3735
msgid "Enumerating objects"
msgstr "Objekte aufzählen"
#: builtin/pack-objects.c:3766
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
"reused %<PRIu32>"
msgstr ""
"Gesamt %<PRIu32> (Delta %<PRIu32>), Wiederverwendet %<PRIu32> (Delta "
"%<PRIu32>), Pack wiederverwendet %<PRIu32>"
#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<Optionen>]"
#: builtin/pack-refs.c:16
msgid "pack everything"
msgstr "alles packen"
#: builtin/pack-refs.c:17
msgid "prune loose refs (default)"
msgstr "lose Referenzen entfernen (Standard)"
#: builtin/prune-packed.c:6
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
#: builtin/prune.c:14
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <Zeit>] [--] [<Branch>...]"
#: builtin/prune.c:133
msgid "report pruned objects"
msgstr "gelöschte Objekte melden"
#: builtin/prune.c:136
msgid "expire objects older than <time>"
msgstr "Objekte älter als <Zeit> verfallen lassen"
#: builtin/prune.c:138
msgid "limit traversal to objects outside promisor packfiles"
msgstr ""
"Traversierung auf Objekte außerhalb von Packdateien aus partiell geklonten "
"Remote-Repositories einschränken"
#: builtin/prune.c:152
msgid "cannot prune in a precious-objects repo"
msgstr "kann \"prune\" in precious-objects Repository nicht ausführen"
#: builtin/pull.c:45 builtin/pull.c:47
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Ungültiger Wert für %s: %s"
#: builtin/pull.c:67
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]"
#: builtin/pull.c:123
msgid "control for recursive fetching of submodules"
msgstr "rekursive Anforderungen von Submodulen kontrollieren"
#: builtin/pull.c:127
msgid "Options related to merging"
msgstr "Optionen bezogen auf Merge"
#: builtin/pull.c:130
msgid "incorporate changes by rebasing rather than merging"
msgstr "Integration von Änderungen durch Rebase statt Merge"
#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "Vorspulen erlauben"
#: builtin/pull.c:167 parse-options.h:339
msgid "automatically stash/stash pop before and after"
msgstr "automatischer Stash/Stash-Pop davor und danach"
#: builtin/pull.c:183
msgid "Options related to fetching"
msgstr "Optionen bezogen auf Fetch"
#: builtin/pull.c:193
msgid "force overwrite of local branch"
msgstr "das Überschreiben von lokalen Branches erzwingen"
#: builtin/pull.c:201
msgid "number of submodules pulled in parallel"
msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule"
#: builtin/pull.c:317
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Ungültiger Wert für pull.ff: %s"
#: 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 ""
"Es wird davon abgeraten zu Pullen, ohne anzugeben, wie mit abweichenden\n"
"Branches umgegangen werden soll. Sie können diese Nachricht unterdrücken,\n"
"indem Sie einen der folgenden Befehle ausführen, bevor der nächste Pull\n"
"ausgeführt wird:\n"
"\n"
" git config pull.rebase false # Merge (Standard-Strategie)\n"
" git config pull.rebase true # Rebase\n"
" git config pull.ff only # ausschließlich Vorspulen\n"
"\n"
"Sie können statt \"git config\" auch \"git config --global\" nutzen, um\n"
"einen Standard für alle Repositories festzulegen. Sie können auch die\n"
"Option --rebase, --no-rebase oder --ff-only auf der Kommandozeile nutzen,\n"
"um das konfigurierte Standardverhalten pro Aufruf zu überschreiben.\n"
#: builtin/pull.c:458
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr ""
"Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben "
"angefordert wurden."
#: builtin/pull.c:460
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Es gibt keine Kandidaten für Merge innerhalb der Referenzen, die eben "
"angefordert wurden."
#: builtin/pull.c:461
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr ""
"Im Allgemeinen bedeutet das, dass Sie einen Refspec mit Wildcards angegeben\n"
"haben, der auf der Gegenseite mit keinen Referenzen übereinstimmt."
#: builtin/pull.c:464
#, 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 ""
"Sie führten \"pull\" von Remote-Repository '%s' aus, ohne einen\n"
"Branch anzugeben. Da das nicht das konfigurierte Standard-Remote-\n"
"Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n"
"der Befehlszeile angeben."
#: builtin/pull.c:469 builtin/rebase.c:1240 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Im Moment auf keinem Branch."
#: builtin/pull.c:471 builtin/pull.c:486 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr ""
"Bitte geben Sie den Branch an, gegen welchen Sie \"rebase\" ausführen "
"möchten."
#: builtin/pull.c:473 builtin/pull.c:488 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Bitte geben Sie den Branch an, welchen Sie zusammenführen möchten."
#: builtin/pull.c:474 builtin/pull.c:489
msgid "See git-pull(1) for details."
msgstr "Siehe git-pull(1) für weitere Details."
#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491
#: builtin/rebase.c:1246 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<Remote-Repository>"
#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<Branch>"
#: builtin/pull.c:484 builtin/rebase.c:1238 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Es gibt keine Tracking-Informationen für den aktuellen Branch."
#: builtin/pull.c:493 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Wenn Sie Tracking-Informationen für diesen Branch setzen möchten, können "
"Sie\n"
"dies tun mit:"
#: builtin/pull.c:498
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"from the remote, but no such ref was fetched."
msgstr ""
"Ihre Konfiguration gibt an, den Merge mit Referenz '%s'\n"
"des Remote-Repositories durchzuführen, aber diese Referenz\n"
"wurde nicht angefordert."
#: builtin/pull.c:609
#, c-format
msgid "unable to access commit %s"
msgstr "Konnte nicht auf Commit '%s' zugreifen."
#: builtin/pull.c:894
msgid "ignoring --verify-signatures for rebase"
msgstr "Ignoriere --verify-signatures für Rebase"
#: builtin/pull.c:954
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Aktualisiere einen ungeborenen Branch mit Änderungen, die zum Commit "
"vorgemerkt sind."
#: builtin/pull.c:958
msgid "pull with rebase"
msgstr "Pull mit Rebase"
#: builtin/pull.c:959
msgid "please commit or stash them."
msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
#: builtin/pull.c:984
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"fast-forwarding your working tree from\n"
"commit %s."
msgstr ""
"\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n"
"Spule Ihr Arbeitsverzeichnis von Commit %s vor."
#: builtin/pull.c:990
#, 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 ""
"Kann Arbeitsverzeichnis nicht vorspulen.\n"
"Nachdem Sie sichergestellt haben, alles Schützenswerte der Ausgabe von\n"
"$ git diff %s\n"
"gespeichert zu haben. Führen Sie\n"
"$ git reset --hard\n"
"zur Wiederherstellung aus."
#: builtin/pull.c:1005
msgid "Cannot merge multiple branches into empty head."
msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen."
#: builtin/pull.c:1009
msgid "Cannot rebase onto multiple branches."
msgstr "Kann Rebase nicht auf mehrere Branches ausführen."
#: builtin/pull.c:1017
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen "
"ausführen."
#: builtin/push.c:19
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<Optionen>] [<Repository> [<Refspec>...]]"
#: builtin/push.c:111
msgid "tag shorthand without <tag>"
msgstr "Kurzschrift für Tag ohne <Tag>"
#: builtin/push.c:119
msgid "--delete only accepts plain target ref names"
msgstr "Die Option --delete akzeptiert nur reine Referenznamen als Ziel."
#: builtin/push.c:164
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
"\n"
"Um eine Variante permanent zu verwenden, siehe push.default in 'git help "
"config'."
#: builtin/push.c:167
#, 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 ""
"Der Name des Upstream-Branches stimmt nicht mit dem Namen Ihres\n"
"aktuellen Branches überein. Um auf den Upstream-Branch in dem Remote-\n"
"Repository zu versenden, benutzen Sie:\n"
"\n"
" git push %s HEAD:%s\n"
"\n"
"Um auf den Branch mit demselben Namen im Remote-Repository zu versenden,\n"
"benutzen Sie:\n"
"\n"
" git push %s HEAD\n"
"%s"
#: builtin/push.c:182
#, 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 ""
"Sie befinden sich im Moment auf keinem Branch.\n"
"Um die Historie, führend zum aktuellen (losgelöster HEAD)\n"
"Status zu versenden, benutzen Sie\n"
"\n"
" git push %s HEAD:<Name-des-Remote-Branches>\n"
#: builtin/push.c:194
#, 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 ""
"Der aktuelle Branch %s hat keinen Upstream-Branch.\n"
"Um den aktuellen Branch zu versenden und den Remote-Branch\n"
"als Upstream-Branch zu setzen, benutzen Sie\n"
"\n"
" git push --set-upstream %s %s\n"
#: builtin/push.c:202
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"Der aktuelle Branch %s hat mehrere Upstream-Branches, \"push\" verweigert."
#: builtin/push.c:205
#, 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 ""
"Sie versenden nach '%s', welches kein Upstream-Repository Ihres aktuellen\n"
"Branches '%s' ist, ohne anzugeben, was versendet werden soll, um welchen\n"
"Remote-Branch zu aktualisieren."
#: builtin/push.c:260
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Sie haben keine Refspec für \"push\" angegeben, und push.default ist "
"\"nothing\"."
#: builtin/push.c:267
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 ""
"Aktualisierungen wurden zurückgewiesen, weil die Spitze Ihres aktuellen\n"
"Branches hinter seinem externen Gegenstück zurückgefallen ist. Führen Sie\n"
"die externen Änderungen zusammen (z. B. 'git pull ...') bevor Sie \"push\"\n"
"erneut ausführen.\n"
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
"für weitere Details."
#: builtin/push.c:273
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 ""
"Aktualisierungen wurden zurückgewiesen, weil die Spitze eines versendeten\n"
"Branches hinter seinem externen Gegenstück zurückgefallen ist. Checken Sie\n"
"diesen Branch aus und führen Sie die externen Änderungen zusammen\n"
"(z. B. 'git pull ...') bevor Sie erneut \"push\" ausführen.\n"
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
"für weitere Details."
#: builtin/push.c:279
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 ""
"Aktualisierungen wurden zurückgewiesen, weil das Remote-Repository Commits "
"enthält,\n"
"die lokal nicht vorhanden sind. Das wird üblicherweise durch einen \"push\" "
"von\n"
"Commits auf dieselbe Referenz von einem anderen Repository aus verursacht.\n"
"Vielleicht müssen Sie die externen Änderungen zusammenführen (z. B. 'git "
"pull ...')\n"
"bevor Sie erneut \"push\" ausführen.\n"
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
"für weitere Details."
#: builtin/push.c:286
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"Aktualisierungen wurden zurückgewiesen, weil das Tag bereits\n"
"im Remote-Repository existiert."
#: builtin/push.c:289
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 ""
"Sie können keine Remote-Referenz aktualisieren, die auf ein Objekt zeigt,\n"
"das kein Commit ist, oder es auf ein solches Objekt zeigen lassen, ohne\n"
"die Option '--force' zu verwenden.\n"
#: builtin/push.c:351
#, c-format
msgid "Pushing to %s\n"
msgstr "Push nach %s\n"
#: builtin/push.c:358
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "Fehler beim Versenden einiger Referenzen nach '%s'"
#: builtin/push.c:532
msgid "repository"
msgstr "Repository"
#: builtin/push.c:533 builtin/send-pack.c:183
msgid "push all refs"
msgstr "alle Referenzen versenden"
#: builtin/push.c:534 builtin/send-pack.c:185
msgid "mirror all refs"
msgstr "alle Referenzen spiegeln"
#: builtin/push.c:536
msgid "delete refs"
msgstr "Referenzen löschen"
#: builtin/push.c:537
msgid "push tags (can't be used with --all or --mirror)"
msgstr "Tags versenden (kann nicht mit --all oder --mirror verwendet werden)"
#: builtin/push.c:540 builtin/send-pack.c:186
msgid "force updates"
msgstr "Aktualisierung erzwingen"
#: builtin/push.c:541 builtin/send-pack.c:198
msgid "<refname>:<expect>"
msgstr "<Referenzname>:<Erwartungswert>"
#: builtin/push.c:542 builtin/send-pack.c:199
msgid "require old value of ref to be at this value"
msgstr "Referenz muss sich auf dem angegebenen Wert befinden"
#: builtin/push.c:545
msgid "control recursive pushing of submodules"
msgstr "rekursiven \"push\" von Submodulen steuern"
#: builtin/push.c:546 builtin/send-pack.c:193
msgid "use thin pack"
msgstr "kleinere Pakete verwenden"
#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180
#: builtin/send-pack.c:181
msgid "receive pack program"
msgstr "'receive pack' Programm"
#: builtin/push.c:549
msgid "set upstream for git pull/status"
msgstr "Upstream für \"git pull/status\" setzen"
#: builtin/push.c:552
msgid "prune locally removed refs"
msgstr "lokal gelöschte Referenzen entfernen"
#: builtin/push.c:554
msgid "bypass pre-push hook"
msgstr "\"pre-push hook\" umgehen"
#: builtin/push.c:555
msgid "push missing but relevant tags"
msgstr "fehlende, aber relevante Tags versenden"
#: builtin/push.c:557 builtin/send-pack.c:187
msgid "GPG sign the push"
msgstr "signiert \"push\" mit GPG"
#: builtin/push.c:559 builtin/send-pack.c:194
msgid "request atomic transaction on remote side"
msgstr "Referenzen atomar versenden"
#: builtin/push.c:577
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags."
#: builtin/push.c:579
msgid "--delete doesn't make sense without any refs"
msgstr "Die Option --delete kann nur mit Referenzen verwendet werden."
#: builtin/push.c:599
#, c-format
msgid "bad repository '%s'"
msgstr "ungültiges Repository '%s'"
#: 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 ""
"Kein Ziel für \"push\" konfiguriert.\n"
"Entweder spezifizieren Sie die URL von der Befehlszeile oder konfigurieren "
"ein Remote-Repository unter Benutzung von\n"
"\n"
" git remote add <Name> <URL>\n"
"\n"
"und führen \"push\" dann unter Benutzung dieses Namens aus\n"
"\n"
" git push <Name>\n"
#: builtin/push.c:615
msgid "--all and --tags are incompatible"
msgstr "Die Optionen --all und --tags sind inkompatibel."
#: builtin/push.c:617
msgid "--all can't be combined with refspecs"
msgstr "Die Option --all kann nicht mit Refspecs kombiniert werden."
#: builtin/push.c:621
msgid "--mirror and --tags are incompatible"
msgstr "Die Optionen --mirror und --tags sind inkompatibel."
#: builtin/push.c:623
msgid "--mirror can't be combined with refspecs"
msgstr "Die Option --mirror kann nicht mit Refspecs kombiniert werden."
#: builtin/push.c:626
msgid "--all and --mirror are incompatible"
msgstr "Die Optionen --all und --mirror sind inkompatibel."
#: builtin/push.c:630
msgid "push options must not have new line characters"
msgstr "Push-Optionen dürfen keine Zeilenvorschubzeichen haben"
#: builtin/range-diff.c:8
msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr ""
"git range-diff [<Optionen>] <alte-Basis>..<alte-Spitze> <neue-Basis>..<neue-"
"Spitze>"
#: builtin/range-diff.c:9
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
msgstr "git range-diff [<Optionen>] <alte-Spitze>...<neue-Spitze>"
#: builtin/range-diff.c:10
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr "git range-diff [<Optionen>] <Basis> <alte-Spitze> <neue-Spitze>"
#: builtin/range-diff.c:22
msgid "Percentage by which creation is weighted"
msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird"
#: builtin/range-diff.c:24
msgid "use simple diff colors"
msgstr "einfache Diff-Farben benutzen"
#: builtin/range-diff.c:26
msgid "notes"
msgstr "Notizen"
#: builtin/range-diff.c:26
msgid "passed to 'git log'"
msgstr "an 'git log' übergeben"
#: builtin/range-diff.c:50 builtin/range-diff.c:54
#, c-format
msgid "no .. in range: '%s'"
msgstr "Kein .. im Bereich: '%s'"
#: builtin/range-diff.c:64
msgid "single arg format must be symmetric range"
msgstr "Format mit einfachem Argument muss symmetrischer Bereich sein."
#: builtin/range-diff.c:79
msgid "need two commit ranges"
msgstr "Benötige zwei Commit-Bereiche."
#: 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 ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<Präfix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<Datei>] (--empty | <Commit-Referenz1> [<Commit-Referenz2> "
"[<Commit-Referenz3>]])"
#: builtin/read-tree.c:124
msgid "write resulting index to <file>"
msgstr "resultierenden Index nach <Datei> schreiben"
#: builtin/read-tree.c:127
msgid "only empty the index"
msgstr "nur den Index leeren"
#: builtin/read-tree.c:129
msgid "Merging"
msgstr "Merge"
#: builtin/read-tree.c:131
msgid "perform a merge in addition to a read"
msgstr "einen Merge, zusätzlich zum Lesen, ausführen"
#: builtin/read-tree.c:133
msgid "3-way merge if no file level merging required"
msgstr "3-Wege-Merge, wenn kein Merge auf Dateiebene erforderlich ist"
#: builtin/read-tree.c:135
msgid "3-way merge in presence of adds and removes"
msgstr "3-Wege-Merge bei Vorhandensein von hinzugefügten/entfernten Zeilen"
#: builtin/read-tree.c:137
msgid "same as -m, but discard unmerged entries"
msgstr "genau wie -m, aber nicht zusammengeführte Einträge verwerfen"
#: builtin/read-tree.c:138
msgid "<subdirectory>/"
msgstr "<Unterverzeichnis>/"
#: builtin/read-tree.c:139
msgid "read the tree into the index under <subdirectory>/"
msgstr "das Verzeichnis in den Index unter <Unterverzeichnis>/ lesen"
#: builtin/read-tree.c:142
msgid "update working tree with merge result"
msgstr "Arbeitsverzeichnis mit dem Ergebnis des Merges aktualisieren"
#: builtin/read-tree.c:144
msgid "gitignore"
msgstr "gitignore"
#: builtin/read-tree.c:145
msgid "allow explicitly ignored files to be overwritten"
msgstr "explizit ignorierte Dateien zu überschreiben erlauben"
#: builtin/read-tree.c:148
msgid "don't check the working tree after merging"
msgstr "das Arbeitsverzeichnis nach dem Merge nicht prüfen"
#: builtin/read-tree.c:149
msgid "don't update the index or the work tree"
msgstr "weder den Index, noch das Arbeitsverzeichnis aktualisieren"
#: builtin/read-tree.c:151
msgid "skip applying sparse checkout filter"
msgstr "Anwendung des Filters für partielles Auschecken überspringen"
#: builtin/read-tree.c:153
msgid "debug unpack-trees"
msgstr "unpack-trees protokollieren"
#: builtin/read-tree.c:157
msgid "suppress feedback messages"
msgstr "Rückmeldungen unterdrücken"
#: builtin/read-tree.c:188
msgid "You need to resolve your current index first"
msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen."
#: builtin/rebase.c:35
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
msgstr ""
"git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis> | --"
"keep-base] [<Upstream> [<Branch>]]"
#: builtin/rebase.c:37
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
"git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis>] --"
"root [<Branch>]"
#: builtin/rebase.c:39
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238
#, c-format
msgid "unusable todo list: '%s'"
msgstr "Unbenutzbare TODO-Liste: '%s'"
#: builtin/rebase.c:304
#, c-format
msgid "could not create temporary %s"
msgstr "Konnte temporäres Verzeichnis '%s' nicht erstellen."
#: builtin/rebase.c:310
msgid "could not mark as interactive"
msgstr "Markierung auf interaktiven Rebase fehlgeschlagen."
#: builtin/rebase.c:364
msgid "could not generate todo list"
msgstr "Konnte TODO-Liste nicht erzeugen."
#: builtin/rebase.c:405
msgid "a base commit must be provided with --upstream or --onto"
msgstr "Ein Basis-Commit muss mit --upstream oder --onto angegeben werden."
#: builtin/rebase.c:474
msgid "git rebase--interactive [<options>]"
msgstr "git rebase--interactive [<Optionen>]"
#: builtin/rebase.c:487 builtin/rebase.c:1382
msgid "keep commits which start empty"
msgstr "behalte Commits, die leer beginnen"
#: builtin/rebase.c:491 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "Commits mit leerer Beschreibung erlauben"
#: builtin/rebase.c:493
msgid "rebase merge commits"
msgstr "Rebase auf Merge-Commits ausführen"
#: builtin/rebase.c:495
msgid "keep original branch points of cousins"
msgstr "originale Branch-Punkte der Cousins behalten"
#: builtin/rebase.c:497
msgid "move commits that begin with squash!/fixup!"
msgstr "Commits verschieben, die mit squash!/fixup! beginnen"
#: builtin/rebase.c:498
msgid "sign commits"
msgstr "Commits signieren"
#: builtin/rebase.c:500 builtin/rebase.c:1321
msgid "display a diffstat of what changed upstream"
msgstr ""
"Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch anzeigen"
#: builtin/rebase.c:502
msgid "continue rebase"
msgstr "Rebase fortsetzen"
#: builtin/rebase.c:504
msgid "skip commit"
msgstr "Commit auslassen"
#: builtin/rebase.c:505
msgid "edit the todo list"
msgstr "die TODO-Liste bearbeiten"
#: builtin/rebase.c:507
msgid "show the current patch"
msgstr "den aktuellen Patch anzeigen"
#: builtin/rebase.c:510
msgid "shorten commit ids in the todo list"
msgstr "Commit-IDs in der TODO-Liste verkürzen"
#: builtin/rebase.c:512
msgid "expand commit ids in the todo list"
msgstr "Commit-IDs in der TODO-Liste erweitern"
#: builtin/rebase.c:514
msgid "check the todo list"
msgstr "die TODO-Liste prüfen"
#: builtin/rebase.c:516
msgid "rearrange fixup/squash lines"
msgstr "fixup/squash-Zeilen umordnen"
#: builtin/rebase.c:518
msgid "insert exec commands in todo list"
msgstr "\"exec\"-Befehle in TODO-Liste einfügen"
#: builtin/rebase.c:519
msgid "onto"
msgstr "auf"
#: builtin/rebase.c:522
msgid "restrict-revision"
msgstr "Begrenzungscommit"
#: builtin/rebase.c:522
msgid "restrict revision"
msgstr "Begrenzungscommit"
#: builtin/rebase.c:524
msgid "squash-onto"
msgstr "squash-onto"
#: builtin/rebase.c:525
msgid "squash onto"
msgstr "squash onto"
#: builtin/rebase.c:527
msgid "the upstream commit"
msgstr "der Upstream-Commit"
#: builtin/rebase.c:529
msgid "head-name"
msgstr "head-Name"
#: builtin/rebase.c:529
msgid "head name"
msgstr "head-Name"
#: builtin/rebase.c:534
msgid "rebase strategy"
msgstr "Rebase-Strategie"
#: builtin/rebase.c:535
msgid "strategy-opts"
msgstr "Strategie-Optionen"
#: builtin/rebase.c:536
msgid "strategy options"
msgstr "Strategie-Optionen"
#: builtin/rebase.c:537
msgid "switch-to"
msgstr "wechseln zu"
#: builtin/rebase.c:538
msgid "the branch or commit to checkout"
msgstr "der Branch oder Commit zum Auschecken"
#: builtin/rebase.c:539
msgid "onto-name"
msgstr "onto-Name"
#: builtin/rebase.c:539
msgid "onto name"
msgstr "onto-Name"
#: builtin/rebase.c:540
msgid "cmd"
msgstr "Befehl"
#: builtin/rebase.c:540
msgid "the command to run"
msgstr "auszuführender Befehl"
#: builtin/rebase.c:543 builtin/rebase.c:1415
msgid "automatically re-schedule any `exec` that fails"
msgstr "jeden fehlgeschlagenen `exec`-Befehl neu ansetzen"
#: builtin/rebase.c:559
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "--[no-]rebase-cousins hat ohne --rebase-merges keine Auswirkung"
#: builtin/rebase.c:575
#, c-format
msgid "%s requires the merge backend"
msgstr "%s erfordert das Merge-Backend"
#: builtin/rebase.c:618
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "Konnte 'onto' nicht bestimmen: '%s'"
#: builtin/rebase.c:635
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "Ungültiges orig-head: '%s'"
#: builtin/rebase.c:660
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "Ignoriere ungültiges allow_rerere_autoupdate: '%s'"
#: builtin/rebase.c:805 git-rebase--preserve-merges.sh:81
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 ""
"Lösen Sie alle Konflikte manuell auf, markieren Sie diese mit\n"
"\"git add/rm <konfliktbehaftete_Dateien>\" und führen Sie dann\n"
"\"git rebase --continue\" aus.\n"
"Sie können auch stattdessen diesen Commit auslassen, indem\n"
"Sie \"git rebase --skip\" ausführen.\n"
"Um abzubrechen und zurück zum Zustand vor \"git rebase\" zu gelangen,\n"
"führen Sie \"git rebase --abort\" aus."
#: builtin/rebase.c:888
#, 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 ""
"\n"
"Git stellte einen Fehler beim Vorbereiten der Patches zur\n"
"wiederholten Anwendung der Revisionen fest:\n"
"\n"
" %s\n"
"\n"
"Infolge dessen kann Git auf diesen Revisionen Rebase nicht\n"
"ausführen."
#: builtin/rebase.c:1214
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
"\"."
msgstr ""
"nicht erkannter leerer Typ '%s'; Gültige Werte sind \"drop\", \"keep\", und "
"\"ask\"."
#: builtin/rebase.c:1232
#, 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 ""
"%s\n"
"Bitte geben Sie den Branch an, gegen welchen Sie \"rebase\" ausführen "
"möchten.\n"
"Siehe git-rebase(1) für Details.\n"
"\n"
" git rebase '<Branch>'\n"
"\n"
#: builtin/rebase.c:1248
#, 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 ""
"Wenn Sie Tracking-Informationen für diesen Branch setzen möchten,\n"
"können Sie dies tun mit:\n"
"\n"
" git branch --set-upstream-to=%s/<Branch> %s\n"
"\n"
#: builtin/rebase.c:1278
msgid "exec commands cannot contain newlines"
msgstr "\"exec\"-Befehle können keine neuen Zeilen enthalten"
#: builtin/rebase.c:1282
msgid "empty exec command"
msgstr "Leerer \"exec\"-Befehl."
#: builtin/rebase.c:1312
msgid "rebase onto given branch instead of upstream"
msgstr "Rebase auf angegebenen Branch anstelle des Upstream-Branches ausführen"
#: builtin/rebase.c:1314
msgid "use the merge-base of upstream and branch as the current base"
msgstr "Nutze die Merge-Basis von Upstream und Branch als die aktuelle Basis"
#: builtin/rebase.c:1316
msgid "allow pre-rebase hook to run"
msgstr "Ausführung des pre-rebase-Hooks erlauben"
#: builtin/rebase.c:1318
msgid "be quiet. implies --no-stat"
msgstr "weniger Ausgaben (impliziert --no-stat)"
#: builtin/rebase.c:1324
msgid "do not show diffstat of what changed upstream"
msgstr ""
"Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch verbergen"
#: builtin/rebase.c:1327
msgid "add a Signed-off-by: line to each commit"
msgstr "eine \"Signed-off-by:\"-Zeile zu jedem Commit hinzufügen"
#: builtin/rebase.c:1330
msgid "make committer date match author date"
msgstr "Datum des Commit-Erstellers soll mit Datum des Autors übereinstimmen"
#: builtin/rebase.c:1332
msgid "ignore author date and use current date"
msgstr "ignoriere Autor-Datum und nutze aktuelles Datum"
#: builtin/rebase.c:1334
msgid "synonym of --reset-author-date"
msgstr "Synonym für --reset-author-date"
#: builtin/rebase.c:1336 builtin/rebase.c:1340
msgid "passed to 'git apply'"
msgstr "an 'git apply' übergeben"
#: builtin/rebase.c:1338
msgid "ignore changes in whitespace"
msgstr "Whitespace-Änderungen ignorieren"
#: builtin/rebase.c:1342 builtin/rebase.c:1345
msgid "cherry-pick all commits, even if unchanged"
msgstr ""
"Cherry-Pick auf alle Commits ausführen, auch wenn diese unverändert sind"
#: builtin/rebase.c:1347
msgid "continue"
msgstr "fortsetzen"
#: builtin/rebase.c:1350
msgid "skip current patch and continue"
msgstr "den aktuellen Patch auslassen und fortfahren"
#: builtin/rebase.c:1352
msgid "abort and check out the original branch"
msgstr "abbrechen und den ursprünglichen Branch auschecken"
#: builtin/rebase.c:1355
msgid "abort but keep HEAD where it is"
msgstr "abbrechen, aber HEAD an aktueller Stelle belassen"
#: builtin/rebase.c:1356
msgid "edit the todo list during an interactive rebase"
msgstr "TODO-Liste während eines interaktiven Rebase bearbeiten"
#: builtin/rebase.c:1359
msgid "show the patch file being applied or merged"
msgstr "den Patch, der gerade angewendet oder zusammengeführt wird, anzeigen"
#: builtin/rebase.c:1362
msgid "use apply strategies to rebase"
msgstr "Strategien von 'git am' bei Rebase verwenden"
#: builtin/rebase.c:1366
msgid "use merging strategies to rebase"
msgstr "Merge-Strategien beim Rebase verwenden"
#: builtin/rebase.c:1370
msgid "let the user edit the list of commits to rebase"
msgstr "den Benutzer die Liste der Commits für den Rebase bearbeiten lassen"
#: builtin/rebase.c:1374
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
"(VERALTET) Versuche, Merges wiederherzustellen anstatt sie zu ignorieren"
#: builtin/rebase.c:1379
msgid "how to handle commits that become empty"
msgstr "wie sollen Commits behandelt werden, die leer werden"
#: builtin/rebase.c:1386
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "bei -i Commits verschieben, die mit squash!/fixup! beginnen"
#: builtin/rebase.c:1393
msgid "add exec lines after each commit of the editable list"
msgstr "exec-Zeilen nach jedem Commit der editierbaren Liste hinzufügen"
#: builtin/rebase.c:1397
msgid "allow rebasing commits with empty messages"
msgstr "Rebase von Commits mit leerer Beschreibung erlauben"
#: builtin/rebase.c:1401
msgid "try to rebase merges instead of skipping them"
msgstr ""
"versuchen, Rebase mit Merges auszuführen, anstatt diese zu überspringen"
#: builtin/rebase.c:1404
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
"'git merge-base --fork-point' benutzen, um Upstream-Branch zu bestimmen"
#: builtin/rebase.c:1406
msgid "use the given merge strategy"
msgstr "angegebene Merge-Strategie verwenden"
#: builtin/rebase.c:1408 builtin/revert.c:115
msgid "option"
msgstr "Option"
#: builtin/rebase.c:1409
msgid "pass the argument through to the merge strategy"
msgstr "Argument zur Merge-Strategie durchreichen"
#: builtin/rebase.c:1412
msgid "rebase all reachable commits up to the root(s)"
msgstr "Rebase auf alle erreichbaren Commits bis zum Root-Commit ausführen"
#: builtin/rebase.c:1417
msgid "apply all changes, even those already present upstream"
msgstr ""
"alle Änderungen anwenden, auch jene, die bereits im Upstream-Branch "
"vorhanden sind"
#: builtin/rebase.c:1434
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgstr ""
"Die Unterstützung für rebase.useBuiltin wurde entfernt!\n"
"Siehe dessen Eintrag in 'git help config' für Details."
#: builtin/rebase.c:1440
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "'git-am' scheint im Gange zu sein. Kann Rebase nicht durchführen."
#: builtin/rebase.c:1481
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
"'git rebase --preserve-merges' ist veraltet. Benutzen Sie stattdessen '--"
"rebase-merges'."
#: builtin/rebase.c:1486
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "'--keep-base' kann nicht mit '--onto' kombiniert werden"
#: builtin/rebase.c:1488
msgid "cannot combine '--keep-base' with '--root'"
msgstr "'--keep-base' kann nicht mit '--root' kombiniert werden"
#: builtin/rebase.c:1492
msgid "cannot combine '--root' with '--fork-point'"
msgstr "'--root' kann nicht mit '--fork-point' kombiniert werden"
#: builtin/rebase.c:1495
msgid "No rebase in progress?"
msgstr "Kein Rebase im Gange?"
#: builtin/rebase.c:1499
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Die --edit-todo Aktion kann nur während eines interaktiven Rebase verwendet "
"werden."
#: builtin/rebase.c:1522
msgid "Cannot read HEAD"
msgstr "Kann HEAD nicht lesen"
#: builtin/rebase.c:1534
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
"Sie müssen alle Merge-Konflikte editieren und diese dann\n"
"mittels \"git add\" als aufgelöst markieren"
#: builtin/rebase.c:1553
msgid "could not discard worktree changes"
msgstr "Konnte Änderungen im Arbeitsverzeichnis nicht verwerfen."
#: builtin/rebase.c:1572
#, c-format
msgid "could not move back to %s"
msgstr "Konnte nicht zu %s zurückgehen."
#: builtin/rebase.c:1618
#, 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 ""
"Es sieht so aus, als ob es das Verzeichnis %s bereits gibt\n"
"und es könnte ein anderer Rebase im Gange sein. Wenn das der Fall ist,\n"
"probieren Sie bitte\n"
"\t%s\n"
"Wenn das nicht der Fall ist, probieren Sie bitte\n"
"\t%s\n"
"und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n"
"etwas Schützenswertes vorhanden ist.\n"
#: builtin/rebase.c:1646
msgid "switch `C' expects a numerical value"
msgstr "Schalter `C' erwartet einen numerischen Wert."
#: builtin/rebase.c:1688
#, c-format
msgid "Unknown mode: %s"
msgstr "Unbekannter Modus: %s"
#: builtin/rebase.c:1727
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy erfordert --merge oder --interactive"
#: builtin/rebase.c:1757
msgid "cannot combine apply options with merge options"
msgstr ""
"Optionen für \"am\" können nicht mit Optionen für \"merge\" kombiniert "
"werden."
#: builtin/rebase.c:1770
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Unbekanntes Rebase-Backend: %s"
#: builtin/rebase.c:1795
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec erfordert --exec oder --interactive"
#: builtin/rebase.c:1815
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr ""
"'--preserve-merges' kann nicht mit '--rebase-merges' kombiniert werden."
#: builtin/rebase.c:1819
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"Fehler: '--preserve-merges' kann nicht mit '--reschedule-failed-exec' "
"kombiniert werden."
#: builtin/rebase.c:1843
#, c-format
msgid "invalid upstream '%s'"
msgstr "Ungültiger Upstream '%s'"
#: builtin/rebase.c:1849
msgid "Could not create new root commit"
msgstr "Konnte neuen Root-Commit nicht erstellen."
#: builtin/rebase.c:1875
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s': benötige genau eine Merge-Basis mit dem Branch"
#: builtin/rebase.c:1878
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': benötige genau eine Merge-Basis"
#: builtin/rebase.c:1886
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "'%s' zeigt auf keinen gültigen Commit."
#: builtin/rebase.c:1912
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "fatal: Branch/Commit '%s' nicht gefunden"
#: builtin/rebase.c:1920 builtin/submodule--helper.c:40
#: builtin/submodule--helper.c:2414
#, c-format
msgid "No such ref: %s"
msgstr "Referenz nicht gefunden: %s"
#: builtin/rebase.c:1931
msgid "Could not resolve HEAD to a revision"
msgstr "Konnte HEAD zu keinem Commit auflösen."
#: builtin/rebase.c:1952
msgid "Please commit or stash them."
msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
#: builtin/rebase.c:1988
#, c-format
msgid "could not switch to %s"
msgstr "Konnte nicht zu %s wechseln."
#: builtin/rebase.c:1999
msgid "HEAD is up to date."
msgstr "HEAD ist aktuell."
#: builtin/rebase.c:2001
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Aktueller Branch %s ist auf dem neuesten Stand.\n"
#: builtin/rebase.c:2009
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD ist aktuell, Rebase erzwungen."
#: builtin/rebase.c:2011
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Aktueller Branch %s ist auf dem neuesten Stand, Rebase erzwungen.\n"
#: builtin/rebase.c:2019
msgid "The pre-rebase hook refused to rebase."
msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen."
#: builtin/rebase.c:2026
#, c-format
msgid "Changes to %s:\n"
msgstr "Änderungen zu %s:\n"
#: builtin/rebase.c:2029
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Änderungen von %s zu %s:\n"
#: builtin/rebase.c:2054
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Zunächst wird der Branch zurückgespult, um Ihre Änderungen darauf neu "
"anzuwenden...\n"
#: builtin/rebase.c:2063
msgid "Could not detach HEAD"
msgstr "Konnte HEAD nicht loslösen."
#: builtin/rebase.c:2072
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Spule %s vor zu %s.\n"
#: builtin/receive-pack.c:34
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <Git-Verzeichnis>"
#: builtin/receive-pack.c:1224
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 ""
"Standardmäßig wird die Aktualisierung des aktuellen Branches in einem\n"
"Nicht-Bare-Repository zurückgewiesen, da dies den Index und das Arbeits-\n"
"verzeichnis inkonsistent zu dem machen würde, was Sie gepushed haben, und\n"
"'git reset --hard' erforderlich wäre, damit das Arbeitsverzeichnis HEAD\n"
"entspricht.\n"
"\n"
"Sie könnten die Konfigurationsvariable 'receive.denyCurrentBranch' im\n"
"Remote-Repository auf 'ignore' oder 'warn' setzen, um den Push in den\n"
"aktuellen Branch zu erlauben; dies wird jedoch nicht empfohlen außer\n"
"Sie stellen durch andere Wege die Aktualität des Arbeitsverzeichnisses\n"
"gegenüber dem gepushten Stand sicher.\n"
"\n"
"Um diese Meldung zu unterdrücken und das Standardverhalten zu behalten,\n"
"setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n"
"'refuse'."
#: builtin/receive-pack.c:1244
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 ""
"Standardmäßig wird das Löschen des aktuellen Branches zurückgewiesen,\n"
"da beim nächsten 'git clone' keine Dateien ausgecheckt werden würden,\n"
"was zu Verwunderung führt.\n"
"\n"
"Sie können die Konfigurationsvariable 'receive.denyDeleteCurrent' im\n"
"Remote-Repository auf 'warn' oder 'ignore' setzen, um das Löschen des\n"
"aktuellen Branch mit oder ohne Warnung zu erlauben.\n"
"\n"
"Um diese Meldung zu unterdrücken, setzen Sie die Variable auf 'refuse'."
#: builtin/receive-pack.c:2422
msgid "quiet"
msgstr "weniger Ausgaben"
#: builtin/receive-pack.c:2436
msgid "You must specify a directory."
msgstr "Sie müssen ein Repository angeben."
#: builtin/reflog.c:17
msgid ""
"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
"<refs>..."
msgstr ""
"git reflog expire [--expire=<Zeit>] [--expire-unreachable=<Zeit>] [--"
"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
"<Referenzen>..."
#: builtin/reflog.c:22
msgid ""
"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
"<refs>..."
msgstr ""
"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
"<Referenzen>..."
#: builtin/reflog.c:25
msgid "git reflog exists <ref>"
msgstr "git reflog exists <Referenz>"
#: builtin/reflog.c:568 builtin/reflog.c:573
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' ist kein gültiger Zeitstempel"
#: builtin/reflog.c:606
#, c-format
msgid "Marking reachable objects..."
msgstr "Markiere nicht erreichbare Objekte..."
#: builtin/reflog.c:644
#, c-format
msgid "%s points nowhere!"
msgstr "%s zeigt auf nichts!"
#: builtin/reflog.c:696
msgid "no reflog specified to delete"
msgstr "Kein Reflog zum Löschen angegeben."
#: builtin/reflog.c:705
#, c-format
msgid "not a reflog: %s"
msgstr "Kein Reflog: %s"
#: builtin/reflog.c:710
#, c-format
msgid "no reflog for '%s'"
msgstr "Kein Reflog für '%s'."
#: builtin/reflog.c:756
#, c-format
msgid "invalid ref format: %s"
msgstr "Ungültiges Format für Referenzen: %s"
#: builtin/reflog.c:765
msgid "git reflog [ show | expire | delete | exists ]"
msgstr "git reflog [ show | expire | delete | exists ]"
#: builtin/remote.c:17
msgid "git remote [-v | --verbose]"
msgstr "git remote [-v | --verbose]"
#: builtin/remote.c:18
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
msgstr ""
"git remote add [-t <Branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <Name> <URL>"
#: builtin/remote.c:19 builtin/remote.c:39
msgid "git remote rename <old> <new>"
msgstr "git remote rename <alt> <neu>"
#: builtin/remote.c:20 builtin/remote.c:44
msgid "git remote remove <name>"
msgstr "git remote remove <Name>"
#: builtin/remote.c:21 builtin/remote.c:49
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)"
#: builtin/remote.c:22
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <Name>"
#: builtin/remote.c:23
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <Name>"
#: builtin/remote.c:24
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
"git remote [-v | --verbose] update [-p | --prune] [(<Gruppe> | <Remote>)...]"
#: builtin/remote.c:25
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <Name> <Branch>..."
#: builtin/remote.c:26 builtin/remote.c:75
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote get-url [--push] [--all] <Name>"
#: builtin/remote.c:27 builtin/remote.c:80
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <Name> <neueURL> [<alteURL>]"
#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <Name> <neueURL>"
#: builtin/remote.c:29 builtin/remote.c:82
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <Name> <URL>"
#: builtin/remote.c:34
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<Optionen>] <Name> <URL>"
#: builtin/remote.c:54
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <Name> <Branch>..."
#: builtin/remote.c:55
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <Name> <Branch>..."
#: builtin/remote.c:60
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<Optionen>] <Name>"
#: builtin/remote.c:65
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<Optionen>] <Name>"
#: builtin/remote.c:70
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<Optionen>] [<Gruppe> | <externesRepository>]..."
#: builtin/remote.c:99
#, c-format
msgid "Updating %s"
msgstr "Aktualisiere %s"
#: builtin/remote.c:131
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
"--mirror ist gefährlich und veraltet; bitte\n"
"\t benutzen Sie stattdessen --mirror=fetch oder --mirror=push"
#: builtin/remote.c:148
#, c-format
msgid "unknown mirror argument: %s"
msgstr "unbekanntes Argument für Option --mirror: %s"
#: builtin/remote.c:164
msgid "fetch the remote branches"
msgstr "die Remote-Branches anfordern"
#: builtin/remote.c:166
msgid "import all tags and associated objects when fetching"
msgstr "alle Tags und verbundene Objekte beim Anfordern importieren"
#: builtin/remote.c:169
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "oder fordere gar keine Tags an (--no-tags)"
#: builtin/remote.c:171
msgid "branch(es) to track"
msgstr "Branch(es) zur Übernahme"
#: builtin/remote.c:172
msgid "master branch"
msgstr "Hauptbranch"
#: builtin/remote.c:174
msgid "set up remote as a mirror to push to or fetch from"
msgstr ""
"Aufsetzen des Remote-Repositories als Spiegel-Repository für \"push\" und "
"\"fetch\""
#: builtin/remote.c:186
msgid "specifying a master branch makes no sense with --mirror"
msgstr ""
"Die Option --mirror kann nicht mit der Angabe eines Hauptbranches verwendet "
"werden."
#: builtin/remote.c:188
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
"Die Angabe von zu folgenden Branches kann nur mit dem Anfordern von "
"Spiegelarchiven verwendet werden."
#: builtin/remote.c:195 builtin/remote.c:697
#, c-format
msgid "remote %s already exists."
msgstr "externes Repository %s existiert bereits"
#: builtin/remote.c:199 builtin/remote.c:701
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' ist kein gültiger Name für ein Remote-Repository"
#: builtin/remote.c:239
#, c-format
msgid "Could not setup master '%s'"
msgstr "Konnte symbolische Referenz für Hauptbranch von '%s' nicht einrichten"
#: builtin/remote.c:354
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Konnte Fetch-Map für Refspec %s nicht bekommen"
#: builtin/remote.c:453 builtin/remote.c:461
msgid "(matching)"
msgstr "(übereinstimmend)"
#: builtin/remote.c:465
msgid "(delete)"
msgstr "(lösche)"
#: builtin/remote.c:654
#, c-format
msgid "could not set '%s'"
msgstr "konnte '%s' nicht setzen"
#: 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 ""
"Die %s Konfiguration remote.pushDefault in:\n"
"\t%s:%d\n"
"benennt jetzt das nicht existierende Remote-Repository '%s'"
#: builtin/remote.c:690 builtin/remote.c:833 builtin/remote.c:941
#, c-format
msgid "No such remote: '%s'"
msgstr "Kein solches Remote-Repository: '%s'"
#: builtin/remote.c:707
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen"
#: builtin/remote.c:727
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
"Keine Aktualisierung der nicht standardmäßigen Refspec für \"fetch\"\n"
"\t%s\n"
"\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell."
#: builtin/remote.c:767
#, c-format
msgid "deleting '%s' failed"
msgstr "Konnte '%s' nicht löschen"
#: builtin/remote.c:801
#, c-format
msgid "creating '%s' failed"
msgstr "Konnte '%s' nicht erstellen"
#: builtin/remote.c:877
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] ""
"Hinweis: Ein Branch außerhalb der refs/remotes/ Hierachie wurde nicht "
"gelöscht;\n"
"um diesen zu löschen, benutzen Sie:"
msgstr[1] ""
"Hinweis: Einige Branches außerhalb der refs/remotes/ Hierarchie wurden nicht "
"entfernt;\n"
"um diese zu entfernen, benutzen Sie:"
#: builtin/remote.c:891
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen"
#: builtin/remote.c:994
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " neu (wird bei nächstem \"fetch\" in remotes/%s gespeichert)"
#: builtin/remote.c:997
msgid " tracked"
msgstr " gefolgt"
#: builtin/remote.c:999
msgid " stale (use 'git remote prune' to remove)"
msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)"
#: builtin/remote.c:1001
msgid " ???"
msgstr " ???"
#: builtin/remote.c:1042
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "ungültiges branch.%s.merge; kann Rebase nicht auf > 1 Branch ausführen"
#: builtin/remote.c:1051
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "interaktiver Rebase auf Remote-Branch %s"
#: builtin/remote.c:1053
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "interaktiver Rebase (mit Merges) auf Remote-Branch %s"
#: builtin/remote.c:1056
#, c-format
msgid "rebases onto remote %s"
msgstr "Rebase auf Remote-Branch %s"
#: builtin/remote.c:1060
#, c-format
msgid " merges with remote %s"
msgstr " führt mit Remote-Branch %s zusammen"
#: builtin/remote.c:1063
#, c-format
msgid "merges with remote %s"
msgstr "führt mit Remote-Branch %s zusammen"
#: builtin/remote.c:1066
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s und mit Remote-Branch %s\n"
#: builtin/remote.c:1109
msgid "create"
msgstr "erstellt"
#: builtin/remote.c:1112
msgid "delete"
msgstr "gelöscht"
#: builtin/remote.c:1116
msgid "up to date"
msgstr "aktuell"
#: builtin/remote.c:1119
msgid "fast-forwardable"
msgstr "vorspulbar"
#: builtin/remote.c:1122
msgid "local out of date"
msgstr "lokal nicht aktuell"
#: builtin/remote.c:1129
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s erzwingt Versandt nach %-*s (%s)"
#: builtin/remote.c:1132
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s versendet nach %-*s (%s)"
#: builtin/remote.c:1136
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s erzwingt Versand nach %s"
#: builtin/remote.c:1139
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s versendet nach %s"
#: builtin/remote.c:1207
msgid "do not query remotes"
msgstr "keine Abfrage von Remote-Repositories"
#: builtin/remote.c:1234
#, c-format
msgid "* remote %s"
msgstr "* Remote-Repository %s"
#: builtin/remote.c:1235
#, c-format
msgid " Fetch URL: %s"
msgstr " URL zum Abholen: %s"
#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391
msgid "(no URL)"
msgstr "(keine URL)"
#. TRANSLATORS: the colon ':' should align
#. with the one in " Fetch URL: %s"
#. translation.
#.
#: builtin/remote.c:1250 builtin/remote.c:1252
#, c-format
msgid " Push URL: %s"
msgstr " URL zum Versenden: %s"
#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258
#, c-format
msgid " HEAD branch: %s"
msgstr " Hauptbranch: %s"
#: builtin/remote.c:1254
msgid "(not queried)"
msgstr "(nicht abgefragt)"
#: builtin/remote.c:1256
msgid "(unknown)"
msgstr "(unbekannt)"
#: builtin/remote.c:1260
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
" Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden "
"sein):\n"
#: builtin/remote.c:1272
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Remote-Branch:%s"
msgstr[1] " Remote-Branches:%s"
#: builtin/remote.c:1275 builtin/remote.c:1301
msgid " (status not queried)"
msgstr " (Zustand nicht abgefragt)"
#: builtin/remote.c:1284
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Lokaler Branch konfiguriert für 'git pull':"
msgstr[1] " Lokale Branches konfiguriert für 'git pull':"
#: builtin/remote.c:1292
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokale Referenzen werden von 'git push' gespiegelt"
#: builtin/remote.c:1298
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Lokale Referenz konfiguriert für 'git push'%s:"
msgstr[1] " Lokale Referenzen konfiguriert für 'git push'%s:"
#: builtin/remote.c:1319
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository"
#: builtin/remote.c:1321
msgid "delete refs/remotes/<name>/HEAD"
msgstr "entfernt refs/remotes/<Name>/HEAD"
#: builtin/remote.c:1336
msgid "Cannot determine remote HEAD"
msgstr "Kann HEAD des Remote-Repositories nicht bestimmen"
#: builtin/remote.c:1338
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Mehrere Hauptbranches im Remote-Repository. Bitte wählen Sie explizit einen "
"aus mit:"
#: builtin/remote.c:1348
#, c-format
msgid "Could not delete %s"
msgstr "Konnte %s nicht entfernen"
#: builtin/remote.c:1356
#, c-format
msgid "Not a valid ref: %s"
msgstr "keine gültige Referenz: %s"
#: builtin/remote.c:1358
#, c-format
msgid "Could not setup %s"
msgstr "Konnte %s nicht einrichten"
#: builtin/remote.c:1376
#, c-format
msgid " %s will become dangling!"
msgstr " %s wird unreferenziert!"
#: builtin/remote.c:1377
#, c-format
msgid " %s has become dangling!"
msgstr " %s wurde unreferenziert!"
#: builtin/remote.c:1387
#, c-format
msgid "Pruning %s"
msgstr "entferne veraltete Branches von %s"
#: builtin/remote.c:1388
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
#: builtin/remote.c:1404
#, c-format
msgid " * [would prune] %s"
msgstr " * [würde veralteten Branch entfernen] %s"
#: builtin/remote.c:1407
#, c-format
msgid " * [pruned] %s"
msgstr "* [veralteten Branch entfernt] %s"
#: builtin/remote.c:1452
msgid "prune remotes after fetching"
msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\""
#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637
#, c-format
msgid "No such remote '%s'"
msgstr "Kein solches Remote-Repository '%s'"
#: builtin/remote.c:1531
msgid "add branch"
msgstr "Branch hinzufügen"
#: builtin/remote.c:1538
msgid "no remote specified"
msgstr "kein Remote-Repository angegeben"
#: builtin/remote.c:1555
msgid "query push URLs rather than fetch URLs"
msgstr "nur URLs für Push ausgeben"
#: builtin/remote.c:1557
msgid "return all URLs"
msgstr "alle URLs ausgeben"
#: builtin/remote.c:1585
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "Keine URLs für Remote-Repository '%s' konfiguriert."
#: builtin/remote.c:1611
msgid "manipulate push URLs"
msgstr "URLs für \"push\" manipulieren"
#: builtin/remote.c:1613
msgid "add URL"
msgstr "URL hinzufügen"
#: builtin/remote.c:1615
msgid "delete URLs"
msgstr "URLs löschen"
#: builtin/remote.c:1622
msgid "--add --delete doesn't make sense"
msgstr ""
"Die Optionen --add und --delete können nicht gemeinsam verwendet werden."
#: builtin/remote.c:1661
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "ungültiges altes URL Format: %s"
#: builtin/remote.c:1669
#, c-format
msgid "No such URL found: %s"
msgstr "Keine solche URL gefunden: %s"
#: builtin/remote.c:1671
msgid "Will not delete all non-push URLs"
msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind"
#: builtin/repack.c:25
msgid "git repack [<options>]"
msgstr "git repack [<Optionen>]"
#: builtin/repack.c:30
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
"Schrittweises Neupacken ist mit Bitmap-Indexen inkompatibel. Benutzen Sie\n"
"--no-write-bitmap-index oder deaktivieren Sie die pack.writebitmaps\n"
"Konfiguration."
#: builtin/repack.c:197
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
"Konnte 'pack-objects' für das Neupacken von Objekten aus partiell geklonten\n"
"Remote-Repositories nicht starten."
#: builtin/repack.c:236 builtin/repack.c:421
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Erwarte Zeilen mit vollständiger Hex-Objekt-ID nur von pack-objects."
#: builtin/repack.c:260
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"Konnte 'pack-objects' für das Neupacken von Objekten aus partiell geklonten\n"
"Remote-Repositories nicht abschließen."
#: builtin/repack.c:297
msgid "pack everything in a single pack"
msgstr "alles in eine einzige Pack-Datei packen"
#: builtin/repack.c:299
msgid "same as -a, and turn unreachable objects loose"
msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelöscht"
#: builtin/repack.c:302
msgid "remove redundant packs, and run git-prune-packed"
msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausführen"
#: builtin/repack.c:304
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "--no-reuse-delta an git-pack-objects übergeben"
#: builtin/repack.c:306
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "--no-reuse-object an git-pack-objects übergeben"
#: builtin/repack.c:308
msgid "do not run git-update-server-info"
msgstr "git-update-server-info nicht ausführen"
#: builtin/repack.c:311
msgid "pass --local to git-pack-objects"
msgstr "--local an git-pack-objects übergeben"
#: builtin/repack.c:313
msgid "write bitmap index"
msgstr "Bitmap-Index schreiben"
#: builtin/repack.c:315
msgid "pass --delta-islands to git-pack-objects"
msgstr "--delta-islands an git-pack-objects übergeben"
#: builtin/repack.c:316
msgid "approxidate"
msgstr "Datumsangabe"
#: builtin/repack.c:317
msgid "with -A, do not loosen objects older than this"
msgstr "mit -A, keine Objekte älter als dieses Datum löschen"
#: builtin/repack.c:319
msgid "with -a, repack unreachable objects"
msgstr "mit -a, nicht erreichbare Objekte neu packen"
#: builtin/repack.c:321
msgid "size of the window used for delta compression"
msgstr "Größe des Fensters für die Delta-Kompression"
#: builtin/repack.c:322 builtin/repack.c:328
msgid "bytes"
msgstr "Bytes"
#: builtin/repack.c:323
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"gleiches wie oben, aber die Speichergröße anstatt der\n"
"Anzahl der Einträge limitieren"
#: builtin/repack.c:325
msgid "limits the maximum delta depth"
msgstr "die maximale Delta-Tiefe limitieren"
#: builtin/repack.c:327
msgid "limits the maximum number of threads"
msgstr "maximale Anzahl von Threads limitieren"
#: builtin/repack.c:329
msgid "maximum size of each packfile"
msgstr "maximale Größe für jede Paketdatei"
#: builtin/repack.c:331
msgid "repack objects in packs marked with .keep"
msgstr ""
"Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden"
#: builtin/repack.c:333
msgid "do not repack this pack"
msgstr "dieses Paket nicht neu packen"
#: builtin/repack.c:343
msgid "cannot delete packs in a precious-objects repo"
msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen"
#: builtin/repack.c:347
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable und -A sind inkompatibel"
#: builtin/repack.c:430
msgid "Nothing new to pack."
msgstr "Nichts Neues zum Packen."
#: builtin/repack.c:486
#, 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 ""
"WARNUNG: Einige in Verwendung befindliche Pakete wurden\n"
"WARNUNG: umbenannt, indem 'old-' an deren Namen vorrangestellt\n"
"WARNUNG: wurde, um diese mit der neuen Dateiversion zu ersetzen.\n"
"WARNUNG: Diese Operation ist fehlgeschlagen. Der Versuch, die\n"
"WARNUNG: Datei zu ihrem ursprünglichen Namen umzubenennen, schlug\n"
"WARNUNG: ebenfalls fehl.\n"
"WARNUNG: Bitte benennen Sie diese manuell nach %s um:\n"
#: builtin/repack.c:534
#, c-format
msgid "failed to remove '%s'"
msgstr "Fehler beim Löschen von '%s'"
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
msgstr "git replace [-f] <Objekt> <Ersetzung>"
#: builtin/replace.c:23
msgid "git replace [-f] --edit <object>"
msgstr "git replace [-f] --edit <Objekt>"
#: builtin/replace.c:24
msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr "git replace [-f] --graft <Commit> [<Eltern-Commit>...]"
#: builtin/replace.c:25
msgid "git replace [-f] --convert-graft-file"
msgstr "git replace [-f] --convert-graft-file"
#: builtin/replace.c:26
msgid "git replace -d <object>..."
msgstr "git replace -d <Objekt>..."
#: builtin/replace.c:27
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<Format>] [-l [<Muster>]]"
#: builtin/replace.c:90
#, c-format
msgid ""
"invalid replace format '%s'\n"
"valid formats are 'short', 'medium' and 'long'"
msgstr ""
"Ungültiges Ersetzungsformat '%s'\n"
"Gültige Formate sind 'short', 'medium' und 'long'."
#: builtin/replace.c:125
#, c-format
msgid "replace ref '%s' not found"
msgstr "Ersetzende Referenz '%s' nicht gefunden."
#: builtin/replace.c:141
#, c-format
msgid "Deleted replace ref '%s'"
msgstr "Ersetzende Referenz '%s' gelöscht."
#: builtin/replace.c:153
#, c-format
msgid "'%s' is not a valid ref name"
msgstr "'%s' ist kein gültiger Referenzname."
#: builtin/replace.c:158
#, c-format
msgid "replace ref '%s' already exists"
msgstr "Ersetzende Referenz '%s' existiert bereits."
#: 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 ""
"Objekte müssen vom selben Typ sein.\n"
"'%s' zeigt auf ein ersetztes Objekt vom Typ '%s'\n"
"während '%s' auf ein ersetzendes Objekt vom Typ '%s'\n"
"zeigt."
#: builtin/replace.c:229
#, c-format
msgid "unable to open %s for writing"
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
#: builtin/replace.c:242
msgid "cat-file reported failure"
msgstr "cat-file meldete Fehler."
#: builtin/replace.c:258
#, c-format
msgid "unable to open %s for reading"
msgstr "Konnte '%s' nicht zum Lesen öffnen."
#: builtin/replace.c:272
msgid "unable to spawn mktree"
msgstr "Konnte mktree nicht ausführen."
#: builtin/replace.c:276
msgid "unable to read from mktree"
msgstr "Konnte nicht von mktree lesen."
#: builtin/replace.c:285
msgid "mktree reported failure"
msgstr "mktree meldete Fehler."
#: builtin/replace.c:289
msgid "mktree did not return an object name"
msgstr "mktree lieferte keinen Objektnamen zurück."
#: builtin/replace.c:298
#, c-format
msgid "unable to fstat %s"
msgstr "Kann fstat auf %s nicht ausführen."
#: builtin/replace.c:303
msgid "unable to write object to database"
msgstr "Konnte Objekt nicht in Datenbank schreiben."
#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
#: builtin/replace.c:454
#, c-format
msgid "not a valid object name: '%s'"
msgstr "Kein gültiger Objektname: '%s'"
#: builtin/replace.c:326
#, c-format
msgid "unable to get object type for %s"
msgstr "Konnte Objektart von %s nicht bestimmten."
#: builtin/replace.c:342
msgid "editing object file failed"
msgstr "Bearbeiten von Objektdatei fehlgeschlagen."
#: builtin/replace.c:351
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "Neues Objekt ist dasselbe wie das alte: '%s'"
#: builtin/replace.c:384
#, c-format
msgid "could not parse %s as a commit"
msgstr "Konnte nicht %s als Commit parsen."
#: builtin/replace.c:416
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "ungültiger Merge-Tag in Commit '%s'"
#: builtin/replace.c:418
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "fehlerhafter Merge-Tag in Commit '%s'"
#: builtin/replace.c:430
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr ""
"Der ursprüngliche Commit '%s' enthält Merge-Tag '%s', der verworfen\n"
"wird; benutzen Sie --edit anstatt --graft"
#: builtin/replace.c:469
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "Der originale Commit '%s' hat eine GPG-Signatur."
#: builtin/replace.c:470
msgid "the signature will be removed in the replacement commit!"
msgstr "Die Signatur wird in dem Ersetzungs-Commit entfernt!"
#: builtin/replace.c:480
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "Konnte Ersetzungs-Commit für '%s' nicht schreiben"
#: builtin/replace.c:488
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "Künstlicher Vorgänger (\"graft\") für '%s' nicht notwendig."
#: builtin/replace.c:492
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "Neuer Commit ist derselbe wie der alte: '%s'"
#: builtin/replace.c:527
#, c-format
msgid ""
"could not convert the following graft(s):\n"
"%s"
msgstr ""
"Konnte die folgenden künstlichen Vorgänger (\"grafts\") nicht konvertieren:\n"
"%s"
#: builtin/replace.c:548
msgid "list replace refs"
msgstr "ersetzende Referenzen auflisten"
#: builtin/replace.c:549
msgid "delete replace refs"
msgstr "ersetzende Referenzen löschen"
#: builtin/replace.c:550
msgid "edit existing object"
msgstr "existierendes Objekt bearbeiten"
#: builtin/replace.c:551
msgid "change a commit's parents"
msgstr "Eltern-Commits eines Commits ändern"
#: builtin/replace.c:552
msgid "convert existing graft file"
msgstr "existierende Datei des künstlichen Vorgängers (\"graft\") konvertieren"
#: builtin/replace.c:553
msgid "replace the ref if it exists"
msgstr "die Referenz ersetzen, wenn sie existiert"
#: builtin/replace.c:555
msgid "do not pretty-print contents for --edit"
msgstr "keine ansprechende Anzeige des Objektinhaltes für --edit"
#: builtin/replace.c:556
msgid "use this format"
msgstr "das angegebene Format benutzen"
#: builtin/replace.c:569
msgid "--format cannot be used when not listing"
msgstr "--format kann nicht beim Auflisten verwendet werden."
#: builtin/replace.c:577
msgid "-f only makes sense when writing a replacement"
msgstr "-f macht nur beim Schreiben einer Ersetzung Sinn."
#: builtin/replace.c:581
msgid "--raw only makes sense with --edit"
msgstr "--raw macht nur mit --edit Sinn."
#: builtin/replace.c:587
msgid "-d needs at least one argument"
msgstr "-d benötigt mindestens ein Argument."
#: builtin/replace.c:593
msgid "bad number of arguments"
msgstr "Ungültige Anzahl von Argumenten."
#: builtin/replace.c:599
msgid "-e needs exactly one argument"
msgstr "-e benötigt genau ein Argument."
#: builtin/replace.c:605
msgid "-g needs at least one argument"
msgstr "-g benötigt mindestens ein Argument."
#: builtin/replace.c:611
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file erwartet keine Argumente"
#: builtin/replace.c:617
msgid "only one pattern can be given with -l"
msgstr "Mit -l kann nur ein Muster angegeben werden."
#: builtin/rerere.c:13
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr "git rerere [clean | forget <Pfad>... | status | remaining | diff | gc]"
#: builtin/rerere.c:60
msgid "register clean resolutions in index"
msgstr "saubere Auflösungen im Index registrieren"
#: builtin/rerere.c:79
msgid "'git rerere forget' without paths is deprecated"
msgstr "'git rerere forget' ohne Pfade ist veraltet."
#: builtin/rerere.c:113
#, c-format
msgid "unable to generate diff for '%s'"
msgstr "Konnte kein Diff für '%s' generieren."
#: builtin/reset.c:32
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<Commit>]"
#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
msgstr "git reset [-q] [<Commit-Referenz>] [--] <Pfadspezifikation>..."
#: builtin/reset.c:34
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<Commit-"
"Referenz>]"
#: builtin/reset.c:35
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
msgstr "git reset --patch [<Commit-Referenz>] [--] [<Pfadspezifikation>...]"
#: builtin/reset.c:41
msgid "mixed"
msgstr "mixed"
#: builtin/reset.c:41
msgid "soft"
msgstr "soft"
#: builtin/reset.c:41
msgid "hard"
msgstr "hard"
#: builtin/reset.c:41
msgid "merge"
msgstr "zusammenführen"
#: builtin/reset.c:41
msgid "keep"
msgstr "keep"
#: builtin/reset.c:83
msgid "You do not have a valid HEAD."
msgstr "Sie haben keinen gültigen HEAD."
#: builtin/reset.c:85
msgid "Failed to find tree of HEAD."
msgstr "Fehler beim Finden des \"Tree\"-Objektes von HEAD."
#: builtin/reset.c:91
#, c-format
msgid "Failed to find tree of %s."
msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
#: builtin/reset.c:116
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD ist jetzt bei %s"
#: builtin/reset.c:195
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Kann keinen '%s'-Reset durchführen, während ein Merge im Gange ist."
#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595
#: builtin/stash.c:619
msgid "be quiet, only report errors"
msgstr "weniger Ausgaben, nur Fehler melden"
#: builtin/reset.c:297
msgid "reset HEAD and index"
msgstr "HEAD und Index umsetzen"
#: builtin/reset.c:298
msgid "reset only HEAD"
msgstr "nur HEAD umsetzen"
#: builtin/reset.c:300 builtin/reset.c:302
msgid "reset HEAD, index and working tree"
msgstr "HEAD, Index und Arbeitsverzeichnis umsetzen"
#: builtin/reset.c:304
msgid "reset HEAD but keep local changes"
msgstr "HEAD umsetzen, aber lokale Änderungen behalten"
#: builtin/reset.c:310
msgid "record only the fact that removed paths will be added later"
msgstr "nur speichern, dass gelöschte Pfade später hinzugefügt werden sollen"
#: builtin/reset.c:344
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Konnte '%s' nicht als gültigen Commit auflösen."
#: builtin/reset.c:352
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Konnte '%s' nicht als gültiges \"Tree\"-Objekt auflösen."
#: builtin/reset.c:361
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}"
#: builtin/reset.c:371
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed mit Pfaden ist veraltet; benutzen Sie stattdessen 'git reset -- "
"<Pfade>'."
#: builtin/reset.c:373
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Ein '%s'-Reset mit Pfaden ist nicht möglich."
#: builtin/reset.c:388
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "'%s'-Reset ist in einem Bare-Repository nicht erlaubt"
#: builtin/reset.c:392
msgid "-N can only be used with --mixed"
msgstr "-N kann nur mit -mixed benutzt werden"
#: builtin/reset.c:413
msgid "Unstaged changes after reset:"
msgstr "Nicht zum Commit vorgemerkte Änderungen nach Zurücksetzung:"
#: builtin/reset.c:416
#, 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 ""
"\n"
"Es dauerte %.2f Sekunden, um über die nach einem Reset nicht zum Commit\n"
"vorgemerkten Änderungen zu zählen. Sie können '--quiet' benutzen, um\n"
"das zu verhindern. Setzen Sie die Konfigurationseinstellung reset.quiet\n"
"auf \"true\", um das zum Standard zu machen.\n"
#: builtin/reset.c:434
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen."
#: builtin/reset.c:439
msgid "Could not write new index file."
msgstr "Konnte neue Index-Datei nicht schreiben."
#: builtin/rev-list.c:499
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
"--exclude-promisor-objects und --missing können nicht kombiniert werden."
#: builtin/rev-list.c:560
msgid "object filtering requires --objects"
msgstr "Das Filtern von Objekten erfordert --objects."
#: builtin/rev-list.c:610
msgid "rev-list does not support display of notes"
msgstr "rev-list unterstützt keine Anzeige von Notizen"
#: builtin/rev-list.c:615
msgid "marked counting is incompatible with --objects"
msgstr "markiertes Zählen ist inkompatibel mit der Option --objects"
#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<Optionen>] -- [<Argumente>...]"
#: builtin/rev-parse.c:414
msgid "keep the `--` passed as an arg"
msgstr "`--` als Argument lassen"
#: builtin/rev-parse.c:416
msgid "stop parsing after the first non-option argument"
msgstr "das Parsen nach dem ersten Argument, was keine Option ist, stoppen"
#: builtin/rev-parse.c:419
msgid "output in stuck long form"
msgstr ""
"Ausgabe in Langform mit Argumenten an den Optionen (getrennt durch '=')"
#: builtin/rev-parse.c:552
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 ""
"git rev-parse --parseopt [<Optionen>] -- [<Argumente>...]\n"
" oder: git rev-parse --sq-quote [<Argumente>...]\n"
" oder: git rev-parse [<Optionen>] [<Argumente>...]\n"
"\n"
"Führen Sie \"git rev-parse --parseopt -h\" für weitere Informationen bei "
"erster Verwendung aus."
#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
msgstr "git revert [<Optionen>] <Commit-Angabe>..."
#: builtin/revert.c:25
msgid "git revert <subcommand>"
msgstr "git revert <Unterbefehl>"
#: builtin/revert.c:30
msgid "git cherry-pick [<options>] <commit-ish>..."
msgstr "git cherry-pick [<Optionen>] <Commit-Angabe>..."
#: builtin/revert.c:31
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <Unterbefehl>"
#: builtin/revert.c:72
#, c-format
msgid "option `%s' expects a number greater than zero"
msgstr "Option `%s' erwartet eine Nummer größer als 0."
#: builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s: %s kann nicht mit %s verwendet werden"
#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
msgstr "\"revert\" oder \"cherry-pick\" Ablauf beenden"
#: builtin/revert.c:103
msgid "resume revert or cherry-pick sequence"
msgstr "\"revert\" oder \"cherry-pick\" Ablauf fortsetzen"
#: builtin/revert.c:104
msgid "cancel revert or cherry-pick sequence"
msgstr "\"revert\" oder \"cherry-pick\" Ablauf abbrechen"
#: builtin/revert.c:105
msgid "skip current commit and continue"
msgstr "den aktuellen Commit auslassen und fortfahren"
#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr "nicht automatisch committen"
#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "Commit-Beschreibung bearbeiten"
#: builtin/revert.c:111
msgid "parent-number"
msgstr "Nummer des Elternteils"
#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "Elternteil der Hauptlinie auswählen"
#: builtin/revert.c:114
msgid "merge strategy"
msgstr "Merge-Strategie"
#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "Option für Merge-Strategie"
#: builtin/revert.c:125
msgid "append commit name"
msgstr "Commit-Namen anhängen"
#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "ursprüngliche, leere Commits erhalten"
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "redundante, leere Commits behalten"
#: builtin/revert.c:232
msgid "revert failed"
msgstr "\"revert\" fehlgeschlagen"
#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" fehlgeschlagen"
#: builtin/rm.c:19
msgid "git rm [<options>] [--] <file>..."
msgstr "git rm [<Optionen>] [--] <Datei>..."
#: 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] ""
"die folgende Datei hat zum Commit vorgemerkte Änderungen unterschiedlich\n"
"zu der Datei und HEAD:"
msgstr[1] ""
"die folgenden Dateien haben zum Commit vorgemerkte Änderungen "
"unterschiedlich\n"
"zu der Datei und HEAD:"
#: builtin/rm.c:212
msgid ""
"\n"
"(use -f to force removal)"
msgstr ""
"\n"
"(benutzen Sie -f, um die Löschung zu erzwingen)"
#: 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] "die folgende Datei hat zum Commit vorgemerkte Änderungen:"
msgstr[1] "die folgenden Dateien haben zum Commit vorgemerkte Änderungen:"
#: builtin/rm.c:220 builtin/rm.c:229
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
"\n"
"(benutzen Sie --cached, um die Datei zu behalten, oder -f, um das Entfernen "
"zu erzwingen)"
#: builtin/rm.c:226
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "die folgende Datei hat lokale Änderungen:"
msgstr[1] "die folgenden Dateien haben lokale Änderungen:"
#: builtin/rm.c:243
msgid "do not list removed files"
msgstr "keine gelöschten Dateien auflisten"
#: builtin/rm.c:244
msgid "only remove from the index"
msgstr "nur aus dem Index entfernen"
#: builtin/rm.c:245
msgid "override the up-to-date check"
msgstr "die \"up-to-date\" Prüfung überschreiben"
#: builtin/rm.c:246
msgid "allow recursive removal"
msgstr "rekursives Entfernen erlauben"
#: builtin/rm.c:248
msgid "exit with a zero status even if nothing matched"
msgstr "mit Rückgabewert 0 beenden, wenn keine Übereinstimmung gefunden wurde"
#: builtin/rm.c:282
msgid "No pathspec was given. Which files should I remove?"
msgstr ""
"Es wurde keine Pfadspezifikation angegeben. Welche Dateien sollen entfernt "
"werden?"
#: builtin/rm.c:305
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder\n"
"benutzen Sie \"stash\", um fortzufahren."
#: builtin/rm.c:323
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "'%s' wird nicht ohne -r rekursiv entfernt"
#: builtin/rm.c:362
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: konnte %s nicht löschen"
#: 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 ""
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
"receive-pack>] [--verbose] [--thin] [--atomic] [<Host>:]<Verzeichnis> "
"[<Referenz>...]\n"
" --all und die explizite Angabe einer <Referenz> schließen sich gegenseitig "
"aus."
#: builtin/send-pack.c:182
msgid "remote name"
msgstr "Name des Remote-Repositories"
#: builtin/send-pack.c:195
msgid "use stateless RPC protocol"
msgstr "zustandsloses RPC-Protokoll verwenden"
#: builtin/send-pack.c:196
msgid "read refs from stdin"
msgstr "Referenzen von der Standard-Eingabe lesen"
#: builtin/send-pack.c:197
msgid "print status from remote helper"
msgstr "Status des Remote-Helpers ausgeben"
#: builtin/shortlog.c:15
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]"
#: builtin/shortlog.c:16
msgid "git log --pretty=short | git shortlog [<options>]"
msgstr "git log --pretty=short | git shortlog [<Optionen>]"
#: builtin/shortlog.c:134
msgid "using multiple --group options with stdin is not supported"
msgstr "mehrere Optionen --group mit Standard-Eingabe wird nicht unterstützt"
#: builtin/shortlog.c:144
msgid "using --group=trailer with stdin is not supported"
msgstr ""
"Nutzung von --group=trailer mit Standard-Eingabe wird nicht unterstützt"
#: builtin/shortlog.c:388
#, c-format
msgid "unknown group type: %s"
msgstr "unbekannter Gruppen-Typ: %s"
#: builtin/shortlog.c:416
msgid "Group by committer rather than author"
msgstr "über Commit-Ersteller anstatt Autor gruppieren"
#: builtin/shortlog.c:419
msgid "sort output according to the number of commits per author"
msgstr "die Ausgabe entsprechend der Anzahl von Commits pro Autor sortieren"
#: builtin/shortlog.c:421
msgid "Suppress commit descriptions, only provides commit count"
msgstr "Commit-Beschreibungen unterdrücken, nur Anzahl der Commits liefern"
#: builtin/shortlog.c:423
msgid "Show the email address of each author"
msgstr "die E-Mail-Adresse von jedem Autor anzeigen"
#: builtin/shortlog.c:424
msgid "<w>[,<i1>[,<i2>]]"
msgstr "<w>[,<i1>[,<i2>]]"
#: builtin/shortlog.c:425
msgid "Linewrap output"
msgstr "Ausgabe mit Zeilenumbrüchen"
#: builtin/shortlog.c:427
msgid "field"
msgstr "Feld"
#: builtin/shortlog.c:428
msgid "Group by field"
msgstr "Gruppieren über Feld"
#: builtin/shortlog.c:456
msgid "too many arguments given outside repository"
msgstr "zu viele Argumente außerhalb des Repositories angegeben"
#: 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 ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<Wann>] | --no-color] [--sparse]\n"
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]"
#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<Basis>]] [--list] [<Referenz>]"
#: 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] "ignoriere %s; kann nicht mehr als %d Referenz behandeln"
msgstr[1] "ignoriere %s; kann nicht mehr als %d Referenzen behandeln"
#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "keine übereinstimmenden Referenzen mit %s"
#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "Remote-Tracking und lokale Branches anzeigen"
#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "Remote-Tracking-Branches anzeigen"
#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "'*!+-' entsprechend des Branches einfärben"
#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "<n> weitere Commits nach dem gemeinsamen Vorgänger-Commit anzeigen"
#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "Synonym für more=-1"
#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "Namen unterdrücken"
#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "den aktuellen Branch einbeziehen"
#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "Commits nach ihren Objektnamen benennen"
#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "mögliche Merge-Basen anzeigen"
#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr ""
"Referenzen, die unerreichbar von allen anderen Referenzen sind, anzeigen"
#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "Commits in topologischer Ordnung anzeigen"
#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr "nur Commits anzeigen, die sich nicht im ersten Branch befinden"
#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "Merges anzeigen, die nur von einem Branch aus erreichbar sind"
#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr "topologische Sortierung, Beibehaltung Datumsordnung wo möglich"
#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "<n>[,<Basis>]"
#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr "die <n> jüngsten Einträge im Reflog, beginnend an der Basis, anzeigen"
#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog ist inkompatibel mit --all, --remotes, --independent oder --merge-"
"base"
#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "keine Branches angegeben, und HEAD ist ungültig"
#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "Die Option --reflog benötigt einen Branchnamen."
#: 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] "nur %d Eintrag kann zur selben Zeit angezeigt werden"
msgstr[1] "nur %d Einträge können zur selben Zeit angezeigt werden"
#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "Referenz nicht gefunden: %s"
#: builtin/show-branch.c:831
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "Kann nicht mehr als %d Commit behandeln."
msgstr[1] "Kann nicht mehr als %d Commits behandeln."
#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' ist keine gültige Referenz."
#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "kann Commit %s (%s) nicht finden"
#: builtin/show-index.c:21
msgid "hash-algorithm"
msgstr "Hash-Algorithmus"
#: builtin/show-index.c:31
msgid "Unknown hash algorithm"
msgstr "Unbekannter Hash-Algorithmus"
#: builtin/show-ref.c:12
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
msgstr ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<Muster>...] "
#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr "git show-ref --exclude-existing[=<Muster>]"
#: builtin/show-ref.c:162
msgid "only show tags (can be combined with heads)"
msgstr "nur Tags anzeigen (kann mit \"heads\" kombiniert werden)"
#: builtin/show-ref.c:163
msgid "only show heads (can be combined with tags)"
msgstr "nur Branches anzeigen (kann mit \"tags\" kombiniert werden)"
#: builtin/show-ref.c:164
msgid "stricter reference checking, requires exact ref path"
msgstr "strengere Referenzprüfung, erfordert exakten Referenzpfad"
#: builtin/show-ref.c:167 builtin/show-ref.c:169
msgid "show the HEAD reference, even if it would be filtered out"
msgstr ""
"die HEAD-Referenz anzeigen, selbst wenn diese ausgefiltert werden würde"
#: builtin/show-ref.c:171
msgid "dereference tags into object IDs"
msgstr "Tags in Objekt-Identifikationen dereferenzieren"
#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
msgstr "nur SHA1 Hash mit <n> Ziffern anzeigen"
#: builtin/show-ref.c:177
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
"keine Ausgabe der Ergebnisse in die Standard-Ausgabe (nützlich mit --verify)"
#: builtin/show-ref.c:179
msgid "show refs from stdin that aren't in local repository"
msgstr ""
"Referenzen von der Standard-Eingabe anzeigen, die sich nicht im lokalen "
"Repository befinden"
#: builtin/sparse-checkout.c:21
msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <Optionen>"
#: builtin/sparse-checkout.c:50
msgid "git sparse-checkout list"
msgstr "git sparse-checkout list"
#: builtin/sparse-checkout.c:76
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
"dieses Arbeitsverzeichnis ist nicht partiell (Datei für partieller Checkout "
"existiert eventuell nicht)"
#: builtin/sparse-checkout.c:228
msgid "failed to create directory for sparse-checkout file"
msgstr ""
"Fehler beim Erstellen eines Verzeichnisses für Datei eines partiellen "
"Checkouts"
#: builtin/sparse-checkout.c:269
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr ""
"Repository-Format konnte nicht erweitert werden, um worktreeConfig zu "
"aktivieren"
#: builtin/sparse-checkout.c:271
msgid "failed to set extensions.worktreeConfig setting"
msgstr "Einstellung für extensions.worktreeConfig konnte nicht gesetzt werden"
#: builtin/sparse-checkout.c:288
msgid "git sparse-checkout init [--cone]"
msgstr "git sparse-checkout init [--cone]"
#: builtin/sparse-checkout.c:307
msgid "initialize the sparse-checkout in cone mode"
msgstr "initialisiere den partiellen Checkout im Cone-Modus"
#: builtin/sparse-checkout.c:344
#, c-format
msgid "failed to open '%s'"
msgstr "Fehler beim Öffnen von '%s'"
#: builtin/sparse-checkout.c:401
#, c-format
msgid "could not normalize path %s"
msgstr "konnte Pfad '%s' nicht normalisieren"
#: builtin/sparse-checkout.c:413
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <Muster>)"
#: builtin/sparse-checkout.c:438
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "konnte Anführungszeichen von C-Style Zeichenkette '%s' nicht entfernen"
#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516
msgid "unable to load existing sparse-checkout patterns"
msgstr "konnte die existierenden Muster des partiellen Checkouts nicht laden"
#: builtin/sparse-checkout.c:561
msgid "read patterns from standard in"
msgstr "Muster von der Standard-Eingabe lesen"
#: builtin/sparse-checkout.c:576
msgid "git sparse-checkout reapply"
msgstr "git sparse-checkout reapply"
#: builtin/sparse-checkout.c:595
msgid "git sparse-checkout disable"
msgstr "git sparse-checkout disable"
#: builtin/sparse-checkout.c:623
msgid "error while refreshing working directory"
msgstr "Fehler während der Aktualisierung des Arbeitsverzeichnisses."
#: builtin/stash.c:22 builtin/stash.c:38
msgid "git stash list [<options>]"
msgstr "git stash list [<Optionen>]"
#: builtin/stash.c:23 builtin/stash.c:43
msgid "git stash show [<options>] [<stash>]"
msgstr "git stash show [<Optionen>] [<Stash>]"
#: builtin/stash.c:24 builtin/stash.c:48
msgid "git stash drop [-q|--quiet] [<stash>]"
msgstr "git stash drop [-q|--quiet] [<Stash>]"
#: builtin/stash.c:25
msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<Stash>]"
#: builtin/stash.c:26 builtin/stash.c:63
msgid "git stash branch <branchname> [<stash>]"
msgstr "git stash branch <Branch> [<Stash>]"
#: builtin/stash.c:27 builtin/stash.c:68
msgid "git stash clear"
msgstr "git stash clear"
#: builtin/stash.c:28
msgid ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <Nachricht>]\n"
" [--pathspec-from-file=<Datei> [--pathspec-file-nul]]\n"
" [--] [<Pfadspezifikation>...]]"
#: builtin/stash.c:32 builtin/stash.c:85
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<Nachricht>]"
#: builtin/stash.c:53
msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
msgstr "git stash pop [--index] [-q|--quiet] [<Stash>]"
#: builtin/stash.c:58
msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
msgstr "git stash apply [--index] [-q|--quiet] [<Stash>]"
#: builtin/stash.c:73
msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
msgstr "git stash store [-m|--message <Nachricht>] [-q|--quiet] <Commit>"
#: 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 ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <Nachricht>]\n"
" [--] [<Pfadspezifikation>...]]"
#: builtin/stash.c:128
#, c-format
msgid "'%s' is not a stash-like commit"
msgstr "'%s' ist kein \"stash\"-artiger Commit"
#: builtin/stash.c:148
#, c-format
msgid "Too many revisions specified:%s"
msgstr "Zu viele Commits angegeben:%s"
#: builtin/stash.c:162
msgid "No stash entries found."
msgstr "Keine Stash-Einträge gefunden."
#: builtin/stash.c:176
#, c-format
msgid "%s is not a valid reference"
msgstr "'%s' ist kein gültiger Referenzname."
#: builtin/stash.c:225
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear mit Parametern ist nicht implementiert"
#: builtin/stash.c:404
msgid "cannot apply a stash in the middle of a merge"
msgstr "Kann Stash nicht anwenden, solange ein Merge im Gange ist"
#: builtin/stash.c:415
#, c-format
msgid "could not generate diff %s^!."
msgstr "Konnte keinen Diff erzeugen %s^!."
#: builtin/stash.c:422
msgid "conflicts in index.Try without --index."
msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
#: builtin/stash.c:428
msgid "could not save index tree"
msgstr "Konnte Index-Verzeichnis nicht speichern"
#: builtin/stash.c:437
msgid "could not restore untracked files from stash"
msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen."
#: builtin/stash.c:451
#, c-format
msgid "Merging %s with %s"
msgstr "Führe %s mit %s zusammen"
#: builtin/stash.c:461
msgid "Index was not unstashed."
msgstr "Index wurde nicht aus dem Stash zurückgeladen."
#: builtin/stash.c:522 builtin/stash.c:621
msgid "attempt to recreate the index"
msgstr "Versuche Index wiederherzustellen."
#: builtin/stash.c:555
#, c-format
msgid "Dropped %s (%s)"
msgstr "%s (%s) gelöscht"
#: builtin/stash.c:558
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Konnte Stash-Eintrag nicht löschen"
#: builtin/stash.c:583
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' ist keine Stash-Referenz"
#: builtin/stash.c:633
msgid "The stash entry is kept in case you need it again."
msgstr ""
"Der Stash-Eintrag wird für den Fall behalten, dass Sie diesen nochmal "
"benötigen."
#: builtin/stash.c:656
msgid "No branch name specified"
msgstr "Kein Branchname spezifiziert"
#: builtin/stash.c:800 builtin/stash.c:837
#, c-format
msgid "Cannot update %s with %s"
msgstr "Kann nicht %s mit %s aktualisieren."
#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537
msgid "stash message"
msgstr "Stash-Beschreibung"
#: builtin/stash.c:828
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" erwartet ein Argument <Commit>"
#: builtin/stash.c:1043
msgid "No changes selected"
msgstr "Keine Änderungen ausgewählt"
#: builtin/stash.c:1143
msgid "You do not have the initial commit yet"
msgstr "Sie haben bisher noch keinen initialen Commit"
#: builtin/stash.c:1170
msgid "Cannot save the current index state"
msgstr "Kann den aktuellen Zustand des Index nicht speichern"
#: builtin/stash.c:1179
msgid "Cannot save the untracked files"
msgstr "Kann die unversionierten Dateien nicht speichern"
#: builtin/stash.c:1190 builtin/stash.c:1199
msgid "Cannot save the current worktree state"
msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern"
#: builtin/stash.c:1227
msgid "Cannot record working tree state"
msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen"
#: builtin/stash.c:1276
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
"Kann nicht gleichzeitig --patch und --include-untracked oder --all verwenden"
#: builtin/stash.c:1292
msgid "Did you forget to 'git add'?"
msgstr "Haben Sie vielleicht 'git add' vergessen?"
#: builtin/stash.c:1307
msgid "No local changes to save"
msgstr "Keine lokalen Änderungen zum Speichern"
#: builtin/stash.c:1314
msgid "Cannot initialize stash"
msgstr "Kann \"stash\" nicht initialisieren"
#: builtin/stash.c:1329
msgid "Cannot save the current status"
msgstr "Kann den aktuellen Status nicht speichern"
#: builtin/stash.c:1334
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Arbeitsverzeichnis und Index-Status %s gespeichert."
#: builtin/stash.c:1424
msgid "Cannot remove worktree changes"
msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen"
#: builtin/stash.c:1463 builtin/stash.c:1528
msgid "keep index"
msgstr "behalte Index"
#: builtin/stash.c:1465 builtin/stash.c:1530
msgid "stash in patch mode"
msgstr "Stash in Patch-Modus"
#: builtin/stash.c:1466 builtin/stash.c:1531
msgid "quiet mode"
msgstr "weniger Ausgaben"
#: builtin/stash.c:1468 builtin/stash.c:1533
msgid "include untracked files in stash"
msgstr "unversionierte Dateien in Stash einbeziehen"
#: builtin/stash.c:1470 builtin/stash.c:1535
msgid "include ignore files"
msgstr "ignorierte Dateien einbeziehen"
#: builtin/stash.c:1570
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgstr ""
"Die Unterstützung für stash.useBuiltin wurde entfernt!\n"
"Siehe dessen Eintrag in 'git help config' für Details."
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
msgstr "git stripspace [-s | --strip-comments]"
#: builtin/stripspace.c:19
msgid "git stripspace [-c | --comment-lines]"
msgstr "git stripspace [-c | --comment-lines]"
#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr ""
"alle Zeilen, die mit dem Kommentarzeichen beginnen, überspringen und "
"entfernen"
#: builtin/stripspace.c:40
msgid "prepend comment character and space to each line"
msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen"
#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Vollständiger Referenzname erwartet, %s erhalten"
#: builtin/submodule--helper.c:64
msgid "submodule--helper print-default-remote takes no arguments"
msgstr "'submodule--helper print-default-remote' erwartet keine Argumente."
#: builtin/submodule--helper.c:102
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "Kann eine Komponente von URL '%s' nicht extrahieren"
#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
msgid "alternative anchor for relative paths"
msgstr "Alternativer Anker für relative Pfade"
#: builtin/submodule--helper.c:415
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]"
#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
#: builtin/submodule--helper.c:652
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Keine URL für Submodul-Pfad '%s' in .gitmodules gefunden"
#: builtin/submodule--helper.c:524
#, c-format
msgid "Entering '%s'\n"
msgstr "Betrete '%s'\n"
#: builtin/submodule--helper.c:527
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
"."
msgstr ""
"run_command gab nicht-Null Status für '%s' zurück.\n"
"."
#: builtin/submodule--helper.c:549
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
"submodules of %s\n"
"."
msgstr ""
"run_command gab während der Rekursion in verschachtelte Submodule von %s "
"einen\n"
"nicht-Null Status zurück.\n"
"."
#: builtin/submodule--helper.c:565
msgid "Suppress output of entering each submodule command"
msgstr ""
"Ausgaben beim Betreten und der Befehlsausführung in einem Submodul "
"unterdrücken"
#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487
msgid "Recurse into nested submodules"
msgstr "Rekursion in verschachtelte Submodule durchführen"
#: builtin/submodule--helper.c:572
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <Befehl>"
#: builtin/submodule--helper.c:599
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr ""
"Konnte Konfiguration '%s' nicht nachschlagen. Nehme an, dass dieses\n"
"Repository sein eigenes verbindliches Upstream-Repository ist."
#: builtin/submodule--helper.c:666
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
"Fehler beim Eintragen der URL für Submodul-Pfad '%s' in die Konfiguration."
#: builtin/submodule--helper.c:670
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submodul '%s' (%s) für Pfad '%s' in die Konfiguration eingetragen.\n"
#: builtin/submodule--helper.c:680
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "Warnung: 'update'-Modus für Submodul '%s' vorgeschlagen\n"
#: builtin/submodule--helper.c:687
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad '%s' in der\n"
"Konfiguration."
#: builtin/submodule--helper.c:709
msgid "Suppress output for initializing a submodule"
msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken"
#: builtin/submodule--helper.c:714
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<Optionen>] [<Pfad>]"
#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "Keine Submodul-Zuordnung in .gitmodules für Pfad '%s' gefunden"
#: builtin/submodule--helper.c:835
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "Konnte HEAD-Referenz nicht innerhalb des Submodul-Pfads '%s' auflösen."
#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "Fehler bei Rekursion in Submodul '%s'."
#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
msgid "Suppress submodule status output"
msgstr "Ausgabe über Submodul-Status unterdrücken"
#: builtin/submodule--helper.c:887
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
"Benutze den Commit, der im Index gespeichert ist, statt den im Submodul HEAD"
#: builtin/submodule--helper.c:888
msgid "recurse into nested submodules"
msgstr "Rekursion in verschachtelte Submodule durchführen"
#: builtin/submodule--helper.c:893
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<Pfad>...]"
#: builtin/submodule--helper.c:917
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <Pfad>"
#: builtin/submodule--helper.c:989
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "* %s %s(blob)->%s(submodule)"
#: builtin/submodule--helper.c:992
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* %s %s(submodule)->%s(blob)"
#: builtin/submodule--helper.c:1005
#, c-format
msgid "%s"
msgstr "%s"
#: builtin/submodule--helper.c:1055
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "Hash eines Objektes von '%s' konnte nicht erzeugt werden"
#: builtin/submodule--helper.c:1059
#, c-format
msgid "unexpected mode %o\n"
msgstr "unerwarteter Modus %o\n"
#: builtin/submodule--helper.c:1300
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr ""
"benutze den Commit, der im Index gespeichert ist, statt vom Submodul HEAD"
#: builtin/submodule--helper.c:1302
msgid "to compare the commit in the index with that in the submodule HEAD"
msgstr "um den Commit aus dem Index mit dem im Submodul HEAD zu vergleichen"
#: builtin/submodule--helper.c:1304
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr ""
"überspringe Submodule, wo der 'ignore_config' Wert auf 'all' gesetzt ist"
#: builtin/submodule--helper.c:1306
msgid "limit the summary size"
msgstr "Größe der Zusammenfassung begrenzen"
#: builtin/submodule--helper.c:1311
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper summary [<Optionen>] [<Commit>] [--] [<Pfad>]"
#: builtin/submodule--helper.c:1335
msgid "could not fetch a revision for HEAD"
msgstr "konnte keinen Commit für HEAD holen"
#: builtin/submodule--helper.c:1340
msgid "--cached and --files are mutually exclusive"
msgstr "--cached und --files schließen sich gegenseitig aus"
#: builtin/submodule--helper.c:1407
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Synchronisiere Submodul-URL für '%s'\n"
#: builtin/submodule--helper.c:1413
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "Fehler beim Registrieren der URL für Submodul-Pfad '%s'"
#: builtin/submodule--helper.c:1427
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "Fehler beim Lesen des Standard-Remote-Repositories für Submodul '%s'"
#: builtin/submodule--helper.c:1438
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "Fehler beim Aktualisieren des Remote-Repositories für Submodul '%s'"
#: builtin/submodule--helper.c:1485
msgid "Suppress output of synchronizing submodule url"
msgstr "Ausgaben bei der Synchronisierung der Submodul-URLs unterdrücken"
#: builtin/submodule--helper.c:1492
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<Pfad>]"
#: builtin/submodule--helper.c:1546
#, 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 ""
"Arbeitsverzeichnis von Submodul in '%s' enthält ein .git-Verzeichnis\n"
"(benutzen Sie 'rm -rf', wenn Sie dieses wirklich mitsamt seiner Historie\n"
"löschen möchten)"
#: builtin/submodule--helper.c:1558
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr ""
"Arbeitsverzeichnis von Submodul in '%s' enthält lokale Änderungen;\n"
"verwenden Sie '-f', um diese zu verwerfen."
#: builtin/submodule--helper.c:1566
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Verzeichnis '%s' bereinigt.\n"
#: builtin/submodule--helper.c:1568
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Konnte Arbeitsverzeichnis des Submoduls in '%s' nicht löschen.\n"
#: builtin/submodule--helper.c:1579
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "Konnte kein leeres Verzeichnis für Submodul in '%s' erstellen."
#: builtin/submodule--helper.c:1595
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Submodul '%s' (%s) für Pfad '%s' ausgetragen.\n"
#: builtin/submodule--helper.c:1624
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
"Arbeitsverzeichnisse von Submodulen löschen, auch wenn lokale Änderungen "
"vorliegen"
#: builtin/submodule--helper.c:1625
msgid "Unregister all submodules"
msgstr "alle Submodule austragen"
#: builtin/submodule--helper.c:1630
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<Pfad>...]]"
#: builtin/submodule--helper.c:1644
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n"
"möchten."
#: 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 ""
"Eine Alternative, die von einer übergeordneten Projekt-Alternative\n"
"berechnet wurde, ist ungültig.\n"
"Um Git das Klonen ohne Alternative in solch einem Fall zu erlauben, setze\n"
"submodule.alternateErrorStrategy auf 'info' oder klone mit der Option\n"
"'--reference-if-able' statt '--reference'."
#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s"
#: builtin/submodule--helper.c:1791
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Wert '%s' für submodule.alternateErrorStrategy wird nicht erkannt"
#: builtin/submodule--helper.c:1798
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Wert '%s' für submodule.alternateLocation wird nicht erkannt."
#: builtin/submodule--helper.c:1822
msgid "where the new submodule will be cloned to"
msgstr "Pfad für neues Submodul"
#: builtin/submodule--helper.c:1825
msgid "name of the new submodule"
msgstr "Name des neuen Submoduls"
#: builtin/submodule--helper.c:1828
msgid "url where to clone the submodule from"
msgstr "URL von der das Submodul geklont wird"
#: builtin/submodule--helper.c:1836
msgid "depth for shallow clones"
msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)"
#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
msgid "force cloning progress"
msgstr "Fortschrittsanzeige beim Klonen erzwingen"
#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
msgid "disallow cloning into non-empty directory"
msgstr "Klonen in ein nicht leeres Verzeichnis verbieten"
#: builtin/submodule--helper.c:1848
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
"<url> --path <path>"
msgstr ""
"git submodule--helper clone [--prefix=<Pfad>] [--quiet] [--reference "
"<Repository>] [--name <Name>] [--depth <Tiefe>] [--single-branch] --url "
"<URL> --path <Pfad>"
#: builtin/submodule--helper.c:1873
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
"Erstellung/Benutzung von '%s' in einem anderen Submodul-Git-Verzeichnis\n"
"verweigert."
#: builtin/submodule--helper.c:1884
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen."
#: builtin/submodule--helper.c:1888
#, c-format
msgid "directory not empty: '%s'"
msgstr "Verzeichnis ist nicht leer: '%s'"
#: builtin/submodule--helper.c:1900
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden."
#: builtin/submodule--helper.c:1936
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Ungültiger Aktualisierungsmodus '%s' für Submodul-Pfad '%s'."
#: builtin/submodule--helper.c:1940
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Ungültiger Aktualisierungsmodus '%s' für Submodul-Pfad '%s' konfiguriert."
#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Submodul-Pfad '%s' nicht initialisiert"
#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "Meinten Sie vielleicht 'update --init'?"
#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Überspringe nicht zusammengeführtes Submodul %s"
#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Überspringe Submodul '%s'"
#: builtin/submodule--helper.c:2254
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant"
#: builtin/submodule--helper.c:2265
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab."
#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
msgid "path into the working tree"
msgstr "Pfad zum Arbeitsverzeichnis"
#: builtin/submodule--helper.c:2330
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg"
#: builtin/submodule--helper.c:2334
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout oder none"
#: builtin/submodule--helper.c:2340
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
"Erstellung eines Klons mit unvollständiger Historie (shallow), abgeschnitten "
"bei\n"
"der angegebenen Anzahl von Commits."
#: builtin/submodule--helper.c:2343
msgid "parallel jobs"
msgstr "Parallele Ausführungen"
#: builtin/submodule--helper.c:2345
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
"ob das initiale Klonen den Empfehlungen für eine unvollständige\n"
"Historie (shallow) folgen soll"
#: builtin/submodule--helper.c:2346
msgid "don't print cloning progress"
msgstr "keine Fortschrittsanzeige beim Klonen"
#: builtin/submodule--helper.c:2357
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=<Pfad>] [<Pfad>...]"
#: builtin/submodule--helper.c:2370
msgid "bad value for update parameter"
msgstr "Fehlerhafter Wert für --update Parameter"
#: builtin/submodule--helper.c:2418
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr ""
"Branch von Submodul (%s) ist konfiguriert, den Branch des Hauptprojektes\n"
"zu erben, aber das Hauptprojekt befindet sich auf keinem Branch."
#: builtin/submodule--helper.c:2541
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "Konnte kein Repository-Handle für Submodul '%s' erhalten."
#: builtin/submodule--helper.c:2574
msgid "recurse into submodules"
msgstr "Rekursion in Submodule durchführen"
#: builtin/submodule--helper.c:2580
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<Optionen>] [<Pfad>...]"
#: builtin/submodule--helper.c:2636
msgid "check if it is safe to write to the .gitmodules file"
msgstr "prüfen, ob es sicher ist, in die Datei .gitmodules zu schreiben"
#: builtin/submodule--helper.c:2639
msgid "unset the config in the .gitmodules file"
msgstr "Konfiguration in der .gitmodules-Datei entfernen"
#: builtin/submodule--helper.c:2644
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <name> [<Wert>]"
#: builtin/submodule--helper.c:2645
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <Name>"
#: builtin/submodule--helper.c:2646
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
#: builtin/submodule--helper.c:2665 git-submodule.sh:151
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
"Bitte stellen Sie sicher, dass sich die Datei .gitmodules im "
"Arbeitsverzeichnis befindet."
#: builtin/submodule--helper.c:2681
msgid "Suppress output for setting url of a submodule"
msgstr "Ausgaben beim Setzen der URL eines Submoduls unterdrücken"
#: builtin/submodule--helper.c:2685
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <Pfad> <neue URL>"
#: builtin/submodule--helper.c:2718
msgid "set the default tracking branch to master"
msgstr "Standard-Tracking-Branch auf master setzen"
#: builtin/submodule--helper.c:2720
msgid "set the default tracking branch"
msgstr "Standard-Tracking-Branch setzen"
#: builtin/submodule--helper.c:2724
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) [<Pfad>]"
#: builtin/submodule--helper.c:2725
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <Branch> <Pfad>"
#: builtin/submodule--helper.c:2732
msgid "--branch or --default required"
msgstr "Option --branch oder --default erforderlich"
#: builtin/submodule--helper.c:2735
msgid "--branch and --default are mutually exclusive"
msgstr "--branch und --default schließen sich gegenseitig aus"
#: builtin/submodule--helper.c:2792 git.c:438 git.c:710
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s unterstützt kein --super-prefix"
#: builtin/submodule--helper.c:2798
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper"
#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr "git symbolic-ref [<Optionen>] <Name> [<Referenz>]"
#: builtin/symbolic-ref.c:9
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <Name>"
#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
"Fehlermeldungen für nicht-symbolische (losgelöste) Referenzen unterdrücken"
#: builtin/symbolic-ref.c:41
msgid "delete symbolic ref"
msgstr "symbolische Referenzen löschen"
#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
msgstr "verkürzte Ausgabe der Referenzen"
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
msgid "reason"
msgstr "Grund"
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
msgid "reason of the update"
msgstr "Grund für die Aktualisierung"
#: builtin/tag.c:25
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
"\t\t<tagname> [<head>]"
msgstr ""
"git tag [-a | -s | -u <Schlüssel-id>] [-f] [-m <Beschreibung> | -F <Datei>]\n"
"\t\t<Tagname> [<Commit>]"
#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
msgstr "git tag -d <Tagname>..."
#: builtin/tag.c:28
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[<Nummer>]] [--contains <Commit>] [--no-contains <Commit>] [--"
"points-at <Objekt>]\n"
"\t\t[--format=<format>] [--merged <Commit>] [--no-merged <Commit>] "
"[<Muster>...]"
#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<Format>] <Tagname>..."
#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "Tag '%s' nicht gefunden."
#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tag '%s' gelöscht (war %s)\n"
#: 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 ""
"\n"
"Geben Sie eine Beschreibung für Tag\n"
" %s\n"
"ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n"
#: 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 ""
"\n"
"Geben Sie eine Beschreibung für Tag\n"
" %s\n"
"ein. Zeilen, die mit '%c' beginnen, werden behalten; Sie dürfen diese\n"
"selbst entfernen wenn Sie möchten.\n"
#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "konnte Tag nicht signieren"
#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr "konnte Tag-Datei nicht schreiben"
#: 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 ""
"Sie haben einen verschachtelten Tag erzeugt. Das Objekt, auf welches Ihr\n"
"neues Tag referenziert, ist bereits ein Tag. Wenn Sie das Objekt taggen\n"
"wollten, worauf dieses zeigt, nutzen Sie:\n"
"\n"
"\tgit tag -f %s %s^{}"
#: builtin/tag.c:232
msgid "bad object type."
msgstr "ungültiger Objekt-Typ"
#: builtin/tag.c:285
msgid "no tag message?"
msgstr "keine Tag-Beschreibung?"
#: builtin/tag.c:292
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Die Tag-Beschreibung wurde in %s gelassen\n"
#: builtin/tag.c:403
msgid "list tag names"
msgstr "Tagnamen auflisten"
#: builtin/tag.c:405
msgid "print <n> lines of each tag message"
msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen"
#: builtin/tag.c:407
msgid "delete tags"
msgstr "Tags löschen"
#: builtin/tag.c:408
msgid "verify tags"
msgstr "Tags überprüfen"
#: builtin/tag.c:410
msgid "Tag creation options"
msgstr "Optionen für Erstellung von Tags"
#: builtin/tag.c:412
msgid "annotated tag, needs a message"
msgstr "annotiertes Tag, benötigt eine Beschreibung"
#: builtin/tag.c:414
msgid "tag message"
msgstr "Tag-Beschreibung"
#: builtin/tag.c:416
msgid "force edit of tag message"
msgstr "Bearbeitung der Tag-Beschreibung erzwingen"
#: builtin/tag.c:417
msgid "annotated and GPG-signed tag"
msgstr "annotiertes und GPG-signiertes Tag"
#: builtin/tag.c:420
msgid "use another key to sign the tag"
msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren"
#: builtin/tag.c:421
msgid "replace the tag if exists"
msgstr "das Tag ersetzen, wenn es existiert"
#: builtin/tag.c:422 builtin/update-ref.c:492
msgid "create a reflog"
msgstr "Reflog erstellen"
#: builtin/tag.c:424
msgid "Tag listing options"
msgstr "Optionen für Auflistung der Tags"
#: builtin/tag.c:425
msgid "show tag list in columns"
msgstr "Liste der Tags in Spalten anzeigen"
#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that contain the commit"
msgstr "nur Tags ausgeben, die diesen Commit beinhalten"
#: builtin/tag.c:427 builtin/tag.c:429
msgid "print only tags that don't contain the commit"
msgstr "nur Tags ausgeben, die diesen Commit nicht enthalten"
#: builtin/tag.c:430
msgid "print only tags that are merged"
msgstr "nur Tags ausgeben, die gemerged wurden"
#: builtin/tag.c:431
msgid "print only tags that are not merged"
msgstr "nur Tags ausgeben, die nicht gemerged wurden"
#: builtin/tag.c:435
msgid "print only tags of the object"
msgstr "nur Tags von dem Objekt ausgeben"
#: builtin/tag.c:483
msgid "--column and -n are incompatible"
msgstr "--column und -n sind inkompatibel"
#: builtin/tag.c:505
msgid "-n option is only allowed in list mode"
msgstr "Die Option -n ist nur im Listenmodus erlaubt."
#: builtin/tag.c:507
msgid "--contains option is only allowed in list mode"
msgstr "Die Option --contains ist nur im Listenmodus erlaubt."
#: builtin/tag.c:509
msgid "--no-contains option is only allowed in list mode"
msgstr "Die Option --no-contains ist nur im Listenmodus erlaubt."
#: builtin/tag.c:511
msgid "--points-at option is only allowed in list mode"
msgstr "Die Option --points-at ist nur im Listenmodus erlaubt."
#: builtin/tag.c:513
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "Die Optionen --merged und --no-merged sind nur im Listenmodus erlaubt."
#: builtin/tag.c:524
msgid "only one -F or -m option is allowed."
msgstr "nur eine -F oder -m Option ist erlaubt."
#: builtin/tag.c:543
msgid "too many params"
msgstr "zu viele Parameter"
#: builtin/tag.c:549
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' ist kein gültiger Tagname."
#: builtin/tag.c:554
#, c-format
msgid "tag '%s' already exists"
msgstr "Tag '%s' existiert bereits"
#: builtin/tag.c:585
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Tag '%s' aktualisiert (war %s)\n"
#: builtin/unpack-objects.c:502
msgid "Unpacking objects"
msgstr "Entpacke Objekte"
#: builtin/update-index.c:84
#, c-format
msgid "failed to create directory %s"
msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
#: builtin/update-index.c:100
#, c-format
msgid "failed to create file %s"
msgstr "Konnte Datei '%s' nicht erstellen"
#: builtin/update-index.c:108
#, c-format
msgid "failed to delete file %s"
msgstr "Konnte Datei '%s' nicht löschen"
#: builtin/update-index.c:115 builtin/update-index.c:221
#, c-format
msgid "failed to delete directory %s"
msgstr "Konnte Verzeichnis '%s' nicht löschen"
#: builtin/update-index.c:140
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Prüfe mtime in '%s' "
#: builtin/update-index.c:154
msgid "directory stat info does not change after adding a new file"
msgstr ""
"Verzeichnisinformationen haben sich nach Hinzufügen einer neuen Datei nicht "
"geändert"
#: builtin/update-index.c:167
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"Verzeichnisinformationen haben sich nach Hinzufügen eines neuen "
"Verzeichnisses nicht geändert"
#: builtin/update-index.c:180
msgid "directory stat info changes after updating a file"
msgstr ""
"Verzeichnisinformationen haben sich nach Aktualisierung einer Datei geändert"
#: builtin/update-index.c:191
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"Verzeichnisinformationen haben sich nach Hinzufügen einer Datei in ein "
"Unterverzeichnis geändert"
#: builtin/update-index.c:202
msgid "directory stat info does not change after deleting a file"
msgstr ""
"Verzeichnisinformationen haben sich nach dem Löschen einer Datei nicht "
"geändert"
#: builtin/update-index.c:215
msgid "directory stat info does not change after deleting a directory"
msgstr ""
"Verzeichnisinformationen haben sich nach dem Löschen eines Verzeichnisses "
"nicht geändert"
#: builtin/update-index.c:222
msgid " OK"
msgstr " OK"
#: builtin/update-index.c:591
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<Optionen>] [--] [<Datei>...]"
#: builtin/update-index.c:974
msgid "continue refresh even when index needs update"
msgstr ""
"Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss"
#: builtin/update-index.c:977
msgid "refresh: ignore submodules"
msgstr "Aktualisierung: ignoriert Submodule"
#: builtin/update-index.c:980
msgid "do not ignore new files"
msgstr "keine neuen Dateien ignorieren"
#: builtin/update-index.c:982
msgid "let files replace directories and vice-versa"
msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht"
#: builtin/update-index.c:984
msgid "notice files missing from worktree"
msgstr "fehlende Dateien im Arbeitsverzeichnis beachten"
#: builtin/update-index.c:986
msgid "refresh even if index contains unmerged entries"
msgstr ""
"aktualisieren, auch wenn der Index nicht zusammengeführte Einträge beinhaltet"
#: builtin/update-index.c:989
msgid "refresh stat information"
msgstr "Dateiinformationen aktualisieren"
#: builtin/update-index.c:993
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung"
#: builtin/update-index.c:997
msgid "<mode>,<object>,<path>"
msgstr "<Modus>,<Objekt>,<Pfad>"
#: builtin/update-index.c:998
msgid "add the specified entry to the index"
msgstr "den angegebenen Eintrag zum Commit vormerken"
#: builtin/update-index.c:1008
msgid "mark files as \"not changing\""
msgstr "diese Datei immer als unverändert betrachten"
#: builtin/update-index.c:1011
msgid "clear assumed-unchanged bit"
msgstr "\"assumed-unchanged\"-Bit löschen"
#: builtin/update-index.c:1014
msgid "mark files as \"index-only\""
msgstr "Dateien als \"index-only\" markieren"
#: builtin/update-index.c:1017
msgid "clear skip-worktree bit"
msgstr "\"skip-worktree\"-Bit löschen"
#: builtin/update-index.c:1020
msgid "do not touch index-only entries"
msgstr "\"index-only\" Einträge überspringen"
#: builtin/update-index.c:1022
msgid "add to index only; do not add content to object database"
msgstr ""
"die Änderungen nur zum Commit vormerken; Inhalt wird nicht der Objekt-"
"Datenbank hinzugefügt"
#: builtin/update-index.c:1024
msgid "remove named paths even if present in worktree"
msgstr ""
"benannte Pfade löschen, auch wenn sie sich im Arbeitsverzeichnis befinden"
#: builtin/update-index.c:1026
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen"
#: builtin/update-index.c:1028
msgid "read list of paths to be updated from standard input"
msgstr "Liste der zu aktualisierenden Pfade von der Standard-Eingabe lesen"
#: builtin/update-index.c:1032
msgid "add entries from standard input to the index"
msgstr "Einträge von der Standard-Eingabe zum Commit vormerken"
#: builtin/update-index.c:1036
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
"wiederholtes Einpflegen der Zustände #2 und #3 für die aufgelisteten Pfade"
#: builtin/update-index.c:1040
msgid "only update entries that differ from HEAD"
msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind"
#: builtin/update-index.c:1044
msgid "ignore files missing from worktree"
msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren"
#: builtin/update-index.c:1047
msgid "report actions to standard output"
msgstr "die Aktionen in der Standard-Ausgabe ausgeben"
#: builtin/update-index.c:1049
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte"
#: builtin/update-index.c:1053
msgid "write index in this format"
msgstr "Index-Datei in diesem Format schreiben"
#: builtin/update-index.c:1055
msgid "enable or disable split index"
msgstr "Splitting des Index aktivieren oder deaktivieren"
#: builtin/update-index.c:1057
msgid "enable/disable untracked cache"
msgstr "Cache für unversionierte Dateien aktivieren oder deaktivieren"
#: builtin/update-index.c:1059
msgid "test if the filesystem supports untracked cache"
msgstr ""
"prüfen, ob das Dateisystem einen Cache für unversionierte Dateien unterstützt"
#: builtin/update-index.c:1061
msgid "enable untracked cache without testing the filesystem"
msgstr ""
"Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren"
#: builtin/update-index.c:1063
msgid "write out the index even if is not flagged as changed"
msgstr "Index rausschreiben, auch wenn dieser nicht als geändert markiert ist"
#: builtin/update-index.c:1065
msgid "enable or disable file system monitor"
msgstr "Dateisystem-Monitor aktivieren oder deaktivieren"
#: builtin/update-index.c:1067
msgid "mark files as fsmonitor valid"
msgstr "Dateien als \"fsmonitor valid\" markieren"
#: builtin/update-index.c:1070
msgid "clear fsmonitor valid bit"
msgstr "\"fsmonitor valid\"-Bit löschen"
#: builtin/update-index.c:1173
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
"core.splitIndex ist auf 'false' gesetzt. Entfernen oder ändern Sie dies,\n"
"wenn sie wirklich das Splitting des Index aktivieren möchten."
#: builtin/update-index.c:1182
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
"core.splitIndex ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n"
"wenn Sie wirklich das Splitting des Index deaktivieren möchten."
#: builtin/update-index.c:1194
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
msgstr ""
"core.untrackedCache ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n"
"wenn Sie wirklich den Cache für unversionierte Dateien deaktivieren möchten."
#: builtin/update-index.c:1198
msgid "Untracked cache disabled"
msgstr "Cache für unversionierte Dateien deaktiviert"
#: builtin/update-index.c:1206
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
msgstr ""
"core.untrackedCache ist auf 'false' gesetzt. Entfernen oder ändern Sie "
"dies,\n"
"wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten."
#: builtin/update-index.c:1210
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Cache für unversionierte Dateien für '%s' aktiviert"
#: builtin/update-index.c:1218
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"core.fsmonitor nicht gesetzt. Setzen Sie es, wenn Sie den Dateisystem-"
"Monitor\n"
"wirklich aktivieren möchten."
#: builtin/update-index.c:1222
msgid "fsmonitor enabled"
msgstr "Dateisystem-Monitor aktiviert"
#: builtin/update-index.c:1225
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"core.fsmonitor ist gesetzt. Löschen Sie es, wenn Sie den Dateisystem-"
"Monitor\n"
"wirklich deaktivieren möchten."
#: builtin/update-index.c:1229
msgid "fsmonitor disabled"
msgstr "Dateisystem-Monitor deaktiviert"
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr "git update-ref [<Optionen>] -d <Referenzname> [<alter-Wert>]"
#: builtin/update-ref.c:11
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
"git update-ref [<Optionen>] <Referenzname> <neuer-Wert> [<alter-Wert>]"
#: builtin/update-ref.c:12
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<Optionen>] --stdin [-z]"
#: builtin/update-ref.c:487
msgid "delete the reference"
msgstr "diese Referenz löschen"
#: builtin/update-ref.c:489
msgid "update <refname> not the one it points to"
msgstr "<Referenzname> aktualisieren, nicht den Verweis"
#: builtin/update-ref.c:490
msgid "stdin has NUL-terminated arguments"
msgstr "Standard-Eingabe hat durch NUL-Zeichen abgeschlossene Argumente"
#: builtin/update-ref.c:491
msgid "read updates from stdin"
msgstr "Aktualisierungen von der Standard-Eingabe lesen"
#: builtin/update-server-info.c:7
msgid "git update-server-info [--force]"
msgstr "git update-server-info [--force]"
#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
msgstr "die Informationsdateien von Grund auf aktualisieren"
#: builtin/upload-pack.c:11
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<Optionen>] <Verzeichnis>"
#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "nach einem einzigen Request/Response-Austausch beenden"
#: builtin/upload-pack.c:25
msgid "exit immediately after initial ref advertisement"
msgstr "direkt nach der initialen Angabe der Commits beenden"
#: builtin/upload-pack.c:27
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
"kein Versuch in <Verzeichnis>/.git/ wenn <Verzeichnis> kein Git-Verzeichnis "
"ist"
#: builtin/upload-pack.c:29
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "Übertragung nach <n> Sekunden Inaktivität unterbrechen"
#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <Commit>..."
#: builtin/verify-commit.c:68
msgid "print commit contents"
msgstr "Commit-Inhalte ausgeben"
#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
msgstr "unbearbeitete Ausgabe des Status von gpg ausgeben"
#: builtin/verify-pack.c:59
msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <Paket>..."
#: builtin/verify-pack.c:70
msgid "verbose"
msgstr "erweiterte Ausgaben"
#: builtin/verify-pack.c:72
msgid "show statistics only"
msgstr "nur Statistiken anzeigen"
#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr "git verify-tag [-v | --verbose] [--format=<Format>] <Tag>..."
#: builtin/verify-tag.c:36
msgid "print tag contents"
msgstr "Tag-Inhalte ausgeben"
#: builtin/worktree.c:17
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<Optionen>] <Pfad> [<Commit-Angabe>]"
#: builtin/worktree.c:18
msgid "git worktree list [<options>]"
msgstr "git worktree list [<Optionen>]"
#: builtin/worktree.c:19
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<Optionen>] <Pfad>"
#: builtin/worktree.c:20
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <Arbeitsverzeichnis> <neuer-Pfad>"
#: builtin/worktree.c:21
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<Optionen>]"
#: builtin/worktree.c:22
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<Optionen>] <Arbeitsverzeichnis>"
#: builtin/worktree.c:23
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <Pfad>"
#: builtin/worktree.c:60 builtin/worktree.c:970
#, c-format
msgid "failed to delete '%s'"
msgstr "Fehler beim Löschen von '%s'"
#: builtin/worktree.c:85
msgid "not a valid directory"
msgstr "kein gültiges Verzeichnis"
#: builtin/worktree.c:91
msgid "gitdir file does not exist"
msgstr "gitdir-Datei existiert nicht"
#: builtin/worktree.c:96 builtin/worktree.c:105
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "konnte gitdir-Datei nicht lesen (%s)"
#: builtin/worktree.c:115
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr "read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> gelesen)"
#: builtin/worktree.c:123
msgid "invalid gitdir file"
msgstr "ungültige gitdir-Datei"
#: builtin/worktree.c:131
msgid "gitdir file points to non-existent location"
msgstr "gitdir-Datei verweist auf nicht existierenden Ort"
#: builtin/worktree.c:146
#, c-format
msgid "Removing %s/%s: %s"
msgstr "Entferne %s/%s: %s"
#: builtin/worktree.c:221
msgid "report pruned working trees"
msgstr "entfernte Arbeitsverzeichnisse ausgeben"
#: builtin/worktree.c:223
msgid "expire working trees older than <time>"
msgstr "Arbeitsverzeichnisse älter als <Zeit> verfallen lassen"
#: builtin/worktree.c:293
#, c-format
msgid "'%s' already exists"
msgstr "'%s' existiert bereits"
#: builtin/worktree.c:302
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "nicht nutzbares Ziel des Arbeitsverzeichnisses '%s'"
#: builtin/worktree.c:307
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
msgstr ""
"'%s' ist ein fehlendes, aber gesperrtes Arbeitsverzeichnis;\n"
"Benutzen Sie '%s -f -f' zum Überschreiben, oder 'unlock' und 'prune'\n"
"oder 'remove' zum Löschen."
#: builtin/worktree.c:309
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
"use '%s -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
"'%s' ist ein fehlendes, aber bereits registriertes Arbeitsverzeichnis;\n"
"Benutzen Sie '%s -f' zum Überschreiben, oder 'prune' oder 'remove' zum\n"
"Löschen."
#: builtin/worktree.c:360
#, c-format
msgid "could not create directory of '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
#: builtin/worktree.c:494 builtin/worktree.c:500
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Bereite Arbeitsverzeichnis vor (neuer Branch '%s')"
#: builtin/worktree.c:496
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Bereite Arbeitsverzeichnis vor (setze Branch '%s' um; war bei %s)"
#: builtin/worktree.c:505
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Bereite Arbeitsverzeichnis vor (checke '%s' aus)"
#: builtin/worktree.c:511
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Bereite Arbeitsverzeichnis vor (losgelöster HEAD %s)"
#: builtin/worktree.c:552
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"<Branch> auschecken, auch wenn dieser bereits in einem anderen "
"Arbeitsverzeichnis ausgecheckt ist"
#: builtin/worktree.c:555
msgid "create a new branch"
msgstr "neuen Branch erstellen"
#: builtin/worktree.c:557
msgid "create or reset a branch"
msgstr "Branch erstellen oder umsetzen"
#: builtin/worktree.c:559
msgid "populate the new working tree"
msgstr "das neue Arbeitsverzeichnis auschecken"
#: builtin/worktree.c:560
msgid "keep the new working tree locked"
msgstr "das neue Arbeitsverzeichnis gesperrt lassen"
#: builtin/worktree.c:563
msgid "set up tracking mode (see git-branch(1))"
msgstr "Modus zum Folgen von Branches einstellen (siehe git-branch(1))"
#: builtin/worktree.c:566
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
"versuchen, eine Übereinstimmung des Branch-Namens mit einem\n"
"Remote-Tracking-Branch herzustellen"
#: builtin/worktree.c:574
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B und --detach schließen sich gegenseitig aus"
#: builtin/worktree.c:635
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
"--[no]-track kann nur verwendet werden, wenn ein neuer Branch erstellt wird."
#: builtin/worktree.c:755
msgid "reason for locking"
msgstr "Sperrgrund"
#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874
#: builtin/worktree.c:998
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' ist kein Arbeitsverzeichnis"
#: builtin/worktree.c:769 builtin/worktree.c:802
msgid "The main working tree cannot be locked or unlocked"
msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden."
#: builtin/worktree.c:774
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' ist bereits gesperrt, Grund: %s"
#: builtin/worktree.c:776
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' ist bereits gesperrt"
#: builtin/worktree.c:804
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' ist nicht gesperrt"
#: builtin/worktree.c:845
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"Arbeitsverzeichnisse, die Submodule enthalten, können nicht verschoben oder\n"
"entfernt werden."
#: builtin/worktree.c:853
msgid "force move even if worktree is dirty or locked"
msgstr ""
"Verschieben erzwingen, auch wenn das Arbeitsverzeichnis geändert oder "
"gesperrt ist"
#: builtin/worktree.c:876 builtin/worktree.c:1000
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' ist ein Hauptarbeitsverzeichnis"
#: builtin/worktree.c:881
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "Konnte Zielname aus '%s' nicht bestimmen."
#: builtin/worktree.c:894
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
"Kann kein gesperrtes Arbeitsverzeichnis verschieben, Sperrgrund: %s\n"
"Benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
#: builtin/worktree.c:896
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
"Kann kein gesperrtes Arbeitsverzeichnis verschieben.\n"
"Benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
#: builtin/worktree.c:899
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "Validierung fehlgeschlagen, kann Arbeitszeichnis nicht verschieben: %s"
#: builtin/worktree.c:904
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "Fehler beim Verschieben von '%s' nach '%s'"
#: builtin/worktree.c:950
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "Fehler beim Ausführen von 'git status' auf '%s'"
#: builtin/worktree.c:954
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"'%s' enthält geänderte oder nicht versionierte Dateien, benutzen Sie --force "
"zum Löschen"
#: builtin/worktree.c:959
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "Fehler beim Ausführen von 'git status' auf '%s'. Code: %d"
#: builtin/worktree.c:982
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"Löschen erzwingen, auch wenn das Arbeitsverzeichnis geändert oder gesperrt "
"ist"
#: builtin/worktree.c:1005
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
"Kann kein gesperrtes Arbeitsverzeichnis löschen, Sperrgrund: %s\n"
"Benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
#: builtin/worktree.c:1007
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
"Kann kein gesperrtes Arbeitsverzeichnis löschen.\n"
"Benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
#: builtin/worktree.c:1010
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "Validierung fehlgeschlagen, kann Arbeitsverzeichnis nicht löschen: %s"
#: builtin/worktree.c:1034
#, c-format
msgid "repair: %s: %s"
msgstr "repariere: %s: %s"
#: builtin/worktree.c:1037
#, c-format
msgid "error: %s: %s"
msgstr "Fehler: %s: %s"
#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<Präfix>/]"
#: builtin/write-tree.c:28
msgid "<prefix>/"
msgstr "<Präfix>/"
#: builtin/write-tree.c:29
msgid "write tree object for a subdirectory <prefix>"
msgstr "das Tree-Objekt für ein Unterverzeichnis <Präfix> schreiben"
#: builtin/write-tree.c:31
msgid "only useful for debugging"
msgstr "nur nützlich für Fehlersuche"
#: http-fetch.c:114
#, c-format
msgid "argument to --packfile must be a valid hash (got '%s')"
msgstr "Argument für --packfile muss ein gültiger Hash sein ('%s' erhalten)"
#: http-fetch.c:122
msgid "not a git repository"
msgstr "kein Git-Repository"
#: t/helper/test-reach.c:154
#, c-format
msgid "commit %s is not marked reachable"
msgstr "Commit %s ist nicht als erreichbar gekennzeichnet."
#: t/helper/test-reach.c:164
msgid "too many commits marked reachable"
msgstr "Zu viele Commits als erreichbar gekennzeichnet."
#: t/helper/test-serve-v2.c:7
msgid "test-tool serve-v2 [<options>]"
msgstr "test-tool serve-v2 [<Optionen>]"
#: t/helper/test-serve-v2.c:19
msgid "exit immediately after advertising capabilities"
msgstr "direkt nach Anzeige der angebotenen Fähigkeiten beenden"
#: git.c:28
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 ""
"git [--version] [--help] [-C <Pfad>] [-c <Name>=<Wert>]\n"
" [--exec-path[=<Pfad>]] [--html-path] [--man-path] [--info-path]\n"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
" [--git-dir=<Pfad>] [--work-tree=<Pfad>] [--namespace=<Name>]\n"
" <Befehl> [<Argumente>]"
#: git.c:35
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 ""
"'git help -a' und 'git help -g' listet verfügbare Unterbefehle und\n"
"einige Anleitungen zu Git-Konzepten auf. Benutzen Sie 'git help <Befehl>'\n"
"oder 'git help <Konzept>', um mehr über einen spezifischen Befehl oder\n"
"Konzept zu erfahren.\n"
"Benutzen Sie 'git help git' für einen Überblick des Systems."
#: git.c:187
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "Kein Verzeichnis für --git-dir angegeben.\n"
#: git.c:201
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "Kein Namespace für --namespace angegeben.\n"
#: git.c:215
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "Kein Verzeichnis für --work-tree angegeben.\n"
#: git.c:229
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "Kein Präfix für --super-prefix angegeben.\n"
#: git.c:251
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c erwartet einen Konfigurationsstring.\n"
#: git.c:289
#, c-format
msgid "no directory given for -C\n"
msgstr "Kein Verzeichnis für -C angegeben.\n"
#: git.c:315
#, c-format
msgid "unknown option: %s\n"
msgstr "Unbekannte Option: %s\n"
#: git.c:364
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "beim Erweitern von Alias '%s': '%s'"
#: git.c:373
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
"You can use '!git' in the alias to do this"
msgstr ""
"Alias '%s' ändert Umgebungsvariablen.\n"
"Sie können '!git' im Alias benutzen, um dies zu tun."
#: git.c:380
#, c-format
msgid "empty alias for %s"
msgstr "leerer Alias für %s"
#: git.c:383
#, c-format
msgid "recursive alias: %s"
msgstr "rekursiver Alias: %s"
#: git.c:465
msgid "write failure on standard output"
msgstr "Fehler beim Schreiben in die Standard-Ausgabe."
#: git.c:467
msgid "unknown write failure on standard output"
msgstr "Unbekannter Fehler beim Schreiben in die Standard-Ausgabe."
#: git.c:469
msgid "close failed on standard output"
msgstr "Fehler beim Schließen der Standard-Ausgabe."
#: git.c:819
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "Alias-Schleife erkannt: Erweiterung von '%s' schließt nicht ab:%s"
#: git.c:869
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "Kann %s nicht als eingebauten Befehl behandeln."
#: git.c:882
#, c-format
msgid ""
"usage: %s\n"
"\n"
msgstr ""
"Verwendung: %s\n"
"\n"
#: git.c:902
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "Erweiterung von Alias '%s' fehlgeschlagen; '%s' ist kein Git-Befehl.\n"
#: git.c:914
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "Fehler beim Ausführen von Befehl '%s': %s\n"
#: http.c:399
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "negativer Wert für http.postbuffer; benutze Standardwert %d"
#: http.c:420
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Kontrolle über Delegation wird mit cURL < 7.22.0 nicht unterstützt"
#: http.c:429
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
"Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.44.0\n"
"nicht unterstützt."
#: http.c:910
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE wird mit cURL < 7.44.0 nicht unterstützt."
#: http.c:989
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr "Protokollbeschränkungen werden mit cURL < 7.19.4 nicht unterstützt."
#: http.c:1132
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Nicht unterstütztes SSL-Backend '%s'. Unterstützte SSL-Backends:"
#: http.c:1139
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
"Konnte SSL-Backend nicht zu '%s' setzen: cURL wurde ohne SSL-Backends gebaut."
#: http.c:1143
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "Konnte SSL-Backend nicht zu '%s' setzen: bereits gesetzt"
#: http.c:2025
#, c-format
msgid ""
"unable to update url base from redirection:\n"
" asked for: %s\n"
" redirect: %s"
msgstr ""
"Konnte Basis-URL nicht durch Umleitung aktualisieren:\n"
" gefragt nach: %s\n"
" umgeleitet: %s"
#: remote-curl.c:174
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "Ungültiges Quoting beim \"push-option\"-Wert: '%s'"
#: remote-curl.c:298
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs nicht gültig: Ist das ein Git-Repository?"
#: remote-curl.c:399
msgid "invalid server response; expected service, got flush packet"
msgstr "Ungültige Antwort des Servers. Service erwartet, Flush-Paket bekommen"
#: remote-curl.c:430
#, c-format
msgid "invalid server response; got '%s'"
msgstr "Ungültige Serverantwort; '%s' bekommen"
#: remote-curl.c:490
#, c-format
msgid "repository '%s' not found"
msgstr "Repository '%s' nicht gefunden."
#: remote-curl.c:494
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Authentifizierung fehlgeschlagen für '%s'"
#: remote-curl.c:498
#, c-format
msgid "unable to access '%s': %s"
msgstr "konnte nicht auf '%s' zugreifen: %s"
#: remote-curl.c:504
#, c-format
msgid "redirecting to %s"
msgstr "Umleitung nach %s"
#: remote-curl.c:633
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "sollte kein EOF haben, wenn nicht behutsam mit EOF"
#: remote-curl.c:645
msgid "remote server sent stateless separator"
msgstr "Server sendete zustandslosen Separator"
#: remote-curl.c:715
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
"konnte nicht RPC-POST-Daten zurückspulen - Versuchen Sie http.postBuffer zu "
"erhöhen"
#: remote-curl.c:745
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl: ungültiges Zeichen für Zeilenlänge: %.4s"
#: remote-curl.c:747
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl: unerwartetes Antwort-Endpaket"
#: remote-curl.c:823
#, c-format
msgid "RPC failed; %s"
msgstr "RPC fehlgeschlagen; %s"
#: remote-curl.c:863
msgid "cannot handle pushes this big"
msgstr "Kann solche großen Übertragungen nicht verarbeiten."
#: remote-curl.c:978
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "Kann Request nicht komprimieren; \"zlib deflate\"-Fehler %d"
#: remote-curl.c:982
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "Kann Request nicht komprimieren; \"zlib end\"-Fehler %d"
#: remote-curl.c:1032
#, c-format
msgid "%d bytes of length header were received"
msgstr "%d Bytes des Längen-Headers wurden empfangen"
#: remote-curl.c:1034
#, c-format
msgid "%d bytes of body are still expected"
msgstr "%d Bytes des Bodys werden noch erwartet"
#: remote-curl.c:1123
msgid "dumb http transport does not support shallow capabilities"
msgstr "Dumb HTTP-Transport unterstützt keine shallow-Funktionen"
#: remote-curl.c:1138
msgid "fetch failed."
msgstr "\"fetch\" fehlgeschlagen."
#: remote-curl.c:1184
msgid "cannot fetch by sha1 over smart http"
msgstr "Kann SHA-1 nicht über Smart-HTTP anfordern"
#: remote-curl.c:1228 remote-curl.c:1234
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "Protokollfehler: SHA-1/Referenz erwartet, '%s' bekommen"
#: remote-curl.c:1246 remote-curl.c:1361
#, c-format
msgid "http transport does not support %s"
msgstr "HTTP-Transport unterstützt nicht %s"
#: remote-curl.c:1282
msgid "git-http-push failed"
msgstr "\"git-http-push\" fehlgeschlagen"
#: remote-curl.c:1467
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: Verwendung: git remote-curl <Remote-Repository> [<URL>]"
#: remote-curl.c:1499
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: Fehler beim Lesen des Kommando-Streams von Git"
#: remote-curl.c:1506
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: \"fetch\" ohne lokales Repository versucht"
#: remote-curl.c:1547
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: Unbekannter Befehl '%s' von Git"
#: compat/compiler.h:26
msgid "no compiler information available\n"
msgstr "keine Compiler-Information verfügbar\n"
#: compat/compiler.h:38
msgid "no libc information available\n"
msgstr "keine libc Informationen verfügbar\n"
#: list-objects-filter-options.h:91
msgid "args"
msgstr "Argumente"
#: list-objects-filter-options.h:92
msgid "object filtering"
msgstr "Filtern nach Objekten"
#: parse-options.h:183
msgid "expiry-date"
msgstr "Verfallsdatum"
#: parse-options.h:197
msgid "no-op (backward compatibility)"
msgstr "Kein Effekt (Rückwärtskompatibilität)"
#: parse-options.h:309
msgid "be more verbose"
msgstr "erweiterte Ausgaben"
#: parse-options.h:311
msgid "be more quiet"
msgstr "weniger Ausgaben"
#: parse-options.h:317
msgid "use <n> digits to display object names"
msgstr "benutze <Anzahl> Ziffern zur Anzeige von Objektnamen"
#: parse-options.h:336
msgid "how to strip spaces and #comments from message"
msgstr ""
"wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
#: parse-options.h:337
msgid "read pathspec from file"
msgstr "Pfadspezifikation aus einer Datei lesen"
#: parse-options.h:338
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
"Mit der Option --pathspec-from-file sind Pfade durch NUL-Zeichen getrennt"
#: ref-filter.h:96
msgid "key"
msgstr "Schüssel"
#: ref-filter.h:96
msgid "field name to sort on"
msgstr "sortiere nach diesem Feld"
#: rerere.h:44
msgid "update the index with reused conflict resolution if possible"
msgstr ""
"Index, wenn möglich, mit wiederverwendeter Konfliktauflösung aktualisieren"
#: wt-status.h:80
msgid "HEAD detached at "
msgstr "HEAD losgelöst bei "
#: wt-status.h:81
msgid "HEAD detached from "
msgstr "HEAD losgelöst von "
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Dateiinhalte zum Commit vormerken"
#: command-list.h:51
msgid "Apply a series of patches from a mailbox"
msgstr "eine Serie von Patches von einer Mailbox anwenden"
#: command-list.h:52
msgid "Annotate file lines with commit information"
msgstr "Zeilen der Datei mit Commit-Informationen versehen und anzeigen"
#: command-list.h:53
msgid "Apply a patch to files and/or to the index"
msgstr "einen Patch auf Dateien und/oder den Index anwenden"
#: command-list.h:54
msgid "Import a GNU Arch repository into Git"
msgstr "ein GNU Arch Repository in Git importieren"
#: command-list.h:55
msgid "Create an archive of files from a named tree"
msgstr "Dateiarchiv von angegebenem Verzeichnis erstellen"
#: command-list.h:56
msgid "Use binary search to find the commit that introduced a bug"
msgstr ""
"Binärsuche verwenden, um den Commit zu finden, der einen Fehler verursacht "
"hat"
#: command-list.h:57
msgid "Show what revision and author last modified each line of a file"
msgstr ""
"Anzeigen, durch welchen Commit und Autor die jeweiligen Zeilen\n"
"einer Datei zuletzt geändert wurden"
#: command-list.h:58
msgid "List, create, or delete branches"
msgstr "Branches anzeigen, erstellen oder entfernen"
#: command-list.h:59
msgid "Collect information for user to file a bug report"
msgstr ""
"Informationen für den Benutzer zum Einreichen eines Fehlerberichts sammeln"
#: command-list.h:60
msgid "Move objects and refs by archive"
msgstr "Objekte und Referenzen über ein Archiv verteilen"
#: command-list.h:61
msgid "Provide content or type and size information for repository objects"
msgstr ""
"Inhalt oder Informationen zu Typ und Größe für Repository-Objekte "
"bereitstellen"
#: command-list.h:62
msgid "Display gitattributes information"
msgstr "gitattributes Informationen darstellen"
#: command-list.h:63
msgid "Debug gitignore / exclude files"
msgstr "Fehlersuche in gitignore / exclude Dateien"
#: command-list.h:64
msgid "Show canonical names and email addresses of contacts"
msgstr "Name und E-Mail-Adresse von Kontakten anzeigen"
#: command-list.h:65
msgid "Switch branches or restore working tree files"
msgstr "Branches wechseln oder Dateien im Arbeitsverzeichnis wiederherstellen"
#: command-list.h:66
msgid "Copy files from the index to the working tree"
msgstr "Dateien von dem Index ins Arbeitsverzeichnis kopieren"
#: command-list.h:67
msgid "Ensures that a reference name is well formed"
msgstr "Sicherstellen, dass ein Referenzname wohlgeformt ist"
#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
msgstr ""
"Commits finden, die noch auf dem Upstream-Branch angewendet werden müssen"
#: command-list.h:69
msgid "Apply the changes introduced by some existing commits"
msgstr "Änderungen eines existierenden Commits anwenden"
#: command-list.h:70
msgid "Graphical alternative to git-commit"
msgstr "grafische Alternative zu git-commit"
#: command-list.h:71
msgid "Remove untracked files from the working tree"
msgstr "unversionierte Dateien vom Arbeitsverzeichnis entfernen"
#: command-list.h:72
msgid "Clone a repository into a new directory"
msgstr "ein Repository in einem neuen Verzeichnis klonen"
#: command-list.h:73
msgid "Display data in columns"
msgstr "Daten in Spalten anzeigen"
#: command-list.h:74
msgid "Record changes to the repository"
msgstr "Änderungen in das Repository eintragen"
#: command-list.h:75
msgid "Write and verify Git commit-graph files"
msgstr "Git Commit-Graph-Dateien schreiben und überprüfen"
#: command-list.h:76
msgid "Create a new commit object"
msgstr "ein neues Commit-Objekt erstellen"
#: command-list.h:77
msgid "Get and set repository or global options"
msgstr "repositoryweite oder globale Optionen lesen oder setzen"
#: command-list.h:78
msgid "Count unpacked number of objects and their disk consumption"
msgstr "Anzahl und Speicherverbrauch ungepackter Objekte zählen"
#: command-list.h:79
msgid "Retrieve and store user credentials"
msgstr "Zugangsdaten des Benutzers empfangen und speichern"
#: command-list.h:80
msgid "Helper to temporarily store passwords in memory"
msgstr ""
"Hilfsprogramm zum temporären Speichern von Zugangsdaten im Hauptspeicher"
#: command-list.h:81
msgid "Helper to store credentials on disk"
msgstr "Hilfsprogramm zum Speichern von Zugangsdaten auf der Festplatte"
#: command-list.h:82
msgid "Export a single commit to a CVS checkout"
msgstr "einzelnen Commit zu einem ausgecheckten CSV-Repository exportieren"
#: command-list.h:83
msgid "Salvage your data out of another SCM people love to hate"
msgstr "Ihre Daten aus einem anderen SCM übernehmen"
#: command-list.h:84
msgid "A CVS server emulator for Git"
msgstr "ein CSV Server Emulator für Git"
#: command-list.h:85
msgid "A really simple server for Git repositories"
msgstr "ein wirklich einfacher Server für Git Repositories"
#: command-list.h:86
msgid "Give an object a human readable name based on an available ref"
msgstr ""
"einem Objekt einen für Menschen lesbaren Namen basierend auf\n"
"einer verfügbaren Referenz geben"
#: command-list.h:87
msgid "Show changes between commits, commit and working tree, etc"
msgstr ""
"Änderungen zwischen Commits, Commit und Arbeitsverzeichnis, etc. anzeigen"
#: command-list.h:88
msgid "Compares files in the working tree and the index"
msgstr "Dateien von dem Arbeitsverzeichnis und dem Index vergleichen"
#: command-list.h:89
msgid "Compare a tree to the working tree or index"
msgstr "ein Verzeichnis von dem Arbeitsverzeichnis und dem Index vergleichen"
#: command-list.h:90
msgid "Compares the content and mode of blobs found via two tree objects"
msgstr ""
"den Inhalt und Modus von Blobs aus zwei Verzeichnisobjekten vergleichen"
#: command-list.h:91
msgid "Show changes using common diff tools"
msgstr "Änderungen mittels den allgemeinen Diff-Tools anzeigen"
#: command-list.h:92
msgid "Git data exporter"
msgstr "Export Tool für Git Daten"
#: command-list.h:93
msgid "Backend for fast Git data importers"
msgstr "Backend für schnelle Git Daten Import Tools"
#: command-list.h:94
msgid "Download objects and refs from another repository"
msgstr "Objekte und Referenzen von einem anderen Repository herunterladen"
#: command-list.h:95
msgid "Receive missing objects from another repository"
msgstr "fehlende Objekte von einem anderen Repository empfangen"
#: command-list.h:96
msgid "Rewrite branches"
msgstr "Branches umschreiben"
#: command-list.h:97
msgid "Produce a merge commit message"
msgstr "Beschreibung eines Merge-Commits erzeugen"
#: command-list.h:98
msgid "Output information on each ref"
msgstr "Informationen für jede Referenz ausgeben"
#: command-list.h:99
msgid "Prepare patches for e-mail submission"
msgstr "Patches für E-Mail-Versand vorbereiten"
#: command-list.h:100
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr ""
"stellt die Verbundenheit und Gültigkeit der Objekte in der Datenbank sicher"
#: command-list.h:101
msgid "Cleanup unnecessary files and optimize the local repository"
msgstr "nicht benötigte Dateien entfernen und das lokale Repository optimieren"
#: command-list.h:102
msgid "Extract commit ID from an archive created using git-archive"
msgstr ""
"Commit-ID eines Archivs extrahieren, welches mit git-archive erstellt wurde"
#: command-list.h:103
msgid "Print lines matching a pattern"
msgstr "Zeilen darstellen, die einem Muster entsprechen"
#: command-list.h:104
msgid "A portable graphical interface to Git"
msgstr "eine portable grafische Schnittstelle zu Git"
#: command-list.h:105
msgid "Compute object ID and optionally creates a blob from a file"
msgstr ""
"von einer Datei die Objekt-ID berechnen und optional ein Blob erstellen"
#: command-list.h:106
msgid "Display help information about Git"
msgstr "Hilfsinformationen über Git anzeigen"
#: command-list.h:107
msgid "Server side implementation of Git over HTTP"
msgstr "serverseitige Implementierung von Git über HTTP"
#: command-list.h:108
msgid "Download from a remote Git repository via HTTP"
msgstr "von einem Remote-Git-Repository über HTTP herunterladen"
#: command-list.h:109
msgid "Push objects over HTTP/DAV to another repository"
msgstr "Objekte über HTTP/DAV zu einem anderen Repository übertragen"
#: command-list.h:110
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr ""
"eine Sammlung von Patches von der Standard-Eingabe zu einem IMAP-Ordner "
"senden"
#: command-list.h:111
msgid "Build pack index file for an existing packed archive"
msgstr "Pack-Index-Datei für ein existierendes gepacktes Archiv erzeugen"
#: command-list.h:112
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr ""
"ein leeres Git-Repository erstellen oder ein bestehendes neuinitialisieren"
#: command-list.h:113
msgid "Instantly browse your working repository in gitweb"
msgstr "Ihr aktuelles Repository sofort in gitweb betrachten"
#: command-list.h:114
msgid "Add or parse structured information in commit messages"
msgstr ""
"Strukturierte Informationen in Commit-Beschreibungen hinzufügen oder parsen"
#: command-list.h:115
msgid "The Git repository browser"
msgstr "der Git-Repository-Browser"
#: command-list.h:116
msgid "Show commit logs"
msgstr "Commit-Historie anzeigen"
#: command-list.h:117
msgid "Show information about files in the index and the working tree"
msgstr ""
"Informationen über Dateien in dem Index und im Arbeitsverzeichnis anzeigen"
#: command-list.h:118
msgid "List references in a remote repository"
msgstr "Referenzen in einem Remote-Repository auflisten"
#: command-list.h:119
msgid "List the contents of a tree object"
msgstr "Inhalte eines Tree-Objektes auflisten"
#: command-list.h:120
msgid "Extracts patch and authorship from a single e-mail message"
msgstr ""
"Patch und Urheberschaft von einer einzelnen E-Mail-Nachricht extrahieren"
#: command-list.h:121
msgid "Simple UNIX mbox splitter program"
msgstr "einfaches UNIX mbox Splitter-Programm"
#: command-list.h:122
msgid "Run tasks to optimize Git repository data"
msgstr "Aufgaben ausführen, um Git-Repository-Daten zu optimieren"
#: command-list.h:123
msgid "Join two or more development histories together"
msgstr "zwei oder mehr Entwicklungszweige zusammenführen"
#: command-list.h:124
msgid "Find as good common ancestors as possible for a merge"
msgstr "möglichst besten gemeinsamen Vorgänger-Commit für einen Merge finden"
#: command-list.h:125
msgid "Run a three-way file merge"
msgstr "einen 3-Wege-Datei-Merge ausführen"
#: command-list.h:126
msgid "Run a merge for files needing merging"
msgstr "einen Merge für zusammenzuführende Dateien ausführen"
#: command-list.h:127
msgid "The standard helper program to use with git-merge-index"
msgstr "das Standard-Hilfsprogramm für die Verwendung mit git-merge-index"
#: command-list.h:128
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
"Ausführen von Tools zur Auflösung von Merge-Konflikten zur Behebung dieser"
#: command-list.h:129
msgid "Show three-way merge without touching index"
msgstr "3-Wege-Merge anzeigen ohne den Index zu verändern"
#: command-list.h:130
msgid "Write and verify multi-pack-indexes"
msgstr "multi-pack-indexes schreiben und überprüfen"
#: command-list.h:131
msgid "Creates a tag object"
msgstr "ein Tag-Objekt erstellen"
#: command-list.h:132
msgid "Build a tree-object from ls-tree formatted text"
msgstr "Tree-Objekt aus ls-tree formattiertem Text erzeugen"
#: command-list.h:133
msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
"eine Datei, ein Verzeichnis, oder eine symbolische Verknüpfung verschieben "
"oder umbenennen"
#: command-list.h:134
msgid "Find symbolic names for given revs"
msgstr "symbolische Namen für die gegebenen Commits finden"
#: command-list.h:135
msgid "Add or inspect object notes"
msgstr "Objekt-Notizen hinzufügen oder überprüfen"
#: command-list.h:136
msgid "Import from and submit to Perforce repositories"
msgstr "von Perforce Repositories importieren und nach diese senden"
#: command-list.h:137
msgid "Create a packed archive of objects"
msgstr "ein gepacktes Archiv von Objekten erstellen"
#: command-list.h:138
msgid "Find redundant pack files"
msgstr "redundante Paketdateien finden"
#: command-list.h:139
msgid "Pack heads and tags for efficient repository access"
msgstr "Branches und Tags für effizienten Zugriff auf das Repository packen"
#: command-list.h:140
msgid "Routines to help parsing remote repository access parameters"
msgstr ""
"Routinen als Hilfe zum Parsen von Zugriffsparametern von Remote-Repositories"
#: command-list.h:141
msgid "Compute unique ID for a patch"
msgstr "eindeutige ID für einen Patch berechnen"
#: command-list.h:142
msgid "Prune all unreachable objects from the object database"
msgstr "alle nicht erreichbaren Objekte von der Objektdatenbank entfernen"
#: command-list.h:143
msgid "Remove extra objects that are already in pack files"
msgstr ""
"zusätzliche Objekte, die sich bereits in Paketdateien befinden, entfernen"
#: command-list.h:144
msgid "Fetch from and integrate with another repository or a local branch"
msgstr ""
"Objekte von einem externen Repository anfordern und sie mit einem anderen "
"Repository oder einem lokalen Branch zusammenführen"
#: command-list.h:145
msgid "Update remote refs along with associated objects"
msgstr "Remote-Referenzen mitsamt den verbundenen Objekten aktualisieren"
#: command-list.h:146
msgid "Applies a quilt patchset onto the current branch"
msgstr "Patches aus quilt auf aktuellen Branch anwenden"
#: command-list.h:147
msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr "zwei Commit-Bereiche vergleichen (zwei Versionen eines Branches)"
#: command-list.h:148
msgid "Reads tree information into the index"
msgstr "Verzeichnisinformationen in den Index einlesen"
#: command-list.h:149
msgid "Reapply commits on top of another base tip"
msgstr "Wiederholtes Anwenden von Commits auf anderem Basis-Commit"
#: command-list.h:150
msgid "Receive what is pushed into the repository"
msgstr "Empfangen was in das Repository übertragen wurde"
#: command-list.h:151
msgid "Manage reflog information"
msgstr "Reflog Informationen verwalten"
#: command-list.h:152
msgid "Manage set of tracked repositories"
msgstr "Menge von hinterlegten Repositories verwalten"
#: command-list.h:153
msgid "Pack unpacked objects in a repository"
msgstr "ungepackte Objekte in einem Repository packen"
#: command-list.h:154
msgid "Create, list, delete refs to replace objects"
msgstr "Referenzen für ersetzende Objekte erstellen, auflisten, löschen"
#: command-list.h:155
msgid "Generates a summary of pending changes"
msgstr "eine Übersicht über ausstehende Änderungen generieren"
#: command-list.h:156
msgid "Reuse recorded resolution of conflicted merges"
msgstr "aufgezeichnete Auflösung von Merge-Konflikten wiederverwenden"
#: command-list.h:157
msgid "Reset current HEAD to the specified state"
msgstr "aktuellen HEAD zu einem spezifizierten Zustand setzen"
#: command-list.h:158
msgid "Restore working tree files"
msgstr "Dateien im Arbeitsverzeichnis wiederherstellen"
#: command-list.h:159
msgid "Revert some existing commits"
msgstr "einige bestehende Commits rückgängig machen"
#: command-list.h:160
msgid "Lists commit objects in reverse chronological order"
msgstr "Commit-Objekte in umgekehrter chronologischer Ordnung auflisten"
#: command-list.h:161
msgid "Pick out and massage parameters"
msgstr "Parameter herauspicken und ändern"
#: command-list.h:162
msgid "Remove files from the working tree and from the index"
msgstr "Dateien im Arbeitsverzeichnis und vom Index löschen"
#: command-list.h:163
msgid "Send a collection of patches as emails"
msgstr "eine Sammlung von Patches als E-Mails versenden"
#: command-list.h:164
msgid "Push objects over Git protocol to another repository"
msgstr "Objekte über das Git Protokoll zu einem anderen Repository übertragen"
#: command-list.h:165
msgid "Restricted login shell for Git-only SSH access"
msgstr "Login-Shell beschränkt für Nur-Git SSH-Zugriff"
#: command-list.h:166
msgid "Summarize 'git log' output"
msgstr "Ausgabe von 'git log' zusammenfassen"
#: command-list.h:167
msgid "Show various types of objects"
msgstr "verschiedene Arten von Objekten anzeigen"
#: command-list.h:168
msgid "Show branches and their commits"
msgstr "Branches und ihre Commits ausgeben"
#: command-list.h:169
msgid "Show packed archive index"
msgstr "gepackten Archiv-Index anzeigen"
#: command-list.h:170
msgid "List references in a local repository"
msgstr "Referenzen in einem lokales Repository auflisten"
#: command-list.h:171
msgid "Git's i18n setup code for shell scripts"
msgstr "Gits i18n-Konfigurationscode für Shell-Skripte"
#: command-list.h:172
msgid "Common Git shell script setup code"
msgstr "allgemeiner Git Shell-Skript Konfigurationscode"
#: command-list.h:173
msgid "Initialize and modify the sparse-checkout"
msgstr "Initialisiere und verändere den partiellen Checkout"
#: command-list.h:174
msgid "Stash the changes in a dirty working directory away"
msgstr "Änderungen in einem Arbeitsverzeichnis aufbewahren"
#: command-list.h:175
msgid "Add file contents to the staging area"
msgstr "Dateiinhalte der Staging-Area hinzufügen"
#: command-list.h:176
msgid "Show the working tree status"
msgstr "den Zustand des Arbeitsverzeichnisses anzeigen"
#: command-list.h:177
msgid "Remove unnecessary whitespace"
msgstr "nicht erforderlichen Whitespace entfernen"
#: command-list.h:178
msgid "Initialize, update or inspect submodules"
msgstr "Submodule initialisieren, aktualisieren oder inspizieren"
#: command-list.h:179
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
"Bidirektionale Operationen zwischen einem Subversion Repository und Git"
#: command-list.h:180
msgid "Switch branches"
msgstr "Branches wechseln"
#: command-list.h:181
msgid "Read, modify and delete symbolic refs"
msgstr "symbolische Referenzen lesen, ändern und löschen"
#: command-list.h:182
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
"ein mit GPG signiertes Tag-Objekt erzeugen, auflisten, löschen oder "
"verifizieren."
#: command-list.h:183
msgid "Creates a temporary file with a blob's contents"
msgstr "eine temporäre Datei mit den Inhalten eines Blobs erstellen"
#: command-list.h:184
msgid "Unpack objects from a packed archive"
msgstr "Objekte von einem gepackten Archiv entpacken"
#: command-list.h:185
msgid "Register file contents in the working tree to the index"
msgstr "Dateiinhalte aus dem Arbeitsverzeichnis im Index registrieren"
#: command-list.h:186
msgid "Update the object name stored in a ref safely"
msgstr ""
"den Objektnamen, der in einer Referenz gespeichert ist, sicher aktualisieren"
#: command-list.h:187
msgid "Update auxiliary info file to help dumb servers"
msgstr "Hilfsinformationsdatei zur Hilfe von einfachen Servern aktualisieren"
#: command-list.h:188
msgid "Send archive back to git-archive"
msgstr "Archiv zurück zu git-archive senden"
#: command-list.h:189
msgid "Send objects packed back to git-fetch-pack"
msgstr "Objekte gepackt zurück an git-fetch-pack senden"
#: command-list.h:190
msgid "Show a Git logical variable"
msgstr "eine logische Variable von Git anzeigen"
#: command-list.h:191
msgid "Check the GPG signature of commits"
msgstr "die GPG-Signatur von Commits prüfen"
#: command-list.h:192
msgid "Validate packed Git archive files"
msgstr "gepackte Git-Archivdateien validieren"
#: command-list.h:193
msgid "Check the GPG signature of tags"
msgstr "die GPG-Signatur von Tags prüfen"
#: command-list.h:194
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Git Web Interface (Web-Frontend für Git-Repositories)"
#: command-list.h:195
msgid "Show logs with difference each commit introduces"
msgstr "Logs mit dem Unterschied, den jeder Commit einführt, anzeigen"
#: command-list.h:196
msgid "Manage multiple working trees"
msgstr "mehrere Arbeitsverzeichnisse verwalten"
#: command-list.h:197
msgid "Create a tree object from the current index"
msgstr "Tree-Objekt vom aktuellen Index erstellen"
#: command-list.h:198
msgid "Defining attributes per path"
msgstr "Definition von Attributen pro Pfad"
#: command-list.h:199
msgid "Git command-line interface and conventions"
msgstr "Git Kommandozeilenschnittstelle und Konventionen"
#: command-list.h:200
msgid "A Git core tutorial for developers"
msgstr "eine Git Anleitung für Entwickler"
#: command-list.h:201
msgid "Providing usernames and passwords to Git"
msgstr "Bereitstellung von Benutzernamen und Passwörtern für Git"
#: command-list.h:202
msgid "Git for CVS users"
msgstr "Git für CVS Benutzer"
#: command-list.h:203
msgid "Tweaking diff output"
msgstr "Diff-Ausgabe optimieren"
#: command-list.h:204
msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
"ein kleine, nützliche Menge von Befehlen für die tägliche Verwendung von Git"
#: command-list.h:205
msgid "Frequently asked questions about using Git"
msgstr "Häufig gestellte Fragen über die Nutzung von Git"
#: command-list.h:206
msgid "A Git Glossary"
msgstr "ein Git-Glossar"
#: command-list.h:207
msgid "Hooks used by Git"
msgstr "von Git verwendete Hooks"
#: command-list.h:208
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien"
#: command-list.h:209
msgid "Defining submodule properties"
msgstr "Definition von Submodul-Eigenschaften"
#: command-list.h:210
msgid "Git namespaces"
msgstr "Git Namensbereiche"
#: command-list.h:211
msgid "Helper programs to interact with remote repositories"
msgstr "Hilfsprogramme zur Interaktion mit Remote-Repositories"
#: command-list.h:212
msgid "Git Repository Layout"
msgstr "Git Repository Aufbau"
#: command-list.h:213
msgid "Specifying revisions and ranges for Git"
msgstr "Spezifikation von Commits und Bereichen für Git"
#: command-list.h:214
msgid "Mounting one repository inside another"
msgstr "Einbinden eines Repositories in ein anderes"
#: command-list.h:215
msgid "A tutorial introduction to Git: part two"
msgstr "eine einführende Anleitung zu Git: Teil zwei"
#: command-list.h:216
msgid "A tutorial introduction to Git"
msgstr "eine einführende Anleitung zu Git"
#: command-list.h:217
msgid "An overview of recommended workflows with Git"
msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git"
#: git-bisect.sh:79
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Ungültige Referenz-Eingabe: $arg"
#: git-bisect.sh:99
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "Ungültige Referenz-Eingabe: $bisected_head"
#: git-bisect.sh:108
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Ungültige Referenz-Eingabe: $rev"
#: git-bisect.sh:117
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "'git bisect $TERM_BAD' kann nur ein Argument entgegennehmen."
#: git-bisect.sh:149
msgid "No logfile given"
msgstr "Keine Log-Datei gegeben"
#: git-bisect.sh:150
#, sh-format
msgid "cannot read $file for replaying"
msgstr "kann $file nicht für das Abspielen lesen"
#: git-bisect.sh:173
msgid "?? what are you talking about?"
msgstr "?? Was reden Sie da?"
#: git-bisect.sh:183
msgid "bisect run failed: no command provided."
msgstr "'bisect run' fehlgeschlagen: kein Befehl angegeben."
#: git-bisect.sh:188
#, sh-format
msgid "running $command"
msgstr "führe $command aus"
#: git-bisect.sh:195
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
"'bisect run' fehlgeschlagen:\n"
"Exit-Code $res von '$command' ist < 0 oder >= 128"
#: git-bisect.sh:221
msgid "bisect run cannot continue any more"
msgstr "'bisect run' kann nicht mehr fortgesetzt werden"
#: git-bisect.sh:227
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
"'bisect run' fehlgeschlagen:\n"
"'bisect_state $state' wurde mit Fehlerwert $res beendet"
#: git-bisect.sh:234
msgid "bisect run success"
msgstr "'bisect run' erfolgreich ausgeführt"
#: git-bisect.sh:242
msgid "We are not bisecting."
msgstr "keine binäre Suche im Gange"
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
"merge"
msgstr ""
"Fehler: Ihre lokalen Änderungen in den folgenden Dateien würden durch den "
"Merge\n"
"überschrieben werden"
#: git-merge-octopus.sh:61
msgid "Automated merge did not work."
msgstr "Automatischer Merge hat nicht funktioniert."
#: git-merge-octopus.sh:62
msgid "Should not be doing an octopus."
msgstr "Sollte keinen Oktopus-Merge ausführen."
#: git-merge-octopus.sh:73
#, sh-format
msgid "Unable to find common commit with $pretty_name"
msgstr "Konnte keinen gemeinsamen Commit mit $pretty_name finden."
#: git-merge-octopus.sh:77
#, sh-format
msgid "Already up to date with $pretty_name"
msgstr "Bereits aktuell mit $pretty_name"
#: git-merge-octopus.sh:89
#, sh-format
msgid "Fast-forwarding to: $pretty_name"
msgstr "Spule vor zu: $pretty_name"
#: git-merge-octopus.sh:97
#, sh-format
msgid "Trying simple merge with $pretty_name"
msgstr "Versuche einfachen Merge mit $pretty_name"
#: git-merge-octopus.sh:102
msgid "Simple merge did not work, trying automatic merge."
msgstr "Einfacher Merge hat nicht funktioniert, versuche automatischen Merge."
#: git-submodule.sh:180
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Relative Pfade können nur von der obersten Ebene des Arbeitsverzeichnisses "
"benutzt werden."
#: git-submodule.sh:190
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "repo URL: '$repo' muss absolut sein oder mit ./|../ beginnen"
#: git-submodule.sh:209
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' ist bereits zum Commit vorgemerkt"
#: git-submodule.sh:212
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "'$sm_path' ist bereits zum Commit vorgemerkt und ist kein Submodul"
#: git-submodule.sh:219
#, sh-format
msgid "'$sm_path' does not have a commit checked out"
msgstr "'$sm_path' hat keinen Commit ausgecheckt"
#: git-submodule.sh:250
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Füge existierendes Repository in '$sm_path' dem Index hinzu."
#: git-submodule.sh:252
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' existiert bereits und ist kein gültiges Git-Repository"
#: git-submodule.sh:260
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Ein Git-Verzeichnis für '$sm_name' wurde lokal gefunden mit den Remote-"
"Repositories:"
#: git-submodule.sh:262
#, 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 ""
"Wenn Sie das lokale Git-Verzeichnis wiederverwenden wollen, anstatt erneut "
"von\n"
" $realrepo\n"
"zu klonen, benutzen Sie die Option '--force'. Wenn das lokale Git-"
"Verzeichnis\n"
"nicht das korrekte Repository ist oder Sie unsicher sind, was das bedeutet,\n"
"wählen Sie einen anderen Namen mit der Option '--name'."
#: git-submodule.sh:268
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '$sm_name'."
#: git-submodule.sh:280
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Kann Submodul '$sm_path' nicht auschecken"
#: git-submodule.sh:285
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen"
#: git-submodule.sh:294
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration."
#: git-submodule.sh:567
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden."
#: git-submodule.sh:577
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausführen"
#: git-submodule.sh:582
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
"Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n"
"'$sm_path' nicht finden."
#: git-submodule.sh:600
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
"$sha1:"
msgstr ""
"Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen. Versuche "
"$sha1 direkt anzufordern:"
#: git-submodule.sh:606
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
"\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n"
"enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen."
#: git-submodule.sh:613
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken."
#: git-submodule.sh:614
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt"
#: git-submodule.sh:618
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht möglich"
#: git-submodule.sh:619
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'"
#: git-submodule.sh:624
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'"
#: git-submodule.sh:630
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Ausführung von '$command $sha1' in Submodul-Pfad '$displaypath' "
"fehlgeschlagen"
#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Submodul-Pfad '$displaypath': '$command $sha1'"
#: git-submodule.sh:662
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'"
#: git-parse-remote.sh:89
#, sh-format
msgid "See git-${cmd}(1) for details."
msgstr "Siehe git-${cmd}(1) für weitere Details."
#: git-rebase--preserve-merges.sh:109
msgid "Applied autostash."
msgstr "Automatischen Stash angewendet."
#: git-rebase--preserve-merges.sh:112
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Kann $stash_sha1 nicht speichern."
#: 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 ""
"Anwendung des automatischen Stash resultierte in Konflikten.\n"
"Ihre Änderungen sind im Stash sicher.\n"
"Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "Führe Rebase aus ($new_count/$total)"
#: git-rebase--preserve-merges.sh:197
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 ""
"\n"
"Befehle:\n"
"p, pick <Commit> = Commit verwenden\n"
"r, reword <Commit> = Commit verwenden, aber Commit-Beschreibung bearbeiten\n"
"e, edit <Commit> = Commit verwenden, aber zum Nachbessern anhalten\n"
"s, squash <Commit> = Commit verwenden, aber mit vorherigem Commit vereinen\n"
"f, fixup <Commit> = wie \"squash\", aber diese Commit-Beschreibung "
"verwerfen\n"
"x, exec <Commit> = Befehl (Rest der Zeile) mittels Shell ausführen\n"
"d, drop <Commit> = Commit entfernen\n"
"l, label <Label> = aktuellen HEAD mit Label versehen\n"
"t, reset <Label> = HEAD zu einem Label umsetzen\n"
"m, merge [-C <Commit> | -c <Commit>] <Label> [# <eineZeile>]\n"
". Merge-Commit mit der originalen Merge-Commit-Beschreibung erstellen\n"
". (oder die eine Zeile, wenn keine originale Merge-Commit-"
"Beschreibung\n"
". spezifiziert ist). Benutzen Sie -c <Commit> zum Bearbeiten der\n"
". Commit-Beschreibung.\n"
"\n"
"Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n"
"ausgeführt.\n"
#: git-rebase--preserve-merges.sh:260
#, 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 ""
"Sie können den Commit nun nachbessern mit:\n"
"\n"
"\tgit commit --amend $gpg_sign_opt_quoted\n"
"\n"
"Sobald Sie mit Ihren Änderungen zufrieden sind, führen Sie aus:\n"
"\n"
"\tgit rebase --continue"
#: git-rebase--preserve-merges.sh:285
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1: kein Commit der gepickt werden kann"
#: git-rebase--preserve-merges.sh:324
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Ungültiger Commit-Name: $sha1"
#: git-rebase--preserve-merges.sh:354
msgid "Cannot write current commit's replacement sha1"
msgstr "Kann ersetzenden SHA-1 des aktuellen Commits nicht schreiben"
#: git-rebase--preserve-merges.sh:405
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Spule vor zu $sha1"
#: git-rebase--preserve-merges.sh:407
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "Kann nicht zu $sha1 vorspulen"
#: git-rebase--preserve-merges.sh:416
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "Kann HEAD nicht auf $first_parent setzen"
#: git-rebase--preserve-merges.sh:421
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "\"squash\" eines Merges ($sha1) zurückgewiesen."
#: git-rebase--preserve-merges.sh:439
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Fehler beim Wiederholen des Merges von $sha1"
#: git-rebase--preserve-merges.sh:448
#, sh-format
msgid "Could not pick $sha1"
msgstr "Konnte $sha1 nicht picken"
#: git-rebase--preserve-merges.sh:457
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Das ist Commit-Beschreibung #${n}:"
#: git-rebase--preserve-merges.sh:462
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Commit-Beschreibung #${n} wird ausgelassen:"
#: git-rebase--preserve-merges.sh:473
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "Das ist eine Kombination aus $count Commit."
msgstr[1] "Das ist eine Kombination aus $count Commits."
#: git-rebase--preserve-merges.sh:482
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Kann $fixup_msg nicht schreiben"
#: git-rebase--preserve-merges.sh:485
msgid "This is a combination of 2 commits."
msgstr "Das ist eine Kombination aus 2 Commits."
#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
#: git-rebase--preserve-merges.sh:572
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "Konnte $sha1... ($rest) nicht anwenden"
#: git-rebase--preserve-merges.sh:601
#, 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 ""
"Konnte Commit nicht nachbessern, nachdem dieser verwendet wurde: $sha1... "
"$rest\n"
"Das passierte sehr wahrscheinlich wegen einer leeren Commit-Beschreibung, "
"oder\n"
"weil der pre-commit Hook fehlschlug. Falls der pre-commit Hook fehlschlug,\n"
"sollten Sie das Problem beheben, bevor Sie die Commit-Beschreibung ändern "
"können."
#: git-rebase--preserve-merges.sh:616
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Angehalten bei $sha1_abbrev... $rest"
#: git-rebase--preserve-merges.sh:631
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "Kann nicht '$squash_style' ohne vorherigen Commit"
#: git-rebase--preserve-merges.sh:673
#, sh-format
msgid "Executing: $rest"
msgstr "Führe aus: $rest"
#: git-rebase--preserve-merges.sh:681
#, sh-format
msgid "Execution failed: $rest"
msgstr "Ausführung fehlgeschlagen: $rest"
#: git-rebase--preserve-merges.sh:683
msgid "and made changes to the index and/or the working tree"
msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert."
#: git-rebase--preserve-merges.sh:685
msgid ""
"You can fix the problem, and then run\n"
"\n"
"\tgit rebase --continue"
msgstr ""
"Sie können das Problem beheben, und dann\n"
"\n"
"\tgit rebase --continue\n"
"\n"
"ausführen."
#. TRANSLATORS: after these lines is a command to be issued by the user
#: git-rebase--preserve-merges.sh:698
#, 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 ""
"Ausführung erfolgreich: $rest\n"
"Aber Änderungen in Index oder Arbeitsverzeichnis verblieben.\n"
"Committen Sie Ihre Änderungen oder benutzen Sie \"stash\".\n"
"Führen Sie dann aus:\n"
"\n"
"\tgit rebase --continue"
#: git-rebase--preserve-merges.sh:709
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Unbekannter Befehl: $command $sha1 $rest"
#: git-rebase--preserve-merges.sh:710
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Bitte beheben Sie das, indem Sie 'git rebase --edit-todo' ausführen."
#: git-rebase--preserve-merges.sh:745
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Erfolgreich Rebase ausgeführt und $head_name aktualisiert."
#: git-rebase--preserve-merges.sh:802
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Konnte CHERRY_PICK_HEAD nicht löschen"
#: git-rebase--preserve-merges.sh:807
#, 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 ""
"Es befinden sich zum Commit vorgemerkte Änderungen in Ihrem "
"Arbeitsverzeichnis.\n"
"Wenn diese Änderungen in den vorherigen Commit aufgenommen werden sollen,\n"
"führen Sie aus:\n"
"\n"
" git commit --amend $gpg_sign_opt_quoted\n"
"\n"
"Wenn daraus ein neuer Commit erzeugt werden soll, führen Sie aus:\n"
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
"Im Anschluss führen Sie zum Fortfahren aus:\n"
"\n"
" git rebase --continue\n"
#: git-rebase--preserve-merges.sh:824
msgid "Error trying to find the author identity to amend commit"
msgstr ""
"Fehler beim Versuch die Identität des Authors zum Verbessern des Commits zu\n"
"finden"
#: git-rebase--preserve-merges.sh:829
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
"Sie haben nicht committete Änderungen in Ihrem Arbeitsverzeichnis. Bitte\n"
"committen Sie diese zuerst und führen Sie dann 'git rebase --continue' "
"erneut\n"
"aus."
#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
msgid "Could not commit staged changes."
msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
msgid "Could not execute editor"
msgstr "Konnte Editor nicht ausführen."
#: git-rebase--preserve-merges.sh:890
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Konnte $switch_to nicht auschecken."
#: git-rebase--preserve-merges.sh:897
msgid "No HEAD?"
msgstr "Kein HEAD?"
#: git-rebase--preserve-merges.sh:898
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Konnte temporäres Verzeichnis $state_dir nicht erstellen."
#: git-rebase--preserve-merges.sh:901
msgid "Could not mark as interactive"
msgstr "Konnte nicht als interaktiven Rebase markieren."
#: git-rebase--preserve-merges.sh:933
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Rebase von $shortrevisions auf $shortonto ($todocount Kommando)"
msgstr[1] "Rebase von $shortrevisions auf $shortonto ($todocount Kommandos)"
#: git-rebase--preserve-merges.sh:945
msgid "Note that empty commits are commented out"
msgstr "Leere Commits sind auskommentiert."
#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
msgid "Could not init rewritten commits"
msgstr "Konnte neu geschriebene Commits nicht initialisieren."
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
msgstr "Verwendung: $dashless $USAGE"
#: git-sh-setup.sh:191
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
"Konnte nicht in Verzeichnis $cdup wechseln, der obersten Ebene des\n"
"Arbeitsverzeichnisses."
#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr ""
"fatal: $program_name kann ohne ein Arbeitsverzeichnis nicht verwendet werden."
#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
msgstr ""
"Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt "
"sind."
#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
"Kann Branches nicht neu schreiben: Sie haben Änderungen, die nicht zum "
"Commit\n"
"vorgemerkt sind."
#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
"Kann \"pull\" mit \"rebase\" nicht ausführen: Sie haben Änderungen, die "
"nicht zum Commit vorgemerkt sind."
#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
"Kann $action nicht ausführen: Sie haben Änderungen, die nicht zum Commit\n"
"vorgemerkt sind."
#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr ""
"Rebase nicht möglich: Die Staging-Area beinhaltet nicht committete "
"Änderungen."
#: git-sh-setup.sh:246
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
"Kann \"pull\" mit \"rebase\" nicht ausführen: Die Staging-Area beinhaltet "
"nicht committete Änderungen."
#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"Kann $action nicht ausführen: Die Staging-Area beinhaltet nicht committete\n"
"Änderungen."
#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr "Zusätzlich beinhaltet die Staging-Area nicht committete Änderungen."
#: git-sh-setup.sh:373
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
"Sie müssen den Befehl von der obersten Ebene des Arbeitsverzeichnisses "
"ausführen."
#: git-sh-setup.sh:378
msgid "Unable to determine absolute path of git directory"
msgstr "Konnte absoluten Pfad des Git-Verzeichnisses nicht bestimmen."
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
#: git-add--interactive.perl:212
#, perl-format
msgid "%12s %12s %s"
msgstr "%28s %25s %s"
#: git-add--interactive.perl:634
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "%d Pfad angefasst\n"
msgstr[1] "%d Pfade angefasst\n"
#: git-add--interactive.perl:1058
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr ""
"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
"Patch-Block direkt zum Hinzufügen zur Staging-Area markiert."
#: git-add--interactive.perl:1061
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr ""
"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
"Patch-Block direkt zum Hinzufügen zum Stash markiert."
#: git-add--interactive.perl:1064
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr ""
"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
"Patch-Block direkt zum Entfernen aus der Staging-Area markiert."
#: git-add--interactive.perl:1067 git-add--interactive.perl:1076
#: git-add--interactive.perl:1082
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr ""
"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
"Patch-Block direkt zum Anwenden markiert."
#: git-add--interactive.perl:1070 git-add--interactive.perl:1073
#: git-add--interactive.perl:1079
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr ""
"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
"Patch-Block direkt zum Verwerfen markiert."
#: git-add--interactive.perl:1116
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr ""
"Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Schreiben: %s"
#: git-add--interactive.perl:1123
#, 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 ""
"---\n"
"Um '%s' Zeilen zu entfernen, machen Sie aus diesen ' ' Zeilen (Kontext).\n"
"Um '%s' Zeilen zu entfernen, löschen Sie diese.\n"
"Zeilen, die mit %s beginnen, werden entfernt.\n"
#: git-add--interactive.perl:1145
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s"
#: git-add--interactive.perl:1253
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 ""
"y - diesen Patch-Block zum Commit vormerken\n"
"n - diesen Patch-Block nicht zum Commit vormerken\n"
"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht zum Commit "
"vormerken\n"
"a - diesen und alle weiteren Patch-Blöcke dieser Datei zum Commit vormerken\n"
"d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit "
"vormerken"
#: git-add--interactive.perl:1259
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 ""
"y - diesen Patch-Block stashen\n"
"n - diesen Patch-Block nicht stashen\n"
"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht stashen\n"
"a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n"
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen"
#: git-add--interactive.perl:1265
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 ""
"y - diesen Patch-Block unstashen\n"
"n - diesen Patch-Block nicht unstashen\n"
"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht unstashen\n"
"a - diesen und alle weiteren Patch-Blöcke dieser Datei unstashen\n"
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht unstashen"
#: git-add--interactive.perl:1271
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 ""
"y - diesen Patch-Block auf den Index anwenden\n"
"n - diesen Patch-Block nicht auf den Index anwenden\n"
"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht auf den Index "
"anwenden\n"
"a - diesen und alle weiteren Patch-Blöcke dieser Datei auf den Index "
"anwenden\n"
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index "
"anwenden"
#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
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 ""
"y - diesen Patch-Block im Arbeitsverzeichnis verwerfen\n"
"n - diesen Patch-Block im Arbeitsverzeichnis nicht verwerfen\n"
"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht im "
"Arbeitsverzeichnis verwerfen\n"
"a - diesen und alle weiteren Patch-Blöcke dieser Datei im Arbeitsverzeichnis "
"verwerfen\n"
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im "
"Arbeitsverzeichnis verwerfen"
#: git-add--interactive.perl:1283
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 ""
"y - diesen Patch-Block im Index und Arbeitsverzeichnis verwerfen\n"
"n - diesen Patch-Block nicht im Index und Arbeitsverzeichnis verwerfen\n"
"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht im Index und "
"Arbeitsverzeichnis verwerfen\n"
"a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n"
"d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen"
#: git-add--interactive.perl:1289
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 ""
"y - diesen Patch-Block im Index und auf Arbeitsverzeichnis anwenden\n"
"n - diesen Patch-Block nicht im Index und auf Arbeitsverzeichnis anwenden\n"
"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht anwenden\n"
"a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
"d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden"
#: git-add--interactive.perl:1301
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 ""
"y - diesen Patch-Block auf das Arbeitsverzeichnis anwenden\n"
"n - diesen Patch-Block nicht auf das Arbeitsverzeichnis anwenden\n"
"q - Beenden; diesen und alle verbleibenden Patch-Blöcke nicht anwenden\n"
"a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
"d - diesen und alle weiteren Patch-Blöcke in der Datei nicht anwenden"
#: git-add--interactive.perl:1316
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 ""
"g - Patch-Block zum Hinspringen auswählen\n"
"/ - nach Patch-Block suchen, der gegebenem regulärem Ausdruck entspricht\n"
"j - diesen Patch-Block unbestimmt lassen, nächsten unbestimmten Patch-Block "
"anzeigen\n"
"J - diesen Patch-Block unbestimmt lassen, nächsten Patch-Block anzeigen\n"
"k - diesen Patch-Block unbestimmt lassen, vorherigen unbestimmten Patch-"
"Block anzeigen\n"
"K - diesen Patch-Block unbestimmt lassen, vorherigen Patch-Block anzeigen\n"
"s - aktuellen Patch-Block in kleinere Patch-Blöcke aufteilen\n"
"e - aktuellen Patch-Block manuell editieren\n"
"? - Hilfe anzeigen\n"
#: git-add--interactive.perl:1347
msgid "The selected hunks do not apply to the index!\n"
msgstr ""
"Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet werden!\n"
#: git-add--interactive.perl:1362
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignoriere nicht zusammengeführte Datei: %s\n"
#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "Modusänderung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "Löschung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1483
#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr "Ergänzung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1484
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Diesen Patch-Block auf das Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr "Keine anderen Patch-Blöcke verbleibend\n"
#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Ungültige Nummer: '%s'\n"
#: git-add--interactive.perl:1624
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Entschuldigung, nur %d Patch-Block verfügbar.\n"
msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar.\n"
#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr "Keine anderen Patch-Blöcke zum Durchsuchen\n"
#: git-add--interactive.perl:1676
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s\n"
#: git-add--interactive.perl:1686
msgid "No hunk matches the given pattern\n"
msgstr "Kein Patch-Block entspricht dem angegebenen Muster\n"
#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr "Kein vorheriger Patch-Block\n"
#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr "Kein folgender Patch-Block\n"
#: git-add--interactive.perl:1732
msgid "Sorry, cannot split this hunk\n"
msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen.\n"
#: git-add--interactive.perl:1738
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "In %d Patch-Block aufgeteilt.\n"
msgstr[1] "In %d Patch-Blöcke aufgeteilt.\n"
#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten.\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
#: git-add--interactive.perl:1813
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 ""
"status - Pfade mit Änderungen anzeigen\n"
"update - Zustand des Arbeitsverzeichnisses den zum Commit "
"vorgemerkten Änderungen hinzufügen\n"
"revert - zum Commit vorgemerkte Änderungen auf HEAD Version "
"zurücksetzen\n"
"patch - Patch-Blöcke auswählen und selektiv aktualisieren\n"
"diff - Unterschiede zwischen HEAD und Index anzeigen\n"
"add untracked - Inhalte von unversionierten Dateien zum Commit vormerken\n"
#: 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
msgid "missing --"
msgstr "-- fehlt"
#: git-add--interactive.perl:1861
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "Unbekannter --patch Modus: %s"
#: git-add--interactive.perl:1867 git-add--interactive.perl:1873
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "ungültiges Argument %s, erwarte --"
#: git-send-email.perl:138
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr ""
"lokale Zeitzone unterscheidet sich von GMT nicht um ein Minutenintervall\n"
#: git-send-email.perl:145 git-send-email.perl:151
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "lokaler Zeit-Offset größer oder gleich 24 Stunden\n"
#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr "Der Editor wurde unsauber beendet, breche alles ab."
#: git-send-email.perl:312
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
"'%s' enthält eine Zwischenversion der E-Mail, die Sie gerade verfassen.\n"
#: git-send-email.perl:317
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' enthält die verfasste E-Mail.\n"
#: git-send-email.perl:410
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases ist mit anderen Optionen inkompatibel\n"
#: 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 ""
"fatal: Konfigurations-Optionen für 'sendmail' gefunden\n"
"git-send-email wird über die Optionen sendemail.* konfiguriert - beachten "
"Sie das 'e'.\n"
"Setzen Sie sendemail.forbidSendmailVariables auf 'false', um diese Prüfung "
"zu deaktivieren.\n"
#: git-send-email.perl:489 git-send-email.perl:691
msgid "Cannot run git format-patch from outside a repository\n"
msgstr ""
"Kann 'git format-patch' nicht außerhalb eines Repositories ausführen.\n"
#: git-send-email.perl:492
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr ""
"'batch-size' und 'relogin' müssen gemeinsam angegeben werden (über "
"Kommandozeile\n"
"oder Konfigurationsoption)\n"
#: git-send-email.perl:505
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Unbekanntes --suppress-cc Feld: '%s'\n"
#: git-send-email.perl:536
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Unbekannte --confirm Einstellung: '%s'\n"
#: git-send-email.perl:564
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
"Warnung: sendemail-Alias mit Anführungszeichen wird nicht unterstützt: %s\n"
#: git-send-email.perl:566
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "Warnung: `:include:` wird nicht unterstützt: %s\n"
#: git-send-email.perl:568
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "Warnung: `/file` oder `|pipe` Umleitung wird nicht unterstützt: %s\n"
#: git-send-email.perl:573
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "Warnung: sendmail Zeile wird nicht erkannt: %s\n"
#: git-send-email.perl:657
#, 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 ""
"Datei '%s' existiert, aber es könnte auch der Bereich von Commits sein,\n"
"für den Patches erzeugt werden sollen. Bitte machen Sie dies eindeutig\n"
"indem Sie ...\n"
"\n"
" * \"./%s\" angeben, wenn Sie eine Datei meinen, oder\n"
" * die Option --format-patch angeben, wenn Sie einen Commit-Bereich "
"meinen\n"
#: git-send-email.perl:678
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Fehler beim Öffnen von %s: %s"
#: git-send-email.perl:702
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr ""
"fatal: %s: %s\n"
"Warnung: Es wurden keine Patches versendet.\n"
#: git-send-email.perl:713
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr ""
"\n"
"keine Patch-Dateien angegeben!\n"
"\n"
#: git-send-email.perl:726
#, perl-format
msgid "No subject line in %s?"
msgstr "Keine Betreffzeile in %s?"
#: git-send-email.perl:736
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Fehler beim Öffnen von '%s' zum Schreiben: %s"
#: git-send-email.perl:747
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 ""
"Zeilen, die mit \"GIT:\" beginnen, werden entfernt.\n"
"Ziehen Sie in Betracht, einen allgemeinen \"diffstat\" oder ein\n"
"Inhaltsverzeichnis, für den Patch den Sie schreiben, hinzuzufügen.\n"
"\n"
"Leeren Sie den Inhalt des Bodys, wenn Sie keine Zusammenfassung senden "
"möchten.\n"
#: git-send-email.perl:771
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Fehler beim Öffnen von %s: %s"
#: git-send-email.perl:788
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Fehler beim Öffnen von %s.final: %s"
#: git-send-email.perl:831
msgid "Summary email is empty, skipping it\n"
msgstr "E-Mail mit Zusammenfassung ist leer, wird ausgelassen\n"
#. TRANSLATORS: please keep [y/N] as is.
#: git-send-email.perl:866
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Sind Sie sich sicher, <%s> zu benutzen [y/N]? "
#: git-send-email.perl:921
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
"Die folgenden Dateien sind 8-Bit, aber deklarieren kein\n"
"Content-Transfer-Encoding.\n"
#: git-send-email.perl:926
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Welches 8-Bit-Encoding soll deklariert werden [UTF-8]? "
#: git-send-email.perl:934
#, 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 ""
"Versand zurückgewiesen, weil der Patch\n"
"\t%s\n"
"die Betreffzeilenvorlage '*** SUBJECT HERE ***' enthält. Geben Sie --force "
"an,\n"
"wenn Sie den Patch wirklich versenden wollen.\n"
#: git-send-email.perl:953
msgid "To whom should the emails be sent (if anyone)?"
msgstr "An wen sollen die E-Mails versendet werden (wenn überhaupt jemand)?"
#: git-send-email.perl:971
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal: Alias '%s' erweitert sich zu sich selbst\n"
#: git-send-email.perl:983
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Message-ID zur Verwendung als In-Reply-To für die erste E-Mail (wenn eine "
"existiert)? "
#: git-send-email.perl:1041 git-send-email.perl:1049
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "Fehler: konnte keine gültige Adresse aus %s extrahieren\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
#: git-send-email.perl:1053
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
"Was soll mit dieser Adresse geschehen? (Beenden [q]|Löschen [d]|Bearbeiten "
"[e]): "
#: git-send-email.perl:1370
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA Pfad \"%s\" existiert nicht"
#: git-send-email.perl:1453
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 ""
" Die Cc-Liste oberhalb wurde um zusätzliche Adressen erweitert, die in "
"der\n"
" Commit-Beschreibung des Patches gefunden wurden. Wenn dies passiert, "
"werden\n"
" Sie von send-email zu einer Eingabe aufgefordert. Dieses Verhalten wird\n"
" durch die Konfigurationseinstellung sendemail.confirm gesteuert.\n"
"\n"
" Für weitere Informationen, führen Sie 'git send-email --help' aus.\n"
" Um das aktuelle Verhalten beizubehalten, aber diese Meldung zu "
"unterdrücken,\n"
" führen Sie 'git config --global sendemail.confirm auto' aus.\n"
"\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
#: git-send-email.perl:1468
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
"Diese E-Mail versenden? (Ja [y]|Nein [n]|Bearbeiten [e]|Beenden [q]|Alle "
"[a]): "
#: git-send-email.perl:1471
msgid "Send this email reply required"
msgstr "Zum Versenden dieser E-Mail ist eine Antwort erforderlich."
#: git-send-email.perl:1499
msgid "The required SMTP server is not properly defined."
msgstr "Der erforderliche SMTP-Server ist nicht korrekt definiert."
#: git-send-email.perl:1546
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Server unterstützt kein STARTTLS! %s"
#: git-send-email.perl:1551 git-send-email.perl:1555
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS fehlgeschlagen! %s"
#: git-send-email.perl:1564
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Konnte SMTP nicht korrekt initialisieren. Bitte prüfen Sie Ihre "
"Konfiguration\n"
"und benutzen Sie --smtp-debug."
#: git-send-email.perl:1582
#, perl-format
msgid "Failed to send %s\n"
msgstr "Fehler beim Senden %s\n"
#: git-send-email.perl:1585
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Probeversand %s\n"
#: git-send-email.perl:1585
#, perl-format
msgid "Sent %s\n"
msgstr "%s gesendet\n"
#: git-send-email.perl:1587
msgid "Dry-OK. Log says:\n"
msgstr "Probeversand OK. Log enthält:\n"
#: git-send-email.perl:1587
msgid "OK. Log says:\n"
msgstr "OK. Log enthält:\n"
#: git-send-email.perl:1599
msgid "Result: "
msgstr "Ergebnis: "
#: git-send-email.perl:1602
msgid "Result: OK\n"
msgstr "Ergebnis: OK\n"
#: git-send-email.perl:1620
#, perl-format
msgid "can't open file %s"
msgstr "Kann Datei %s nicht öffnen"
#: git-send-email.perl:1667 git-send-email.perl:1687
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Füge cc: hinzu: %s von Zeile '%s'\n"
#: git-send-email.perl:1673
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Füge to: hinzu: %s von Zeile '%s'\n"
#: git-send-email.perl:1730
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Füge cc: hinzu: %s von Zeile '%s'\n"
#: git-send-email.perl:1765
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Füge cc: hinzu: %s von Zeile '%s'\n"
#: git-send-email.perl:1876
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Konnte '%s' nicht ausführen"
#: git-send-email.perl:1883
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Füge %s: %s hinzu von: '%s'\n"
#: git-send-email.perl:1887
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) Fehler beim Schließen der Pipe nach '%s'"
#: git-send-email.perl:1917
msgid "cannot send message as 7bit"
msgstr "Kann Nachricht nicht als 7bit versenden."
#: git-send-email.perl:1925
msgid "invalid transfer encoding"
msgstr "Ungültiges Transfer-Encoding"
#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "konnte %s nicht öffnen: %s\n"
#: git-send-email.perl:1969
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: Patch enthält eine Zeile, die länger als 998 Zeichen ist"
#: git-send-email.perl:1986
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "Lasse %s mit Backup-Suffix '%s' aus.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
#: git-send-email.perl:1990
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Wollen Sie %s wirklich versenden? [y|N]: "