From 0f8e75abebff0877cae681a3d5ff31ac47f54220 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Sep 2026 10:34:33 -0700
Subject: [PATCH 001/247] Revert "Merge branch 'en/no-amend-during-conflicts'"

This reverts commit a334b7ec8687285c4efaaf046bd9c6ab93a20d74,
reversing changes made to cee3798cb4a54f1011ce0bcd36d47b79dafbb894,
as we found a regression and decided to give ourselves a chance to
fix it better after Git 2.56 final.

  cf. https://lore.kernel.org/git/xmqqik3vc1pc.fsf@gitster.g/
---
 Documentation/RelNotes/2.56.0.adoc |   6 --
 builtin/commit.c                   |  65 +++++----------
 sequencer.c                        |  59 +------------
 sequencer.h                        |  24 ------
 t/t3404-rebase-interactive.sh      | 128 +----------------------------
 t/t3507-cherry-pick-conflict.sh    |  22 -----
 t/t4151-am-abort.sh                |  22 -----
 wt-status.h                        |   6 +-
 8 files changed, 27 insertions(+), 305 deletions(-)

diff --git a/Documentation/RelNotes/2.56.0.adoc b/Documentation/RelNotes/2.56.0.adoc
index b2a7440c5e8f7f..2f97785f505391 100644
--- a/Documentation/RelNotes/2.56.0.adoc
+++ b/Documentation/RelNotes/2.56.0.adoc
@@ -867,12 +867,6 @@ Fixes since v2.55
    Additionally, an obsolete variable used for retired Azure Pipelines
    environments has been removed.
 
- * Teach 'am', 'revert', and 'rebase' that running 'commit --amend' or a
-   partial 'commit <paths>' makes no sense during operations that stop
-   and return control to the user to resolve conflicts left in the
-   working tree, just like 'cherry-pick' and 'merge' do.
-   (merge cc499d40e5 en/no-amend-during-conflicts later to maint).
-
  * The error path in 'git submodule--helper' has been updated to plug a
    memory leak when a repository handle could not be obtained,
    leveraging an updated idempotent repo_clear().
diff --git a/builtin/commit.c b/builtin/commit.c
index 205fbd57e37d3d..840b6b4083b945 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -515,25 +515,13 @@ static const char *prepare_index(const char **argv, const char *prefix,
 	 */
 	commit_style = COMMIT_PARTIAL;
 
-	switch (sequencer_ongoing_operation(the_repository, whence)) {
-	case ONGOING_NONE:
-		break;
-	case ONGOING_MERGE:
-		die(_("cannot do a partial commit during a merge."));
-	case ONGOING_CHERRY_PICK:
-		die(_("cannot do a partial commit during a cherry-pick."));
-	case ONGOING_REBASE_NOW_EMPTY:
-		/*
-		 * A pick that became empty is not a conflict, and creating
-		 * a new commit (partial or not) poses no problem.
-		 */
-		break;
-	case ONGOING_REVERT:
-		die(_("cannot do a partial commit during a revert."));
-	case ONGOING_AM:
-		die(_("cannot do a partial commit during an am session."));
-	case ONGOING_REBASE_CONFLICT:
-		die(_("cannot do a partial commit while resolving conflicts during a rebase."));
+	if (whence != FROM_COMMIT) {
+		if (whence == FROM_MERGE)
+			die(_("cannot do a partial commit during a merge."));
+		else if (is_from_cherry_pick(whence))
+			die(_("cannot do a partial commit during a cherry-pick."));
+		else if (is_from_rebase(whence))
+			die(_("cannot do a partial commit during a rebase."));
 	}
 
 	if (list_paths(&partial, !current_head ? NULL : "HEAD", &pathspec))
@@ -905,7 +893,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 	 */
 	else if (whence == FROM_MERGE)
 		hook_arg1 = "merge";
-	else if (is_from_cherry_pick(whence) || is_from_rebase_now_empty(whence)) {
+	else if (is_from_cherry_pick(whence) || whence == FROM_REBASE_PICK) {
 		hook_arg1 = "commit";
 		hook_arg2 = "CHERRY_PICK_HEAD";
 	}
@@ -1098,7 +1086,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 		if (amend)
 			fputs(_(empty_amend_advice), stderr);
 		else if (is_from_cherry_pick(whence) ||
-			 is_from_rebase_now_empty(whence)) {
+			 whence == FROM_REBASE_PICK) {
 			fputs(_(empty_cherry_pick_advice), stderr);
 			if (whence == FROM_CHERRY_PICK_SINGLE)
 				fputs(_(empty_cherry_pick_advice_single), stderr);
@@ -1338,30 +1326,15 @@ static int parse_and_validate_options(int argc, const char *argv[],
 		use_editor = 0;
 
 	/* Sanity check options */
-	if (amend) {
-		if (!current_head)
-			die(_("You have nothing to amend."));
-		/*
-		 * Refuse to amend in the middle of any operation that is
-		 * meant to record its result as a new commit on top of HEAD
-		 * rather than by rewriting HEAD.
-		 */
-		switch (sequencer_ongoing_operation(s->repo, whence)) {
-		case ONGOING_NONE:
-			break;
-		case ONGOING_MERGE:
+	if (amend && !current_head)
+		die(_("You have nothing to amend."));
+	if (amend && whence != FROM_COMMIT) {
+		if (whence == FROM_MERGE)
 			die(_("You are in the middle of a merge -- cannot amend."));
-		case ONGOING_CHERRY_PICK:
+		else if (is_from_cherry_pick(whence))
 			die(_("You are in the middle of a cherry-pick -- cannot amend."));
-		case ONGOING_REBASE_NOW_EMPTY:
-			die(_("The now-empty commit has been dropped -- cannot amend."));
-		case ONGOING_REVERT:
-			die(_("You are in the middle of a revert -- cannot amend."));
-		case ONGOING_AM:
-			die(_("You are in the middle of an am session -- cannot amend."));
-		case ONGOING_REBASE_CONFLICT:
-			die(_("You are resolving conflicts during a rebase -- cannot amend."));
-		}
+		else if (whence == FROM_REBASE_PICK)
+			die(_("You are in the middle of a rebase -- cannot amend."));
 	}
 	if (fixup_message && squash_message)
 		die(_("options '%s' and '%s' cannot be used together"), "--squash", "--fixup");
@@ -1380,7 +1353,7 @@ static int parse_and_validate_options(int argc, const char *argv[],
 	if (amend && !use_message && !fixup_message)
 		use_message = "HEAD";
 	if (!use_message && !is_from_cherry_pick(whence) &&
-	    !is_from_rebase_now_empty(whence) && renew_authorship)
+	    !is_from_rebase(whence) && renew_authorship)
 		die(_("--reset-author can be used only with -C, -c or --amend."));
 	if (use_message) {
 		use_message_buffer = read_commit_message(use_message);
@@ -1389,7 +1362,7 @@ static int parse_and_validate_options(int argc, const char *argv[],
 			author_message_buffer = use_message_buffer;
 		}
 	}
-	if ((is_from_cherry_pick(whence) || is_from_rebase_now_empty(whence)) &&
+	if ((is_from_cherry_pick(whence) || whence == FROM_REBASE_PICK) &&
 	    !renew_authorship) {
 		author_message = "CHERRY_PICK_HEAD";
 		author_message_buffer = read_commit_message(author_message);
@@ -1914,7 +1887,7 @@ int cmd_commit(int argc,
 		if (!reflog_msg)
 			reflog_msg = is_from_cherry_pick(whence)
 					? "commit (cherry-pick)"
-					: is_from_rebase_now_empty(whence)
+					: is_from_rebase(whence)
 					? "commit (rebase)"
 					: "commit";
 		commit_list_insert(current_head, &parents);
diff --git a/sequencer.c b/sequencer.c
index e25ef5eb61f9e9..6dae43e4db92ae 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -143,13 +143,6 @@ static GIT_PATH_FUNC(rebase_path_author_script, "rebase-merge/author-script")
  * command is processed, this file is deleted.
  */
 static GIT_PATH_FUNC(rebase_path_amend, "rebase-merge/amend")
-/*
- * The apply ("am") backend keeps its state in the rebase-apply directory;
- * the "applying" file within it marks a plain `git am` (as opposed to an
- * apply-based rebase).
- */
-static GIT_PATH_FUNC(apply_dir, "rebase-apply")
-static GIT_PATH_FUNC(apply_path_applying, "rebase-apply/applying")
 /*
  * When we stop at a given patch via the "edit" command, this file contains
  * the commit object name of the corresponding patch.
@@ -6994,7 +6987,7 @@ int sequencer_determine_whence(struct repository *r, enum commit_whence *whence)
 		    !repo_get_oid(r, "REBASE_HEAD", &rebase_head) &&
 		    !repo_get_oid(r, "CHERRY_PICK_HEAD", &cherry_pick_head) &&
 		    oideq(&rebase_head, &cherry_pick_head))
-			*whence = FROM_REBASE_NOW_EMPTY;
+			*whence = FROM_REBASE_PICK;
 		else
 			*whence = FROM_CHERRY_PICK_SINGLE;
 
@@ -7004,56 +6997,6 @@ int sequencer_determine_whence(struct repository *r, enum commit_whence *whence)
 	return 0;
 }
 
-enum ongoing_operation sequencer_ongoing_operation(struct repository *r,
-						   enum commit_whence whence)
-{
-	/*
-	 * The merge, cherry-pick, and (empty) rebase-pick stops are already
-	 * distinguished by 'whence'.
-	 */
-	switch (whence) {
-	case FROM_MERGE:
-		return ONGOING_MERGE;
-	case FROM_CHERRY_PICK_SINGLE:
-	case FROM_CHERRY_PICK_MULTI:
-		return ONGOING_CHERRY_PICK;
-	case FROM_REBASE_NOW_EMPTY:
-		return ONGOING_REBASE_NOW_EMPTY;
-	case FROM_COMMIT:
-		break;
-	}
-
-	/*
-	 * 'whence' is FROM_COMMIT, but we may still be in the middle of an
-	 * operation that records its result on top of HEAD; detect those
-	 * from their on-disk state.
-	 */
-
-	/* In the middle of a revert? */
-	if (refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD"))
-		return ONGOING_REVERT;
-
-	/* In the middle of an `am`? */
-	if (file_exists(apply_path_applying()))
-		return ONGOING_AM;
-
-	/*
-	 * In the middle of a rebase that stopped for conflict resolution?
-	 * The apply backend only ever stops for conflicts, so the presence
-	 * of its state directory is enough.  The merge backend writes
-	 * stopped-sha whenever it hands control back to the user, but omits
-	 * `amend` unless it stopped with HEAD already pointing at the commit
-	 * to be amended (a clean edit/reword stop); its absence therefore
-	 * marks a conflicted stop.
-	 */
-	if (file_exists(apply_dir()) ||
-	    (file_exists(rebase_path_stopped_sha()) &&
-	     !file_exists(rebase_path_amend())))
-		return ONGOING_REBASE_CONFLICT;
-
-	return ONGOING_NONE;
-}
-
 int sequencer_get_update_refs_state(const char *wt_dir,
 				    struct string_list *refs)
 {
diff --git a/sequencer.h b/sequencer.h
index df9d0d189f921a..804501b64c2622 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -282,30 +282,6 @@ int sequencer_get_last_command(struct repository* r,
 			       enum replay_action *action);
 int sequencer_determine_whence(struct repository *r, enum commit_whence *whence);
 
-/*
- * An in-progress operation that records its result (often a conflict
- * resolution) as a new commit on top of HEAD.  Some ways of invoking
- * "git commit" -- amending HEAD, or a partial commit -- are almost
- * always a mistake during such an operation.
- */
-enum ongoing_operation {
-	ONGOING_NONE = 0,
-	ONGOING_MERGE,
-	ONGOING_CHERRY_PICK,
-	ONGOING_REBASE_NOW_EMPTY,
-	ONGOING_REVERT,
-	ONGOING_AM,
-	ONGOING_REBASE_CONFLICT
-};
-
-/*
- * Return which in-progress operation, if any, is underway; see enum
- * ongoing_operation.  'whence' is the origin already computed for the
- * pending commit.
- */
-enum ongoing_operation sequencer_ongoing_operation(struct repository *r,
-						   enum commit_whence whence);
-
 /**
  * Append the set of ref-OID pairs that are currently stored for the 'git
  * rebase --update-refs' feature if such a rebase is currently happening.
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 8c63682b7f6d29..ff11abb2f222c4 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -1858,7 +1858,7 @@ test_expect_success 'post-commit hook is called' '
 	test_cmp expect actual
 '
 
-test_expect_success 'partial commit is allowed when a rebase pick becomes empty' '
+test_expect_success 'correct error message for partial commit after empty pick' '
 	test_when_finished "git rebase --abort" &&
 	(
 		set_fake_editor &&
@@ -1867,7 +1867,8 @@ test_expect_success 'partial commit is allowed when a rebase pick becomes empty'
 		test_must_fail git rebase -i A D
 	) &&
 	echo x >file1 &&
-	git commit file1
+	test_must_fail git commit file1 2>err &&
+	test_grep "cannot do a partial commit during a rebase." err
 '
 
 test_expect_success 'correct error message for commit --amend after empty pick' '
@@ -1880,128 +1881,7 @@ test_expect_success 'correct error message for commit --amend after empty pick'
 	) &&
 	echo x>file1 &&
 	test_must_fail git commit -a --amend 2>err &&
-	test_grep "now-empty commit has been dropped -- cannot amend." err
-'
-
-test_expect_success 'commit --amend is refused at a rebase conflict stop' '
-	test_when_finished "git rebase --abort" &&
-	git checkout --detach conflict-branch &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 3" &&
-		export FAKE_LINES &&
-		test_must_fail git rebase -i A
-	) &&
-	test_path_is_file .git/rebase-merge/patch &&
-	test_path_is_missing .git/rebase-merge/amend &&
-	echo resolved >conflict &&
-	git add conflict &&
-	test_must_fail git commit --amend --no-edit 2>err &&
-	test_grep "You are resolving conflicts during a rebase -- cannot amend" err
-'
-
-test_expect_success 'commit --amend is refused when an "edit" pick conflicts' '
-	test_when_finished "git rebase --abort" &&
-	git checkout --detach conflict-branch &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 edit 3" &&
-		export FAKE_LINES &&
-		test_must_fail git rebase -i A
-	) &&
-	test_path_is_file .git/rebase-merge/patch &&
-	test_path_is_missing .git/rebase-merge/amend &&
-	echo resolved >conflict &&
-	git add conflict &&
-	test_must_fail git commit --amend --no-edit 2>err &&
-	test_grep "You are resolving conflicts during a rebase -- cannot amend" err
-'
-
-test_expect_success 'commit --amend is allowed at a rebase edit stop' '
-	test_when_finished "git rebase --abort" &&
-	git checkout --detach no-conflict-branch &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1 2 3 4" &&
-		export FAKE_LINES &&
-		git rebase -i A
-	) &&
-	test_path_is_file .git/rebase-merge/amend &&
-	echo tweak >fileJ &&
-	git add fileJ &&
-	git commit --amend --no-edit
-'
-
-test_expect_success 'commit --amend is allowed at a rebase break stop' '
-	test_when_finished "git rebase --abort" &&
-	git checkout --detach no-conflict-branch &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="break 1 2 3 4" &&
-		export FAKE_LINES &&
-		git rebase -i A
-	) &&
-	test_must_fail git rev-parse --verify REBASE_HEAD &&
-	echo tweak >fileJ &&
-	git add fileJ &&
-	git commit --amend --no-edit
-'
-
-test_expect_success 'commit --amend is refused at an apply-backend conflict stop' '
-	test_when_finished "rm -rf apply-backend" &&
-	test_create_repo apply-backend &&
-	(
-		cd apply-backend &&
-		test_commit base file &&
-		git branch -M mainline &&
-		test_commit upstream file upstream &&
-		git checkout -b side mainline~1 &&
-		test_commit conflicting file side &&
-		test_commit unrelated other &&
-		test_must_fail git rebase --apply mainline &&
-		# the apply backend only ever stops for conflicts, and
-		# leaves HEAD on the previously-applied commit
-		test_path_is_dir .git/rebase-apply &&
-		test_path_is_missing .git/rebase-apply/applying &&
-		echo resolved >file &&
-		git add file &&
-		test_must_fail git commit --amend --no-edit 2>err &&
-		test_grep "You are resolving conflicts during a rebase -- cannot amend" err
-	)
-'
-
-test_expect_success 'partial commit is refused at a rebase conflict stop' '
-	test_when_finished "git rebase --abort" &&
-	git checkout --detach conflict-branch &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 3" &&
-		export FAKE_LINES &&
-		test_must_fail git rebase -i A
-	) &&
-	echo resolved >conflict &&
-	git add conflict &&
-	test_must_fail git commit conflict 2>err &&
-	test_grep "cannot do a partial commit while resolving conflicts during a rebase." err
-'
-
-test_expect_success 'partial commit is refused at an apply-backend conflict stop' '
-	test_when_finished "rm -rf apply-backend" &&
-	test_create_repo apply-backend &&
-	(
-		cd apply-backend &&
-		test_commit base file &&
-		git branch -M mainline &&
-		test_commit upstream file upstream &&
-		git checkout -b side mainline~1 &&
-		test_commit conflicting file side &&
-		test_commit unrelated other &&
-		test_must_fail git rebase --apply mainline &&
-		echo resolved >file &&
-		git add file &&
-		test_must_fail git commit file 2>err &&
-		test_grep "cannot do a partial commit while resolving conflicts during a rebase." err
-	)
+	test_grep "middle of a rebase -- cannot amend." err
 '
 
 test_expect_success 'todo has correct onto hash' '
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index c767e4ad3d34b0..aa004d929b1840 100755
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -365,28 +365,6 @@ test_expect_success 'failed revert sets REVERT_HEAD' '
 	test_cmp_rev picked REVERT_HEAD
 '
 
-test_expect_success 'commit --amend of revert fails' '
-	pristine_detach initial &&
-
-	test_must_fail git revert picked &&
-	echo resolved >foo &&
-	git add foo &&
-	test_must_fail git commit --amend 2>err &&
-
-	test_grep "in the middle of a revert -- cannot amend." err
-'
-
-test_expect_success 'partial commit during a revert fails' '
-	pristine_detach initial &&
-
-	test_must_fail git revert picked &&
-	echo resolved >foo &&
-	git add foo &&
-	test_must_fail git commit foo 2>err &&
-
-	test_grep "cannot do a partial commit during a revert." err
-'
-
 test_expect_success 'successful revert does not set REVERT_HEAD' '
 	pristine_detach base &&
 	git revert base &&
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index c80269e015d81b..8e1ecf8a68546c 100755
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am-abort.sh
@@ -63,28 +63,6 @@ do
 
 done
 
-test_expect_success 'commit --amend during a failed am fails' '
-	git reset --hard initial &&
-	cp file-2-expect file-2 &&
-	test_must_fail git am 000[1245]-*.patch &&
-	echo resolved >file-1 &&
-	git add file-1 &&
-	test_must_fail git commit --amend 2>err &&
-	test_grep "in the middle of an am session -- cannot amend." err &&
-	git am --abort
-'
-
-test_expect_success 'partial commit during a failed am fails' '
-	git reset --hard initial &&
-	cp file-2-expect file-2 &&
-	test_must_fail git am 000[1245]-*.patch &&
-	echo resolved >file-1 &&
-	git add file-1 &&
-	test_must_fail git commit file-1 2>err &&
-	test_grep "cannot do a partial commit during an am session." err &&
-	git am --abort
-'
-
 test_expect_success 'am -3 --skip removes otherfile-4' '
 	git reset --hard initial &&
 	test_must_fail git am -3 0003-*.patch &&
diff --git a/wt-status.h b/wt-status.h
index 2143f50b49208c..e9fe32e98cc18c 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -41,7 +41,7 @@ enum commit_whence {
 	FROM_MERGE,      /* commit came from merge */
 	FROM_CHERRY_PICK_SINGLE, /* commit came from cherry-pick */
 	FROM_CHERRY_PICK_MULTI, /* commit came from a sequence of cherry-picks */
-	FROM_REBASE_NOW_EMPTY /* rebase applied a pick that became empty */
+	FROM_REBASE_PICK /* commit came from a pick/reword/edit */
 };
 
 static inline int is_from_cherry_pick(enum commit_whence whence)
@@ -50,9 +50,9 @@ static inline int is_from_cherry_pick(enum commit_whence whence)
 		whence == FROM_CHERRY_PICK_MULTI;
 }
 
-static inline int is_from_rebase_now_empty(enum commit_whence whence)
+static inline int is_from_rebase(enum commit_whence whence)
 {
-	return whence == FROM_REBASE_NOW_EMPTY;
+	return whence == FROM_REBASE_PICK;
 }
 
 struct wt_status_change_data {

From b758bc5bc4b35db0bc807d3ab33cd492e86d6b4d Mon Sep 17 00:00:00 2001
From: Jiang Xin <worldhello.net@gmail.com>
Date: Thu, 17 Sep 2026 15:21:06 +0800
Subject: [PATCH 002/247] l10n: AGENTS.md: fix counter fallbacks

Reading a counter with "cmd || echo 0" breaks whenever the command
writes output but still exits non-zero. On zero matches, "grep -c"
prints 0 and exits with status 1, so the command substitution
captured two zeros and the arithmetic that follows failed with a
syntax error instead of evaluating to 0.

Fix by ignoring the exit status with "|| true" and defaulting the
empty value with "${VAR:-0}". Apply this to ENTRY_COUNT in both
l10n_one_batch() and review_one_batch(), and to the BATCH counter
read from po/review-batch.txt, which used the same fragile fallback.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
 po/AGENTS.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/po/AGENTS.md b/po/AGENTS.md
index 94af128b46d063..e83cbe4497932d 100644
--- a/po/AGENTS.md
+++ b/po/AGENTS.md
@@ -543,9 +543,9 @@ step 8 after step 6.
        DONE_PO="po/l10n-done.po"
        rm -f "$TODO_JSON" "$TODO_PO" "$DONE_JSON" "$DONE_PO"
 
-       ENTRY_COUNT=$(grep -c '^msgid ' "$PENDING" 2>/dev/null || echo 0)
+       ENTRY_COUNT=$(grep -c '^msgid ' "$PENDING" 2>/dev/null || true)
+       ENTRY_COUNT=${ENTRY_COUNT:-0}
        ENTRY_COUNT=$((ENTRY_COUNT > 0 ? ENTRY_COUNT - 1 : 0))
-
        if test "$ENTRY_COUNT" -gt $min_batch_size
        then
            if test "$ENTRY_COUNT" -gt $((min_batch_size * 8))
@@ -772,7 +772,8 @@ already present.
            cp "$INPUT_PO" "$PENDING"
        fi
 
-       ENTRY_COUNT=$(grep -c '^msgid ' "$PENDING" 2>/dev/null || echo 0)
+       ENTRY_COUNT=$(grep -c '^msgid ' "$PENDING" 2>/dev/null || true)
+       ENTRY_COUNT=${ENTRY_COUNT:-0}
        ENTRY_COUNT=$((ENTRY_COUNT > 0 ? ENTRY_COUNT - 1 : 0))
        if test "$ENTRY_COUNT" -eq 0
        then
@@ -796,7 +797,8 @@ already present.
            NUM=$ENTRY_COUNT
        fi
 
-       BATCH=$(cat "$BATCH_FILE" 2>/dev/null || echo 0)
+       BATCH=$(cat "$BATCH_FILE" 2>/dev/null || true)
+       BATCH=${BATCH:-0}
        BATCH=$((BATCH + 1))
        echo "$BATCH" >"$BATCH_FILE"
 

From b2bc011edd388c3e2f4d7e2b22d3463315faf6d5 Mon Sep 17 00:00:00 2001
From: Jiang Xin <worldhello.net@gmail.com>
Date: Thu, 17 Sep 2026 15:58:33 +0800
Subject: [PATCH 003/247] l10n: AGENTS.md: require git-po-helper >= 0.9.1

Task 3 claimed a gettext-only fallback, but validation already needs
git-po-helper, and the awk|tac batch path fails on systems without tac.
Require the helper for Tasks 3 and 4, drop the unused msgattrib/PO
paths, and point agents at msg-select (with msgattrib still noted as an
option).

Pin to git-po-helper >= 0.9.1 to rely on new helper features: version
comparison for the minimum version check, and `git-po-helper stat -c`
used by the next commit to count PO entries.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
 po/AGENTS.md | 114 +++++++++++++++------------------------------------
 1 file changed, 34 insertions(+), 80 deletions(-)

diff --git a/po/AGENTS.md b/po/AGENTS.md
index e83cbe4497932d..c0806cf8d78e84 100644
--- a/po/AGENTS.md
+++ b/po/AGENTS.md
@@ -93,17 +93,9 @@ msgstr ""
 
 **CRITICAL**: Do **not** use `grep '^msgstr ""'` to find untranslated entries;
 multi-line `msgstr` blocks use the same opening line, so grep gives false
-positives. Use `msgattrib` (next section).
-
-
-### Locating untranslated, fuzzy, and obsolete entries
-
-Use `msgattrib` to list untranslated, fuzzy, and obsolete entries. Task 3
-(translating `po/XX.po`) uses these commands.
-
-- **Untranslated**: `msgattrib --untranslated --no-obsolete po/XX.po`
-- **Fuzzy**: `msgattrib --only-fuzzy --no-obsolete po/XX.po`
-- **Obsolete** (`#~`): `msgattrib --obsolete --no-wrap po/XX.po`
+positives. Use `git-po-helper msg-select` with `--untranslated` / `--fuzzy`
+(see Task 3), or `msgattrib` (e.g. `--untranslated`, `--only-fuzzy`,
+`--obsolete`).
 
 
 ### Translating fuzzy entries
@@ -238,8 +230,19 @@ On failure, `msgfmt` prints the line number; fix the PO at that line.
 
 [git-po-helper](https://github.com/git-l10n/git-po-helper) supports Git l10n with
 **quality checking** (git-l10n PR conventions) and **AI-assisted translation**
-(subcommands for automated workflows). Housekeeping tasks in this document use
-it when available; otherwise rely on gettext tools.
+(subcommands for automated workflows). Task 3 (translating) and Task 4
+(reviewing) **require** `git-po-helper` **>= 0.9.1**. Task 1 and Task 2 use
+`make` / gettext tooling instead.
+
+**Version check**: Before Task 3 or Task 4, run:
+
+```shell
+git-po-helper version --ge 0.9.1
+```
+
+If the command is missing or the exit status is non-zero, print the error (use
+the command's own output when available) and **refuse** the task; do not
+continue.
 
 
 #### Splitting large PO files
@@ -476,9 +479,9 @@ When asked to update `po/XX.po` (or the like):
 
 ### Task 3: Translating po/XX.po
 
-To translate `po/XX.po`, use the steps below. The script uses gettext or
-`git-po-helper` depending on what is installed; JSON export (when available)
-supports batch translation rather than per-entry work.
+To translate `po/XX.po`, use the steps below. **Require** `git-po-helper` (see
+"Using git-po-helper" for the version check); without a passing check, refuse
+the task. Batches are GETTEXT JSON for translation.
 
 **Workflow loop**: Steps 1→2→3→4→5→6→7 form a loop. After step 6 succeeds,
 **always** go to step 7, which returns to step 1. The **only** exit to step 8
@@ -494,21 +497,9 @@ step 8 after step 6.
        test $# -ge 1 || { echo "Usage: l10n_extract_pending <po-file>" >&2; return 1; }
        PO_FILE="$1"
        PENDING="po/l10n-pending.po"
-       PENDING_FUZZY="${PENDING}.fuzzy"
-       PENDING_REFER="${PENDING}.fuzzy.reference"
-       PENDING_UNTRANS="${PENDING}.untranslated"
        rm -f "$PENDING"
 
-       if command -v git-po-helper >/dev/null 2>&1
-       then
-           git-po-helper msg-select --untranslated --fuzzy --no-obsolete -o "$PENDING" "$PO_FILE"
-       else
-           msgattrib --untranslated --no-obsolete "$PO_FILE" >"${PENDING_UNTRANS}"
-           msgattrib --only-fuzzy --no-obsolete --clear-fuzzy --empty "$PO_FILE" >"${PENDING_FUZZY}"
-           msgattrib --only-fuzzy --no-obsolete "$PO_FILE" >"${PENDING_REFER}"
-           msgcat --use-first "${PENDING_UNTRANS}" "${PENDING_FUZZY}" >"$PENDING"
-           rm -f "${PENDING_UNTRANS}" "${PENDING_FUZZY}"
-       fi
+       git-po-helper msg-select --untranslated --fuzzy --no-obsolete -o "$PENDING" "$PO_FILE"
        if test -s "$PENDING"
        then
            msgfmt --stat -o /dev/null "$PENDING" || true
@@ -528,8 +519,7 @@ step 8 after step 6.
 3. **Prepare one batch for translation**: Batching keeps each run small so the
    model can complete translation within limited context. **BEFORE translating**,
    **directly execute** the script below—it is authoritative; do not reimplement.
-   Based on which file the script produces: if `po/l10n-todo.json` exists, go to
-   step 4a; if `po/l10n-todo.po` exists, go to step 4b.
+   It writes `po/l10n-todo.json`; then go to step 4.
 
    ```shell
    l10n_one_batch () {
@@ -538,10 +528,9 @@ step 8 after step 6.
        min_batch_size=${2:-100}
        PENDING="po/l10n-pending.po"
        TODO_JSON="po/l10n-todo.json"
-       TODO_PO="po/l10n-todo.po"
        DONE_JSON="po/l10n-done.json"
        DONE_PO="po/l10n-done.po"
-       rm -f "$TODO_JSON" "$TODO_PO" "$DONE_JSON" "$DONE_PO"
+       rm -f "$TODO_JSON" "$DONE_JSON" "$DONE_PO"
 
        ENTRY_COUNT=$(grep -c '^msgid ' "$PENDING" 2>/dev/null || true)
        ENTRY_COUNT=${ENTRY_COUNT:-0}
@@ -557,39 +546,18 @@ step 8 after step 6.
            else
                NUM=$min_batch_size
            fi
-           BATCHING=1
+           git-po-helper msg-select --json --head "$NUM" -o "$TODO_JSON" "$PENDING"
+           echo "Processing batch of $NUM entries (out of $ENTRY_COUNT remaining)"
        else
-           NUM=$ENTRY_COUNT
-           BATCHING=
-       fi
-
-       if command -v git-po-helper >/dev/null 2>&1
-       then
-           if test -n "$BATCHING"
-           then
-               git-po-helper msg-select --json --head "$NUM" -o "$TODO_JSON" "$PENDING"
-               echo "Processing batch of $NUM entries (out of $ENTRY_COUNT remaining)"
-           else
-               git-po-helper msg-select --json -o "$TODO_JSON" "$PENDING"
-               echo "Processing all $ENTRY_COUNT entries at once"
-           fi
-       else
-           if test -n "$BATCHING"
-           then
-               awk -v num="$NUM" '/^msgid / && count++ > num {exit} 1' "$PENDING" |
-                   tac | awk '/^$/ {found=1} found' | tac >"$TODO_PO"
-               echo "Processing batch of $NUM entries (out of $ENTRY_COUNT remaining)"
-           else
-               cp "$PENDING" "$TODO_PO"
-               echo "Processing all $ENTRY_COUNT entries at once"
-           fi
+           git-po-helper msg-select --json -o "$TODO_JSON" "$PENDING"
+           echo "Processing all $ENTRY_COUNT entries at once"
        fi
    }
    # Prepare one batch; shrink 2nd arg when batches exceed agent capacity.
    l10n_one_batch po/XX.po 100
    ```
 
-4a. **Translate JSON batch** (`po/l10n-todo.json` → `po/l10n-done.json`):
+4. **Translate JSON batch** (`po/l10n-todo.json` → `po/l10n-done.json`):
 
    - **Task**: Translate `po/l10n-todo.json` (input, GETTEXT JSON) into
      `po/l10n-done.json` (output, GETTEXT JSON). See the "GETTEXT JSON format"
@@ -604,18 +572,6 @@ step 8 after step 6.
      (for plural entries); clear the fuzzy flag (omit or set `fuzzy` to `false`).
      Do **not** modify `msgid` or `msgid_plural`.
 
-4b. **Translate PO batch** (`po/l10n-todo.po` → `po/l10n-done.po`):
-
-   - **Task**: Translate `po/l10n-todo.po` (input, GETTEXT PO) into
-     `po/l10n-done.po` (output, GETTEXT PO).
-   - **Reference glossary**: Read the glossary from the pending file header
-     (see "Glossary Section" above) and use it for consistent terminology.
-   - **When translating**: Follow the "Quality checklist" above for correctness
-     and quality. Preserve escape sequences (`\n`, `\"`, `\\`, `\t`), placeholders,
-     and quotes as in `msgid`. Modify `msgstr` and `msgstr[n]` (for plural
-     entries); remove the `#, fuzzy` tag from comments when done. Do **not**
-     modify `msgid` or `msgid_plural`.
-
 5. **Validate `po/l10n-done.po`**:
 
    Run the validation script below. If it fails, fix per the errors and notes,
@@ -685,10 +641,7 @@ step 8 after step 6.
        DONE_PO="po/l10n-done.po"
        DONE_JSON="po/l10n-done.json"
        MERGED="po/l10n-done.merged"
-       PENDING="po/l10n-pending.po"
-       PENDING_REFER="${PENDING}.fuzzy.reference"
        TODO_JSON="po/l10n-todo.json"
-       TODO_PO="po/l10n-todo.po"
        if test -f "$DONE_JSON" && { ! test -f "$DONE_PO" || test "$DONE_JSON" -nt "$DONE_PO"; }
        then
            git-po-helper msg-cat --unset-fuzzy -o "$DONE_PO" "$DONE_JSON" || {
@@ -701,7 +654,7 @@ step 8 after step 6.
            return 1
        }
        mv "$MERGED" "$PO_FILE"
-       rm -f "$TODO_JSON" "$TODO_PO" "$DONE_JSON" "$DONE_PO" "$PENDING_REFER"
+       rm -f "$TODO_JSON" "$DONE_JSON" "$DONE_PO"
    }
    # Run the merge. Example: l10n_merge_batch po/zh_CN.po
    l10n_merge_batch po/XX.po
@@ -726,11 +679,12 @@ commit. When asked to review, follow the steps below.
 
 **Workflow**: Follow steps in order. Do **NOT** use `git show`, `git diff`,
 `git format-patch`, or similar to get changes—they break PO context; use **only**
-`git-po-helper compare` for extraction. Without `git-po-helper`, refuse the task.
-Steps 3→4→5→6→7 loop: after step 6, **always** go to step 7 (back to step 3).
-The **only** ways to step 8 are when step 4 finds `po/review-todo.json` missing
-or empty (no batch left to review), or when step 1 finds `po/review-result.json`
-already present.
+`git-po-helper compare` for extraction. **Require** `git-po-helper` (see
+"Using git-po-helper" for the version check); without a passing check, refuse
+the task. Steps 3→4→5→6→7 loop: after step 6, **always** go to step 7 (back to
+step 3). The **only** ways to step 8 are when step 4 finds `po/review-todo.json`
+missing or empty (no batch left to review), or when step 1 finds
+`po/review-result.json` already present.
 
 1. **Check for existing review (resume support)**: Evaluate the following in order:
 

From 312e271fcb8c109d74d1efe627655995b33ca46c Mon Sep 17 00:00:00 2001
From: Jiang Xin <worldhello.net@gmail.com>
Date: Thu, 17 Sep 2026 16:33:23 +0800
Subject: [PATCH 004/247] l10n: AGENTS.md: count PO entries with git-po-helper
 stat -c

grep -c on msgid lines only works for PO text, not GETTEXT JSON. When
workflow intermediates move from PO to JSON, that count breaks. Use
stat -c instead; it also excludes the header, so ENTRY_COUNT - 1 is
unnecessary.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
 po/AGENTS.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/po/AGENTS.md b/po/AGENTS.md
index c0806cf8d78e84..4cfa59182a75af 100644
--- a/po/AGENTS.md
+++ b/po/AGENTS.md
@@ -532,9 +532,8 @@ step 8 after step 6.
        DONE_PO="po/l10n-done.po"
        rm -f "$TODO_JSON" "$DONE_JSON" "$DONE_PO"
 
-       ENTRY_COUNT=$(grep -c '^msgid ' "$PENDING" 2>/dev/null || true)
+       ENTRY_COUNT=$(git-po-helper stat -c "$PENDING" 2>/dev/null || true)
        ENTRY_COUNT=${ENTRY_COUNT:-0}
-       ENTRY_COUNT=$((ENTRY_COUNT > 0 ? ENTRY_COUNT - 1 : 0))
        if test "$ENTRY_COUNT" -gt $min_batch_size
        then
            if test "$ENTRY_COUNT" -gt $((min_batch_size * 8))
@@ -726,9 +725,8 @@ missing or empty (no batch left to review), or when step 1 finds
            cp "$INPUT_PO" "$PENDING"
        fi
 
-       ENTRY_COUNT=$(grep -c '^msgid ' "$PENDING" 2>/dev/null || true)
+       ENTRY_COUNT=$(git-po-helper stat -c "$PENDING" 2>/dev/null || true)
        ENTRY_COUNT=${ENTRY_COUNT:-0}
-       ENTRY_COUNT=$((ENTRY_COUNT > 0 ? ENTRY_COUNT - 1 : 0))
        if test "$ENTRY_COUNT" -eq 0
        then
            rm -f "$TODO"

From ab902cf3aa76c3e654cb8b6bb7194e6e32197375 Mon Sep 17 00:00:00 2001
From: Jiang Xin <worldhello.net@gmail.com>
Date: Thu, 17 Sep 2026 17:45:40 +0800
Subject: [PATCH 005/247] l10n: AGENTS.md: use JSON intermediates in workflow

Make/l10n compiles every po/*.po file. The AGENTS.md workflow keeps its
intermediate files in po/, so any .po file written there can be picked
up by a normal `make` run and cause build failures. Switch the workflow
to use GETTEXT JSON for pending/input/review work files instead of PO,
and rename the remaining PO scratch file to l10n-done.po.tmp so
Make/l10n ignores it.

This only affects the helper scripts documented in po/AGENTS.md.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
 po/AGENTS.md | 87 +++++++++++++++++++++++++++-------------------------
 1 file changed, 45 insertions(+), 42 deletions(-)

diff --git a/po/AGENTS.md b/po/AGENTS.md
index 4cfa59182a75af..e0bc2ba804987b 100644
--- a/po/AGENTS.md
+++ b/po/AGENTS.md
@@ -291,10 +291,10 @@ changed entries; otherwise it contains a valid PO header.
 git-po-helper compare po/XX.po -o po/out.po
 
 # Get full context of changes in a specific commit (parent vs commit)
-git-po-helper compare --commit <commit> po/XX.po -o po/out.po
+git-po-helper compare --json --commit <commit> po/XX.po -o po/out.json
 
 # Get full context of changes since a commit (commit vs working tree)
-git-po-helper compare --since <commit> po/XX.po -o po/out.po
+git-po-helper compare --json --since <commit> po/XX.po -o po/out.json
 
 # Get full context between two commits
 git-po-helper compare -r <commit1>..<commit2> po/XX.po -o po/out.po
@@ -485,24 +485,26 @@ the task. Batches are GETTEXT JSON for translation.
 
 **Workflow loop**: Steps 1→2→3→4→5→6→7 form a loop. After step 6 succeeds,
 **always** go to step 7, which returns to step 1. The **only** exit to step 8
-is when step 2 finds `po/l10n-pending.po` empty. Do not skip step 7 or jump to
+is when step 2 finds `po/l10n-pending.json` empty. Do not skip step 7 or jump to
 step 8 after step 6.
 
 1. **Extract entries to translate**: **Directly execute** the script below—it is
-   authoritative; do not reimplement. It generates `po/l10n-pending.po` with
+   authoritative; do not reimplement. It generates `po/l10n-pending.json` with
    messages that need translation.
 
    ```shell
    l10n_extract_pending () {
        test $# -ge 1 || { echo "Usage: l10n_extract_pending <po-file>" >&2; return 1; }
        PO_FILE="$1"
-       PENDING="po/l10n-pending.po"
+       PENDING="po/l10n-pending.json"
        rm -f "$PENDING"
 
-       git-po-helper msg-select --untranslated --fuzzy --no-obsolete -o "$PENDING" "$PO_FILE"
-       if test -s "$PENDING"
+       git-po-helper msg-select --json --untranslated --fuzzy --no-obsolete -o "$PENDING" "$PO_FILE"
+       ENTRY_COUNT=$(git-po-helper stat -c "$PENDING" 2>/dev/null || true)
+       ENTRY_COUNT=${ENTRY_COUNT:-0}
+       if test "$ENTRY_COUNT" -gt 0
        then
-           msgfmt --stat -o /dev/null "$PENDING" || true
+           git-po-helper stat "$PENDING" || true
            echo "Pending file is not empty; there are still entries to translate."
        else
            echo "No entries need translation."
@@ -513,8 +515,9 @@ step 8 after step 6.
    l10n_extract_pending po/XX.po
    ```
 
-2. **Check generated file**: If `po/l10n-pending.po` is empty or does not exist,
-   translation is complete; go to step 8. Otherwise proceed to step 3.
+2. **Check generated file**: If `po/l10n-pending.json` has no content entries
+   (or does not exist), translation is complete; go to step 8. Otherwise proceed
+   to step 3.
 
 3. **Prepare one batch for translation**: Batching keeps each run small so the
    model can complete translation within limited context. **BEFORE translating**,
@@ -526,11 +529,11 @@ step 8 after step 6.
        test $# -ge 1 || { echo "Usage: l10n_one_batch <po-file> [min_batch_size]" >&2; return 1; }
        PO_FILE="$1"
        min_batch_size=${2:-100}
-       PENDING="po/l10n-pending.po"
+       PENDING="po/l10n-pending.json"
        TODO_JSON="po/l10n-todo.json"
        DONE_JSON="po/l10n-done.json"
-       DONE_PO="po/l10n-done.po"
-       rm -f "$TODO_JSON" "$DONE_JSON" "$DONE_PO"
+       DONE_PO_TMP="po/l10n-done.po.tmp"
+       rm -f "$TODO_JSON" "$DONE_JSON" "$DONE_PO_TMP"
 
        ENTRY_COUNT=$(git-po-helper stat -c "$PENDING" 2>/dev/null || true)
        ENTRY_COUNT=${ENTRY_COUNT:-0}
@@ -571,20 +574,20 @@ step 8 after step 6.
      (for plural entries); clear the fuzzy flag (omit or set `fuzzy` to `false`).
      Do **not** modify `msgid` or `msgid_plural`.
 
-5. **Validate `po/l10n-done.po`**:
+5. **Validate `po/l10n-done.po.tmp`**:
 
    Run the validation script below. If it fails, fix per the errors and notes,
    re-run until it succeeds.
 
    ```shell
    l10n_validate_done () {
-       DONE_PO="po/l10n-done.po"
+       DONE_PO_TMP="po/l10n-done.po.tmp"
        DONE_JSON="po/l10n-done.json"
-       PENDING="po/l10n-pending.po"
+       PENDING="po/l10n-pending.json"
 
-       if test -f "$DONE_JSON" && { ! test -f "$DONE_PO" || test "$DONE_JSON" -nt "$DONE_PO"; }
+       if test -f "$DONE_JSON" && { ! test -f "$DONE_PO_TMP" || test "$DONE_JSON" -nt "$DONE_PO_TMP"; }
        then
-           git-po-helper msg-cat --unset-fuzzy -o "$DONE_PO" "$DONE_JSON" || {
+           git-po-helper msg-cat --unset-fuzzy -o "$DONE_PO_TMP" "$DONE_JSON" || {
                echo "ERROR [JSON to PO conversion]: Fix $DONE_JSON and re-run." >&2
                return 1
            }
@@ -592,22 +595,22 @@ step 8 after step 6.
 
        # Check 1: msgid should not be modified
        MSGID_OUT=$(git-po-helper compare -q --msgid --assert-no-changes \
-           "$PENDING" "$DONE_PO" 2>&1)
+           "$PENDING" "$DONE_PO_TMP" 2>&1)
        MSGID_RC=$?
        if test $MSGID_RC -ne 0 || test -n "$MSGID_OUT"
        then
            echo "ERROR [msgid modified]: The following entries appeared after" >&2
-           echo "translation because msgid was altered. Fix in $DONE_PO." >&2
+           echo "translation because msgid was altered. Fix in $DONE_PO_TMP." >&2
            echo "$MSGID_OUT" >&2
            return 1
        fi
 
        # Check 2: PO format (see "Validating PO File Format" for error handling)
-       MSGFMT_OUT=$(msgfmt --check -o /dev/null "$DONE_PO" 2>&1)
+       MSGFMT_OUT=$(msgfmt --check -o /dev/null "$DONE_PO_TMP" 2>&1)
        MSGFMT_RC=$?
        if test $MSGFMT_RC -ne 0
        then
-           echo "ERROR [PO format]: Fix errors in $DONE_PO." >&2
+           echo "ERROR [PO format]: Fix errors in $DONE_PO_TMP." >&2
            echo "$MSGFMT_OUT" >&2
            return 1
        fi
@@ -617,43 +620,43 @@ step 8 after step 6.
    l10n_validate_done
    ```
 
-   If the script fails, fix **directly in `po/l10n-done.po`**. Re-run
+   If the script fails, fix **directly in `po/l10n-done.po.tmp`**. Re-run
    `l10n_validate_done` until it succeeds. Editing `po/l10n-done.json` is not
    recommended because it adds an extra JSON-to-PO conversion step. Use the
    error message to decide:
 
    - **`[msgid modified]`**: The listed entries have altered `msgid`; restore
-     them to match `po/l10n-pending.po`.
+     them to match `po/l10n-pending.json`.
    - **`[PO format]`**: `msgfmt` reports line numbers; fix the errors in place.
      See "Validating PO File Format" for common issues.
 
 
 6. **Merge translation results into `po/XX.po`**: Run the script below. If it
    fails, fix the file the error names: **`[JSON to PO conversion]`** →
-   `po/l10n-done.json`; **`[msgcat merge]`** → `po/l10n-done.po`. Re-run until
+   `po/l10n-done.json`; **`[msgcat merge]`** → `po/l10n-done.po.tmp`. Re-run until
    it succeeds.
 
    ```shell
    l10n_merge_batch () {
        test $# -ge 1 || { echo "Usage: l10n_merge_batch <po-file>" >&2; return 1; }
        PO_FILE="$1"
-       DONE_PO="po/l10n-done.po"
+       DONE_PO_TMP="po/l10n-done.po.tmp"
        DONE_JSON="po/l10n-done.json"
        MERGED="po/l10n-done.merged"
        TODO_JSON="po/l10n-todo.json"
-       if test -f "$DONE_JSON" && { ! test -f "$DONE_PO" || test "$DONE_JSON" -nt "$DONE_PO"; }
+       if test -f "$DONE_JSON" && { ! test -f "$DONE_PO_TMP" || test "$DONE_JSON" -nt "$DONE_PO_TMP"; }
        then
-           git-po-helper msg-cat --unset-fuzzy -o "$DONE_PO" "$DONE_JSON" || {
+           git-po-helper msg-cat --unset-fuzzy -o "$DONE_PO_TMP" "$DONE_JSON" || {
                echo "ERROR [JSON to PO conversion]: Fix $DONE_JSON and re-run." >&2
                return 1
            }
        fi
-       msgcat --use-first "$DONE_PO" "$PO_FILE" >"$MERGED" || {
-           echo "ERROR [msgcat merge]: Fix errors in $DONE_PO and re-run." >&2
+       msgcat --use-first "$DONE_PO_TMP" "$PO_FILE" >"$MERGED" || {
+           echo "ERROR [msgcat merge]: Fix errors in $DONE_PO_TMP and re-run." >&2
            return 1
        }
        mv "$MERGED" "$PO_FILE"
-       rm -f "$TODO_JSON" "$DONE_JSON" "$DONE_PO"
+       rm -f "$TODO_JSON" "$DONE_JSON" "$DONE_PO_TMP"
    }
    # Run the merge. Example: l10n_merge_batch po/zh_CN.po
    l10n_merge_batch po/XX.po
@@ -687,7 +690,7 @@ missing or empty (no batch left to review), or when step 1 finds
 
 1. **Check for existing review (resume support)**: Evaluate the following in order:
 
-   - If `po/review-input.po` does **not** exist, proceed to step 2 (Extract
+   - If `po/review-input.json` does **not** exist, proceed to step 2 (Extract
      entries) for a fresh start.
    - Else If `po/review-result.json` exists, go to step 8 (only after loop exits).
    - Else If `po/review-done.json` exists, go to step 6 (Rename result).
@@ -695,9 +698,9 @@ missing or empty (no batch left to review), or when step 1 finds
      batch).
    - Else go to step 3 (Prepare one batch).
 
-2. **Extract entries**: Run `git-po-helper compare` with the desired range and
-   redirect the output to `po/review-input.po`. See "Comparing PO files for
-   translation and review" under git-po-helper for options.
+2. **Extract entries**: Run `git-po-helper compare --json` with the desired range
+   and write the output to `po/review-input.json` (use `-o`). See "Comparing PO
+   files for translation and review" under git-po-helper for options.
 
 3. **Prepare one batch**: Batching keeps each run small so the model can
    complete review within limited context. **Directly execute** the script
@@ -706,23 +709,23 @@ missing or empty (no batch left to review), or when step 1 finds
    ```shell
    review_one_batch () {
        min_batch_size=${1:-100}
-       INPUT_PO="po/review-input.po"
-       PENDING="po/review-pending.po"
+       INPUT_JSON="po/review-input.json"
+       PENDING="po/review-pending.json"
        TODO="po/review-todo.json"
        DONE="po/review-done.json"
        BATCH_FILE="po/review-batch.txt"
 
-       if test ! -f "$INPUT_PO"
+       if test ! -f "$INPUT_JSON"
        then
            rm -f "$TODO"
-           echo >&2 "cannot find $INPUT_PO, nothing for review"
+           echo >&2 "cannot find $INPUT_JSON, nothing for review"
            return 1
        fi
-       if test ! -f "$PENDING" || test "$INPUT_PO" -nt "$PENDING"
+       if test ! -f "$PENDING" || test "$INPUT_JSON" -nt "$PENDING"
        then
            rm -f "$BATCH_FILE" "$TODO" "$DONE"
            rm -f po/review-result*.json
-           cp "$INPUT_PO" "$PENDING"
+           cp "$INPUT_JSON" "$PENDING"
        fi
 
        ENTRY_COUNT=$(git-po-helper stat -c "$PENDING" 2>/dev/null || true)
@@ -755,7 +758,7 @@ missing or empty (no batch left to review), or when step 1 finds
        echo "$BATCH" >"$BATCH_FILE"
 
        git-po-helper msg-select --json --head "$NUM" -o "$TODO" "$PENDING"
-       git-po-helper msg-select --since "$((NUM + 1))" -o "${PENDING}.tmp" "$PENDING"
+       git-po-helper msg-select --json --since "$((NUM + 1))" -o "${PENDING}.tmp" "$PENDING"
        mv "${PENDING}.tmp" "$PENDING"
        echo "Processing batch $BATCH ($NUM entries out of $ENTRY_COUNT)"
    }

From 54c2884e8bbeadad99fad1631bdd8787f5c4ed51 Mon Sep 17 00:00:00 2001
From: Jiang Xin <worldhello.net@gmail.com>
Date: Fri, 18 Sep 2026 09:47:07 +0800
Subject: [PATCH 006/247] l10n: AGENTS.md: zsh-safe review result cleanup

The review_one_batch() function cleans up stale po/review-result*.json
files before starting a new review. On zsh, an unmatched glob causes a
"no matches found" error and aborts the command, because NOMATCH is on
by default.

Fix by enabling null_glob locally when running under zsh. This leaves
bash and other POSIX shells unaffected, since $ZSH_VERSION is unset
there.

Only the cleanup step in review_one_batch() is changed; no other
behavior is affected.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
 po/AGENTS.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/po/AGENTS.md b/po/AGENTS.md
index e0bc2ba804987b..239ef19caa748f 100644
--- a/po/AGENTS.md
+++ b/po/AGENTS.md
@@ -723,8 +723,13 @@ missing or empty (no batch left to review), or when step 1 finds
        fi
        if test ! -f "$PENDING" || test "$INPUT_JSON" -nt "$PENDING"
        then
-           rm -f "$BATCH_FILE" "$TODO" "$DONE"
+           # zsh aborts on unmatched globs; allow empty expansion here.
+           if test -n "$ZSH_VERSION"
+           then
+               setopt local_options null_glob
+           fi
            rm -f po/review-result*.json
+           rm -f "$BATCH_FILE" "$TODO" "$DONE"
            cp "$INPUT_JSON" "$PENDING"
        fi
 

From 8f3ec9333f9acacd51f91617c8ae13487512bd72 Mon Sep 17 00:00:00 2001
From: Bagas Sanjaya <bagasdotme@gmail.com>
Date: Mon, 14 Sep 2026 15:55:00 +0700
Subject: [PATCH 007/247] l10n: po-id for 2.56

Update following components:

  * bisect.c
  * builtin/add.c
  * builtin/bisect.c
  * builtin/branch.c
  * builtin/cat-file.c
  * builtin/checkout.c
  * builtin/commit.c
  * builtin/diff.c
  * builtin/fast-export.c
  * builtin/fast-import.c
  * builtin/fetch.c
  * builtin/history.c
  * builtin/multi-pack-index.c
  * builtin/mv.c
  * builtin/push.c
  * builtin/refs.c
  * builtin/repack.c
  * builtin/replay.c
  * builtin/repo.c
  * builtin/rev-list.c
  * builtin/worktree.c
  * bundle-uri.c
  * command-list.h
  * diff.c
  * git.c
  * imap-send.c
  * list-objects-filter.c
  * merge-ort.c
  * object-file.c
  * pack-bitmap.c
  * promisor-remote.c
  * remote.c
  * replay.c
  * setup.c
  * sequencer.c
  * transport-helper.c
  * usage.c
  * git-send-email.perl

Translate following new components:

  * commit-reach.c
  * fetch-object-info.c
  * odb.c
  * odb/source-files.c
  * odb/transaction.c
  * odb/transaction.h

Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
---
 po/id.po | 1390 ++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 1079 insertions(+), 311 deletions(-)

diff --git a/po/id.po b/po/id.po
index 381db5a4bfcf43..e5316047952390 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2026-06-27 04:45+0700\n"
-"PO-Revision-Date: 2025-06-27 10:38+0700\n"
+"POT-Creation-Date: 2026-09-21 08:19+0700\n"
+"PO-Revision-Date: 2026-09-21 14:57+0700\n"
 "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n"
 "Language-Team: Indonesian\n"
 "Language: id\n"
@@ -999,9 +999,9 @@ msgstr "opsi spasi putih tidak dikenal '%s'"
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "opsi abai spasi putih tidak dikenal '%s'"
 
-#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c
-#: builtin/checkout.c builtin/clean.c builtin/clone.c builtin/commit.c
-#: builtin/describe.c builtin/diff-tree.c builtin/difftool.c
+#: apply.c archive.c builtin/add.c builtin/bisect.c builtin/branch.c
+#: builtin/checkout-index.c builtin/checkout.c builtin/clean.c builtin/clone.c
+#: builtin/commit.c builtin/describe.c builtin/diff-tree.c builtin/difftool.c
 #: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c
 #: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c
 #: builtin/merge-tree.c builtin/merge.c builtin/rebase.c builtin/repack.c
@@ -1357,7 +1357,7 @@ msgstr "%s: salah tipe"
 msgid "%s has type %o, expected %o"
 msgstr "%s bertipe %o, diharapkan %o"
 
-#: apply.c builtin/fast-import.c read-cache.c
+#: apply.c builtin/fast-import.c builtin/worktree.c read-cache.c
 #, c-format
 msgid "invalid path '%s'"
 msgstr "jalur tidak valid '%s'"
@@ -1810,7 +1810,7 @@ msgstr "titik dua hilang: '%s'"
 msgid "empty file name: '%s'"
 msgstr "nama berkas kosong: '%s'"
 
-#: archive.c
+#: archive.c builtin/fast-import.c
 msgid "fmt"
 msgstr "fmt"
 
@@ -1827,8 +1827,9 @@ msgid "prepend prefix to each pathname in the archive"
 msgstr "tambahkan prefiks di depan setiap nama jalur dalam arsip"
 
 #: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c
-#: builtin/fast-export.c builtin/gc.c builtin/grep.c builtin/hash-object.c
-#: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h
+#: builtin/fast-export.c builtin/fast-import.c builtin/gc.c builtin/grep.c
+#: builtin/hash-object.c builtin/ls-files.c builtin/notes.c builtin/read-tree.c
+#: parse-options.h
 msgid "file"
 msgstr "berkas"
 
@@ -2067,6 +2068,16 @@ msgstr "tidak dapat memulai 'show' untuk objek '%s'"
 msgid "could not read file '%s'"
 msgstr "tidak dapat membaca berkas '%s'"
 
+#: bisect.c
+#, c-format
+msgid "could not read bad term from file '%s'"
+msgstr "tidak dapat membaca istilah jelek dari berkas '%s'"
+
+#: bisect.c
+#, c-format
+msgid "could not read good term from file '%s'"
+msgstr "tidak dapat membaca istilah bagus dari berkas '%s'"
+
 #: bisect.c
 msgid "reading bisect refs failed"
 msgstr "gagal membaca berkas referensi bagi dua"
@@ -2338,7 +2349,7 @@ msgstr "tidak dapat chmod %cx '%s'"
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Perubahan tak tergelar setelah menyegarkan indeks:"
 
-#: builtin/add.c
+#: builtin/add.c builtin/repack.c
 msgid "could not read the index"
 msgstr "tidak dapat membaca indeks"
 
@@ -2355,6 +2366,14 @@ msgstr "tidak dapat men-stat '%s'"
 msgid "empty patch. aborted"
 msgstr "tambalan kosong, dibatalkan"
 
+#: builtin/add.c
+msgid "could not initialize apply state"
+msgstr "tidak dapat menginisialisasi keadaan penerapan"
+
+#: builtin/add.c
+msgid "could not check apply state"
+msgstr "tidak dapat memeriksa keadaan penerapan"
+
 #: builtin/add.c
 #, c-format
 msgid "could not apply '%s'"
@@ -2405,6 +2424,10 @@ msgstr "perbarui berkas terlacak"
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "normalisasi ulang EOL berkas terlacak (menyiratkan -u)"
 
+#: builtin/add.c
+msgid "add conflict-resolved tracked files"
+msgstr "tambahkan berkas yang terlacak konflik terselesaikan"
+
 #: builtin/add.c
 msgid "record only the fact that the path will be added later"
 msgstr "rekam hanya fakta bahwa jalur akan ditambahkan nanti"
@@ -2485,6 +2508,25 @@ msgstr "Gunakan -f jika Anda benar-benar ingin menambahkannya."
 msgid "adding files failed"
 msgstr "gagal menambahkan berkas"
 
+#: builtin/add.c
+#, c-format
+msgid "updating file '%s' failed"
+msgstr "gagal memperbarui berkas '%s'"
+
+#: builtin/add.c
+#, c-format
+msgid ""
+"the following paths still have conflict markers:\n"
+"%s"
+msgstr ""
+"Jalur berikut masih ada penanda konflik:\n"
+"%s"
+
+#: builtin/add.c
+#, c-format
+msgid "cannot lstat: '%s'"
+msgstr "tidak dapat men-lstat: '%s'"
+
 #: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c
 #: builtin/stash.c
 #, c-format
@@ -2535,7 +2577,8 @@ msgstr "tindakan jelek '%s' untuk '%s'"
 msgid "invalid value for '%s': '%s'"
 msgstr "nilai tidak valid untuk '%s': '%s'"
 
-#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c trailer.c
+#: builtin/am.c builtin/bisect.c builtin/commit.c builtin/merge.c sequencer.c
+#: trailer.c
 #, c-format
 msgid "could not read '%s'"
 msgstr "tidak dapat membaca '%s'"
@@ -2873,9 +2916,10 @@ msgstr "lewatkannya melalui git-mailinfo"
 msgid "pass it through git-apply"
 msgstr "lewatkannya melalui git-apply"
 
-#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c builtin/grep.c
-#: builtin/merge.c builtin/pull.c builtin/rebase.c builtin/repack.c
-#: builtin/show-branch.c builtin/show-ref.c builtin/tag.c parse-options.h
+#: builtin/am.c builtin/commit.c builtin/fast-import.c builtin/fmt-merge-msg.c
+#: builtin/grep.c builtin/merge.c builtin/pull.c builtin/rebase.c
+#: builtin/repack.c builtin/show-branch.c builtin/show-ref.c builtin/tag.c
+#: parse-options.h
 msgid "n"
 msgstr "n"
 
@@ -3058,13 +3102,13 @@ msgstr "argumen tidak dikenal: %s"
 #: builtin/bisect.c
 msgid ""
 "git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n"
-"                 [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
-"[<pathspec>...]"
+"                 [--no-checkout] [--first-parent] [--reset-when-"
+"found[=<where>]] [<bad> [<good>...]] [--] [<pathspec>...]"
 msgstr ""
-"git bisect start [--term-(new,bad)=<istilah baru> --term-(old, "
-"good)=<istilah lama>]\n"
-"[--no-checkout] [--first-parent] [<jelek> [<bagus>...]] [--] [<spek "
-"jalur>...]"
+"git bisect start [--term-(bad|new)=<istilah baru> --term-(good|old)=<istilah "
+"lama>]\n"
+"                 [--no-checkout] [--first-parent] [--reset-when-"
+"found[=<dimana>]] [<jelek> [<bagus>...]] [--] [<spek jalur>...]"
 
 #: builtin/bisect.c
 msgid "git bisect (bad|new|<term-new>) [<rev>]"
@@ -3087,8 +3131,9 @@ msgid "git bisect replay <logfile>"
 msgstr "git bisect replay <berkas log>"
 
 #: builtin/bisect.c
-msgid "git bisect run <cmd> [<arg>...]"
-msgstr "git bisect run <perintah> [<argumen>...]"
+msgid "git bisect run [--reset-when-found[=<where>]] <cmd> [<arg>...]"
+msgstr ""
+"git bisect run [--reset-when-found[=<dimana>]] <perintah> [<argumen>...]"
 
 #: builtin/bisect.c
 #, c-format
@@ -3141,6 +3186,11 @@ msgid ""
 msgstr ""
 "tidak dapat men-checkout HEAD asli '%s'. Coba 'git bisect reset <komit>'."
 
+#: builtin/bisect.c
+#, c-format
+msgid "invalid value for '--reset-when-found': '%s'"
+msgstr "nilai tidak valid untuk '--reset-when-found': '%s'"
+
 #: builtin/bisect.c
 #, c-format
 msgid "Bad bisect_write argument: %s"
@@ -3238,6 +3288,11 @@ msgstr ""
 msgid "could not open '%s' for appending"
 msgstr "tidak dapat membuka '%s' untuk menambahkan"
 
+#: builtin/bisect.c
+#, c-format
+msgid "could not find commit for '%s'"
+msgstr "tidak dapat menemukan komit untuk '%s'"
+
 #: builtin/bisect.c
 msgid "'' is not a valid term"
 msgstr "'' bukan istilah yang valid"
@@ -3344,6 +3399,10 @@ msgstr "bisect run gagal: kode keluar %d dari %s < 0 atau >= 128"
 msgid "cannot open file '%s' for writing"
 msgstr "tidak dapat membuka berkas '%s' untuk ditulis"
 
+#: builtin/bisect.c diagnose.c
+msgid "could not duplicate stdout"
+msgstr "tidak dapat menggandakan keluaran standar"
+
 #: builtin/bisect.c
 msgid "bisect run cannot continue any more"
 msgstr "bisect run tidak dapat dilanjutkan lagi"
@@ -3589,8 +3648,12 @@ msgid "Blaming lines"
 msgstr "Menyalahkan baris"
 
 #: builtin/branch.c
-msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
-msgstr "git branch [<opsi>] [-r | -a] [--merged] [--no-merged]"
+msgid ""
+"git branch [<options>] [-r | -a] [--merged] [--no-merged] [(--forked "
+"<branch>)...]"
+msgstr ""
+"git branch [<opsi>] [-r | -a] [--merged] [--no-merged] [(--forked "
+"<cabang>)...]"
 
 #: builtin/branch.c
 msgid ""
@@ -3623,6 +3686,11 @@ msgstr "git branch [<opsi>] [-r | -a] [--points-at]"
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<opsi>] [-r | -a] [--format]"
 
+#: builtin/branch.c
+msgid ""
+"git branch [<options>] (--delete-merged <pattern>)... [<branch-pattern>...]"
+msgstr "git branch [<opsi>] (--delete-merged <pola>)... [<pola cabang>...]"
+
 #: builtin/branch.c
 #, c-format
 msgid ""
@@ -3664,11 +3732,18 @@ msgstr "pembaruan berkas konfigurasi gagal"
 msgid "cannot use -a with -d"
 msgstr "tidak dapat gunakan -a dengan -d"
 
+#: builtin/branch.c
+#, c-format
+msgid "cannot delete branch '%s' used by worktree at '%s' for bisect"
+msgstr ""
+"tidak dapat menghapus cabang '%s' yang digunakan oleh pohon kerja pada '%s' "
+"untuk pembagian dua"
+
 #: builtin/branch.c
 #, c-format
 msgid "cannot delete branch '%s' used by worktree at '%s'"
 msgstr ""
-"tidak dapat menghapus cabang '%s' yang digunakan oleh pohon kerja di '%s'"
+"tidak dapat menghapus cabang '%s' yang digunakan oleh pohon kerja pada '%s'"
 
 #: builtin/branch.c
 #, c-format
@@ -3689,6 +3764,16 @@ msgstr ""
 msgid "branch '%s' not found"
 msgstr "cabang '%s' tidak ditemukan"
 
+#: builtin/branch.c
+#, c-format
+msgid "Would delete remote-tracking branch %s (was %s).\n"
+msgstr "Akan menghapus cabang pelacak remote %s (yaitu %s).\n"
+
+#: builtin/branch.c
+#, c-format
+msgid "Would delete branch %s (was %s).\n"
+msgstr "Akan menghapus cabang %s (yaitu %s).\n"
+
 #: builtin/branch.c
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
@@ -3773,6 +3858,16 @@ msgstr "cabang berganti nama, tapi pembaruan berkas konfigurasi gagal"
 msgid "branch is copied, but update of config-file failed"
 msgstr "cabang disalin, tapi pembaruan berkas konfigurasi gagal"
 
+#: builtin/branch.c
+#, c-format
+msgid "'%s' is not a valid branch or pattern"
+msgstr "'%s' bukan nama cabang atau pola yang valid"
+
+#: builtin/branch.c
+#, c-format
+msgid "Skipping '%s' (branch.%s.deleteMerged is false)\n"
+msgstr "Lewati '%s' (branch.%s.deleteMerged false)\n"
+
 #: builtin/branch.c
 #, c-format
 msgid ""
@@ -3784,9 +3879,18 @@ msgstr ""
 "  %s\n"
 "Baris yang diawali dengan '%s' akan dicopot.\n"
 
+#: builtin/branch.c
+msgid "--set-upstream-to takes a single <remote>/<branch> argument"
+msgstr "--set-upstream-to mengambil satu argumen <remote>/<cabang>"
+
+#: builtin/branch.c
+#, c-format
+msgid "Did you mean to use: git branch --set-upstream-to=%s/%s?"
+msgstr "Mungkin maksud Anda: git branch --set-upstream-to=%s/%s?"
+
 #: builtin/branch.c
 msgid "Generic options"
-msgstr "Opsi generik"
+msgstr "Opsi umum"
 
 #: builtin/branch.c
 msgid "show hash and subject, give twice for upstream branch"
@@ -3884,6 +3988,22 @@ msgstr "buat reflog cabang"
 msgid "edit the description for the branch"
 msgstr "sunting deskripsi cabang"
 
+#: builtin/branch.c builtin/clean.c builtin/config.c builtin/describe.c
+#: builtin/grep.c builtin/log.c builtin/ls-files.c builtin/name-rev.c
+#: builtin/show-ref.c pack-refs.c ref-filter.h
+msgid "pattern"
+msgstr "pola"
+
+#: builtin/branch.c
+msgid "delete merged branches whose upstream matches <pattern> (repeatable)"
+msgstr ""
+"hapus cabang yang tergabung dengan hulu yang cocok dengan <pola> (bisa "
+"diulang)"
+
+#: builtin/branch.c
+msgid "with --delete-merged, only print which branches would be deleted"
+msgstr "dengan --delete-merged, hanya cetak cabang yang akan dihapus"
+
 #: builtin/branch.c
 msgid "force creation, move/rename, deletion"
 msgstr "paksa buat, pindah/ganti nama, hapus"
@@ -3896,6 +4016,16 @@ msgstr "cetak hanya cabang yang tergabung"
 msgid "print only branches that are not merged"
 msgstr "cetak hanya cabang yang tak tergabung"
 
+#: builtin/branch.c builtin/checkout.c builtin/clone.c builtin/remote.c
+#: builtin/replay.c builtin/submodule--helper.c builtin/worktree.c
+msgid "branch"
+msgstr "cabang"
+
+#: builtin/branch.c
+msgid "print only branches whose upstream matches <branch> (repeatable)"
+msgstr ""
+"hanya cetak cabang dengan hulu yang cocok dengan <cabang> (bisa diulang)"
+
 #: builtin/branch.c
 msgid "list branches in columns"
 msgstr "sebut cabang dalam kolom"
@@ -3929,6 +4059,10 @@ msgstr "gagal menguraikan HEAD sebagai referensi valid."
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD tidak ditemukan di bawah refs/heads!"
 
+#: builtin/branch.c
+msgid "--dry-run requires --delete-merged"
+msgstr "--dry-run butuh --delete-merged"
+
 #: builtin/branch.c
 msgid ""
 "branch with --recurse-submodules can only be used if "
@@ -4083,8 +4217,8 @@ msgstr ""
 "Anda dapat menghapus baris-baris yang Anda tidak ingin dibagi.\n"
 
 #: builtin/bugreport.c builtin/commit.c builtin/fast-export.c
-#: builtin/pack-objects.c builtin/rebase.c builtin/repack.c builtin/replay.c
-#: parse-options.h
+#: builtin/fast-import.c builtin/pack-objects.c builtin/rebase.c
+#: builtin/repack.c builtin/replay.c parse-options.h
 msgid "mode"
 msgstr "mode"
 
@@ -4170,10 +4304,6 @@ msgstr "perlihatkan meteran perkembangan"
 msgid "historical; same as --progress"
 msgstr "opsi bersejarah; sama dengan --progress"
 
-#: builtin/bundle.c
-msgid "historical; does nothing"
-msgstr "opsi bersejarah: tidak apa-apa"
-
 #: builtin/bundle.c
 msgid "specify bundle format version"
 msgstr "sebutkan versi format bundel"
@@ -4208,11 +4338,48 @@ msgstr "Membongkar bundel objek"
 msgid "cannot read object %s '%s'"
 msgstr "tidak dapat membaca objek %s '%s'"
 
+#: builtin/cat-file.c
+msgid "must supply valid remote when using remote-object-info"
+msgstr "harus suplai remote valid ketika menggunakan remote-object-info"
+
+#: builtin/cat-file.c
+#, c-format
+msgid "remote-object-info does not support short oids, %d characters required"
+msgstr "remote-object-info tidak mendukung oid pendek, %d karakter diperlukan"
+
+#: builtin/cat-file.c
+#, c-format
+msgid "not a valid object name '%s'"
+msgstr "bukan nama objek valid: '%s'"
+
+#: builtin/cat-file.c
+msgid "remote-object-info requires objects"
+msgstr "remote-object-info memerlukan objek"
+
 #: builtin/cat-file.c
 #, c-format
 msgid "mailmap: invalid boolean '%s'"
 msgstr "mailmap: boolean tidak valid '%s'"
 
+#: builtin/cat-file.c
+msgid "remote-object-info command too long"
+msgstr "perintah remote-object-info terlalu panjang"
+
+#: builtin/cat-file.c
+#, c-format
+msgid "remote-object-info: failed to parse command line: %s"
+msgstr "remote-object-info: gagal menguraikan baris perintah: %s"
+
+#: builtin/cat-file.c
+#, c-format
+msgid "remote-object-info supports at most %d objects"
+msgstr "remote-object-info mendukung paling banyak %d objek"
+
+#: builtin/cat-file.c
+#, c-format
+msgid "failed to get object info from the remote: %s"
+msgstr "gagal mendapatkan info objek dari remote: %s"
+
 #: builtin/cat-file.c
 msgid "flush is only for --buffer mode"
 msgstr "bilas hanya untuk mode --buffer"
@@ -4777,32 +4944,34 @@ msgstr "Anda berada pada cabang yang belum lahir"
 msgid "The following paths have local changes:\n"
 msgstr "Berkas berikut punya modifikasi lokal:\n"
 
-#: builtin/checkout.c
+#: builtin/checkout.c builtin/worktree.c
 #, 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' bisa jadi berkas lokal dan cabang pelacak.\n"
-"Mohon gunakan -- (dan secara opsional --no-guess) untuk disambiguasi"
+msgid "Branch name '%s' appears in multiple remotes:"
+msgstr "Nama cabang '%s' tampak di beberapa remote:"
+
+#: builtin/checkout.c builtin/worktree.c
+#, c-format
+msgid "  %s"
+msgstr "  %s"
 
 #: builtin/checkout.c
 #, c-format
 msgid ""
-"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"If you meant to check out a remote tracking branch on <remote>,\n"
 "you can do so by fully qualifying the name with the --track option:\n"
 "\n"
-"    git %s --track origin/<name>\n"
+"    git %s --track <remote>/%s\n"
 "\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\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 ""
-"Jika maksud Anda untuk meng-check out cabang pelacak remote, seperti\n"
-"'origin', Anda bisa lakukan dengan kualifikasi penuh nama dengan opsi\n"
+"Jika maksud Anda untuk meng-check out cabang pelacak remote pada <remote>,\n"
+"seperti 'origin', Anda bisa lakukan dengan kualifikasi penuh nama dengan "
+"opsi\n"
 "--track:\n"
 "\n"
-"    git %s --track origin/<nama>\n"
+"    git %s --track <remote>/%s\n"
 "\n"
 "Jika Anda ingin checkout <nama> ambigu selalu memilih satu remote,\n"
 "seperti remote 'origin', pertimbangkan untuk menyetel\n"
@@ -4810,6 +4979,15 @@ msgstr ""
 
 #: builtin/checkout.c
 #, 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' bisa jadi berkas lokal dan cabang pelacak.\n"
+"Mohon gunakan -- (dan secara opsional --no-guess) untuk disambiguasi"
+
+#: builtin/checkout.c builtin/worktree.c
+#, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "'%s' cocok dengan banyak (%d) cabang pelacak remote"
 
@@ -5052,11 +5230,6 @@ msgstr ""
 msgid "you must specify path(s) to restore"
 msgstr "Anda harus sebutkan jalur untuk dipulihkan"
 
-#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c
-#: builtin/submodule--helper.c builtin/worktree.c
-msgid "branch"
-msgstr "cabang"
-
 #: builtin/checkout.c
 msgid "create and checkout a new branch"
 msgstr "buat dan checkout cabang baru"
@@ -5262,12 +5435,6 @@ msgstr "pembersihan interaktif"
 msgid "remove whole directories"
 msgstr "hapus keseluruhan direktori"
 
-#: builtin/clean.c builtin/config.c builtin/describe.c builtin/grep.c
-#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c
-#: pack-refs.c ref-filter.h
-msgid "pattern"
-msgstr "pola"
-
 #: builtin/clean.c
 msgid "add <pattern> to ignore rules"
 msgstr "tambahkan <pola> ke aturan pengabaian"
@@ -6031,8 +6198,18 @@ msgid "cannot do a partial commit during a cherry-pick."
 msgstr "tidak dapat melakukan komit sebagian selama pemetikan ceri."
 
 #: builtin/commit.c
-msgid "cannot do a partial commit during a rebase."
-msgstr "tidak dapat melakukan komit sebagian selama pendasaran ulang."
+msgid "cannot do a partial commit during a revert."
+msgstr "tidak dapat melakukan komit sebagian selama pembalikan."
+
+#: builtin/commit.c
+msgid "cannot do a partial commit during an am session."
+msgstr "tidak dapat melakukan komit sebagian dalam sesi am."
+
+#: builtin/commit.c
+msgid "cannot do a partial commit while resolving conflicts during a rebase."
+msgstr ""
+"tidak dapat melakukan komit sebagian ketika menyelesaikan konflik di tengah "
+"pendasaran ulang."
 
 #: builtin/commit.c
 msgid "cannot read the index"
@@ -6256,8 +6433,22 @@ msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Anda berada di tengah pemetikan ceri -- tidak dapat mengubah."
 
 #: builtin/commit.c
-msgid "You are in the middle of a rebase -- cannot amend."
-msgstr "Anda berada di tengah pendasaran ulang -- tidak dapat mengubah."
+msgid "The now-empty commit has been dropped -- cannot amend."
+msgstr "Komit yang tak kosong telah dijatuhkan -- tidak dapat mengubah."
+
+#: builtin/commit.c
+msgid "You are in the middle of a revert -- cannot amend."
+msgstr "Anda berada di tengah pembalikan -- tidak dapat mengubah."
+
+#: builtin/commit.c
+msgid "You are in the middle of an am session -- cannot amend."
+msgstr "Anda berada di tengah sesi am -- tidak dapat mengubah."
+
+#: builtin/commit.c
+msgid "You are resolving conflicts during a rebase -- cannot amend."
+msgstr ""
+"Anda sedang menyelesaikan konflik di tengah pendasaran ulang -- tidak dapat "
+"mengubah."
 
 #: builtin/commit.c
 msgid "--reset-author can be used only with -C, -c or --amend."
@@ -7345,6 +7536,11 @@ msgstr "bukan repositori git"
 msgid "invalid object '%s' given."
 msgstr "objek yang diberikan '%s' tidak valid"
 
+#: builtin/diff.c
+#, c-format
+msgid "unable to read tree object for commit '%s'"
+msgstr "tidak dapat membaca objek pohon untuk komit '%s'"
+
 #: builtin/diff.c
 #, c-format
 msgid "more than two blobs given: '%s'"
@@ -7472,8 +7668,8 @@ msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "tidak ada <perintah> yang diberikan untuk --extcmd=<perintah>"
 
 #: builtin/fast-export.c
-msgid "git fast-export [<rev-list-opts>]"
-msgstr "git fast-export [<opsi rev-list>]"
+msgid "git fast-export [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git fast-export [<opsi>] [<rentang revisi>] [[--] <jalur>...]"
 
 #: builtin/fast-export.c
 #, c-format
@@ -8302,6 +8498,10 @@ msgstr "--cat-blob-fd tidak dapat melebihi %d"
 msgid "expected format name:filename for submodule rewrite option"
 msgstr "format nama:nama berkas diharapkan untuk opsi penulisan ulang submodul"
 
+#: builtin/fast-import.c
+msgid "--max-pack-size: argument must be a non-negative integer"
+msgstr "--max-pack-size: argumen harus bilangan bulat non negatif"
+
 #: builtin/fast-import.c
 #, c-format
 msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum"
@@ -8311,6 +8511,10 @@ msgstr "max-pack-size sekarang dalam bita, asumsikan --max-pack-size=%lum"
 msgid "minimum max-pack-size is 1 MiB"
 msgstr "max-pack-size minimal adalah 1 MiB"
 
+#: builtin/fast-import.c
+msgid "--big-file-threshold: argument must be a non-negative integer"
+msgstr "--big-file-threshold: argumen harus bilangan bulat non negatif"
+
 #: builtin/fast-import.c
 #, c-format
 msgid "unknown --signed-commits mode '%s'"
@@ -8346,15 +8550,119 @@ msgstr "dapat perintah opsi '%s' setelah perintah data"
 msgid "this version of fast-import does not support option: %s"
 msgstr "versi fast-import ini tidak mendukung opsi: %s"
 
-#: builtin/fast-import.c builtin/merge-recursive.c
-#, c-format
-msgid "unknown option %s"
-msgstr "opsi tidak dikenal %s"
+#: builtin/fast-import.c
+msgid "git fast-import [<options>]"
+msgstr "git fast-import [<opsi>]"
 
 #: builtin/fast-import.c
-#, c-format
-msgid "unknown option --%s"
-msgstr "opsi tidak dikenal --%s"
+msgid "Common"
+msgstr "Umum"
+
+#: builtin/fast-import.c
+msgid "format of the commit/tag dates"
+msgstr "format tanggal komit/tag"
+
+#: builtin/fast-import.c
+msgid "display some basic statistics (objects, packfiles and memory)"
+msgstr "perlihatkan beberapa statistik dasar (objek, berkas pak, dan memori)"
+
+#: builtin/fast-import.c
+msgid "disable the output shown by --stats"
+msgstr "matikan keluarang yang diperlihatkan oleh --stats"
+
+#: builtin/fast-import.c
+msgid "force updating modified existing branches"
+msgstr "paksa perbarui cabang yang sudah ada yang diubah"
+
+#: builtin/fast-import.c
+msgid "require a terminating 'done' command"
+msgstr "butuh perintah pengakhir 'done'"
+
+#: builtin/fast-import.c builtin/pack-objects.c
+msgid "maximum size of each output pack file"
+msgstr "ukuran maksimum dari setiap keluaran berkas pak"
+
+#: builtin/fast-import.c
+msgid "maximum size of a blob that will be deltified"
+msgstr "ukuran blob maksimum yang akan dideltakan"
+
+#: builtin/fast-import.c
+msgid "maximum delta depth"
+msgstr "kedalaman delta maksimum"
+
+#: builtin/fast-import.c
+msgid "maximum number of branches to maintain active"
+msgstr "jumlah cabang maksimum yang dikelola aktif"
+
+#: builtin/fast-import.c
+msgid "Marks"
+msgstr "Tanda"
+
+#: builtin/fast-import.c
+msgid "import marks from <file>"
+msgstr "impor tanda dari <berkas>"
+
+#: builtin/fast-import.c
+msgid "import marks from <file> if it exists"
+msgstr "impor tanda dari <berkas> jika ada"
+
+#: builtin/fast-import.c
+msgid "dump marks to <file>"
+msgstr "buang tanda ke <berkas>"
+
+#: builtin/fast-import.c
+msgid "are --(import|export)-marks= paths relative to '.git/info/fast-import'?"
+msgstr ""
+"apakah jalur --(import|export)-marks= relatif terhadap '.git/info/fast-"
+"import'?"
+
+#: builtin/fast-import.c
+msgid "Submodule rewrite"
+msgstr "Tulis ulang submodul"
+
+#: builtin/fast-import.c
+msgid "name:filename"
+msgstr "nama:nama berkas"
+
+#: builtin/fast-import.c
+msgid "rewrite object IDs for submodule <name> from <filename>"
+msgstr "tulis ulang ID objek untuk submodul <nama> dari <nama berkas>"
+
+#: builtin/fast-import.c
+msgid "rewrite object IDs for submodule <name> to <filename>"
+msgstr "tulis ulang ID objek untuk submodul <nama> ke <nama berkas>"
+
+#: builtin/fast-import.c
+msgid "Signing"
+msgstr "Penandatanganan"
+
+#: builtin/fast-import.c
+msgid "how to handle signed commits"
+msgstr "bagaimana cara menangani komit bertandatangan"
+
+#: builtin/fast-import.c
+msgid "how to handle signed tags"
+msgstr "bagaimana cara menangani tag bertandatangan"
+
+#: builtin/fast-import.c
+msgid "Advanced"
+msgstr "Lanjutan"
+
+#: builtin/fast-import.c
+msgid "allow unsafe mark commands from the stream"
+msgstr "perbolehkan perintah tanda tidak aman dari arus"
+
+#: builtin/fast-import.c
+msgid "dump edge commits to <file>"
+msgstr "buang komit ujung ke <berkas>"
+
+#: builtin/fast-import.c
+msgid "fd"
+msgstr "deskriptor berkas"
+
+#: builtin/fast-import.c
+msgid "write some responses to <fd> instead of stdout"
+msgstr "tulis jawaban ke <deskriptor berkas> daripada keluaran standar"
 
 #: builtin/fast-import.c
 #, c-format
@@ -8390,6 +8698,11 @@ msgstr "git fetch --all [<opsi>]"
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel tidak dapat bernilai negatif"
 
+#: builtin/fetch.c
+#, c-format
+msgid "unrecognized fetch.followRemoteHEAD value '%s' ignored"
+msgstr "nilai fetch.followRemoteHEAD yang tak dikenal '%s' diabaikan"
+
 #: builtin/fetch.c
 msgid "couldn't find remote ref HEAD"
 msgstr "tidak dapat menemukan referensi remote HEAD"
@@ -8529,17 +8842,26 @@ msgstr "mengabaikan %s karena protokol tidak mendukungnya"
 #: builtin/fetch.c
 #, c-format
 msgid ""
-"Run 'git remote set-head %s %s' to follow the change, or set\n"
-"'remote.%s.followRemoteHEAD' configuration option to a different value\n"
-"if you do not want to see this message. Specifically running\n"
-"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"
-"will disable the warning until the remote changes HEAD to something else."
+"Run 'git remote set-head %s %s' to follow the change, or modify\n"
+"either of the 'remote.%s.followRemoteHEAD' or 'fetch.followRemoteHEAD'\n"
+"configuration variables to handle the situation differently.\n"
+"\n"
+"Using this specific setting\n"
+"\n"
+"    git config set remote.%s.followRemoteHEAD warn-if-not-%s\n"
+"\n"
+"will suppress the warning until the remote changes HEAD to something else."
 msgstr ""
 "Jalankan 'git remote set-head %s %s' untuk mengikuti perubahan, atau setel\n"
-"opsi konfigurasi 'remote.%s.followRemoteHEAD' ke nilai yang berbeda jika\n"
-"Anda tidak ingin melihat pesan ini lagi. Secara rinci menjalankan\n"
-"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s' akan\n"
-"mematikan peringatan ini sampai remote mengubah HEAD ke yang lain."
+"baik opsi konfigurasi 'remote.%s.followRemoteHEAD' atau "
+"'fetch.followRemoteHEAD'\n"
+"untuk menangani situasi secara berbeda.\n"
+"\n"
+"Menggunakan opsi berikut:\n"
+"\n"
+"    git config set remote.%s.followRemoteHEAD warn-if-not-%s\n"
+"\n"
+"akan mematikan peringatan ini sampai remote mengubah HEAD ke yang lain."
 
 #: builtin/fetch.c
 msgid ""
@@ -9057,6 +9379,11 @@ msgstr "Memeriksa %s"
 msgid "Checking connectivity (%d objects)"
 msgstr "Memerika konektivitas (%d objek)"
 
+#: builtin/fsck.c
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s: objek rusak atau hilang"
+
 #: builtin/fsck.c
 #, c-format
 msgid "Checking %s %s"
@@ -9076,11 +9403,6 @@ msgstr "akar %s"
 msgid "tagged %s %s (%s) in %s"
 msgstr "ter-tag %s %s (%s) di %s"
 
-#: builtin/fsck.c
-#, c-format
-msgid "%s: object corrupt or missing"
-msgstr "%s: objek rusak atau hilang"
-
 #: builtin/fsck.c
 #, c-format
 msgid "%s: invalid reflog entry %s"
@@ -9112,64 +9434,26 @@ msgstr "catatan: Tidak ada referensi asali"
 
 #: builtin/fsck.c
 #, c-format
-msgid "%s: hash-path mismatch, found at: %s"
-msgstr "%s: hash-jalur tidak cocok, ditemukan pada: %s"
+msgid "Checking cache tree of %s"
+msgstr "Memeriksa pohon tembolok %s"
 
 #: builtin/fsck.c
 #, c-format
-msgid "%s: object corrupt or missing: %s"
-msgstr "%s: objek rusak atau hilang: %s"
+msgid "%s: invalid sha1 pointer in cache-tree of %s"
+msgstr "%s: penunjuk sha1 tidak valid pada pohon tembolok %s"
 
 #: builtin/fsck.c
-#, c-format
-msgid "%s: object could not be parsed: %s"
-msgstr "%s: objek tidak dapat diuraikan: %s"
+msgid "non-tree in cache-tree"
+msgstr "bukan pohon pada pohon tembolok"
 
 #: builtin/fsck.c
 #, c-format
-msgid "bad sha1 file: %s"
-msgstr "sha1 berkas jelek: %s"
+msgid "%s: invalid sha1 pointer in resolve-undo of %s"
+msgstr "%s: penunjuk sha1 tidak valid di resolve-undo %s"
 
 #: builtin/fsck.c
-msgid "Checking object directory"
-msgstr "Memeriksa direktori objek"
-
-#: builtin/fsck.c
-msgid "Checking object directories"
-msgstr "Memeriksa direktori objek"
-
-#: builtin/fsck.c
-#, c-format
-msgid "Checking cache tree of %s"
-msgstr "Memeriksa pohon tembolok %s"
-
-#: builtin/fsck.c
-#, c-format
-msgid "%s: invalid sha1 pointer in cache-tree of %s"
-msgstr "%s: penunjuk sha1 tidak valid pada pohon tembolok %s"
-
-#: builtin/fsck.c
-msgid "non-tree in cache-tree"
-msgstr "bukan pohon pada pohon tembolok"
-
-#: builtin/fsck.c
-#, c-format
-msgid "%s: invalid sha1 pointer in resolve-undo of %s"
-msgstr "%s: penunjuk sha1 tidak valid di resolve-undo %s"
-
-#: builtin/fsck.c
-#, c-format
-msgid "unable to load rev-index for pack '%s'"
-msgstr "tidak dapat memuat indeks balik untuk pak '%s'"
-
-#: builtin/fsck.c
-#, c-format
-msgid "invalid rev-index for pack '%s'"
-msgstr "indeks balik tidak valid untuk pak '%s'"
-
-#: builtin/fsck.c
-msgid "Checking ref database"
-msgstr "Memeriksa basis referensi"
+msgid "Checking ref database"
+msgstr "Memeriksa basis referensi"
 
 #: builtin/fsck.c
 msgid ""
@@ -9235,10 +9519,6 @@ msgstr "perlihatkan nama lantung untuk objek yang dapat dicapai"
 msgid "check reference database consistency"
 msgstr "Memeriksa konsistensi basis data referensi"
 
-#: builtin/fsck.c builtin/index-pack.c
-msgid "Checking objects"
-msgstr "Memeriksa objek"
-
 #: builtin/fsmonitor--daemon.c
 msgid "git fsmonitor--daemon start [<options>]"
 msgstr "git fsmonitor--daemon start [<opsi>]"
@@ -9472,13 +9752,6 @@ msgid ""
 msgstr ""
 "gc sudah berjalan pada mesin '%s' pid %<PRIuMAX> (gunakan --force jika tidak)"
 
-#: builtin/gc.c
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr ""
-"Ada terlalu banyak objek longgar yang tak dapat dicapai; jalankan 'git "
-"prune' untuk menghapusnya."
-
 #: builtin/gc.c
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
@@ -9528,10 +9801,6 @@ msgid ""
 msgstr ""
 "melewatkan tugas pengepakan tambahan karena core.multiPackIndex dinonaktifkan"
 
-#: builtin/gc.c
-msgid "failed to perform geometric repack"
-msgstr "gagal melakukan pak ulang geometri"
-
 #: builtin/gc.c
 #, c-format
 msgid "task '%s' failed"
@@ -10182,6 +10451,14 @@ msgstr "penggunaan: %s%s"
 msgid "'git help config' for more information"
 msgstr "'git help config' untuk informasi lebih lanjut"
 
+#: builtin/history.c
+msgid ""
+"git history drop <commit> [--dry-run] [--update-refs=(branches|head)] [--"
+"empty=(drop|keep|abort)]"
+msgstr ""
+"git history drop <komit> [--dry-run] [--update-refs=(branches|head)] [--"
+"empty=(drop|keep|abort)]"
+
 #: builtin/history.c
 msgid ""
 "git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--"
@@ -10211,6 +10488,11 @@ msgstr ""
 "Mohon masukkan pesan komit untuk perubahan %s. Baris yang diawali\n"
 "dengan '%s' akan diabaikan, dan pesan kosong batalkan komit.\n"
 
+#: builtin/history.c editor.c sequencer.c wrapper.c
+#, c-format
+msgid "could not write to '%s'"
+msgstr "tidak dapat menulis ke '%s'"
+
 #: builtin/history.c
 #, c-format
 msgid "Aborting commit as launching the editor failed.\n"
@@ -10360,6 +10642,11 @@ msgstr "gagal memainkan ulang keturunan"
 msgid "failed writing reworded commit"
 msgstr "gagal menulis komit yang diubah kata-katanya"
 
+#: builtin/history.c
+#, c-format
+msgid "unable to parse tree %s"
+msgstr "tidak dapat menguraikan pohon %s"
+
 #: builtin/history.c
 msgid "unable to populate index with tree"
 msgstr "tidak dapat mengisi indeks dengan pohon"
@@ -10404,6 +10691,36 @@ msgstr "perintah mengharapkan sebuah mirip komit"
 msgid "cannot split up merge commit"
 msgstr "tidak dapat membagi komit penggabungan"
 
+#: builtin/history.c
+msgid "cannot resolve HEAD commit"
+msgstr "tidak dapat menguraikan komit HEAD"
+
+#: builtin/history.c
+msgid "cannot resolve tree for HEAD"
+msgstr "tidak dapat mendapatkan pohon untuk HEAD"
+
+#: builtin/history.c
+msgid "how to handle descendants that become empty"
+msgstr "bagaimana cara menangani keturunan yang menjadi kosong"
+
+#: builtin/history.c
+#, c-format
+msgid "cannot drop merge commit: %s"
+msgstr "tidak dapat menjatuhkan komit penggabungan: %s"
+
+#: builtin/history.c
+msgid "dropping this commit would overwrite local changes; aborting"
+msgstr "menjatuhkan komit ini akan menimpa perubahan loka; batalkan"
+
+#: builtin/history.c
+msgid "failed to update references"
+msgstr "gagal memperbarui referensi"
+
+#: builtin/history.c
+#, c-format
+msgid "could not update working tree to new commit %s"
+msgstr "tidak dapat memperbarui pohon kerja ke komit baru %s"
+
 #: builtin/hook.c
 msgid ""
 "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-"
@@ -10488,6 +10805,10 @@ msgstr "tidak menerima objek yang diharapkan %s"
 msgid "object %s: expected type %s, found %s"
 msgstr "objek %s: yang diharapkan %s, yang didapat %s"
 
+#: builtin/index-pack.c odb/source-packed.c
+msgid "Checking objects"
+msgstr "Memeriksa objek"
+
 #: builtin/index-pack.c
 #, c-format
 msgid "cannot fill %d byte"
@@ -11811,6 +12132,11 @@ msgstr "objek '%s' tidak ada"
 msgid "Could not write object file"
 msgstr "Tidak dapat menulis berkas objek"
 
+#: builtin/merge-recursive.c
+#, c-format
+msgid "unknown option %s"
+msgstr "opsi tidak dikenal %s"
+
 #: builtin/merge-recursive.c
 #, c-format
 msgid "could not parse object '%s'"
@@ -12358,6 +12684,11 @@ msgstr "git multi-pack-index [<opsi>] expire"
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<opsi>] repack [--batch-size=<ukuran>]"
 
+#: builtin/multi-pack-index.c
+#, c-format
+msgid "object directory is not an alternate of the current repository: '%s'"
+msgstr "direktori objek bukan alternatif dari repositori saat ini: '%s'"
+
 #: builtin/multi-pack-index.c
 msgid "directory"
 msgstr "direktori"
@@ -12518,6 +12849,14 @@ msgstr "banyak asal untuk target yang sama"
 msgid "destination directory does not exist"
 msgstr "direktori tujuan tidak ada"
 
+#: builtin/mv.c
+msgid "destination is beyond a symbolic link"
+msgstr "tujuan di luar tautan simbolik"
+
+#: builtin/mv.c
+msgid "destination is not a directory"
+msgstr "tujuan bukan direktori"
+
 #: builtin/mv.c
 msgid "destination exists in the index"
 msgstr "tujuan ada dalam indeks"
@@ -12539,8 +12878,8 @@ msgstr "Mengganti nama %s ke %s\n"
 
 #: builtin/mv.c
 #, c-format
-msgid "renaming '%s' failed"
-msgstr "gagal mengganti nama '%s'"
+msgid "renaming '%s' to '%s' failed"
+msgstr "gagal mengganti nama '%s' ke '%s'"
 
 #: builtin/name-rev.c
 msgid "git name-rev [<options>] <commit>..."
@@ -13133,7 +13472,7 @@ msgstr "Menulis objek"
 msgid "failed to stat %s"
 msgstr "gagal men-stat %s"
 
-#: builtin/pack-objects.c object-file.c
+#: builtin/pack-objects.c odb/source-loose.c
 #, c-format
 msgid "failed utime() on %s"
 msgstr "utime() gagal pada %s"
@@ -13304,10 +13643,25 @@ msgstr "tidak dapat membuka indeks pak"
 msgid "loose object at %s could not be examined"
 msgstr "objek longgar pada %s tidak dapat diperiksa"
 
+#: builtin/pack-objects.c
+#, c-format
+msgid "cannot read object for %s"
+msgstr "tidak dapat membaca objek untuk %s"
+
+#: builtin/pack-objects.c
+#, c-format
+msgid "cannot map object %s to %s"
+msgstr "tidak dapat memetakan objek %s ke %s"
+
 #: builtin/pack-objects.c
 msgid "unable to force loose object"
 msgstr "tidak dapat memaksakan objek longgar"
 
+#: builtin/pack-objects.c commit-graph.c
+#, c-format
+msgid "could not find commit %s"
+msgstr "tidak dapat menemukan komit %s"
+
 #: builtin/pack-objects.c
 #, c-format
 msgid "not a rev '%s'"
@@ -13352,10 +13706,6 @@ msgstr "<versi>[,<offset>]"
 msgid "write the pack index file in the specified idx format version"
 msgstr "tulis berkas indeks pak pada versi format indeks yang disebutkan"
 
-#: builtin/pack-objects.c
-msgid "maximum size of each output pack file"
-msgstr "ukuran maksimum dari setiap keluaran berkas pak"
-
 #: builtin/pack-objects.c
 msgid "ignore borrowed objects from alternate object store"
 msgstr "abaikan objek yang dipinjam dari penyimpanan objek alternatif"
@@ -14067,6 +14417,16 @@ msgstr "nilai tidak valid untuk '%s'"
 msgid "could not push to %s"
 msgstr "tidak dapat mendorong ke %s"
 
+#: builtin/push.c
+#, c-format
+msgid "'%s' is not a valid push target"
+msgstr "'%s' bukan istilah yang valid"
+
+#: builtin/push.c
+#, c-format
+msgid "Did you mean to use: git push %s %s?"
+msgstr "Mungkin maksud Anda: git push %s %s?"
+
 #: builtin/push.c builtin/submodule--helper.c
 msgid "repository"
 msgstr "repositori"
@@ -15030,7 +15390,7 @@ msgstr "referensi yang dirincikan bersamaan dengan --all"
 msgid "invalid reference name: %s"
 msgstr "nama referensi tidak valid: %s"
 
-#: builtin/reflog.c
+#: builtin/reflog.c builtin/refs.c
 #, c-format
 msgid "invalid old object ID: '%s'"
 msgstr "ID objek lama tidak valid: '%s'"
@@ -15040,7 +15400,7 @@ msgstr "ID objek lama tidak valid: '%s'"
 msgid "old object '%s' does not exist"
 msgstr "objek lama '%s' tidak ada"
 
-#: builtin/reflog.c
+#: builtin/reflog.c builtin/refs.c
 #, c-format
 msgid "invalid new object ID: '%s'"
 msgstr "ID objek baru tidak valid: '%s'"
@@ -15081,9 +15441,34 @@ msgstr "git refs exists <referensi>"
 msgid "git refs optimize "
 msgstr "git refs optimize "
 
+#: builtin/refs.c
+msgid ""
+"git refs create [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value>"
+msgstr ""
+"git refs create [--message=<alasan>] [--no-deref] [--create-reflog] "
+"<referensi> <nilai baru>"
+
+#: builtin/refs.c
+msgid "git refs delete [--message=<reason>] [--no-deref] <ref> [<old-value>]"
+msgstr ""
+"git refs delete [--message=<alasan> [--no-deref] <referensi> [<nilai lama>]"
+
+#: builtin/refs.c
+msgid ""
+"git refs update [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value> [<old-value>]"
+msgstr ""
+"git refs update [--message=<alasan>] [--no-deref] [--create-reflog] "
+"<referensi> <nilai baru> [<nilai lama>]"
+
+#: builtin/refs.c
+msgid "git refs rename [--message=<reason>] <old-ref> <new-ref>"
+msgstr "git refs rename [--message=<alasan>] <referensi lama> <referensi baru>"
+
 #: builtin/refs.c
 msgid "specify the reference format to convert to"
-msgstr "sebutkan format referensi untuk dikonversi"
+msgstr "rincikan format referensi untuk dikonversi"
 
 #: builtin/refs.c
 msgid "perform a non-destructive dry-run"
@@ -15126,6 +15511,70 @@ msgstr "referensi tidak ada"
 msgid "failed to look up reference"
 msgstr "gagal mencari referensi"
 
+#: builtin/refs.c builtin/symbolic-ref.c builtin/update-ref.c
+msgid "reason"
+msgstr "alasan"
+
+#: builtin/refs.c builtin/symbolic-ref.c builtin/update-ref.c
+msgid "reason of the update"
+msgstr "alasan pembaruan"
+
+#: builtin/refs.c builtin/update-ref.c
+msgid "update <refname> not the one it points to"
+msgstr "perbarui <nama referensi> bukan yang ditunjuknya"
+
+#: builtin/refs.c builtin/tag.c builtin/update-ref.c
+msgid "create a reflog"
+msgstr "buat log referensi"
+
+#: builtin/refs.c
+msgid "create requires reference name and an object ID"
+msgstr "create memerlukan nama referensi dan ID objek"
+
+#: builtin/refs.c
+msgid "refusing to perform update with empty message"
+msgstr "menolak memperbarui dengan pesan kosong"
+
+#: builtin/refs.c
+#, c-format
+msgid "invalid object ID: '%s'"
+msgstr "ID objek tidak valid: '%s'"
+
+#: builtin/refs.c
+msgid "cannot create reference with null new object ID"
+msgstr "tidak dapat membuat referensi dengan ID objek null"
+
+#: builtin/refs.c
+msgid "delete requires reference name and an optional old object ID"
+msgstr "delete memerlukan nama referensi dan ID objek lama (opsional)"
+
+#: builtin/refs.c
+msgid "cannot delete reference with null old object ID"
+msgstr "tidak dapat menghapus objek dengan ID objek lama null"
+
+#: builtin/refs.c
+msgid "update requires reference name, new value and an optional old value"
+msgstr "update memerlukan nama referensi, nilai baru dan nilai lama (opsional)"
+
+#: builtin/refs.c
+msgid "rename requires old and new reference name"
+msgstr "rename memerlukan nama referensi lama dan baru"
+
+#: builtin/refs.c
+#, c-format
+msgid "invalid ref format: '%s'"
+msgstr "format referensi tidak valid: '%s'"
+
+#: builtin/refs.c
+#, c-format
+msgid "reference does not exist: '%s'"
+msgstr "referensi tidak ada: '%s'"
+
+#: builtin/refs.c
+#, c-format
+msgid "reference already exists: '%s'"
+msgstr "referensi sudah ada: '%s'"
+
 #: builtin/remote.c
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
@@ -15712,11 +16161,13 @@ msgstr "jadi lebih bertele-tele; harus ditempatkan sebelum subperintah"
 msgid ""
 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]"
+"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]\n"
+"[--filter=<filter-spec>] [--drop-filtered [--dry-run]]"
 msgstr ""
 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<nama pak>]\n"
-"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]"
+"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]\n"
+"[--filter=<spek penyaring>] [--drop-filtered [--dry-run]]"
 
 #: builtin/repack.c
 msgid ""
@@ -15848,6 +16299,48 @@ msgstr "tulis indeks multipak dari pak yang dihasilkan"
 msgid "pack prefix to store a pack containing filtered out objects"
 msgstr "awalan pak untuk menyimpan pak berisi objek tersaring"
 
+#: builtin/repack.c
+msgid "delete filtered out objects (requires --filter)"
+msgstr "hapus objek tersaring (memerlukan --filter)"
+
+#: builtin/repack.c
+msgid "only show which objects would be dropped"
+msgstr "hanya perlihatkan objek mana yang akan dijatuhkan"
+
+#: builtin/repack.c
+msgid "--dry-run only takes effect with --drop-filtered"
+msgstr "--dry-run hanya berlaku dengan --drop-filtered"
+
+#: builtin/repack.c
+msgid "--drop-filtered requires --filter"
+msgstr "--drop-filtered memerlukan --filter"
+
+#: builtin/repack.c
+msgid "--drop-filtered requires -a"
+msgstr "--drop-filtered memerlukan -a"
+
+#: builtin/repack.c
+msgid "--drop-filtered only supports --filter=blob:limit=<n> for now"
+msgstr "--drop-filtered hanya mendukung --filter=blob:limit<n> untuk saat ini"
+
+#: builtin/repack.c
+msgid "--drop-filtered requires a promisor remote"
+msgstr "--drop-filtered butuh remote pejanji"
+
+#: builtin/repack.c
+msgid ""
+"--drop-filtered cannot be used while another operation (merge, rebase, am, "
+"cherry-pick, revert, or bisect) is in progress"
+msgstr ""
+"--drop-filtered tidak dapat digunakan ketika operasi lainnya (penggabungan, "
+"pendasaran ulang, am, petik ceri, pembalikan, atau bagi dua) sedang "
+"berlangsung"
+
+#: builtin/repack.c
+#, c-format
+msgid "cannot drop '%s' (%s): it is referenced by the current index"
+msgstr "tidak dapat menjatuhkan '%s' (%s): direferensikan oleh indeks saat ini"
+
 #: builtin/repack.c
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "tidak dapat menghapus pak dalam repositori objek berharga"
@@ -16113,11 +16606,11 @@ msgstr "nilai %s tidak valid: '%s'"
 msgid ""
 "(EXPERIMENTAL!) git replay ([--contained] --onto=<newbase> | --"
 "advance=<branch> | --revert=<branch>)\n"
-"[--ref=<ref>] [--ref-action=<mode>] <revision-range>"
+"[--ref=<ref>] [--ref-action=<mode>] [--linearize] <revision-range>"
 msgstr ""
 "(EKSPERIMENTAL!) git replay ([--contained] --onto=<dasar baru> | --"
 "advance=<cabang> | --revert=<cabang>)\n"
-"[--ref=<referensi>] [--ref-action=<mode>] <rentang revisi>"
+"[--ref=<referensi>] [--ref-action=<mode>] [--linearize] <rentang revisi>"
 
 #: builtin/replay.c
 msgid "update all branches that point at commits in <revision-range>"
@@ -16144,6 +16637,11 @@ msgstr "referensi untuk diperbarui dengan hasil"
 msgid "control ref update behavior (update|print)"
 msgstr "atur perilaku pembaruan referensi (update|print)"
 
+#: builtin/replay.c
+msgid "drop merge commits, replaying only non-merge commits"
+msgstr ""
+"jatuhkan komit penggabungan, hanya mainkan ulang komit non-penggabungan"
+
 #: builtin/replay.c
 msgid "exactly one of --onto, --advance, or --revert is required"
 msgstr ""
@@ -16158,6 +16656,14 @@ msgstr ""
 "beberapa opsi jalan revisi akan ditimpa oleh karena bit '%s' di 'struct "
 "rev_info' akan dipaksakan"
 
+#: builtin/repo.c
+msgid "unable to get common directory"
+msgstr "tidak dapat mendapatkan direktori umum"
+
+#: builtin/repo.c
+msgid "unable to get git directory"
+msgstr "tidak dapat mendapatkan direktori git"
+
 #: builtin/repo.c
 #, c-format
 msgid "key '%s' not found"
@@ -16438,6 +16944,10 @@ msgstr "Tidak dapat menulis berkas indeks baru."
 msgid "unable to get disk usage of %s"
 msgstr "tidak dapat mendapatkan penggunaan disk %s"
 
+#: builtin/rev-list.c
+msgid "--missing-only requires --missing=print or --missing=print-info"
+msgstr "--missing-only memerlukan --missing=print atau --missing=print-info"
+
 #: builtin/rev-list.c
 #, c-format
 msgid "invalid value for '%s': '%s', the only allowed format is '%s'"
@@ -18488,14 +18998,6 @@ msgstr "pendekkan keluaran referensi"
 msgid "recursively dereference (default)"
 msgstr "derefensi secara rekursif (asali)"
 
-#: builtin/symbolic-ref.c builtin/update-ref.c
-msgid "reason"
-msgstr "alasan"
-
-#: builtin/symbolic-ref.c builtin/update-ref.c
-msgid "reason of the update"
-msgstr "alasan pembaruan"
-
 #: builtin/tag.c
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
@@ -18639,10 +19141,6 @@ msgstr "gunakan kunci yang lain untuk menandatangani tag"
 msgid "replace the tag if exists"
 msgstr "ganti tag jika ada"
 
-#: builtin/tag.c builtin/update-ref.c
-msgid "create a reflog"
-msgstr "buat log referensi"
-
 #: builtin/tag.c
 msgid "Tag listing options"
 msgstr "Opsi daftar tag"
@@ -19002,10 +19500,6 @@ msgstr "git update-ref [<opsi>] --stdin [-z] [--batch-updates]"
 msgid "delete the reference"
 msgstr "hapus referensi"
 
-#: builtin/update-ref.c
-msgid "update <refname> not the one it points to"
-msgstr "perbarui <nama referensi> bukan yang ditunjuknya"
-
 #: builtin/update-ref.c
 msgid "stdin has NUL-terminated arguments"
 msgstr "stdin punya argumen yang diakhiri dengan NUL"
@@ -19264,6 +19758,26 @@ msgstr ""
 "ada, berhenti; gunakan 'add -f' untuk menimpa atau mengambil remote\n"
 "terlebih dahulu"
 
+#: builtin/worktree.c
+#, c-format
+msgid ""
+"If you meant to create a worktree from a remote tracking branch on\n"
+"<remote>, you can do so by:\n"
+"\n"
+"    git worktree add -b %s %s <remote>/%s\n"
+"\n"
+"If you'd like to always prefer some remote, e.g. 'origin',\n"
+"consider setting checkout.defaultRemote=origin in your config."
+msgstr ""
+"Jika maksud Anda untuk membuat pohon kerja dari cabang pelacak remote\n"
+"pada <remote>, Anda dapat melakukannya dengan:\n"
+"\n"
+"    git worktree add -b %s %s <remote>/%s\n"
+"\n"
+"Jika Anda ingin selalu memilih salah satu remote, seperti 'origin',\n"
+"pertimbangkan untuk menyetel checkout.defaultRemote=origin\n"
+"di konfigurasi Anda."
+
 #: builtin/worktree.c
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
@@ -19530,6 +20044,11 @@ msgstr "gagal mengunduh bundel dari URI '%s'"
 msgid "file at URI '%s' is not a bundle or bundle list"
 msgstr "berkas pada URI '%s' bukan sebuah bundel atau daftar bundel"
 
+#: bundle-uri.c
+#, c-format
+msgid "config '%s' has no value"
+msgstr "konfigurasi '%s' tidak punya nilai"
+
 #: bundle-uri.c
 #, c-format
 msgid "bundle-uri: unexpected argument: '%s'"
@@ -19999,8 +20518,8 @@ msgid "Instantly browse your working repository in gitweb"
 msgstr "Jelajahi repositori kerja Anda secara instan di gitweb"
 
 #: command-list.h
-msgid "Add or parse structured information in commit messages"
-msgstr "Tambah atau urai informasi terstruktur di dalam pesan komit"
+msgid "Add or parse metadata in commit messages"
+msgstr "Tambah atau urai metadata di dalam pesan komit"
 
 #: command-list.h
 msgid "EXPERIMENTAL: Show when files were last modified"
@@ -20371,6 +20890,10 @@ msgstr "Sediakan nama pengguna dan kata sandi ke Git"
 msgid "Git for CVS users"
 msgstr "Git untuk pengguna CVS"
 
+#: command-list.h
+msgid "Git's core data model"
+msgstr "Model data inti Git"
+
 #: command-list.h
 msgid "Tweaking diff output"
 msgstr "Ubah keluaran diff"
@@ -20604,11 +21127,6 @@ msgstr "tidak dapat menemukan semua berkas grafik komit"
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "posisi komit tidak valid. grafik komit mungkin rusak"
 
-#: commit-graph.c
-#, c-format
-msgid "could not find commit %s"
-msgstr "tidak dapat menemukan komit %s"
-
 #: commit-graph.c
 msgid "commit-graph requires overflow generation data but has none"
 msgstr "grafik komit memerlukan pembuatan data meluap tapi tidak punya"
@@ -20815,6 +21333,14 @@ msgstr "Memverifikasi komit di dalam grafik komit"
 msgid "could not parse commit %s"
 msgstr "tidak dapat menguraikan komit %s"
 
+#: commit-reach.c
+msgid "commit ancestry contains a cycle"
+msgstr "silsilah komit berisi siklus"
+
+#: commit-reach.c
+msgid "failed to check reachability"
+msgstr "gagal memeriksa keterjangkauan"
+
 #: commit.c object.c
 #, c-format
 msgid "object %s is a %s, not a %s"
@@ -21603,6 +22129,16 @@ msgstr "jawaban ls-refs tidak valid: %s"
 msgid "expected flush after ref listing"
 msgstr "bilasan diharapkan setelah penyebutan referensi"
 
+#: connect.c
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "algoritma tidak cocok: klien %s; peladen %s"
+
+#: connect.c
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "peladen tidak mendukung algoritma '%s'"
+
 #: connect.c
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "tidak dapat menyetel SO_KEEPALIVE pada soket"
@@ -21997,10 +22533,6 @@ msgstr "tidak dapat membuka direktori '%s'"
 msgid "skipping '%s', which is neither file nor directory"
 msgstr "melewatkan '%s', yang bukan berkas atau direktori"
 
-#: diagnose.c
-msgid "could not duplicate stdout"
-msgstr "tidak dapat menggandakan keluaran standar"
-
 #: diagnose.c
 #, c-format
 msgid "could not add directory '%s' to archiver"
@@ -22465,11 +22997,11 @@ msgstr "lanjutkan daftarkan riwayat berkas di luar penamaan ulang"
 
 #: diff.c
 msgid ""
-"prevent rename/copy detection if the number of rename/copy targets exceeds "
-"given limit"
+"limit to cheap rename/copy detection if the number of rename/copy targets "
+"exceeds this value"
 msgstr ""
-"cegah pendeteksian penamaan ulang/penyalinan jika jumlah target penamaan "
-"ulang/penyalinan melebihi batas yang diberikan"
+"batasi pada deteksi penamaan ulang/penyalinan murah jika jumlah target "
+"penamaan ulang/penyalinan melebihi nilai ini"
 
 #: diff.c
 msgid "Diff algorithm options"
@@ -22779,11 +23311,6 @@ msgstr "tidak dapat memigrasikan direktori git dari '%s' ke '%s'"
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "petunjuk: Menunggu penyunting Anda untuk menutup berkas...%c"
 
-#: editor.c sequencer.c wrapper.c
-#, c-format
-msgid "could not write to '%s'"
-msgstr "tidak dapat menulis ke '%s'"
-
 #: editor.c
 #, c-format
 msgid "could not edit '%s'"
@@ -22866,11 +23393,69 @@ msgstr "harus salah satu dari nothing, matching, simple, upstream atau current"
 msgid "too many args to run %s"
 msgstr "terlalu banyak argumen untuk menjalankan %s"
 
-#: fetch-pack.c
-#, c-format
-msgid ""
-"You are attempting to fetch %s, which is in the commit graph file but not in "
-"the object database.\n"
+#: fetch-object-info.c fetch-pack.c
+msgid "unable to write request to remote"
+msgstr "tidak dapat menulis permintaan kepada remote"
+
+#: fetch-object-info.c
+msgid "object-info capability is not enabled on the server"
+msgstr "kemampuan object-info tidak diaktifkan pada peladen"
+
+#: fetch-object-info.c transport-helper.c
+msgid "object-info requires protocol v2"
+msgstr "object-info butuh protokol v2"
+
+#: fetch-object-info.c
+#, c-format
+msgid "object-info: expected %<PRIuMAX> attributes, got %<PRIuMAX>"
+msgstr "object-info: %<PRIuMAX> atribut diharapkan, dapat %<PRIuMAX>"
+
+#: fetch-object-info.c
+msgid "object-info: unrequested 'size' attribute"
+msgstr "object-info: atribut 'size' tidak diminta"
+
+#: fetch-object-info.c
+msgid "object-info: duplicate 'size' attribute"
+msgstr "object-info: atribut 'size' ganda"
+
+#: fetch-object-info.c
+msgid "object-info: unrequested 'type' attribute"
+msgstr "object-info: atribut 'type' tidak diminta"
+
+#: fetch-object-info.c
+msgid "object-info: duplicate 'type' attribute"
+msgstr "object-info: atribut 'type' ganda"
+
+#: fetch-object-info.c
+#, c-format
+msgid "object-info: unknown attribute '%s'"
+msgstr "object-info: atribut tidak dikenal '%s'"
+
+#: fetch-object-info.c
+#, c-format
+msgid "object-info: expected %<PRIuMAX> objects, got %<PRIuMAX>"
+msgstr "object-info: %<PRIuMAX> objek diharapkan, dapat %<PRIuMAX>"
+
+#: fetch-object-info.c
+#, c-format
+msgid "object-info: expected OID: %s, got %s"
+msgstr "object-info: OID yang diharapkan: %s, dapat %s"
+
+#: fetch-object-info.c
+#, c-format
+msgid "object-info: object %s has invalid type '%s'"
+msgstr "object-info: objek %s bertipe tidak valid '%s'"
+
+#: fetch-object-info.c
+#, c-format
+msgid "object-info: expected flush after %<PRIuMAX> objects"
+msgstr "object-info: bilasan diharapkan setelah %<PRIuMAX> objek"
+
+#: fetch-pack.c
+#, c-format
+msgid ""
+"You are attempting to fetch %s, which is in the commit graph file but not in "
+"the object database.\n"
 "This is probably due to repo corruption.\n"
 "If you are attempting to repair this repo corruption by refetching the "
 "missing object, use 'git fetch --refetch' with the missing object."
@@ -23028,24 +23613,10 @@ msgstr "tidak ada komit umum"
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: pengambilan gagal."
 
-#: fetch-pack.c
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr "algoritma tidak cocok: klien %s; peladen %s"
-
-#: fetch-pack.c
-#, c-format
-msgid "the server does not support algorithm '%s'"
-msgstr "peladen tidak mendukung algoritma '%s'"
-
 #: fetch-pack.c
 msgid "Server does not support shallow requests"
 msgstr "Peladen tidak mendukung permintaan dangkal"
 
-#: fetch-pack.c
-msgid "unable to write request to remote"
-msgstr "tidak dapat menulis permintaan kepada remote"
-
 #: fetch-pack.c
 #, c-format
 msgid "expected '%s', received '%s'"
@@ -23234,6 +23805,11 @@ msgstr "-c mengharapkan sebuah untai konfigurasi\n"
 msgid "no config key given for --config-env\n"
 msgstr "tidak ada kunci konfigurasi yang diberikan untuk --config-env\n"
 
+#: git.c
+#, c-format
+msgid "no file given for '%s' option\n"
+msgstr "tidak ada berkas yang diberikan untuk opsi '%s'\n"
+
 #: git.c
 #, c-format
 msgid "no attribute source given for --attr-source\n"
@@ -23854,9 +24430,12 @@ msgid "name consists only of disallowed characters: %s"
 msgstr "nama hanya terdiri dari karakter yang tidak diperbolehkan: %s"
 
 #: imap-send.c
-msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+msgid ""
+"git imap-send [-v] [-q] [--[no-]curl] [--[no-]draft] [(--folder|-f) "
+"<folder>] < <mbox>"
 msgstr ""
-"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+"git imap-send [-v] [-q] [--[no-]curl] [--[no-]draft] [(--folder|-f) "
+"<folder>] < <mbox>"
 
 #: imap-send.c
 msgid "no IMAP host specified"
@@ -23948,6 +24527,10 @@ msgstr "tidak dapat mengakses blob tipis di '%s'"
 msgid "unable to parse sparse filter data in %s"
 msgstr "tidak dapat menyaring data penyaring tipis di %s"
 
+#: list-objects-filter.c
+msgid "filter_oidset: only blob:limit filters are supported"
+msgstr "filter_oidset: hanya penyaring blob:limit yang didukung"
+
 #: list-objects.c
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
@@ -24014,7 +24597,7 @@ msgstr ""
 msgid "Unable to create '%s.lock': %s"
 msgstr "Tidak dapat membuat '%s.lock': %s"
 
-#: log-tree.c
+#: log-tree.c object-file.c
 msgid "unable to create temporary object directory"
 msgstr "tidak dapat membuat direktori objek sementara"
 
@@ -24056,6 +24639,11 @@ msgstr "marker-size '%s' tidak valid, bilangan bulat diharapkan"
 msgid "Could not parse object '%s'"
 msgstr "Tidak dapat menguraikan objek '%s'"
 
+#: merge-ort.c
+#, c-format
+msgid "tree has duplicate entries for '%s'"
+msgstr "pohon memliliki entri ganda untuk '%s'"
+
 #: merge-ort.c
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
@@ -24790,70 +25378,6 @@ msgstr "tidak dapat menyetel perizinan ke '%s'"
 msgid "core.fsyncMethod = batch is unsupported on this platform"
 msgstr "core.fsyncMethod = batch tidak didukung pada platform ini"
 
-#: object-file.c
-msgid "error when closing loose object file"
-msgstr "kesalahan saat menutup berkas objek longgar"
-
-#: object-file.c
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
-"perizinan tidak cukup untuk menambahkan sebuah objek ke basis data "
-"repositori %s"
-
-#: object-file.c
-msgid "unable to create temporary file"
-msgstr "tidak dapat membuat berkas sementara"
-
-#: object-file.c
-msgid "unable to write loose object file"
-msgstr "tidak dapat menulis berkas objek longgar"
-
-#: object-file.c
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "tidak dapat mengempiskan objek baru %s (%d)"
-
-#: object-file.c
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "deflateEnd pada objek %s gagal (%d)"
-
-#: object-file.c
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "kebingungan oleh data sumber objek tidak stabil untuk %s"
-
-#: object-file.c
-#, c-format
-msgid "write stream object %<PRIuMAX> != %<PRIuMAX>"
-msgstr "tulis objek arus %<PRIuMAX> != %<PRIuMAX>"
-
-#: object-file.c
-#, c-format
-msgid "unable to stream deflate new object (%d)"
-msgstr "tidak dapat mengempis arus objek baru (%d)"
-
-#: object-file.c
-#, c-format
-msgid "deflateEnd on stream object failed (%d)"
-msgstr "deflateEnd pada objek arus gagal (%d)"
-
-#: object-file.c
-#, c-format
-msgid "unable to create directory %s"
-msgstr "gagal membuat direktori %s"
-
-#: object-file.c
-#, c-format
-msgid "cannot read object for %s"
-msgstr "tidak dapat membaca objek untuk %s"
-
-#: object-file.c
-#, c-format
-msgid "cannot map object %s to %s"
-msgstr "tidak dapat memetakan objek %s ke %s"
-
 #: object-file.c
 #, c-format
 msgid "object fails fsck: %s"
@@ -24917,6 +25441,10 @@ msgstr "tidak dapat menguraikan tipe dari kepala '%s' dari '%s'"
 msgid "unable to unpack contents of %s"
 msgstr "tidak dapat membongkar isi %s"
 
+#: object-file.c
+msgid "unable to migrate temporary objects"
+msgstr "tidak dapat memigrasikan objek sementara"
+
 #. TRANSLATORS: This is a line of ambiguous object
 #. output shown when we cannot look up or parse the
 #. object in question. E.g. "deadbeef [bad object]".
@@ -25173,8 +25701,8 @@ msgstr "pengganti %s tidak ditemukan untuk %s"
 
 #: odb.c
 #, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "objek terpak %s (disimpan di %s) rusak"
+msgid "object %s is corrupt"
+msgstr "objek %s rusak"
 
 #: odb.c
 #, c-format
@@ -25191,6 +25719,10 @@ msgstr "%s bukan sebuah objek valid"
 msgid "%s is not a valid '%s' object"
 msgstr "%s bukan sebuah objek '%s' valid"
 
+#: odb.c
+msgid "primary object source does not support generating packfiles"
+msgstr "sumber objek utama tidak mendukung pembuatan berkas pak"
+
 #: odb/source-files.c
 msgid "unable to fdopen alternates lockfile"
 msgstr "tidak dapat men-fdopen berkas kunci alternatif"
@@ -25203,6 +25735,26 @@ msgstr "tidak dapat membaca berkas alternatif"
 msgid "unable to move new alternates file into place"
 msgstr "tidak dapat memindahkan berkas alternatif baru ke tempatnya"
 
+#: odb/source-files.c
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+"Ada terlalu banyak objek longgar yang tak dapat dicapai; jalankan 'git "
+"prune' untuk menghapusnya."
+
+#: odb/source-files.c
+#, c-format
+msgid "pack-objects died of signal %d"
+msgstr "pack-objects mati dengan sinyal %d"
+
+#: odb/source-files.c
+msgid "could not spawn pack-objects"
+msgstr "Tidak dapat memunculkan pack-objects"
+
+#: odb/source-files.c
+msgid "error writing to pack-objects"
+msgstr "galat menulis ke pack-objects"
+
 #: odb/source-loose.c
 #, c-format
 msgid "unable to open loose object %s"
@@ -25232,6 +25784,114 @@ msgstr "kepala untuk %s terlalu panjang, melebihi %d bita"
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "objek longgar %s (disimpan di %s) rusak"
 
+#: odb/source-loose.c
+msgid "error when closing loose object file"
+msgstr "kesalahan saat menutup berkas objek longgar"
+
+#: odb/source-loose.c
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
+"perizinan tidak cukup untuk menambahkan sebuah objek ke basis data "
+"repositori %s"
+
+#: odb/source-loose.c
+msgid "unable to create temporary file"
+msgstr "tidak dapat membuat berkas sementara"
+
+#: odb/source-loose.c
+msgid "unable to write loose object file"
+msgstr "tidak dapat menulis berkas objek longgar"
+
+#: odb/source-loose.c
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "tidak dapat mengempiskan objek baru %s (%d)"
+
+#: odb/source-loose.c
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "deflateEnd pada objek %s gagal (%d)"
+
+#: odb/source-loose.c
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "kebingungan oleh data sumber objek tidak stabil untuk %s"
+
+#: odb/source-loose.c
+#, c-format
+msgid "write stream object %<PRIuMAX> != %<PRIuMAX>"
+msgstr "tulis objek arus %<PRIuMAX> != %<PRIuMAX>"
+
+#: odb/source-loose.c
+#, c-format
+msgid "unable to stream deflate new object (%d)"
+msgstr "tidak dapat mengempis arus objek baru (%d)"
+
+#: odb/source-loose.c
+#, c-format
+msgid "deflateEnd on stream object failed (%d)"
+msgstr "deflateEnd pada objek arus gagal (%d)"
+
+#: odb/source-loose.c
+#, c-format
+msgid "unable to create directory %s"
+msgstr "gagal membuat direktori %s"
+
+#: odb/source-loose.c
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: hash-jalur tidak cocok, ditemukan pada: %s"
+
+#: odb/source-loose.c
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s: objek rusak atau hilang: %s"
+
+#: odb/source-loose.c
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "sha1 berkas jelek: %s"
+
+#: odb/source-loose.c
+msgid "Checking object directory"
+msgstr "Memeriksa direktori objek"
+
+#: odb/source-loose.c
+msgid "Checking object directories"
+msgstr "Memeriksa direktori objek"
+
+#: odb/source-packed.c
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "objek terpak %s (disimpan di %s) rusak"
+
+#: odb/source-packed.c
+#, c-format
+msgid "unable to load rev-index for pack '%s'"
+msgstr "tidak dapat memuat indeks balik untuk pak '%s'"
+
+#: odb/source-packed.c
+#, c-format
+msgid "invalid rev-index for pack '%s'"
+msgstr "indeks balik tidak valid untuk pak '%s'"
+
+#: odb/transaction.c
+msgid "object database transaction already pending"
+msgstr "transaksi basis data objek sedang ditunggu"
+
+#: odb/transaction.h
+msgid "failed to start ODB transaction"
+msgstr "gagal memulai transaksi ODB"
+
+#: odb/transaction.h
+msgid "failed to commit ODB transaction"
+msgstr "gagal mengkomit transaksi ODB"
+
+#: odb/transaction.h
+msgid "failed to finalize ODB transaction"
+msgstr "gagal mengakhiri transaksi ODB"
+
 #: pack-bitmap-write.c
 #, c-format
 msgid "duplicate entry when writing bitmap index: %s"
@@ -25329,6 +25989,10 @@ msgstr "bitmap multipak kehilangan indeks balik yang diperlukan"
 msgid "could not open pack %s"
 msgstr "tidak dapat membuka '%s'"
 
+#: pack-bitmap.c
+msgid "could not open bitmap for base MIDX"
+msgstr "tidak dapat membuka bitmap untuk MIDX dasar"
+
 #: pack-bitmap.c
 msgid "corrupt bitmap lookup table: triplet position out of index"
 msgstr "tabel pencarian bitmap rusak: posisi kembar tiga di luar indeks"
@@ -26017,6 +26681,59 @@ msgstr "tidak dapat mengambil %s dari remote penjanji"
 msgid "unsupported field '%s' in '%s' config"
 msgstr "bidang '%s' tidak didukung pada konfiugrasi '%s'"
 
+#: promisor-remote.c
+#, c-format
+msgid ""
+"invalid remote name '%s' before '=' sign in '%s' from "
+"promisor.acceptFromServerUrl config"
+msgstr ""
+"nama remote '%s' tidak valid sebelum tanda '=' pada '%s' dari konfigurasi "
+"promisor.acceptFromServerUrl"
+
+#: promisor-remote.c
+#, c-format
+msgid ""
+"invalid url pattern '%s' in '%s' from promisor.acceptFromServerUrl config"
+msgstr ""
+"pola url '%s' tidak valid pada '%s' dari konfigurasi "
+"promisor.acceptFromServerUrl"
+
+#: promisor-remote.c
+#, c-format
+msgid ""
+"couldn't generate a valid remote name from advertised url '%s', ignoring "
+"this remote"
+msgstr ""
+"tidak dapat membuat nama remote valid dari url yang diiklankan '%s', abaikan "
+"remote ini"
+
+#: promisor-remote.c
+#, c-format
+msgid ""
+"generated remote name '%s' from advertised url '%s' is invalid, ignoring "
+"this remote"
+msgstr ""
+"nama remote yang dibuat '%s' dari url yang diiklankan '%s' tidak valid, "
+"abaikan remote ini"
+
+#: promisor-remote.c
+#, c-format
+msgid "couldn't normalize advertised url '%s', ignoring this remote"
+msgstr ""
+"tidak dapat menormalisasikan url yang diiklankan '%s', abaikan remote ini"
+
+#: promisor-remote.c
+#, c-format
+msgid "Auto-creating promisor remote '%s' for URL '%s'\n"
+msgstr "Membuat otomatis remote pejanji '%s' dari remote '%s'\n"
+
+#: promisor-remote.c
+#, c-format
+msgid "too many remotes accepted with name like '%s-X', ignoring this remote"
+msgstr ""
+"terlalu banyak remote yang diterima dengan nama seperti '%s-X', abaikan "
+"remote ini"
+
 #: promisor-remote.c
 #, c-format
 msgid ""
@@ -26215,6 +26932,11 @@ msgstr "ujung sampah tambahan tidak valid: '%s'"
 msgid "unable to enumerate additional recent objects"
 msgstr "tidak dapat menghitung objeck terkini tambahan"
 
+#: read-cache.c
+#, c-format
+msgid "remove '%s'\n"
+msgstr "hapus '%s'\n"
+
 #: read-cache.c
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
@@ -26409,11 +27131,6 @@ msgstr ""
 msgid "unexpected diff status %c"
 msgstr "status diff tak diharapkan %c"
 
-#: read-cache.c
-#, c-format
-msgid "remove '%s'\n"
-msgstr "hapus '%s'\n"
-
 #: rebase-interactive.c
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
@@ -27614,6 +28331,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Cabang Anda di belakan '%s' oleh %d komit, dan bisa di maju-cepatkan.\n"
 
+#: remote.c
+#, c-format
+msgid "  (use \"git pull %s %s\" to update your local branch)\n"
+msgstr "  (gunakan \"git pull %s %s\" untuk perbarui cabang lokal Anda)\n"
+
 #: remote.c
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (gunakan \"git pull\" untuk perbarui cabang lokal Anda)\n"
@@ -27633,6 +28355,16 @@ msgstr[1] ""
 "Cabang Anda dan '%s' telah menyimpang,\n"
 "dan masing-masing punya %d dan %d komit berbeda.\n"
 
+#: remote.c
+#, c-format
+msgid ""
+"  (use \"git pull %s %s\" if you want to integrate the remote branch with "
+"yours)\n"
+msgstr ""
+"  (gunakan \"git pull %s %s\" jika Anda ingin mengintegrasikan cabang "
+"remote\n"
+"   pada milik Anda)\n"
+
 #: remote.c
 msgid ""
 "  (use \"git pull\" if you want to integrate the remote branch with yours)\n"
@@ -27786,6 +28518,11 @@ msgstr "kedalaman penggantian terlalu tinggi untuk objek %s"
 msgid "'%s' is not a valid commit-ish for %s"
 msgstr "'%s' bukan mirip komit yang valid untuk %s"
 
+#: replay.c
+#, c-format
+msgid "'%s' does not point to a commit for %s"
+msgstr "'%s' tidak menunjuk pada sebuah komit untuk %s"
+
 #: replay.c
 #, c-format
 msgid "argument to %s must be a reference"
@@ -27808,11 +28545,20 @@ msgstr "butuh beberapa komit untuk dimainkan ulang"
 msgid "all positive revisions given must be references"
 msgstr "semua revisi positif yang diberikan haruslah referensi"
 
+#: replay.c
+#, c-format
+msgid "merge of %s onto %s failed"
+msgstr "penggabungan %s pada %s gagal"
+
 #: replay.c
 #, c-format
 msgid "commit %s became empty after replay"
 msgstr "komit %s menjadi kosong setelah tayangan ulang"
 
+#: replay.c
+msgid "'--linearize' cannot be used with multiple branches"
+msgstr "'--linearize' tidak dapat digunakan dengan banyak cabang"
+
 #: replay.c
 msgid "'--ref' cannot be used with multiple revision ranges"
 msgstr "'--ref' tidak dapat digunakan dengan berbagai rentang revisi"
@@ -29136,6 +29882,11 @@ msgstr ""
 "terapkan perubahan lokal Anda nanti dengan menjalankan\n"
 "\"git stash pop\".\n"
 
+#: sequencer.c
+msgid "could not apply autostash; your changes are safe in the stash"
+msgstr ""
+"tidak dapat menerapkan stase otomatis; perubahan Anda aman di dalam stase"
+
 #: sequencer.c
 #, c-format
 msgid ""
@@ -29404,8 +30155,8 @@ msgstr "tidak ada jalur di dalam gitfile: %s"
 
 #: setup.c
 #, c-format
-msgid "not a git repository: %s"
-msgstr "bukan sebuah repositori git: %s"
+msgid "gitfile does not point to a valid repository: %s"
+msgstr "gitfile tidak menunjuk pada repositori valid: %s"
 
 #: setup.c
 #, c-format
@@ -29553,6 +30304,10 @@ msgstr "nama cabang asal salah: '%s'"
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init: --initial-branch=%s diabaikan"
 
+#: setup.c
+msgid "failed creating object database"
+msgstr "gagal membuat basis data objek"
+
 #: setup.c
 #, c-format
 msgid "unable to handle file type %d"
@@ -30228,6 +30983,10 @@ msgstr "%s tiba-tiba berkata: '%s'"
 msgid "%s also locked %s"
 msgstr "%s juga mengunci %s"
 
+#: transport-helper.c
+msgid "could not dup helper output fd"
+msgstr "tidak dapat menduplikasi deskriptor berkas keluaran pembantu"
+
 #: transport-helper.c
 msgid "couldn't run fast-import"
 msgstr "tidak dapat menjalankan fast-import"
@@ -30329,6 +31088,11 @@ msgstr "tidak dapat menjalankan fast-export"
 msgid "error while running fast-export"
 msgstr "kesalahan ketika menjalankan fast-export"
 
+#: transport-helper.c
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "tidak dapat menamai ulang '%s' ke '%s'"
+
 #: transport-helper.c
 #, c-format
 msgid ""
@@ -30410,6 +31174,10 @@ msgstr "lihat protocol.version di 'git help config' untuk lebih lengkapnya"
 msgid "server options require protocol version 2 or later"
 msgstr "opsi peladen butuh protokol versi 2 atau lebih baru"
 
+#: transport.c
+msgid "remote does not support object-info"
+msgstr "remote tidak mendukung object-info"
+
 #: transport.c
 msgid "server does not support wait-for-done"
 msgstr "peladen tidak mendukung wait-for-done"
@@ -30824,32 +31592,32 @@ msgstr "peringatan: "
 
 #: usage.c
 #, c-format
-msgid "'%s' is nominated for removal.\n"
-msgstr "'%s' diajukan untuk dihapus.\n"
+msgid "'%s' will be removed soon.\n"
+msgstr "'%s' akan segera dihapus.\n"
 
 #: usage.c
 #, c-format
 msgid ""
-"If you still use this command, here's what you can do:\n"
+"If you need a replacement:\n"
 "\n"
-"- read https://git-scm.com/docs/BreakingChanges.html\n"
-"- check if anyone has discussed this on the mailing\n"
-"  list and if they came up with something that can\n"
-"  help you: https://lore.kernel.org/git/?q=%s\n"
-"- send an email to <git@vger.kernel.org> to let us\n"
-"  know that you still use this command and were unable\n"
-"  to determine a suitable replacement\n"
+"- Read https://git-scm.com/docs/BreakingChanges.html.\n"
+"\n"
+"- Check what others on the mailing list suggest as a replacement:\n"
+"  https://lore.kernel.org/git/?q=%s\n"
+"\n"
+"- Send an email to <git@vger.kernel.org> asking for help, only if\n"
+"  suggestions by others do not work for you.\n"
 "\n"
 msgstr ""
-"Jika Anda masih menggunakan perintah ini, beginilah yang dapat Anda "
-"lakukan:\n"
+"Jika Anda butuh pengganti:\n"
+"\n"
+"- Baca https://git-scm.com/docs/BreakingChanges.html.\n"
+"\n"
+"- Periksa apa yang orang lain di milis sarankan sebagai pengganti:\n"
+"  https://lore.kernel.org/git/?q=%s\n"
 "\n"
-"- lihat https://git-scm.com/docs/BreakingChanges.html\n"
-"- periksa apakah ada yang sudah membahas ini pada milis dan jika mereka\n"
-"  ada sesuatu yang dapat membantu Anda: https://lore.kernel.org/git?q=%s\n"
-"- kirimkan email ke <git@vger.kernel.org> untuk memberitahu kami bahwa\n"
-"  Anda masih menggunakan perintah ini dan tidak dapat menemukan pengganti\n"
-"  yang cocok.\n"
+"- Kirim email ke <git@vger.kernel.org> untuk meminta bantuan, tapi hanya\n"
+"  jika saran dari orang lain tidak bekerja untuk Anda.\n"
 "\n"
 
 #: usage.c
@@ -31786,8 +32554,8 @@ msgstr ""
 
 #: git-send-email.perl
 #, perl-format
-msgid "No subject line in %s?"
-msgstr "Tidak ada baris subjek di %s?"
+msgid "No 'Subject:' line in '%s'\n"
+msgstr "Tidak ada baris 'Subject:' di '%s\n"
 
 #: git-send-email.perl
 #, perl-format

From 4805c1ff999c2f7283c87c7a29635dba8a08855e Mon Sep 17 00:00:00 2001
From: Peter Krefting <peter@softwolves.pp.se>
Date: Mon, 21 Sep 2026 14:25:02 +0100
Subject: [PATCH 008/247] l10n: sv.po: Update Swedish translation

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Reviewed-by: Tuomas Ahola <taahol@utu.fi>
Reviewed-by: AI, by way of Jiang Xin <worldhello.net@gmail.com>
---
 po/sv.po | 1098 +++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 848 insertions(+), 250 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index 3856426319daa3..248ea7f010758d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: git 2.55.0\n"
+"Project-Id-Version: git 2.56.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2026-06-15 18:56+0000\n"
-"PO-Revision-Date: 2026-06-25 16:15+0100\n"
+"POT-Creation-Date: 2026-09-15 23:12+0000\n"
+"PO-Revision-Date: 2026-09-21 14:24+0100\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -16,6 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.6\n"
 
 #, c-format
 msgid "Huh (%s)?"
@@ -1549,7 +1550,7 @@ msgstr "Argumentet stöd inte för formatet ”%s”: -%d"
 
 #, c-format
 msgid "%.*s is not a valid attribute name"
-msgstr "%-*s är inte ett giltigt namn på attribut"
+msgstr "%.*s är inte ett giltigt namn på attribut"
 
 msgid "unable to add additional attribute"
 msgstr "kan inte lägga till ytterligare attribut"
@@ -1672,6 +1673,14 @@ msgstr "kan inte starta ”show” för objektet ”%s”"
 msgid "could not read file '%s'"
 msgstr "kunde inte läsa filen ”%s”"
 
+#, c-format
+msgid "could not read bad term from file '%s'"
+msgstr "kunde inte läsa dålig term från filen ”%s”"
+
+#, c-format
+msgid "could not read good term from file '%s'"
+msgstr "kunde inte läsa bra term från filen ”%s”"
+
 msgid "reading bisect refs failed"
 msgstr "misslyckades läsa bisect-referenser"
 
@@ -1776,12 +1785,10 @@ msgstr ""
 msgid "not tracking: ambiguous information for ref '%s'"
 msgstr "spårar inte: tvetydig information för referensen ”%s”"
 
-#. #-#-#-#-#  branch.c.po  #-#-#-#-#
 #. TRANSLATORS: This is a line listing a remote with duplicate
 #. refspecs in the advice message below. For RTL languages you'll
 #. probably want to swap the "%s" and leading "  " space around.
 #.
-#. #-#-#-#-#  object-name.c.po  #-#-#-#-#
 #. TRANSLATORS: This is line item of ambiguous object output
 #. from describe_ambiguous_object() above. For RTL languages
 #. you'll probably want to swap the "%s" and leading " " space
@@ -1914,6 +1921,12 @@ msgstr "kunde inte ta status på ”%s”"
 msgid "empty patch. aborted"
 msgstr "tom patch. avbryter"
 
+msgid "could not initialize apply state"
+msgstr "kunde inte initiera tillämpningstillstånd"
+
+msgid "could not check apply state"
+msgstr "kunde inte kontrollera tillämpningstillstånd"
+
 #, c-format
 msgid "could not apply '%s'"
 msgstr "kunde inte tillämpa ”%s”"
@@ -1948,6 +1961,9 @@ msgstr "uppdatera spårade filer"
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "åternormalisera radslut i spårade filer (implicerar -u)"
 
+msgid "add conflict-resolved tracked files"
+msgstr "lägg till konfliktlösta spårade filer"
+
 msgid "record only the fact that the path will be added later"
 msgstr "registrera endast att sökvägen kommer läggas till senare"
 
@@ -2015,6 +2031,22 @@ msgstr "Använd -f om du verkligen vill lägga till dem."
 msgid "adding files failed"
 msgstr "misslyckades lägga till filer"
 
+#, c-format
+msgid "updating file '%s' failed"
+msgstr "misslyckades uppdatera filen ”%s”"
+
+#, c-format
+msgid ""
+"the following paths still have conflict markers:\n"
+"%s"
+msgstr ""
+"följande sökvägar har fortfarande konfliktmarkörer:\n"
+"%s"
+
+#, c-format
+msgid "cannot lstat: '%s'"
+msgstr "kan inte utföra lstat: ”%s”"
+
 #, c-format
 msgid "'%s' cannot be negative"
 msgstr "”%s” kan inte vara negativt"
@@ -2448,13 +2480,13 @@ msgstr "okänt argument: %s"
 
 msgid ""
 "git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n"
-"                 [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
-"[<pathspec>...]"
+"                 [--no-checkout] [--first-parent] [--reset-when-"
+"found[=<where>]] [<bad> [<good>...]] [--] [<pathspec>...]"
 msgstr ""
 "git bisect start [--term-(bad|new)=<term-ny> --term-(good|old)=<term-"
 "gammal>]\n"
-"                 [--no-checkout] [--first-parent] [<dålig> [<bra>...]] [--] "
-"[<sökvägsangivelser>...]"
+"                 [--no-checkout] [--first-parent] [--reset-when-"
+"found[=<var>]] [<dålig> [<bra>...]] [--] [<sökvägsangivelser>...]"
 
 msgid "git bisect (bad|new|<term-new>) [<rev>]"
 msgstr "git bisect (bad|new|<term-ny>) [<incheckning>]"
@@ -2471,8 +2503,8 @@ msgstr "git bisect reset [<incheckning>]"
 msgid "git bisect replay <logfile>"
 msgstr "git bisect replay <loggfil>"
 
-msgid "git bisect run <cmd> [<arg>...]"
-msgstr "git bisect run <kommando> [<argument>...]"
+msgid "git bisect run [--reset-when-found[=<where>]] <cmd> [<arg>...]"
+msgstr "git bisect run [--reset-when-found[=<var>]] <kommando> [<argument>...]"
 
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
@@ -2516,6 +2548,10 @@ msgstr ""
 "kan inte checka ut original-HEAD ”%s”. Försök ”git bisect reset "
 "<incheckning>”."
 
+#, c-format
+msgid "invalid value for '--reset-when-found': '%s'"
+msgstr "felaktigt värde för ”--reset-when-found”: ”%s”"
+
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Felaktigt argument till bisect_write: %s"
@@ -2598,6 +2634,10 @@ msgstr ""
 msgid "could not open '%s' for appending"
 msgstr "kunde inte öppna ”%s” för tillägg"
 
+#, c-format
+msgid "could not find commit for '%s'"
+msgstr "kunde inte hitta incheckningen för ”%s”"
+
 msgid "'' is not a valid term"
 msgstr "”” är inte en giltig term"
 
@@ -2682,6 +2722,9 @@ msgstr "”bisect”-körningen misslyckades: felkod %d från %s är < 0 eller >
 msgid "cannot open file '%s' for writing"
 msgstr "kan inte öppna ”%s” för skrivning"
 
+msgid "could not duplicate stdout"
+msgstr "kunde inte duplicera standard ut"
+
 msgid "bisect run cannot continue any more"
 msgstr "”bisect”-körningen kan inte fortsätta längre"
 
@@ -2870,8 +2913,12 @@ msgstr[1] "filen %s har bara %lu rader"
 msgid "Blaming lines"
 msgstr "Klandra rader"
 
-msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
-msgstr "git branch [<flaggor>] [-r | -a] [--merged] [--no-merged]"
+msgid ""
+"git branch [<options>] [-r | -a] [--merged] [--no-merged] [(--forked "
+"<branch>)...]"
+msgstr ""
+"git branch [<flaggor>] [-r | -a] [--merged] [--no-merged] [(--forked "
+"<gren>)...]"
 
 msgid ""
 "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
@@ -2897,6 +2944,11 @@ msgstr "git branch [<flaggor>] [-r | -a] [--points-at]"
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<flaggor>] [-r | -a] [--format]"
 
+msgid ""
+"git branch [<options>] (--delete-merged <pattern>)... [<branch-pattern>...]"
+msgstr ""
+"git branch [<flaggor>] (--delete-merged <mönster>)... [<gren-mönster>...]"
+
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -2931,6 +2983,12 @@ msgstr "misslyckades uppdatera konfigurationsfil"
 msgid "cannot use -a with -d"
 msgstr "kan inte ange -a med -d"
 
+#, c-format
+msgid "cannot delete branch '%s' used by worktree at '%s' for bisect"
+msgstr ""
+"kan inte ta bort grenen ”%s” som används av arbetskatalogen på ”%s” för "
+"bisect"
+
 #, c-format
 msgid "cannot delete branch '%s' used by worktree at '%s'"
 msgstr "kan inte ta bort grenen ”%s” som används av arbetskatalogen på ”%s”"
@@ -2951,6 +3009,14 @@ msgstr ""
 msgid "branch '%s' not found"
 msgstr "grenen ”%s” hittades inte"
 
+#, c-format
+msgid "Would delete remote-tracking branch %s (was %s).\n"
+msgstr "Skulle ta bort fjärrspårande grenen %s (var %s).\n"
+
+#, c-format
+msgid "Would delete branch %s (was %s).\n"
+msgstr "Skulle ta bort grenen %s (var %s).\n"
+
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"
@@ -3017,6 +3083,14 @@ msgstr "grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
 msgid "branch is copied, but update of config-file failed"
 msgstr "grenen kopierades, men misslyckades uppdatera konfigurationsfilen"
 
+#, c-format
+msgid "'%s' is not a valid branch or pattern"
+msgstr "”%s” är inte ett giltigt grennamn eller mönster"
+
+#, c-format
+msgid "Skipping '%s' (branch.%s.deleteMerged is false)\n"
+msgstr "Hoppar över ”%s” (branch.%s.deleteMerged är falsk)\n"
+
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -3027,6 +3101,13 @@ msgstr ""
 "  %s\n"
 "Rader som inleds med ”%s” ignoreras.\n"
 
+msgid "--set-upstream-to takes a single <remote>/<branch> argument"
+msgstr "--set-upstream-to tar ett ensamt <fjärr>/<gren>-argument"
+
+#, c-format
+msgid "Did you mean to use: git branch --set-upstream-to=%s/%s?"
+msgstr "Menade du att använda: git branch --set-upstream-to=%s/%s?"
+
 msgid "Generic options"
 msgstr "Allmänna flaggor"
 
@@ -3102,6 +3183,17 @@ msgstr "skapa grenens referenslogg"
 msgid "edit the description for the branch"
 msgstr "redigera beskrivning för grenen"
 
+msgid "pattern"
+msgstr "mönster"
+
+msgid "delete merged branches whose upstream matches <pattern> (repeatable)"
+msgstr ""
+"ta bort sammanslagna grenar med uppström som motsvarar <mönster> (kan "
+"repeteras)"
+
+msgid "with --delete-merged, only print which branches would be deleted"
+msgstr "för --delete-merged, visa endast grenar som skulle tas bort"
+
 msgid "force creation, move/rename, deletion"
 msgstr "tvinga skapande, flytt/namnändring, borttagande"
 
@@ -3111,6 +3203,12 @@ msgstr "visa endast sammanslagna grenar"
 msgid "print only branches that are not merged"
 msgstr "visa endast ej sammanslagna grenar"
 
+msgid "branch"
+msgstr "gren"
+
+msgid "print only branches whose upstream matches <branch> (repeatable)"
+msgstr "visa endast grenar med uppström som motsvarar <gren> (kan repeteras)"
+
 msgid "list branches in columns"
 msgstr "visa grenar i spalter"
 
@@ -3135,6 +3233,9 @@ msgstr "misslyckades slå upp HEAD som giltig referens"
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD hittades inte under refs/heads!"
 
+msgid "--dry-run requires --delete-merged"
+msgstr "--dry-run kräver --delete-merged"
+
 msgid ""
 "branch with --recurse-submodules can only be used if "
 "submodule.propagateBranches is enabled"
@@ -3331,9 +3432,6 @@ msgstr "visa förloppsindikator"
 msgid "historical; same as --progress"
 msgstr "historisk; samma som --progress"
 
-msgid "historical; does nothing"
-msgstr "historisk flagga; gör ingenting"
-
 msgid "specify bundle format version"
 msgstr "ange formatversion för bunten"
 
@@ -3360,10 +3458,39 @@ msgstr "Packar upp objektbunt"
 msgid "cannot read object %s '%s'"
 msgstr "kan inte läsa objektet %s: ”%s”"
 
+msgid "must supply valid remote when using remote-object-info"
+msgstr "måste ange giltig fjärr när remote-object-info anges"
+
+#, c-format
+msgid "remote-object-info does not support short oids, %d characters required"
+msgstr "remote-object-info stöder inte kort OID, %d tecken krävs"
+
+#, c-format
+msgid "not a valid object name '%s'"
+msgstr "objektnamnet ”%s” är inte giltigt"
+
+msgid "remote-object-info requires objects"
+msgstr "remote-object-info kräver objekt"
+
 #, c-format
 msgid "mailmap: invalid boolean '%s'"
 msgstr "mailmap: ogiltigt booleskt värde ”%s”"
 
+msgid "remote-object-info command too long"
+msgstr "kommandot för remote-object-info för långt"
+
+#, c-format
+msgid "remote-object-info: failed to parse command line: %s"
+msgstr "remote-object-info: kunde inte tolka kommandoraden: %s"
+
+#, c-format
+msgid "remote-object-info supports at most %d objects"
+msgstr "remote-object-info stöder som mest %d objekt"
+
+#, c-format
+msgid "failed to get object info from the remote: %s"
+msgstr "misslyckades hämta objektinformation från fjärren: %s"
+
 msgid "flush is only for --buffer mode"
 msgstr "flush är endast till för ”--buffer”-läge"
 
@@ -3810,33 +3937,41 @@ msgid "The following paths have local changes:\n"
 msgstr "Följande sökvägar har lokala ändringar:\n"
 
 #, 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” kan vara både en lokal fil och en spårande gren.\n"
-"Använd -- (och möjligen --no-guess) för att göra otvetydig"
+msgid "Branch name '%s' appears in multiple remotes:"
+msgstr "Grennamnet ”%s” förekommer hos flera fjärrar:"
+
+#, c-format
+msgid "  %s"
+msgstr "  %s"
 
 #, c-format
 msgid ""
-"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"If you meant to check out a remote tracking branch on <remote>,\n"
 "you can do so by fully qualifying the name with the --track option:\n"
 "\n"
-"    git %s --track origin/<name>\n"
+"    git %s --track <remote>/%s\n"
 "\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\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 ""
-"Om du menade checka ut en spårad fjärrgren på t.ex. ”origin”, kan du\n"
+"Om du menade att checka ut en fjärrspårande gren på <fjärr>, kan du\n"
 "göra det genom att ange hela namnet med flaggan --track:\n"
 "\n"
-"    git %s --track origin/<namn>\n"
+"    git %s --track <fjärr>/%s\n"
 "\n"
-"Om du alltid vill att utcheckningar med tvetydiga <namn> ska\n"
+"Om du alltid vill att utcheckningar med tvetydiga namn ska\n"
 "föredra en fjärr, t.ex. fjärren ”origin” kan du ställa in\n"
 "checkout.defaultRemote=origin i din konfiguration."
 
+#, 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” kan vara både en lokal fil och en spårande gren.\n"
+"Använd -- (och möjligen --no-guess) för att göra otvetydig"
+
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "”%s” motsvarar flera (%d) spårade fjärrgrenar"
@@ -4030,9 +4165,6 @@ msgstr ""
 msgid "you must specify path(s) to restore"
 msgstr "du måste ange katalog(er) att återställa"
 
-msgid "branch"
-msgstr "gren"
-
 msgid "create and checkout a new branch"
 msgstr "skapa och checka ut en ny gren"
 
@@ -4201,9 +4333,6 @@ msgstr "städa interaktivt"
 msgid "remove whole directories"
 msgstr "ta bort hela kataloger"
 
-msgid "pattern"
-msgstr "mönster"
-
 msgid "add <pattern> to ignore rules"
 msgstr "lägg till <mönster> till ignoreringsregler"
 
@@ -4797,8 +4926,16 @@ msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "kan inte utföra en delvis incheckning under en cherry-pick."
 
-msgid "cannot do a partial commit during a rebase."
-msgstr "kan inte utföra en delvis incheckning under en ombasering."
+msgid "cannot do a partial commit during a revert."
+msgstr "kan inte utföra en delvis incheckning under en återställning."
+
+msgid "cannot do a partial commit during an am session."
+msgstr "kan inte utföra en delvis incheckning under en am-körning."
+
+msgid "cannot do a partial commit while resolving conflicts during a rebase."
+msgstr ""
+"kan inte utföra en delvis incheckning vid konfliktlösning under en "
+"ombasering."
 
 msgid "cannot read the index"
 msgstr "kan inte läsa indexet"
@@ -4982,8 +5119,17 @@ msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."
 
-msgid "You are in the middle of a rebase -- cannot amend."
-msgstr "Du är i mitten av en ombasering -- kan inte utöka."
+msgid "The now-empty commit has been dropped -- cannot amend."
+msgstr "Den numera tomma incheckningen har kastats -- kan inte utöka."
+
+msgid "You are in the middle of a revert -- cannot amend."
+msgstr "Du är i mitten av en återställning -- kan inte utöka."
+
+msgid "You are in the middle of an am session -- cannot amend."
+msgstr "Du är i mitten av en am-körning -- kan inte utöka."
+
+msgid "You are resolving conflicts during a rebase -- cannot amend."
+msgstr "Du löser konflikter under en ombasering -- kan inte utöka."
 
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author kan endast användas med -C, -c eller --amend."
@@ -5835,6 +5981,10 @@ msgstr "Inte ett git-arkiv"
 msgid "invalid object '%s' given."
 msgstr "objektet ”%s” som angavs är felaktigt."
 
+#, c-format
+msgid "unable to read tree object for commit '%s'"
+msgstr "kan inte läsa trädobjektet för incheckningen ”%s”"
+
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "mer än två blob:ar angavs: ”%s”"
@@ -5935,8 +6085,8 @@ msgstr "inget <verktyg> angavs för --tool=<verktyg>"
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "inget <kommando> angavs för --extcmd=<kommando>"
 
-msgid "git fast-export [<rev-list-opts>]"
-msgstr "git fast-export [<rev-list-flaggor>]"
+msgid "git fast-export [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git fast-export [<flaggor>] [<revisions-intervall>] [[--] <sökväg>...]"
 
 #, c-format
 msgid "unknown %s mode: %s"
@@ -6598,6 +6748,9 @@ msgstr "--cat-blob-fd kan inte överstiga %d"
 msgid "expected format name:filename for submodule rewrite option"
 msgstr "förväntade formatet namn:filnamn för undermodul-omskrivningsflaggan"
 
+msgid "--max-pack-size: argument must be a non-negative integer"
+msgstr "--max-pack-size: argumentet måste vara ett icke-negativt heltal"
+
 #, c-format
 msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum"
 msgstr "max-pack-size är nu i byte, antar --max-pack-size=%lum"
@@ -6605,6 +6758,9 @@ msgstr "max-pack-size är nu i byte, antar --max-pack-size=%lum"
 msgid "minimum max-pack-size is 1 MiB"
 msgstr "minsta max-pack-size är 1 MiB"
 
+msgid "--big-file-threshold: argument must be a non-negative integer"
+msgstr "--big-file-threshold: argumentet måste vara ett icke-negativt heltal"
+
 #, c-format
 msgid "unknown --signed-commits mode '%s'"
 msgstr "okänt läge ”%s” för --signed-commits"
@@ -6633,13 +6789,90 @@ msgstr "fick tillvalskommando ”%s” efter datakommando"
 msgid "this version of fast-import does not support option: %s"
 msgstr "den här versionen av fast-import stöder inte tillvalet: %s"
 
-#, c-format
-msgid "unknown option %s"
-msgstr "okänd flagga %s"
+msgid "git fast-import [<options>]"
+msgstr "git fast-import [<flaggor>]"
 
-#, c-format
-msgid "unknown option --%s"
-msgstr "okänd flagga --%s"
+msgid "Common"
+msgstr "Vanliga"
+
+msgid "format of the commit/tag dates"
+msgstr "format för inchecknings-/taggdatum"
+
+msgid "display some basic statistics (objects, packfiles and memory)"
+msgstr "visa en del grundläggande statistik (objekt, paketfiler och minne)"
+
+msgid "disable the output shown by --stats"
+msgstr "inaktivera utdata som visas av --stats"
+
+msgid "force updating modified existing branches"
+msgstr "tvinga uppdatering av befintliga grenar som har ändrats"
+
+msgid "require a terminating 'done' command"
+msgstr "kräv ett avslutande ”done”-kommando"
+
+msgid "maximum size of each output pack file"
+msgstr "maximal storlek på varje utdatapaketfil"
+
+msgid "maximum size of a blob that will be deltified"
+msgstr "maximal storlek på en blob som kommer att deltifieras"
+
+msgid "maximum delta depth"
+msgstr "maximalt deltadjup"
+
+msgid "maximum number of branches to maintain active"
+msgstr "maximalt antal grenar att behålla aktiva"
+
+msgid "Marks"
+msgstr "Märken"
+
+msgid "import marks from <file>"
+msgstr "importera märken från <fil>"
+
+msgid "import marks from <file> if it exists"
+msgstr "importera märken från <fil>, om den finns"
+
+msgid "dump marks to <file>"
+msgstr "dumpa märken till <fil>"
+
+msgid "are --(import|export)-marks= paths relative to '.git/info/fast-import'?"
+msgstr ""
+"är sökvägar i --(import|export)-marks= relativa till ”.git/info/fast-import”?"
+
+msgid "Submodule rewrite"
+msgstr "Omskrivning av undermoduler"
+
+msgid "name:filename"
+msgstr "namn:filnamn"
+
+msgid "rewrite object IDs for submodule <name> from <filename>"
+msgstr "skriv om objekt-ID för undermodulen <namn> från <filnamn>"
+
+msgid "rewrite object IDs for submodule <name> to <filename>"
+msgstr "skriv om objekt-ID för undermodulen <namn> till <filnamn>"
+
+msgid "Signing"
+msgstr "Signering"
+
+msgid "how to handle signed commits"
+msgstr "hantering av signerade incheckningar"
+
+msgid "how to handle signed tags"
+msgstr "hantering av signerade taggar"
+
+msgid "Advanced"
+msgstr "Avancerat"
+
+msgid "allow unsafe mark commands from the stream"
+msgstr "tillåt osäkra ”mark”-kommandon från strömmen"
+
+msgid "dump edge commits to <file>"
+msgstr "dumpa kant-incheckningar till <fil>"
+
+msgid "fd"
+msgstr "handtag"
+
+msgid "write some responses to <fd> instead of stdout"
+msgstr "skriv vissa svar till <handtag> istället för standard ut"
 
 #, c-format
 msgid "unsupported command: %s"
@@ -6667,6 +6900,10 @@ msgstr "git fetch --all [<flaggor>]"
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel kan inte vara negativt"
 
+#, c-format
+msgid "unrecognized fetch.followRemoteHEAD value '%s' ignored"
+msgstr "okänt värde ”%s” för fetch.followRemoteHEAD ignorerades"
+
 msgid "couldn't find remote ref HEAD"
 msgstr "kunde inte hitta fjärr-referensen HEAD"
 
@@ -6776,17 +7013,25 @@ msgstr "ignorerar %s eftersom protokollet inte stöder det"
 
 #, c-format
 msgid ""
-"Run 'git remote set-head %s %s' to follow the change, or set\n"
-"'remote.%s.followRemoteHEAD' configuration option to a different value\n"
-"if you do not want to see this message. Specifically running\n"
-"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"
-"will disable the warning until the remote changes HEAD to something else."
+"Run 'git remote set-head %s %s' to follow the change, or modify\n"
+"either of the 'remote.%s.followRemoteHEAD' or 'fetch.followRemoteHEAD'\n"
+"configuration variables to handle the situation differently.\n"
+"\n"
+"Using this specific setting\n"
+"\n"
+"    git config set remote.%s.followRemoteHEAD warn-if-not-%s\n"
+"\n"
+"will suppress the warning until the remote changes HEAD to something else."
 msgstr ""
-"Kör ”git remote set-head %s %s” för att följa ändringen, eller sätt\n"
-"konfigurationsflaggan ”remote %s.followRemoteHEAD” till ett annat värde\n"
-"om du inte vill se det här meddelandet. Du kan specifikt inaktivera\n"
-"varningen till fjärren ändrar HEAD till något annat genom att köra\n"
-"”git config set remote %s.followRemoteHEAD warn-if-not-branch-%s”."
+"Kör ”git remote set-head %s %s” för att följa ändringen, eller ändra\n"
+"antingen konfigurationsflaggan ”remote.%s.followRemoteHEAD” eller\n"
+"”fetch.followRemoteHEAD” för att hantera situationen på ett annat sätt.\n"
+"\n"
+"Om du använder denna specifika inställning\n"
+"\n"
+"    git config set remote.%s.followRemoteHEAD warn-if-not-%s\n"
+"\n"
+"inaktiverar varningen till fjärren ändrar HEAD till något annat."
 
 msgid ""
 "You're on a case-insensitive filesystem, and the remote you are\n"
@@ -7198,6 +7443,10 @@ msgstr "Kontrollerar %s"
 msgid "Checking connectivity (%d objects)"
 msgstr "Kontrollerar konnektivitet (%d objekt)"
 
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s: objekt trasigt eller saknas"
+
 #, c-format
 msgid "Checking %s %s"
 msgstr "Kontrollerar %s %s"
@@ -7213,10 +7462,6 @@ msgstr "roten %s"
 msgid "tagged %s %s (%s) in %s"
 msgstr "taggad %s %s (%s) i %s"
 
-#, c-format
-msgid "%s: object corrupt or missing"
-msgstr "%s: objekt trasigt eller saknas"
-
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: ogiltig referensloggpost %s"
@@ -7240,28 +7485,6 @@ msgstr "ogiltig parameter: förväntade sha1, fick ”%s”"
 msgid "notice: No default references"
 msgstr "obs: Inga förvalda referenser"
 
-#, c-format
-msgid "%s: hash-path mismatch, found at: %s"
-msgstr "%s: hashsökväg stämmer inte överens, hittad vid: %s"
-
-#, c-format
-msgid "%s: object corrupt or missing: %s"
-msgstr "%s: objektet trasigt eller saknas: %s"
-
-#, c-format
-msgid "%s: object could not be parsed: %s"
-msgstr "%s: objektet kunde inte tolkas: %s"
-
-#, c-format
-msgid "bad sha1 file: %s"
-msgstr "ogiltig sha1-fil: %s"
-
-msgid "Checking object directory"
-msgstr "Kontrollerar objektkatalog"
-
-msgid "Checking object directories"
-msgstr "Kontrollerar objektkataloger"
-
 #, c-format
 msgid "Checking cache tree of %s"
 msgstr "Kontrollerar cacheträd för %s"
@@ -7277,14 +7500,6 @@ msgstr "icke-träd i cacheträd"
 msgid "%s: invalid sha1 pointer in resolve-undo of %s"
 msgstr "%s: ogiltig sha1-pekare i resolve-undo för %s"
 
-#, c-format
-msgid "unable to load rev-index for pack '%s'"
-msgstr "kan inte läsa rev-index för paketfil ”%s”"
-
-#, c-format
-msgid "invalid rev-index for pack '%s'"
-msgstr "ogiltigt rev-index för paketet ”%s”"
-
 msgid "Checking ref database"
 msgstr "Kontrollerar referensdatabasen"
 
@@ -7340,9 +7555,6 @@ msgstr "visa ordrika namn för nåbara objekt"
 msgid "check reference database consistency"
 msgstr "kontrollerar referensdatabasens konsistens"
 
-msgid "Checking objects"
-msgstr "Kontrollerar objekt"
-
 msgid "git fsmonitor--daemon start [<options>]"
 msgstr "git fsmonitor--daemon start [<flaggor>]"
 
@@ -7527,11 +7739,6 @@ msgstr ""
 "gc körs redan på maskinen ”%s” pid %<PRIuMAX> (använd --force om så inte är "
 "fallet)"
 
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr ""
-"Det finns för många onåbara lösa objekt; kör ”git prune” för att ta bort dem."
-
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
@@ -7571,9 +7778,6 @@ msgstr ""
 "hoppar över ”incremental-repack”-uppgift eftersom core.multiPackIndex är "
 "inaktiverat"
 
-msgid "failed to perform geometric repack"
-msgstr "misslyckades att utföra geometrisk ompackning"
-
 #, c-format
 msgid "task '%s' failed"
 msgstr "uppgiften ”%s” misslyckades"
@@ -7700,7 +7904,7 @@ msgid ""
 "then try again. If it still fails, a git-maintenance(1) process may have\n"
 "crashed in this repository earlier: remove the file manually to continue."
 msgstr ""
-"Kunde inte skapa ”%s.lock”: %s.\n"
+"kunde inte skapa ”%s.lock”: %s.\n"
 "\n"
 "Det verkar som en annan schemalagd git-maintenance(1)-process kör i det\n"
 "här arkivet. Se till att inga andra underhållsprocesser körs och försök\n"
@@ -7743,7 +7947,6 @@ msgstr "grep: misslyckades skapa tråd. %s"
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "felaktigt antal trådar angivet (%d) för %s"
 
-#. #-#-#-#-#  grep.c.po  #-#-#-#-#
 #. TRANSLATORS: %s is the configuration
 #. variable for tweaking threads, currently
 #. grep.threads
@@ -8074,6 +8277,13 @@ msgstr "användning: %s%s"
 msgid "'git help config' for more information"
 msgstr "”git help config” för mer information"
 
+msgid ""
+"git history drop <commit> [--dry-run] [--update-refs=(branches|head)] [--"
+"empty=(drop|keep|abort)]"
+msgstr ""
+"git history drop <incheckning> [--dry-run] [--update-refs=(branches|head)] "
+"[--empty=(drop|keep|abort)]"
+
 msgid ""
 "git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--"
 "reedit-message] [--empty=(drop|keep|abort)]"
@@ -8101,6 +8311,10 @@ msgstr ""
 "Ange incheckningsmeddelandet för %s-ändringarna. Rader som inleds\n"
 "med ”%s” kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n"
 
+#, c-format
+msgid "could not write to '%s'"
+msgstr "kunde inte skriva till ”%s”"
+
 #, c-format
 msgid "Aborting commit as launching the editor failed.\n"
 msgstr ""
@@ -8218,6 +8432,10 @@ msgstr "misslyckades spela upp ättlingar på nytt"
 msgid "failed writing reworded commit"
 msgstr "misslyckades skriva omformulerad incheckning"
 
+#, c-format
+msgid "unable to parse tree %s"
+msgstr "kan inte tolka trädet %s"
+
 msgid "unable to populate index with tree"
 msgstr "kan inte fylla i indexet med trädet"
 
@@ -8252,6 +8470,30 @@ msgstr "kommandot förväntar en incheckning-igt"
 msgid "cannot split up merge commit"
 msgstr "kan inte dela sammanslagningsincheckning"
 
+msgid "cannot resolve HEAD commit"
+msgstr "kan inte bestämma HEAD:s incheckning"
+
+msgid "cannot resolve tree for HEAD"
+msgstr "kan inte bestämma trädet för HEAD"
+
+msgid "how to handle descendants that become empty"
+msgstr "hur ättlingar som blir tomma ska hanteras"
+
+#, c-format
+msgid "cannot drop merge commit: %s"
+msgstr "kan inte kasta sammanslagningsincheckning: %s"
+
+msgid "dropping this commit would overwrite local changes; aborting"
+msgstr ""
+"lokala ändringar skulle skrivas över om incheckningen hoppas över; avbryter"
+
+msgid "failed to update references"
+msgstr "misslyckades uppdatera referenser"
+
+#, c-format
+msgid "could not update working tree to new commit %s"
+msgstr "kunde inte uppdatera arbetskatalogen till den nya incheckningen %s"
+
 msgid ""
 "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-"
 "stdin=<path>] [(-j|--jobs) <n>]\n"
@@ -8320,6 +8562,9 @@ msgstr "emottog inte det förväntade objektet %s"
 msgid "object %s: expected type %s, found %s"
 msgstr "objektet %s: förväntad typ %s, såg %s"
 
+msgid "Checking objects"
+msgstr "Kontrollerar objekt"
+
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
@@ -9336,6 +9581,10 @@ msgstr "objektet ”%s” finns inte"
 msgid "Could not write object file"
 msgstr "Kunde inte skriva objektfilen"
 
+#, c-format
+msgid "unknown option %s"
+msgstr "okänd flagga %s"
+
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "kunde inte tolka objektet ”%s”"
@@ -9766,6 +10015,10 @@ msgstr "git multi-pack-index [<flaggor>] expire"
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<flaggor>] repack [--batch-size=<storlek>]"
 
+#, c-format
+msgid "object directory is not an alternate of the current repository: '%s'"
+msgstr "objektkatalogen är inte en suppleant för det aktuella arkivet: ”%s”"
+
 msgid "directory"
 msgstr "katalog"
 
@@ -9890,6 +10143,12 @@ msgstr "flera källor för samma mål"
 msgid "destination directory does not exist"
 msgstr "destinationskatalogen finns inte"
 
+msgid "destination is beyond a symbolic link"
+msgstr "destinationen är på andra sidan av en symbolisk länk"
+
+msgid "destination is not a directory"
+msgstr "destinationen är inte en katalog"
+
 msgid "destination exists in the index"
 msgstr "destinationen finns i indexet"
 
@@ -9906,8 +10165,8 @@ msgid "Renaming %s to %s\n"
 msgstr "Byter namn på %s till %s\n"
 
 #, c-format
-msgid "renaming '%s' failed"
-msgstr "misslyckades byta namn på ”%s”"
+msgid "renaming '%s' to '%s' failed"
+msgstr "misslyckades byta namn från ”%s” till ”%s”"
 
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<flaggor>] <incheckning>..."
@@ -10516,9 +10775,21 @@ msgstr "kan inte öppna paketfilen"
 msgid "loose object at %s could not be examined"
 msgstr "det lösa objektet på %s kunde inte undersökas"
 
+#, c-format
+msgid "cannot read object for %s"
+msgstr "kan inte läsa objekt för %s"
+
+#, c-format
+msgid "cannot map object %s to %s"
+msgstr "kan inte koppla objektet %s till %s"
+
 msgid "unable to force loose object"
 msgstr "kan inte tvinga löst objekt"
 
+#, c-format
+msgid "could not find commit %s"
+msgstr "kunde inte hitta incheckningen %s"
+
 #, c-format
 msgid "not a rev '%s'"
 msgstr "inte en referens ”%s”"
@@ -10553,9 +10824,6 @@ msgstr "<version>[,<offset>]"
 msgid "write the pack index file in the specified idx format version"
 msgstr "skriv paketindexfilen i angiven indexformatversion"
 
-msgid "maximum size of each output pack file"
-msgstr "maximal storlek på varje utdatapaketfil"
-
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorera lånade objekt från supplerande objektlager"
 
@@ -11134,6 +11402,14 @@ msgstr "ogiltigt värde för ”%s”"
 msgid "could not push to %s"
 msgstr "kunde inte sända till %s"
 
+#, c-format
+msgid "'%s' is not a valid push target"
+msgstr "”%s” är inte ett giltigt sändmål"
+
+#, c-format
+msgid "Did you mean to use: git push %s %s?"
+msgstr "Menade du att använda: git push %s %s?"
+
 msgid "repository"
 msgstr "arkiv"
 
@@ -11955,6 +12231,27 @@ msgstr "git refs exists <referens>"
 msgid "git refs optimize "
 msgstr "git refs optimize "
 
+msgid ""
+"git refs create [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value>"
+msgstr ""
+"git refs create [--message=<orsak>] [--no-deref] [--create-reflog] <ref> "
+"<nytt-värde>"
+
+msgid "git refs delete [--message=<reason>] [--no-deref] <ref> [<old-value>]"
+msgstr ""
+"git refs delete [--message=<orsak>] [--no-deref] <ref> [<gammalt-värde>]"
+
+msgid ""
+"git refs update [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value> [<old-value>]"
+msgstr ""
+"git refs update [--message=<orsak>] [--no-deref] [--create-reflog] <ref> "
+"<nytt-värde> [<gammalt-värde>]"
+
+msgid "git refs rename [--message=<reason>] <old-ref> <new-ref>"
+msgstr "git refs rename [--message=<orsak>] <gammal-ref> <ny-ref>"
+
 msgid "specify the reference format to convert to"
 msgstr "ange referensformatet att konvertera till"
 
@@ -11989,15 +12286,65 @@ msgstr "referensen existerar inte"
 msgid "failed to look up reference"
 msgstr "misslyckades slå upp referensen"
 
-msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
-msgstr ""
-"git remote add [-t <gren>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <namn> <url>"
-
-msgid "git remote rename [--[no-]progress] <old> <new>"
-msgstr "git remote rename [--[no-]progress] <gammal> <ny>"
+msgid "reason"
+msgstr "skäl"
+
+msgid "reason of the update"
+msgstr "skäl till uppdateringen"
+
+msgid "update <refname> not the one it points to"
+msgstr "uppdatera <refnamn> inte det den pekar på"
+
+msgid "create a reflog"
+msgstr "skapa en referenslogg"
+
+msgid "create requires reference name and an object ID"
+msgstr "skapa kräver referensnamn och ett objekt-ID"
+
+msgid "refusing to perform update with empty message"
+msgstr "vägrar utföra uppdatering med tomt meddelande"
+
+#, c-format
+msgid "invalid object ID: '%s'"
+msgstr "ogiltigt objekt-ID: ”%s”"
+
+msgid "cannot create reference with null new object ID"
+msgstr "kan inte skapa referens med nytt objekt-ID som är null"
+
+msgid "delete requires reference name and an optional old object ID"
+msgstr "borttagning kräver referensnamn och ett valfritt gammalt objekt-ID"
+
+msgid "cannot delete reference with null old object ID"
+msgstr "kan inte ta bort referens med gammalt objekt-ID som är null"
+
+msgid "update requires reference name, new value and an optional old value"
+msgstr ""
+"uppdatering kräver referensnamn, nytt värde och ett valfritt gammalt värde"
+
+msgid "rename requires old and new reference name"
+msgstr "namnändring kräver gammalt och nytt referensnamn"
+
+#, c-format
+msgid "invalid ref format: '%s'"
+msgstr "felaktigt referensformat: ”%s”"
+
+#, c-format
+msgid "reference does not exist: '%s'"
+msgstr "referensen existerar inte: ”%s”"
+
+#, c-format
+msgid "reference already exists: '%s'"
+msgstr "referensen finns redan: ”%s”"
+
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
+msgstr ""
+"git remote add [-t <gren>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <namn> <url>"
+
+msgid "git remote rename [--[no-]progress] <old> <new>"
+msgstr "git remote rename [--[no-]progress] <gammal> <ny>"
 
 msgid "git remote remove <name>"
 msgstr "git remote remove <namn>"
@@ -12456,11 +12803,13 @@ msgstr "var pratsam; måste skrivas före ett underkommando"
 msgid ""
 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]"
+"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]\n"
+"[--filter=<filter-spec>] [--drop-filtered [--dry-run]]"
 msgstr ""
 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<paket-namn>]\n"
-"[--write-midx[=<läge>]] [--name-hash-version=<n>] [--path-walk]"
+"[--write-midx[=<läge>]] [--name-hash-version=<n>] [--path-walk]\n"
+"[--filter=<filter-specifikation>] [--drop-filtered [--dry-run]]"
 
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
@@ -12561,6 +12910,38 @@ msgstr "skriv ett flerpaketsindex för de skapade paketen"
 msgid "pack prefix to store a pack containing filtered out objects"
 msgstr "paketprefix att lagra ett paket som innehåller utfiltrerade objekt"
 
+msgid "delete filtered out objects (requires --filter)"
+msgstr "ta bort filtrerade objekt (kräver --filter)"
+
+msgid "only show which objects would be dropped"
+msgstr "visa endast vilka objekt som ska kastas"
+
+msgid "--dry-run only takes effect with --drop-filtered"
+msgstr "--dry-run träder endast i kraft med --drop-filtered"
+
+msgid "--drop-filtered requires --filter"
+msgstr "--drop-filtered kräver --filter"
+
+msgid "--drop-filtered requires -a"
+msgstr "--drop-filtered kräver -a"
+
+msgid "--drop-filtered only supports --filter=blob:limit=<n> for now"
+msgstr "--drop-filtered stöder bara --filter=blob:limit=<n> än så länge"
+
+msgid "--drop-filtered requires a promisor remote"
+msgstr "--drop-filtered kräver ett kontraktsfjärr"
+
+msgid ""
+"--drop-filtered cannot be used while another operation (merge, rebase, am, "
+"cherry-pick, revert, or bisect) is in progress"
+msgstr ""
+"--drop-filtered kan inte användas samtidigt som en annan åtgärd (merge, "
+"rebase, am, cherry-pick, revert, eller bisect) pågår"
+
+#, c-format
+msgid "cannot drop '%s' (%s): it is referenced by the current index"
+msgstr "kan inte kasta ”%s” (%s): den refereras av nuvarande index"
+
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "kan inte ta bort paket i ett ”precious-objects”-arkiv"
 
@@ -12770,11 +13151,11 @@ msgstr "ogiltigt värde för %s: ”%s”"
 msgid ""
 "(EXPERIMENTAL!) git replay ([--contained] --onto=<newbase> | --"
 "advance=<branch> | --revert=<branch>)\n"
-"[--ref=<ref>] [--ref-action=<mode>] <revision-range>"
+"[--ref=<ref>] [--ref-action=<mode>] [--linearize] <revision-range>"
 msgstr ""
 "(EXPERIMENTELLT!) git replay ([--contained] --onto=<nybas> | --"
 "advance=<gren> | --revert=<gren>)\n"
-"[--ref=<ref>] [--ref-action[=<läge>]] <revisions-intervall>"
+"[--ref=<ref>] [--ref-action=<läge>] [--linearize] <revisions-intervall>"
 
 msgid "update all branches that point at commits in <revision-range>"
 msgstr ""
@@ -12795,6 +13176,11 @@ msgstr "referensen att uppdatera med resultatet"
 msgid "control ref update behavior (update|print)"
 msgstr "styr beteende för referensuppdatering (update|print)"
 
+msgid "drop merge commits, replaying only non-merge commits"
+msgstr ""
+"kasta sammanslagningar, återspelar bara incheckningar som inte är "
+"sammanslagningar"
+
 msgid "exactly one of --onto, --advance, or --revert is required"
 msgstr "exakt en av --onto, --advance eller --revert krävs"
 
@@ -12806,6 +13192,12 @@ msgstr ""
 "några flaggor för revisionstraversering kommer överstyras eftersom ”%s”-"
 "biten i ”struct rev_info” kommer att tvingas"
 
+msgid "unable to get common directory"
+msgstr "kan inte hämta gemensam katalog"
+
+msgid "unable to get git directory"
+msgstr "kan inte hämta git-katalogen"
+
 #, c-format
 msgid "key '%s' not found"
 msgstr "nyckeln ”%s” hittades inte"
@@ -13023,6 +13415,9 @@ msgstr "Kunde inte skriva ny indexfil."
 msgid "unable to get disk usage of %s"
 msgstr "kan inte hämta diskanvändning för %s"
 
+msgid "--missing-only requires --missing=print or --missing=print-info"
+msgstr "--missing-only kräver --missing=print eller --missing=print-info"
+
 #, c-format
 msgid "invalid value for '%s': '%s', the only allowed format is '%s'"
 msgstr "felaktigt värde för ”%s”: ”%s”, det enda tillåtna formatet är ”%s”"
@@ -13327,7 +13722,7 @@ msgid "sort output according to the number of commits per author"
 msgstr "sortera utdata enligt antal incheckningar per författare"
 
 msgid "suppress commit descriptions, only provides commit count"
-msgstr "undertryck beskrivningar, visa bara antal incheckningar"
+msgstr "undertryck beskrivningar för incheckningar, visa endast antalet"
 
 msgid "show the email address of each author"
 msgstr "visa e-postadress för varje författare"
@@ -13870,7 +14265,7 @@ msgid "include untracked files in the stash"
 msgstr "ta med ospårade filer i ”stash”"
 
 msgid "only show untracked files in the stash"
-msgstr "visa bara ospårade filer i ”stash”"
+msgstr "visa endast ospårade filer i ”stash”"
 
 #, c-format
 msgid "Cannot update %s with %s"
@@ -14257,7 +14652,7 @@ msgid ""
 "'--reference-if-able' instead of '--reference'."
 msgstr ""
 "En suppleant beräknad från huvudprojektets suppleant är ogiltig.\n"
-"För att i så fall låta Git klona utan ett suppleant, sätt\n"
+"För att i så fall låta Git klona utan en suppleant, sätt\n"
 "submodule.alternateErrorStrategy till ”info” eller, likvärdigt, klona\n"
 "med ”--reference-if-able” istället för ”--reference”."
 
@@ -14566,7 +14961,7 @@ msgstr "Aktiverar lokal git-katalog för undermodulen ”%s” på nytt\n"
 
 #, c-format
 msgid "unable to checkout submodule '%s'"
-msgstr "Kan inte checka ut undermodulen ”%s”"
+msgstr "kan inte checka ut undermodulen ”%s”"
 
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr "se till att .gitmodules finns i arbetskatalogen"
@@ -14650,12 +15045,6 @@ msgstr "förkorta ref-utdata"
 msgid "recursively dereference (default)"
 msgstr "avreferera rekursivt (standard)"
 
-msgid "reason"
-msgstr "skäl"
-
-msgid "reason of the update"
-msgstr "skäl till uppdateringen"
-
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
 "        [(--trailer <token>[(=|:)<value>])...]\n"
@@ -14775,9 +15164,6 @@ msgstr "använd annan nyckel för att signera taggen"
 msgid "replace the tag if exists"
 msgstr "ersätt taggen om den finns"
 
-msgid "create a reflog"
-msgstr "skapa en referenslogg"
-
 msgid "Tag listing options"
 msgstr "Alternativ för listning av taggar"
 
@@ -15055,9 +15441,6 @@ msgstr "git update-ref [<flaggor>] --stdin [-z] [--batch-updates]"
 msgid "delete the reference"
 msgstr "ta bort referensen"
 
-msgid "update <refname> not the one it points to"
-msgstr "uppdatera <refnamn> inte det den pekar på"
-
 msgid "stdin has NUL-terminated arguments"
 msgstr "standard in har NUL-terminerade argument"
 
@@ -15270,6 +15653,24 @@ msgstr ""
 "finns, avslutar; använd ”add -f” för att överstyra eller hämta från en fjärr "
 "först"
 
+#, c-format
+msgid ""
+"If you meant to create a worktree from a remote tracking branch on\n"
+"<remote>, you can do so by:\n"
+"\n"
+"    git worktree add -b %s %s <remote>/%s\n"
+"\n"
+"If you'd like to always prefer some remote, e.g. 'origin',\n"
+"consider setting checkout.defaultRemote=origin in your config."
+msgstr ""
+"Om du tänkte skapa en arbetskatalog från en fjärrspårande gren på\n"
+"<fjärr> kan du göra det med:\n"
+"\n"
+"    git worktree add -b %s %s <fjärr>/%s\n"
+"\n"
+"Om du alltid vill föredra en fjärr, t.ex. fjärren ”origin”,\n"
+"överväg att ställa in checkout.defaultRemote=origin i din konfiguration."
+
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog"
@@ -15482,6 +15883,10 @@ msgstr "misslyckades hämta bunt från URI:en ”%s”"
 msgid "file at URI '%s' is not a bundle or bundle list"
 msgstr "filen på URI:en ”%s” är inte en bunt eller buntlista"
 
+#, c-format
+msgid "config '%s' has no value"
+msgstr "konfigurationen ”%s” har inget värde"
+
 #, c-format
 msgid "bundle-uri: unexpected argument: '%s'"
 msgstr "bundle-uri: okänt argument: ”%s”"
@@ -15837,9 +16242,8 @@ msgstr "Skapa tomt Git-arkiv eller ominitiera ett befintligt"
 msgid "Instantly browse your working repository in gitweb"
 msgstr "Omedelbart bläddra i din arbetskatalog med gitweb"
 
-msgid "Add or parse structured information in commit messages"
-msgstr ""
-"Lägg till eller tolka strukturerad information i incheckningsmeddelanden"
+msgid "Add or parse metadata in commit messages"
+msgstr "Lägg till eller tolka metadata i incheckningsmeddelanden"
 
 msgid "EXPERIMENTAL: Show when files were last modified"
 msgstr "EXPERIMENTELLT: Visa när filer sist ändrades"
@@ -16116,6 +16520,9 @@ msgstr "Tillhandahåll användarnamn och lösenord till Git"
 msgid "Git for CVS users"
 msgstr "Git för CVS-användare"
 
+msgid "Git's core data model"
+msgstr "Gits grundläggande datamodell"
+
 msgid "Tweaking diff output"
 msgstr "Justera diff-utdata"
 
@@ -16297,10 +16704,6 @@ msgstr "kan inte hitta alla incheckningsgraffiler"
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"
 
-#, c-format
-msgid "could not find commit %s"
-msgstr "kunde inte hitta incheckningen %s"
-
 msgid "commit-graph requires overflow generation data but has none"
 msgstr "incheckningsgraf kräver spillgenerationsdata, men har ingen"
 
@@ -16472,6 +16875,12 @@ msgstr "Bekräftar incheckningar i incheckningsgrafen"
 msgid "could not parse commit %s"
 msgstr "kunde inte tolka incheckningen %s"
 
+msgid "commit ancestry contains a cycle"
+msgstr "incheckningshistoriken är cyklisk"
+
+msgid "failed to check reachability"
+msgstr "misslyckades kontrollera nåbarhet"
+
 #, c-format
 msgid "object %s is a %s, not a %s"
 msgstr "objektet %s är en %s, inte en %s"
@@ -17056,7 +17465,7 @@ msgstr ""
 
 #, c-format
 msgid "server doesn't support '%s'"
-msgstr "Servern stöder inte ”%s”"
+msgstr "servern stöder inte ”%s”"
 
 #, c-format
 msgid "server doesn't support feature '%s'"
@@ -17107,6 +17516,14 @@ msgstr "ogiltigt svar på ls-refs: %s"
 msgid "expected flush after ref listing"
 msgstr "förväntade ”flush” efter ref-listan"
 
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "omaka algoritmer: klient %s; server %s"
+
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "servern stöder inte algoritmen ”%s”"
+
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "kan inte sätta SO_KEEPALIVE på uttaget"
 
@@ -17425,9 +17842,6 @@ msgstr "kunde inte öppna katalogen ”%s”"
 msgid "skipping '%s', which is neither file nor directory"
 msgstr "hoppar över ”%s”, som varken är en fil eller en katalog"
 
-msgid "could not duplicate stdout"
-msgstr "kunde inte duplicera standard ut"
-
 #, c-format
 msgid "could not add directory '%s' to archiver"
 msgstr "kunde inte lägga till katalogen ”%s” till arkiveraren"
@@ -17790,11 +18204,11 @@ msgid "continue listing the history of a file beyond renames"
 msgstr "fortsätt lista historiken för en fil bortom namnändringar"
 
 msgid ""
-"prevent rename/copy detection if the number of rename/copy targets exceeds "
-"given limit"
+"limit to cheap rename/copy detection if the number of rename/copy targets "
+"exceeds this value"
 msgstr ""
-"förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "
-"given gräns"
+"begränsa till billig detektering av namnbyte/kopiering om antalet namnbyten/"
+"kopior överskrider detta värde"
 
 msgid "Diff algorithm options"
 msgstr "Alternativ för diff-algoritm"
@@ -18034,10 +18448,6 @@ msgstr "kunde inte migrera git-katalog från ”%s” till ”%s”"
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "tips: Väntar på att textredigeringsprogrammet ska stänga filen...%c"
 
-#, c-format
-msgid "could not write to '%s'"
-msgstr "kunde inte skriva till ”%s”"
-
 #, c-format
 msgid "could not edit '%s'"
 msgstr "kunde inte redigera ”%s”"
@@ -18103,6 +18513,51 @@ msgstr "måste vara en av nothing, matching, simple, upstream eller current"
 msgid "too many args to run %s"
 msgstr "för många flaggor för att köra %s"
 
+msgid "unable to write request to remote"
+msgstr "kan inte skriva anrop till fjärren"
+
+msgid "object-info capability is not enabled on the server"
+msgstr "kapabiliteten ”object-info” är inte aktiverad på servern"
+
+msgid "object-info requires protocol v2"
+msgstr "kapabiliteten ”object-info” kräver protokoll v2"
+
+#, c-format
+msgid "object-info: expected %<PRIuMAX> attributes, got %<PRIuMAX>"
+msgstr "object-info: förväntade %<PRIuMAX> attribut, fick %<PRIuMAX>"
+
+msgid "object-info: unrequested 'size' attribute"
+msgstr "object-info: oefterfrågat ”size”-attribut"
+
+msgid "object-info: duplicate 'size' attribute"
+msgstr "object-info: dubblerat ”size”-attribut"
+
+msgid "object-info: unrequested 'type' attribute"
+msgstr "object-info: oefterfrågat ”type”-attribut"
+
+msgid "object-info: duplicate 'type' attribute"
+msgstr "object-info: dubblerat ”type”-attribut"
+
+#, c-format
+msgid "object-info: unknown attribute '%s'"
+msgstr "object-info: okänt attribut ”%s”"
+
+#, c-format
+msgid "object-info: expected %<PRIuMAX> objects, got %<PRIuMAX>"
+msgstr "object-info: förväntade %<PRIuMAX> objekt, fick %<PRIuMAX>"
+
+#, c-format
+msgid "object-info: expected OID: %s, got %s"
+msgstr "object-info: förväntade OID: %s, fick %s"
+
+#, c-format
+msgid "object-info: object %s has invalid type '%s'"
+msgstr "object-info: objektet %s har ogiltig typ ”%s”"
+
+#, c-format
+msgid "object-info: expected flush after %<PRIuMAX> objects"
+msgstr "object-info: förväntade ”flush” efter %<PRIuMAX> objekt"
+
 #, c-format
 msgid ""
 "You are attempting to fetch %s, which is in the commit graph file but not in "
@@ -18231,20 +18686,9 @@ msgstr "inga gemensamma incheckningar"
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: hämtning misslyckades."
 
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr "omaka algoritmer: klient %s; server %s"
-
-#, c-format
-msgid "the server does not support algorithm '%s'"
-msgstr "servern stöder inte algoritmen ”%s”"
-
 msgid "Server does not support shallow requests"
 msgstr "Servern stöder inte grunda förfrågningar"
 
-msgid "unable to write request to remote"
-msgstr "kan inte skriva anrop till fjärren"
-
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "förväntade ”%s”, tog emot ”%s”"
@@ -18403,6 +18847,10 @@ msgstr "-c förväntar en konfigurationssträng\n"
 msgid "no config key given for --config-env\n"
 msgstr "ingen konfigurationsnyckel angavs för --config-env\n"
 
+#, c-format
+msgid "no file given for '%s' option\n"
+msgstr "ingen fil angavs för flaggan ”%s”\n"
+
 #, c-format
 msgid "no attribute source given for --attr-source\n"
 msgstr "ingen attributkälla angavs för --attr-source\n"
@@ -18911,8 +19359,12 @@ msgstr "tomt ident-namn (för <%s>) ej tillåtet"
 msgid "name consists only of disallowed characters: %s"
 msgstr "namnet består enbart av ej tillåtna tecken: %s"
 
-msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
-msgstr "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <mapp>] < <mbox>"
+msgid ""
+"git imap-send [-v] [-q] [--[no-]curl] [--[no-]draft] [(--folder|-f) "
+"<folder>] < <mbox>"
+msgstr ""
+"git imap-send [-v] [-q] [--[no-]curl] [--[no-]draft] [(--folder|-f) <mapp>] "
+"< <mbox>"
 
 msgid "no IMAP host specified"
 msgstr "ingen IMAP-värd angavs"
@@ -18984,6 +19436,9 @@ msgstr "kan inte nå gles blob på ”%s”"
 msgid "unable to parse sparse filter data in %s"
 msgstr "kan inte tolka gles filterdata i %s"
 
+msgid "filter_oidset: only blob:limit filters are supported"
+msgstr "filter_oidset: enbart blob:limit-filter stöds"
+
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
 msgstr "posten ”%s” i trädet %s har träd-läge, men är inte ett träd"
@@ -19072,6 +19527,10 @@ msgstr "felaktigt värde för marker-size ”%s”, förväntade ett heltal"
 msgid "Could not parse object '%s'"
 msgstr "Kunde inte tolka objektet ”%s”"
 
+#, c-format
+msgid "tree has duplicate entries for '%s'"
+msgstr "trädet har dubblerade poster för ”%s”"
+
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"
@@ -19671,56 +20130,6 @@ msgstr "kan inte sätta behörigheten till ”%s”"
 msgid "core.fsyncMethod = batch is unsupported on this platform"
 msgstr "core.fsyncMethod = batch stöds inte på denna plattform"
 
-msgid "error when closing loose object file"
-msgstr "fel vid stängning av fil för löst objekt"
-
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
-"otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s"
-
-msgid "unable to create temporary file"
-msgstr "kan inte skapa temporär fil"
-
-msgid "unable to write loose object file"
-msgstr "kan inte skriva fil för löst objekt"
-
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "kan inte utföra ”deflate” på nytt objekt %s (%d)"
-
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "”deflateEnd” på objektet %s misslyckades (%d)"
-
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "förvirrad av instabil objektkälldata för %s"
-
-#, c-format
-msgid "write stream object %<PRIuMAX> != %<PRIuMAX>"
-msgstr "skriv strömobjektet %<PRIuMAX> != %<PRIuMAX>"
-
-#, c-format
-msgid "unable to stream deflate new object (%d)"
-msgstr "kan inte utföra ”deflate” på nytt strömobjekt (%d)"
-
-#, c-format
-msgid "deflateEnd on stream object failed (%d)"
-msgstr "”deflateEnd” på strömobjektet misslyckades (%d)"
-
-#, c-format
-msgid "unable to create directory %s"
-msgstr "kan inte skapa katalogen %s"
-
-#, c-format
-msgid "cannot read object for %s"
-msgstr "kan inte läsa objekt för %s"
-
-#, c-format
-msgid "cannot map object %s to %s"
-msgstr "kan inte koppla objektet %s till %s"
-
 #, c-format
 msgid "object fails fsck: %s"
 msgstr "objekt klarar inte fsck: %s"
@@ -19771,6 +20180,9 @@ msgstr "kan inte tolka typen från huvudet ”%s” för %s"
 msgid "unable to unpack contents of %s"
 msgstr "kan inte tolka innehåll i %s"
 
+msgid "unable to migrate temporary objects"
+msgstr "kan inte migrera temporära objekt"
+
 #. TRANSLATORS: This is a line of ambiguous object
 #. output shown when we cannot look up or parse the
 #. object in question. E.g. "deadbeef [bad object]".
@@ -19874,7 +20286,7 @@ msgstr "loggen för ”%.*s” har bara %d poster"
 
 #, c-format
 msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "Sökvägen ”%s” finns på disken, men inte i ”%.*s”"
+msgstr "sökvägen ”%s” finns på disken, men inte i ”%.*s”"
 
 #, c-format
 msgid ""
@@ -19988,8 +20400,8 @@ msgid "replacement %s not found for %s"
 msgstr "ersättningen %s hittades inte för %s"
 
 #, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "packat objekt %s (lagrat i %s) är trasigt"
+msgid "object %s is corrupt"
+msgstr "objektet %s är trasigt"
 
 #, c-format
 msgid "missing mapping of %s to %s"
@@ -20003,6 +20415,9 @@ msgstr "%s är inte ett giltigt objekt"
 msgid "%s is not a valid '%s' object"
 msgstr "%s är inte ett giltigt ”%s”-objekt"
 
+msgid "primary object source does not support generating packfiles"
+msgstr "den primära objektkällan stöder inte generering av paketfiler"
+
 msgid "unable to fdopen alternates lockfile"
 msgstr "kan inte utföra ”fdopen” på suppleantlåsfil"
 
@@ -20012,6 +20427,21 @@ msgstr "kan inte läsa ”alternates”-filen"
 msgid "unable to move new alternates file into place"
 msgstr "kan inte flytta ny ”alternates”-fil på plats"
 
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+"Det finns för många onåbara lösa objekt; kör ”git prune” för att ta bort dem."
+
+#, c-format
+msgid "pack-objects died of signal %d"
+msgstr "pack-objects dog med signalen %d"
+
+msgid "could not spawn pack-objects"
+msgstr "kunde inte starta pack-objects"
+
+msgid "error writing to pack-objects"
+msgstr "fel vid skrivning till pack-objects"
+
 #, c-format
 msgid "unable to open loose object %s"
 msgstr "kan inte öppna det lösa objektet %s"
@@ -20035,6 +20465,90 @@ msgstr "huvudet för %s är för långt, mer än %d byte"
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "det lösa objektet %s (lagrat i %s) är trasigt"
 
+msgid "error when closing loose object file"
+msgstr "fel vid stängning av fil för löst objekt"
+
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
+"otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s"
+
+msgid "unable to create temporary file"
+msgstr "kan inte skapa temporär fil"
+
+msgid "unable to write loose object file"
+msgstr "kan inte skriva fil för löst objekt"
+
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "kan inte utföra ”deflate” på nytt objekt %s (%d)"
+
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "”deflateEnd” på objektet %s misslyckades (%d)"
+
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "förvirrad av instabil objektkälldata för %s"
+
+#, c-format
+msgid "write stream object %<PRIuMAX> != %<PRIuMAX>"
+msgstr "skriv strömobjektet %<PRIuMAX> != %<PRIuMAX>"
+
+#, c-format
+msgid "unable to stream deflate new object (%d)"
+msgstr "kan inte utföra ”deflate” på nytt strömobjekt (%d)"
+
+#, c-format
+msgid "deflateEnd on stream object failed (%d)"
+msgstr "”deflateEnd” på strömobjektet misslyckades (%d)"
+
+#, c-format
+msgid "unable to create directory %s"
+msgstr "kan inte skapa katalogen %s"
+
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: hashsökväg stämmer inte överens, hittad vid: %s"
+
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s: objektet trasigt eller saknas: %s"
+
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "ogiltig sha1-fil: %s"
+
+msgid "Checking object directory"
+msgstr "Kontrollerar objektkatalog"
+
+msgid "Checking object directories"
+msgstr "Kontrollerar objektkataloger"
+
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "packat objekt %s (lagrat i %s) är trasigt"
+
+#, c-format
+msgid "unable to load rev-index for pack '%s'"
+msgstr "kan inte läsa rev-index för paketfil ”%s”"
+
+#, c-format
+msgid "invalid rev-index for pack '%s'"
+msgstr "ogiltigt rev-index för paketet ”%s”"
+
+msgid "object database transaction already pending"
+msgstr "objektdatabastransaktion väntar redan"
+
+msgid "failed to start ODB transaction"
+msgstr "misslyckades starta ODB-transaktion"
+
+msgid "failed to commit ODB transaction"
+msgstr "misslyckades checka in ODB-transaktion"
+
+msgid "failed to finalize ODB transaction"
+msgstr "misslyckades slutföra ODB-transaktion"
+
 #, c-format
 msgid "duplicate entry when writing bitmap index: %s"
 msgstr "duplicerad post när bitkarteindex skulle skrivas: %s"
@@ -20110,6 +20624,9 @@ msgstr "flerpaketsbitkarta saknar nödvändigt omvänt index"
 msgid "could not open pack %s"
 msgstr "kunde inte öppna paketfilen %s"
 
+msgid "could not open bitmap for base MIDX"
+msgstr "kunde inte öppna bitkartan för bas-MIDX"
+
 msgid "corrupt bitmap lookup table: triplet position out of index"
 msgstr "trasig bitkarteuppslagstabell: trippelposition utanför indexet"
 
@@ -20663,6 +21180,49 @@ msgstr "kunde inte hämta %s från kontraktsfjärr"
 msgid "unsupported field '%s' in '%s' config"
 msgstr "fältet ”%s” i inställningen ”%s” stöds ej"
 
+#, c-format
+msgid ""
+"invalid remote name '%s' before '=' sign in '%s' from "
+"promisor.acceptFromServerUrl config"
+msgstr ""
+"ogiltigt fjärrnamn ”%s” före ”=”-tecknet i ”%s” från "
+"promisor.acceptFromServerUrl-konfiguration"
+
+#, c-format
+msgid ""
+"invalid url pattern '%s' in '%s' from promisor.acceptFromServerUrl config"
+msgstr ""
+"ogiltigt URL-mönster ”%s” i ”%s” från promisor.acceptFromServerUrl-"
+"konfigurationen"
+
+#, c-format
+msgid ""
+"couldn't generate a valid remote name from advertised url '%s', ignoring "
+"this remote"
+msgstr ""
+"kunde inte generera ett giltigt fjärrnamn från deklarerad URL ”%s”, "
+"ignorerar denna fjärr"
+
+#, c-format
+msgid ""
+"generated remote name '%s' from advertised url '%s' is invalid, ignoring "
+"this remote"
+msgstr ""
+"genererat fjärrnamn ”%s” från deklarerad URL ”%s” är ogiltigt, ignorerar "
+"denna fjärr"
+
+#, c-format
+msgid "couldn't normalize advertised url '%s', ignoring this remote"
+msgstr "kunde inte normalisera deklarerad URL ”%s”, ignorerar denna fjärr"
+
+#, c-format
+msgid "Auto-creating promisor remote '%s' for URL '%s'\n"
+msgstr "Skapar kontraktsfjärr ”%s” från URL:en ”%s” automatiskt\n"
+
+#, c-format
+msgid "too many remotes accepted with name like '%s-X', ignoring this remote"
+msgstr "för många fjärrar togs emot med namn som ”%s-X”, ignorerar denna fjärr"
+
 #, c-format
 msgid ""
 "known remote named '%s' but with URL '%s' instead of '%s', ignoring this "
@@ -20827,6 +21387,10 @@ msgstr "ogiltig extra överbliven ände: ”%s”"
 msgid "unable to enumerate additional recent objects"
 msgstr "kan inte räkna ytterligare nyliga objekt"
 
+#, c-format
+msgid "remove '%s'\n"
+msgstr "ta bort ”%s”\n"
+
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr "lägger inte till filalias ”%s” (”%s” finns redan i indexet)"
@@ -20982,10 +21546,6 @@ msgstr ""
 msgid "unexpected diff status %c"
 msgstr "diff-status %c förväntades inte"
 
-#, c-format
-msgid "remove '%s'\n"
-msgstr "ta bort ”%s”\n"
-
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
 "continue'.\n"
@@ -21982,6 +22542,10 @@ msgstr[0] ""
 msgstr[1] ""
 "Din gren ligger efter ”%s” med %d incheckningar, och kan snabbspolas.\n"
 
+#, c-format
+msgid "  (use \"git pull %s %s\" to update your local branch)\n"
+msgstr "  (använd ”git pull %s %s” för att uppdatera din lokala gren)\n"
+
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (använd ”git pull” för att uppdatera din lokala gren)\n"
 
@@ -21999,6 +22563,13 @@ msgstr[1] ""
 "Din gren och ”%s” har divergerat,\n"
 "och har %d respektive %d olika incheckningar.\n"
 
+#, c-format
+msgid ""
+"  (use \"git pull %s %s\" if you want to integrate the remote branch with "
+"yours)\n"
+msgstr ""
+"  (använd ”git pull %s %s” om du vill integrera fjärrgrenen med din egen)\n"
+
 msgid ""
 "  (use \"git pull\" if you want to integrate the remote branch with yours)\n"
 msgstr "  (använd ”git pull” om du vill integrera fjärrgrenen med din egen)\n"
@@ -22118,6 +22689,10 @@ msgstr "ersättningsdjupet för högt för objektet %s"
 msgid "'%s' is not a valid commit-ish for %s"
 msgstr "”%s” är inte en giltig incheckning-igt för %s"
 
+#, c-format
+msgid "'%s' does not point to a commit for %s"
+msgstr "”%s” pekar inte på en incheckning för %s"
+
 #, c-format
 msgid "argument to %s must be a reference"
 msgstr "argumentet till %s måste vara en referens"
@@ -22136,10 +22711,17 @@ msgstr "behöver några incheckningar för omspelning"
 msgid "all positive revisions given must be references"
 msgstr "alla positiva revisioner som anges måste vara referenser"
 
+#, c-format
+msgid "merge of %s onto %s failed"
+msgstr "sammanslagning av %s på %s misslyckades"
+
 #, c-format
 msgid "commit %s became empty after replay"
 msgstr "incheckningen %s blev tom efter återuppspelning"
 
+msgid "'--linearize' cannot be used with multiple branches"
+msgstr "”--linearize” kan inte användas med flera grenar"
+
 msgid "'--ref' cannot be used with multiple revision ranges"
 msgstr "”--ref” kan inte användas med flera revisionsintervall"
 
@@ -22357,7 +22939,7 @@ msgstr ""
 
 #, c-format
 msgid "cannot deduce worktree name from '%s'"
-msgstr "Kan inte härleda arbetsträdsnamn från ”%s”"
+msgstr "kan inte härleda arbetsträdsnamn från ”%s”"
 
 #, c-format
 msgid "directory '%s' exists already"
@@ -23218,6 +23800,9 @@ msgstr ""
 "och tillämpa de lokala ändringarna senare genom att köra\n"
 "”git stash pop”.\n"
 
+msgid "could not apply autostash; your changes are safe in the stash"
+msgstr "kunde inte tillämpa autostash; dina ändringar är säkrade i stash:en"
+
 #, c-format
 msgid ""
 "Autostash exists; creating a new stash entry.\n"
@@ -23438,8 +24023,8 @@ msgid "no path in gitfile: %s"
 msgstr "ingen sökväg i gitfil: %s"
 
 #, c-format
-msgid "not a git repository: %s"
-msgstr "inte ett git-arkiv: %s"
+msgid "gitfile does not point to a valid repository: %s"
+msgstr "gitfile pekar inte på ett giltigt arkiv: ”%s”"
 
 #, c-format
 msgid "'$%s' too big"
@@ -23479,7 +24064,7 @@ msgstr "fel vid läsning av ”%s”"
 
 #, c-format
 msgid "not a regular file: '%s'"
-msgstr "Inte en vanlig fil: ”%s”"
+msgstr "inte en vanlig fil: ”%s”"
 
 msgid "Unable to read current working directory"
 msgstr "Kan inte läsa aktuell arbetskatalog"
@@ -23560,6 +24145,9 @@ msgstr "ogiltigt namn på första gren: ”%s”"
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init: ignorerade --initial-branch=%s"
 
+msgid "failed creating object database"
+msgstr "misslyckades skapa objektdatabas"
+
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "kan inte hantera filtyp %d"
@@ -24098,6 +24686,9 @@ msgstr "%s sade oväntat: ”%s”"
 msgid "%s also locked %s"
 msgstr "%s låste också %s"
 
+msgid "could not dup helper output fd"
+msgstr "kunde inte duplicera hjälpprogrammets utdata-filhandtag"
+
 msgid "couldn't run fast-import"
 msgstr "kunde inte köra fast-import"
 
@@ -24177,6 +24768,10 @@ msgstr "kunde inte köra fast-export"
 msgid "error while running fast-export"
 msgstr "fel vid körning av fast-export"
 
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "kunde inte byta namn från ”%s” till ”%s”"
+
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -24242,6 +24837,9 @@ msgstr "se protocol.version i ”git help config” för mer information"
 msgid "server options require protocol version 2 or later"
 msgstr "serverflaggor kräver protokollversion 2 eller senare"
 
+msgid "remote does not support object-info"
+msgstr "fjärren stöder inte object-info"
+
 msgid "server does not support wait-for-done"
 msgstr "servern stöder inte wait-for-done"
 
@@ -24603,31 +25201,31 @@ msgid "warning: "
 msgstr "varning: "
 
 #, c-format
-msgid "'%s' is nominated for removal.\n"
-msgstr "”%s” har nominerats för borttagning.\n"
+msgid "'%s' will be removed soon.\n"
+msgstr "”%s” kommer snart att tas bort.\n"
 
 #, c-format
 msgid ""
-"If you still use this command, here's what you can do:\n"
+"If you need a replacement:\n"
 "\n"
-"- read https://git-scm.com/docs/BreakingChanges.html\n"
-"- check if anyone has discussed this on the mailing\n"
-"  list and if they came up with something that can\n"
-"  help you: https://lore.kernel.org/git/?q=%s\n"
-"- send an email to <git@vger.kernel.org> to let us\n"
-"  know that you still use this command and were unable\n"
-"  to determine a suitable replacement\n"
+"- Read https://git-scm.com/docs/BreakingChanges.html.\n"
+"\n"
+"- Check what others on the mailing list suggest as a replacement:\n"
+"  https://lore.kernel.org/git/?q=%s\n"
+"\n"
+"- Send an email to <git@vger.kernel.org> asking for help, only if\n"
+"  suggestions by others do not work for you.\n"
 "\n"
 msgstr ""
-"Om du fortfarande använder det här kommandot kan du:\n"
+"Om du behöver en ersättning:\n"
 "\n"
-"- läsa https://git-scm.com/docs/BreakingChanges.html\n"
-"- se om någon har diskuterat det här på sändlistan\n"
-"  och se om de kommit på något som kan hjälpa dig:\n"
+"- Läs https://git-scm.com/docs/BreakingChanges.html.\n"
+"\n"
+"- Se vad andra på sändlistan föreslår som ersättning:\n"
 "  https://lore.kernel.org/git/?q=%s\n"
-"- sända en e-post till <git@vger.kernel.org> för att\n"
-"  berätta för oss att du fortfarande använder kommandot\n"
-"  för att komma fram till en lämplig ersättning\n"
+"\n"
+"- Sänd en e-post till <git@vger.kernel.org> för att be om hjälp,\n"
+"  men bara om andras förslag inte fungerar för dig.\n"
 "\n"
 
 msgid "refusing to run without --i-still-use-this"
@@ -25360,8 +25958,8 @@ msgstr ""
 "\n"
 
 #, perl-format
-msgid "No subject line in %s?"
-msgstr "Ingen ärenderad i %s?"
+msgid "No 'Subject:' line in '%s'\n"
+msgstr "Ärenderad saknas i ”%s”\n"
 
 #, perl-format
 msgid "Failed to open for writing %s: %s"

From 334a9a3867784dd0f916a887419ce1dec44f9063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>
Date: Tue, 15 Sep 2026 20:04:07 +0200
Subject: [PATCH 009/247] l10n: fr: update translation for git 2.56.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
---
 po/fr.po | 1436 +++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 1047 insertions(+), 389 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index f9613e793f9ade..1443625eb198a4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -36,7 +36,7 @@
 #   fanout           |  dispersion
 #   fast-forward     |  avance rapide
 #   fast-forwarded   |  mis à jour en avance rapide
-#   to fetch         |  rapatrier
+#   to fetch         |  récupérer
 #   fix conflicts    |  réglez les conflits
 #   to format        |  formater
 #   glob             |  glob
@@ -80,15 +80,15 @@
 #   to unstage       |  désindexer
 #   upstream         |  amont
 #   viewer           |  visualiseur
-#   worktree /       |
-#   work(ing) tree   |  arbre de travail
+#   worktree         |  arbre-de-travail
+#   working tree     |  arbre de travail
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2026-06-13 12:23+0200\n"
-"PO-Revision-Date: 2026-06-14 08:17+0200\n"
+"POT-Creation-Date: 2026-09-15 23:12+0000\n"
+"PO-Revision-Date: 2026-09-20 16:00+0200\n"
 "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n"
 "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
 "Language: fr\n"
@@ -451,7 +451,7 @@ msgstr "Abandonner l'ajout de l'index et de l'arbre%s [y,n,q,a,d%s,?] ? "
 #, c-format
 msgid "Discard this hunk from index and worktree%s [y,n,q,a,d%s,?]? "
 msgstr ""
-"Supprimer la section dans l'index et l'arbre de travail%s [y,n,q,a,d%s,?] ? "
+"Supprimer la section dans l'index et l'arbre-de-travail%s [y,n,q,a,d%s,?] ? "
 
 msgid ""
 "y - discard this hunk from index and worktree\n"
@@ -460,7 +460,7 @@ msgid ""
 "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 - éliminer cette section de l'index et de l'arbre de travail\n"
+"y - éliminer cette section de l'index et de l'arbre-de-travail\n"
 "n - ne pas éliminer cette section\n"
 "q - quitter ; ne pas éliminer cette section ni les autres restantes\n"
 "a - éliminer cette section et toutes les suivantes de ce fichier\n"
@@ -469,24 +469,24 @@ msgstr ""
 #, c-format
 msgid "Apply mode change to index and worktree%s [y,n,q,a,d%s,?]? "
 msgstr ""
-"Appliquer le changement de mode dans l'index et l'arbre de travail%s [y,n,q,"
-"a,d%s,?] ? "
+"Appliquer le changement de mode dans l'index et l'arbre-de-travail%s "
+"[y,n,q,a,d%s,?] ? "
 
 #, c-format
 msgid "Apply deletion to index and worktree%s [y,n,q,a,d%s,?]? "
 msgstr ""
-"Appliquer la suppression dans l'index et l'arbre de travail%s [y,n,q,a,"
-"d%s,?] ? "
+"Appliquer la suppression dans l'index et l'arbre-de-travail%s "
+"[y,n,q,a,d%s,?] ? "
 
 #, c-format
 msgid "Apply addition to index and worktree%s [y,n,q,a,d%s,?]? "
 msgstr ""
-"Appliquer l'ajout dans l'index et l'arbre de travail%s [y,n,q,a,d%s,?] ? "
+"Appliquer l'ajout dans l'index et l'arbre-de-travail%s [y,n,q,a,d%s,?] ? "
 
 #, c-format
 msgid "Apply this hunk to index and worktree%s [y,n,q,a,d%s,?]? "
 msgstr ""
-"Appliquer la section à l'index et l'arbre de travail%s [y,n,q,a,d%s,?] ? "
+"Appliquer la section à l'index et l'arbre-de-travail%s [y,n,q,a,d%s,?] ? "
 
 msgid ""
 "y - apply this hunk to index and worktree\n"
@@ -495,7 +495,7 @@ msgid ""
 "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 - appliquer cette section à l'index et à l'arbre de travail\n"
+"y - appliquer cette section à l'index et à l'arbre-de-travail\n"
 "n - ne pas appliquer cette section\n"
 "q - quitter ; ne pas appliquer cette section ni les autres restantes\n"
 "a - appliquer cette section et toutes les suivantes de ce fichier\n"
@@ -504,19 +504,19 @@ msgstr ""
 #, c-format
 msgid "Apply mode change to worktree%s [y,n,q,a,d%s,?]? "
 msgstr ""
-"Appliquer le changement de mode dans l'arbre de travail%s [y,n,q,a,d%s,?] ? "
+"Appliquer le changement de mode dans l'arbre-de-travail%s [y,n,q,a,d%s,?] ? "
 
 #, c-format
 msgid "Apply deletion to worktree%s [y,n,q,a,d%s,?]? "
-msgstr "Appliquer la suppression dans l'arbre de travail%s [y,n,q,a,d%s,?] ? "
+msgstr "Appliquer la suppression dans l'arbre-de-travail%s [y,n,q,a,d%s,?] ? "
 
 #, c-format
 msgid "Apply addition to worktree%s [y,n,q,a,d%s,?]? "
-msgstr "Appliquer l'ajout dans l'arbre de travail%s [y,n,q,a,d%s,?] ? "
+msgstr "Appliquer l'ajout dans l'arbre-de-travail%s [y,n,q,a,d%s,?] ? "
 
 #, c-format
 msgid "Apply this hunk to worktree%s [y,n,q,a,d%s,?]? "
-msgstr "Appliquer la section à l'arbre de travail%s [y,n,q,a,d%s,?] ? "
+msgstr "Appliquer la section à l'arbre-de-travail%s [y,n,q,a,d%s,?] ? "
 
 msgid ""
 "y - apply this hunk to worktree\n"
@@ -525,7 +525,7 @@ msgid ""
 "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 - appliquer cette section à l'arbre de travail\n"
+"y - appliquer cette section à l'arbre-de-travail\n"
 "n - ne pas appliquer cette section\n"
 "q - quitter ; ne pas appliquer cette section ni les autres restantes\n"
 "a - appliquer cette section et toutes les suivantes de ce fichier\n"
@@ -615,6 +615,7 @@ msgstr "'git apply --cached' a échoué"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
+#.
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
@@ -625,7 +626,7 @@ msgid "The selected hunks do not apply to the index!"
 msgstr "Les sections sélectionnées ne s'appliquent pas à l'index !"
 
 msgid "Apply them to the worktree anyway? "
-msgstr "Les appliquer quand même à l'arbre de travail ? "
+msgstr "Les appliquer quand même à l'arbre-de-travail ? "
 
 msgid "Nothing was applied.\n"
 msgstr "Rien n'a été appliqué.\n"
@@ -792,7 +793,7 @@ 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 ""
-"Corrigez-les puis lancez 'git add/rm <fichier>'\n"
+"Corrigez-les dans l'arbre de travail puis lancez 'git add/rm <fichier>'\n"
 "si nécessaire pour marquer la résolution et valider."
 
 msgid "Exiting because of an unresolved conflict."
@@ -888,8 +889,8 @@ msgstr ""
 "\n"
 "  git switch -\n"
 "\n"
-"Désactivez ce conseil en renseignant la variable de configuration advice."
-"detachedHead à false\n"
+"Désactivez ce conseil en renseignant la variable de configuration "
+"advice.detachedHead à false\n"
 "\n"
 
 #, c-format
@@ -1419,7 +1420,7 @@ msgid "mark new files with `git add --intent-to-add`"
 msgstr "marquer les nouveaux fichiers `git add --intent-to-add`"
 
 msgid "apply a patch without touching the working tree"
-msgstr "appliquer les rustines sans toucher à la copie de travail"
+msgstr "appliquer une rustine sans toucher à l'arbre de travail"
 
 msgid "accept a patch that touches outside the working area"
 msgstr "accepter une rustine qui touche hors de la copie de travail"
@@ -1791,6 +1792,14 @@ msgstr "impossible de démarrer 'show' pour l'objet '%s'"
 msgid "could not read file '%s'"
 msgstr "impossible de lire le fichier '%s'"
 
+#, c-format
+msgid "could not read bad term from file '%s'"
+msgstr "impossible de lire le terme « mauvais » depuis le fichier '%s'"
+
+#, c-format
+msgid "could not read good term from file '%s'"
+msgstr "impossible de lire le terme « bon » depuis le fichier '%s'"
+
 msgid "reading bisect refs failed"
 msgstr "impossible de lire les références de bissection"
 
@@ -1814,6 +1823,7 @@ msgstr[1] "(à peu près %d étapes)"
 
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
+#.
 #, 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"
@@ -1898,17 +1908,20 @@ msgstr "pas de suivi : information ambiguë pour la référence '%s'"
 #. TRANSLATORS: This is a line listing a remote with duplicate
 #. refspecs in the advice message below. For RTL languages you'll
 #. probably want to swap the "%s" and leading "  " space around.
+#.
 #. #-#-#-#-#  object-name.c.po  #-#-#-#-#
 #. TRANSLATORS: This is line item of ambiguous object output
 #. from describe_ambiguous_object() above. For RTL languages
 #. you'll probably want to swap the "%s" and leading " " space
 #. around.
+#.
 #, c-format
 msgid "  %s\n"
 msgstr "  %s\n"
 
 #. TRANSLATORS: The second argument is a \n-delimited list of
 #. duplicate refspecs, composed above.
+#.
 #, c-format
 msgid ""
 "There are multiple remotes whose fetch refspecs map to the remote\n"
@@ -2030,6 +2043,12 @@ msgstr "impossible de stat '%s'"
 msgid "empty patch. aborted"
 msgstr "rustine vide. abandon"
 
+msgid "could not initialize apply state"
+msgstr "impossible d'initialiser l'état d'application"
+
+msgid "could not check apply state"
+msgstr "impossible de vérifier l'état d'application"
+
 #, c-format
 msgid "could not apply '%s'"
 msgstr "impossible d'appliquer '%s'"
@@ -2068,6 +2087,9 @@ msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 "renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)"
 
+msgid "add conflict-resolved tracked files"
+msgstr "ajouter les fichiers suivis avec conflits résolus"
+
 msgid "record only the fact that the path will be added later"
 msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard"
 
@@ -2076,7 +2098,7 @@ msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
 
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
-"ignorer les chemins effacés dans la copie de travail (identique à --no-all)"
+"ignorer les chemins effacés dans l'arbre de travail (identique à --no-all)"
 
 msgid "don't add, only refresh the index"
 msgstr "ne pas ajouter, juste rafraîchir l'index"
@@ -2139,6 +2161,22 @@ msgstr "Utilisez -f si vous voulez vraiment les ajouter."
 msgid "adding files failed"
 msgstr "échec de l'ajout de fichiers"
 
+#, c-format
+msgid "updating file '%s' failed"
+msgstr "échec de la mise à jour du fichier '%s'"
+
+#, c-format
+msgid ""
+"the following paths still have conflict markers:\n"
+"%s"
+msgstr ""
+"les chemins suivants contiennent encore des marqueurs de conflit :\n"
+"%s"
+
+#, c-format
+msgid "cannot lstat: '%s'"
+msgstr "impossible de faire un lstat de '%s'"
+
 #, c-format
 msgid "'%s' cannot be negative"
 msgstr "'%s' doit être non négatif"
@@ -2313,6 +2351,7 @@ msgstr "Le corps de la validation est :"
 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
 #. in your translation. The program will only accept English
 #. input at this point.
+#.
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "
@@ -2431,7 +2470,7 @@ msgid "pass -m flag to git-mailinfo"
 msgstr "passer l'option -m à git-mailinfo"
 
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"
+msgstr "passer l'option --keep-cr à git-mailsplit pour le format mbox"
 
 msgid "strip everything before a scissors line"
 msgstr "retirer tout le contenu avant la ligne des ciseaux"
@@ -2583,13 +2622,14 @@ msgstr "argument non reconnu : %s"
 
 msgid ""
 "git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n"
-"                 [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
-"[<pathspec>...]"
+"                 [--no-checkout] [--first-parent] [--reset-when-"
+"found[=<where>]] [<bad> [<good>...]] [--] [<pathspec>...]"
 msgstr ""
-"git bisect start [--term-(new,bad)=<terme-nouveau> --term-(old|good)=<terme-"
+"git bisect start [--term-(bad|new)=<terme-nouveau> --term-(good|old)=<terme-"
 "ancien>]\n"
-"                 [--no-checkout] [--first-parent] [<mauvais> [<bon>...]] "
-"[--] [<spéc-de-chemin>...]"
+"                 [--no-checkout] [--first-parent] [--reset-when-"
+"found[=<endroit>]] [<mauvais-commit> [<bon-commit>...]] [--] [<spécificateur-"
+"de-chemin>...]"
 
 msgid "git bisect (bad|new|<term-new>) [<rev>]"
 msgstr "git bisect (good|bad|<terme-nouveau>) [<rév>]"
@@ -2606,8 +2646,8 @@ msgstr "git bisect reset [<commit>]"
 msgid "git bisect replay <logfile>"
 msgstr "git bisect replay <fichier-journal>"
 
-msgid "git bisect run <cmd> [<arg>...]"
-msgstr "git bisect run <cmd>  [<arg>...]"
+msgid "git bisect run [--reset-when-found[=<where>]] <cmd> [<arg>...]"
+msgstr "git bisect run [--reset-when-found[=<endroit>]] <cmd> [<arg>...]"
 
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
@@ -2651,6 +2691,10 @@ msgstr ""
 "échec d'extraction de la HEAD d'origine '%s'. Essayez 'git bisect reset "
 "<commit>'."
 
+#, c-format
+msgid "invalid value for '--reset-when-found': '%s'"
+msgstr "valeur invalide pour '--reset-when-found' : '%s'"
+
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Mauvais argument pour bisect_write : %s"
@@ -2692,6 +2736,7 @@ msgstr "bissection avec seulement un commit %s"
 #. TRANSLATORS: Make sure to include [Y] and [n] in your
 #. translation. The program will only accept English input
 #. at this point.
+#.
 msgid "Are you sure [Y/n]? "
 msgstr "Confirmez-vous [Y/n] ? "
 
@@ -2733,6 +2778,10 @@ msgstr ""
 msgid "could not open '%s' for appending"
 msgstr "impossible d'ouvrir '%s' en ajout"
 
+#, c-format
+msgid "could not find commit for '%s'"
+msgstr "impossible de trouver le commit pour '%s'"
+
 msgid "'' is not a valid term"
 msgstr "'' n'est pas un terme valide"
 
@@ -2765,6 +2814,7 @@ msgstr "Vous devez démarrer avec \"git bisect start\"\n"
 #. TRANSLATORS: Make sure to include [Y] and [n] in your
 #. translation. The program will only accept English input
 #. at this point.
+#.
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr "Souhaitez-vous que je le fasse pour vous [Y/n] ? "
 
@@ -2817,6 +2867,9 @@ msgstr "la bissection a échoué : le code retour %d de %s est < 0 ou >= 128"
 msgid "cannot open file '%s' for writing"
 msgstr "impossible d'ouvrir '%s' en écriture"
 
+msgid "could not duplicate stdout"
+msgstr "impossible de dupliquer stdout"
+
 msgid "bisect run cannot continue any more"
 msgstr "la bissection ne peut plus continuer"
 
@@ -3003,6 +3056,7 @@ msgstr ""
 #. among various forms of relative timestamps, but
 #. your language may need more or fewer display
 #. columns.
+#.
 msgid "4 years, 11 months ago"
 msgstr "il y a 10 ans et 11 mois"
 
@@ -3015,8 +3069,12 @@ msgstr[1] "le fichier %s n'a que %lu lignes"
 msgid "Blaming lines"
 msgstr "Assignation de blâme aux lignes"
 
-msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
-msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+msgid ""
+"git branch [<options>] [-r | -a] [--merged] [--no-merged] [(--forked "
+"<branch>)...]"
+msgstr ""
+"git branch [<options>] [-r | -a] [--merged] [--no-merged] [(--forked "
+"<branche>)...]"
 
 msgid ""
 "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
@@ -3045,6 +3103,11 @@ msgstr "git branch [<options>] [-r | -a] [--points-at]"
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<options>] [-r | -a] [--format]"
 
+msgid ""
+"git branch [<options>] (--delete-merged <pattern>)... [<branch-pattern>...]"
+msgstr ""
+"git branch [<options>] (--delete-merged <motif>)... [<motif-de-branche>...]"
+
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -3079,6 +3142,12 @@ msgstr "échec de la mise à jour du fichier de configuration"
 msgid "cannot use -a with -d"
 msgstr "impossible d'utiliser -a avec -d"
 
+#, c-format
+msgid "cannot delete branch '%s' used by worktree at '%s' for bisect"
+msgstr ""
+"impossible de supprimer la branche '%s' utilisée par l'arbre-de-travail dans "
+"'%s' pour la bissection"
+
 #, c-format
 msgid "cannot delete branch '%s' used by worktree at '%s'"
 msgstr ""
@@ -3101,6 +3170,14 @@ msgstr ""
 msgid "branch '%s' not found"
 msgstr "branche '%s' non trouvée"
 
+#, c-format
+msgid "Would delete remote-tracking branch %s (was %s).\n"
+msgstr "Supprimerait la branche de suivi distante %s (précédemment %s).\n"
+
+#, c-format
+msgid "Would delete branch %s (was %s).\n"
+msgstr "Supprimerait la branche %s (précédemment %s).\n"
+
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Branche de suivi %s supprimée (précédemment %s).\n"
@@ -3129,7 +3206,7 @@ msgstr "la branche %s est en cours de bissection sur %s"
 
 #, c-format
 msgid "HEAD of working tree %s is not updated"
-msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"
+msgstr "la HEAD de l'arbre de travail %s n'est pas mise à jour"
 
 #, c-format
 msgid "invalid branch name: '%s'"
@@ -3171,6 +3248,14 @@ msgstr ""
 "la branche est copiée, mais la mise à jour du fichier de configuration a "
 "échoué"
 
+#, c-format
+msgid "'%s' is not a valid branch or pattern"
+msgstr "'%s' n'est pas un nom de branche ou un motif valide"
+
+#, c-format
+msgid "Skipping '%s' (branch.%s.deleteMerged is false)\n"
+msgstr "Saut de '%s' (branch.%s.deleteMerged vaut false)\n"
+
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -3181,6 +3266,13 @@ msgstr ""
 "  %s\n"
 "Les lignes commençant par '%s' seront ignorées.\n"
 
+msgid "--set-upstream-to takes a single <remote>/<branch> argument"
+msgstr "--set-upstream-to prend un seul argument <distant>/<branche>"
+
+#, c-format
+msgid "Did you mean to use: git branch --set-upstream-to=%s/%s?"
+msgstr "Vouliez-vous utiliser : git branch --set-upstream-to=%s/%s ?"
+
 msgid "Generic options"
 msgstr "Options génériques"
 
@@ -3256,6 +3348,18 @@ msgstr "créer le reflog de la branche"
 msgid "edit the description for the branch"
 msgstr "éditer la description de la branche"
 
+msgid "pattern"
+msgstr "motif"
+
+msgid "delete merged branches whose upstream matches <pattern> (repeatable)"
+msgstr ""
+"supprimer les branches fusionnées dont l'amont correspond à <motif> "
+"(répétable)"
+
+msgid "with --delete-merged, only print which branches would be deleted"
+msgstr ""
+"avec --delete-merged, afficher seulement quelles branches seraient supprimées"
+
 msgid "force creation, move/rename, deletion"
 msgstr "forcer la création, le déplacement/renommage, ou la suppression"
 
@@ -3265,6 +3369,14 @@ msgstr "afficher seulement les branches qui sont fusionnées"
 msgid "print only branches that are not merged"
 msgstr "afficher seulement les branches qui ne sont pas fusionnées"
 
+msgid "branch"
+msgstr "branche"
+
+msgid "print only branches whose upstream matches <branch> (repeatable)"
+msgstr ""
+"afficher seulement les branches dont l'amont correspond à <branche> "
+"(répétable)"
+
 msgid "list branches in columns"
 msgstr "afficher les branches en colonnes"
 
@@ -3289,12 +3401,15 @@ msgstr "échec de résolution de HEAD comme référence valide"
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD non trouvée sous refs/heads !"
 
+msgid "--dry-run requires --delete-merged"
+msgstr "--dry-run requiert --delete-merged"
+
 msgid ""
-"branch with --recurse-submodules can only be used if submodule."
-"propagateBranches is enabled"
+"branch with --recurse-submodules can only be used if "
+"submodule.propagateBranches is enabled"
 msgstr ""
-"brancher avec --recurse-submodules ne peut être utilisé que si submodule."
-"propagateBranches est activé"
+"brancher avec --recurse-submodules ne peut être utilisé que si "
+"submodule.propagateBranches est activé"
 
 msgid "--recurse-submodules can only be used to create branches"
 msgstr "--recurse-submodules ne peut être utilisé que pour créer des branches"
@@ -3435,7 +3550,7 @@ msgid "specify a destination for the bugreport file(s)"
 msgstr "spécifier la destination du/des fichier(s) de rapport de bogue"
 
 msgid "specify a strftime format suffix for the filename(s)"
-msgstr "spécifier une suffixe au format strftime pour le(s) nom(s) de fichier"
+msgstr "spécifier un suffixe au format strftime pour le(s) nom(s) de fichier"
 
 #, c-format
 msgid "unknown argument `%s'"
@@ -3491,9 +3606,6 @@ msgstr "afficher la barre de progression"
 msgid "historical; same as --progress"
 msgstr "option historique ; identique à --progress"
 
-msgid "historical; does nothing"
-msgstr "option historique ; ne fait rien"
-
 msgid "specify bundle format version"
 msgstr "spécifier la version du format de colis"
 
@@ -3520,10 +3632,41 @@ msgstr "Dépaquetage d'objets"
 msgid "cannot read object %s '%s'"
 msgstr "impossible de lire l'objet %s '%s'"
 
+msgid "must supply valid remote when using remote-object-info"
+msgstr ""
+"vous devez fournir un distant valide lors de l'utilisation de remote-object-"
+"info"
+
+#, c-format
+msgid "remote-object-info does not support short oids, %d characters required"
+msgstr "remote-object-info ne gère pas les OID courts, %d caractères requis"
+
+#, c-format
+msgid "not a valid object name '%s'"
+msgstr "nom d'objet invalide '%s'"
+
+msgid "remote-object-info requires objects"
+msgstr "remote-object-info nécessite des objets"
+
 #, c-format
 msgid "mailmap: invalid boolean '%s'"
 msgstr "mailmap : booléen invalide '%s'"
 
+msgid "remote-object-info command too long"
+msgstr "commande remote-object-info trop longue"
+
+#, c-format
+msgid "remote-object-info: failed to parse command line: %s"
+msgstr "remote-object-info : échec de l'analyse de la ligne de commande : %s"
+
+#, c-format
+msgid "remote-object-info supports at most %d objects"
+msgstr "remote-object-info prend en charge au plus %d objets"
+
+#, c-format
+msgid "failed to get object info from the remote: %s"
+msgstr "échec de l'obtention des informations d'objet depuis le distant : %s"
+
 msgid "flush is only for --buffer mode"
 msgstr "flush n'est que pour le mode --buffer"
 
@@ -3981,32 +4124,41 @@ msgid "The following paths have local changes:\n"
 msgstr "Les chemins suivants ont des modifications locales :\n"
 
 #, 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' pourrait être un fichier local ou un branche de suivi.\n"
-"Veuillez utiliser -- (et --no-guess en facultatif) pour les distinguer"
+msgid "Branch name '%s' appears in multiple remotes:"
+msgstr "Le nom de branche '%s' apparaît dans plusieurs distants :"
+
+#, c-format
+msgid "  %s"
+msgstr "  %s"
 
 #, c-format
 msgid ""
-"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"If you meant to check out a remote tracking branch on <remote>,\n"
 "you can do so by fully qualifying the name with the --track option:\n"
 "\n"
-"    git %s --track origin/<name>\n"
+"    git %s --track <remote>/%s\n"
 "\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\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 ""
-"Si vous souhaitiez extraire une branche de suivi distant sur 'origin',\n"
-"par exemple, qualifiez-la complètement avec l'option --track :\n"
+"Si vous vouliez extraire une branche de suivi distante sur <distant>,\n"
+"vous pouvez le faire en qualifiant complètement le nom avec l'option --"
+"track :\n"
 "\n"
-"    git %s --track origin/<nom>\n"
+"    git %s --track <distant>/%s\n"
 "\n"
-"Si vous souhaitez privilégier un distant particulier, par ex. 'origin'\n"
-"lorsque <nom> est ambigu, vous pouvez positionner\n"
-"checkout.defaultRemote=origin dans votre config."
+"Si vous souhaitez que les extractions d'un nom ambigu privilégient\n"
+"toujours un distant, par exemple le distant 'origin', envisagez de définir\n"
+"checkout.defaultRemote=origin dans votre configuration."
+
+#, 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' pourrait être un fichier local ou un branche de suivi.\n"
+"Veuillez utiliser -- (et --no-guess en facultatif) pour les distinguer"
 
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
@@ -4203,9 +4355,6 @@ msgstr ""
 msgid "you must specify path(s) to restore"
 msgstr "vous devez spécifier un ou des chemins à restaurer"
 
-msgid "branch"
-msgstr "branche"
-
 msgid "create and checkout a new branch"
 msgstr "créer et extraire une nouvelle branche"
 
@@ -4375,9 +4524,6 @@ msgstr "nettoyage interactif"
 msgid "remove whole directories"
 msgstr "supprimer les répertoires entiers"
 
-msgid "pattern"
-msgstr "motif"
-
 msgid "add <pattern> to ignore rules"
 msgstr "ajouter <motif> aux règles ignore"
 
@@ -4468,7 +4614,7 @@ msgstr ""
 "l'extraire"
 
 msgid "unable to checkout working tree"
-msgstr "impossible d'extraire la copie de travail"
+msgstr "impossible d'extraire l'arbre de travail"
 
 msgid "unable to write parameters to config file"
 msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
@@ -4565,7 +4711,7 @@ msgid "gitdir"
 msgstr "gitdir"
 
 msgid "separate git dir from working tree"
-msgstr "séparer le répertoire git de la copie de travail"
+msgstr "séparer le répertoire git de l'arbre de travail"
 
 msgid "specify the reference format to use"
 msgstr "spécifier le format de référence à utiliser"
@@ -4634,7 +4780,7 @@ msgstr "le chemin du dépôt '%s' existe déjà et n'est pas un répertoire vide
 
 #, c-format
 msgid "working tree '%s' already exists."
-msgstr "la copie de travail '%s' existe déjà."
+msgstr "l'arbre de travail '%s' existe déjà."
 
 #, c-format
 msgid "could not create leading directories of '%s'"
@@ -4642,7 +4788,7 @@ msgstr "impossible de créer les répertoires de premier niveau dans '%s'"
 
 #, c-format
 msgid "could not create work tree dir '%s'"
-msgstr "impossible de créer le répertoire de la copie de travail '%s'"
+msgstr "impossible de créer le répertoire de l'arbre de travail '%s'"
 
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
@@ -4988,8 +5134,16 @@ msgstr "impossible de faire une validation partielle pendant une fusion."
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "impossible de faire une validation partielle pendant un picorage."
 
-msgid "cannot do a partial commit during a rebase."
-msgstr "impossible de faire une validation partielle pendant un rebasage."
+msgid "cannot do a partial commit during a revert."
+msgstr "impossible de faire une validation partielle pendant un revert."
+
+msgid "cannot do a partial commit during an am session."
+msgstr "impossible de faire une validation partielle pendant une session am."
+
+msgid "cannot do a partial commit while resolving conflicts during a rebase."
+msgstr ""
+"impossible de faire une validation partielle en résolvant les conflits "
+"pendant un rebasage."
 
 msgid "cannot read the index"
 msgstr "impossible de lire l'index"
@@ -5180,8 +5334,20 @@ msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."
 
-msgid "You are in the middle of a rebase -- cannot amend."
-msgstr "Vous êtes en plein rebasage -- impossible de corriger (amend)."
+msgid "The now-empty commit has been dropped -- cannot amend."
+msgstr ""
+"Le commit désormais vide a été éliminé -- impossible de corriger (amend)."
+
+msgid "You are in the middle of a revert -- cannot amend."
+msgstr "Vous êtes en plein retour -- impossible de corriger (amend)."
+
+msgid "You are in the middle of an am session -- cannot amend."
+msgstr "Vous êtes en pleine session am -- impossible de corriger (amend)."
+
+msgid "You are resolving conflicts during a rebase -- cannot amend."
+msgstr ""
+"Vous résolvez des conflits pendant un rebasage -- impossible de corriger "
+"(amend)."
 
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."
@@ -5290,6 +5456,7 @@ msgstr "réutiliser le message du commit spécifié"
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
+#.
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]commit"
 
@@ -5467,7 +5634,7 @@ msgid "use repository config file"
 msgstr "utiliser le fichier de configuration du dépôt"
 
 msgid "use per-worktree config file"
-msgstr "utiliser un fichier de configuration par arbre de travail"
+msgstr "utiliser un fichier de configuration par arbre-de-travail"
 
 msgid "use given config file"
 msgstr "utiliser le fichier de configuration spécifié"
@@ -5521,7 +5688,7 @@ msgstr ""
 
 msgid "show scope of config (worktree, local, global, system, command)"
 msgstr ""
-"afficher la portée de configuration (arbre de travail, local, global, "
+"afficher la portée de configuration (arbre-de-travail, local, global, "
 "système, commande)"
 
 msgid "show config keys in addition to their values"
@@ -5957,11 +6124,11 @@ msgid "mark"
 msgstr "marque"
 
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
-msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")"
+msgstr "ajouter <marque> si l'arbre de travail est sale (défaut : \"-dirty\")"
 
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
-"ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")"
+"ajouter <marque> si l'arbre de travail est cassé (défaut : \"-broken\")"
 
 msgid "No names found, cannot describe anything."
 msgstr "Aucun nom trouvé, impossible de décrire quoi que ce soit."
@@ -5982,7 +6149,7 @@ msgid "specify a destination for the diagnostics archive"
 msgstr "spécifier la destination de l'archive de diagnostique"
 
 msgid "specify a strftime format suffix for the filename"
-msgstr "spécifier une suffixe au format strftime pour le nom de fichier"
+msgstr "spécifier un suffixe au format strftime pour le nom de fichier"
 
 msgid "specify the content of the diagnostic archive"
 msgstr "spécifier le contenu de l'archive de diagnostique"
@@ -6055,6 +6222,10 @@ msgstr "Ce n'est pas un dépôt git"
 msgid "invalid object '%s' given."
 msgstr "objet spécifié '%s' invalide."
 
+#, c-format
+msgid "unable to read tree object for commit '%s'"
+msgstr "impossible de lire l'objet arbre pour le commit '%s'"
+
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "plus de deux blobs spécifiés : '%s'"
@@ -6146,7 +6317,7 @@ msgid "passed to `diff`"
 msgstr "passé à `diff`"
 
 msgid "difftool requires worktree or --no-index"
-msgstr "difftool exige un arbre de travail ou --no-index"
+msgstr "difftool exige un arbre-de-travail ou --no-index"
 
 msgid "no <tool> given for --tool=<tool>"
 msgstr "pas d'<outil> spécifié pour --tool=<outil>"
@@ -6154,8 +6325,8 @@ msgstr "pas d'<outil> spécifié pour --tool=<outil>"
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "pas de <commande> spécifié pour --extcmd=<commande>"
 
-msgid "git fast-export [<rev-list-opts>]"
-msgstr "git fast-export [<options-de-liste-de-révisions>]"
+msgid "git fast-export [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git fast-export [<options>] [<plage-de-révision>] [[--] <chemin>...]"
 
 #, c-format
 msgid "unknown %s mode: %s"
@@ -6378,7 +6549,7 @@ msgstr "tentative invalide de création d'une branche dupliquée : %s"
 
 #, c-format
 msgid "branch name doesn't conform to Git standards: %s"
-msgstr "le nom de la branche n'est pas conforme au standards Git : %s"
+msgstr "le nom de la branche n'est pas conforme aux standards Git : %s"
 
 msgid "internal consistency error creating the index"
 msgstr "erreur de cohérence interne à la création de l'index"
@@ -6824,6 +6995,9 @@ msgstr ""
 "Format attendu <nom>:<nom de fichier> pour l'option de réécriture de sous-"
 "module"
 
+msgid "--max-pack-size: argument must be a non-negative integer"
+msgstr "--max-pack-size : l'argument doit être un entier positif ou nul"
+
 #, c-format
 msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum"
 msgstr "max-pack-size est maintenant en octets, --max-pack-size=%lum supposé"
@@ -6831,6 +7005,9 @@ msgstr "max-pack-size est maintenant en octets, --max-pack-size=%lum supposé"
 msgid "minimum max-pack-size is 1 MiB"
 msgstr "la taille limite minimale d'un paquet est 1 Mio"
 
+msgid "--big-file-threshold: argument must be a non-negative integer"
+msgstr "--big-file-threshold : l'argument doit être un entier positif ou nul"
+
 #, c-format
 msgid "unknown --signed-commits mode '%s'"
 msgstr "mode --signed-commits inconnu '%s'"
@@ -6860,13 +7037,91 @@ msgstr "option de commande '%s' obtenue après la commande data"
 msgid "this version of fast-import does not support option: %s"
 msgstr "cette version de fast-import ne supporte pas la l'option : %s"
 
-#, c-format
-msgid "unknown option %s"
-msgstr "option inconnue %s"
+msgid "git fast-import [<options>]"
+msgstr "git fast-import [<options>]"
 
-#, c-format
-msgid "unknown option --%s"
-msgstr "option inconnue --%s"
+msgid "Common"
+msgstr "Commun"
+
+msgid "format of the commit/tag dates"
+msgstr "format des dates de commit/étiquette"
+
+msgid "display some basic statistics (objects, packfiles and memory)"
+msgstr "afficher quelques statistiques de base (objets, paquets et mémoire)"
+
+msgid "disable the output shown by --stats"
+msgstr "désactiver la sortie affichée par --stats"
+
+msgid "force updating modified existing branches"
+msgstr "forcer la mise à jour des branches existantes modifiées"
+
+msgid "require a terminating 'done' command"
+msgstr "requérir une commande finale 'done'"
+
+msgid "maximum size of each output pack file"
+msgstr "taille maximum de chaque fichier paquet en sortie"
+
+msgid "maximum size of a blob that will be deltified"
+msgstr "taille maximale d'un blob qui sera deltifié"
+
+msgid "maximum delta depth"
+msgstr "profondeur maximale des deltas"
+
+msgid "maximum number of branches to maintain active"
+msgstr "nombre maximal de branches à maintenir actives"
+
+msgid "Marks"
+msgstr "Marques"
+
+msgid "import marks from <file>"
+msgstr "importer les marques depuis <fichier>"
+
+msgid "import marks from <file> if it exists"
+msgstr "importer les marques depuis <fichier> s'il existe"
+
+msgid "dump marks to <file>"
+msgstr "écrire les marques dans <fichier>"
+
+msgid "are --(import|export)-marks= paths relative to '.git/info/fast-import'?"
+msgstr ""
+"les chemins --(import|export)-marks= sont-ils relatifs à '.git/info/fast-"
+"import' ?"
+
+msgid "Submodule rewrite"
+msgstr "Réécriture de sous-module"
+
+msgid "name:filename"
+msgstr "nom:fichier"
+
+msgid "rewrite object IDs for submodule <name> from <filename>"
+msgstr "réécrire les ID d'objet pour le sous-module <nom> depuis <fichier>"
+
+msgid "rewrite object IDs for submodule <name> to <filename>"
+msgstr "réécrire les ID d'objet pour le sous-module <nom> vers <fichier>"
+
+msgid "Signing"
+msgstr "Signature"
+
+msgid "how to handle signed commits"
+msgstr "comment gérer les commits signés"
+
+msgid "how to handle signed tags"
+msgstr "comment gérer les étiquettes signées"
+
+msgid "Advanced"
+msgstr "Avancé"
+
+msgid "allow unsafe mark commands from the stream"
+msgstr "autoriser les commandes de marque non sûres depuis le flux"
+
+msgid "dump edge commits to <file>"
+msgstr "écrire les commits de bord dans <fichier>"
+
+msgid "fd"
+msgstr "fd"
+
+msgid "write some responses to <fd> instead of stdout"
+msgstr "écrire certaines réponses sur <fd> au lieu de stdout"
 
 #, c-format
 msgid "unsupported command: %s"
@@ -6894,6 +7149,10 @@ msgstr "git fetch --all [<options>]"
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel ne peut pas être négatif"
 
+#, c-format
+msgid "unrecognized fetch.followRemoteHEAD value '%s' ignored"
+msgstr "valeur '%s' non reconnue pour fetch.followRemoteHEAD, ignorée"
+
 msgid "couldn't find remote ref HEAD"
 msgstr "impossible de trouver la référence HEAD distante"
 
@@ -7004,18 +7263,26 @@ msgstr "%s ignoré car le protocole ne le prend pas en charge"
 
 #, c-format
 msgid ""
-"Run 'git remote set-head %s %s' to follow the change, or set\n"
-"'remote.%s.followRemoteHEAD' configuration option to a different value\n"
-"if you do not want to see this message. Specifically running\n"
-"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"
-"will disable the warning until the remote changes HEAD to something else."
+"Run 'git remote set-head %s %s' to follow the change, or modify\n"
+"either of the 'remote.%s.followRemoteHEAD' or 'fetch.followRemoteHEAD'\n"
+"configuration variables to handle the situation differently.\n"
+"\n"
+"Using this specific setting\n"
+"\n"
+"    git config set remote.%s.followRemoteHEAD warn-if-not-%s\n"
+"\n"
+"will suppress the warning until the remote changes HEAD to something else."
 msgstr ""
-"Lancez 'git remote set-head %s %s' pour suivre la modification, ou\n"
-"réglez l'option de configuration 'remote.%s.followRemoteHEAD' à une\n"
-"valeur différente si vous ne souhaitez pas voir ce message. Lancer\n"
-"spécifiquement 'git config set remote.%s.followRemoteHEAD warn-if-not-branch-"
-"%s'\n"
-"va désactiver l'alerte jusqu'à ce que le distant change HEAD."
+"Lancez 'git remote set-head %s %s' pour suivre le changement, ou modifiez\n"
+"l'une des variables de configuration 'remote.%s.followRemoteHEAD' ou\n"
+"'fetch.followRemoteHEAD' pour gérer la situation autrement.\n"
+"\n"
+"En utilisant ce réglage précis\n"
+"\n"
+"    git config set remote.%s.followRemoteHEAD warn-if-not-%s\n"
+"\n"
+"supprimera cet avertissement jusqu'à ce que le distant change HEAD vers "
+"autre chose."
 
 msgid ""
 "You're on a case-insensitive filesystem, and the remote you are\n"
@@ -7224,7 +7491,7 @@ msgstr ""
 "mises à jour"
 
 msgid "write the commit-graph after fetching"
-msgstr "écrire le graphe de commits après le rapatriement"
+msgstr "écrire le graphe de commits après la récupération"
 
 msgid "accept refspecs from stdin"
 msgstr "lire les spécificateurs de référence depuis l'entrée standard"
@@ -7265,8 +7532,8 @@ msgid "%s needs one or more %s"
 msgstr "%s nécessite un ou plusieurs %s"
 
 msgid ""
-"--filter can only be used with the remote configured in extensions."
-"partialclone"
+"--filter can only be used with the remote configured in "
+"extensions.partialclone"
 msgstr ""
 "--filter ne peut être utilisé qu'avec le dépôt distant configuré dans "
 "extensions.partialclone"
@@ -7436,6 +7703,10 @@ msgstr "Vérification de l'objet %s"
 msgid "Checking connectivity (%d objects)"
 msgstr "Vérification de la connectivité (%d objets)"
 
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s : objet corrompu ou manquant"
+
 #, c-format
 msgid "Checking %s %s"
 msgstr "Vérification de l'objet %s %s"
@@ -7451,10 +7722,6 @@ msgstr "racine %s"
 msgid "tagged %s %s (%s) in %s"
 msgstr "étiquetage de l'objet %s %s (%s) dans %s"
 
-#, c-format
-msgid "%s: object corrupt or missing"
-msgstr "%s : objet corrompu ou manquant"
-
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s : entrée %s de journal de références invalide"
@@ -7478,28 +7745,6 @@ msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé"
 msgid "notice: No default references"
 msgstr "note : pas de référence par défaut"
 
-#, c-format
-msgid "%s: hash-path mismatch, found at: %s"
-msgstr "%s : incohérence de hachage,trouvé à : %s"
-
-#, c-format
-msgid "%s: object corrupt or missing: %s"
-msgstr "%s : objet corrompu ou manquant : %s"
-
-#, c-format
-msgid "%s: object could not be parsed: %s"
-msgstr "%s : impossible d'analyser : %s"
-
-#, c-format
-msgid "bad sha1 file: %s"
-msgstr "mauvais fichier de sha1 : %s"
-
-msgid "Checking object directory"
-msgstr "Vérification du répertoire d'objet"
-
-msgid "Checking object directories"
-msgstr "Vérification des répertoires d'objet"
-
 #, c-format
 msgid "Checking cache tree of %s"
 msgstr "Vérification de l'arbre cache de %s"
@@ -7515,14 +7760,6 @@ msgstr "non-arbre dans l'arbre de cache"
 msgid "%s: invalid sha1 pointer in resolve-undo of %s"
 msgstr "%s : pointeur sha1 invalide dans resolve-undo de %s"
 
-#, c-format
-msgid "unable to load rev-index for pack '%s'"
-msgstr "impossible de charger le rev-index pour le paquet '%s'"
-
-#, c-format
-msgid "invalid rev-index for pack '%s'"
-msgstr "rev-index invalide pour le paquet '%s'"
-
 msgid "Checking ref database"
 msgstr "Vérification de la base de données des références"
 
@@ -7577,9 +7814,6 @@ msgstr "afficher les noms étendus pour les objets inaccessibles"
 msgid "check reference database consistency"
 msgstr "vérifier la cohérence de la base de données des références"
 
-msgid "Checking objects"
-msgstr "Vérification des objets"
-
 msgid "git fsmonitor--daemon start [<options>]"
 msgstr "git fsmonitor--daemon start [<options>]"
 
@@ -7769,12 +8003,6 @@ msgstr ""
 "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> "
 "(utilisez --force si ce n'est pas le cas)"
 
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr ""
-"Il y a trop d'objets esseulés inaccessibles ; lancez 'git prune' pour les "
-"supprimer."
-
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
@@ -7813,9 +8041,6 @@ msgid ""
 msgstr ""
 "tâche incremental-repack ignorée parce que core.multiPackIndex est désactivé"
 
-msgid "failed to perform geometric repack"
-msgstr "échec de l'exécution du repaquetage géométrique"
-
 #, c-format
 msgid "task '%s' failed"
 msgstr "échec de la tâche '%s'"
@@ -7996,6 +8221,7 @@ msgstr "nombre de fils spécifié invalide (%d) pour %s"
 #. TRANSLATORS: %s is the configuration
 #. variable for tweaking threads, currently
 #. grep.threads
+#.
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "pas de support des fils, ignore %s"
@@ -8013,7 +8239,7 @@ msgid "switch `%c' expects a numerical value"
 msgstr "l'option '%c' attend une valeur numérique"
 
 msgid "search in index instead of in the work tree"
-msgstr "rechercher dans l'index plutôt que dans la copie de travail"
+msgstr "rechercher dans l'index plutôt que dans l'arbre de travail"
 
 msgid "find in contents not managed by git"
 msgstr "rechercher dans les contenus non gérés par git"
@@ -8185,7 +8411,7 @@ msgid "invalid number of threads specified (%d)"
 msgstr "nombre de fils spécifié invalide (%d)"
 
 msgid "--open-files-in-pager only works on the worktree"
-msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail"
+msgstr "--open-files-in-pager ne fonctionne que sur l'arbre-de-travail"
 
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi"
@@ -8334,6 +8560,13 @@ msgstr "usage : %s%s"
 msgid "'git help config' for more information"
 msgstr "'git help config' pour plus d'information"
 
+msgid ""
+"git history drop <commit> [--dry-run] [--update-refs=(branches|head)] [--"
+"empty=(drop|keep|abort)]"
+msgstr ""
+"git history drop <commit> [--dry-run] [--update-refs=(branches|head)] [--"
+"empty=(drop|keep|abort)]"
+
 msgid ""
 "git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--"
 "reedit-message] [--empty=(drop|keep|abort)]"
@@ -8362,6 +8595,10 @@ msgstr ""
 "commençant par '%s' seront ignorées, et un message vide abandonne la "
 "validation.\n"
 
+#, c-format
+msgid "could not write to '%s'"
+msgstr "impossible d'écrire dans '%s'"
+
 #, c-format
 msgid "Aborting commit as launching the editor failed.\n"
 msgstr "Abandon de la validation dû à l'échec du lancement de l'éditeur\n"
@@ -8473,11 +8710,15 @@ msgstr "la rectification rend le commit %s vide"
 msgid "failed writing fixed-up commit"
 msgstr "échec de l'écriture du commit rectifié"
 
+msgid "failed replaying descendants"
+msgstr "échec du rejeu des descendants"
+
 msgid "failed writing reworded commit"
 msgstr "échec de l'écriture du commit reformulé"
 
-msgid "failed replaying descendants"
-msgstr "échec du rejeu des descendants"
+#, c-format
+msgid "unable to parse tree %s"
+msgstr "impossible d'analyser l'arbre %s"
 
 msgid "unable to populate index with tree"
 msgstr "impossible de peupler l'index avec l'arbre"
@@ -8512,6 +8753,30 @@ msgstr "la commande attend un commit-esque"
 msgid "cannot split up merge commit"
 msgstr "impossible de scinder un commit de fusion"
 
+msgid "cannot resolve HEAD commit"
+msgstr "impossible de résoudre le commit HEAD"
+
+msgid "cannot resolve tree for HEAD"
+msgstr "impossible de résoudre l'arbre de HEAD"
+
+msgid "how to handle descendants that become empty"
+msgstr "comment gérer les descendants qui deviennent vides"
+
+#, c-format
+msgid "cannot drop merge commit: %s"
+msgstr "impossible d'éliminer le commit de fusion : %s"
+
+msgid "dropping this commit would overwrite local changes; aborting"
+msgstr "supprimer ce commit écraserait des modifications locales ; abandon"
+
+msgid "failed to update references"
+msgstr "échec de la mise à jour des références"
+
+#, c-format
+msgid "could not update working tree to new commit %s"
+msgstr ""
+"impossible de mettre à jour l'arbre de travail vers le nouveau commit %s"
+
 msgid ""
 "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-"
 "stdin=<path>] [(-j|--jobs) <n>]\n"
@@ -8582,6 +8847,9 @@ msgstr "objet attendu non reçu %s"
 msgid "object %s: expected type %s, found %s"
 msgstr "objet %s : type attendu %s, reçu %s"
 
+msgid "Checking objects"
+msgstr "Vérification des objets"
+
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
@@ -9154,7 +9422,7 @@ msgstr ""
 
 msgid "use simple number sequence for output file names"
 msgstr ""
-"utiliser une séquence simple de nombres pour les nom des fichiers de sortie"
+"utiliser une séquence simple de nombres pour les noms des fichiers de sortie"
 
 msgid "sfx"
 msgstr "sfx"
@@ -9391,7 +9659,7 @@ msgid "show ignored files in the output"
 msgstr "afficher les fichiers ignorés dans la sortie"
 
 msgid "show staged contents' object name in the output"
-msgstr "afficher les nom des objets indexés dans la sortie"
+msgstr "afficher les noms des objets indexés dans la sortie"
 
 msgid "show files on the filesystem that need to be removed"
 msgstr ""
@@ -9638,6 +9906,10 @@ msgstr "l'objet '%s' n'existe pas"
 msgid "Could not write object file"
 msgstr "impossible d'écrire le fichier d'objet"
 
+#, c-format
+msgid "unknown option %s"
+msgstr "option inconnue %s"
+
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "impossible d'analyser l'objet '%s'"
@@ -10076,6 +10348,10 @@ msgstr "git multi-pack-index [<options>] expire"
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<options>] repack [--batch-size=<taille>]"
 
+#, c-format
+msgid "object directory is not an alternate of the current repository: '%s'"
+msgstr "le répertoire d'objet n'est pas une alternative du répertoire actuel : '%s'"
+
 msgid "directory"
 msgstr "répertoire"
 
@@ -10203,6 +10479,12 @@ msgstr "multiples sources pour la même destination"
 msgid "destination directory does not exist"
 msgstr "le répertoire de destination n'existe pas"
 
+msgid "destination is beyond a symbolic link"
+msgstr "la destination est au-delà d'un lien symbolique"
+
+msgid "destination is not a directory"
+msgstr "la destination n'est pas un répertoire"
+
 msgid "destination exists in the index"
 msgstr "la destination existe dans l'index"
 
@@ -10219,8 +10501,8 @@ msgid "Renaming %s to %s\n"
 msgstr "Renommage de %s en %s\n"
 
 #, c-format
-msgid "renaming '%s' failed"
-msgstr "le renommage de '%s' a échoué"
+msgid "renaming '%s' to '%s' failed"
+msgstr "échec du renommage de '%s' en '%s'"
 
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<options>] <validation>..."
@@ -10426,6 +10708,7 @@ msgstr "impossible de copier les notes de '%s' vers '%s'"
 
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
+#.
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "refus de faire %s sur des notes dans %s (hors de refs/notes/)"
@@ -10517,7 +10800,7 @@ msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "échec de la suppression de la référence NOTES_MERGE_REF"
 
 msgid "failed to remove 'git notes merge' worktree"
-msgstr "échec de la suppression de la copie de travail 'git notes merge'"
+msgstr "échec de la suppression de l'arbre-de-travail 'git notes merge'"
 
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "échec de la lecture de la référence NOTES_MERGE_PARTIAL"
@@ -10843,11 +11126,20 @@ msgstr "impossible d'ouvrir l'index de paquet"
 msgid "loose object at %s could not be examined"
 msgstr "l'objet libre à %s n'a pas pu être examiné"
 
+#, c-format
+msgid "cannot read object for %s"
+msgstr "impossible de lire l'objet pour %s"
+
+#, c-format
+msgid "cannot map object %s to %s"
+msgstr "impossible de faire correspondre l'objet %s avec %s"
+
 msgid "unable to force loose object"
 msgstr "impossible de forcer l'objet libre"
 
-msgid "failed to pack objects via path-walk"
-msgstr "échec du paquetage des objets par parcours de chemin"
+#, c-format
+msgid "could not find commit %s"
+msgstr "impossible de trouver le commit %s"
 
 #, c-format
 msgid "not a rev '%s'"
@@ -10857,6 +11149,9 @@ msgstr "'%s' n'est pas une révision"
 msgid "bad revision '%s'"
 msgstr "mauvaise révision '%s'"
 
+msgid "failed to pack objects via path-walk"
+msgstr "échec du paquetage des objets par parcours de chemin"
+
 msgid "unable to add recent objects"
 msgstr "impossible d'ajouter les objets récents"
 
@@ -10882,9 +11177,6 @@ msgstr ""
 "écrire le fichier d'index du paquet dans le format d'index de version "
 "spécifié"
 
-msgid "maximum size of each output pack file"
-msgstr "taille maximum de chaque fichier paquet en sortie"
-
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorer les objets empruntés à un autre magasin d'objets"
 
@@ -11221,7 +11513,7 @@ msgid "automatically stash/stash pop before and after"
 msgstr "remiser et réappliquer automatiquement avant et après"
 
 msgid "Options related to fetching"
-msgstr "Options relatives au rapatriement"
+msgstr "Options relatives à la récupération"
 
 msgid "force overwrite of local branch"
 msgstr "forcer l'écrasement de la branche locale"
@@ -11253,7 +11545,7 @@ msgid ""
 "commit %s."
 msgstr ""
 "la récupération a mis à jour la tête de la branche actuelle.\n"
-"avance rapide de votre copie de travail\n"
+"avance rapide de votre arbre de travail\n"
 "depuis le commit %s."
 
 #, c-format
@@ -11388,8 +11680,8 @@ msgstr ""
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
-"Vous n'avez pas spécifié de spécifications de référence à pousser, et push."
-"default est \"nothing\"."
+"Vous n'avez pas spécifié de spécifications de référence à pousser, et "
+"push.default est \"nothing\"."
 
 #, c-format
 msgid ""
@@ -11496,6 +11788,14 @@ msgstr "valeur invalide pour '%s'"
 msgid "could not push to %s"
 msgstr "impossible de pousser vers %s"
 
+#, c-format
+msgid "'%s' is not a valid push target"
+msgstr "'%s' n'est pas une cible de poussée valide"
+
+#, c-format
+msgid "Did you mean to use: git push %s %s?"
+msgstr "Vouliez-vous utiliser : git push %s %s ?"
+
 msgid "repository"
 msgstr "dépôt"
 
@@ -11699,7 +11999,7 @@ msgid "read the tree into the index under <subdirectory>/"
 msgstr "lire l'arbre dans l'index dans <sous-répertoire>/"
 
 msgid "update working tree with merge result"
-msgstr "mettre à jour la copie de travail avec le résultat de la fusion"
+msgstr "mettre à jour l'arbre de travail avec le résultat de la fusion"
 
 msgid "gitignore"
 msgstr "gitignore"
@@ -11708,10 +12008,10 @@ msgid "allow explicitly ignored files to be overwritten"
 msgstr "autoriser explicitement les fichiers ignorés à être écrasés"
 
 msgid "don't check the working tree after merging"
-msgstr "ne pas vérifier la copie de travail après la fusion"
+msgstr "ne pas vérifier l'arbre de travail après la fusion"
 
 msgid "don't update the index or the work tree"
-msgstr "ne pas mettre à jour l'index ou la copie de travail"
+msgstr "ne pas mettre à jour l'index ou l'arbre de travail"
 
 msgid "skip applying sparse checkout filter"
 msgstr "sauter l'application du filtre d'extraction creuse"
@@ -12012,7 +12312,7 @@ msgstr ""
 "les marquer comme résolus avec git add"
 
 msgid "could not discard worktree changes"
-msgstr "impossible de supprimer les changements de l'arbre de travail"
+msgstr "impossible de supprimer les changements de l'arbre-de-travail"
 
 #, c-format
 msgid "could not move back to %s"
@@ -12150,14 +12450,14 @@ msgid ""
 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
 msgstr ""
 "Par défaut, mettre à jour la branche actuelle dans un dépôt non-nu\n"
-"est réfusé parce que cela rendrait l'index et la copie de travail\n"
+"est refusé parce que cela rendrait l'index et l'arbre de travail\n"
 "inconsistants avec ce que vous avez poussé et nécessiterait\n"
-"'git reset --hard' pour réaligner la copie de travail avec HEAD.\n"
+"'git reset --hard' pour réaligner l'arbre de travail avec HEAD.\n"
 "\n"
 "Vous pouvez régler « receive.denyCurrentBranch » à 'ignore' ou\n"
 "'warn' dans le dépôt distant pour permettre la poussée dans la\n"
 "branche actuelle ; cependant, ce n'est pas recommandé à moins que\n"
-"vous ayez déjà mis à jour sa copie de travail par une moyen détourné\n"
+"vous ayez déjà mis à jour son arbre de travail par un moyen détourné\n"
 "pour correspondre à ce que vous avez poussé.\n"
 "\n"
 "Pour éliminer ce message et conserver le comportement par défaut,\n"
@@ -12265,7 +12565,7 @@ msgid "process the reflogs of all references"
 msgstr "traiter les reflogs de toutes les références"
 
 msgid "limits processing to reflogs from the current worktree only"
-msgstr "limite le traitement des reflogs seulement à l'arbre de travail actuel"
+msgstr "limite le traitement des reflogs seulement à l'arbre-de-travail actuel"
 
 #, c-format
 msgid "Marking reachable objects..."
@@ -12335,8 +12635,32 @@ msgstr "git refs exist <référence>"
 msgid "git refs optimize "
 msgstr "git refs optimize "
 
-msgid "specify the reference format to convert to"
-msgstr "spécifier le format de référence vers lequel convertir"
+msgid ""
+"git refs create [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value>"
+msgstr ""
+"git refs create [--message=<raison>] [--no-deref] [--create-reflog] "
+"<référence> <nouvelle-valeur>"
+
+msgid "git refs delete [--message=<reason>] [--no-deref] <ref> [<old-value>]"
+msgstr ""
+"git refs delete [--message=<raison>] [--no-deref] <référence> [<ancienne-"
+"valeur>]"
+
+msgid ""
+"git refs update [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value> [<old-value>]"
+msgstr ""
+"git refs update [--message=<raison>] [--no-deref] [--create-reflog] "
+"<référence> <nouvelle-valeur> [<ancienne-valeur>]"
+
+msgid "git refs rename [--message=<reason>] <old-ref> <new-ref>"
+msgstr ""
+"git refs rename [--message=<raison>] <ancienne-référence> <nouvelle-"
+"référence>"
+
+msgid "specify the reference format to convert to"
+msgstr "spécifier le format de référence vers lequel convertir"
 
 msgid "perform a non-destructive dry-run"
 msgstr "faire l'action en mode simulé non destructif"
@@ -12369,6 +12693,58 @@ msgstr "la référence n'existe pas"
 msgid "failed to look up reference"
 msgstr "échec de la recherche de la référence"
 
+msgid "reason"
+msgstr "raison"
+
+msgid "reason of the update"
+msgstr "raison de la mise à jour"
+
+msgid "update <refname> not the one it points to"
+msgstr "mettre à jour <nomréférence> et non la référence pointée par lui"
+
+msgid "create a reflog"
+msgstr "créer un reflog"
+
+msgid "create requires reference name and an object ID"
+msgstr "create nécessite un nom de référence et un ID d'objet"
+
+msgid "refusing to perform update with empty message"
+msgstr "refus d'effectuer la mise à jour avec un message vide"
+
+#, c-format
+msgid "invalid object ID: '%s'"
+msgstr "ID d'objet invalide : '%s'"
+
+msgid "cannot create reference with null new object ID"
+msgstr "impossible de créer une référence avec un nouvel ID d'objet nul"
+
+msgid "delete requires reference name and an optional old object ID"
+msgstr ""
+"delete nécessite un nom de référence et éventuellement un ancien ID d'objet"
+
+msgid "cannot delete reference with null old object ID"
+msgstr "impossible de supprimer une référence avec un ancien ID d'objet nul"
+
+msgid "update requires reference name, new value and an optional old value"
+msgstr ""
+"update nécessite un nom de référence, une nouvelle valeur et éventuellement "
+"une ancienne valeur"
+
+msgid "rename requires old and new reference name"
+msgstr "rename nécessite l'ancien et le nouveau nom de référence"
+
+#, c-format
+msgid "invalid ref format: '%s'"
+msgstr "format de référence invalide : '%s'"
+
+#, c-format
+msgid "reference does not exist: '%s'"
+msgstr "la référence n'existe pas : '%s'"
+
+#, c-format
+msgid "reference already exists: '%s'"
+msgstr "la référence existe déjà : '%s'"
+
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -12451,14 +12827,14 @@ msgstr "argument de --mirror inconnu : %s"
 
 #, c-format
 msgid "remote name '%s' is a subset of existing remote '%s'"
-msgstr "le nom distance '%s' est un sous-ensemble du distant existant '%s'"
+msgstr "le nom distant '%s' est un sous-ensemble du distant existant '%s'"
 
 #, c-format
 msgid "remote name '%s' is a superset of existing remote '%s'"
-msgstr "les nom distant '%s' est un sur-ensemble du distant existant '%s'"
+msgstr "le nom distant '%s' est un sur-ensemble du distant existant '%s'"
 
 msgid "fetch the remote branches"
-msgstr "rapatrier les branches distantes"
+msgstr "récupérer les branches distantes"
 
 msgid ""
 "import all tags and associated objects when fetching\n"
@@ -12476,7 +12852,7 @@ msgstr "branche maîtresse"
 
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
-"paramétrer la distante comme miroir pour pousser ou pour rapatrier depuis"
+"paramétrer la distante comme miroir pour pousser ou pour récupérer depuis"
 
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "spécifier une branche maîtresse n'a pas de sens avec --mirror"
@@ -12484,7 +12860,7 @@ msgstr "spécifier une branche maîtresse n'a pas de sens avec --mirror"
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 "spécifier les branches à suivre n'a de sens qu'avec des miroirs de "
-"rapatriement"
+"récupération"
 
 #, c-format
 msgid "remote %s already exists."
@@ -12571,7 +12947,7 @@ msgid ""
 "\t%s\n"
 "\tPlease update the configuration manually if necessary."
 msgstr ""
-"Pas de mise à jour du refspec de rapatriement qui n'est pas par défaut\n"
+"Pas de mise à jour du refspec de récupération qui n'est pas par défaut\n"
 "\t%s\n"
 "\tVeuillez mettre à jour la configuration manuellement si nécessaire."
 
@@ -12599,7 +12975,7 @@ msgstr "Impossible de supprimer la section de configuration '%s'"
 
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
-msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)"
+msgstr " nouveau (la prochaine récupération (fetch) stockera dans remotes/%s)"
 
 msgid " tracked"
 msgstr " suivi"
@@ -12681,11 +13057,12 @@ msgstr "* distant %s"
 
 #, c-format
 msgid "  Fetch URL: %s"
-msgstr "  URL de rapatriement : %s"
+msgstr "  URL de récupération : %s"
 
 #. TRANSLATORS: the colon ':' should align
 #. with the one in " Fetch URL: %s"
 #. translation.
+#.
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL push : %s"
@@ -12847,11 +13224,13 @@ msgstr "être verbeux : doit être placé avant une sous-commande"
 msgid ""
 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]"
+"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]\n"
+"[--filter=<filter-spec>] [--drop-filtered [--dry-run]]"
 msgstr ""
 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<nom-de-paquet>]\n"
-"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]"
+"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]\n"
+"[--filter=<spécificateur-de-filtre>] [--drop-filtered [--dry-run]]"
 
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
@@ -12954,6 +13333,38 @@ msgstr "écrire un index de multi-paquet des paquets résultants"
 msgid "pack prefix to store a pack containing filtered out objects"
 msgstr "préfixe de paquet pour stocker un paquet contenant les objets filtrés"
 
+msgid "delete filtered out objects (requires --filter)"
+msgstr "supprimer les objets filtrés (requiert --filter)"
+
+msgid "only show which objects would be dropped"
+msgstr "afficher seulement quels objets seraient éliminés"
+
+msgid "--dry-run only takes effect with --drop-filtered"
+msgstr "--dry-run n'a d'effet qu'avec --drop-filtered"
+
+msgid "--drop-filtered requires --filter"
+msgstr "--drop-filtered requiert --filter"
+
+msgid "--drop-filtered requires -a"
+msgstr "--drop-filtered requiert -a"
+
+msgid "--drop-filtered only supports --filter=blob:limit=<n> for now"
+msgstr "--drop-filtered ne gère pour l'instant que --filter=blob:limit=<n>"
+
+msgid "--drop-filtered requires a promisor remote"
+msgstr "--drop-filtered nécessite un distant prometteur"
+
+msgid ""
+"--drop-filtered cannot be used while another operation (merge, rebase, am, "
+"cherry-pick, revert, or bisect) is in progress"
+msgstr ""
+"--drop-filtered ne peut pas être utilisé pendant qu'une autre opération "
+"(merge, rebase, am, cherry-pick, revert ou bisect) est en cours"
+
+#, c-format
+msgid "cannot drop '%s' (%s): it is referenced by the current index"
+msgstr "impossible d'éliminer '%s' (%s) : il est référencé par l'index actuel"
+
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux"
 
@@ -13163,11 +13574,11 @@ msgstr "valeur invalide de %s : '%s'"
 msgid ""
 "(EXPERIMENTAL!) git replay ([--contained] --onto=<newbase> | --"
 "advance=<branch> | --revert=<branch>)\n"
-"[--ref=<ref>] [--ref-action=<mode>] <revision-range>"
+"[--ref=<ref>] [--ref-action=<mode>] [--linearize] <revision-range>"
 msgstr ""
 "(EXPERIMENTAL!) git replay ([--contained] --onto=<nouvelle-base> | --"
 "advance=<branche> | --revert=<branche>)\n"
-"[--ref=<réf>] [--ref-action=<mode>] <plage-de-révision>"
+"[--ref=<référence>] [--ref-action=<mode>] [--linearize] <plage-de-révision>"
 
 msgid "update all branches that point at commits in <revision-range>"
 msgstr ""
@@ -13189,6 +13600,10 @@ msgstr "la référence à mettre à jour avec le résultat"
 msgid "control ref update behavior (update|print)"
 msgstr "contrôler le comportement de mise à jour de ref (update|print)"
 
+msgid "drop merge commits, replaying only non-merge commits"
+msgstr ""
+"ignorer les commits de fusion en ne rejouant que les commits non-fusion"
+
 msgid "exactly one of --onto, --advance, or --revert is required"
 msgstr "un seul des paramètres --onto, --advance ou --revert  est requis"
 
@@ -13200,6 +13615,12 @@ msgstr ""
 "certaines options de parcours de révs seront surchargées car le bit '%s' "
 "dans 'struct rev_info' sera forcé"
 
+msgid "unable to get common directory"
+msgstr "impossible d'obtenir le répertoire commun"
+
+msgid "unable to get git directory"
+msgstr "impossible d'obtenir le répertoire git"
+
 #, c-format
 msgid "key '%s' not found"
 msgstr "clé '%s' non trouvée"
@@ -13367,7 +13788,7 @@ msgid "reset only HEAD"
 msgstr "réinitialiser seulement HEAD"
 
 msgid "reset HEAD, index and working tree"
-msgstr "réinitialiser HEAD, l'index et la copie de travail"
+msgstr "réinitialiser HEAD, l'index et l'arbre de travail"
 
 msgid "reset HEAD but keep local changes"
 msgstr "réinitialiser HEAD mais garder les changements locaux"
@@ -13421,6 +13842,9 @@ msgstr "Impossible d'écrire le nouveau fichier d'index."
 msgid "unable to get disk usage of %s"
 msgstr "impossible de récupérer l'utilisation du disque de %s"
 
+msgid "--missing-only requires --missing=print or --missing=print-info"
+msgstr "--missing-only requiert --missing=print ou --missing=print-info"
+
 #, c-format
 msgid "invalid value for '%s': '%s', the only allowed format is '%s'"
 msgstr "valeur invalide pour '%s' : '%s', le seul format permis est '%s'"
@@ -13963,11 +14387,11 @@ msgstr ""
 "rules | clean) [<options>]"
 
 msgid "this worktree is not sparse"
-msgstr "cet arbre de travail n'est pas clairsemé"
+msgstr "cet arbre-de-travail n'est pas clairsemé"
 
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
-"cet arbre de travail n'est pas clairsemé (le fichier sparse-checkout "
+"cet arbre-de-travail n'est pas clairsemé (le fichier sparse-checkout "
 "pourrait ne pas exister)"
 
 #, c-format
@@ -13991,7 +14415,7 @@ msgid "unable to fdopen %s"
 msgstr "impossible d'ouvrir %s avec fdopen"
 
 msgid "failed to initialize worktree config"
-msgstr "échec lors de l'initialisation de la configuration d'arbre de travail"
+msgstr "échec lors de l'initialisation de la configuration d'arbre-de-travail"
 
 msgid "failed to modify sparse-index config"
 msgstr "impossible de modifier la configuration d'index clairsemé"
@@ -14322,13 +14746,13 @@ msgid "Cannot save the untracked files"
 msgstr "Impossible de sauver les fichiers non-suivis"
 
 msgid "Cannot save the current worktree state"
-msgstr "Impossible de sauver l'état courant de la copie de travail"
+msgstr "Impossible de sauvegarder l'état courant de l'arbre-de-travail"
 
 msgid "Cannot save the current staged state"
 msgstr "Impossible de sauver l'état actuel de l'index"
 
 msgid "Cannot record working tree state"
-msgstr "Impossible d'enregistrer l'état de la copie de travail"
+msgstr "Impossible d'enregistrer l'état de l'arbre de travail"
 
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr ""
@@ -14355,7 +14779,7 @@ msgid "Saved working directory and index state %s"
 msgstr "Arbre de travail et état de l'index sauvegardés dans %s"
 
 msgid "Cannot remove worktree changes"
-msgstr "Impossible de supprimer les changements de la copie de travail"
+msgstr "Impossible de supprimer les changements de l'arbre-de-travail"
 
 msgid "keep index"
 msgstr "conserver l'index"
@@ -14833,8 +15257,8 @@ msgstr "Le chemin de sous-module '%s' : '%s %s'\n"
 #, c-format
 msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
 msgstr ""
-"Impossible de rapatrier dans le chemin de sous-module '%s' ; essai de "
-"rapatriement direct de %s :"
+"Impossible de récupérer dans le chemin de sous-module '%s' ; essai de "
+"récupération directe de %s :"
 
 #, c-format
 msgid ""
@@ -14867,7 +15291,7 @@ msgstr ""
 
 #, c-format
 msgid "Unable to fetch in submodule path '%s'"
-msgstr "Impossible de rapatrier dans le chemin de sous-module '%s'"
+msgstr "Impossible de récupérer dans le chemin de sous-module '%s'"
 
 #, c-format
 msgid "Unable to find %s revision in submodule path '%s'"
@@ -15058,7 +15482,7 @@ msgstr "git submodule add [<options>] [--] <dépôt> [<chemin>]"
 
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
-"Un chemin relatif ne peut être utilisé que depuis la racine de la copie de "
+"Un chemin relatif ne peut être utilisé que depuis la racine de l'arbre de "
 "travail"
 
 #, c-format
@@ -15098,12 +15522,6 @@ msgstr "raccourcir l'affichage de la référence"
 msgid "recursively dereference (default)"
 msgstr "déréférencer récursivement (défaut)"
 
-msgid "reason"
-msgstr "raison"
-
-msgid "reason of the update"
-msgstr "raison de la mise à jour"
-
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
 "        [(--trailer <token>[(=|:)<value>])...]\n"
@@ -15224,9 +15642,6 @@ msgstr "utiliser une autre clé pour signer l'étiquette"
 msgid "replace the tag if exists"
 msgstr "remplacer l'étiquette si elle existe"
 
-msgid "create a reflog"
-msgstr "créer un reflog"
-
 msgid "Tag listing options"
 msgstr "Options d'affichage des étiquettes"
 
@@ -15349,7 +15764,7 @@ msgid "let files replace directories and vice-versa"
 msgstr "laisser les fichiers remplacer des répertoires et vice-versa"
 
 msgid "notice files missing from worktree"
-msgstr "aviser des fichiers manquants dans la copie de travail"
+msgstr "aviser des fichiers manquants dans l'arbre-de-travail"
 
 msgid "refresh even if index contains unmerged entries"
 msgstr "rafraîchir même si l'index contient des éléments non fusionnés"
@@ -15388,8 +15803,7 @@ msgstr ""
 
 msgid "remove named paths even if present in worktree"
 msgstr ""
-"supprimer les chemins nommés même s'ils sont présents dans la copie de "
-"travail"
+"supprimer les chemins nommés même s'ils sont présents dans l'arbre-de-travail"
 
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls"
@@ -15407,7 +15821,7 @@ msgid "only update entries that differ from HEAD"
 msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"
 
 msgid "ignore files missing from worktree"
-msgstr "ignorer les fichiers manquants dans la copie de travail"
+msgstr "ignorer les fichiers manquants dans l'arbre-de-travail"
 
 msgid "report actions to standard output"
 msgstr "afficher les actions sur la sortie standard"
@@ -15519,9 +15933,6 @@ msgstr "git update-ref [<options>] --stdin [-z] [--batch-updates]"
 msgid "delete the reference"
 msgstr "supprimer la référence"
 
-msgid "update <refname> not the one it points to"
-msgstr "mettre à jour <nomréférence> et non la référence pointée par lui"
-
 msgid "stdin has NUL-terminated arguments"
 msgstr "l'entrée standard a des arguments qui se terminent par NUL"
 
@@ -15665,24 +16076,24 @@ msgstr "'%s' existe déjà"
 
 #, c-format
 msgid "unusable worktree destination '%s'"
-msgstr "arbre de travail destination '%s' inutilisable"
+msgstr "destination d'arbre-de-travail '%s' inutilisable"
 
 #, 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' est un arbre de travail manquant mais verrouillé ;\n"
+"'%s' est un arbre-de-travail manquant mais verrouillé ;\n"
 "utilisez '%s -f -f' pour passer outre, ou 'unlock' et 'prune' ou 'remove' "
-"pour corriger"
+"pour les effacer"
 
 #, 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' est un arbre de travail manquant mais déjà enregistré ;\n"
-"utilisez '%s -f' pour passer outre, ou 'prune' ou 'remove' pour corriger"
+"'%s' est un arbre-de-travail manquant mais déjà enregistré ;\n"
+"utilisez '%s -f' pour passer outre, ou 'prune' ou 'remove' pour les effacer"
 
 #, c-format
 msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
@@ -15693,7 +16104,7 @@ msgstr ""
 #, c-format
 msgid "failed to copy worktree config from '%s' to '%s'"
 msgstr ""
-"impossible de copier la configuration d'arbre de travail de '%s' vers '%s'"
+"impossible de copier la configuration d'arbre-de-travail de '%s' vers '%s'"
 
 #, c-format
 msgid "failed to unset '%s' in '%s'"
@@ -15712,21 +16123,21 @@ msgstr "impossible de trouver l'arbre-de-travail créé '%s'"
 
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
-msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')"
+msgstr "Préparation de l'arbre-de-travail (nouvelle branche '%s')"
 
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
-"Préparation de l'arbre de travail (réinitialisation de la branche '%s' ; "
+"Préparation de l'arbre-de-travail (réinitialisation de la branche '%s' ; "
 "précédemment sur %s)"
 
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
-msgstr "Préparation de l'arbre de travail (extraction de '%s')"
+msgstr "Préparation de l'arbre-de-travail (extraction de '%s')"
 
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
-msgstr "Préparation de l'arbre de travail (HEAD détachée %s)"
+msgstr "Préparation de l'arbre-de-travail (HEAD détachée %s)"
 
 msgid "HEAD points to an invalid (or orphaned) reference.\n"
 msgstr "HEAD pointe sur une référence invalide (ou orpheline).\n"
@@ -15735,14 +16146,33 @@ msgid ""
 "No local or remote refs exist despite at least one remote\n"
 "present, stopping; use 'add -f' to override or fetch a remote first"
 msgstr ""
-"Aucune réf locale ou distant n'existe malgré la présence d'au moins un "
-"distant,\n"
-"on arrête ; utilisez 'add -f' pour passe outre ou récupérer le distant en "
-"premier"
+"Aucune référence locale ou distante n'existe malgré la présence d'au moins "
+"un distant,\n"
+"arrêt ; utilisez 'add -f' pour passer outre ou récupérez depuis le distant "
+"en premier"
+
+#, c-format
+msgid ""
+"If you meant to create a worktree from a remote tracking branch on\n"
+"<remote>, you can do so by:\n"
+"\n"
+"    git worktree add -b %s %s <remote>/%s\n"
+"\n"
+"If you'd like to always prefer some remote, e.g. 'origin',\n"
+"consider setting checkout.defaultRemote=origin in your config."
+msgstr ""
+"Si vous vouliez créer un arbre-de-travail depuis une branche de suivi "
+"distante\n"
+"sur <distant>, vous pouvez le faire ainsi :\n"
+"\n"
+"    git worktree add -b %s %s <distant>/%s\n"
+"\n"
+"Si vous souhaitez toujours privilégier un distant, par exemple 'origin',\n"
+"envisagez de définir checkout.defaultRemote=origin dans votre configuration."
 
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
-"extraire la <branche> même si elle est déjà extraite dans une autre copie de "
+"extraire la <branche> même si elle est déjà extraite dans un autre arbre-de-"
 "travail"
 
 msgid "create a new branch"
@@ -15755,7 +16185,7 @@ msgid "create unborn branch"
 msgstr "créer une branche non née"
 
 msgid "populate the new working tree"
-msgstr "remplissage de la nouvelle copie de travail"
+msgstr "remplir le nouvel arbre de travail"
 
 msgid "keep the new working tree locked"
 msgstr "conserver le verrou sur le nouvel arbre de travail"
@@ -15793,7 +16223,7 @@ msgstr "afficher les annotations étendues et les raisons, si disponible"
 
 msgid "add 'prunable' annotation to missing worktrees older than <time>"
 msgstr ""
-"ajouter l'annotation 'prunable' aux arbres de travail manquants plus vieux "
+"ajouter l'annotation 'prunable' aux arbres-de-travail manquants plus vieux "
 "que <temps>"
 
 msgid "terminate records with a NUL character"
@@ -15801,11 +16231,11 @@ msgstr "terminer les enregistrements par un caractère NUL"
 
 #, c-format
 msgid "'%s' is not a working tree"
-msgstr "'%s' n'est pas une copie de travail"
+msgstr "'%s' n'est pas un arbre de travail"
 
 msgid "The main working tree cannot be locked or unlocked"
 msgstr ""
-"La copie de travail principale ne peut pas être verrouillée ou déverrouillée"
+"L'arbre de travail principal ne peut pas être verrouillé ou déverrouillé"
 
 #, c-format
 msgid "'%s' is already locked, reason: %s"
@@ -15826,7 +16256,7 @@ msgstr ""
 
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
-"forcer le déplacement même si l'arbre de travail est sale ou verrouillé"
+"forcer le déplacement même si l'arbre-de-travail est sale ou verrouillé"
 
 #, c-format
 msgid "'%s' is a main working tree"
@@ -15876,7 +16306,7 @@ msgstr "impossible de lancer 'git status' sur '%s', code %d"
 
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
-"forcer la suppression même si l'arbre de travail est sale ou verrouillé"
+"forcer la suppression même si l'arbre-de-travail est sale ou verrouillé"
 
 #, c-format
 msgid ""
@@ -15964,6 +16394,10 @@ msgstr "impossible de télécharger le colis depuis l'URI '%s'"
 msgid "file at URI '%s' is not a bundle or bundle list"
 msgstr "le fichier à l'URI '%s' n'est pas un colis ou une liste de colis"
 
+#, c-format
+msgid "config '%s' has no value"
+msgstr "la configuration '%s' n'a pas de valeur"
+
 #, c-format
 msgid "bundle-uri: unexpected argument: '%s'"
 msgstr "bundle-uri :argument inattendu : '%s'"
@@ -16161,10 +16595,10 @@ msgid "Ensures that a reference name is well formed"
 msgstr "S'assurer qu'un nom de référence est bien formé"
 
 msgid "Switch branches or restore working tree files"
-msgstr "Basculer de branche ou restaurer la copie de travail"
+msgstr "Basculer de branche ou restaurer l'arbre de travail"
 
 msgid "Copy files from the index to the working tree"
-msgstr "Copier les fichiers depuis l'index dans la copie de travail"
+msgstr "Copier les fichiers depuis l'index dans l'arbre de travail"
 
 msgid "Find commits yet to be applied to upstream"
 msgstr "Trouver les commits à appliquer en amont"
@@ -16231,7 +16665,7 @@ msgstr "Générer une archive zip d'information de diagnostic"
 
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr ""
-"Afficher les changements entre les validations, entre validation et copie de "
+"Afficher les changements entre les validations, entre validation et arbre de "
 "travail, etc"
 
 msgid "Compares files in the working tree and the index"
@@ -16330,9 +16764,8 @@ msgstr "Créer un dépôt Git vide ou réinitialiser un existant"
 msgid "Instantly browse your working repository in gitweb"
 msgstr "Naviguer instantanément votre dépôt de travail dans gitweb"
 
-msgid "Add or parse structured information in commit messages"
-msgstr ""
-"Ajouter ou analyser l'information structurée dans les messages de validation"
+msgid "Add or parse metadata in commit messages"
+msgstr "Ajouter ou analyser des métadonnées dans les messages de validation"
 
 msgid "EXPERIMENTAL: Show when files were last modified"
 msgstr "EXPÉRIMENTAL : Afficher la dernière date de modification des fichiers"
@@ -16425,7 +16858,7 @@ msgid "Remove extra objects that are already in pack files"
 msgstr "Éliminer les objets qui sont déjà présents dans les fichiers pack"
 
 msgid "Fetch from and integrate with another repository or a local branch"
-msgstr "Rapatrier et intégrer un autre dépôt ou une branche locale"
+msgstr "Récupérer et intégrer un autre dépôt ou une branche locale"
 
 msgid "Update remote refs along with associated objects"
 msgstr "Mettre à jour les références distantes ainsi que les objets associés"
@@ -16479,7 +16912,7 @@ msgid "Set `HEAD` or the index to a known state"
 msgstr "Positionner `HEAD` ou l'index à un état connu"
 
 msgid "Restore working tree files"
-msgstr "Restaurer les fichiers l'arbre de travail"
+msgstr "Restaurer les fichiers de l'arbre de travail"
 
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Afficher les objets commit dans l'ordre chronologique inverse"
@@ -16491,7 +16924,7 @@ msgid "Revert some existing commits"
 msgstr "Inverser des commits existants"
 
 msgid "Remove files from the working tree and from the index"
-msgstr "Supprimer des fichiers de la copie de travail et de l'index"
+msgstr "Supprimer des fichiers de l'arbre de travail et de l'index"
 
 msgid "Send a collection of patches as emails"
 msgstr "Envoyer un ensemble de rustines comme courriels"
@@ -16533,7 +16966,7 @@ msgid "Stash the changes in a dirty working directory away"
 msgstr "Remiser les modifications d'un répertoire de travail sale"
 
 msgid "Show the working tree status"
-msgstr "Afficher l'état de la copie de travail"
+msgstr "Afficher l'état de l'arbre de travail"
 
 msgid "Remove unnecessary whitespace"
 msgstr "Retirer les espaces inutiles"
@@ -16619,6 +17052,9 @@ msgstr "Fourniture des noms d'utilisateurs et des mots de passe à Git"
 msgid "Git for CVS users"
 msgstr "Git pour les utilisateurs de CVS"
 
+msgid "Git's core data model"
+msgstr "Le modèle de données central de Git"
+
 msgid "Tweaking diff output"
 msgstr "Bidouillage de la sortie diff"
 
@@ -16813,10 +17249,6 @@ msgstr ""
 "position de commit invalide. Le graphe de commit est vraisemblablement "
 "corrompu"
 
-#, c-format
-msgid "could not find commit %s"
-msgstr "impossible de trouver le commit %s"
-
 msgid "commit-graph requires overflow generation data but has none"
 msgstr ""
 "le graphe de commits requiert des données de génération de débordement mais "
@@ -16920,11 +17352,11 @@ msgstr ""
 
 #, c-format
 msgid ""
-"attempting to write a commit-graph, but 'commitGraph."
-"changedPathsVersion' (%d) is not supported"
+"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' "
+"(%d) is not supported"
 msgstr ""
-"essai d'écriture de graphe de commits, mais 'commitGraph."
-"changedPathsVersion' (%d) n'est pas pris en charge"
+"essai d'écriture de graphe de commits, mais "
+"'commitGraph.changedPathsVersion' (%d) n'est pas pris en charge"
 
 msgid "too many commits to write graph"
 msgstr "trop de commits pour écrire un graphe"
@@ -17001,6 +17433,12 @@ msgstr "Verification des commits dans le graphe de commits"
 msgid "could not parse commit %s"
 msgstr "impossible d'analyser le commit %s"
 
+msgid "commit ancestry contains a cycle"
+msgstr "l'ascendance de commit contient un cycle"
+
+msgid "failed to check reachability"
+msgstr "échec de la vérification de l'accessibilité"
+
 #, c-format
 msgid "object %s is a %s, not a %s"
 msgstr "l'objet %s est de type %s, pas de type %s"
@@ -17653,6 +18091,14 @@ msgstr "réponse à ls-ref invalide : %s"
 msgid "expected flush after ref listing"
 msgstr "vidage attendu après le listage de références"
 
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "non-correspondance des algorithmes : client %s ; serveur %s"
+
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "le serveur ne prend pas en charge l'algorithme '%s'"
+
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "impossible de positionner SO_KEEPALIVE sur la socket"
 
@@ -17983,9 +18429,6 @@ msgstr "impossible d'ouvrir le répertoire '%s'"
 msgid "skipping '%s', which is neither file nor directory"
 msgstr "'%s' sauté, qui n'est ni un fichier ni un répertoire"
 
-msgid "could not duplicate stdout"
-msgstr "impossible de dupliquer stdout"
-
 #, c-format
 msgid "could not add directory '%s' to archiver"
 msgstr "impossible d'ajouter le répertoire '%s' à l'archiveur"
@@ -18366,11 +18809,11 @@ msgid "continue listing the history of a file beyond renames"
 msgstr "continuer à afficher l'historique d'un fichier au delà des renommages"
 
 msgid ""
-"prevent rename/copy detection if the number of rename/copy targets exceeds "
-"given limit"
+"limit to cheap rename/copy detection if the number of rename/copy targets "
+"exceeds this value"
 msgstr ""
-"empêcher la détection de renommage/copie si le nombre de cibles de renommage/"
-"copie excède la limite indiquée"
+"limiter à une détection bon marché des renommages/copies si le nombre de "
+"cibles de renommage/copie dépasse cette valeur"
 
 msgid "Diff algorithm options"
 msgstr "Options de l'algorithme de diff"
@@ -18631,10 +19074,6 @@ msgstr ""
 "suggestion : en attente de la fermeture du fichier par votre éditeur de "
 "texte…%c"
 
-#, c-format
-msgid "could not write to '%s'"
-msgstr "impossible d'écrire dans '%s'"
-
 #, c-format
 msgid "could not edit '%s'"
 msgstr "impossible d'éditer '%s'"
@@ -18700,6 +19139,51 @@ msgstr "doit être parmi nothing, matching, simple, upstream ou current"
 msgid "too many args to run %s"
 msgstr "trop d'arguments pour lancer %s"
 
+msgid "unable to write request to remote"
+msgstr "impossible d'écrire la requête sur le distant"
+
+msgid "object-info capability is not enabled on the server"
+msgstr "la capacité object-info n'est pas activée sur le serveur"
+
+msgid "object-info requires protocol v2"
+msgstr "object-info nécessite le protocole v2"
+
+#, c-format
+msgid "object-info: expected %<PRIuMAX> attributes, got %<PRIuMAX>"
+msgstr "object-info : %<PRIuMAX> attributs attendus, %<PRIuMAX> reçus"
+
+msgid "object-info: unrequested 'size' attribute"
+msgstr "object-info : attribut 'size' non demandé"
+
+msgid "object-info: duplicate 'size' attribute"
+msgstr "object-info : attribut 'size' dupliqué"
+
+msgid "object-info: unrequested 'type' attribute"
+msgstr "object-info : attribut 'type' non demandé"
+
+msgid "object-info: duplicate 'type' attribute"
+msgstr "object-info : attribut 'type' dupliqué"
+
+#, c-format
+msgid "object-info: unknown attribute '%s'"
+msgstr "object-info : attribut inconnu '%s'"
+
+#, c-format
+msgid "object-info: expected %<PRIuMAX> objects, got %<PRIuMAX>"
+msgstr "object-info : %<PRIuMAX> objets attendus, %<PRIuMAX> reçus"
+
+#, c-format
+msgid "object-info: expected OID: %s, got %s"
+msgstr "object-info : OID attendu : %s, %s reçu"
+
+#, c-format
+msgid "object-info: object %s has invalid type '%s'"
+msgstr "object-info : l'objet %s a un type invalide '%s'"
+
+#, c-format
+msgid "object-info: expected flush after %<PRIuMAX> objects"
+msgstr "object-info : vidage attendu après %<PRIuMAX> objets"
+
 #, c-format
 msgid ""
 "You are attempting to fetch %s, which is in the commit graph file but not in "
@@ -18711,8 +19195,8 @@ msgstr ""
 "Vous tentez de récupérer %s, qui est dans le graphe de commit mais pas dans "
 "la base de données des objets.\n"
 "C'est probablement dû à une corruption de dépôt.\n"
-"Si vous essayez de réparer cette corruption de dépôt en re-récupérant l'objet "
-"manquant, utilisez 'git fetch --refetch' sur les objets manquants."
+"Si vous essayez de réparer cette corruption de dépôt en re-récupérant "
+"l'objet manquant, utilisez 'git fetch --refetch' sur les objets manquants."
 
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack : liste superficielle attendue"
@@ -18829,20 +19313,9 @@ msgstr "pas de commit commun"
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack : échec de le récupération."
 
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr "non-correspondance des algorithmes : client %s ; serveur %s"
-
-#, c-format
-msgid "the server does not support algorithm '%s'"
-msgstr "le serveur ne supporte pas l'algorithme '%s'"
-
 msgid "Server does not support shallow requests"
 msgstr "Le serveur ne supporte pas les requêtes superficielles"
 
-msgid "unable to write request to remote"
-msgstr "impossible d'écrire la requête sur le distant"
-
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "'%s' attendu, '%s' reçu"
@@ -18861,12 +19334,14 @@ msgstr "erreur lors du traitement des acquittements : %d"
 
 #. TRANSLATORS: The parameter will be 'ready', a protocol
 #. keyword.
+#.
 #, c-format
 msgid "expected packfile to be sent after '%s'"
 msgstr "fichier paquet attendu à envoyer après '%s'"
 
 #. TRANSLATORS: The parameter will be 'ready', a protocol
 #. keyword.
+#.
 #, c-format
 msgid "expected no other sections to be sent after no '%s'"
 msgstr "aucune autre section attendue à envoyer après absence de '%s'"
@@ -18999,6 +19474,10 @@ msgstr "-c requiert une chaîne de configuration\n"
 msgid "no config key given for --config-env\n"
 msgstr "aucune clé de configuration fournie pour --config-env\n"
 
+#, c-format
+msgid "no file given for '%s' option\n"
+msgstr "aucun fichier fourni pour l'option '%s'\n"
+
 #, c-format
 msgid "no attribute source given for --attr-source\n"
 msgstr "aucune source d'attribut fournie pour --attr-source\n"
@@ -19516,9 +19995,12 @@ msgstr "nom d'identifiant vide (pour <%s>) non permis"
 msgid "name consists only of disallowed characters: %s"
 msgstr "le nom n'est constitué que de caractères interdits : %s"
 
-msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+msgid ""
+"git imap-send [-v] [-q] [--[no-]curl] [--[no-]draft] [(--folder|-f) "
+"<folder>] < <mbox>"
 msgstr ""
-"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <répertoire>] < <mbox>"
+"git imap-send [-v] [-q] [--[no-]curl] [--[no-]draft] [(--folder|-f) "
+"<dossier>] < <mbox>"
 
 msgid "no IMAP host specified"
 msgstr "serveur IMAP non spécifié"
@@ -19593,6 +20075,9 @@ msgstr "impossible d'accéder au blob clairsemé dans '%s'"
 msgid "unable to parse sparse filter data in %s"
 msgstr "impossible d'analyser la donnée de filtre clairsemé dans %s"
 
+msgid "filter_oidset: only blob:limit filters are supported"
+msgstr "filter_oidset : seuls les filtres blob:limit sont pris en charge"
+
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
 msgstr ""
@@ -19684,6 +20169,10 @@ msgstr "taille de marqueur invalide '%s', entier attendu"
 msgid "Could not parse object '%s'"
 msgstr "Impossible d'analyser l'objet '%s'"
 
+#, c-format
+msgid "tree has duplicate entries for '%s'"
+msgstr "l'arbre contient des entrées en double pour '%s'"
+
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "Échec de la fusion du sous-module %s (non extrait)"
@@ -19890,6 +20379,7 @@ msgstr ""
 #. name, and the second argument is the abbreviated id of the
 #. commit that needs to be merged.  For example:
 #.  - go to submodule (mysubmodule), and either merge commit abc1234"
+#.
 #, c-format
 msgid ""
 " - go to submodule (%s), and either merge commit %s\n"
@@ -19927,6 +20417,7 @@ msgstr ""
 
 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
 #. base, and 2-3) the trees for the two trees we're merging.
+#.
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr "échec de collecte l'information de fusion pour les arbres %s, %s, %s"
@@ -20247,6 +20738,7 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"
 #. TRANSLATORS: The first %s is the name of
 #. the environment variable, the second %s is
 #. its value.
+#.
 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "Mauvaise valeur de %s : '%s'"
@@ -20301,56 +20793,6 @@ msgstr "impossible de régler les droits de '%s'"
 msgid "core.fsyncMethod = batch is unsupported on this platform"
 msgstr "core.fsyncMethod = batch non géré sur cette plateforme"
 
-msgid "error when closing loose object file"
-msgstr "erreur en fermeture du fichier d'objet esseulé"
-
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
-"droits insuffisants pour ajouter un objet à la base de données %s du dépôt"
-
-msgid "unable to create temporary file"
-msgstr "impossible de créer un fichier temporaire"
-
-msgid "unable to write loose object file"
-msgstr "impossible d'écrire le fichier d'objet esseulé"
-
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "impossible de compresser le nouvel objet %s (%d)"
-
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "échec de deflateEnd sur l'objet %s (%d)"
-
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "données de source d'objet instable pour %s"
-
-#, c-format
-msgid "write stream object %<PRIuMAX> != %<PRIuMAX>"
-msgstr "écrire l'objet de flux %<PRIuMAX> != %<PRIuMAX>"
-
-#, c-format
-msgid "unable to stream deflate new object (%d)"
-msgstr "impossible de compresser le nouvel objet dans le flux (%d)"
-
-#, c-format
-msgid "deflateEnd on stream object failed (%d)"
-msgstr "échec de deflateEnd sur l'objet (%d)"
-
-#, c-format
-msgid "unable to create directory %s"
-msgstr "échec de la création du répertoire %s"
-
-#, c-format
-msgid "cannot read object for %s"
-msgstr "impossible de lire l'objet pour %s"
-
-#, c-format
-msgid "cannot map object %s to %s"
-msgstr "impossible de faire correspondre l'objet %s avec %s"
-
 #, c-format
 msgid "object fails fsck: %s"
 msgstr "l'objet est en échec de fsck : %s"
@@ -20402,9 +20844,13 @@ msgstr "impossible d'analyser le type depuis l'entête '%s' de '%s'"
 msgid "unable to unpack contents of %s"
 msgstr "impossible de dépaqueter le contenu de %s"
 
+msgid "unable to migrate temporary objects"
+msgstr "impossible de migrer les objets temporaires"
+
 #. TRANSLATORS: This is a line of ambiguous object
 #. output shown when we cannot look up or parse the
 #. object in question. E.g. "deadbeef [bad object]".
+#.
 #, c-format
 msgid "%s [bad object]"
 msgstr "%s [mauvais objet]"
@@ -20413,6 +20859,7 @@ msgstr "%s [mauvais objet]"
 #. object output. E.g.:
 #. *
 #.    "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
 #, c-format
 msgid "%s commit %s - %s"
 msgstr "%s commit %s - %s"
@@ -20427,6 +20874,7 @@ msgstr "%s commit %s - %s"
 #. *
 #. The third argument is the "tag" string
 #. from object.c.
+#.
 #, c-format
 msgid "%s tag %s - %s"
 msgstr "%s étiquette %s - %s"
@@ -20436,18 +20884,21 @@ msgstr "%s étiquette %s - %s"
 #. the tag itself. E.g.:
 #. *
 #.    "deadbeef [bad tag, could not parse it]"
+#.
 #, c-format
 msgid "%s [bad tag, could not parse it]"
 msgstr "%s [mauvaise étiquette, impossible à analyser]"
 
 #. TRANSLATORS: This is a line of ambiguous <type>
 #. object output. E.g. "deadbeef tree".
+#.
 #, c-format
 msgid "%s tree"
 msgstr "arbre %s"
 
 #. TRANSLATORS: This is a line of ambiguous <type>
 #. object output. E.g. "deadbeef blob".
+#.
 #, c-format
 msgid "%s blob"
 msgstr "blob %s"
@@ -20459,6 +20910,7 @@ msgstr "l'id court d'objet %s est ambigu"
 #. TRANSLATORS: The argument is the list of ambiguous
 #. objects composed in show_ambiguous_object(). See
 #. its "TRANSLATORS" comments for details.
+#.
 #, c-format
 msgid ""
 "The candidates are:\n"
@@ -20619,8 +21071,8 @@ msgid "replacement %s not found for %s"
 msgstr "remplacement %s non trouvé pour %s"
 
 #, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu"
+msgid "object %s is corrupt"
+msgstr "l'objet %s est corrompu"
 
 #, c-format
 msgid "missing mapping of %s to %s"
@@ -20634,6 +21086,9 @@ msgstr "%s n'est pas un objet valide"
 msgid "%s is not a valid '%s' object"
 msgstr "%s n'est pas un objet '%s' valide"
 
+msgid "primary object source does not support generating packfiles"
+msgstr "la source d'objet principale ne permet pas de générer des paquets"
+
 msgid "unable to fdopen alternates lockfile"
 msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives"
 
@@ -20643,6 +21098,22 @@ msgstr "lecture du fichier d'alternatives impossible"
 msgid "unable to move new alternates file into place"
 msgstr "impossible de déplacer le nouveau fichier d'alternative"
 
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+"Il y a trop d'objets esseulés inaccessibles ; lancez 'git prune' pour les "
+"supprimer."
+
+#, c-format
+msgid "pack-objects died of signal %d"
+msgstr "pack-objects s'est terminé par le signal %d"
+
+msgid "could not spawn pack-objects"
+msgstr "impossible de lancer pack-objects"
+
+msgid "error writing to pack-objects"
+msgstr "erreur d'écriture vers pack-objects"
+
 #, c-format
 msgid "unable to open loose object %s"
 msgstr "impossible d'ouvrir l'objet libre %s"
@@ -20666,6 +21137,90 @@ msgstr "entête de %s trop long, attendu %d octets"
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "l'objet libre %s (stocké dans %s) est corrompu"
 
+msgid "error when closing loose object file"
+msgstr "erreur en fermeture du fichier d'objet esseulé"
+
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
+"droits insuffisants pour ajouter un objet à la base de données %s du dépôt"
+
+msgid "unable to create temporary file"
+msgstr "impossible de créer un fichier temporaire"
+
+msgid "unable to write loose object file"
+msgstr "impossible d'écrire le fichier d'objet esseulé"
+
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "impossible de compresser le nouvel objet %s (%d)"
+
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "échec de deflateEnd sur l'objet %s (%d)"
+
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "données de source d'objet instable pour %s"
+
+#, c-format
+msgid "write stream object %<PRIuMAX> != %<PRIuMAX>"
+msgstr "écrire l'objet de flux %<PRIuMAX> != %<PRIuMAX>"
+
+#, c-format
+msgid "unable to stream deflate new object (%d)"
+msgstr "impossible de compresser le nouvel objet dans le flux (%d)"
+
+#, c-format
+msgid "deflateEnd on stream object failed (%d)"
+msgstr "échec de deflateEnd sur le flux d'objet (%d)"
+
+#, c-format
+msgid "unable to create directory %s"
+msgstr "échec de la création du répertoire %s"
+
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s : incohérence entre le hachage et le chemin, trouvé à : %s"
+
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s : objet corrompu ou manquant : %s"
+
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "mauvais fichier de sha1 : %s"
+
+msgid "Checking object directory"
+msgstr "Vérification du répertoire d'objet"
+
+msgid "Checking object directories"
+msgstr "Vérification des répertoires d'objet"
+
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu"
+
+#, c-format
+msgid "unable to load rev-index for pack '%s'"
+msgstr "impossible de charger le rev-index pour le paquet '%s'"
+
+#, c-format
+msgid "invalid rev-index for pack '%s'"
+msgstr "rev-index invalide pour le paquet '%s'"
+
+msgid "object database transaction already pending"
+msgstr "une transaction de base d'objets est déjà en attente"
+
+msgid "failed to start ODB transaction"
+msgstr "échec du démarrage de la transaction ODB"
+
+msgid "failed to commit ODB transaction"
+msgstr "échec de la validation de la transaction ODB"
+
+msgid "failed to finalize ODB transaction"
+msgstr "échec de la finalisation de la transaction ODB"
+
 #, c-format
 msgid "duplicate entry when writing bitmap index: %s"
 msgstr "entrée dupliquée dans l'index en bitmap : '%s'"
@@ -20745,6 +21300,9 @@ msgstr "l'index inverse requis manque dans l'index multi-paquet"
 msgid "could not open pack %s"
 msgstr "impossible d'ouvrir le paquet '%s'"
 
+msgid "could not open bitmap for base MIDX"
+msgstr "impossible d'ouvrir le bitmap pour le MIDX de base"
+
 msgid "corrupt bitmap lookup table: triplet position out of index"
 msgstr ""
 "table de recherche en bitmap corrompue : position de triplet hors d'index"
@@ -20998,6 +21556,7 @@ msgstr "option non-ascii inconnue dans la chaîne : '%s'"
 #. or if the alphabet is different enough it may use
 #. "%s" without any placeholder signal.  Most
 #. translations leave this message as is.
+#.
 #, c-format
 msgid "[=<%s>]"
 msgstr "[=<%s>]"
@@ -21013,6 +21572,7 @@ msgstr "[=<%s>]"
 #. or if the alphabet is different enough it may use
 #. "%s" without any placeholder signal.  Most
 #. translations leave this message as is.
+#.
 #, c-format
 msgid "[<%s>]"
 msgstr "[<%s>]"
@@ -21026,6 +21586,7 @@ msgstr "[<%s>]"
 #. "|%s|" instead, or if the alphabet is different enough it
 #. may use "%s" without any placeholder signal.  Most
 #. translations leave this message as is.
+#.
 #, c-format
 msgid " <%s>"
 msgstr " <%s>"
@@ -21039,6 +21600,7 @@ msgstr "usage : %s"
 
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
+#.
 #, c-format
 msgid "   or: %s"
 msgstr "   ou : %s"
@@ -21061,6 +21623,7 @@ msgstr "   ou : %s"
 #. function. The "%s" is a line in the (hopefully already
 #. translated) N_() usage string, which contained embedded
 #. newlines before we split it up.
+#.
 #, c-format
 msgid "%*s%s"
 msgstr "%*s%s"
@@ -21310,6 +21873,50 @@ msgstr "impossible de récupérer %s depuis le distant de prometteur"
 msgid "unsupported field '%s' in '%s' config"
 msgstr "champ non géré '%s' dans le config '%s'"
 
+#, c-format
+msgid ""
+"invalid remote name '%s' before '=' sign in '%s' from "
+"promisor.acceptFromServerUrl config"
+msgstr ""
+"nom de distant invalide '%s' avant le signe '=' dans '%s' de la "
+"configuration promisor.acceptFromServerUrl"
+
+#, c-format
+msgid ""
+"invalid url pattern '%s' in '%s' from promisor.acceptFromServerUrl config"
+msgstr ""
+"motif d'URL invalide '%s' dans '%s' de la configuration "
+"promisor.acceptFromServerUrl"
+
+#, c-format
+msgid ""
+"couldn't generate a valid remote name from advertised url '%s', ignoring "
+"this remote"
+msgstr ""
+"impossible de générer un nom de distant valide à partir de l'URL annoncée "
+"'%s', ce distant est ignoré"
+
+#, c-format
+msgid ""
+"generated remote name '%s' from advertised url '%s' is invalid, ignoring "
+"this remote"
+msgstr ""
+"le nom de distant généré '%s' à partir de l'URL annoncée '%s' est invalide, "
+"ce distant est ignoré"
+
+#, c-format
+msgid "couldn't normalize advertised url '%s', ignoring this remote"
+msgstr "impossible de normaliser l'URL annoncée '%s', ce distant est ignoré"
+
+#, c-format
+msgid "Auto-creating promisor remote '%s' for URL '%s'\n"
+msgstr "Création automatique du distant prometteur '%s' pour l'URL '%s'\n"
+
+#, c-format
+msgid "too many remotes accepted with name like '%s-X', ignoring this remote"
+msgstr ""
+"trop de distants acceptés avec un nom de type '%s-X', ce distant est ignoré"
+
 #, c-format
 msgid ""
 "known remote named '%s' but with URL '%s' instead of '%s', ignoring this "
@@ -21352,7 +21959,7 @@ msgstr "valeur inconnue '%s' pour l'option de config '%s'"
 
 #, c-format
 msgid "accepted promisor remote '%s' not found"
-msgstr "distant accpté de prometteur '%s' non trouvé"
+msgstr "distant prometteur accepté '%s' non trouvé"
 
 #, c-format
 msgid "promisor remote '%s' advertised invalid filter '%s': %s"
@@ -21473,6 +22080,10 @@ msgstr "sommet supplémentaire dégénéré invalide : '%s'"
 msgid "unable to enumerate additional recent objects"
 msgstr "impossible d'énumérer les objets récents additionnels"
 
+#, c-format
+msgid "remove '%s'\n"
+msgstr "suppression de '%s'\n"
+
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr "pas d'ajout d'alias de fichier '%s'(« %s » existe déjà dans l'index)"
@@ -21629,10 +22240,6 @@ msgstr ""
 msgid "unexpected diff status %c"
 msgstr "état de diff inattendu %c"
 
-#, c-format
-msgid "remove '%s'\n"
-msgstr "suppression de '%s'\n"
-
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
 "continue'.\n"
@@ -22277,7 +22884,7 @@ msgstr "la pile de reftable pour l'arbre-de-travail '%s' est cassée"
 
 #, c-format
 msgid "could not create iterator for worktree '%s'"
-msgstr "impossible de créer l'itérateur l'arbre-de-travail '%s'"
+msgstr "impossible de créer l'itérateur pour l'arbre-de-travail '%s'"
 
 #, c-format
 msgid "could not read record for worktree '%s'"
@@ -22347,8 +22954,8 @@ msgstr "le serveur distant a envoyé un paquet de fin de réponse inattendu"
 
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
-"impossible de rembobiner le données post rpc - essayer d'augmenter http."
-"postBuffer"
+"impossible de rembobiner le données post rpc - essayer d'augmenter "
+"http.postBuffer"
 
 #, c-format
 msgid "remote-curl: bad line length character: %.4s"
@@ -22487,6 +23094,7 @@ msgstr ""
 #. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
+#.
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -22658,6 +23266,11 @@ msgstr[1] ""
 "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "
 "en avance rapide.\n"
 
+#, c-format
+msgid "  (use \"git pull %s %s\" to update your local branch)\n"
+msgstr ""
+"  (utilisez \"git pull %s %s\" pour mettre à jour votre branche locale)\n"
+
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
 
@@ -22675,6 +23288,14 @@ msgstr[1] ""
 "Votre branche et '%s' ont divergé,\n"
 "et ont %d et %d commits différents chacune respectivement.\n"
 
+#, c-format
+msgid ""
+"  (use \"git pull %s %s\" if you want to integrate the remote branch with "
+"yours)\n"
+msgstr ""
+"  (utilisez \"git pull %s %s\" si vous souhaitez intégrer la branche "
+"distante à la vôtre)\n"
+
 msgid ""
 "  (use \"git pull\" if you want to integrate the remote branch with yours)\n"
 msgstr ""
@@ -22804,6 +23425,10 @@ msgstr "profondeur de remplacement trop grande pour l'objet %s"
 msgid "'%s' is not a valid commit-ish for %s"
 msgstr "'%s' n'est pas un commit-esque valide pour l'option %s"
 
+#, c-format
+msgid "'%s' does not point to a commit for %s"
+msgstr "'%s' ne pointe pas sur un commit pour %s"
+
 #, c-format
 msgid "argument to %s must be a reference"
 msgstr "l'argument de %s doit être une référence"
@@ -22822,10 +23447,17 @@ msgstr "commits requis pour pouvoir rejouer"
 msgid "all positive revisions given must be references"
 msgstr "toutes les révisions positives fournies doivent être des références"
 
+#, c-format
+msgid "merge of %s onto %s failed"
+msgstr "échec de la fusion de %s sur %s"
+
 #, c-format
 msgid "commit %s became empty after replay"
 msgstr "le commit %s est devenu vide après rejeu"
 
+msgid "'--linearize' cannot be used with multiple branches"
+msgstr "'--linearize' ne peut pas être utilisé avec plusieurs branches"
+
 msgid "'--ref' cannot be used with multiple revision ranges"
 msgstr "--ref ne peut pas être utilisé avec des plages de révisions multiples"
 
@@ -22971,7 +23603,7 @@ msgid "need a working directory"
 msgstr "répertoire de travail nécessaire"
 
 msgid "Scalar enlistments require a worktree"
-msgstr "Les enrôlements scalaires requièrent un arbre de travail"
+msgstr "Les enrôlements scalaires requièrent un arbre-de-travail"
 
 #, c-format
 msgid "could not configure %s=%s"
@@ -23048,7 +23680,7 @@ msgstr ""
 
 #, c-format
 msgid "cannot deduce worktree name from '%s'"
-msgstr "impossible de déduire le nom de l'arbre de travail depuis '%s'"
+msgstr "impossible de déduire le nom de l'arbre-de-travail depuis '%s'"
 
 #, c-format
 msgid "directory '%s' exists already"
@@ -23318,6 +23950,7 @@ msgstr "validez vos modifications ou les remiser pour continuer."
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase".
+#.
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Impossible d'écrire le nouveau fichier index"
@@ -23373,16 +24006,17 @@ msgid ""
 "\n"
 "  git rebase --continue\n"
 msgstr ""
-"vous avez des modifications indexées dans votre copie de travail.\n"
-"Si elles devaient être ajoutées dans le commit précédent, lancez :\n"
+"vous avez des modifications indexées dans votre arbre de travail.\n"
+"Si elles sont destinées à être fusionnées dans le commit précédent, "
+"lancez :\n"
 "\n"
 "  git commit --amend %s\n"
 "\n"
-"Si elles devaient aller dans un nouveau commit, lancez :\n"
+"Si elles sont destinées à aller dans un nouveau commit, lancez :\n"
 "\n"
 "  git commit %s\n"
 "\n"
-"Dans les deux cas, une fois fini, continuez avec :\n"
+"Dans les deux cas, une fois terminé, continuez avec :\n"
 "\n"
 "  git rebase --continue\n"
 
@@ -23585,6 +24219,7 @@ msgstr "'%s' n'accepte pas de commit de fusion"
 
 #. TRANSLATORS: 'pick' and 'merge -C' should not be
 #. translated.
+#.
 msgid ""
 "'pick' does not take a merge commit. If you wanted to\n"
 "replay the merge, use 'merge -C' on the commit."
@@ -23594,6 +24229,7 @@ msgstr ""
 
 #. TRANSLATORS: 'reword' and 'merge -c' should not be
 #. translated.
+#.
 msgid ""
 "'reword' does not take a merge commit. If you wanted to\n"
 "replay the merge and reword the commit message, use\n"
@@ -23605,6 +24241,7 @@ msgstr ""
 
 #. TRANSLATORS: 'edit', 'merge -C' and 'break' should
 #. not be translated.
+#.
 msgid ""
 "'edit' does not take a merge commit. If you wanted to\n"
 "replay the merge, use 'merge -C' on the commit, and then\n"
@@ -23805,8 +24442,8 @@ msgid ""
 "\n"
 msgstr ""
 "l'exécution a réussi : %s\n"
-"mais a laissé des modifications dans l'index ou la copie de travail.\n"
-"Validez ou remisez vos modification, puis lancez\n"
+"mais a laissé des modifications dans l'index ou l'arbre de travail.\n"
+"Validez ou remisez vos modifications, puis lancez\n"
 "\n"
 "  git rebase --continue\n"
 "\n"
@@ -23908,6 +24545,11 @@ msgstr ""
 "ne voulez pas les résoudre maintenant, lancez \"git reset --hard\" et\n"
 "appliquez les modifications locales plus tard avec \"git stash pop\".\n"
 
+msgid "could not apply autostash; your changes are safe in the stash"
+msgstr ""
+"impossible d'appliquer l'autoremisage ; vos modifications sont en sécurité "
+"dans la remise"
+
 #, c-format
 msgid ""
 "Autostash exists; creating a new stash entry.\n"
@@ -23998,7 +24640,7 @@ msgid ""
 "first and then run 'git rebase --continue' again."
 msgstr ""
 "\n"
-"Vous avez des modifications non validées dans votre copie de travail.\n"
+"Vous avez des modifications non validées dans votre arbre de travail.\n"
 "Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
 
 #, c-format
@@ -24057,7 +24699,7 @@ msgid ""
 "%s: no such path in the working tree.\n"
 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."
 msgstr ""
-"%s : ce chemin n'existe pas dans la copie de travail.\n"
+"%s : ce chemin n'existe pas dans l'arbre de travail.\n"
 "Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui "
 "n'existent pas localement."
 
@@ -24089,7 +24731,7 @@ msgstr ""
 
 msgid "unable to set up work tree using invalid config"
 msgstr ""
-"impossible de mettre en place le répertoire de travail en utilisant une "
+"impossible de mettre en place l'arbre de travail en utilisant une "
 "configuration invalide"
 
 #, c-format
@@ -24133,8 +24775,8 @@ msgid "no path in gitfile: %s"
 msgstr "aucun chemin dans le fichier git : %s"
 
 #, c-format
-msgid "not a git repository: %s"
-msgstr "ce n'est pas un dépôt git : %s"
+msgid "gitfile does not point to a valid repository: %s"
+msgstr "gitfile ne pointe pas vers un dépôt valide : %s"
 
 #, c-format
 msgid "'$%s' too big"
@@ -24257,6 +24899,9 @@ msgstr "nom de branche initiale invalide : '%s'"
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-initialisation : --initial-branch=%s ignoré"
 
+msgid "failed creating object database"
+msgstr "échec de la création de la base d'objets"
+
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "impossible de traiter le fichier de type %d"
@@ -24378,6 +25023,7 @@ msgstr[1] "octets"
 
 #. TRANSLATORS: The first argument is the number string. The second
 #. argument is the unit string (i.e. "12.34 MiB/s").
+#.
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -24543,12 +25189,12 @@ msgstr "le chemin du sous-module '%s' ne devait pas être un lien symbolique"
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr ""
-"relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "
-"n'est pas supporté"
+"relocate_gitdir pour le sous-module '%s' avec plus d'un arbre-de-travail "
+"n'est pas pris en charge"
 
 #, c-format
 msgid "could not lookup name for submodule '%s'"
-msgstr "impossible de trouve le nom pour le sous-module '%s'"
+msgstr "impossible de trouver le nom pour le sous-module '%s'"
 
 #, c-format
 msgid ""
@@ -24571,8 +25217,8 @@ msgstr "ls-tree a renvoyé un code de retour inattendu %d"
 msgid ""
 "the 'submodule.%s.gitdir' config does not exist for module '%s'. Please "
 "ensure it is set, for example by running something like: 'git config "
-"submodule.%s.gitdir .git/modules/%s'. For details see the extensions."
-"submodulePathConfig documentation."
+"submodule.%s.gitdir .git/modules/%s'. For details see the "
+"extensions.submodulePathConfig documentation."
 msgstr ""
 "la config 'submodule.%s.gitdir' n'existe par pour le module '%s'. Veuillez "
 "vérifier qu'elle est réglée, en lançant par exemple quelque chose comme : "
@@ -24806,6 +25452,9 @@ msgstr "%s a dit de manière inattendue : '%s'"
 msgid "%s also locked %s"
 msgstr "%s a aussi verrouillé %s"
 
+msgid "could not dup helper output fd"
+msgstr "impossible de dupliquer le descripteur de sortie de l'assistant"
+
 msgid "couldn't run fast-import"
 msgstr "impossible de lancer fast-import"
 
@@ -24889,6 +25538,10 @@ msgstr "impossible de lancer fast-export"
 msgid "error while running fast-export"
 msgstr "erreur au lancement de fast-export"
 
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "impossible de renommer '%s' en '%s'"
+
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -24954,6 +25607,9 @@ msgstr "voir protocol.version dans 'git help config' pour plus d'information"
 msgid "server options require protocol version 2 or later"
 msgstr "les options de serveur exigent une version 2 ou supérieure"
 
+msgid "remote does not support object-info"
+msgstr "le distant ne prend pas en charge object-info"
+
 msgid "server does not support wait-for-done"
 msgstr "le serveur ne prend pas en charge wait-for-done"
 
@@ -25107,7 +25763,7 @@ msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
-"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
+"Les fichiers suivants non suivis de l'arbre de travail seraient effacés par "
 "l'extraction :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
 
@@ -25124,7 +25780,7 @@ msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
-"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
+"Les fichiers suivants non suivis de l'arbre de travail seraient écrasés par "
 "la fusion :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
 
@@ -25141,7 +25797,7 @@ msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr ""
-"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
+"Les fichiers suivants non suivis de l'arbre de travail seraient effacés par "
 "%s :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant %s."
 
@@ -25159,7 +25815,7 @@ msgid ""
 "checkout:\n"
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
-"Les fichiers suivants non suivis de la copie de travail seraient écrasés par "
+"Les fichiers suivants non suivis de l'arbre de travail seraient écrasés par "
 "l'extraction :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
 
@@ -25177,7 +25833,7 @@ msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
-"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
+"Les fichiers suivants non suivis de l'arbre de travail seraient effacés par "
 "la fusion :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
 
@@ -25194,7 +25850,7 @@ msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr ""
-"Les fichiers suivants non suivis de la copie de travail seraient écrasés par "
+"Les fichiers suivants non suivis de l'arbre de travail seraient écrasés par "
 "%s :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant %s."
 
@@ -25277,7 +25933,7 @@ msgstr "Mise à jour des drapeaux de l'index"
 #, c-format
 msgid "worktree and untracked commit have duplicate entries: %s"
 msgstr ""
-"l'arbre de travail et le commit non suivi ont des entrées dupliquées : %s"
+"l'arbre-de-travail et le commit non suivi ont des entrées dupliquées : %s"
 
 msgid "expected flush after fetch arguments"
 msgstr "vidage attendu après les arguments de récupération"
@@ -25321,31 +25977,33 @@ msgid "warning: "
 msgstr "avertissement : "
 
 #, c-format
-msgid "'%s' is nominated for removal.\n"
-msgstr "'%s' est nommé pour la suppression.\n"
+msgid "'%s' will be removed soon.\n"
+msgstr "'%s' sera bientôt supprimé.\n"
 
 #, c-format
 msgid ""
-"If you still use this command, here's what you can do:\n"
+"If you need a replacement:\n"
+"\n"
+"- Read https://git-scm.com/docs/BreakingChanges.html.\n"
+"\n"
+"- Check what others on the mailing list suggest as a replacement:\n"
+"  https://lore.kernel.org/git/?q=%s\n"
 "\n"
-"- read https://git-scm.com/docs/BreakingChanges.html\n"
-"- check if anyone has discussed this on the mailing\n"
-"  list and if they came up with something that can\n"
-"  help you: https://lore.kernel.org/git/?q=%s\n"
-"- send an email to <git@vger.kernel.org> to let us\n"
-"  know that you still use this command and were unable\n"
-"  to determine a suitable replacement\n"
+"- Send an email to <git@vger.kernel.org> asking for help, only if\n"
+"  suggestions by others do not work for you.\n"
 "\n"
 msgstr ""
-"Si vous utilisez toujours cette commande, voici ce que vous pouvez faire :\n"
+"Si vous avez besoin d'un remplacement :\n"
+"\n"
+"- Lisez https://git-scm.com/docs/BreakingChanges.html.\n"
+"\n"
+"- Vérifiez ce que les personnes sur la liste de diffusion proposent comme "
+"remplacement :\n"
+"  https://lore.kernel.org/git/?q=%s\n"
 "\n"
-"- lire  https://git-scm.com/docs/BreakingChanges.html\n"
-"- vérifier si quelqu'un a abordé le sujet sur la liste\n"
-"  de diffusion et si une solution à votre problème a été\n"
-"  trouvée : https://lore.kernel.org/git/?q=%s\n"
-"- envoyer un courriel à <git@vger.kernel.org> et nous\n"
-"  informer que vous utilisez toujours cette commande et\n"
-"  que vous n'avez pas trouvé de remplacement\n"
+"- Envoyez un courriel à <git@vger.kernel.org> pour demander de l'aide, "
+"seulement si\n"
+"  les suggestions des autres ne vous conviennent pas.\n"
 "\n"
 
 msgid "refusing to run without --i-still-use-this"
@@ -25902,7 +26560,7 @@ msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"
 
 #, c-format
 msgid "nothing to commit, working tree clean\n"
-msgstr "rien à valider, la copie de travail est propre\n"
+msgstr "rien à valider, l'arbre de travail est propre\n"
 
 msgid "No commits yet on "
 msgstr "Encore aucun commit sur "
@@ -25974,12 +26632,12 @@ msgstr "usage : $dashless $USAGE"
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr ""
-"Impossible de se placer dans le répertoire $cdup, la racine de la copie de "
+"Impossible de se placer dans le répertoire $cdup, la racine de l'arbre de "
 "travail"
 
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
-msgstr "fatal : $program_name ne peut pas être utilisé sans copie de travail."
+msgstr "fatal : $program_name ne peut pas être utilisé sans arbre de travail."
 
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr ""
@@ -26000,7 +26658,7 @@ msgstr "De plus, votre index contient des modifications non validées."
 
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr ""
-"Vous devez lancer cette commande depuis la racine de votre copie de travail."
+"Vous devez lancer cette commande depuis la racine de votre arbre de travail."
 
 msgid "Unable to determine absolute path of git directory"
 msgstr "Impossible de déterminer le chemin absolu du répertoire git"
@@ -26110,8 +26768,8 @@ msgstr ""
 "\n"
 
 #, perl-format
-msgid "No subject line in %s?"
-msgstr "Ligne de sujet non trouvée dans %s ?"
+msgid "No 'Subject:' line in '%s'\n"
+msgstr "Aucune ligne 'Subject:' dans '%s'\n"
 
 #, perl-format
 msgid "Failed to open for writing %s: %s"

From d4586f38f77fab3956f5fdb2521b7a2f92372f66 Mon Sep 17 00:00:00 2001
From: Emir SARI <emir_sari@icloud.com>
Date: Wed, 16 Sep 2026 17:32:40 +0300
Subject: [PATCH 010/247] l10n: tr: Update Turkish translations

Signed-off-by: Emir SARI <emir_sari@icloud.com>
---
 po/tr.po | 1195 +++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 902 insertions(+), 293 deletions(-)

diff --git a/po/tr.po b/po/tr.po
index 5e992e1a04900f..0b750f549a6270 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,8 +1,8 @@
 # Turkish translations for Git
 # Git Türkçe çevirileri
-# SPDX-FileCopyrightText: 2020-2024, 2025 Emir SARI <emir_sari@icloud.com>
+# SPDX-FileCopyrightText: 2020-2026 Emir SARI <emir_sari@icloud.com>
 # This file is distributed under the same license as the Git package.
-# Emir SARI <emir_sari@icloud.com>, 2020-2025
+# Emir SARI <emir_sari@icloud.com>, 2020-2026
 #
 # ######################################################### #
 #     Git Türkçe kavramlar dizini / Git Turkish Glossary    #
@@ -97,8 +97,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git Turkish Localization Project\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2026-06-15 18:56+0000\n"
-"PO-Revision-Date: 2026-06-16 20:30+0300\n"
+"POT-Creation-Date: 2026-09-15 23:12+0000\n"
+"PO-Revision-Date: 2026-09-16 10:00+0300\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: Turkish <kde-i18n-doc@kde.org>\n"
 "Language: tr\n"
@@ -1758,6 +1758,14 @@ msgstr "\"%s\" nesnesi için \"show\" başlatılamıyor"
 msgid "could not read file '%s'"
 msgstr "\"%s\" dosyası okunamadı"
 
+#, c-format
+msgid "could not read bad term from file '%s'"
+msgstr "\"%s\" dosyasından hatalı terim okunamadı"
+
+#, c-format
+msgid "could not read good term from file '%s'"
+msgstr "\"%s\" dosyasından düzgün terim okunamadı"
+
 msgid "reading bisect refs failed"
 msgstr "ikili arama başvurularını okuma başarısız oldu"
 
@@ -2001,6 +2009,12 @@ msgstr "'%s' bilgileri alınamadı"
 msgid "empty patch. aborted"
 msgstr "boş yama. iptal edildi."
 
+msgid "could not initialize apply state"
+msgstr "uygulama durumu ilklendirilemedi"
+
+msgid "could not check apply state"
+msgstr "uygulama durumu denetlenemedi"
+
 #, c-format
 msgid "could not apply '%s'"
 msgstr "'%s' uygulanamadı"
@@ -2038,6 +2052,9 @@ msgstr "izlenen dosyaları güncelle"
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "izlenen dosyaların satır sonlarını yeniden olağanlaştır (-u ima eder)"
 
+msgid "add conflict-resolved tracked files"
+msgstr "çakışması çözülmüş izlenen dosyaları ekle"
+
 msgid "record only the fact that the path will be added later"
 msgstr "yalnızca yolun sonra ekleneceği gerçeğinin kaydını yaz"
 
@@ -2107,6 +2124,22 @@ msgstr "Onları eklemeyi gerçekten istiyorsanız -f kullanın."
 msgid "adding files failed"
 msgstr "dosya ekleme başarısız"
 
+#, c-format
+msgid "updating file '%s' failed"
+msgstr "\"%s\" dosyası güncellenemedi"
+
+#, c-format
+msgid ""
+"the following paths still have conflict markers:\n"
+"%s"
+msgstr ""
+"Aşağıdaki yollarda hâlâ çakışma imleyicileri var:\n"
+"%s"
+
+#, c-format
+msgid "cannot lstat: '%s'"
+msgstr "lstat yapılamıyor: \"%s\""
+
 #, c-format
 msgid "'%s' cannot be negative"
 msgstr "'%s' negatif olamaz"
@@ -2544,12 +2577,12 @@ msgstr "tanımlanamayan argüman: %s"
 
 msgid ""
 "git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n"
-"                 [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
-"[<pathspec>...]"
+"                 [--no-checkout] [--first-parent] [--reset-when-"
+"found[=<where>]] [<bad> [<good>...]] [--] [<pathspec>...]"
 msgstr ""
-"git bisect start [--term-(bad|new)=<yeni> --term-(good|old)=<eski>]\n"
-"                 [--no-checkout] [--first-parent] [<kötü> [<iyi>...]] [--]\n"
-"                 [<yol-belirteci>...]"
+"git bisect start [--term-(bad|new)=<yeni-trm> --term-(good|old)=<eski-trm>]\n"
+"                 [--no-checkout] [--first-parent] [--reset-when-"
+"found[=<yer>]] [<hasarlı> [<düzgün>...]] [--] [<yol-belirteci>...]"
 
 msgid "git bisect (bad|new|<term-new>) [<rev>]"
 msgstr "git bisect (bad|new|<yeni-terim>) [<revizyon>]"
@@ -2566,24 +2599,24 @@ msgstr "git bisect reset [<işleme>]"
 msgid "git bisect replay <logfile>"
 msgstr "git bisect replay <günlük-dosyası>"
 
-msgid "git bisect run <cmd> [<arg>...]"
-msgstr "git bisect run <komut> [<argüman>...]"
+msgid "git bisect run [--reset-when-found[=<where>]] <cmd> [<arg>...]"
+msgstr "git bisect run [--reset-when-found[=<yer>]] <komut> [<argüman>...]"
 
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
-msgstr "'%s' dosyası '%s' kipinde açılamıyor"
+msgstr "\"%s\" dosyası \"%s\" kipinde açılamıyor"
 
 #, c-format
 msgid "could not write to file '%s'"
-msgstr "'%s' dosyasına yazılamadı"
+msgstr "\"%s\" dosyasına yazılamadı"
 
 #, c-format
 msgid "cannot open file '%s' for reading"
-msgstr "'%s' dosyası okuma için açılamıyor"
+msgstr "\"%s\" dosyası okuma için açılamıyor"
 
 #, c-format
 msgid "'%s' is not a valid term"
-msgstr "'%s' geçerli bir terim değil"
+msgstr "\"%s\" geçerli bir terim değil"
 
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
@@ -2602,13 +2635,18 @@ msgstr "İkili arama yapılmıyor.\n"
 
 #, c-format
 msgid "'%s' is not a valid commit"
-msgstr "'%s' geçerli bir işleme değil"
+msgstr "\"%s\" geçerli bir işleme değil"
 
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
 msgstr ""
-"Orijinal HEAD '%s' çıkışı yapılamadı. 'git bisect reset <işleme>' deneyin."
+"Orijinal HEAD \"%s\" çıkışı yapılamadı. \"git bisect reset <işleme>\" "
+"deneyin."
+
+#, c-format
+msgid "invalid value for '--reset-when-found': '%s'"
+msgstr "\"--reset-when-found\" için geçersiz değer: \"%s\""
 
 #, c-format
 msgid "Bad bisect_write argument: %s"
@@ -2692,6 +2730,10 @@ msgstr ""
 msgid "could not open '%s' for appending"
 msgstr "'%s' iliştirme için açılamadı"
 
+#, c-format
+msgid "could not find commit for '%s'"
+msgstr "\"%s\" için işleme bulunamadı"
+
 msgid "'' is not a valid term"
 msgstr "'' geçerli bir terim değil"
 
@@ -2776,6 +2818,9 @@ msgstr "bisect çalıştırılamadı: çıkış kodu %d, %s konumundan, < 0 veya
 msgid "cannot open file '%s' for writing"
 msgstr "'%s' dosyası yazma için açılamadı"
 
+msgid "could not duplicate stdout"
+msgstr "stdout çoğaltılamadı"
+
 msgid "bisect run cannot continue any more"
 msgstr "ikili arama artık çalışmayı sürdüremiyor"
 
@@ -2964,15 +3009,19 @@ msgstr[1] "%s dosyasında yalnızca %lu satır var"
 msgid "Blaming lines"
 msgstr "Satırlara bakılıyor"
 
-msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
-msgstr "git branch [<seçenekler>] [-r | -a] [--merged] [--no-merged]"
+msgid ""
+"git branch [<options>] [-r | -a] [--merged] [--no-merged] [(--forked "
+"<branch>)...]"
+msgstr ""
+"git branch [<seçenekler>] [-r | -a] [--merged] [--no-merged]\n"
+"[(--forked <dal>)...]"
 
 msgid ""
 "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
 "point>]"
 msgstr ""
-"git branch [<seçenekler>] [-f] [--recurse-submodules] <dal-adı> [<başlangıç-"
-"noktası>]"
+"git branch [<seçenekler>] [-f] [--recurse-submodules] <dal-adı>\n"
+"[<başlangıç-noktası>]"
 
 msgid "git branch [<options>] [-l] [<pattern>...]"
 msgstr "git branch [<seçenekler>] [-l] [<dizgi>...]"
@@ -2992,33 +3041,38 @@ msgstr "git branch [<seçenekler>] [-r | -a] [--points-at]"
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<seçenekler>] [-r | -a] [--format]"
 
+msgid ""
+"git branch [<options>] (--delete-merged <pattern>)... [<branch-pattern>...]"
+msgstr ""
+"git branch [<seçenekler>] (--delete-merged <dizgi>)... [<dal-dizgisi>...]"
+
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
 "         '%s', but not yet merged to HEAD"
 msgstr ""
-"'%s' dalı siliniyor: Bu dal '%s'\n"
-"         dalına birleştirilmiş; ancak HEAD'e henüz birleştirilmemiş."
+"\"%s\" dalı siliniyor: Bu dal, \"%s\"\n"
+"  dalına birleştirilmiş; ancak HEAD'e henüz birleştirilmemiş."
 
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
 "         '%s', even though it is merged to HEAD"
 msgstr ""
-"'%s' dalı silinmiyor: Bu dal HEAD'e birleştirilmiş olmasına rağmen\n"
-"         '%s' dalına birleştirilmemiş."
+"\"%s\" dalı silinmiyor: Bu dal HEAD'e birleştirilmiş olmasına\n"
+"  rağmen \"%s\" dalına birleştirilmemiş."
 
 #, c-format
 msgid "couldn't look up commit object for '%s'"
-msgstr "'%s' için işleme nesnesi aranamadı"
+msgstr "\"%s\" için işleme nesnesi aranamadı"
 
 #, c-format
 msgid "the branch '%s' is not fully merged"
-msgstr "'%s' dalı tümüyle birleştirilmedi"
+msgstr "\"%s\" dalı tümüyle birleştirilmedi"
 
 #, c-format
 msgid "If you are sure you want to delete it, run 'git branch -D %s'"
-msgstr "Onu silmek istediğinizden eminseniz 'git branch -D %s' çalıştırın."
+msgstr "Onu silmek istediğinizden eminseniz \"git branch -D %s\" çalıştırın."
 
 msgid "update of config-file failed"
 msgstr "config-file güncellenemedi"
@@ -3026,14 +3080,20 @@ msgstr "config-file güncellenemedi"
 msgid "cannot use -a with -d"
 msgstr "-a, -d ile kullanılamıyor"
 
+#, c-format
+msgid "cannot delete branch '%s' used by worktree at '%s' for bisect"
+msgstr ""
+"\"%s\" dalı, ikili arama için \"%s\" çalışma ağacı tarafından "
+"kullanıldığından silinemiyor"
+
 #, c-format
 msgid "cannot delete branch '%s' used by worktree at '%s'"
 msgstr ""
-"'%s' konumundaki çalışma ağacı tarafından kullanılan '%s' dalı silinemiyor"
+"\"%s\" dalı, \"%s\" çalışma ağacı tarafından kullanıldığından silinemiyor"
 
 #, c-format
 msgid "remote-tracking branch '%s' not found"
-msgstr "uzak izleme dalı '%s' bulunamadı"
+msgstr "uzak izleme dalı \"%s\" bulunamadı"
 
 #, c-format
 msgid ""
@@ -3047,6 +3107,14 @@ msgstr ""
 msgid "branch '%s' not found"
 msgstr "'%s' dalı bulunamadı"
 
+#, c-format
+msgid "Would delete remote-tracking branch %s (was %s).\n"
+msgstr "%s uzak izleme dalı silinecek (%s idi).\n"
+
+#, c-format
+msgid "Would delete branch %s (was %s).\n"
+msgstr "%s dalı silinecek (%s idi).\n"
+
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Uzak izleme dalı %s silindi (%s idi).\n"
@@ -3113,6 +3181,14 @@ msgstr "dal yeniden adlandırıldı; ancak config-file güncellenemedi"
 msgid "branch is copied, but update of config-file failed"
 msgstr "dal kopyalandı; ancak config-file güncellenemedi"
 
+#, c-format
+msgid "'%s' is not a valid branch or pattern"
+msgstr "\"%s\", geçerli bir dal veya dizgi değil"
+
+#, c-format
+msgid "Skipping '%s' (branch.%s.deleteMerged is false)\n"
+msgstr "\"%s\" atlanıyor (branch.%s.deleteMerged: false)\n"
+
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -3123,6 +3199,13 @@ msgstr ""
 "\t%s\n"
 "'%s' ile başlayan satırlar soyulacaktır.\n"
 
+msgid "--set-upstream-to takes a single <remote>/<branch> argument"
+msgstr "--set-upstream-to, tek bir <uzak-konum>/<dal> argümanı alır"
+
+#, c-format
+msgid "Did you mean to use: git branch --set-upstream-to=%s/%s?"
+msgstr "Şunu mu kullanmak istediniz: git branch --set-upstream-to=%s/%s?"
+
 msgid "Generic options"
 msgstr "Genel seçenekler"
 
@@ -3198,6 +3281,17 @@ msgstr "dalın başvuru günlüğünü oluştur"
 msgid "edit the description for the branch"
 msgstr "dalın açıklamasını düzenle"
 
+msgid "pattern"
+msgstr "dizgi"
+
+msgid "delete merged branches whose upstream matches <pattern> (repeatable)"
+msgstr ""
+"yalnızca üstkaynağı <dizgi> ile eşleşen birleştirilmiş dalları sil "
+"(yinelenebilir)"
+
+msgid "with --delete-merged, only print which branches would be deleted"
+msgstr "--delete-merged ile, yalnızca silinecek dalları yazdır"
+
 msgid "force creation, move/rename, deletion"
 msgstr "zorla oluştur, taşı/yeniden adlandır, sil"
 
@@ -3207,6 +3301,12 @@ msgstr "yalnızca birleştirilen dalları yazdır"
 msgid "print only branches that are not merged"
 msgstr "yalnızca birleştirilmeyen dalları yazdır"
 
+msgid "branch"
+msgstr "dal"
+
+msgid "print only branches whose upstream matches <branch> (repeatable)"
+msgstr "yalnızca üstkaynağı <dal> ile eşleşen dalları yazdır (yinelenebilir)"
+
 msgid "list branches in columns"
 msgstr "dalları sütunlarla listele"
 
@@ -3231,6 +3331,9 @@ msgstr "HEAD geçerli bir başvuru olarak çözülemedi"
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD, refs/heads altında bulunamadı!"
 
+msgid "--dry-run requires --delete-merged"
+msgstr "--dry-run, --delete-merged gerektiriyor"
+
 msgid ""
 "branch with --recurse-submodules can only be used if "
 "submodule.propagateBranches is enabled"
@@ -3427,9 +3530,6 @@ msgstr "ilerleme çubuğunu göster"
 msgid "historical; same as --progress"
 msgstr "eski seçenek; --progress ile aynı"
 
-msgid "historical; does nothing"
-msgstr "eski seçenek; bir şey yapmaz"
-
 msgid "specify bundle format version"
 msgstr "demet biçim sürümünü belirt"
 
@@ -3456,10 +3556,39 @@ msgstr "Nesneler demetten çıkarılıyor"
 msgid "cannot read object %s '%s'"
 msgstr "%s '%s' nesnesi okunamıyor"
 
+msgid "must supply valid remote when using remote-object-info"
+msgstr "remote-object-info kullanırken geçerli bir uzak konum sağlanmalıdır"
+
+#, c-format
+msgid "remote-object-info does not support short oids, %d characters required"
+msgstr "remote-object-info kısa oid'leri desteklemiyor; %d karakter gerekli"
+
+#, c-format
+msgid "not a valid object name '%s'"
+msgstr "geçerli bir nesne adı \"%s\" değil"
+
+msgid "remote-object-info requires objects"
+msgstr "remote-object-info, nesneler gerektiriyor"
+
 #, c-format
 msgid "mailmap: invalid boolean '%s'"
 msgstr "mailmap: geçersiz Boole \"%s\""
 
+msgid "remote-object-info command too long"
+msgstr "remote-object-info komutu pek uzun"
+
+#, c-format
+msgid "remote-object-info: failed to parse command line: %s"
+msgstr "remote-object-info: komut satırı ayrıştırılamadı: %s"
+
+#, c-format
+msgid "remote-object-info supports at most %d objects"
+msgstr "remote-object-info, en çok %d nesne destekliyor"
+
+#, c-format
+msgid "failed to get object info from the remote: %s"
+msgstr "uzak konumdan nesne bilgisi alınamadı: %s"
+
 msgid "flush is only for --buffer mode"
 msgstr "floş, yalnızca --buffer kipi içindir"
 
@@ -3907,34 +4036,40 @@ msgid "The following paths have local changes:\n"
 msgstr "Aşağıdaki yolların yerel değişiklikleri var:\n"
 
 #, 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' hem bir yerel dosya hem de bir izleme dalı olabilir.\n"
-"-- (ve isteğe bağlı olarak --no-guess) kullanıp belirsizliği giderin"
+msgid "Branch name '%s' appears in multiple remotes:"
+msgstr "Dal adı \"%s\", birden çok uzak konumda görünüyor:"
+
+#, c-format
+msgid "  %s"
+msgstr "  %s"
 
 #, c-format
 msgid ""
-"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"If you meant to check out a remote tracking branch on <remote>,\n"
 "you can do so by fully qualifying the name with the --track option:\n"
 "\n"
-"    git %s --track origin/<name>\n"
+"    git %s --track <remote>/%s\n"
 "\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\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 ""
-"Eğer bir uzak izleme dalını çıkış yapmak istediyseniz;\n"
-"örn., \"origin\", bunu adı --track seçeneği ile tam\n"
-"olarak nitelendirip yapabilirsiniz.\n"
+"<uzak-konum> üzerindeki bir uzak izleme dalını çıkış yapmak\n"
+"istediyseniz bunu, ada --track seçeneğini ekleyerek yapabilirsiniz:\n"
 "\n"
-"\tgit %s --track origin/<ad>\n"
+"    git %s --track <uzak-konum>/%s\n"
 "\n"
-"Eğer her zaman belirsiz <ad> çıkışlarının bir uzak\n"
-"konumu tercih etmesini isterseniz; örn., \"origin\",\n"
-"yapılandırmanızda checkout.defaultRemote=origin\n"
-"ayarını yapmayı düşünün."
+"Belirsiz bir adın her zaman tek bir uzak konuma çıkış yapmasını\n"
+"istiyorsanız; örneğin, \"origin\" uzak konumu, yapılandırmanızda\n"
+"checkout.defaultRemote=origin ayarını yapmayı düşünün."
+
+#, 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' hem bir yerel dosya hem de bir izleme dalı olabilir.\n"
+"-- (ve isteğe bağlı olarak --no-guess) kullanıp belirsizliği giderin"
 
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
@@ -4128,9 +4263,6 @@ msgstr ""
 msgid "you must specify path(s) to restore"
 msgstr "eski durumuna getirilecek yolları belirtmelisiniz"
 
-msgid "branch"
-msgstr "dal"
-
 msgid "create and checkout a new branch"
 msgstr "yeni bir dal oluştur ve çıkış yap"
 
@@ -4299,9 +4431,6 @@ msgstr "etkileşimli temizlik"
 msgid "remove whole directories"
 msgstr "dizinleri tümüyle kaldır"
 
-msgid "pattern"
-msgstr "dizgi"
-
 msgid "add <pattern> to ignore rules"
 msgstr "yok sayma kurallarına <dizgi> ekle"
 
@@ -4896,13 +5025,20 @@ msgid "Failed to update main cache tree"
 msgstr "Ana önbellek ağacı güncellenemedi"
 
 msgid "cannot do a partial commit during a merge."
-msgstr "Bir birleştirme sırasında kısmi işleme yapılamaz."
+msgstr "Birleştirme sırasında kısmi işleme yapılamaz."
 
 msgid "cannot do a partial commit during a cherry-pick."
-msgstr "Bir seç-al sırasında kısmi işleme yapılamaz."
+msgstr "Seç-al sırasında kısmi işleme yapılamaz."
 
-msgid "cannot do a partial commit during a rebase."
-msgstr "Bir yeniden temellendirme sırasında kısmi işleme yapılamaz."
+msgid "cannot do a partial commit during a revert."
+msgstr "Geri alma sırasında kısmi işleme yapılamaz."
+
+msgid "cannot do a partial commit during an am session."
+msgstr "\"am\" oturumu sırasında kısmi işleme yapılamaz."
+
+msgid "cannot do a partial commit while resolving conflicts during a rebase."
+msgstr ""
+"Yeniden temellendirme sırasında çakışmaları çözerken kısmi işleme yapılamaz."
 
 msgid "cannot read the index"
 msgstr "indeks okunamıyor"
@@ -4912,11 +5048,11 @@ msgstr "geçici indeks dosyası yazılamıyor"
 
 #, c-format
 msgid "commit '%s' lacks author header"
-msgstr "'%s' işlemesinde yazar üstbilgisi yok"
+msgstr "\"%s\" işlemesinde yazar üstbilgisi yok"
 
 #, c-format
 msgid "commit '%s' has malformed author line"
-msgstr "'%s' işlemesindeki yazar satırı hatalı oluşturulmuş"
+msgstr "\"%s\" işlemesindeki yazar satırı hatalı oluşturulmuş"
 
 msgid "malformed --author parameter"
 msgstr "hatalı oluşturulmuş --author parametresi"
@@ -5087,9 +5223,19 @@ msgstr "Bir birleştirmenin tam ortasındasınız -- değiştirme yapılamıyor.
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Bir seç-al'ın tam ortasındasınız -- değiştirme yapılamıyor."
 
-msgid "You are in the middle of a rebase -- cannot amend."
+msgid "The now-empty commit has been dropped -- cannot amend."
+msgstr "Şimdi boş olan işleme bırakıldı -- değiştirme yapılamıyor."
+
+msgid "You are in the middle of a revert -- cannot amend."
+msgstr "Bir geri almanın tam ortasındasınız -- değiştirme yapılamıyor."
+
+msgid "You are in the middle of an am session -- cannot amend."
+msgstr "Bir \"am\" oturumunun tam ortasındasınız -- değiştirme yapılamıyor."
+
+msgid "You are resolving conflicts during a rebase -- cannot amend."
 msgstr ""
-"Bir yeniden temellendirmenin tam ortasındasınız -- değiştirme yapılamıyor."
+"Bir yeniden temellendirme sırasında çakışma çözüyorsunuz -- değiştirme "
+"yapılamıyor."
 
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
@@ -5949,13 +6095,17 @@ msgstr "Bir git deposu değil"
 msgid "invalid object '%s' given."
 msgstr "geçersiz nesne '%s' verildi."
 
+#, c-format
+msgid "unable to read tree object for commit '%s'"
+msgstr "\"%s\" işlemesi için ağaç nesnesi okunamadı"
+
 #, c-format
 msgid "more than two blobs given: '%s'"
-msgstr "ikiden çok ikili nesne verildi: '%s'"
+msgstr "ikiden çok ikili nesne verildi: \"%s\""
 
 #, c-format
 msgid "unhandled object '%s' given."
-msgstr "ele alınmayan nesne '%s' verildi."
+msgstr "ele alınmayan nesne \"%s\" verildi."
 
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
@@ -6049,8 +6199,8 @@ msgstr "--tool=<araç> için bir <araç> verilmedi"
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "--extcmd=<komut> için bir <komut> verilmedi"
 
-msgid "git fast-export [<rev-list-opts>]"
-msgstr "git fast-export [<revizyon-listesi-seçenekleri>]"
+msgid "git fast-export [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git fast-export [<seçenekler>] [<revizyon-erimi>] [[--] <yol>...]"
 
 #, c-format
 msgid "unknown %s mode: %s"
@@ -6713,6 +6863,9 @@ msgstr "--cat-blob-fd, %d değerini aşamaz"
 msgid "expected format name:filename for submodule rewrite option"
 msgstr "altmodül yeniden yazım seçeneği için ad:dosya-adı biçimi bekleniyordu"
 
+msgid "--max-pack-size: argument must be a non-negative integer"
+msgstr "--max-pack-size: argüman, negatif olmayan bir tamsayı olmalı"
+
 #, c-format
 msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum"
 msgstr "max-pack-size artık bayt türünden, --max-pack-size=%lum varsayılıyor"
@@ -6720,6 +6873,9 @@ msgstr "max-pack-size artık bayt türünden, --max-pack-size=%lum varsayılıyo
 msgid "minimum max-pack-size is 1 MiB"
 msgstr "olabilecek en küçük max-pack-size 1 MiB'dır"
 
+msgid "--big-file-threshold: argument must be a non-negative integer"
+msgstr "--big-file-threshold: argüman, negatif olmayan bir tamsayı olmalı"
+
 #, c-format
 msgid "unknown --signed-commits mode '%s'"
 msgstr "bilinmeyen --signed-commits kipi \"%s\""
@@ -6748,13 +6904,92 @@ msgstr "veri komutu sonrası \"%s\" komut seçeneği alındı"
 msgid "this version of fast-import does not support option: %s"
 msgstr "fast-import'un bu sürümü şu seçeneği desteklemiyor: %s"
 
-#, c-format
-msgid "unknown option %s"
-msgstr "bilinmeyen seçenek %s"
+msgid "git fast-import [<options>]"
+msgstr "git fast-import [<seçenekler>]"
 
-#, c-format
-msgid "unknown option --%s"
-msgstr "bilinmeyen seçenek --%s"
+msgid "Common"
+msgstr "Ortak"
+
+msgid "format of the commit/tag dates"
+msgstr "işleme/etiket tarihlerinin biçimi"
+
+msgid "display some basic statistics (objects, packfiles and memory)"
+msgstr ""
+"bazı temel istatistikleri görüntüle (nesneler, paket dosyaları ve bellek)"
+
+msgid "disable the output shown by --stats"
+msgstr "--stats ile gösterilen çıktıyı devre dışı bırak"
+
+msgid "force updating modified existing branches"
+msgstr "değiştirilmiş var olan dalları güncellemeyi zorla"
+
+msgid "require a terminating 'done' command"
+msgstr "sonlandıran bir \"done\" komutunu gerektir"
+
+msgid "maximum size of each output pack file"
+msgstr "her çıktı paketi dosyasının olabilecek en büyük boyutu"
+
+msgid "maximum size of a blob that will be deltified"
+msgstr "deltalanacak bir ikili nesnenin en büyük boyutu"
+
+msgid "maximum delta depth"
+msgstr "en büyük delta derinliği"
+
+msgid "maximum number of branches to maintain active"
+msgstr "etkin tutulacak en çok dal sayısı"
+
+msgid "Marks"
+msgstr "İmler"
+
+msgid "import marks from <file>"
+msgstr "<dosya>'dan imler içe aktar"
+
+msgid "import marks from <file> if it exists"
+msgstr "varsa <dosya>'dan imler içe aktar"
+
+msgid "dump marks to <file>"
+msgstr "imleri <dosya>'ya dök"
+
+msgid "are --(import|export)-marks= paths relative to '.git/info/fast-import'?"
+msgstr ""
+"--(import|export)-marks= yolları, \".git/info/fast-import\" yoluna göreceli "
+"mi?"
+
+msgid "Submodule rewrite"
+msgstr "Altmodül yeniden yazımı"
+
+msgid "name:filename"
+msgstr "ad:dosya-adı"
+
+msgid "rewrite object IDs for submodule <name> from <filename>"
+msgstr "<ad> altmodülü için nesne kimliklerini <dosya-adı>'ndan yeniden yaz"
+
+msgid "rewrite object IDs for submodule <name> to <filename>"
+msgstr "<ad> altmodülü için nesne kimliklerini <dosya-adı>'na yeniden yaz"
+
+msgid "Signing"
+msgstr "İmzalama"
+
+msgid "how to handle signed commits"
+msgstr "imzalı işlemelerin nasıl ele alınacağı"
+
+msgid "how to handle signed tags"
+msgstr "imzalı etiketlerin nasıl ele alınacağı"
+
+msgid "Advanced"
+msgstr "Gelişmiş"
+
+msgid "allow unsafe mark commands from the stream"
+msgstr "akıştan güvensiz im komutlarına izin ver"
+
+msgid "dump edge commits to <file>"
+msgstr "kenar işlemelerini <dosya>'ya dök"
+
+msgid "fd"
+msgstr "dosya-açıklayıcısı"
+
+msgid "write some responses to <fd> instead of stdout"
+msgstr "bazı yanıtları stdout yerine <dosya-açıklayıcısı>'na yaz"
 
 #, c-format
 msgid "unsupported command: %s"
@@ -6782,6 +7017,10 @@ msgstr "git fetch --all [<seçenekler>]"
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel negatif olamaz"
 
+#, c-format
+msgid "unrecognized fetch.followRemoteHEAD value '%s' ignored"
+msgstr "tanımlanamayan fetch.followRemoteHEAD değeri \"%s\" yok sayıldı"
+
 msgid "couldn't find remote ref HEAD"
 msgstr "uzak HEAD başvurusu bulunamadı"
 
@@ -6891,18 +7130,25 @@ msgstr "%s yok sayılıyor; çünkü protokol tarafından desteklenmiyor"
 
 #, c-format
 msgid ""
-"Run 'git remote set-head %s %s' to follow the change, or set\n"
-"'remote.%s.followRemoteHEAD' configuration option to a different value\n"
-"if you do not want to see this message. Specifically running\n"
-"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"
-"will disable the warning until the remote changes HEAD to something else."
+"Run 'git remote set-head %s %s' to follow the change, or modify\n"
+"either of the 'remote.%s.followRemoteHEAD' or 'fetch.followRemoteHEAD'\n"
+"configuration variables to handle the situation differently.\n"
+"\n"
+"Using this specific setting\n"
+"\n"
+"    git config set remote.%s.followRemoteHEAD warn-if-not-%s\n"
+"\n"
+"will suppress the warning until the remote changes HEAD to something else."
 msgstr ""
-"Değişikliği izlemek için 'git remote set-head %s %s' yapın veya\n"
-"'remote.%s.followRemoteHEAD' yapılandırma seçeneğini başka bir\n"
-"değere ayarlayın (bu iletiyi görmek istemiyorsanız). Özellikle\n"
-"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"
-"komutunu çalıştırmak, uyarıyı HEAD'e veya başka bir şeye uzaktan\n"
-"değişiklik olana dek devre dışı bırakır."
+"Değişikliği izlemek için \"git remote set-head %s %s\" yapın veya\n"
+"durumu farklı bir şekilde ele almak için \"remote.%s.followRemoteHEAD\"\n"
+"veya fetch.followRemoteHEAD yapılandırma değişkenlerinin birinde\n"
+"değişiklik yapın.\n"
+"\n"
+"    git config set remote.%s.followRemoteHEAD warn-if-not-%s\n"
+"\n"
+"ayarını kullanmak, uzak konum HEAD'ini veya başka bir şeye\n"
+"değiştirene kadar uyarıyı susturacaktır."
 
 msgid ""
 "You're on a case-insensitive filesystem, and the remote you are\n"
@@ -7316,6 +7562,10 @@ msgstr "%s denetleniyor"
 msgid "Checking connectivity (%d objects)"
 msgstr "Bağlanabilirlik denetleniyor (%d nesne)"
 
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s: nesne hasarlı veya kayıp"
+
 #, c-format
 msgid "Checking %s %s"
 msgstr "%s %s denetleniyor"
@@ -7331,10 +7581,6 @@ msgstr "kök %s"
 msgid "tagged %s %s (%s) in %s"
 msgstr "%s %s (%s) şurada etiketlendi: %s"
 
-#, c-format
-msgid "%s: object corrupt or missing"
-msgstr "%s: nesne hasarlı veya kayıp"
-
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: geçersiz başvuru günlüğü girdisi %s"
@@ -7358,28 +7604,6 @@ msgstr "geçersiz parametre: sha1 bekleniyordu, '%s' alındı"
 msgid "notice: No default references"
 msgstr "Uyarı: Öntanımlı başvurular yok"
 
-#, c-format
-msgid "%s: hash-path mismatch, found at: %s"
-msgstr "%s: sağlama yolu uyuşmazlığı, şurada bulundu: %s"
-
-#, c-format
-msgid "%s: object corrupt or missing: %s"
-msgstr "%s: nesne hasarlı veya kayıp: %s"
-
-#, c-format
-msgid "%s: object could not be parsed: %s"
-msgstr "%s: nesne ayrıştırılamadı: %s"
-
-#, c-format
-msgid "bad sha1 file: %s"
-msgstr "hatalı sha1 dosyası: %s"
-
-msgid "Checking object directory"
-msgstr "Nesne dizini denetleniyor"
-
-msgid "Checking object directories"
-msgstr "Nesne dizinleri denetleniyor"
-
 #, c-format
 msgid "Checking cache tree of %s"
 msgstr "%s ögesinin önbellek ağacı denetleniyor"
@@ -7395,14 +7619,6 @@ msgstr "cache-tree içinde ağaç olmayan öge"
 msgid "%s: invalid sha1 pointer in resolve-undo of %s"
 msgstr "%s: %s ögesinin resolve-undo'su içinde geçersiz sha1 işaretçisi"
 
-#, c-format
-msgid "unable to load rev-index for pack '%s'"
-msgstr "'%s' paketi için rev-index yüklenemiyor"
-
-#, c-format
-msgid "invalid rev-index for pack '%s'"
-msgstr "'%s' paketi için geçersiz rev-index"
-
 msgid "Checking ref database"
 msgstr "Başvuru günlüğü denetleniyor"
 
@@ -7454,10 +7670,7 @@ msgid "show verbose names for reachable objects"
 msgstr "ulaşılabilir nesneler için ayrıntılı adları göster"
 
 msgid "check reference database consistency"
-msgstr "başvuru veritabanı tutarlılığını denetle"
-
-msgid "Checking objects"
-msgstr "Nesneler denetleniyor"
+msgstr "başvuru veri tabanı tutarlılığını denetle"
 
 msgid "git fsmonitor--daemon start [<options>]"
 msgstr "git fsmonitor--daemon start [<seçenekler>]"
@@ -7643,11 +7856,6 @@ msgstr ""
 "gc %s makinesinde halihazırda çalışıyor (pid %<PRIuMAX> - çalışmıyorsa --"
 "force kullanın)"
 
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr ""
-"Çok fazla ulaşılabilir boşta nesne var; kaldırmak için 'git prune' kullanın."
-
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
@@ -7686,9 +7894,6 @@ msgid ""
 msgstr ""
 "incremental-repack görevi atlanıyor; çünkü core.multiPackIndex devre dışı"
 
-msgid "failed to perform geometric repack"
-msgstr "geometrik yeniden paketleme yapılamadı"
-
 #, c-format
 msgid "task '%s' failed"
 msgstr "'%s' görevi başarısız oldu"
@@ -8069,7 +8274,7 @@ msgid "object type"
 msgstr "nesne türü"
 
 msgid "write the object into the object database"
-msgstr "nesneyi nesne veritabanına yaz"
+msgstr "nesneyi nesne veri tabanına yaz"
 
 msgid "read the object from stdin"
 msgstr "nesneyi stdin'den oku"
@@ -8197,6 +8402,13 @@ msgstr "kullanım: %s%s"
 msgid "'git help config' for more information"
 msgstr "ek bilgi için: 'git help config'"
 
+msgid ""
+"git history drop <commit> [--dry-run] [--update-refs=(branches|head)] [--"
+"empty=(drop|keep|abort)]"
+msgstr ""
+"git history drop <işleme> [--dry-run] [--update-refs=(branches|head)] [--"
+"empty=(drop|keep|abort)]"
+
 msgid ""
 "git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--"
 "reedit-message] [--empty=(drop|keep|abort)]"
@@ -8223,6 +8435,10 @@ msgstr ""
 "Lütfen %s değişiklikleri için bir işleme iletisi girin. \"%s\" ile başlayan\n"
 "satırlar yok sayılacaktır. Boş bir ileti işlemeyi iptal eder.\n"
 
+#, c-format
+msgid "could not write to '%s'"
+msgstr "şuraya yazılamadı: '%s'"
+
 #, c-format
 msgid "Aborting commit as launching the editor failed.\n"
 msgstr "Düzenleyici başlatılamadığından işleme iptal edildi.\n"
@@ -8337,6 +8553,10 @@ msgstr "altsoy yeniden oynatılamadı"
 msgid "failed writing reworded commit"
 msgstr "iletisi değiştirilen işleme yazılamadı"
 
+#, c-format
+msgid "unable to parse tree %s"
+msgstr "%s ağacı ayrıştırılamıyor"
+
 msgid "unable to populate index with tree"
 msgstr "indeks, ağaç ile doldurulamıyor"
 
@@ -8370,6 +8590,31 @@ msgstr "komut, bir işlememsi bekler"
 msgid "cannot split up merge commit"
 msgstr "birleştirme işlemesi bölünemez"
 
+msgid "cannot resolve HEAD commit"
+msgstr "HEAD işlemesi çözülemiyor"
+
+msgid "cannot resolve tree for HEAD"
+msgstr "HEAD için olan ağaç çözülemiyor"
+
+msgid "how to handle descendants that become empty"
+msgstr "boşalan altsoyun nasıl ele alınacağı"
+
+#, c-format
+msgid "cannot drop merge commit: %s"
+msgstr "birleştirme işlemesi bırakılamıyor: %s"
+
+msgid "dropping this commit would overwrite local changes; aborting"
+msgstr ""
+"bu işlemeyi bırakmak, yerel değişikliklerin üzerine yazacaktır; iptal "
+"ediliyor"
+
+msgid "failed to update references"
+msgstr "başvurular güncellenemedi"
+
+#, c-format
+msgid "could not update working tree to new commit %s"
+msgstr "çalışma ağacı, yeni %s işlemesine güncellenemedi"
+
 msgid ""
 "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-"
 "stdin=<path>] [(-j|--jobs) <n>]\n"
@@ -8436,6 +8681,9 @@ msgstr "beklenen nesne %s alınmadı"
 msgid "object %s: expected type %s, found %s"
 msgstr "nesne %s: beklenen tür %s, bulunan %s"
 
+msgid "Checking objects"
+msgstr "Nesneler denetleniyor"
+
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
@@ -9458,6 +9706,10 @@ msgstr "'%s' diye bir nesne yok"
 msgid "Could not write object file"
 msgstr "nesne dosyası yazılamadı"
 
+#, c-format
+msgid "unknown option %s"
+msgstr "bilinmeyen seçenek %s"
+
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "'%s' nesnesi ayrıştırılamadı"
@@ -9886,6 +10138,10 @@ msgstr "git multi-pack-index [<seçenekler>] expire"
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<seçenekler>] repack [--batch-size=<boyut>]"
 
+#, c-format
+msgid "object directory is not an alternate of the current repository: '%s'"
+msgstr "nesne dizini, geçerli deponun bir alternatifi değil: \"%s\""
+
 msgid "directory"
 msgstr "dizin"
 
@@ -10011,8 +10267,14 @@ msgstr "aynı hedef için birden çok kaynak"
 msgid "destination directory does not exist"
 msgstr "hedef dizin yok"
 
+msgid "destination is beyond a symbolic link"
+msgstr "hedef, bir sembolik bağın ötesinde"
+
+msgid "destination is not a directory"
+msgstr "hedef, bir dizin değil"
+
 msgid "destination exists in the index"
-msgstr "hedef konum indekste var"
+msgstr "hedef, indekste var"
 
 #, c-format
 msgid "%s, source=%s, destination=%s"
@@ -10027,8 +10289,8 @@ msgid "Renaming %s to %s\n"
 msgstr "%s, %s olarak yeniden adlandırılıyor\n"
 
 #, c-format
-msgid "renaming '%s' failed"
-msgstr "'%s' yeniden adlandırılamadı"
+msgid "renaming '%s' to '%s' failed"
+msgstr "\"%s\" ögesinin adı \"%s\" olarak değiştirilemedi"
 
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<seçenekler>] <işleme>..."
@@ -10635,9 +10897,21 @@ msgstr "paket indeksi açılamıyor"
 msgid "loose object at %s could not be examined"
 msgstr "%s konumundaki gevşek nesne incelenemedi"
 
+#, c-format
+msgid "cannot read object for %s"
+msgstr "%s için nesne okunamıyor"
+
+#, c-format
+msgid "cannot map object %s to %s"
+msgstr "%s nesnesi %s ögesine eşlemlenemiyor"
+
 msgid "unable to force loose object"
 msgstr "gevşek nesne zorlanamıyor"
 
+#, c-format
+msgid "could not find commit %s"
+msgstr "%s işlemesi bulunamadı"
+
 #, c-format
 msgid "not a rev '%s'"
 msgstr "bir revizyon değil: '%s'"
@@ -10672,9 +10946,6 @@ msgstr "<sürüm>[,<ofset>]"
 msgid "write the pack index file in the specified idx format version"
 msgstr "paket indeks dosyasını belirtilen idx biçiminde yaz"
 
-msgid "maximum size of each output pack file"
-msgstr "her çıktı paketi dosyasının olabilecek en büyük boyutu"
-
 msgid "ignore borrowed objects from alternate object store"
 msgstr "alternatif nesne mağazasından ödünç alınan nesneleri yok say"
 
@@ -11255,6 +11526,14 @@ msgstr "'%s' için geçersiz değer"
 msgid "could not push to %s"
 msgstr "%s konumuna itilemedi"
 
+#, c-format
+msgid "'%s' is not a valid push target"
+msgstr "\"%s\", geçerli bir itme hedefi değil"
+
+#, c-format
+msgid "Did you mean to use: git push %s %s?"
+msgstr "\"git push %s %s\" komutunu mu kullanmak istediniz?"
+
 msgid "repository"
 msgstr "depo"
 
@@ -12082,6 +12361,27 @@ msgstr "git refs exists <başvuru>"
 msgid "git refs optimize "
 msgstr "git refs optimize "
 
+msgid ""
+"git refs create [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value>"
+msgstr ""
+"git refs create [--message=<gerekçe>] [--no-deref] [--create-reflog]\n"
+"<başvuru> <yeni-değer>"
+
+msgid "git refs delete [--message=<reason>] [--no-deref] <ref> [<old-value>]"
+msgstr ""
+"git refs delete [--message=<gerekçe>] [--no-deref] <başvuru> [<eski-değer>]"
+
+msgid ""
+"git refs update [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value> [<old-value>]"
+msgstr ""
+"git refs update [--message=<gerekçe>] [--no-deref] [--create-reflog]\n"
+"<başvuru> <yeni-değer> [<eski-değer>]"
+
+msgid "git refs rename [--message=<reason>] <old-ref> <new-ref>"
+msgstr "git refs rename [--message=<gerekçe>] <eski-başvuru> <yeni-başvuru>"
+
 msgid "specify the reference format to convert to"
 msgstr "dönüştürülecek başvuru biçimini belirt"
 
@@ -12116,15 +12416,65 @@ msgstr "başvuru yok"
 msgid "failed to look up reference"
 msgstr "başvuru bakılamadı"
 
-msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
-msgstr ""
-"git remote add [-t <dal>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<getir|it>] <ad> <url>"
-
-msgid "git remote rename [--[no-]progress] <old> <new>"
-msgstr "git remote rename [--[no-]progress] <eski> <yeni>"
+msgid "reason"
+msgstr "neden"
+
+msgid "reason of the update"
+msgstr "güncelleme nedeni"
+
+msgid "update <refname> not the one it points to"
+msgstr "<başvuru-adı>'nı güncelleyin, işaret ettiğini değil"
+
+msgid "create a reflog"
+msgstr "bir başvuru günlüğü oluştur"
+
+msgid "create requires reference name and an object ID"
+msgstr "oluşturma, başvuru adı ve bir nesne kimliği gerektirir"
+
+msgid "refusing to perform update with empty message"
+msgstr "boş iletiyle güncelleme yapma reddediliyor"
+
+#, c-format
+msgid "invalid object ID: '%s'"
+msgstr "geçersiz nesne kimliği: \"%s\""
+
+msgid "cannot create reference with null new object ID"
+msgstr "boş yeni nesne kimliğiyle başvuru oluşturulamıyor"
+
+msgid "delete requires reference name and an optional old object ID"
+msgstr "silme, başvuru adı ve isteğe bağlı eski nesne kimliği gerektirir"
+
+msgid "cannot delete reference with null old object ID"
+msgstr "boş eski nesne kimlikli başvuru silinemiyor"
+
+msgid "update requires reference name, new value and an optional old value"
+msgstr ""
+"güncelleme; başvuru adı, yeni değer ve isteğe bağlı eski değer gerektirir"
+
+msgid "rename requires old and new reference name"
+msgstr "yeniden adlandırma, eski ve yeni başvuru adı gerektirir"
+
+#, c-format
+msgid "invalid ref format: '%s'"
+msgstr "geçersiz başvuru biçimi: \"%s\""
+
+#, c-format
+msgid "reference does not exist: '%s'"
+msgstr "başvuru yok: \"%s\""
+
+#, c-format
+msgid "reference already exists: '%s'"
+msgstr "başvuru halihazırda var: \"%s\""
+
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
+msgstr ""
+"git remote add [-t <dal>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<getir|it>] <ad> <url>"
+
+msgid "git remote rename [--[no-]progress] <old> <new>"
+msgstr "git remote rename [--[no-]progress] <eski> <yeni>"
 
 msgid "git remote remove <name>"
 msgstr "git remote remove <ad>"
@@ -12590,11 +12940,13 @@ msgstr "ayrıntılı anlat; bir altkomuttan önce yerleştirilmelidir"
 msgid ""
 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]"
+"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]\n"
+"[--filter=<filter-spec>] [--drop-filtered [--dry-run]]"
 msgstr ""
 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
-"  [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<paket-adı>]\n"
-"  [--write-midx[=<kip>]] [--name-hash-version=<n>] [--path-walk]"
+"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<paket-adı>]\n"
+"[--write-midx[=<kip>]] [--name-hash-version=<n>] [--path-walk]\n"
+"[--filter=<süzgeç-belirteci>] [--drop-filtered [--dry-run]]"
 
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
@@ -12694,6 +13046,38 @@ msgstr "ortaya çıkan paketlerin bir çoklu paket indeksini yaz"
 msgid "pack prefix to store a pack containing filtered out objects"
 msgstr "süzülen nesneler içeren paketi depolamak için paket öneki"
 
+msgid "delete filtered out objects (requires --filter)"
+msgstr "süzülmüş nesneleri sil (--filter gerektirir)"
+
+msgid "only show which objects would be dropped"
+msgstr "yalnızca hangi nesnelerin bırakılacağını göster"
+
+msgid "--dry-run only takes effect with --drop-filtered"
+msgstr "--dry-run, yalnızca --drop-filtered ile etkili olur"
+
+msgid "--drop-filtered requires --filter"
+msgstr "--drop-filtered, --filter gerektiriyor"
+
+msgid "--drop-filtered requires -a"
+msgstr "--drop-filtered, -a gerektiriyor"
+
+msgid "--drop-filtered only supports --filter=blob:limit=<n> for now"
+msgstr "--drop-filtered, şu anda yalnızca --filter=blob:limit=<n> destekliyor"
+
+msgid "--drop-filtered requires a promisor remote"
+msgstr "--drop-filtered, bir vaatçi uzak konum gerektiriyor"
+
+msgid ""
+"--drop-filtered cannot be used while another operation (merge, rebase, am, "
+"cherry-pick, revert, or bisect) is in progress"
+msgstr ""
+"--drop-filtered, başka bir işlem (merge, rebase, am, cherry-pick, revert "
+"veya bisect) sürerken kullanılamaz"
+
+#, c-format
+msgid "cannot drop '%s' (%s): it is referenced by the current index"
+msgstr "\"%s\" (%s) bırakılamıyor: geçerli indeks tarafından başvuruluyor"
+
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "bir precious-objects deposundaki paketler silinemiyor"
 
@@ -12785,7 +13169,7 @@ msgid "unable to fstat %s"
 msgstr "%s 'fstat' yapılamıyor"
 
 msgid "unable to write object to database"
-msgstr "nesne veritabanına yazılamıyor"
+msgstr "nesne veri tabanına yazılamıyor"
 
 #, c-format
 msgid "unable to get object type for %s"
@@ -12903,10 +13287,11 @@ msgstr "geçersiz %s değeri: \"%s\""
 msgid ""
 "(EXPERIMENTAL!) git replay ([--contained] --onto=<newbase> | --"
 "advance=<branch> | --revert=<branch>)\n"
-"[--ref=<ref>] [--ref-action=<mode>] <revision-range>"
+"[--ref=<ref>] [--ref-action=<mode>] [--linearize] <revision-range>"
 msgstr ""
-"(DENEYSEL!) git replay ([--contained] --onto=<yeni-taban> | --advance=<dal>\n"
-"| --revert=<dal>) [--ref=<başvuru>] [--ref-action=<kip>] <revizyon-erimi>"
+"(DENEYSEL!) git replay ([--contained] --onto=<yeni-taban> |\n"
+"--advance=<dal> | --revert=<dal>) [--ref=<başvuru>]\n"
+"[--ref-action=<kip>] [--linearize] <revizyon-erimi>"
 
 msgid "update all branches that point at commits in <revision-range>"
 msgstr "<revizyon-erimi>'ndeki işlemelere işaret eden tüm dalları güncelle"
@@ -12926,6 +13311,11 @@ msgstr "güncellemeye sonuçla başvur"
 msgid "control ref update behavior (update|print)"
 msgstr "başvuru güncelleme davranışını denetle (update|print)"
 
+msgid "drop merge commits, replaying only non-merge commits"
+msgstr ""
+"yalnızca birleştirme olmayan işlemeleri yeniden oynatarak birleştirme "
+"işlemelerini bırak"
+
 msgid "exactly one of --onto, --advance, or --revert is required"
 msgstr "tam olarak --onto, --advance veya --revert arasından biri gerekiyor"
 
@@ -12937,6 +13327,12 @@ msgstr ""
 "'struct rev_info' içindeki '%s' biti zorlanacağından kimi revizyon yürütme "
 "seçenekleri geçersiz kılınacak"
 
+msgid "unable to get common directory"
+msgstr "ortak dizin alınamıyor"
+
+msgid "unable to get git directory"
+msgstr "git dizini alınamıyor"
+
 #, c-format
 msgid "key '%s' not found"
 msgstr "\"%s\" anahtarı bulunamadı"
@@ -13156,9 +13552,12 @@ msgstr "Yeni indeks dosyası yazılamadı."
 msgid "unable to get disk usage of %s"
 msgstr "%s ögesinin disk kullanımı alınamıyor"
 
+msgid "--missing-only requires --missing=print or --missing=print-info"
+msgstr "--missing-only, --missing=print veya --missing=print-info gerektiriyor"
+
 #, c-format
 msgid "invalid value for '%s': '%s', the only allowed format is '%s'"
-msgstr "'%s' için geçersiz değer: '%s', tek izin verilen biçim '%s'"
+msgstr "\"%s\" için geçersiz değer: \"%s\", tek izin verilen biçim \"%s\""
 
 msgid "-z option used with unsupported option"
 msgstr "-z seçeneği desteklenmeyen seçenekle kullanıldı"
@@ -14782,12 +15181,6 @@ msgstr "başvuru çıktısını kısalt"
 msgid "recursively dereference (default)"
 msgstr "başvuruyu özyineli olarak kaldır (öntanımlı)"
 
-msgid "reason"
-msgstr "neden"
-
-msgid "reason of the update"
-msgstr "güncelleme nedeni"
-
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
 "        [(--trailer <token>[(=|:)<value>])...]\n"
@@ -14907,9 +15300,6 @@ msgstr "etiketi imzalamak için başka bir anahtar kullanın"
 msgid "replace the tag if exists"
 msgstr "eğer varsa etiketi başkasıyla değiştir"
 
-msgid "create a reflog"
-msgstr "bir başvuru günlüğü oluştur"
-
 msgid "Tag listing options"
 msgstr "Etiket listeleme seçenekleri"
 
@@ -15056,7 +15446,7 @@ msgid "do not touch index-only entries"
 msgstr "'index-only' girdilerine dokunma"
 
 msgid "add to index only; do not add content to object database"
-msgstr "yalnızca indekse ekle; içeriğe nesne veritabanına ekleme"
+msgstr "yalnızca indekse ekle; nesne veri tabanına içerik ekleme"
 
 msgid "remove named paths even if present in worktree"
 msgstr "çalışma ağacında var olsa bile ad verilen yolları kaldır"
@@ -15188,9 +15578,6 @@ msgstr "git update-ref [<seçenekler>] --stdin [-z] [--batch-updates]"
 msgid "delete the reference"
 msgstr "başvuruyu sil"
 
-msgid "update <refname> not the one it points to"
-msgstr "<başvuru-adı>'nı güncelleyin, işaret ettiğini değil"
-
 msgid "stdin has NUL-terminated arguments"
 msgstr "stdin'de NUL ile sonlandırılan argümanlar var"
 
@@ -15399,6 +15786,26 @@ msgstr ""
 "Bir uzak konum olmasına rağmen hiçbir yerel/uzak başvuru yok, durduruluyor;\n"
 "geçersiz kılmak veya önce bir uzak konum getirmek için 'add -f' kullanın"
 
+#, c-format
+msgid ""
+"If you meant to create a worktree from a remote tracking branch on\n"
+"<remote>, you can do so by:\n"
+"\n"
+"    git worktree add -b %s %s <remote>/%s\n"
+"\n"
+"If you'd like to always prefer some remote, e.g. 'origin',\n"
+"consider setting checkout.defaultRemote=origin in your config."
+msgstr ""
+"<uzak-konum> üzerindeki bir uzak izleme dalından bir çalışma\n"
+"ağacı oluşturmak istediyseniz bunu şu komutu kullanarak\n"
+"yapabilirsiniz:\n"
+"\n"
+"    git worktree add -b %s %s <uzak-konum>/%s\n"
+"\n"
+"Her zaman belirli bir uzak konumu tercih ediyorsanız; örneğin,\n"
+"\"origin\", yapılandırmanızda checkout.defaultRemote=origin\n"
+"ayarını yapmayı düşünün."
+
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "diğer çalışma ağacında çıkış yapılmış olsa bile <dal> çıkışını yap"
 
@@ -15610,6 +16017,10 @@ msgstr "\"%s\" URI'sinden demet indirilemedi"
 msgid "file at URI '%s' is not a bundle or bundle list"
 msgstr "\"%s\" URI'sindeki dosya bir demet veya demet listesi değil"
 
+#, c-format
+msgid "config '%s' has no value"
+msgstr "\"%s\" yapılandırmasının değeri yok"
+
 #, c-format
 msgid "bundle-uri: unexpected argument: '%s'"
 msgstr "bundle-uri: beklenmedik argüman: \"%s\""
@@ -15965,8 +16376,8 @@ msgstr "Boş Git deposu oluştur veya olanı yeniden ilklendir"
 msgid "Instantly browse your working repository in gitweb"
 msgstr "gitweb'deki çalışma deposuna anında göz at"
 
-msgid "Add or parse structured information in commit messages"
-msgstr "İşleme iletilerine düzenli bilgi ekle veya ayrıştır"
+msgid "Add or parse metadata in commit messages"
+msgstr "İşleme iletilerine üst veri ekle/ayrıştır"
 
 msgid "EXPERIMENTAL: Show when files were last modified"
 msgstr "DENEYSEL: Dosyaların en son ne zaman değiştirildiğini göster"
@@ -16047,7 +16458,7 @@ msgid "Compute unique IDs for patches"
 msgstr "Yamalar için benzersiz kimlikleri hesapla"
 
 msgid "Prune all unreachable objects from the object database"
-msgstr "Ulaşılamayan tüm nesneleri nesne veritabanından buda"
+msgstr "Ulaşılamayan tüm nesneleri nesne veri tabanından buda"
 
 msgid "Remove extra objects that are already in pack files"
 msgstr "Halihazırda paket dosyalarındaki ek nesneleri kaldır"
@@ -16241,8 +16652,11 @@ msgstr "Git'e kullanıcı adları ve parolalar belirt"
 msgid "Git for CVS users"
 msgstr "CVS kullanıcıları için Git"
 
+msgid "Git's core data model"
+msgstr "Git'in çekirdek veri modeli"
+
 msgid "Tweaking diff output"
-msgstr "diff çıktısı için ince ayarlar"
+msgstr "Diff çıktısı için ince ayarlar"
 
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Günlük Git kullanımı için yararlı komutlar"
@@ -16421,10 +16835,6 @@ msgstr "tüm commit-graph dosyaları bulunamıyor"
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "geçersiz işleme konumu, commit-graph büyük olasılıkla hasarlı"
 
-#, c-format
-msgid "could not find commit %s"
-msgstr "%s işlemesi bulunamadı"
-
 msgid "commit-graph requires overflow generation data but has none"
 msgstr "commit-graph, taşım oluşturma verisi gerektiriyor; ancak hiç yok"
 
@@ -16549,7 +16959,7 @@ msgstr "%s işlemesi commit-graph'tan ayrıştırılamadı"
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
-"%s işlemesi commit-graph için olan nesne veritabanından ayrıştırılamadı"
+"%s işlemesi commit-graph için olan nesne veri tabanından ayrıştırılamadı"
 
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
@@ -16592,6 +17002,12 @@ msgstr "İşleme grafiğindeki işlemeler doğrulanıyor"
 msgid "could not parse commit %s"
 msgstr "%s işlemesi ayrıştırılamadı"
 
+msgid "commit ancestry contains a cycle"
+msgstr "işleme soyu geçmişi, bir döngü içeriyor"
+
+msgid "failed to check reachability"
+msgstr "erişilebilirlik denetimi yapılamadı"
+
 #, c-format
 msgid "object %s is a %s, not a %s"
 msgstr "%s nesnesi bir %s, %s değil"
@@ -16621,7 +17037,7 @@ msgstr ""
 
 #, c-format
 msgid "commit %s exists in commit-graph but not in the object database"
-msgstr "%s işlemesi işleme grafiğinde var; ancak nesne veritabanında yok"
+msgstr "%s işlemesi işleme grafiğinde var; ancak nesne veri tabanında yok"
 
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
@@ -17230,6 +17646,14 @@ msgstr "geçersiz ls-refs yanıtı: %s"
 msgid "expected flush after ref listing"
 msgstr "başvuru listelemesinden sonra floş bekleniyordu"
 
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "eşleşmeyen algoritmalar: İstemci %s; sunucu %s"
+
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "sunucu '%s' algoritmasını desteklemiyor"
+
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "yuva üzerinde SO_KEEPALIVE ayarlanamıyor"
 
@@ -17552,9 +17976,6 @@ msgstr "'%s' dizini açılamadı"
 msgid "skipping '%s', which is neither file nor directory"
 msgstr "ne bir dosya ne de dizin olan '%s' atlanıyor"
 
-msgid "could not duplicate stdout"
-msgstr "stdout çoğaltılamadı"
-
 #, c-format
 msgid "could not add directory '%s' to archiver"
 msgstr "'%s' dizini, arşivleyiciye eklenemedi"
@@ -17918,14 +18339,14 @@ msgstr ""
 "bir dosyanın geçmişini listelemeyi yeniden adlandırmaların ötesinde sürdür"
 
 msgid ""
-"prevent rename/copy detection if the number of rename/copy targets exceeds "
-"given limit"
+"limit to cheap rename/copy detection if the number of rename/copy targets "
+"exceeds this value"
 msgstr ""
-"eğer yeniden adlandırma/kopyalama hedeflerinin sayısı verilen sınırı aşarsa "
-"yeniden adlandırma/kopyalama algılamasını önle"
+"yeniden adlandır/kopyala hedeflerinin sayısı bu değeri aşarsa ucuz yeniden "
+"adlandır/kopyala işlemlerine sınırla"
 
 msgid "Diff algorithm options"
-msgstr "Diff algoritma seçenekleri"
+msgstr "Diff algoritması seçenekleri"
 
 msgid "produce the smallest possible diff"
 msgstr "olabilecek en küçük diff'i üret"
@@ -18165,10 +18586,6 @@ msgstr "git dizini '%s' konumundan '%s' konumuna göç ettirilemedi"
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "İpucu: Düzenleyicinizin dosyayı kapatması bekleniyor...%c"
 
-#, c-format
-msgid "could not write to '%s'"
-msgstr "şuraya yazılamadı: '%s'"
-
 #, c-format
 msgid "could not edit '%s'"
 msgstr "'%s' düzenlenemedi"
@@ -18234,6 +18651,51 @@ msgstr "nothing, matching, simple, upstream veya current içinden biri olmalı"
 msgid "too many args to run %s"
 msgstr "%s çalıştırmak için pek fazla argüman"
 
+msgid "unable to write request to remote"
+msgstr "uzak konuma istek yazılamıyor"
+
+msgid "object-info capability is not enabled on the server"
+msgstr "object-info yeteneği sunucuda etkinleştirilmemiş"
+
+msgid "object-info requires protocol v2"
+msgstr "object-info, protokolün ikinci sürümünü gerektiriyor"
+
+#, c-format
+msgid "object-info: expected %<PRIuMAX> attributes, got %<PRIuMAX>"
+msgstr "object-info: %<PRIuMAX> öznitelik bekleniyordu, %<PRIuMAX> alındı"
+
+msgid "object-info: unrequested 'size' attribute"
+msgstr "object-info: istenmemiş \"size\" özniteliği"
+
+msgid "object-info: duplicate 'size' attribute"
+msgstr "object-info: yinelenmiş \"size\" özniteliği"
+
+msgid "object-info: unrequested 'type' attribute"
+msgstr "object-info: istenmemiş \"type\" özniteliği"
+
+msgid "object-info: duplicate 'type' attribute"
+msgstr "object-info: yinelenmiş \"type\" özniteliği"
+
+#, c-format
+msgid "object-info: unknown attribute '%s'"
+msgstr "object-info: bilinmeyen öznitelik \"%s\""
+
+#, c-format
+msgid "object-info: expected %<PRIuMAX> objects, got %<PRIuMAX>"
+msgstr "object-info: %<PRIuMAX> nesne bekleniyordu, %<PRIuMAX> alındı"
+
+#, c-format
+msgid "object-info: expected OID: %s, got %s"
+msgstr "object-info: OID bekleniyordu: %s, %s alındı"
+
+#, c-format
+msgid "object-info: object %s has invalid type '%s'"
+msgstr "object-info: %s nesnesinde geçersiz tür \"%s\""
+
+#, c-format
+msgid "object-info: expected flush after %<PRIuMAX> objects"
+msgstr "object-info: %<PRIuMAX> nesneden sonra floş bekleniyordu"
+
 #, c-format
 msgid ""
 "You are attempting to fetch %s, which is in the commit graph file but not in "
@@ -18242,7 +18704,7 @@ msgid ""
 "If you are attempting to repair this repo corruption by refetching the "
 "missing object, use 'git fetch --refetch' with the missing object."
 msgstr ""
-"İşleme grafiğinde bulunan; ancak nesne veritabanında bulunmayan %s ögesini "
+"İşleme grafiğinde bulunan; ancak nesne veri tabanında bulunmayan %s ögesini "
 "getirmeyi deniyorsunuz.\n"
 "Bu, büyük olasılıkla depo hasarından dolayı oluyor.\n"
 "Bu depo hasarını eksik nesneyi yeniden getirerek onarmayı düşünüyorsanız "
@@ -18362,20 +18824,9 @@ msgstr "ortak işleme yok"
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: Getirme başarısız."
 
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr "eşleşmeyen algoritmalar: İstemci %s; sunucu %s"
-
-#, c-format
-msgid "the server does not support algorithm '%s'"
-msgstr "sunucu '%s' algoritmasını desteklemiyor"
-
 msgid "Server does not support shallow requests"
 msgstr "Sunucu sığ istekleri desteklemiyor"
 
-msgid "unable to write request to remote"
-msgstr "uzak konuma istek yazılamıyor"
-
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "'%s' bekleniyordu, '%s' alındı"
@@ -18529,6 +18980,10 @@ msgstr "-c bir yapılandırma dizisi bekliyor\n"
 msgid "no config key given for --config-env\n"
 msgstr "--config-env için bir yapılandırma anahtarı verilmedi\n"
 
+#, c-format
+msgid "no file given for '%s' option\n"
+msgstr "\"%s\" seçeneği için bir dosya verilmedi\n"
+
 #, c-format
 msgid "no attribute source given for --attr-source\n"
 msgstr "--attr-source için öznitelik kaynağı verilmedi\n"
@@ -19041,9 +19496,12 @@ msgstr "boş tanımlayıcı adına (<%s> için) izin verilmiyor"
 msgid "name consists only of disallowed characters: %s"
 msgstr "ad yalnızca izin verilmeyen karakterlerden oluşuyor: %s"
 
-msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+msgid ""
+"git imap-send [-v] [-q] [--[no-]curl] [--[no-]draft] [(--folder|-f) "
+"<folder>] < <mbox>"
 msgstr ""
-"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <klasör>] < <mbox>"
+"git imap-send [-v] [-q] [--[no-]curl] [--[no-]draft] [(--folder|-f)\n"
+"<klasör>] < <posta-kutusu>"
 
 msgid "no IMAP host specified"
 msgstr "belirtilmiş IMAP makinesi yok"
@@ -19115,6 +19573,9 @@ msgstr "'%s' içindeki aralıklı ikili nesneye erişilemiyor"
 msgid "unable to parse sparse filter data in %s"
 msgstr "%s içindeki aralıklı süzgeç verisi ayrıştırılamıyor"
 
+msgid "filter_oidset: only blob:limit filters are supported"
+msgstr "filter_oidset: yalnızca blob:limit süzgeçleri destekleniyor"
+
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
 msgstr "'%s' girdisi (%s ağacında) ağaç kipine iye; ancak bir ağaç değil"
@@ -19200,11 +19661,15 @@ msgstr "ileti biçimlendirilemiyor: %s"
 
 #, c-format
 msgid "invalid marker-size '%s', expecting an integer"
-msgstr "geçersiz imleyici boyutu '%s', bir tamsayı bekleniyor"
+msgstr "geçersiz imleyici boyutu \"%s\", bir tamsayı bekleniyor"
 
 #, c-format
 msgid "Could not parse object '%s'"
-msgstr "'%s' nesnesi ayrıştırılamadı"
+msgstr "\"%s\" nesnesi ayrıştırılamadı"
+
+#, c-format
+msgid "tree has duplicate entries for '%s'"
+msgstr "ağaçta \"%s\" için yinelenmiş girdiler var"
 
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
@@ -19254,7 +19719,7 @@ msgstr "hata: %s için iç birleştirme yürütülemedi"
 
 #, c-format
 msgid "error: unable to add %s to database"
-msgstr "hata: %s veritabanına eklenemiyor"
+msgstr "hata: %s veri tabanına eklenemiyor"
 
 #, c-format
 msgid "Auto-merging %s"
@@ -19805,55 +20270,6 @@ msgstr "'%s' ögesine izin ayarlanamıyor"
 msgid "core.fsyncMethod = batch is unsupported on this platform"
 msgstr "core.fsyncMethod = batch, bu platformda desteklenmiyor"
 
-msgid "error when closing loose object file"
-msgstr "gevşek nesne dosyası kapatılırken hata"
-
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr "%s depo veritabanına nesne eklemek için yetersiz izin"
-
-msgid "unable to create temporary file"
-msgstr "geçici dosya oluşturulamıyor"
-
-msgid "unable to write loose object file"
-msgstr "gevşek nesne dosyası yazılamıyor"
-
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "yeni nesne %s söndürülemiyor (%d)"
-
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "%s nesnesi üzerinde deflateEnd başarısız oldu (%d)"
-
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "%s için olan nesne kaynak verisinden dolayı kafa karışıklığı"
-
-#, c-format
-msgid "write stream object %<PRIuMAX> != %<PRIuMAX>"
-msgstr "akış nesnesini yaz %<PRIuMAX> != %<PRIuMAX>"
-
-#, c-format
-msgid "unable to stream deflate new object (%d)"
-msgstr "yeni nesne akışı söndürülemiyor (%d)"
-
-#, c-format
-msgid "deflateEnd on stream object failed (%d)"
-msgstr "akış nesnesi üzerinde deflateEnd başarısız (%d)"
-
-#, c-format
-msgid "unable to create directory %s"
-msgstr "%s dizini oluşturulamıyor"
-
-#, c-format
-msgid "cannot read object for %s"
-msgstr "%s için nesne okunamıyor"
-
-#, c-format
-msgid "cannot map object %s to %s"
-msgstr "%s nesnesi %s ögesine eşlemlenemiyor"
-
 #, c-format
 msgid "object fails fsck: %s"
 msgstr "nesne fsck'yi başarısız ediyor: %s"
@@ -19871,7 +20287,7 @@ msgstr "%s indekslenirken kısa read"
 
 #, c-format
 msgid "%s: failed to insert into database"
-msgstr "%s: veritabanına ekleme başarısız"
+msgstr "%s: veri tabanına ekleme başarısız"
 
 msgid "cannot add a submodule of a different hash algorithm"
 msgstr "başka bir sağlama algoritmalı altmodül eklenemiyor"
@@ -19904,6 +20320,9 @@ msgstr "%s ögesinin '%s' üstbilgisinden tür ayrıştırılamıyor"
 msgid "unable to unpack contents of %s"
 msgstr "%s içeriği açılamıyor"
 
+msgid "unable to migrate temporary objects"
+msgstr "geçici nesneler göç ettirilemedi"
+
 #. TRANSLATORS: This is a line of ambiguous object
 #. output shown when we cannot look up or parse the
 #. object in question. E.g. "deadbeef [bad object]".
@@ -20123,8 +20542,8 @@ msgid "replacement %s not found for %s"
 msgstr "%s yedeği %s için bulunamadı"
 
 #, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "paketlenmiş nesne %s (%s içinde depolanıyor) hasarlı"
+msgid "object %s is corrupt"
+msgstr "%s nesnesi hasarlı"
 
 #, c-format
 msgid "missing mapping of %s to %s"
@@ -20138,6 +20557,9 @@ msgstr "%s geçerli bir nesne değil"
 msgid "%s is not a valid '%s' object"
 msgstr "%s geçerli bir '%s' nesnesi değil"
 
+msgid "primary object source does not support generating packfiles"
+msgstr "ana nesne kaynağı, paket dosyaları üretmeyi desteklemiyor"
+
 msgid "unable to fdopen alternates lockfile"
 msgstr "alternatifler kilit dosyası fdopen yapılamıyor"
 
@@ -20147,6 +20569,22 @@ msgstr "alternatifler dosyası okunamıyor"
 msgid "unable to move new alternates file into place"
 msgstr "yeni alternatifler dosyası yerine taşınamıyor"
 
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+"Çok fazla ulaşılamayan gevşek nesne var; kaldırmak için \"git prune\" "
+"kullanın."
+
+#, c-format
+msgid "pack-objects died of signal %d"
+msgstr "pack-objects, %d sinyaliyle sonlandı"
+
+msgid "could not spawn pack-objects"
+msgstr "pack-objects ortaya çıkarılamadı"
+
+msgid "error writing to pack-objects"
+msgstr "pack-objects'e yazarken hata"
+
 #, c-format
 msgid "unable to open loose object %s"
 msgstr "gevşek nesne %s açılamıyor"
@@ -20170,6 +20608,89 @@ msgstr "%s üstbilgisi pek uzun, %d bayt'ı aşıyor"
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "%s gevşek nesnesi (%s içinde depolanıyor) hasarlı"
 
+msgid "error when closing loose object file"
+msgstr "gevşek nesne dosyası kapatılırken hata"
+
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr "%s depo veri tabanına nesne eklemek için yetersiz izin"
+
+msgid "unable to create temporary file"
+msgstr "geçici dosya oluşturulamıyor"
+
+msgid "unable to write loose object file"
+msgstr "gevşek nesne dosyası yazılamıyor"
+
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "yeni nesne %s söndürülemiyor (%d)"
+
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "%s nesnesi üzerinde deflateEnd başarısız oldu (%d)"
+
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "%s için olan nesne kaynak verisinden dolayı kafa karışıklığı"
+
+#, c-format
+msgid "write stream object %<PRIuMAX> != %<PRIuMAX>"
+msgstr "akış nesnesini yaz %<PRIuMAX> != %<PRIuMAX>"
+
+#, c-format
+msgid "unable to stream deflate new object (%d)"
+msgstr "yeni nesne akışı söndürülemiyor (%d)"
+
+#, c-format
+msgid "deflateEnd on stream object failed (%d)"
+msgstr "akış nesnesi üzerinde deflateEnd başarısız (%d)"
+
+#, c-format
+msgid "unable to create directory %s"
+msgstr "%s dizini oluşturulamıyor"
+
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: sağlama yolu uyuşmazlığı, şurada bulundu: %s"
+
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s: nesne hasarlı veya kayıp: %s"
+
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "hatalı sha1 dosyası: %s"
+
+msgid "Checking object directory"
+msgstr "Nesne dizini denetleniyor"
+
+msgid "Checking object directories"
+msgstr "Nesne dizinleri denetleniyor"
+
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "paketlenmiş nesne %s (%s içinde depolanıyor) hasarlı"
+
+#, c-format
+msgid "unable to load rev-index for pack '%s'"
+msgstr "'%s' paketi için rev-index yüklenemiyor"
+
+#, c-format
+msgid "invalid rev-index for pack '%s'"
+msgstr "'%s' paketi için geçersiz rev-index"
+
+msgid "object database transaction already pending"
+msgstr "nesne veri tabanı işlemi halihazırda bekliyor"
+
+msgid "failed to start ODB transaction"
+msgstr "ODB işlemi başlatılamadı"
+
+msgid "failed to commit ODB transaction"
+msgstr "ODB işlemi işlenemedi"
+
+msgid "failed to finalize ODB transaction"
+msgstr "ODB işlemi sonuçlandırılamadı"
+
 #, c-format
 msgid "duplicate entry when writing bitmap index: %s"
 msgstr "biteşlem indeksi yazılırken yinelenen girdi: %s"
@@ -20247,6 +20768,9 @@ msgstr "çoklu paket biteşlemi gereken ters indeksi içermiyor"
 msgid "could not open pack %s"
 msgstr "%s paketi açılamadı"
 
+msgid "could not open bitmap for base MIDX"
+msgstr "temel MIDX için biteşlem açılamadı"
+
 msgid "corrupt bitmap lookup table: triplet position out of index"
 msgstr "hasarlı biteşlem arama tablosu: üçlü konum indeks dışında"
 
@@ -20795,6 +21319,52 @@ msgstr "vaatçi uzak konumundan %s getirilemedi"
 msgid "unsupported field '%s' in '%s' config"
 msgstr "şu yapılandırmada desteklenmeyen \"%s\" alanı: \"%s\""
 
+#, c-format
+msgid ""
+"invalid remote name '%s' before '=' sign in '%s' from "
+"promisor.acceptFromServerUrl config"
+msgstr ""
+"promisor.acceptFromServerUrl yapılandırmasından \"=\" işareti öncesi "
+"geçersiz uzak konum adı \"%s\", \"%s\" konumunda"
+
+#, c-format
+msgid ""
+"invalid url pattern '%s' in '%s' from promisor.acceptFromServerUrl config"
+msgstr ""
+"promisor.acceptFromServerUrl yapılandırmasında geçersiz \"%s\" URL dizgisi, "
+"\"%s\" konumundan"
+
+#, c-format
+msgid ""
+"couldn't generate a valid remote name from advertised url '%s', ignoring "
+"this remote"
+msgstr ""
+"Tanıtılan \"%s\" URL'sinden geçerli bir uzak konum adı üretilemedi, bu uzak "
+"konum yok sayılıyor"
+
+#, c-format
+msgid ""
+"generated remote name '%s' from advertised url '%s' is invalid, ignoring "
+"this remote"
+msgstr ""
+"Şu URL'den üretilmiş uzak konum adı \"%s\" geçersiz, bu uzak konum yok "
+"sayılıyor: \"%s\""
+
+#, c-format
+msgid "couldn't normalize advertised url '%s', ignoring this remote"
+msgstr "tanıtılan URL \"%s\" olağanlaştırılamadı, bu uzak konum yok sayılıyor"
+
+#, c-format
+msgid "Auto-creating promisor remote '%s' for URL '%s'\n"
+msgstr ""
+"Şu URL için vaatçi uzak konum \"%s\" kendiliğinden oluşturuluyor: \"%s\"\n"
+
+#, c-format
+msgid "too many remotes accepted with name like '%s-X', ignoring this remote"
+msgstr ""
+"\"%s-X\" adına benzer pek çok uzak konum kabul edildi, bu uzak konum yok "
+"sayılıyor"
+
 #, c-format
 msgid ""
 "known remote named '%s' but with URL '%s' instead of '%s', ignoring this "
@@ -20957,12 +21527,16 @@ msgstr "geçersiz ek süprüntü ucu: '%s'"
 msgid "unable to enumerate additional recent objects"
 msgstr "ek son kullanılan nesneler numaralandırılamıyor"
 
+#, c-format
+msgid "remove '%s'\n"
+msgstr "kaldır: \"%s\"\n"
+
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr "dosya arması '%s' eklenmeyecek ('%s' indekste halihazırda var)"
 
 msgid "cannot create an empty blob in the object database"
-msgstr "nesne veritabanında boş ikili bir nesne oluşturulamıyor"
+msgstr "nesne veri tabanında boş ikili bir nesne oluşturulamıyor"
 
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
@@ -21112,10 +21686,6 @@ msgstr ""
 msgid "unexpected diff status %c"
 msgstr "beklenmedik diff durumu %c"
 
-#, c-format
-msgid "remove '%s'\n"
-msgstr "kaldır: \"%s\"\n"
-
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
 "continue'.\n"
@@ -22117,8 +22687,12 @@ msgstr "  (yerel işlemelerinizi yayımlamak için \"git push\" kullanın)\n"
 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] "Dalınız '%s' dalından %d işleme geride ve ileri sarılabilir.\n"
-msgstr[1] "Dalınız '%s' dalından %d işleme geride ve ileri sarılabilir.\n"
+msgstr[0] "Dalınız \"%s\" dalından %d işleme geride ve ileri sarılabilir.\n"
+msgstr[1] "Dalınız \"%s\" dalından %d işleme geride ve ileri sarılabilir.\n"
+
+#, c-format
+msgid "  (use \"git pull %s %s\" to update your local branch)\n"
+msgstr "  (yerel dalınızı güncellemek için \"git pull %s %s\" kullanın)\n"
 
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (yerel dalınızı güncellemek için \"git pull\" kullanın)\n"
@@ -22137,10 +22711,18 @@ msgstr[1] ""
 "Sizin dalınız ve '%s' birbirinden uzaklaşmış ve sırasıyla\n"
 "her birinde %d ve %d işleme var.\n"
 
+#, c-format
+msgid ""
+"  (use \"git pull %s %s\" if you want to integrate the remote branch with "
+"yours)\n"
+msgstr ""
+"  (uzak dalı kendi dalınıza tümleştirmek istiyorsanız \"git pull %s %s\" "
+"kullanın)\n"
+
 msgid ""
 "  (use \"git pull\" if you want to integrate the remote branch with yours)\n"
 msgstr ""
-"  (uzak dalı kendi dalınızla birleştirmek istiyorsanız \"git pull\" "
+"  (uzak dalı kendi dalınıza tümleştirmek istiyorsanız \"git pull\" "
 "kullanın)\n"
 
 #, c-format
@@ -22259,6 +22841,10 @@ msgstr "%s nesnesi için değiştirme derinliği pek yüksek"
 msgid "'%s' is not a valid commit-ish for %s"
 msgstr "\"%s\", %s için geçerli bir işlememsi değil"
 
+#, c-format
+msgid "'%s' does not point to a commit for %s"
+msgstr "\"%s\", %s için bir işlemeye işaret etmiyor"
+
 #, c-format
 msgid "argument to %s must be a reference"
 msgstr "%s argümanı bir başvuru olmalı"
@@ -22277,10 +22863,17 @@ msgstr "yeniden oynatmak için birkaç işleme gerekli"
 msgid "all positive revisions given must be references"
 msgstr "verilen tüm pozitif revizyonlar, başvuru olmalı"
 
+#, c-format
+msgid "merge of %s onto %s failed"
+msgstr "%s ögesinin %s üzerine birleştirilmesi başarısız oldu"
+
 #, c-format
 msgid "commit %s became empty after replay"
 msgstr "%s işlemesi, yeniden oynatma sonrasında boş oldu"
 
+msgid "'--linearize' cannot be used with multiple branches"
+msgstr "\"--linearize\", birden çok dalla kullanılamaz"
+
 msgid "'--ref' cannot be used with multiple revision ranges"
 msgstr "\"--ref\", birden çok revizyon erimiyle kullanılamaz"
 
@@ -23355,6 +23948,9 @@ msgstr ""
 "sonra \"git stash pop\" ile yerel değişiklikleri\n"
 "uygulayabilirsiniz.\n"
 
+msgid "could not apply autostash; your changes are safe in the stash"
+msgstr "kendiliğinden zula uygulanamıyor; değişiklikleriniz zulada güvende"
+
 #, c-format
 msgid ""
 "Autostash exists; creating a new stash entry.\n"
@@ -23574,16 +24170,16 @@ msgid "no path in gitfile: %s"
 msgstr "gitfile içinde yol yok: %s"
 
 #, c-format
-msgid "not a git repository: %s"
-msgstr "bir git deposu değil: %s"
+msgid "gitfile does not point to a valid repository: %s"
+msgstr "gitfile, geçerli bir depoya işaret etmiyor: %s"
 
 #, c-format
 msgid "'$%s' too big"
-msgstr "'$%s' çok büyük"
+msgstr "\"$%s\" çok büyük"
 
 #, c-format
 msgid "not a git repository: '%s'"
-msgstr "bir git deposu değil: '%s'"
+msgstr "bir git deposu değil: \"%s\""
 
 #, c-format
 msgid "cannot chdir to '%s'"
@@ -23696,6 +24292,9 @@ msgstr "geçersiz başlangıç dalı adı: '%s'"
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init: --initial-branch=%s yok sayıldı"
 
+msgid "failed creating object database"
+msgstr "nesne veri tabanı oluşturulamadı"
+
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "%d dosya türü ele alınamıyor"
@@ -24234,6 +24833,9 @@ msgstr "%s beklenmedik bir biçimde şunu söyledi: '%s'"
 msgid "%s also locked %s"
 msgstr "%s ayrıca şunu kilitledi: %s"
 
+msgid "could not dup helper output fd"
+msgstr "yardımcı çıktısı dosya açıklayıcısı çoğaltılamadı"
+
 msgid "couldn't run fast-import"
 msgstr "fast-import çalıştırılamadı"
 
@@ -24313,6 +24915,10 @@ msgstr "fast-export çalıştırılamadı"
 msgid "error while running fast-export"
 msgstr "fast-export çalıştırılırken hata"
 
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "\"%s\" ögesinin adı, \"%s\" olarak değiştirilemedi"
+
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -24378,8 +24984,11 @@ msgstr "ayrıntılar için 'git help config' içinde protocol.version'a bakın"
 msgid "server options require protocol version 2 or later"
 msgstr "sunucu seçenekleri protokol sürüm 2 veya sonrasını gerektirir"
 
+msgid "remote does not support object-info"
+msgstr "uzak konum, object-info'yu desteklemiyor"
+
 msgid "server does not support wait-for-done"
-msgstr "Sunucu, wait-for-done desteklemiyor"
+msgstr "sunucu, wait-for-done desteklemiyor"
 
 msgid "could not parse transport.color.* config"
 msgstr "transport.color.* yapılandırması ayrıştırılamadı"
@@ -24735,31 +25344,31 @@ msgid "warning: "
 msgstr "uyarı: "
 
 #, c-format
-msgid "'%s' is nominated for removal.\n"
-msgstr "'%s', kaldırılması için aday gösterildi.\n"
+msgid "'%s' will be removed soon.\n"
+msgstr "\"%s\", yakın zamanda kaldırılacak.\n"
 
 #, c-format
 msgid ""
-"If you still use this command, here's what you can do:\n"
+"If you need a replacement:\n"
+"\n"
+"- Read https://git-scm.com/docs/BreakingChanges.html.\n"
+"\n"
+"- Check what others on the mailing list suggest as a replacement:\n"
+"  https://lore.kernel.org/git/?q=%s\n"
 "\n"
-"- read https://git-scm.com/docs/BreakingChanges.html\n"
-"- check if anyone has discussed this on the mailing\n"
-"  list and if they came up with something that can\n"
-"  help you: https://lore.kernel.org/git/?q=%s\n"
-"- send an email to <git@vger.kernel.org> to let us\n"
-"  know that you still use this command and were unable\n"
-"  to determine a suitable replacement\n"
+"- Send an email to <git@vger.kernel.org> asking for help, only if\n"
+"  suggestions by others do not work for you.\n"
 "\n"
 msgstr ""
-"Bu komutu hâlâ kullanıyorsanız şunları yapabilirsiniz:\n"
+"Bunun yerine başka bir şeye gereksiniminiz varsa:\n"
+"\n"
+"- https://git-scm.com/docs/BreakingChanges.html sayfasını okuyun.\n"
+"\n"
+"- Başkalarının posta listesinde yerine ne önerdiğine bakın:\n"
+"  https://lore.kernel.org/git/?q=%s\n"
 "\n"
-"- https://git-scm.com/docs/BreakingChanges.html sayfasını okuyun\n"
-"- posta listesinde herhangi bir kişinin bunun hakkında konuşup\n"
-"  konuşmadığına ve size yardımcı olabilecek bir şey söylenip\n"
-"  söylenmediğine bakın: https://lore.kernel.org/git/?q=%s\n"
-"- <git@vger.kernel.org> adresine bir e-posta göndererek bize\n"
-"  bu komutu hâlâ kullandığınızı ve yerine uygun bir ikâmeyi\n"
-"  bulamadığınızı iletin\n"
+"- Diğer öneriler size yardımcı olmadıysa <git@vger.kernel.org>\n"
+"  adresine yardım isteyen bir ileti gönderin.\n"
 "\n"
 
 msgid "refusing to run without --i-still-use-this"
@@ -25043,7 +25652,7 @@ msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (birleştirmeyi sonuçlandırmak için \"git commit\" kullanın)"
 
 msgid "You are in the middle of an am session."
-msgstr "Bir 'am' oturumunun tam ortasındasınız."
+msgstr "Bir \"am\" oturumunun tam ortasındasınız."
 
 msgid "The current patch is empty."
 msgstr "Mevcut yama boş."
@@ -25494,8 +26103,8 @@ msgstr ""
 "\n"
 
 #, perl-format
-msgid "No subject line in %s?"
-msgstr "%s içinde konu satırı yok mu?"
+msgid "No 'Subject:' line in '%s'\n"
+msgstr "\"%s\" içinde \"Subject:\" satırı yok\n"
 
 #, perl-format
 msgid "Failed to open for writing %s: %s"

From e051aa97dc742812d654d5effcf44735e91121ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aindri=C3=BA=20Mac=20Giolla=20Eoin?= <aindriu80@gmail.com>
Date: Sat, 19 Sep 2026 11:17:33 +0100
Subject: [PATCH 011/247] l10n: ga.po: update for Git 2.56
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aindriú Mac Giolla Eoin <aindriu80@gmail.com>
---
 po/TEAMS |    2 +-
 po/ga.po | 1129 ++++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 882 insertions(+), 249 deletions(-)

diff --git a/po/TEAMS b/po/TEAMS
index fe73dedefbbfd0..0fd009b2400647 100644
--- a/po/TEAMS
+++ b/po/TEAMS
@@ -31,7 +31,7 @@ Members:	Sébastien Helleu <flashcode@flashtux.org>
 
 Language:	ga (Irish)
 Repository:	https://github.com/aindriu80/git-po
-Members:	Aindriú Mac Giolla Eoin <aindriu80@gmail.com>
+Leader:		Aindriú Mac Giolla Eoin <aindriu80@gmail.com>
 
 Language:	id (Indonesian)
 Repository:	https://github.com/bagasme/git-po
diff --git a/po/ga.po b/po/ga.po
index 3d04a3bc51799a..89866cf0bf4650 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2026-06-15 18:56+0000\n"
-"PO-Revision-Date: 2026-06-27 14:34+0100\n"
+"POT-Creation-Date: 2026-09-15 23:12+0000\n"
+"PO-Revision-Date: 2026-09-20 12:43+0100\n"
 "Last-Translator: Aindriú Mac Giolla Eoin <aindriu80@yahoo.com>\n"
 "Language-Team: none\n"
 "Language: ga\n"
@@ -1737,6 +1737,14 @@ msgstr "ní féidir 'show' a thosú le haghaidh réad '%s'"
 msgid "could not read file '%s'"
 msgstr "ní raibh in ann comhad '%s' a léamh"
 
+#, c-format
+msgid "could not read bad term from file '%s'"
+msgstr "níorbh fhéidir téarma lochtach a léamh ón gcomhad '%s'"
+
+#, c-format
+msgid "could not read good term from file '%s'"
+msgstr "níorbh fhéidir téarma bailí a léamh ón gcomhad '%s'"
+
 msgid "reading bisect refs failed"
 msgstr "theip ar athbhreithnithe bisect a léamh"
 
@@ -1984,6 +1992,12 @@ msgstr "ní fhéadfaí '%s' a stát"
 msgid "empty patch. aborted"
 msgstr "paiste folam. a ghabhrú"
 
+msgid "could not initialize apply state"
+msgstr "níorbh fhéidir staid an chur i bhfeidhm a thúsú"
+
+msgid "could not check apply state"
+msgstr "níorbh fhéidir staid an chur i bhfeidhm a sheiceáil"
+
 #, c-format
 msgid "could not apply '%s'"
 msgstr "ní fhéadfaí '%s' a chur i bhfeidhm"
@@ -2023,6 +2037,9 @@ msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 "athormalú a dhéanamh ar EOL na gcomhaid rianaithe (tugann le tuiscint -u)"
 
+msgid "add conflict-resolved tracked files"
+msgstr "cuir comhaid rianaithe a bhfuil coinbhleachtaí réitithe iontu leis"
+
 msgid "record only the fact that the path will be added later"
 msgstr "ní thaifeadadh ach an fíric go gcuirfear an cosán leis níos déanaí"
 
@@ -2094,6 +2111,22 @@ msgstr "Úsáid -f más mian leat iad a chur leis i ndáiríre."
 msgid "adding files failed"
 msgstr "theip ar chomhaid a chur leis"
 
+#, c-format
+msgid "updating file '%s' failed"
+msgstr "theip ar nuashonrú an chomhaid '%s'"
+
+#, c-format
+msgid ""
+"the following paths still have conflict markers:\n"
+"%s"
+msgstr ""
+"tá marcóirí coimhlinte fós ag na cosáin seo a leanas:\n"
+"%s"
+
+#, c-format
+msgid "cannot lstat: '%s'"
+msgstr "ní féidir lstat a dhéanamh ar: '%s'"
+
 #, c-format
 msgid "'%s' cannot be negative"
 msgstr "Caithfidh '%s' a bheith neamh-diúltach"
@@ -2538,12 +2571,13 @@ msgstr "argóint gan aithint: %s"
 
 msgid ""
 "git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n"
-"                 [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
-"[<pathspec>...]"
+"                 [--no-checkout] [--first-parent] [--reset-when-"
+"found[=<where>]] [<bad> [<good>...]] [--] [<pathspec>...]"
 msgstr ""
-"git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n"
-"                 [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
-"[<pathspec>...]"
+"git bisect start [--term-(bad|new)=<téarma-nua> --term-(good|old)=<sean-"
+"téarma>]\n"
+"                 [--no-checkout] [--first-parent] [--reset-when-found[=<áit "
+"a bhfuil>]] [<dona> [<maith>...]] [--] [<sonraíocht cosáin>...]"
 
 msgid "git bisect (bad|new|<term-new>) [<rev>]"
 msgstr "git bisect (bad|new|<term-new>) [<rev>]"
@@ -2560,8 +2594,8 @@ msgstr "git bisect reset [<commit>]"
 msgid "git bisect replay <logfile>"
 msgstr "git bisect replay <logfile>"
 
-msgid "git bisect run <cmd> [<arg>...]"
-msgstr "git bisect run <cmd> [<arg>...]"
+msgid "git bisect run [--reset-when-found[=<where>]] <cmd> [<arg>...]"
+msgstr "git bisect run [--reset-when-found[=<áit>]] <ordú> [<argóint>...]"
 
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
@@ -2605,6 +2639,10 @@ msgstr ""
 "ní fhéadfaí an HEAD bunaidh '%s' a sheiceáil. <commit>Bain triail as 'git "
 "bisect reset '."
 
+#, c-format
+msgid "invalid value for '--reset-when-found': '%s'"
+msgstr "luach neamhbhailí do '--reset-when-found': '%s'"
+
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Droch-argóint bisect_write: %s"
@@ -2692,6 +2730,10 @@ msgstr ""
 msgid "could not open '%s' for appending"
 msgstr "ní fhéadfaí '%s' a oscailt le haghaidh cur isteach"
 
+#, c-format
+msgid "could not find commit for '%s'"
+msgstr "níorbh fhéidir an tiomantas do '%s' a aimsiú"
+
 msgid "'' is not a valid term"
 msgstr "'' ní téarma bailí é"
 
@@ -2777,6 +2819,9 @@ msgstr "< 0 or >Theip ar rith bioctha: is é an cód imeachta %d ó %s = 128"
 msgid "cannot open file '%s' for writing"
 msgstr "ní féidir comhad '%s' a oscailt le haghaidh scríobh"
 
+msgid "could not duplicate stdout"
+msgstr "ní fhéadfaí stdout a dhúbailt"
+
 msgid "bisect run cannot continue any more"
 msgstr "ní féidir le rith bisect leanúint ar aghaidh níos mó"
 
@@ -2967,8 +3012,12 @@ msgstr[2] "comhad %s níl ach %lu línte"
 msgid "Blaming lines"
 msgstr "An milleán ar línte"
 
-msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
-msgstr "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
+msgid ""
+"git branch [<options>] [-r | -a] [--merged] [--no-merged] [(--forked "
+"<branch>)...]"
+msgstr ""
+"git branch [<options>] [-r | -a] [--merged] [--no-merged] [(--forked "
+"<brainse>)...]"
 
 msgid ""
 "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
@@ -2995,6 +3044,12 @@ msgstr "git branch [<options>] [-r | -a] [--points-at]"
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<options>] [-r | -a] [--format]"
 
+msgid ""
+"git branch [<options>] (--delete-merged <pattern>)... [<branch-pattern>...]"
+msgstr ""
+"git branch [<roghanna>] (--delete-merged <patrún>)... [<patrún-"
+"brainseach>...]"
+
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -3030,6 +3085,12 @@ msgstr "theip ar nuashonrú comhad config-file"
 msgid "cannot use -a with -d"
 msgstr "ní féidir -a a úsáid le -d"
 
+#, c-format
+msgid "cannot delete branch '%s' used by worktree at '%s' for bisect"
+msgstr ""
+"ní féidir brainse '%s' a scriosadh a úsáideann crann oibre ag '%s' le "
+"haghaidh déroinnt"
+
 #, c-format
 msgid "cannot delete branch '%s' used by worktree at '%s'"
 msgstr "ní féidir brainse '%s' a úsáideann crann oibre ag '%s' a scriosadh"
@@ -3050,6 +3111,14 @@ msgstr ""
 msgid "branch '%s' not found"
 msgstr "níor aimsíodh brainse '%s'"
 
+#, c-format
+msgid "Would delete remote-tracking branch %s (was %s).\n"
+msgstr "Scriosfaí an brainse cianrianaithe %s (ba é %s a bhí ann).\n"
+
+#, c-format
+msgid "Would delete branch %s (was %s).\n"
+msgstr "Scriosfaí an brainse %s (ba é %s é).\n"
+
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Brainse cianrianaithe scriosta %s (bhí %s).\n"
@@ -3116,6 +3185,14 @@ msgstr "athainmnítear brainse, ach theip ar nuashonrú ar chomhad config-file"
 msgid "branch is copied, but update of config-file failed"
 msgstr "cóipeáiltear brainse, ach theip ar nuashonrú comhad config-file"
 
+#, c-format
+msgid "'%s' is not a valid branch or pattern"
+msgstr "ní brainse ná patrún bailí é '%s'"
+
+#, c-format
+msgid "Skipping '%s' (branch.%s.deleteMerged is false)\n"
+msgstr "Ag scipeáil '%s' (tá branch.%s.deleteMerged cothrom le 'false')\n"
+
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -3126,6 +3203,15 @@ msgstr ""
 " %s\n"
 "Déanfar línte a thosaíonn le '%s' a scriosadh.\n"
 
+msgid "--set-upstream-to takes a single <remote>/<branch> argument"
+msgstr "Glacann --set-upstream-to argóint aonair <remote>/<branch>"
+
+#, c-format
+msgid "Did you mean to use: git branch --set-upstream-to=%s/%s?"
+msgstr ""
+"An raibh sé i gceist agat an méid seo a leanas a úsáid: git branch --set-"
+"upstream-to=%s/%s?"
+
 msgid "Generic options"
 msgstr "Roghanna cineálacha"
 
@@ -3201,6 +3287,17 @@ msgstr "athbhreithniú na brainse a chruthú"
 msgid "edit the description for the branch"
 msgstr "cuir an tuairisc don bhrainse a chur in eagar"
 
+msgid "pattern"
+msgstr "patrún"
+
+msgid "delete merged branches whose upstream matches <pattern> (repeatable)"
+msgstr ""
+"scrios brainsí cumaiscthe a bhfuil a mbrainse foinseach (upstream) ag teacht "
+"le <patrún> (is féidir é seo a dhéanamh arís)"
+
+msgid "with --delete-merged, only print which branches would be deleted"
+msgstr "le --delete-merged, ná taispeáin ach na brainsí a scriosfaí"
+
 msgid "force creation, move/rename, deletion"
 msgstr "cruthú fórsa, gluaise/athainmniú, scriosadh"
 
@@ -3210,6 +3307,14 @@ msgstr "ach brainsí a chumasc a phriontáil"
 msgid "print only branches that are not merged"
 msgstr "ach brainsí nach ndéantar cumasc a phriontáil"
 
+msgid "branch"
+msgstr "brainse"
+
+msgid "print only branches whose upstream matches <branch> (repeatable)"
+msgstr ""
+"ná priontáil ach na brainsí a bhfuil a mbrainse foinseach (upstream) ag "
+"teacht le <branch> (is féidir é seo a dhéanamh arís is arís eile)"
+
 msgid "list branches in columns"
 msgstr "liostáil brainsí i gcolúin"
 
@@ -3234,6 +3339,9 @@ msgstr "theip ar HEAD a réiteach mar thagartha bailí"
 msgid "HEAD not found below refs/heads!"
 msgstr "Ní fhaightear CEAD thíos na refs/heads!"
 
+msgid "--dry-run requires --delete-merged"
+msgstr "Teastaíonn --delete-merged ó --dry-run"
+
 msgid ""
 "branch with --recurse-submodules can only be used if submodule."
 "propagateBranches is enabled"
@@ -3435,9 +3543,6 @@ msgstr "taispeáin méadar dul chun cinn"
 msgid "historical; same as --progress"
 msgstr "stairiúil; mar an gcéanna le --progress"
 
-msgid "historical; does nothing"
-msgstr "stairiúil; ní dhéanann aon rud"
-
 msgid "specify bundle format version"
 msgstr "leagan formáid beartán a shonrú"
 
@@ -3464,10 +3569,40 @@ msgstr "Rudaí a dhícheangal"
 msgid "cannot read object %s '%s'"
 msgstr "ní féidir réad %s '%s' a léamh"
 
+msgid "must supply valid remote when using remote-object-info"
+msgstr "ní mór cianda bailí a sholáthar agus remote-object-info á úsáid"
+
+#, c-format
+msgid "remote-object-info does not support short oids, %d characters required"
+msgstr ""
+"Ní thacaíonn remote-object-info le OIDanna gearra; teastaíonn %d carachtar"
+
+#, c-format
+msgid "not a valid object name '%s'"
+msgstr "ní hainm réad bailí é '%s'"
+
+msgid "remote-object-info requires objects"
+msgstr "teastaíonn réada ó remote-object-info"
+
 #, c-format
 msgid "mailmap: invalid boolean '%s'"
 msgstr "mailmap: booléanach neamhbhailí '%s'"
 
+msgid "remote-object-info command too long"
+msgstr "Tá an t-ordú remote-object-info ró-fhada"
+
+#, c-format
+msgid "remote-object-info: failed to parse command line: %s"
+msgstr "remote-object-info: theip ar an líne ordaithe a pharsáil: %s"
+
+#, c-format
+msgid "remote-object-info supports at most %d objects"
+msgstr "tacaíonn remote-object-info le huasmhéid %d réad"
+
+#, c-format
+msgid "failed to get object info from the remote: %s"
+msgstr "theip ar fhaisnéis an réada a fháil ón gcianda: %s"
+
 msgid "flush is only for --buffer mode"
 msgstr "níl sruth ach le haghaidh mód --buffer"
 
@@ -3931,34 +4066,44 @@ msgid "The following paths have local changes:\n"
 msgstr "Tá athruithe áitiúla ar na cosáin seo a leanas:\n"
 
 #, c-format
-msgid ""
-"'%s' could be both a local file and a tracking branch.\n"
-"Please use -- (and optionally --no-guess) to disambiguate"
-msgstr ""
-"D'fhéadfadh '%s' a bheith ina chomhad áitiúil agus ina bhrainse rianaithe "
-"araon.\n"
-"Úsáid le do thoil -- (agus go roghnach --no-guess) chun a dhíbhriú"
+msgid "Branch name '%s' appears in multiple remotes:"
+msgstr "Tá ainm na brainse '%s' le feiceáil i roinnt ciandaí:"
+
+#, c-format
+msgid "  %s"
+msgstr "  %s"
 
 #, c-format
 msgid ""
-"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"If you meant to check out a remote tracking branch on <remote>,\n"
 "you can do so by fully qualifying the name with the --track option:\n"
 "\n"
-"    git %s --track origin/<name>\n"
+"    git %s --track <remote>/%s\n"
 "\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\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 ""
-"Más mian leat brainse rianaithe iargúlta a sheiceáil ar, e.g. 'origin',\n"
-"is féidir leat é sin a dhéanamh tríd an ainm a cháiliú go hiomlán leis an "
+"Más mian leat brainse rianaithe cianda ar <remote> a tharraingt anuas "
+"(checkout),\n"
+"is féidir leat é sin a dhéanamh tríd an ainm a shonrú go hiomlán leis an "
 "rogha --track:\n"
 "\n"
-"git %s --track origin/<ainm>\n"
+"    git %s --track <remote>/%s\n"
 "\n"
-"Más mian leat go mbeadh rogha ag seiceálacha de <ainm> débhríoch i gcónaí\n"
-"d'aon chianrialtán amháin, e.g. an cianrialtán 'origin', smaoinigh ar\n"
-"checkout.defaultRemote=origin a shocrú i do chumraíocht."
+"Más fearr leat go roghnófaí cianda áirithe i gcónaí — mar shampla an cianda "
+"'origin' —\n"
+"nuair a tharraingítear anuas brainse a bhfuil ainm débhríoch air,\n"
+"smaoinigh ar checkout.defaultRemote=origin a shocrú i do chumraíocht."
+
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
+msgstr ""
+"D'fhéadfadh '%s' a bheith ina chomhad áitiúil agus ina bhrainse rianaithe "
+"araon.\n"
+"Úsáid le do thoil -- (agus go roghnach --no-guess) chun a dhíbhriú"
 
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
@@ -4155,9 +4300,6 @@ msgstr ""
 msgid "you must specify path(s) to restore"
 msgstr "ní mór duit cosáin(í) a shonrú chun athchóiriú"
 
-msgid "branch"
-msgstr "brainse"
-
 msgid "create and checkout a new branch"
 msgstr "brainse nua a chruthú agus a sheiceáil"
 
@@ -4329,9 +4471,6 @@ msgstr "glanadh idirghní"
 msgid "remove whole directories"
 msgstr "bain eolairí iomlána"
 
-msgid "pattern"
-msgstr "patrún"
-
 msgid "add <pattern> to ignore rules"
 msgstr "cuir leis <pattern>na rialacha a neamhaird"
 
@@ -4939,8 +5078,16 @@ msgstr "ní féidir le tiomantas páirteach a dhéanamh le linn cumaisc."
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "ní féidir le tiomantas páirteach a dhéanamh le linn pioc silíní."
 
-msgid "cannot do a partial commit during a rebase."
-msgstr "ní féidir le tiomantas páirteach a dhéanamh le linn athbhunaithe."
+msgid "cannot do a partial commit during a revert."
+msgstr "ní féidir tiomantas páirteach a dhéanamh le linn aisiompaithe."
+
+msgid "cannot do a partial commit during an am session."
+msgstr "ní féidir tiomantas páirteach a dhéanamh le linn seisiúin am."
+
+msgid "cannot do a partial commit while resolving conflicts during a rebase."
+msgstr ""
+"ní féidir tiomantas páirteach a dhéanamh agus coinbhleachtaí á réiteach le "
+"linn athbhunaithe (rebase)."
 
 msgid "cannot read the index"
 msgstr "ní féidir leis an innéacs a léamh"
@@ -5130,8 +5277,20 @@ msgstr "Tá tú i lár cumaisc - ní féidir leat leasú."
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Tá tú i lár rogha silíní - ní féidir leat leasú."
 
-msgid "You are in the middle of a rebase -- cannot amend."
-msgstr "Tá tú i lár athbhunaithe - ní féidir leat leasú."
+msgid "The now-empty commit has been dropped -- cannot amend."
+msgstr ""
+"Tá an tiomantas, atá folamh anois, curtha ar ceal -- ní féidir é a leasú."
+
+msgid "You are in the middle of a revert -- cannot amend."
+msgstr "Tá tú i mbun aisiompaithe faoi láthair -- ní féidir leasú a dhéanamh."
+
+msgid "You are in the middle of an am session -- cannot amend."
+msgstr "Tá tú i lár seisiúin am -- ní féidir leasú a dhéanamh."
+
+msgid "You are resolving conflicts during a rebase -- cannot amend."
+msgstr ""
+"Tá tú ag réiteach coinbhleachtaí le linn rebase -- ní féidir leasú a "
+"dhéanamh."
 
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "Ní féidir --reset-author a úsáid ach le -C, -c nó --amend."
@@ -5995,6 +6154,10 @@ msgstr "Ní stór git é"
 msgid "invalid object '%s' given."
 msgstr "réad neamhbhailí '%s' tugtha."
 
+#, c-format
+msgid "unable to read tree object for commit '%s'"
+msgstr "ní féidir an réad crann don tiomantas '%s' a léamh"
+
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "níos mó ná dhá bhlob a thugtar: '%s'"
@@ -6094,8 +6257,8 @@ msgstr "níl aon tu <tool> gadh le haghaidh --tool=<tool>"
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "níl <cmd> tugtha do --extcmd=<cmd>"
 
-msgid "git fast-export [<rev-list-opts>]"
-msgstr "git fast-export [<rev-list-opts>]"
+msgid "git fast-export [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git fast-export [<roghanna>] [<revision-range>] [[--] <cosán>...]"
 
 #, c-format
 msgid "unknown %s mode: %s"
@@ -6763,6 +6926,10 @@ msgstr "--cat-blob-fd ní féidir dul thar %d"
 msgid "expected format name:filename for submodule rewrite option"
 msgstr "ainm formáide ionchais: ainm comhaid don rogha athscríofa fo-mhodúil"
 
+msgid "--max-pack-size: argument must be a non-negative integer"
+msgstr ""
+"--max-pack-size: ní mór gur slánuimhir neamhdhiúltach a bheadh sa argóint"
+
 #, c-format
 msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum"
 msgstr "max-pack-size is now in bytes, assuming --max-pack-size=%lum"
@@ -6770,6 +6937,11 @@ msgstr "max-pack-size is now in bytes, assuming --max-pack-size=%lum"
 msgid "minimum max-pack-size is 1 MiB"
 msgstr "is é 1 MiB an méid uasta íosta sa phacáiste"
 
+msgid "--big-file-threshold: argument must be a non-negative integer"
+msgstr ""
+"--big-file-threshold: ní mór gur slánuimhir neamhdhiúltach a bheadh sa "
+"argóint"
+
 #, c-format
 msgid "unknown --signed-commits mode '%s'"
 msgstr "anaithnid --signed-commits mód '%s'"
@@ -6798,13 +6970,93 @@ msgstr "fuair mé an rogha '%s' i ndiaidh an ordaithe sonraí"
 msgid "this version of fast-import does not support option: %s"
 msgstr "ní thacaíonn an leagan seo de thapa-iompórtáil leis an rogha: %s"
 
-#, c-format
-msgid "unknown option %s"
-msgstr "rogha anaithnid %s"
+msgid "git fast-import [<options>]"
+msgstr "git fast-import [<roghanna>]"
 
-#, c-format
-msgid "unknown option --%s"
-msgstr "rogha anaithnid --%s"
+msgid "Common"
+msgstr "Coiteann"
+
+msgid "format of the commit/tag dates"
+msgstr "formáid na ndátaí tiomanta/clibeála"
+
+msgid "display some basic statistics (objects, packfiles and memory)"
+msgstr ""
+"taispeáin roinnt staitisticí bunúsacha (oibiachtaí, comhaid phacáiste agus "
+"cuimhne)"
+
+msgid "disable the output shown by --stats"
+msgstr "díchumasaigh an t-aschur a thaispeántar le --stats"
+
+msgid "force updating modified existing branches"
+msgstr "nuashonrú fórsaithe ar bhrainsí atá ann cheana modhnaithe"
+
+msgid "require a terminating 'done' command"
+msgstr "éilíonn sé ordú críochnaithe 'done'"
+
+msgid "maximum size of each output pack file"
+msgstr "uasmhéid gach comhad pacáiste aschuir"
+
+msgid "maximum size of a blob that will be deltified"
+msgstr "uasmhéid bloba a ndéanfar 'deltified' air"
+
+msgid "maximum delta depth"
+msgstr "uasdoimhneacht delta"
+
+msgid "maximum number of branches to maintain active"
+msgstr "líon uasta na mbrainsí le coinneáil gníomhach"
+
+msgid "Marks"
+msgstr "Marcanna"
+
+msgid "import marks from <file>"
+msgstr "iompórtáil marcanna ó <comhad>"
+
+msgid "import marks from <file> if it exists"
+msgstr "iompórtáil marcanna ó <comhad> má tá sé ann"
+
+msgid "dump marks to <file>"
+msgstr "dumpáil marcanna chuig <comhad>"
+
+msgid "are --(import|export)-marks= paths relative to '.git/info/fast-import'?"
+msgstr ""
+"an bhfuil --(import|export)-marks= cosáin i gcoibhneas le '.git/info/fast-"
+"import'?"
+
+msgid "Submodule rewrite"
+msgstr "Athscríobh fo-mhodúil"
+
+msgid "name:filename"
+msgstr "ainm:ainm comhaid"
+
+msgid "rewrite object IDs for submodule <name> from <filename>"
+msgstr "athscríobh aitheantóirí réad don fho-mhodúl <name> ó <filename>"
+
+msgid "rewrite object IDs for submodule <name> to <filename>"
+msgstr "athscríobh aitheantóirí réad don fho-mhodúl <name> go dtí <filename>"
+
+msgid "Signing"
+msgstr "Síniú"
+
+msgid "how to handle signed commits"
+msgstr "conas déileáil le tiomantais shínithe"
+
+msgid "how to handle signed tags"
+msgstr "conas clibeanna sínithe a láimhseáil"
+
+msgid "Advanced"
+msgstr "Ardleibhéal"
+
+msgid "allow unsafe mark commands from the stream"
+msgstr "ceadaigh orduithe marcála neamhshábháilte ón sruth"
+
+msgid "dump edge commits to <file>"
+msgstr "dumpáil tiomantais imeallacha chuig <comhad>"
+
+msgid "fd"
+msgstr "fd"
+
+msgid "write some responses to <fd> instead of stdout"
+msgstr "scríobh roinnt freagraí chuig <fd> in áit stdout"
 
 #, c-format
 msgid "unsupported command: %s"
@@ -6832,6 +7084,10 @@ msgstr "git fetch --all [<options>]"
 msgid "fetch.parallel cannot be negative"
 msgstr "ní féidir fetch.parallel a bheith diúltach"
 
+#, c-format
+msgid "unrecognized fetch.followRemoteHEAD value '%s' ignored"
+msgstr "luach fetch.followRemoteHEAD anaithnid '%s' neamhaird déanta air"
+
 msgid "couldn't find remote ref HEAD"
 msgstr "ní raibh in ann ciantagartha HEAD a fháil"
 
@@ -6944,19 +7200,28 @@ msgstr "ag déanamh neamhaird de %s mar nach dtacaíonn an prótacal leis"
 
 #, c-format
 msgid ""
-"Run 'git remote set-head %s %s' to follow the change, or set\n"
-"'remote.%s.followRemoteHEAD' configuration option to a different value\n"
-"if you do not want to see this message. Specifically running\n"
-"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"
-"will disable the warning until the remote changes HEAD to something else."
+"Run 'git remote set-head %s %s' to follow the change, or modify\n"
+"either of the 'remote.%s.followRemoteHEAD' or 'fetch.followRemoteHEAD'\n"
+"configuration variables to handle the situation differently.\n"
+"\n"
+"Using this specific setting\n"
+"\n"
+"    git config set remote.%s.followRemoteHEAD warn-if-not-%s\n"
+"\n"
+"will suppress the warning until the remote changes HEAD to something else."
 msgstr ""
-"Rith 'git remote set-head %s %s' chun an t-athrú a leanúint, nó socraigh\n"
-"rogha cumraíochta 'remote.%s.followRemoteHEAD' go luach difriúil\n"
-"mura mian leat an teachtaireacht seo a fheiceáil. Go sonrach, má ritheann "
-"tú\n"
-"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"
-"díchumasófar an rabhadh go dtí go n-athraíonn an cianda HEAD go rud éigin "
-"eile."
+"Rith 'git remote set-head %s %s' chun an t-athrú a leanúint, nó déan "
+"mionathrú\n"
+"ar cheachtar de na hathróga cumraíochta 'remote.%s.followRemoteHEAD' nó "
+"'fetch.followRemoteHEAD'\n"
+"chun déileáil leis an gcás ar bhealach difriúil.\n"
+"\n"
+"Má úsáidtear an socrú sonrach seo\n"
+"\n"
+"    git config set remote.%s.followRemoteHEAD warn-if-not-%s\n"
+"\n"
+"cuirfear bac ar an rabhadh go dtí go n-athróidh an cianda an HEAD go rud "
+"éigin eile."
 
 msgid ""
 "You're on a case-insensitive filesystem, and the remote you are\n"
@@ -7336,7 +7601,7 @@ msgid ""
 "              to %7s %s"
 msgstr ""
 "nasc briste ó %7s %s\n"
-" chuig %7s %s"
+"              chuig %7s %s"
 
 msgid "Checking connectivity"
 msgstr "Nascacht a sheiceáil"
@@ -7372,6 +7637,10 @@ msgstr "Seiceáil %s"
 msgid "Checking connectivity (%d objects)"
 msgstr "Ag seiceáil nascachta (%d réad)"
 
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s: réad truaillithe nó ar iarraidh"
+
 #, c-format
 msgid "Checking %s %s"
 msgstr "Seiceáil %s %s"
@@ -7387,10 +7656,6 @@ msgstr "fréamh %s"
 msgid "tagged %s %s (%s) in %s"
 msgstr "clib %s %s (%s) i %s"
 
-#, c-format
-msgid "%s: object corrupt or missing"
-msgstr "%s: réad truaillithe nó ar iarraidh"
-
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: iontráil reflog neamhbhailí %s"
@@ -7414,28 +7679,6 @@ msgstr "paraiméadar neamhbhailí: súil le sha1, fuair '%s'"
 msgid "notice: No default references"
 msgstr "fógra: Gan aon tagairtí réamhshocraithe"
 
-#, c-format
-msgid "%s: hash-path mismatch, found at: %s"
-msgstr "%s: míchomhoiriúnú hash-path, le fáil ag: %s"
-
-#, c-format
-msgid "%s: object corrupt or missing: %s"
-msgstr "%s: réad truaillithe nó ar iarraidh: %s"
-
-#, c-format
-msgid "%s: object could not be parsed: %s"
-msgstr "%s: ní fhéadfaí réad a pháirseáil: %s"
-
-#, c-format
-msgid "bad sha1 file: %s"
-msgstr "comhad sha1 olc: %s"
-
-msgid "Checking object directory"
-msgstr "Seiceáil eolaire réada"
-
-msgid "Checking object directories"
-msgstr "Seiceáil eolairí réada"
-
 #, c-format
 msgid "Checking cache tree of %s"
 msgstr "Crann taisce de %s a sheiceáil"
@@ -7451,14 +7694,6 @@ msgstr "neamh-chrann i gcrann cache-"
 msgid "%s: invalid sha1 pointer in resolve-undo of %s"
 msgstr "%s: pointeoir sha1 neamhbhailí i réiteach a chealú de %s"
 
-#, c-format
-msgid "unable to load rev-index for pack '%s'"
-msgstr "ní féidir innéacs athbhreithnithe a luchtú don phacáiste '%s'"
-
-#, c-format
-msgid "invalid rev-index for pack '%s'"
-msgstr "innéacs rev-neamhbhailí do phacáiste '%s'"
-
 msgid "Checking ref database"
 msgstr "Seiceáil bunachar sonraí tagairt"
 
@@ -7512,9 +7747,6 @@ msgstr "taispeáint ainmneacha fabhracha do rudaí inrochtana"
 msgid "check reference database consistency"
 msgstr "seiceáil comhsheasmhacht bunachair"
 
-msgid "Checking objects"
-msgstr "Rud a sheiceáil"
-
 msgid "git fsmonitor--daemon start [<options>]"
 msgstr "git fsmonitor--daemon start [<options>]"
 
@@ -7700,12 +7932,6 @@ msgstr ""
 "tá gc ag rith cheana féin ar mheaisín '%s' pid%<PRIuMAX>(bain úsáid as --"
 "force mura bhfuil)"
 
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr ""
-"Tá an iomarca rudaí scaoilte neamh-inrochtana ann; reáchtáil 'git prune' "
-"chun iad a bhaint."
-
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
@@ -7745,9 +7971,6 @@ msgstr ""
 "ag scipeáil an tasc athphacála incriminteach mar go bhfuil core."
 "multiPackIndex díchumasaithe"
 
-msgid "failed to perform geometric repack"
-msgstr "theip ar athphacáil gheoiméadrach a dhéanamh"
-
 #, c-format
 msgid "task '%s' failed"
 msgstr "theip ar thasc '%s'"
@@ -8260,6 +8483,13 @@ msgstr "úsáid: %s%s"
 msgid "'git help config' for more information"
 msgstr "'git help config' le haghaidh tuilleadh faisnéise"
 
+msgid ""
+"git history drop <commit> [--dry-run] [--update-refs=(branches|head)] [--"
+"empty=(drop|keep|abort)]"
+msgstr ""
+"git history drop <tiomantas> [--dry-run] [--update-refs=(branches|head)] [--"
+"empty=(drop|keep|abort)]"
+
 msgid ""
 "git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--"
 "reedit-message] [--empty=(drop|keep|abort)]"
@@ -8288,6 +8518,10 @@ msgstr ""
 "línte a thosaíonn le '%s', agus cuirfidh teachtaireacht fholamh deireadh "
 "leis an tiomantas.\n"
 
+#, c-format
+msgid "could not write to '%s'"
+msgstr "ní fhéadfaí scríobh chuig '%s'"
+
 #, c-format
 msgid "Aborting commit as launching the editor failed.\n"
 msgstr ""
@@ -8406,6 +8640,10 @@ msgstr "theip ar athimirt sliocht"
 msgid "failed writing reworded commit"
 msgstr "theip ar scríobh an tiomnaithe athfhoclaithe"
 
+#, c-format
+msgid "unable to parse tree %s"
+msgstr "ní féidir an crann %s a pharsáil"
+
 msgid "unable to populate index with tree"
 msgstr "ní féidir an t-innéacs a líonadh le crann"
 
@@ -8439,6 +8677,31 @@ msgstr "tá an t-ordú ag súil le comité"
 msgid "cannot split up merge commit"
 msgstr "ní féidir an tiomantas cumasc a roinnt"
 
+msgid "cannot resolve HEAD commit"
+msgstr "ní féidir an tiomantas HEAD a réiteach"
+
+msgid "cannot resolve tree for HEAD"
+msgstr "ní féidir crann a réiteach do HEAD"
+
+msgid "how to handle descendants that become empty"
+msgstr "conas déileáil le sliochtghnéithe a éiríonn folamh"
+
+#, c-format
+msgid "cannot drop merge commit: %s"
+msgstr "ní féidir an tiomantas cumaisc a scriosadh: %s"
+
+msgid "dropping this commit would overwrite local changes; aborting"
+msgstr ""
+"scriosfadh an tiomantas seo athruithe áitiúla; ag cur deireadh leis an "
+"oibríocht"
+
+msgid "failed to update references"
+msgstr "theip ar nuashonrú na dtagairtí"
+
+#, c-format
+msgid "could not update working tree to new commit %s"
+msgstr "níorbh fhéidir an crann oibre a nuashonrú go dtí an tiomantas nua %s"
+
 msgid ""
 "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-"
 "stdin=<path>] [(-j|--jobs) <n>]\n"
@@ -8509,6 +8772,9 @@ msgstr "nár bhfuair sé réad ag súil leis %s"
 msgid "object %s: expected type %s, found %s"
 msgstr "réad %s: súil leis an gcineál %s, aimsíodh %s"
 
+msgid "Checking objects"
+msgstr "Rud a sheiceáil"
+
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
@@ -9548,6 +9814,10 @@ msgstr "níl réad '%s' ann"
 msgid "Could not write object file"
 msgstr "Ní fhéadfaí comhad réad a scríobh"
 
+#, c-format
+msgid "unknown option %s"
+msgstr "rogha anaithnid %s"
+
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "ní fhéadfaí réad '%s' a pháirseáil"
@@ -9984,6 +10254,10 @@ msgstr "git multi-pack-index [<options>] expire"
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 
+#, c-format
+msgid "object directory is not an alternate of the current repository: '%s'"
+msgstr "ní malairt den stór reatha é an t-eolaire réad: '%s'"
+
 msgid "directory"
 msgstr "eolaire"
 
@@ -10004,7 +10278,7 @@ msgid "checksum"
 msgstr "suim sheiceála"
 
 msgid "base MIDX for incremental writes"
-msgstr "MIDX bonn le haghaidh scríbhinní incriminteacha"
+msgstr "bunús MIDX le haghaidh scríobhanna incriminteacha"
 
 msgid "write a new incremental MIDX"
 msgstr "scríobh MIDX incrementach nua"
@@ -10109,6 +10383,12 @@ msgstr "foinsí iolracha don sprioc chéanna"
 msgid "destination directory does not exist"
 msgstr "níl eolaire ceann scríbe ann"
 
+msgid "destination is beyond a symbolic link"
+msgstr "tá an ceann scríbe níos faide ná nasc siombalach"
+
+msgid "destination is not a directory"
+msgstr "ní eolaire é an ceann scríbe"
+
 msgid "destination exists in the index"
 msgstr "ceann scríbe ann san innéacs"
 
@@ -10125,8 +10405,8 @@ msgid "Renaming %s to %s\n"
 msgstr "Athainmniú %s go %s\n"
 
 #, c-format
-msgid "renaming '%s' failed"
-msgstr "theip ar athainmniú '%s'"
+msgid "renaming '%s' to '%s' failed"
+msgstr "theip ar athainmniú '%s' go '%s'"
 
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<options>] <commit>..."
@@ -10740,9 +11020,21 @@ msgstr "ní féidir innéacs pacáiste a osc"
 msgid "loose object at %s could not be examined"
 msgstr "ní fhéadfaí réad scaoilte ag %s a scrúdú"
 
+#, c-format
+msgid "cannot read object for %s"
+msgstr "ní féidir réad a léamh do %s"
+
+#, c-format
+msgid "cannot map object %s to %s"
+msgstr "ní féidir réad %s a mhapáil go %s"
+
 msgid "unable to force loose object"
 msgstr "ní féidir fórsa réad scaoilte"
 
+#, c-format
+msgid "could not find commit %s"
+msgstr "ní raibh sé in ann teacht ar thiomantas %s"
+
 #, c-format
 msgid "not a rev '%s'"
 msgstr "ní rev '%s'"
@@ -10777,9 +11069,6 @@ msgstr "<version>[,<offset>]"
 msgid "write the pack index file in the specified idx format version"
 msgstr "scríobh an comhad innéacs pacáiste sa leagan formáid idx sonraithe"
 
-msgid "maximum size of each output pack file"
-msgstr "uasmhéid gach comhad pacáiste aschuir"
-
 msgid "ignore borrowed objects from alternate object store"
 msgstr "neamhaird a dhéanamh ar rudaí atá ar iasacht ó stór"
 
@@ -11375,6 +11664,14 @@ msgstr "luach neamhbhailí do '%s'"
 msgid "could not push to %s"
 msgstr "níorbh fhéidir brú chuig %s"
 
+#, c-format
+msgid "'%s' is not a valid push target"
+msgstr "ní sprioc bhailí brúite é '%s'"
+
+#, c-format
+msgid "Did you mean to use: git push %s %s?"
+msgstr "An raibh sé i gceist agat git push %s %s a úsáid?"
+
 msgid "repository"
 msgstr "stóras"
 
@@ -12211,11 +12508,32 @@ msgstr "git refs exists <ref>"
 msgid "git refs optimize "
 msgstr "git refs optimize "
 
-msgid "specify the reference format to convert to"
-msgstr "sonraigh an fhormáid tagartha le tiontú"
+msgid ""
+"git refs create [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value>"
+msgstr ""
+"git refs create [--message=<údar>] [--no-deref] [--create-reflog] <tagairt> "
+"<luach-nua>"
 
-msgid "perform a non-destructive dry-run"
-msgstr "rith tirim neamh-millteach a dhéanamh"
+msgid "git refs delete [--message=<reason>] [--no-deref] <ref> [<old-value>]"
+msgstr ""
+"git refs delete [--message=<údar>] [--no-deref] <tagairt> [<seanluach>]"
+
+msgid ""
+"git refs update [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value> [<old-value>]"
+msgstr ""
+"git refs update [--message=<údar>] [--no-deref] [--create-reflog] <tagairt> "
+"<luach-nua> [<seanluach>]"
+
+msgid "git refs rename [--message=<reason>] <old-ref> <new-ref>"
+msgstr "git refs rename [--message=<cúis>] <sean-tagairt> <tagairt-nua>"
+
+msgid "specify the reference format to convert to"
+msgstr "sonraigh an fhormáid tagartha le tiontú"
+
+msgid "perform a non-destructive dry-run"
+msgstr "rith tirim neamh-millteach a dhéanamh"
 
 msgid "drop reflogs entirely during the migration"
 msgstr "titim athfhóga go hiomlán le linn na himirce"
@@ -12245,6 +12563,62 @@ msgstr "níl tagairt ann"
 msgid "failed to look up reference"
 msgstr "theip ort tagairt a lorg suas"
 
+msgid "reason"
+msgstr "cúis"
+
+msgid "reason of the update"
+msgstr "cúis an nuashonraithe"
+
+msgid "update <refname> not the one it points to"
+msgstr "nuashon <refname>raigh ní an ceann a thugann sé in iúl"
+
+msgid "create a reflog"
+msgstr "cruthaigh reflog"
+
+msgid "create requires reference name and an object ID"
+msgstr "Teastaíonn ainm tagartha agus aitheantas réada le haghaidh 'create'"
+
+msgid "refusing to perform update with empty message"
+msgstr "ag diúltú don nuashonrú a dhéanamh le teachtaireacht fholamh"
+
+#, c-format
+msgid "invalid object ID: '%s'"
+msgstr "aitheantóir réada neamhbhailí: '%s'"
+
+msgid "cannot create reference with null new object ID"
+msgstr "ní féidir tagairt a chruthú le haitheantas réada nua atá ina neamhní"
+
+msgid "delete requires reference name and an optional old object ID"
+msgstr ""
+"teastaíonn ainm tagartha agus aitheantas sean-réada roghnach ón oibríocht "
+"scriosta"
+
+msgid "cannot delete reference with null old object ID"
+msgstr ""
+"ní féidir an tagairt a scriosadh nuair atá aitheantas an tsean-réada ina "
+"neamhní"
+
+msgid "update requires reference name, new value and an optional old value"
+msgstr ""
+"teastaíonn ainm tagartha, luach nua agus seanluach roghnach ón nuashonrú"
+
+msgid "rename requires old and new reference name"
+msgstr ""
+"teastaíonn an seanainm tagartha agus an t-ainm tagartha nua le haghaidh "
+"athainmnithe"
+
+#, c-format
+msgid "invalid ref format: '%s'"
+msgstr "formáid thagartha neamhbhailí: '%s'"
+
+#, c-format
+msgid "reference does not exist: '%s'"
+msgstr "níl an tagairt ann: '%s'"
+
+#, c-format
+msgid "reference already exists: '%s'"
+msgstr "tá an tagairt ann cheana féin: '%s'"
+
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -12722,11 +13096,13 @@ msgstr "a bheith inearálta; caithfear é a chur os comhair fo-ordú"
 msgid ""
 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]"
+"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]\n"
+"[--filter=<filter-spec>] [--drop-filtered [--dry-run]]"
 msgstr ""
 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]"
+"[--write-midx[=<modh>]] [--name-hash-version=<n>] [--path-walk]\n"
+"[--filter=<filter-spec>] [--drop-filtered [--dry-run]]"
 
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
@@ -12829,6 +13205,40 @@ msgstr "scríobh innéacs il-phacáiste de na pacáistí mar thoradh air"
 msgid "pack prefix to store a pack containing filtered out objects"
 msgstr "réimír pacáiste chun pacáiste ina bhfuil rudaí scagtha amach a stóráil"
 
+msgid "delete filtered out objects (requires --filter)"
+msgstr "scrios réada a scagadh amach (teastaíonn --filter)"
+
+msgid "only show which objects would be dropped"
+msgstr "ná taispeáin ach na réada a fhágfaí ar lár"
+
+msgid "--dry-run only takes effect with --drop-filtered"
+msgstr ""
+"ní bhíonn éifeacht ag --dry-run ach amháin i gcomhar le --drop-filtered"
+
+msgid "--drop-filtered requires --filter"
+msgstr "Éilíonn --drop-filtered --filter"
+
+msgid "--drop-filtered requires -a"
+msgstr "Éilíonn --drop-filtered -a"
+
+msgid "--drop-filtered only supports --filter=blob:limit=<n> for now"
+msgstr ""
+"ní thacaíonn --drop-filtered ach le --filter=blob:limit=<n> faoi láthair"
+
+msgid "--drop-filtered requires a promisor remote"
+msgstr "teastaíonn cianda gealltóra ó --drop-filtered"
+
+msgid ""
+"--drop-filtered cannot be used while another operation (merge, rebase, am, "
+"cherry-pick, revert, or bisect) is in progress"
+msgstr ""
+"Ní féidir --drop-filtered a úsáid fad is atá oibríocht eile (merge, rebase, "
+"am, cherry-pick, revert, nó bisect) ar siúl"
+
+#, c-format
+msgid "cannot drop '%s' (%s): it is referenced by the current index"
+msgstr "ní féidir '%s' (%s) a scriosadh: tá tagairt dó ag an innéacs reatha"
+
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "ní féidir pacáistí a scriosadh i repo rudaí luachmhara"
 
@@ -13038,11 +13448,11 @@ msgstr "luach neamhbhailí %s: '%s'"
 msgid ""
 "(EXPERIMENTAL!) git replay ([--contained] --onto=<newbase> | --"
 "advance=<branch> | --revert=<branch>)\n"
-"[--ref=<ref>] [--ref-action=<mode>] <revision-range>"
+"[--ref=<ref>] [--ref-action=<mode>] [--linearize] <revision-range>"
 msgstr ""
-"(TURGNAÍOCH!) athsheinm git ([--contained] --onto=<newbase> | --"
+"(TURGNAMHACH!) git replay ([--contained] --onto=<bonn nua> | --"
 "advance=<brainse> | --revert=<brainse>)\n"
-"[--ref=<ref>] [--ref-action=<mód>] <raon-athbhreithnithe>"
+"[--ref=<tagairt>] [--ref-action=<modh>] [--linearize] <raon-leasuithe>"
 
 msgid "update all branches that point at commits in <revision-range>"
 msgstr ""
@@ -13063,6 +13473,11 @@ msgstr "tagairt don nuashonrú le toradh"
 msgid "control ref update behavior (update|print)"
 msgstr "iompar nuashonraithe tag rialaithe (nuashonrú|priontáil)"
 
+msgid "drop merge commits, replaying only non-merge commits"
+msgstr ""
+"fág ar lár na tiomantais chumaisc, agus ná hathsheinn ach na tiomantais nach "
+"tiomantais chumaisc iad"
+
 msgid "exactly one of --onto, --advance, or --revert is required"
 msgstr ""
 "tá ceann amháin go díreach de --onto, --advance, nó --revert ag teastáil"
@@ -13075,6 +13490,12 @@ msgstr ""
 "cuirfear roinnt roghanna siúil rev a athshealbhú mar go gcuirfear giotán "
 "'%s' i 'struct rev_info' iallach"
 
+msgid "unable to get common directory"
+msgstr "ní féidir an eolaire coiteann a fháil"
+
+msgid "unable to get git directory"
+msgstr "ní féidir eolaire git a fháil"
+
 #, c-format
 msgid "key '%s' not found"
 msgstr "níor aimsíodh an eochair '%s'"
@@ -13294,6 +13715,9 @@ msgstr "Ní fhéadfaí comhad innéacs nua a scríobh."
 msgid "unable to get disk usage of %s"
 msgstr "ní féidir úsáid diosca %s a fháil"
 
+msgid "--missing-only requires --missing=print or --missing=print-info"
+msgstr "Éilíonn --missing-only --missing=print nó --missing=print-info"
+
 #, c-format
 msgid "invalid value for '%s': '%s', the only allowed format is '%s'"
 msgstr "luach neamhbhailí do '%s': '%s', is é '%s' an t-aon fhormáid ceadaithe"
@@ -14955,12 +15379,6 @@ msgstr "aschur tagairt a ghiorrú"
 msgid "recursively dereference (default)"
 msgstr "dereference athshlánach (réamhshocraithe)"
 
-msgid "reason"
-msgstr "cúis"
-
-msgid "reason of the update"
-msgstr "cúis an nuashonraithe"
-
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
 "        [(--trailer <token>[(=|:)<value>])...]\n"
@@ -15080,9 +15498,6 @@ msgstr "bain úsáid as eochair eile chun an chlib a shíniú"
 msgid "replace the tag if exists"
 msgstr "athsholáthar an chlib má tá sé ann"
 
-msgid "create a reflog"
-msgstr "cruthaigh reflog"
-
 msgid "Tag listing options"
 msgstr "Roghanna liostaithe clibeanna"
 
@@ -15363,9 +15778,6 @@ msgstr "git update-ref [<options>] --stdin [-z] [--batch-updates]"
 msgid "delete the reference"
 msgstr "scrios an tagairt"
 
-msgid "update <refname> not the one it points to"
-msgstr "nuashon <refname>raigh ní an ceann a thugann sé in iúl"
-
 msgid "stdin has NUL-terminated arguments"
 msgstr "tá argóintí ag foirceannadh NUL ag stdin"
 
@@ -15584,6 +15996,24 @@ msgstr ""
 "láthair, ag stopadh; bain úsáid as 'add -f' chun iargúlta a shárú nó a fháil "
 "ar dtús"
 
+#, c-format
+msgid ""
+"If you meant to create a worktree from a remote tracking branch on\n"
+"<remote>, you can do so by:\n"
+"\n"
+"    git worktree add -b %s %s <remote>/%s\n"
+"\n"
+"If you'd like to always prefer some remote, e.g. 'origin',\n"
+"consider setting checkout.defaultRemote=origin in your config."
+msgstr ""
+"Más é an rún agat 'worktree' a chruthú ó bhrainse rianaithe cianda ar\n"
+"<remote>, is féidir leat é sin a dhéanamh mar seo:\n"
+"\n"
+"    git worktree add -b %s %s <remote>/%s\n"
+"\n"
+"Más fearr leat i gcónaí cianda áirithe a úsáid, e.g. 'origin',\n"
+"smaoinigh ar checkout.defaultRemote=origin a shocrú i do chumraíocht."
+
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "seiceáil <branch>fiú má tá sé seiceáilte cheana féin i gcrann oibre eile"
@@ -15797,6 +16227,10 @@ msgstr "theip ar an mbeartán a íoslódáil ó URI '%s'"
 msgid "file at URI '%s' is not a bundle or bundle list"
 msgstr "comhad ag URI ní beacán nó liosta beartán é '%s'"
 
+#, c-format
+msgid "config '%s' has no value"
+msgstr "níl aon luach ag an gcumraíocht '%s'"
+
 #, c-format
 msgid "bundle-uri: unexpected argument: '%s'"
 msgstr "bundle-uri: argóint gan choinne: '%s'"
@@ -16163,8 +16597,8 @@ msgstr "Cruthaigh stór Git folamh nó déan ceann atá ann cheana a athionsú"
 msgid "Instantly browse your working repository in gitweb"
 msgstr "Brabhsáil láithreach do stór oibre i gitweb"
 
-msgid "Add or parse structured information in commit messages"
-msgstr "Cuir nó déan faisnéis struchtúrtha i dteachtaireachtaí tiomanta"
+msgid "Add or parse metadata in commit messages"
+msgstr "Cuir meiteashonraí le teachtaireachtaí tiomanta nó déan iad a pharsáil"
 
 msgid "EXPERIMENTAL: Show when files were last modified"
 msgstr ""
@@ -16443,6 +16877,9 @@ msgstr "Ainmneacha úsáideora agus pasfhocail a sholáthar do"
 msgid "Git for CVS users"
 msgstr "Git d'úsáideoirí CVS"
 
+msgid "Git's core data model"
+msgstr "Bunmhúnla sonraí Git"
+
 msgid "Tweaking diff output"
 msgstr "Aschur difriúil a athrú"
 
@@ -16623,10 +17060,6 @@ msgstr "ní féidir gach comhad commit-graph a aimsiú"
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "post tiomanta neamhbhailí. Is dócha go bhfuil graf coimite truaillithe"
 
-#, c-format
-msgid "could not find commit %s"
-msgstr "ní raibh sé in ann teacht ar thiomantas %s"
-
 msgid "commit-graph requires overflow generation data but has none"
 msgstr "teastaíonn sonraí giniúna ró-shreabhadh ach níl aon cheann acu"
 
@@ -16799,6 +17232,12 @@ msgstr "Gealltanna a fhíorú i ngraf tiomanta"
 msgid "could not parse commit %s"
 msgstr "ní fhéadfaí a pharsáil a dhéanamh ar thiomantas %s"
 
+msgid "commit ancestry contains a cycle"
+msgstr "tá timthriall i sinsearacht tiomanta"
+
+msgid "failed to check reachability"
+msgstr "theip ar sheiceáil na hinrochtanachta"
+
 #, c-format
 msgid "object %s is a %s, not a %s"
 msgstr "is %s é réad %s, ní %s"
@@ -17426,6 +17865,14 @@ msgstr "freagra neamhbhailí ls-refs: %s"
 msgid "expected flush after ref listing"
 msgstr "súil le sruth tar éis liostú tagartha"
 
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "halgartaim míchomhoiriúnach: cliant %s; freastalaí %s"
+
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "ní thacaíonn an freastalaí algartam '%s'"
+
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "ní féidir SO_KEEPALIVE a shocrú ar an soicéad"
 
@@ -17756,9 +18203,6 @@ msgstr "ní raibh in ann eolaire '%s' a oscailt"
 msgid "skipping '%s', which is neither file nor directory"
 msgstr "ag scipeáil '%s', nach comhad ná eolaire"
 
-msgid "could not duplicate stdout"
-msgstr "ní fhéadfaí stdout a dhúbailt"
-
 #, c-format
 msgid "could not add directory '%s' to archiver"
 msgstr "ní fhéadfaí eolaire '%s' a chur leis an gcartlann"
@@ -18126,11 +18570,11 @@ msgid "continue listing the history of a file beyond renames"
 msgstr "leanúint ar aghaidh ag liostáil stair chomhaid thar athainmneacha"
 
 msgid ""
-"prevent rename/copy detection if the number of rename/copy targets exceeds "
-"given limit"
+"limit to cheap rename/copy detection if the number of rename/copy targets "
+"exceeds this value"
 msgstr ""
-"cosc a chur ar athainmniú/braite cóipeála má sháraíonn líon na spriocanna "
-"athainmniúcháin/cóipeála"
+"cuir teorainn leis an mbrath saor ar athainmniú/cóipeáil má sháraíonn líon "
+"na spriocanna athainmnithe/cóipeála an luach seo"
 
 msgid "Diff algorithm options"
 msgstr "Roghanna algartam Diff"
@@ -18378,10 +18822,6 @@ msgstr "ní fhéadfaí eolaire git a aistriú ó '%s' go '%s'"
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "leid: Ag fanacht go ndúnfaidh d'eagarthóir an comhad... %c"
 
-#, c-format
-msgid "could not write to '%s'"
-msgstr "ní fhéadfaí scríobh chuig '%s'"
-
 #, c-format
 msgid "could not edit '%s'"
 msgstr "ní fhéadfaí '%s' a chur in eagar"
@@ -18450,6 +18890,52 @@ msgstr ""
 msgid "too many args to run %s"
 msgstr "an iomarca args chun %s a rith"
 
+msgid "unable to write request to remote"
+msgstr "ní féidir iarratas a scríobh chuig an iargúlta"
+
+msgid "object-info capability is not enabled on the server"
+msgstr "Níl an cumas object-info cumasaithe ar an bhfreastalaí"
+
+msgid "object-info requires protocol v2"
+msgstr "teastaíonn prótacal v2 ó object-info"
+
+#, c-format
+msgid "object-info: expected %<PRIuMAX> attributes, got %<PRIuMAX>"
+msgstr ""
+"object-info: bhíothas ag súil le %<PRIuMAX> tréith, ach fuarthas %<PRIuMAX>"
+
+msgid "object-info: unrequested 'size' attribute"
+msgstr "object-info: tréith 'size' nár iarradh"
+
+msgid "object-info: duplicate 'size' attribute"
+msgstr "object-info: tréith 'size' dhúbláilte"
+
+msgid "object-info: unrequested 'type' attribute"
+msgstr "object-info: tréith 'type' nár iarradh"
+
+msgid "object-info: duplicate 'type' attribute"
+msgstr "object-info: tréith 'type' dhúbláilte"
+
+#, c-format
+msgid "object-info: unknown attribute '%s'"
+msgstr "object-info: tréith anaithnid '%s'"
+
+#, c-format
+msgid "object-info: expected %<PRIuMAX> objects, got %<PRIuMAX>"
+msgstr "object-info: súilíodh %<PRIuMAX> réad, fuarthas %<PRIuMAX>"
+
+#, c-format
+msgid "object-info: expected OID: %s, got %s"
+msgstr "object-info: OID a rabhthas ag súil leis: %s, fuarthas: %s"
+
+#, c-format
+msgid "object-info: object %s has invalid type '%s'"
+msgstr "object-info: tá cineál neamhbhailí '%s' ag an réad %s"
+
+#, c-format
+msgid "object-info: expected flush after %<PRIuMAX> objects"
+msgstr "object-info: súil le sruthlú tar éis %<PRIuMAX> réad"
+
 #, c-format
 msgid ""
 "You are attempting to fetch %s, which is in the commit graph file but not in "
@@ -18580,20 +19066,9 @@ msgstr "gan aon gealltanais choiteann"
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: theip ar fáil."
 
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr "halgartaim míchomhoiriúnach: cliant %s; freastalaí %s"
-
-#, c-format
-msgid "the server does not support algorithm '%s'"
-msgstr "ní thacaíonn an freastalaí algartam '%s'"
-
 msgid "Server does not support shallow requests"
 msgstr "Ní thacaíonn an freastalaí le hiarratais"
 
-msgid "unable to write request to remote"
-msgstr "ní féidir iarratas a scríobh chuig an iargúlta"
-
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "bhíothas ag súil le '%s', fuarthas '%s'"
@@ -18752,6 +19227,10 @@ msgstr "-c ag súil le teaghrán cumraíochta\n"
 msgid "no config key given for --config-env\n"
 msgstr "níl aon eochair chumraithe tugtha do --config-env\n"
 
+#, c-format
+msgid "no file given for '%s' option\n"
+msgstr "níor soláthraíodh aon chomhad don rogha '%s'\n"
+
 #, c-format
 msgid "no attribute source given for --attr-source\n"
 msgstr "níor tugadh foinse tréith do --attr-source\n"
@@ -19283,9 +19762,12 @@ msgstr "ainm ident folamh (le haghaidh <%s>) nach gceadaítear"
 msgid "name consists only of disallowed characters: %s"
 msgstr "ní chuimsíonn ainm ach carachtair neamh-cheadaithe: %s"
 
-msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+msgid ""
+"git imap-send [-v] [-q] [--[no-]curl] [--[no-]draft] [(--folder|-f) "
+"<folder>] < <mbox>"
 msgstr ""
-"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+"git imap-send [-v] [-q] [--[no-]curl] [--[no-]draft] [(--folder|-f) "
+"<folder>] < <mbox>"
 
 msgid "no IMAP host specified"
 msgstr "níor sonraíodh aon óstach IMAP"
@@ -19358,6 +19840,9 @@ msgstr "ní féidir rochtain a fháil ar an blob tana i '%s'"
 msgid "unable to parse sparse filter data in %s"
 msgstr "ní féidir sonraí scagaire tanaí a pharsáil i %s"
 
+msgid "filter_oidset: only blob:limit filters are supported"
+msgstr "filter_oidset: ní thacaítear ach le scagairí blob:limit"
+
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
 msgstr "tá modh crann ag iontráil '%s' i gcrann %s, ach ní crann í"
@@ -19447,6 +19932,10 @@ msgstr "méid marcóra neamhbhailí '%s', ag súil le sláimhir"
 msgid "Could not parse object '%s'"
 msgstr "Ní fhéadfaí réad '%s' a pháirseáil"
 
+#, c-format
+msgid "tree has duplicate entries for '%s'"
+msgstr "tá iontrálacha dúblacha ag an gcrann le haghaidh '%s'"
+
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "Theip ar fho-mhodúl %s a chumasc (níor seiceáiltear amach)"
@@ -20057,55 +20546,6 @@ msgstr "ní féidir cead a shocrú go '%s'"
 msgid "core.fsyncMethod = batch is unsupported on this platform"
 msgstr "core.fsyncMethod = ní thacaítear leis an bhaisc ar an ardán seo"
 
-msgid "error when closing loose object file"
-msgstr "earráid agus comhad réad scaoilte á ndú"
-
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr "cead neamhleor chun réad a chur le bunachar sonraí stórais %s"
-
-msgid "unable to create temporary file"
-msgstr "ní féidir comhad sealadach a chruthú"
-
-msgid "unable to write loose object file"
-msgstr "ní féidir comhad réada scaoilte a scríobh"
-
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "ní féidir an réad nua %s (%d) a dhíbhoilsciú."
-
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "theip ar deflateEnd ar réad %s (%d)"
-
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "mearbhall de bharr sonraí foinse réada éagobhsaí do %s"
-
-#, c-format
-msgid "write stream object %<PRIuMAX> != %<PRIuMAX>"
-msgstr "scríobh réad srutha %<PRIuMAX> != %<PRIuMAX>"
-
-#, c-format
-msgid "unable to stream deflate new object (%d)"
-msgstr "ní féidir sruthú díbhoilsciú réad nua (%d)"
-
-#, c-format
-msgid "deflateEnd on stream object failed (%d)"
-msgstr "theip ar réad srutha DeflateEnd (%d)"
-
-#, c-format
-msgid "unable to create directory %s"
-msgstr "ní féidir eolaire %s a chruthú"
-
-#, c-format
-msgid "cannot read object for %s"
-msgstr "ní féidir réad a léamh do %s"
-
-#, c-format
-msgid "cannot map object %s to %s"
-msgstr "ní féidir réad %s a mhapáil go %s"
-
 #, c-format
 msgid "object fails fsck: %s"
 msgstr "teipeann ar réad fsck: %s"
@@ -20156,6 +20596,9 @@ msgstr "ní féidir cineál a pharsáil ó cheanntásc '%s' de %s"
 msgid "unable to unpack contents of %s"
 msgstr "ní féidir ábhar %s a dhíphacáil"
 
+msgid "unable to migrate temporary objects"
+msgstr "ní féidir réada sealadacha a aistriú"
+
 #. TRANSLATORS: This is a line of ambiguous object
 #. output shown when we cannot look up or parse the
 #. object in question. E.g. "deadbeef [bad object]".
@@ -20377,8 +20820,8 @@ msgid "replacement %s not found for %s"
 msgstr "nach bhfuarthas %s a athsholáthar do %s"
 
 #, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "tá réad pacáilte %s (stóráilte i %s) truaillithe"
+msgid "object %s is corrupt"
+msgstr "tá an réad %s truaillithe"
 
 #, c-format
 msgid "missing mapping of %s to %s"
@@ -20392,6 +20835,9 @@ msgstr "Ní réad bailí é %s"
 msgid "%s is not a valid '%s' object"
 msgstr "Ní réad bailí '%s' é %s '"
 
+msgid "primary object source does not support generating packfiles"
+msgstr "ní thacaíonn an fhoinse réad bunúsach le giniúint comhad pacáiste"
+
 msgid "unable to fdopen alternates lockfile"
 msgstr "ní féidir comhad glasála malartacha fdopen a úsáid"
 
@@ -20401,6 +20847,22 @@ msgstr "ní féidir comhad malartach a léamh"
 msgid "unable to move new alternates file into place"
 msgstr "ní féidir comhad malartach nua a bhogadh ina áit"
 
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+"Tá an iomarca rudaí scaoilte neamh-inrochtana ann; reáchtáil 'git prune' "
+"chun iad a bhaint."
+
+#, c-format
+msgid "pack-objects died of signal %d"
+msgstr "fuair pack-objects bás de chomhartha %d"
+
+msgid "could not spawn pack-objects"
+msgstr "níorbh fhéidir 'pack-objects' a sheoladh"
+
+msgid "error writing to pack-objects"
+msgstr "earráid agus á scríobh chuig pack-objects"
+
 #, c-format
 msgid "unable to open loose object %s"
 msgstr "ní féidir réad scaoilte %s a oscailt"
@@ -20424,6 +20886,89 @@ msgstr "ceannteideal do %s rófhada, níos mó ná %d bearta"
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "tá réad scaoilte %s (stóráilte i %s) truaillithe"
 
+msgid "error when closing loose object file"
+msgstr "earráid agus comhad réad scaoilte á ndú"
+
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr "cead neamhleor chun réad a chur le bunachar sonraí stórais %s"
+
+msgid "unable to create temporary file"
+msgstr "ní féidir comhad sealadach a chruthú"
+
+msgid "unable to write loose object file"
+msgstr "ní féidir comhad réada scaoilte a scríobh"
+
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "ní féidir an réad nua %s (%d) a dhíbhoilsciú."
+
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "theip ar deflateEnd ar réad %s (%d)"
+
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "mearbhall de bharr sonraí foinse réada éagobhsaí do %s"
+
+#, c-format
+msgid "write stream object %<PRIuMAX> != %<PRIuMAX>"
+msgstr "scríobh réad srutha %<PRIuMAX> != %<PRIuMAX>"
+
+#, c-format
+msgid "unable to stream deflate new object (%d)"
+msgstr "ní féidir sruthú díbhoilsciú réad nua (%d)"
+
+#, c-format
+msgid "deflateEnd on stream object failed (%d)"
+msgstr "theip ar réad srutha DeflateEnd (%d)"
+
+#, c-format
+msgid "unable to create directory %s"
+msgstr "ní féidir eolaire %s a chruthú"
+
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: míchomhoiriúnú hash-path, le fáil ag: %s"
+
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s: réad truaillithe nó ar iarraidh: %s"
+
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "comhad sha1 olc: %s"
+
+msgid "Checking object directory"
+msgstr "Seiceáil eolaire réada"
+
+msgid "Checking object directories"
+msgstr "Seiceáil eolairí réada"
+
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "tá réad pacáilte %s (stóráilte i %s) truaillithe"
+
+#, c-format
+msgid "unable to load rev-index for pack '%s'"
+msgstr "ní féidir innéacs athbhreithnithe a luchtú don phacáiste '%s'"
+
+#, c-format
+msgid "invalid rev-index for pack '%s'"
+msgstr "innéacs rev-neamhbhailí do phacáiste '%s'"
+
+msgid "object database transaction already pending"
+msgstr "idirbheart bunachair sonraí réad atá ar feitheamh cheana féin"
+
+msgid "failed to start ODB transaction"
+msgstr "theip ar thús idirbhirt ODB"
+
+msgid "failed to commit ODB transaction"
+msgstr "theip ar an idirbheart ODB a dheimhniú"
+
+msgid "failed to finalize ODB transaction"
+msgstr "theip ar thabhairt críche do idirbheart ODB"
+
 #, c-format
 msgid "duplicate entry when writing bitmap index: %s"
 msgstr "iontráil dúblach agus innéacs bitmap á scríobh: %s"
@@ -20501,6 +21046,9 @@ msgstr "tá an t-innéacs droim riachtanach in easnamh ilphacáiste"
 msgid "could not open pack %s"
 msgstr "ní fhéadfaí pacáiste %s a oscailt"
 
+msgid "could not open bitmap for base MIDX"
+msgstr "níorbh fhéidir an mapa giotán don bhun-MIDX a oscailt"
+
 msgid "corrupt bitmap lookup table: triplet position out of index"
 msgstr "tábla cuardaigh bitmap truaillithe: suíomh triplet as innéacs"
 
@@ -21065,6 +21613,53 @@ msgstr "ní fhéadfaí %s a fháil ó iargúlta gealltanach"
 msgid "unsupported field '%s' in '%s' config"
 msgstr "réimse neamhthacaithe '%s' i gcumraíocht '%s'"
 
+#, c-format
+msgid ""
+"invalid remote name '%s' before '=' sign in '%s' from promisor."
+"acceptFromServerUrl config"
+msgstr ""
+"ainm cianda neamhbhailí '%s' roimh an gcomhartha '=' in '%s' ón gcumraíocht "
+"promisor.acceptFromServerUrl"
+
+#, c-format
+msgid ""
+"invalid url pattern '%s' in '%s' from promisor.acceptFromServerUrl config"
+msgstr ""
+"patrún URL neamhbhailí '%s' in '%s' ó chumraíocht promisor."
+"acceptFromServerUrl"
+
+#, c-format
+msgid ""
+"couldn't generate a valid remote name from advertised url '%s', ignoring "
+"this remote"
+msgstr ""
+"níorbh fhéidir ainm bailí cianda a ghiniúint ón URL fógartha '%s'; ag "
+"déanamh neamhaird den cheangal cianda seo"
+
+#, c-format
+msgid ""
+"generated remote name '%s' from advertised url '%s' is invalid, ignoring "
+"this remote"
+msgstr ""
+"tá an t-ainm cianda '%s', a gineadh ón URL fógartha '%s', neamhbhailí; á "
+"neamhaird a dhéanamh den chianda seo"
+
+#, c-format
+msgid "couldn't normalize advertised url '%s', ignoring this remote"
+msgstr ""
+"níorbh fhéidir an URL fógartha '%s' a normalú; ag déanamh neamhaird den "
+"chianda seo"
+
+#, c-format
+msgid "Auto-creating promisor remote '%s' for URL '%s'\n"
+msgstr "Á chruthú go huathoibríoch cianda gealltóra '%s' don URL '%s'\n"
+
+#, c-format
+msgid "too many remotes accepted with name like '%s-X', ignoring this remote"
+msgstr ""
+"glacadh le an iomarca ciandaí a bhfuil ainm acu ar nós '%s-X'; á neamhaird a "
+"dhéanamh den chianda seo"
+
 #, c-format
 msgid ""
 "known remote named '%s' but with URL '%s' instead of '%s', ignoring this "
@@ -21228,6 +21823,10 @@ msgstr "tip cruft bhreise neamhbhailí: '%s'"
 msgid "unable to enumerate additional recent objects"
 msgstr "ní féidir réada breise le déanaí a liostú"
 
+#, c-format
+msgid "remove '%s'\n"
+msgstr "bain '%s'\n"
+
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr ""
@@ -21385,10 +21984,6 @@ msgstr ""
 msgid "unexpected diff status %c"
 msgstr "stádas diff gan choinne %c"
 
-#, c-format
-msgid "remove '%s'\n"
-msgstr "bain '%s'\n"
-
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
 "continue'.\n"
@@ -22420,6 +23015,11 @@ msgstr[2] ""
 "Tá do bhrainse taobh thiar de '%s' faoi %d tiomnuithe, agus is féidir é a "
 "luasghéarú ar aghaidh.\n"
 
+#, c-format
+msgid "  (use \"git pull %s %s\" to update your local branch)\n"
+msgstr ""
+"  (bain úsáid as \"git pull %s %s\" chun do bhrainse áitiúil a nuashonrú)\n"
+
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr " (bain úsáid as “git pull” chun do bhrainse áitiúil a nuashonrú)\n"
 
@@ -22440,6 +23040,14 @@ msgstr[2] ""
 "Tá do bhrainse agus '%s' scartha óna chéile,\n"
 "agus tá %d agus %d tiomnuithe difriúla acu faoi seach.\n"
 
+#, c-format
+msgid ""
+"  (use \"git pull %s %s\" if you want to integrate the remote branch with "
+"yours)\n"
+msgstr ""
+"  (bain úsáid as \"git pull %s %s\" más mian leat an brainse cianda a "
+"chomhtháthú le do bhrainse féin)\n"
+
 msgid ""
 "  (use \"git pull\" if you want to integrate the remote branch with yours)\n"
 msgstr ""
@@ -22565,6 +23173,10 @@ msgstr "doimhneacht ró-ard a chur in ionad do réad %s"
 msgid "'%s' is not a valid commit-ish for %s"
 msgstr "Ní comhartha bailí commit-ish é '%s' do %s"
 
+#, c-format
+msgid "'%s' does not point to a commit for %s"
+msgstr "ní dhíríonn '%s' ar thiomantas do %s"
+
 #, c-format
 msgid "argument to %s must be a reference"
 msgstr "ní mór don argóint chuig %s a bheith ina thagairt"
@@ -22583,10 +23195,17 @@ msgstr "teastaíonn roinnt gealltanais chun athsheinm"
 msgid "all positive revisions given must be references"
 msgstr "caithfidh gach athbhreithniú dearfach a thugtar a bheith ina"
 
+#, c-format
+msgid "merge of %s onto %s failed"
+msgstr "theip ar chumasc %s isteach i %s"
+
 #, c-format
 msgid "commit %s became empty after replay"
 msgstr "d’éirigh an tiomantas %s folamh tar éis athsheinm"
 
+msgid "'--linearize' cannot be used with multiple branches"
+msgstr "ní féidir '--linearize' a úsáid le brainsí iomadúla"
+
 msgid "'--ref' cannot be used with multiple revision ranges"
 msgstr "Ní féidir '--ref' a úsáid le raonta athbhreithnithe iolracha"
 
@@ -23675,6 +24294,11 @@ msgstr ""
 "déanaí trí\n"
 "\"git stash pop\" a rith.\n"
 
+msgid "could not apply autostash; your changes are safe in the stash"
+msgstr ""
+"níorbh fhéidir autostash a chur i bhfeidhm; tá do chuid athruithe sábháilte "
+"sa stóras sealadach (stash)"
+
 #, c-format
 msgid ""
 "Autostash exists; creating a new stash entry.\n"
@@ -23902,8 +24526,8 @@ msgid "no path in gitfile: %s"
 msgstr "gan aon chosán i gitfile: %s"
 
 #, c-format
-msgid "not a git repository: %s"
-msgstr "ní stór git: %s"
+msgid "gitfile does not point to a valid repository: %s"
+msgstr "ní dhíríonn gitfile ar stór bailí: %s"
 
 #, c-format
 msgid "'$%s' too big"
@@ -24025,6 +24649,9 @@ msgstr "ainm brainse tosaigh neamhbhailí: '%s'"
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "ath-init: neamhaird a dhéanamh ar --initial-branch=%s"
 
+msgid "failed creating object database"
+msgstr "theip ar chruthú na bunachair sonraí réad"
+
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "ní féidir cineál comhaid %d a láimhseáil"
@@ -24568,6 +25195,9 @@ msgstr "Dúirt %s gan choinne: '%s'"
 msgid "%s also locked %s"
 msgstr "Glas %s freisin %s"
 
+msgid "could not dup helper output fd"
+msgstr "níorbh fhéidir an fd aschuir cúntóra a dhúbláil"
+
 msgid "couldn't run fast-import"
 msgstr "ní raibh in ann allmhairiú tapa a reá"
 
@@ -24647,6 +25277,10 @@ msgstr "ní raibh sé in ann onnmhairiú tapa a"
 msgid "error while running fast-export"
 msgstr "earráid agus easpórtáil tapa á rith"
 
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "níorbh fhéidir '%s' a athainmniú go '%s'"
+
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -24714,6 +25348,9 @@ msgstr ""
 msgid "server options require protocol version 2 or later"
 msgstr "teastaíonn leagan prótacal 2 nó níos déanaí ó roghanna"
 
+msgid "remote does not support object-info"
+msgstr "ní thacaíonn an cianda le object-info"
+
 msgid "server does not support wait-for-done"
 msgstr "ní thacaíonn freastalaí le fanacht le déanamh"
 
@@ -25076,32 +25713,34 @@ msgid "warning: "
 msgstr "rabhadh: "
 
 #, c-format
-msgid "'%s' is nominated for removal.\n"
-msgstr "Tá '%s' ainmnithe le haghaidh bainte.\n"
+msgid "'%s' will be removed soon.\n"
+msgstr "Bainfear '%s' go luath.\n"
 
 #, c-format
 msgid ""
-"If you still use this command, here's what you can do:\n"
+"If you need a replacement:\n"
+"\n"
+"- Read https://git-scm.com/docs/BreakingChanges.html.\n"
+"\n"
+"- Check what others on the mailing list suggest as a replacement:\n"
+"  https://lore.kernel.org/git/?q=%s\n"
 "\n"
-"- read https://git-scm.com/docs/BreakingChanges.html\n"
-"- check if anyone has discussed this on the mailing\n"
-"  list and if they came up with something that can\n"
-"  help you: https://lore.kernel.org/git/?q=%s\n"
-"- send an email to <git@vger.kernel.org> to let us\n"
-"  know that you still use this command and were unable\n"
-"  to determine a suitable replacement\n"
+"- Send an email to <git@vger.kernel.org> asking for help, only if\n"
+"  suggestions by others do not work for you.\n"
 "\n"
 msgstr ""
-"Más rud é go bhfuil an t-ordú seo in úsáid agat fós, seo an méid is féidir "
-"leat a dhéanamh:\n"
+"Má theastaíonn ionadach uait:\n"
+"\n"
+"- Léigh https://git-scm.com/docs/BreakingChanges.html.\n"
+"\n"
+"- Féach cad a mholann daoine eile ar an liosta seoltaí mar ionadach:\n"
+"  https://lore.kernel.org/git/?q=%s\n"
+"\n"
+"- Seol ríomhphost chuig <git@vger.kernel.org> ag lorg cabhrach, ach amháin "
+"mura\n"
+"  n-oibríonn na moltaí ó dhaoine eile duit.\n"
+"\n"
 "\n"
-"- léigh https://git-scm.com/docs/BreakingChanges.html\n"
-"- seiceáil an bhfuil aon duine tar éis plé a dhéanamh ar an méid seo ar an "
-"liosta poist agus an bhfuil rud éigin acu a d'fhéadfadh cabhrú leat: https://"
-"lore.kernel.org/git/?q=%s\n"
-"- seol ríomhphost chuig <git@vger.kernel.org> chun a chur in iúl dúinn go "
-"bhfuil tú fós ag úsáid an ordaithe seo agus nár éirigh leat ceann eile "
-"oiriúnach a aimsiú\n"
 
 msgid "refusing to run without --i-still-use-this"
 msgstr "ag diúltú rith gan --i-still-use-this fós"
@@ -25873,8 +26512,8 @@ msgstr ""
 "\n"
 
 #, perl-format
-msgid "No subject line in %s?"
-msgstr "Níl aon líne ábhair i %s?"
+msgid "No 'Subject:' line in '%s'\n"
+msgstr "Gan líne 'Ábhar:' i '%s'\n"
 
 #, perl-format
 msgid "Failed to open for writing %s: %s"
@@ -26131,9 +26770,3 @@ msgstr "Ag scipeáil %s leis an iarmhír chúltaca '%s'.\n"
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "An bhfuil tú ag iarraidh %s a sheoladh i ndáiríre? [y|N]: "
-
-#, c-format
-
-
-
-#, c-format

From 2e3e58a51d9e5b8356f9eede3e8b5f2b962a97bf Mon Sep 17 00:00:00 2001
From: lilydjwg <lilydjwg@gmail.com>
Date: Fri, 11 Sep 2026 18:49:26 +0800
Subject: [PATCH 012/247] l10n: zh_CN: updated translation for 2.56

Signed-off-by: lilydjwg <lilydjwg@gmail.com>
---
 po/zh_CN.po | 1321 +++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 1030 insertions(+), 291 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9baf2bf7a6374a..c6beb01edebc68 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -176,7 +176,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2026-06-19 14:43+0800\n"
+"POT-Creation-Date: 2026-09-16 23:08+0800\n"
 "PO-Revision-Date: 2025-11-16 01:03+0800\n"
 "Last-Translator: Teng Long <dyroneteng@gmail.com>\n"
 "Language-Team: GitHub <https://github.com/dyrone/git/>\n"
@@ -1145,9 +1145,9 @@ msgstr "未能识别的空白字符选项 '%s'"
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "未能识别的空白字符忽略选项 '%s'"
 
-#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c
-#: builtin/checkout.c builtin/clean.c builtin/clone.c builtin/commit.c
-#: builtin/describe.c builtin/diff-tree.c builtin/difftool.c
+#: apply.c archive.c builtin/add.c builtin/bisect.c builtin/branch.c
+#: builtin/checkout-index.c builtin/checkout.c builtin/clean.c builtin/clone.c
+#: builtin/commit.c builtin/describe.c builtin/diff-tree.c builtin/difftool.c
 #: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c
 #: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c
 #: builtin/merge-tree.c builtin/merge.c builtin/rebase.c builtin/repack.c
@@ -1491,7 +1491,7 @@ msgstr "%s：错误类型"
 msgid "%s has type %o, expected %o"
 msgstr "%s 的类型是 %o，应为 %o"
 
-#: apply.c builtin/fast-import.c read-cache.c
+#: apply.c builtin/fast-import.c builtin/worktree.c read-cache.c
 #, c-format
 msgid "invalid path '%s'"
 msgstr "无效路径 '%s'"
@@ -1940,7 +1940,7 @@ msgstr "缺失冒号：'%s'"
 msgid "empty file name: '%s'"
 msgstr "空的文件名：'%s'"
 
-#: archive.c
+#: archive.c builtin/fast-import.c
 msgid "fmt"
 msgstr "格式"
 
@@ -1957,8 +1957,9 @@ msgid "prepend prefix to each pathname in the archive"
 msgstr "为归档中每个路径名加上前缀"
 
 #: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c
-#: builtin/fast-export.c builtin/gc.c builtin/grep.c builtin/hash-object.c
-#: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h
+#: builtin/fast-export.c builtin/fast-import.c builtin/gc.c builtin/grep.c
+#: builtin/hash-object.c builtin/ls-files.c builtin/notes.c builtin/read-tree.c
+#: parse-options.h
 msgid "file"
 msgstr "文件"
 
@@ -2196,6 +2197,16 @@ msgstr "无法对对象 '%s' 启动 'show'"
 msgid "could not read file '%s'"
 msgstr "无法读取文件 '%s'"
 
+#: bisect.c
+#, c-format
+msgid "could not read bad term from file '%s'"
+msgstr "无法从文件 '%s' 读取坏术语"
+
+#: bisect.c
+#, c-format
+msgid "could not read good term from file '%s'"
+msgstr "无法从文件 '%s' 读取好术语"
+
 #: bisect.c
 msgid "reading bisect refs failed"
 msgstr "读取二分查找引用失败"
@@ -2452,7 +2463,7 @@ msgstr "无法 chmod %cx '%s'"
 msgid "Unstaged changes after refreshing the index:"
 msgstr "刷新索引之后尚未被暂存的变更："
 
-#: builtin/add.c
+#: builtin/add.c builtin/repack.c
 msgid "could not read the index"
 msgstr "无法读取索引"
 
@@ -2469,6 +2480,14 @@ msgstr "无法对 '%s' 调用 stat"
 msgid "empty patch. aborted"
 msgstr "空补丁。已中止"
 
+#: builtin/add.c
+msgid "could not initialize apply state"
+msgstr "无法初始化应用状态"
+
+#: builtin/add.c
+msgid "could not check apply state"
+msgstr "无法检查应用状态"
+
 #: builtin/add.c
 #, c-format
 msgid "could not apply '%s'"
@@ -2518,6 +2537,10 @@ msgstr "更新已跟踪的文件"
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "对已跟踪文件（暗含 -u）重新归一换行符"
 
+#: builtin/add.c
+msgid "add conflict-resolved tracked files"
+msgstr "添加已解决冲突的已跟踪文件"
+
 #: builtin/add.c
 msgid "record only the fact that the path will be added later"
 msgstr "只记录该路径稍后将被添加"
@@ -2595,6 +2618,25 @@ msgstr "如果您确实想添加它们，请使用 -f 选项。"
 msgid "adding files failed"
 msgstr "添加文件失败"
 
+#: builtin/add.c
+#, c-format
+msgid "updating file '%s' failed"
+msgstr "更新文件 '%s' 失败"
+
+#: builtin/add.c
+#, c-format
+msgid ""
+"the following paths still have conflict markers:\n"
+"%s"
+msgstr ""
+"以下路径仍包含冲突标记：\n"
+"%s"
+
+#: builtin/add.c
+#, c-format
+msgid "cannot lstat: '%s'"
+msgstr "无法 lstat：'%s'"
+
 #: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c
 #: builtin/stash.c
 #, c-format
@@ -2645,7 +2687,8 @@ msgstr "用于 '%2$s' 的动作 '%1$s' 无效"
 msgid "invalid value for '%s': '%s'"
 msgstr "'%s' 的值无效：'%s'"
 
-#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c trailer.c
+#: builtin/am.c builtin/bisect.c builtin/commit.c builtin/merge.c sequencer.c
+#: trailer.c
 #, c-format
 msgid "could not read '%s'"
 msgstr "无法读取 '%s'"
@@ -2967,9 +3010,10 @@ msgstr "传递给 git-mailinfo"
 msgid "pass it through git-apply"
 msgstr "传递给 git-apply"
 
-#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c builtin/grep.c
-#: builtin/merge.c builtin/pull.c builtin/rebase.c builtin/repack.c
-#: builtin/show-branch.c builtin/show-ref.c builtin/tag.c parse-options.h
+#: builtin/am.c builtin/commit.c builtin/fast-import.c builtin/fmt-merge-msg.c
+#: builtin/grep.c builtin/merge.c builtin/pull.c builtin/rebase.c
+#: builtin/repack.c builtin/show-branch.c builtin/show-ref.c builtin/tag.c
+#: parse-options.h
 msgid "n"
 msgstr "n"
 
@@ -3151,12 +3195,12 @@ msgstr "未识别的参数：%s"
 #: builtin/bisect.c
 msgid ""
 "git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n"
-"                 [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
-"[<pathspec>...]"
+"                 [--no-checkout] [--first-parent] [--reset-when-"
+"found[=<where>]] [<bad> [<good>...]] [--] [<pathspec>...]"
 msgstr ""
 "git bisect start [--term-(bad|new)=<新术语> --term-(good|old)=<旧术语>]\n"
-"                 [--no-checkout] [--first-parent] [<坏> [<好>...]] [--] [<路"
-"径规格>...]"
+"                 [--no-checkout] [--first-parent] [--reset-when-found[=<何处"
+">]] [<坏> [<好>...]] [--] [<路径规格>...]"
 
 #: builtin/bisect.c
 msgid "git bisect (bad|new|<term-new>) [<rev>]"
@@ -3179,8 +3223,8 @@ msgid "git bisect replay <logfile>"
 msgstr "git bisect replay <日志文件>"
 
 #: builtin/bisect.c
-msgid "git bisect run <cmd> [<arg>...]"
-msgstr "git bisect run <命令> [<参数>...]"
+msgid "git bisect run [--reset-when-found[=<where>]] <cmd> [<arg>...]"
+msgstr "git bisect run [--reset-when-found[=<何处>]] <命令> [<参数>...]"
 
 #: builtin/bisect.c
 #, c-format
@@ -3232,6 +3276,11 @@ msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
 msgstr "无法检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
 
+#: builtin/bisect.c
+#, c-format
+msgid "invalid value for '--reset-when-found': '%s'"
+msgstr "'--reset-when-found' 的值无效：'%s'"
+
 #: builtin/bisect.c
 #, c-format
 msgid "Bad bisect_write argument: %s"
@@ -3327,6 +3376,11 @@ msgstr ""
 msgid "could not open '%s' for appending"
 msgstr "无法打开 '%s' 进行追加"
 
+#: builtin/bisect.c
+#, c-format
+msgid "could not find commit for '%s'"
+msgstr "无法为 '%s' 找到提交"
+
 #: builtin/bisect.c
 msgid "'' is not a valid term"
 msgstr "'' 不是一个有效的术语"
@@ -3433,6 +3487,10 @@ msgstr "二分查找运行失败：命令 %2$s 的退出码 %1$d < 0 或 >= 128"
 msgid "cannot open file '%s' for writing"
 msgstr "无法打开文件 '%s' 进行写入"
 
+#: builtin/bisect.c diagnose.c
+msgid "could not duplicate stdout"
+msgstr "无法复制标准输出"
+
 #: builtin/bisect.c
 msgid "bisect run cannot continue any more"
 msgstr "二分查找无法继续运行"
@@ -3677,8 +3735,11 @@ msgid "Blaming lines"
 msgstr "追踪代码行"
 
 #: builtin/branch.c
-msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
-msgstr "git branch [<选项>] [-r | -a] [--merged] [--no-merged]"
+msgid ""
+"git branch [<options>] [-r | -a] [--merged] [--no-merged] [(--forked "
+"<branch>)...]"
+msgstr ""
+"git branch [<选项>] [-r | -a] [--merged] [--no-merged] [(--forked <分支>)...]"
 
 #: builtin/branch.c
 msgid ""
@@ -3710,6 +3771,11 @@ msgstr "git branch [<选项>] [-r | -a] [--points-at]"
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<选项>] [-r | -a] [--format]"
 
+#: builtin/branch.c
+msgid ""
+"git branch [<options>] (--delete-merged <pattern>)... [<branch-pattern>...]"
+msgstr "git branch [<选项>] (--delete-merged <模式>)... [<分支模式>...]"
+
 #  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
 #: builtin/branch.c
 #, c-format
@@ -3753,6 +3819,11 @@ msgstr "更新配置文件失败"
 msgid "cannot use -a with -d"
 msgstr "不能将 -a 和 -d 同时使用"
 
+#: builtin/branch.c
+#, c-format
+msgid "cannot delete branch '%s' used by worktree at '%s' for bisect"
+msgstr "无法删除分支 '%s'，它被位于 '%s' 的工作区用于二分查找"
+
 #: builtin/branch.c
 #, c-format
 msgid "cannot delete branch '%s' used by worktree at '%s'"
@@ -3777,6 +3848,16 @@ msgstr ""
 msgid "branch '%s' not found"
 msgstr "分支 '%s' 未找到"
 
+#: builtin/branch.c
+#, c-format
+msgid "Would delete remote-tracking branch %s (was %s).\n"
+msgstr "将删除远程跟踪分支 %s（原为 %s）。\n"
+
+#: builtin/branch.c
+#, c-format
+msgid "Would delete branch %s (was %s).\n"
+msgstr "将删除分支 %s（原为 %s）。\n"
+
 #: builtin/branch.c
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
@@ -3861,6 +3942,16 @@ msgstr "分支被重命名，但更新配置文件失败"
 msgid "branch is copied, but update of config-file failed"
 msgstr "分支已拷贝，但更新配置文件失败"
 
+#: builtin/branch.c
+#, c-format
+msgid "'%s' is not a valid branch or pattern"
+msgstr "'%s' 不是有效的分支或模式"
+
+#: builtin/branch.c
+#, c-format
+msgid "Skipping '%s' (branch.%s.deleteMerged is false)\n"
+msgstr "略过 '%s'（branch.%s.deleteMerged 为 false）\n"
+
 #: builtin/branch.c
 #, c-format
 msgid ""
@@ -3872,6 +3963,15 @@ msgstr ""
 "  %s\n"
 "以 '%s' 开头的行将被移除。\n"
 
+#: builtin/branch.c
+msgid "--set-upstream-to takes a single <remote>/<branch> argument"
+msgstr "--set-upstream-to 接收单个 <远程>/<分支> 参数"
+
+#: builtin/branch.c
+#, c-format
+msgid "Did you mean to use: git branch --set-upstream-to=%s/%s?"
+msgstr "您是否想要使用：git branch --set-upstream-to=%s/%s？"
+
 #: builtin/branch.c
 msgid "Generic options"
 msgstr "通用选项"
@@ -3972,6 +4072,20 @@ msgstr "创建分支的引用日志"
 msgid "edit the description for the branch"
 msgstr "编辑分支的描述"
 
+#: builtin/branch.c builtin/clean.c builtin/config.c builtin/describe.c
+#: builtin/grep.c builtin/log.c builtin/ls-files.c builtin/name-rev.c
+#: builtin/show-ref.c pack-refs.c ref-filter.h
+msgid "pattern"
+msgstr "模式"
+
+#: builtin/branch.c
+msgid "delete merged branches whose upstream matches <pattern> (repeatable)"
+msgstr "删除上游匹配 <模式> 的已合并分支（可重复）"
+
+#: builtin/branch.c
+msgid "with --delete-merged, only print which branches would be deleted"
+msgstr "使用 --delete-merged 时，仅打印哪些分支会被删除"
+
 #: builtin/branch.c
 msgid "force creation, move/rename, deletion"
 msgstr "强制创建、移动/重命名、删除"
@@ -3984,6 +4098,15 @@ msgstr "只打印已经合并的分支"
 msgid "print only branches that are not merged"
 msgstr "只打印尚未合并的分支"
 
+#: builtin/branch.c builtin/checkout.c builtin/clone.c builtin/remote.c
+#: builtin/replay.c builtin/submodule--helper.c builtin/worktree.c
+msgid "branch"
+msgstr "分支"
+
+#: builtin/branch.c
+msgid "print only branches whose upstream matches <branch> (repeatable)"
+msgstr "仅打印上游匹配 <分支> 的分支（可重复）"
+
 #: builtin/branch.c
 msgid "list branches in columns"
 msgstr "以列的方式显示分支"
@@ -4017,6 +4140,10 @@ msgstr "无法将 HEAD 解析为有效引用"
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD 没有位于 refs/heads 之下！"
 
+#: builtin/branch.c
+msgid "--dry-run requires --delete-merged"
+msgstr "--dry-run 需要 --delete-merged"
+
 #: builtin/branch.c
 msgid ""
 "branch with --recurse-submodules can only be used if "
@@ -4164,8 +4291,8 @@ msgstr ""
 "您可以删除任何您不想共享的内容。\n"
 
 #: builtin/bugreport.c builtin/commit.c builtin/fast-export.c
-#: builtin/pack-objects.c builtin/rebase.c builtin/repack.c builtin/replay.c
-#: parse-options.h
+#: builtin/fast-import.c builtin/pack-objects.c builtin/rebase.c
+#: builtin/repack.c builtin/replay.c parse-options.h
 msgid "mode"
 msgstr "模式"
 
@@ -4251,10 +4378,6 @@ msgstr "显示进度条"
 msgid "historical; same as --progress"
 msgstr "老的参数；等同于 --progress"
 
-#: builtin/bundle.c
-msgid "historical; does nothing"
-msgstr "老的参数；无作用"
-
 #: builtin/bundle.c
 msgid "specify bundle format version"
 msgstr "指定捆绑包的格式版本"
@@ -4289,11 +4412,48 @@ msgstr "解包对象中"
 msgid "cannot read object %s '%s'"
 msgstr "无法读取对象 %s '%s'"
 
+#: builtin/cat-file.c
+msgid "must supply valid remote when using remote-object-info"
+msgstr "使用 remote-object-info 时必须提供有效的远程仓库"
+
+#: builtin/cat-file.c
+#, c-format
+msgid "remote-object-info does not support short oids, %d characters required"
+msgstr "remote-object-info 不支持简短 oid，需要 %d 个字符"
+
+#: builtin/cat-file.c
+#, c-format
+msgid "not a valid object name '%s'"
+msgstr "不是有效的对象名 '%s'"
+
+#: builtin/cat-file.c
+msgid "remote-object-info requires objects"
+msgstr "remote-object-info 需要对象"
+
 #: builtin/cat-file.c
 #, c-format
 msgid "mailmap: invalid boolean '%s'"
 msgstr "mailmap：无效的布尔值 '%s'"
 
+#: builtin/cat-file.c
+msgid "remote-object-info command too long"
+msgstr "remote-object-info 命令过长"
+
+#: builtin/cat-file.c
+#, c-format
+msgid "remote-object-info: failed to parse command line: %s"
+msgstr "remote-object-info：无法解析命令行：%s"
+
+#: builtin/cat-file.c
+#, c-format
+msgid "remote-object-info supports at most %d objects"
+msgstr "remote-object-info 最多支持 %d 个对象"
+
+#: builtin/cat-file.c
+#, c-format
+msgid "failed to get object info from the remote: %s"
+msgstr "无法从远程获取对象信息：%s"
+
 #: builtin/cat-file.c
 msgid "flush is only for --buffer mode"
 msgstr "flush 只在 --buffer 模式中使用"
@@ -4849,37 +5009,46 @@ msgstr "您位于一个尚未初始化的分支"
 msgid "The following paths have local changes:\n"
 msgstr "以下路径有本地修改：\n"
 
-#: builtin/checkout.c
+#: builtin/checkout.c builtin/worktree.c
 #, 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' 既可以是一个本地文件，也可以是一个跟踪分支。\n"
-"请使用 --（和可选的 --no-guess）来消除歧义"
+msgid "Branch name '%s' appears in multiple remotes:"
+msgstr "分支名 '%s' 出现在多个远程仓库中："
+
+#: builtin/checkout.c builtin/worktree.c
+#, c-format
+msgid "  %s"
+msgstr "  %s"
 
 #: builtin/checkout.c
 #, c-format
 msgid ""
-"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"If you meant to check out a remote tracking branch on <remote>,\n"
 "you can do so by fully qualifying the name with the --track option:\n"
 "\n"
-"    git %s --track origin/<name>\n"
+"    git %s --track <remote>/%s\n"
 "\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\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 ""
-"若您想检出远程跟踪分支（例如在 'origin' 上），可以使用 --track 选项写出完整名"
-"称：\n"
+"若您想检出 <远程> 上的远程跟踪分支，可以使用 --track 选项写出完整名称：\n"
 "\n"
-"    git %s --track origin/<名称>\n"
+"    git %s --track <远程>/%s\n"
 "\n"
-"若希望在检出含义模糊的 <名称> 时总是偏好某个远程（例如 'origin'），\n"
-"可在配置中设置 checkout.defaultRemote=origin。"
+"若您希望在检出有歧义的名称时总是偏好某个远程（例如'origin' 远程），\n"
+"请考虑在配置中设置 checkout.defaultRemote=origin。"
 
 #: builtin/checkout.c
 #, 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' 既可以是一个本地文件，也可以是一个跟踪分支。\n"
+"请使用 --（和可选的 --no-guess）来消除歧义"
+
+#: builtin/checkout.c builtin/worktree.c
+#, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "'%s' 匹配多个（%d 个）远程跟踪分支"
 
@@ -5117,11 +5286,6 @@ msgstr ""
 msgid "you must specify path(s) to restore"
 msgstr "您必须指定要恢复的路径"
 
-#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c
-#: builtin/submodule--helper.c builtin/worktree.c
-msgid "branch"
-msgstr "分支"
-
 #: builtin/checkout.c
 msgid "create and checkout a new branch"
 msgstr "创建并检出一个新的分支"
@@ -5326,12 +5490,6 @@ msgstr "交互式清除"
 msgid "remove whole directories"
 msgstr "删除整个目录"
 
-#: builtin/clean.c builtin/config.c builtin/describe.c builtin/grep.c
-#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c
-#: pack-refs.c ref-filter.h
-msgid "pattern"
-msgstr "模式"
-
 #: builtin/clean.c
 msgid "add <pattern> to ignore rules"
 msgstr "添加 <模式> 到忽略规则"
@@ -6084,8 +6242,16 @@ msgid "cannot do a partial commit during a cherry-pick."
 msgstr "在拣选过程中不能做部分提交。"
 
 #: builtin/commit.c
-msgid "cannot do a partial commit during a rebase."
-msgstr "在变基过程中不能做部分提交。"
+msgid "cannot do a partial commit during a revert."
+msgstr "在还原过程中不能做部分提交。"
+
+#: builtin/commit.c
+msgid "cannot do a partial commit during an am session."
+msgstr "在 am 会话过程中不能做部分提交。"
+
+#: builtin/commit.c
+msgid "cannot do a partial commit while resolving conflicts during a rebase."
+msgstr "在解决变基冲突过程中不能做部分提交。"
 
 #: builtin/commit.c
 msgid "cannot read the index"
@@ -6304,8 +6470,20 @@ msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "您正处于一个拣选过程中 -- 不能修订提交。"
 
 #: builtin/commit.c
-msgid "You are in the middle of a rebase -- cannot amend."
-msgstr "您正处于一个变基过程中 -- 不能修订提交。"
+msgid "The now-empty commit has been dropped -- cannot amend."
+msgstr "现为空的提交已经被丢弃 -- 不能修订提交。"
+
+#: builtin/commit.c
+msgid "You are in the middle of a revert -- cannot amend."
+msgstr "您正处于一个还原过程中 -- 不能修订提交。"
+
+#: builtin/commit.c
+msgid "You are in the middle of an am session -- cannot amend."
+msgstr "您正处于一个 am 会话过程中 -- 不能修订提交。"
+
+#: builtin/commit.c
+msgid "You are resolving conflicts during a rebase -- cannot amend."
+msgstr "您正处于一个解决变基冲突的过程中 -- 不能修订提交。"
 
 #: builtin/commit.c
 msgid "--reset-author can be used only with -C, -c or --amend."
@@ -7373,6 +7551,11 @@ msgstr "不是 git 仓库"
 msgid "invalid object '%s' given."
 msgstr "提供了无效对象 '%s'。"
 
+#: builtin/diff.c
+#, c-format
+msgid "unable to read tree object for commit '%s'"
+msgstr "无法为提交 '%s' 读取树对象"
+
 #: builtin/diff.c
 #, c-format
 msgid "more than two blobs given: '%s'"
@@ -7498,8 +7681,8 @@ msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
 
 #: builtin/fast-export.c
-msgid "git fast-export [<rev-list-opts>]"
-msgstr "git fast-export [<rev-list 选项>]"
+msgid "git fast-export [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git fast-export [<选项>] [<版本范围>] [[--] <路径>...]"
 
 #: builtin/fast-export.c
 #, c-format
@@ -8316,6 +8499,10 @@ msgstr "--cat-blob-fd 不能超过 %d"
 msgid "expected format name:filename for submodule rewrite option"
 msgstr "子模组重写选项的预期格式为 name:filename"
 
+#: builtin/fast-import.c
+msgid "--max-pack-size: argument must be a non-negative integer"
+msgstr "--max-pack-size：参数必须为非负整数"
+
 #: builtin/fast-import.c
 #, c-format
 msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum"
@@ -8325,6 +8512,10 @@ msgstr "max-pack-size 现在以字节为单位，假定为 --max-pack-size=%lum"
 msgid "minimum max-pack-size is 1 MiB"
 msgstr "最小 max-pack-size 为 1 MiB"
 
+#: builtin/fast-import.c
+msgid "--big-file-threshold: argument must be a non-negative integer"
+msgstr "--big-file-threshold：参数必须为非负整数"
+
 #: builtin/fast-import.c
 #, c-format
 msgid "unknown --signed-commits mode '%s'"
@@ -8360,15 +8551,117 @@ msgstr "在 data 命令后得到 option 命令 '%s'"
 msgid "this version of fast-import does not support option: %s"
 msgstr "此版本的 fast-import 不支持选项：%s"
 
-#: builtin/fast-import.c builtin/merge-recursive.c
-#, c-format
-msgid "unknown option %s"
-msgstr "未知选项 %s"
+#: builtin/fast-import.c
+msgid "git fast-import [<options>]"
+msgstr "git fast-import [<选项>]"
 
 #: builtin/fast-import.c
-#, c-format
-msgid "unknown option --%s"
-msgstr "未知选项 --%s"
+msgid "Common"
+msgstr "共用"
+
+#: builtin/fast-import.c
+msgid "format of the commit/tag dates"
+msgstr "提交/标签日期的格式"
+
+#: builtin/fast-import.c
+msgid "display some basic statistics (objects, packfiles and memory)"
+msgstr "显示一些基本统计信息（对象、包文件和内存）"
+
+#: builtin/fast-import.c
+msgid "disable the output shown by --stats"
+msgstr "禁用 --stats 显示的输出"
+
+#: builtin/fast-import.c
+msgid "force updating modified existing branches"
+msgstr "强制更新已修改的现有分支"
+
+#: builtin/fast-import.c
+msgid "require a terminating 'done' command"
+msgstr "要求以 'done' 命令结尾"
+
+#: builtin/fast-import.c builtin/pack-objects.c
+msgid "maximum size of each output pack file"
+msgstr "每个输出包的最大大小"
+
+#: builtin/fast-import.c
+msgid "maximum size of a blob that will be deltified"
+msgstr "将被生成增量的 blob 的最大大小"
+
+#: builtin/fast-import.c
+msgid "maximum delta depth"
+msgstr "最大增量深度"
+
+#: builtin/fast-import.c
+msgid "maximum number of branches to maintain active"
+msgstr "保持活动状态的分支的最大数量"
+
+#: builtin/fast-import.c
+msgid "Marks"
+msgstr "标记"
+
+#: builtin/fast-import.c
+msgid "import marks from <file>"
+msgstr "从 <文件> 导入标记"
+
+#: builtin/fast-import.c
+msgid "import marks from <file> if it exists"
+msgstr "如果 <文件> 存在，则从中导入标记"
+
+#: builtin/fast-import.c
+msgid "dump marks to <file>"
+msgstr "将标记导出到 <文件>"
+
+#: builtin/fast-import.c
+msgid "are --(import|export)-marks= paths relative to '.git/info/fast-import'?"
+msgstr "--(import|export)-marks= 路径是否相对于 '.git/info/fast-import'？"
+
+#: builtin/fast-import.c
+msgid "Submodule rewrite"
+msgstr "子模组重写"
+
+#: builtin/fast-import.c
+msgid "name:filename"
+msgstr "名称:文件名"
+
+#: builtin/fast-import.c
+msgid "rewrite object IDs for submodule <name> from <filename>"
+msgstr "从 <文件名> 读取重写子模组 <名称> 的对象 ID 的原始值"
+
+#: builtin/fast-import.c
+msgid "rewrite object IDs for submodule <name> to <filename>"
+msgstr "从 <文件名> 读取重写子模组 <名称> 的对象 ID 的目标值"
+
+#: builtin/fast-import.c
+msgid "Signing"
+msgstr "签名"
+
+#: builtin/fast-import.c
+msgid "how to handle signed commits"
+msgstr "如何处理已签名提交"
+
+#: builtin/fast-import.c
+msgid "how to handle signed tags"
+msgstr "如何处理已签名标签"
+
+#: builtin/fast-import.c
+msgid "Advanced"
+msgstr "高级"
+
+#: builtin/fast-import.c
+msgid "allow unsafe mark commands from the stream"
+msgstr "允许流中包含的不安全标记命令"
+
+#: builtin/fast-import.c
+msgid "dump edge commits to <file>"
+msgstr "将边界提交导出到 <文件>"
+
+#: builtin/fast-import.c
+msgid "fd"
+msgstr "文件描述符"
+
+#: builtin/fast-import.c
+msgid "write some responses to <fd> instead of stdout"
+msgstr "将一些响应写入 <文件描述符> 而非标准输出"
 
 #: builtin/fast-import.c
 #, c-format
@@ -8404,6 +8697,11 @@ msgstr "git fetch --all [<选项>]"
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel 不能为负数"
 
+#: builtin/fetch.c
+#, c-format
+msgid "unrecognized fetch.followRemoteHEAD value '%s' ignored"
+msgstr "已忽略无法识别的 fetch.followRemoteHEAD 值 '%s'"
+
 #: builtin/fetch.c
 msgid "couldn't find remote ref HEAD"
 msgstr "无法发现远程 HEAD 引用"
@@ -8539,15 +8837,24 @@ msgstr "因协议不支持而忽略 %s"
 #: builtin/fetch.c
 #, c-format
 msgid ""
-"Run 'git remote set-head %s %s' to follow the change, or set\n"
-"'remote.%s.followRemoteHEAD' configuration option to a different value\n"
-"if you do not want to see this message. Specifically running\n"
-"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"
-"will disable the warning until the remote changes HEAD to something else."
+"Run 'git remote set-head %s %s' to follow the change, or modify\n"
+"either of the 'remote.%s.followRemoteHEAD' or 'fetch.followRemoteHEAD'\n"
+"configuration variables to handle the situation differently.\n"
+"\n"
+"Using this specific setting\n"
+"\n"
+"    git config set remote.%s.followRemoteHEAD warn-if-not-%s\n"
+"\n"
+"will suppress the warning until the remote changes HEAD to something else."
 msgstr ""
-"运行 'git remote set-head %s %s' 同步变更，或通过配置选项\n"
-"'remote.%s.followRemoteHEAD' 设置为其他值以屏蔽此提示。具体可通过\n"
-"运行命令 'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"
+"运行 'git remote set-head %s %s' 以跟随更改，或者修改配置变量\n"
+"'remote.%s.followRemoteHEAD' 或 'fetch.followRemoteHEAD'\n"
+"之一以另行处理该情况。\n"
+"\n"
+"使用以下设置\n"
+"\n"
+"    git config set remote.%s.followRemoteHEAD warn-if-not-%s\n"
+"\n"
 "以禁用该警告，直到远程将 HEAD 更改为其他内容。"
 
 #: builtin/fetch.c
@@ -9050,6 +9357,11 @@ msgstr "正在检查 %s"
 msgid "Checking connectivity (%d objects)"
 msgstr "正在检查连通性（%d 个对象）"
 
+#: builtin/fsck.c
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s：对象损坏或丢失"
+
 #: builtin/fsck.c
 #, c-format
 msgid "Checking %s %s"
@@ -9069,11 +9381,6 @@ msgstr "根 %s"
 msgid "tagged %s %s (%s) in %s"
 msgstr "标记 %s %s (%s) 于 %s"
 
-#: builtin/fsck.c
-#, c-format
-msgid "%s: object corrupt or missing"
-msgstr "%s：对象损坏或丢失"
-
 #: builtin/fsck.c
 #, c-format
 msgid "%s: invalid reflog entry %s"
@@ -9103,34 +9410,6 @@ msgstr "无效的参数：期望 sha1，得到 '%s'"
 msgid "notice: No default references"
 msgstr "注意：无默认引用"
 
-#: builtin/fsck.c
-#, c-format
-msgid "%s: hash-path mismatch, found at: %s"
-msgstr "%s：哈希路径不匹配，发现于 %s"
-
-#: builtin/fsck.c
-#, c-format
-msgid "%s: object corrupt or missing: %s"
-msgstr "%s：对象损坏或丢失：%s"
-
-#: builtin/fsck.c
-#, c-format
-msgid "%s: object could not be parsed: %s"
-msgstr "%s：无法解析对象：%s"
-
-#: builtin/fsck.c
-#, c-format
-msgid "bad sha1 file: %s"
-msgstr "坏的 sha1 文件：%s"
-
-#: builtin/fsck.c
-msgid "Checking object directory"
-msgstr "正在检查对象目录"
-
-#: builtin/fsck.c
-msgid "Checking object directories"
-msgstr "正在检查对象目录"
-
 #: builtin/fsck.c
 #, c-format
 msgid "Checking cache tree of %s"
@@ -9150,16 +9429,6 @@ msgstr "cache-tree 中非树对象"
 msgid "%s: invalid sha1 pointer in resolve-undo of %s"
 msgstr "%s：resolve-undo %s 中存在无效的 sha1 指针"
 
-#: builtin/fsck.c
-#, c-format
-msgid "unable to load rev-index for pack '%s'"
-msgstr "无法为包文件 %s 加载反向索引"
-
-#: builtin/fsck.c
-#, c-format
-msgid "invalid rev-index for pack '%s'"
-msgstr "包文件 '%s' 的反向索引文件无效"
-
 #: builtin/fsck.c
 msgid "Checking ref database"
 msgstr "正在检查引用数据库"
@@ -9228,10 +9497,6 @@ msgstr "显示可达对象的详细名称"
 msgid "check reference database consistency"
 msgstr "检查引用数据库一致性"
 
-#: builtin/fsck.c builtin/index-pack.c
-msgid "Checking objects"
-msgstr "正在检查对象"
-
 #: builtin/fsmonitor--daemon.c
 msgid "git fsmonitor--daemon start [<options>]"
 msgstr "git fsmonitor--daemon start [<选项>]"
@@ -9463,11 +9728,6 @@ msgid ""
 msgstr ""
 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）"
 
-#: builtin/gc.c
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
-
 #: builtin/gc.c
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
@@ -9516,10 +9776,6 @@ msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr "跳过增量重新打包任务，因为 core.multiPackIndex 被禁用"
 
-#: builtin/gc.c
-msgid "failed to perform geometric repack"
-msgstr "无法执行几何打包"
-
 #: builtin/gc.c
 #, c-format
 msgid "task '%s' failed"
@@ -10160,6 +10416,14 @@ msgstr "用法：%s%s"
 msgid "'git help config' for more information"
 msgstr "'git help config' 获取更多信息"
 
+#: builtin/history.c
+msgid ""
+"git history drop <commit> [--dry-run] [--update-refs=(branches|head)] [--"
+"empty=(drop|keep|abort)]"
+msgstr ""
+"git history drop <提交> [--dry-run] [--update-refs=(branches|head)] [--"
+"empty=(drop|keep|abort)]"
+
 #: builtin/history.c
 msgid ""
 "git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--"
@@ -10188,6 +10452,11 @@ msgid ""
 msgstr ""
 "请输入针对 %s 变更的提交说明。以 '%s' 开头的行将被忽略，空说明将中止提交。\n"
 
+#: builtin/history.c editor.c sequencer.c wrapper.c
+#, c-format
+msgid "could not write to '%s'"
+msgstr "无法写入 '%s'"
+
 #: builtin/history.c
 #, c-format
 msgid "Aborting commit as launching the editor failed.\n"
@@ -10332,6 +10601,11 @@ msgstr "重放后代提交失败"
 msgid "failed writing reworded commit"
 msgstr "写入重写后的提交失败"
 
+#: builtin/history.c
+#, c-format
+msgid "unable to parse tree %s"
+msgstr "无法解析树 %s"
+
 #: builtin/history.c
 msgid "unable to populate index with tree"
 msgstr "无法用树填充索引"
@@ -10376,6 +10650,36 @@ msgstr "该命令需要一个提交号"
 msgid "cannot split up merge commit"
 msgstr "无法拆分合并提交"
 
+#: builtin/history.c
+msgid "cannot resolve HEAD commit"
+msgstr "无法解析 HEAD 提交"
+
+#: builtin/history.c
+msgid "cannot resolve tree for HEAD"
+msgstr "无法解析 HEAD 的树对象"
+
+#: builtin/history.c
+msgid "how to handle descendants that become empty"
+msgstr "如何处理变空的后代提交"
+
+#: builtin/history.c
+#, c-format
+msgid "cannot drop merge commit: %s"
+msgstr "无法丢弃合并提交：%s"
+
+#: builtin/history.c
+msgid "dropping this commit would overwrite local changes; aborting"
+msgstr "丢弃此提交将覆盖本地修改；正在终止"
+
+#: builtin/history.c
+msgid "failed to update references"
+msgstr "更新引用失败"
+
+#: builtin/history.c
+#, c-format
+msgid "could not update working tree to new commit %s"
+msgstr "无法将工作区更新到新提交 %s"
+
 #: builtin/hook.c
 msgid ""
 "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-"
@@ -10458,6 +10762,10 @@ msgstr "未能获取预期的对象 %s"
 msgid "object %s: expected type %s, found %s"
 msgstr "对象 %s：应为类型 %s，却是 %s"
 
+#: builtin/index-pack.c odb/source-packed.c
+msgid "Checking objects"
+msgstr "正在检查对象"
+
 #: builtin/index-pack.c
 #, c-format
 msgid "cannot fill %d byte"
@@ -11760,6 +12068,11 @@ msgstr "对象 '%s' 不存在"
 msgid "Could not write object file"
 msgstr "无法写入对象文件"
 
+#: builtin/merge-recursive.c
+#, c-format
+msgid "unknown option %s"
+msgstr "未知选项 %s"
+
 #: builtin/merge-recursive.c
 #, c-format
 msgid "could not parse object '%s'"
@@ -12297,7 +12610,12 @@ msgstr "git multi-pack-index [<选项>] expire"
 
 #: builtin/multi-pack-index.c
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
-msgstr "git multi-pack-index [<选项>] repack [--batch-size=<尺寸>]"
+msgstr "git multi-pack-index [<选项>] repack [--batch-size=<数量>]"
+
+#: builtin/multi-pack-index.c
+#, c-format
+msgid "object directory is not an alternate of the current repository: '%s'"
+msgstr "对象目标不是当前仓库的备用：'%s'"
 
 #: builtin/multi-pack-index.c
 msgid "directory"
@@ -12370,7 +12688,7 @@ msgstr "MIDX %s 必须是 %s 的祖先"
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
-msgstr "在 repack 期间，将较小尺寸的包文件收集到大于此大小的批次中"
+msgstr "在 repack 期间，将较小的包文件收集到大于此大小的批次中"
 
 #: builtin/mv.c
 msgid "git mv [-v] [-f] [-n] [-k] <source> <destination>"
@@ -12457,6 +12775,14 @@ msgstr "同一目标具有多个源"
 msgid "destination directory does not exist"
 msgstr "目标目录不存在"
 
+#: builtin/mv.c
+msgid "destination is beyond a symbolic link"
+msgstr "目标位于符号链接之下"
+
+#: builtin/mv.c
+msgid "destination is not a directory"
+msgstr "目标不是一个目录"
+
 #: builtin/mv.c
 msgid "destination exists in the index"
 msgstr "目标在索引中已存在"
@@ -12478,8 +12804,8 @@ msgstr "重命名 %s 至 %s\n"
 
 #: builtin/mv.c
 #, c-format
-msgid "renaming '%s' failed"
-msgstr "重命名 '%s' 失败"
+msgid "renaming '%s' to '%s' failed"
+msgstr "将 '%s' 重命名为 '%s' 失败"
 
 #: builtin/name-rev.c
 msgid "git name-rev [<options>] <commit>..."
@@ -13059,7 +13385,7 @@ msgstr "写入对象中"
 msgid "failed to stat %s"
 msgstr "无法对 %s 调用 stat"
 
-#: builtin/pack-objects.c object-file.c
+#: builtin/pack-objects.c odb/source-loose.c
 #, c-format
 msgid "failed utime() on %s"
 msgstr "在 %s 上调用 utime() 失败"
@@ -13228,10 +13554,25 @@ msgstr "无法打开包文件索引"
 msgid "loose object at %s could not be examined"
 msgstr "无法检查 %s 处的松散对象"
 
+#: builtin/pack-objects.c
+#, c-format
+msgid "cannot read object for %s"
+msgstr "无法读取对象 %s"
+
+#: builtin/pack-objects.c
+#, c-format
+msgid "cannot map object %s to %s"
+msgstr "无法将对象 %s 映射到 %s"
+
 #: builtin/pack-objects.c
 msgid "unable to force loose object"
 msgstr "无法强制松散对象"
 
+#: builtin/pack-objects.c commit-graph.c
+#, c-format
+msgid "could not find commit %s"
+msgstr "无法找到提交 %s"
+
 #: builtin/pack-objects.c
 #, c-format
 msgid "not a rev '%s'"
@@ -13276,10 +13617,6 @@ msgstr "<版本>[,<偏移>]"
 msgid "write the pack index file in the specified idx format version"
 msgstr "用指定的 idx 格式版本来写包索引文件"
 
-#: builtin/pack-objects.c
-msgid "maximum size of each output pack file"
-msgstr "每个输出包的最大尺寸"
-
 #: builtin/pack-objects.c
 msgid "ignore borrowed objects from alternate object store"
 msgstr "忽略从备用对象存储里借用对象"
@@ -13954,6 +14291,16 @@ msgstr "'%s' 的值无效"
 msgid "could not push to %s"
 msgstr "无法推送到 %s"
 
+#: builtin/push.c
+#, c-format
+msgid "'%s' is not a valid push target"
+msgstr "'%s' 不是一个有效的推送目标"
+
+#: builtin/push.c
+#, c-format
+msgid "Did you mean to use: git push %s %s?"
+msgstr "您是想用 git push %s %s 吗？"
+
 #: builtin/push.c builtin/submodule--helper.c
 msgid "repository"
 msgstr "仓库"
@@ -14894,7 +15241,7 @@ msgstr "--all 选项不能与具体引用同时使用"
 msgid "invalid reference name: %s"
 msgstr "无效引用名称：%s"
 
-#: builtin/reflog.c
+#: builtin/reflog.c builtin/refs.c
 #, c-format
 msgid "invalid old object ID: '%s'"
 msgstr "无效对象 ID：%s"
@@ -14904,7 +15251,7 @@ msgstr "无效对象 ID：%s"
 msgid "old object '%s' does not exist"
 msgstr "旧对象 '%s' 不存在"
 
-#: builtin/reflog.c
+#: builtin/reflog.c builtin/refs.c
 #, c-format
 msgid "invalid new object ID: '%s'"
 msgstr "无效的新对象 ID：'%s'"
@@ -14945,6 +15292,30 @@ msgstr "git refs exists <引用>"
 msgid "git refs optimize "
 msgstr "git refs optimize "
 
+#: builtin/refs.c
+msgid ""
+"git refs create [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value>"
+msgstr ""
+"git refs create [--message=<原因>] [--no-deref] [--create-reflog] <引用> <新"
+"值>"
+
+#: builtin/refs.c
+msgid "git refs delete [--message=<reason>] [--no-deref] <ref> [<old-value>]"
+msgstr "git refs delete [--message=<原因>] [--no-deref] <引用> [<旧值>]"
+
+#: builtin/refs.c
+msgid ""
+"git refs update [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value> [<old-value>]"
+msgstr ""
+"git refs update [--message=<原因>] [--no-deref] [--create-reflog] <引用> <新"
+"值> [<旧值>]"
+
+#: builtin/refs.c
+msgid "git refs rename [--message=<reason>] <old-ref> <new-ref>"
+msgstr "git refs rename [--message=<原因>] <旧引用> <新引用>"
+
 #: builtin/refs.c
 msgid "specify the reference format to convert to"
 msgstr "指定要转换的引用格式"
@@ -14990,6 +15361,70 @@ msgstr "引用不存在"
 msgid "failed to look up reference"
 msgstr "无法找到引用"
 
+#: builtin/refs.c builtin/symbolic-ref.c builtin/update-ref.c
+msgid "reason"
+msgstr "原因"
+
+#: builtin/refs.c builtin/symbolic-ref.c builtin/update-ref.c
+msgid "reason of the update"
+msgstr "更新的原因"
+
+#: builtin/refs.c builtin/update-ref.c
+msgid "update <refname> not the one it points to"
+msgstr "更新 <引用名> 本身而不是它指向的引用"
+
+#: builtin/refs.c builtin/tag.c builtin/update-ref.c
+msgid "create a reflog"
+msgstr "创建引用日志"
+
+#: builtin/refs.c
+msgid "create requires reference name and an object ID"
+msgstr "create 需要引用名称和一个对象 ID"
+
+#: builtin/refs.c
+msgid "refusing to perform update with empty message"
+msgstr "拒绝使用空说明执行更新"
+
+#: builtin/refs.c
+#, c-format
+msgid "invalid object ID: '%s'"
+msgstr "无效的对象 ID：'%s'"
+
+#: builtin/refs.c
+msgid "cannot create reference with null new object ID"
+msgstr "无法使用空的新对象 ID 创建引用"
+
+#: builtin/refs.c
+msgid "delete requires reference name and an optional old object ID"
+msgstr "delete 需要引用名称和一个可选的旧对象 ID"
+
+#: builtin/refs.c
+msgid "cannot delete reference with null old object ID"
+msgstr "无法使用空的旧对象 ID 删除引用"
+
+#: builtin/refs.c
+msgid "update requires reference name, new value and an optional old value"
+msgstr "update 需要引用名称、新值和一个可选的旧值"
+
+#: builtin/refs.c
+msgid "rename requires old and new reference name"
+msgstr "rename 需要旧的和新的引用名称"
+
+#: builtin/refs.c
+#, c-format
+msgid "invalid ref format: '%s'"
+msgstr "无效的引用格式：'%s'"
+
+#: builtin/refs.c
+#, c-format
+msgid "reference does not exist: '%s'"
+msgstr "引用不存在：'%s'"
+
+#: builtin/refs.c
+#, c-format
+msgid "reference already exists: '%s'"
+msgstr "引用已存在：'%s'"
+
 #: builtin/remote.c
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
@@ -15562,11 +15997,13 @@ msgstr "冗长输出；必须置于子命令之前"
 msgid ""
 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]"
+"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]\n"
+"[--filter=<filter-spec>] [--drop-filtered [--dry-run]]"
 msgstr ""
 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<包名>]\n"
-"[--write-midx[=<模式>]] [--name-hash-version=<n>] [--path-walk]"
+"[--write-midx[=<模式>]] [--name-hash-version=<n>] [--path-walk]\n"
+"[--filter=<过滤规格>] [--drop-filtered [--dry-run]]"
 
 #: builtin/repack.c
 msgid ""
@@ -15672,7 +16109,7 @@ msgstr "限制最大线程数"
 
 #: builtin/repack.c
 msgid "maximum size of each packfile"
-msgstr "每个包文件的最大尺寸"
+msgstr "每个包文件的最大大小"
 
 #: builtin/repack.c
 msgid "repack objects in packs marked with .keep"
@@ -15694,6 +16131,47 @@ msgstr "写入结果包的多包索引"
 msgid "pack prefix to store a pack containing filtered out objects"
 msgstr "储存被过滤的对象的包的前缀"
 
+#: builtin/repack.c
+msgid "delete filtered out objects (requires --filter)"
+msgstr "删除被过滤掉的对象（需要 --filter）"
+
+#: builtin/repack.c
+msgid "only show which objects would be dropped"
+msgstr "仅显示哪些对象会被丢弃"
+
+#: builtin/repack.c
+msgid "--dry-run only takes effect with --drop-filtered"
+msgstr "--dry-run 仅在与 --drop-filtered 一起使用时生效"
+
+#: builtin/repack.c
+msgid "--drop-filtered requires --filter"
+msgstr "--drop-filtered 需要 --filter"
+
+#: builtin/repack.c
+msgid "--drop-filtered requires -a"
+msgstr "--drop-filtered 需要 -a"
+
+#: builtin/repack.c
+msgid "--drop-filtered only supports --filter=blob:limit=<n> for now"
+msgstr "--drop-filtered 目前仅支持 --filter=blob:limit=<n>"
+
+#: builtin/repack.c
+msgid "--drop-filtered requires a promisor remote"
+msgstr "--drop-filtered 需要一个承诺者远程"
+
+#: builtin/repack.c
+msgid ""
+"--drop-filtered cannot be used while another operation (merge, rebase, am, "
+"cherry-pick, revert, or bisect) is in progress"
+msgstr ""
+"当另一个操作（合并、变基、am、拣选、还原或二分查找）正在进行时，不能使用 --"
+"drop-filtered"
+
+#: builtin/repack.c
+#, c-format
+msgid "cannot drop '%s' (%s): it is referenced by the current index"
+msgstr "无法丢弃 '%s'（%s）：它被当前索引引用"
+
 #: builtin/repack.c
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "不能删除珍品仓库中的打包文件"
@@ -15957,11 +16435,11 @@ msgstr "无效的 %s 值：'%s'"
 msgid ""
 "(EXPERIMENTAL!) git replay ([--contained] --onto=<newbase> | --"
 "advance=<branch> | --revert=<branch>)\n"
-"[--ref=<ref>] [--ref-action=<mode>] <revision-range>"
+"[--ref=<ref>] [--ref-action=<mode>] [--linearize] <revision-range>"
 msgstr ""
 "（实验性！）git replay ([--contained] --onto=<新基线> | --advance=<分支> | --"
 "revert=<分支>)\n"
-"[--ref=<引用>] [--ref-action=<模式>] <版本范围>"
+"[--ref=<引用>] [--ref-action=<模式>] [--linearize] <版本范围>"
 
 #: builtin/replay.c
 msgid "update all branches that point at commits in <revision-range>"
@@ -15987,6 +16465,10 @@ msgstr "要更新结果的引用"
 msgid "control ref update behavior (update|print)"
 msgstr "控制引用更新行为（update|print）"
 
+#: builtin/replay.c
+msgid "drop merge commits, replaying only non-merge commits"
+msgstr "丢弃合并提交，仅重放非合并提交"
+
 #: builtin/replay.c
 msgid "exactly one of --onto, --advance, or --revert is required"
 msgstr "必须指定 --onto、--advance 或 --revert 之一"
@@ -15999,6 +16481,14 @@ msgid ""
 msgstr ""
 "一些版本遍历选项将被覆盖，如 'struct rev_info' 中的 '%s' 位将被强制设定"
 
+#: builtin/repo.c
+msgid "unable to get common directory"
+msgstr "无法获取公共目录"
+
+#: builtin/repo.c
+msgid "unable to get git directory"
+msgstr "无法获取 git 目录"
+
 #: builtin/repo.c
 #, c-format
 msgid "key '%s' not found"
@@ -16277,6 +16767,10 @@ msgstr "无法写入新的索引文件。"
 msgid "unable to get disk usage of %s"
 msgstr "无法得到 %s 的磁盘使用量"
 
+#: builtin/rev-list.c
+msgid "--missing-only requires --missing=print or --missing=print-info"
+msgstr "--missing-only 需要 --missing=print 或 --missing=print-info"
+
 #: builtin/rev-list.c
 #, c-format
 msgid "invalid value for '%s': '%s', the only allowed format is '%s'"
@@ -18275,14 +18769,6 @@ msgstr "缩短引用输出"
 msgid "recursively dereference (default)"
 msgstr "递归解引用（默认）"
 
-#: builtin/symbolic-ref.c builtin/update-ref.c
-msgid "reason"
-msgstr "原因"
-
-#: builtin/symbolic-ref.c builtin/update-ref.c
-msgid "reason of the update"
-msgstr "更新的原因"
-
 #: builtin/tag.c
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
@@ -18424,10 +18910,6 @@ msgstr "使用另外的私钥签名该标签"
 msgid "replace the tag if exists"
 msgstr "如果存在，替换现有的标签"
 
-#: builtin/tag.c builtin/update-ref.c
-msgid "create a reflog"
-msgstr "创建引用日志"
-
 #: builtin/tag.c
 msgid "Tag listing options"
 msgstr "标签列表选项"
@@ -18780,10 +19262,6 @@ msgstr "git update-ref [<选项>] --stdin [-z] [--batch-updates]"
 msgid "delete the reference"
 msgstr "删除引用"
 
-#: builtin/update-ref.c
-msgid "update <refname> not the one it points to"
-msgstr "更新 <引用名> 本身而不是它指向的引用"
-
 #: builtin/update-ref.c
 msgid "stdin has NUL-terminated arguments"
 msgstr "标准输入有以 NUL 字符终止的参数"
@@ -19040,6 +19518,24 @@ msgstr ""
 "尽管已配置远程仓库，但不存在任何本地的或远程的引用，操作终止。\n"
 "请先使用 'add -f' 来覆盖或拉取一个远程仓库"
 
+#: builtin/worktree.c
+#, c-format
+msgid ""
+"If you meant to create a worktree from a remote tracking branch on\n"
+"<remote>, you can do so by:\n"
+"\n"
+"    git worktree add -b %s %s <remote>/%s\n"
+"\n"
+"If you'd like to always prefer some remote, e.g. 'origin',\n"
+"consider setting checkout.defaultRemote=origin in your config."
+msgstr ""
+"如果您想从 <远程> 上的远程跟踪分支创建工作区，可以这样做：\n"
+"\n"
+"    git worktree add -b %s %s <远程>/%s\n"
+"\n"
+"如果您希望总是偏好某个远程（例如 'origin'），请考虑在您的配置\n"
+"中设置 checkout.defaultRemote=origin。"
+
 #: builtin/worktree.c
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "检出 <分支>，即使已经被检出到其他工作区"
@@ -19303,6 +19799,11 @@ msgstr "无法从 URI '%s' 下载捆绑包"
 msgid "file at URI '%s' is not a bundle or bundle list"
 msgstr "位于 URI '%s' 的文件不是捆绑包或捆绑包列表"
 
+#: bundle-uri.c
+#, c-format
+msgid "config '%s' has no value"
+msgstr "配置 '%s' 没有值"
+
 #: bundle-uri.c
 #, c-format
 msgid "bundle-uri: unexpected argument: '%s'"
@@ -19764,8 +20265,8 @@ msgid "Instantly browse your working repository in gitweb"
 msgstr "在 gitweb 中即时浏览您的工作仓库"
 
 #: command-list.h
-msgid "Add or parse structured information in commit messages"
-msgstr "添加或解析提交说明中的结构化信息"
+msgid "Add or parse metadata in commit messages"
+msgstr "添加或解析提交说明中的元数据"
 
 #: command-list.h
 msgid "EXPERIMENTAL: Show when files were last modified"
@@ -20133,6 +20634,10 @@ msgstr "为 Git 提供用户名和密码"
 msgid "Git for CVS users"
 msgstr "适合 CVS 用户的 Git 帮助"
 
+#: command-list.h
+msgid "Git's core data model"
+msgstr "Git 的核心数据模型"
+
 #: command-list.h
 msgid "Tweaking diff output"
 msgstr "调整差异输出"
@@ -20361,11 +20866,6 @@ msgstr "无法找到所有提交图文件"
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "无效的提交位置。提交图可能已损坏"
 
-#: commit-graph.c
-#, c-format
-msgid "could not find commit %s"
-msgstr "无法找到提交 %s"
-
 #: commit-graph.c
 msgid "commit-graph requires overflow generation data but has none"
 msgstr "提交图需要溢出世代数据，但是没有"
@@ -20566,6 +21066,14 @@ msgstr "正在校验提交图中的提交"
 msgid "could not parse commit %s"
 msgstr "无法解析提交 %s"
 
+#: commit-reach.c
+msgid "commit ancestry contains a cycle"
+msgstr "提交祖先中包含循环"
+
+#: commit-reach.c
+msgid "failed to check reachability"
+msgstr "检查可达性失败"
+
 #: commit.c object.c
 #, c-format
 msgid "object %s is a %s, not a %s"
@@ -21344,6 +21852,16 @@ msgstr "无效的 ls-refs 响应：%s"
 msgid "expected flush after ref listing"
 msgstr "在引用列表之后应该有一个 flush 包"
 
+#: connect.c
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "不匹配的算法：客户端 %s，服务端 %s"
+
+#: connect.c
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "服务器不支持算法 '%s'"
+
 #: connect.c
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "无法为 socket 设置 SO_KEEPALIVE"
@@ -21728,10 +22246,6 @@ msgstr "无法打开目录 '%s'"
 msgid "skipping '%s', which is neither file nor directory"
 msgstr "跳过 '%s'，既不是文件又不是目录"
 
-#: diagnose.c
-msgid "could not duplicate stdout"
-msgstr "无法复制标准输出"
-
 #: diagnose.c
 #, c-format
 msgid "could not add directory '%s' to archiver"
@@ -22179,9 +22693,9 @@ msgstr "继续列出文件重命名以外的历史记录"
 
 #: diff.c
 msgid ""
-"prevent rename/copy detection if the number of rename/copy targets exceeds "
-"given limit"
-msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"
+"limit to cheap rename/copy detection if the number of rename/copy targets "
+"exceeds this value"
+msgstr "如果重命名/拷贝目标的数量超过此值，则限制为低成本的重命名/拷贝检测"
 
 #: diff.c
 msgid "Diff algorithm options"
@@ -22482,11 +22996,6 @@ msgstr "无法从 '%s' 迁移 Git 目录到 '%s'"
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "提示：等待您的编辑器关闭文件...%c"
 
-#: editor.c sequencer.c wrapper.c
-#, c-format
-msgid "could not write to '%s'"
-msgstr "无法写入 '%s'"
-
 #: editor.c
 #, c-format
 msgid "could not edit '%s'"
@@ -22569,6 +23078,64 @@ msgstr "必须是其中之一：nothing、matching、simple、upstream 或 curre
 msgid "too many args to run %s"
 msgstr "执行 %s 的参数太多"
 
+#: fetch-object-info.c fetch-pack.c
+msgid "unable to write request to remote"
+msgstr "无法将请求写到远程"
+
+#: fetch-object-info.c
+msgid "object-info capability is not enabled on the server"
+msgstr "服务器未启用 object-info 能力"
+
+#: fetch-object-info.c transport-helper.c
+msgid "object-info requires protocol v2"
+msgstr "object-info 需要 v2 协议"
+
+#: fetch-object-info.c
+#, c-format
+msgid "object-info: expected %<PRIuMAX> attributes, got %<PRIuMAX>"
+msgstr "object-info：期望 %<PRIuMAX> 个属性，得到 %<PRIuMAX> 个"
+
+#: fetch-object-info.c
+msgid "object-info: unrequested 'size' attribute"
+msgstr "object-info：未请求的 'size' 属性"
+
+#: fetch-object-info.c
+msgid "object-info: duplicate 'size' attribute"
+msgstr "object-info：重复的 'size' 属性"
+
+#: fetch-object-info.c
+msgid "object-info: unrequested 'type' attribute"
+msgstr "object-info：未请求的 'type' 属性"
+
+#: fetch-object-info.c
+msgid "object-info: duplicate 'type' attribute"
+msgstr "object-info：重复的 'type' 属性"
+
+#: fetch-object-info.c
+#, c-format
+msgid "object-info: unknown attribute '%s'"
+msgstr "object-info：未知属性 '%s'"
+
+#: fetch-object-info.c
+#, c-format
+msgid "object-info: expected %<PRIuMAX> objects, got %<PRIuMAX>"
+msgstr "object-info：期望 %<PRIuMAX> 个对象，得到 %<PRIuMAX> 个"
+
+#: fetch-object-info.c
+#, c-format
+msgid "object-info: expected OID: %s, got %s"
+msgstr "object-info：期望 OID：%s，得到 %s"
+
+#: fetch-object-info.c
+#, c-format
+msgid "object-info: object %s has invalid type '%s'"
+msgstr "object-info：对象 %s 具有无效类型 '%s'"
+
+#: fetch-object-info.c
+#, c-format
+msgid "object-info: expected flush after %<PRIuMAX> objects"
+msgstr "object-info：在 %<PRIuMAX> 个对象后期望 flush"
+
 #: fetch-pack.c
 #, c-format
 msgid ""
@@ -22731,22 +23298,8 @@ msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack：获取失败。"
 
 #: fetch-pack.c
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr "不匹配的算法：客户端 %s，服务端 %s"
-
-#: fetch-pack.c
-#, c-format
-msgid "the server does not support algorithm '%s'"
-msgstr "服务器不支持算法 '%s'"
-
-#: fetch-pack.c
-msgid "Server does not support shallow requests"
-msgstr "服务器不支持浅克隆请求"
-
-#: fetch-pack.c
-msgid "unable to write request to remote"
-msgstr "无法将请求写到远程"
+msgid "Server does not support shallow requests"
+msgstr "服务器不支持浅克隆请求"
 
 #: fetch-pack.c
 #, c-format
@@ -22933,6 +23486,11 @@ msgstr "应为 -c 提供一个配置字符串\n"
 msgid "no config key given for --config-env\n"
 msgstr "没有为 --config-env 提供配置键名\n"
 
+#: git.c
+#, c-format
+msgid "no file given for '%s' option\n"
+msgstr "没有为 '%s' 选项给定文件\n"
+
 #: git.c
 #, c-format
 msgid "no attribute source given for --attr-source\n"
@@ -23530,9 +24088,12 @@ msgid "name consists only of disallowed characters: %s"
 msgstr "姓名中仅包含禁用字符：%s"
 
 #: imap-send.c
-msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+msgid ""
+"git imap-send [-v] [-q] [--[no-]curl] [--[no-]draft] [(--folder|-f) "
+"<folder>] < <mbox>"
 msgstr ""
-"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <文件夹>] < <mbox>"
+"git imap-send [-v] [-q] [--[no-]curl] [--[no-]draft] [(--folder|-f) <文件夹"
+">] < <mbox>"
 
 #: imap-send.c
 msgid "no IMAP host specified"
@@ -23623,6 +24184,10 @@ msgstr "无法访问 '%s' 中的稀疏数据对象"
 msgid "unable to parse sparse filter data in %s"
 msgstr "无法解析 %s 中的稀疏过滤器数据"
 
+#: list-objects-filter.c
+msgid "filter_oidset: only blob:limit filters are supported"
+msgstr "filter_oidset：仅支持 blob:limit 过滤器"
+
 #: list-objects.c
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
@@ -23684,7 +24249,7 @@ msgstr "另一 git 进程似乎正在此仓库中运行，或者锁文件可能
 msgid "Unable to create '%s.lock': %s"
 msgstr "无法创建 '%s.lock'：%s"
 
-#: log-tree.c
+#: log-tree.c object-file.c
 msgid "unable to create temporary object directory"
 msgstr "无法创建临时对象目录"
 
@@ -23726,6 +24291,11 @@ msgstr "无效的标记大小 '%s'，应为一个整数"
 msgid "Could not parse object '%s'"
 msgstr "无法解析对象 '%s'"
 
+#: merge-ort.c
+#, c-format
+msgid "tree has duplicate entries for '%s'"
+msgstr "树中包含对 '%s' 的重复条目"
+
 #: merge-ort.c
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
@@ -24437,68 +25007,6 @@ msgstr "无法为 '%s' 设置权限"
 msgid "core.fsyncMethod = batch is unsupported on this platform"
 msgstr "core.fsyncMethod = batch 不支持本平台"
 
-#: object-file.c
-msgid "error when closing loose object file"
-msgstr "关闭松散对象文件时出错"
-
-#: object-file.c
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr "权限不足，无法在仓库对象库 %s 中添加对象"
-
-#: object-file.c
-msgid "unable to create temporary file"
-msgstr "无法创建临时文件"
-
-#: object-file.c
-msgid "unable to write loose object file"
-msgstr "无法写入松散对象文件"
-
-#: object-file.c
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "无法压缩新对象 %s（%d）"
-
-#: object-file.c
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
-
-#: object-file.c
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "由于 %s 的对象源数据不稳定而无法处理"
-
-#: object-file.c
-#, c-format
-msgid "write stream object %<PRIuMAX> != %<PRIuMAX>"
-msgstr "写入流对象 %<PRIuMAX> != %<PRIuMAX>"
-
-#: object-file.c
-#, c-format
-msgid "unable to stream deflate new object (%d)"
-msgstr "无法流式压缩新对象（%d）"
-
-#: object-file.c
-#, c-format
-msgid "deflateEnd on stream object failed (%d)"
-msgstr "在流对象上调用 deflateEnd 失败（%d）"
-
-#: object-file.c
-#, c-format
-msgid "unable to create directory %s"
-msgstr "无法创建目录 %s"
-
-#: object-file.c
-#, c-format
-msgid "cannot read object for %s"
-msgstr "无法读取对象 %s"
-
-#: object-file.c
-#, c-format
-msgid "cannot map object %s to %s"
-msgstr "无法将对象 %s 映射到 %s"
-
 #: object-file.c
 #, c-format
 msgid "object fails fsck: %s"
@@ -24562,6 +25070,10 @@ msgstr "无法从 %2$s 的包头 '%1$s' 中解析类型"
 msgid "unable to unpack contents of %s"
 msgstr "无法解压缩 %s 的内容"
 
+#: object-file.c
+msgid "unable to migrate temporary objects"
+msgstr "无法迁移临时对象"
+
 #. TRANSLATORS: This is a line of ambiguous object
 #. output shown when we cannot look up or parse the
 #. object in question. E.g. "deadbeef [bad object]".
@@ -24816,8 +25328,8 @@ msgstr "找不到 %2$s 的替代 %1$s"
 
 #: odb.c
 #, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "打包对象 %s（保存在 %s）已损坏"
+msgid "object %s is corrupt"
+msgstr "对象 %s 已损坏"
 
 #: odb.c
 #, c-format
@@ -24834,6 +25346,10 @@ msgstr "%s 不是一个有效的对象"
 msgid "%s is not a valid '%s' object"
 msgstr "%s 不是有效的 '%s' 对象"
 
+#: odb.c
+msgid "primary object source does not support generating packfiles"
+msgstr "主对象源不支持生成包文件"
+
 #: odb/source-files.c
 msgid "unable to fdopen alternates lockfile"
 msgstr "无法 fdopen alternates 的锁文件"
@@ -24846,6 +25362,24 @@ msgstr "无法读取 alternates 文件"
 msgid "unable to move new alternates file into place"
 msgstr "无法将新的 alternates 文件移动到位"
 
+#: odb/source-files.c
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
+
+#: odb/source-files.c
+#, c-format
+msgid "pack-objects died of signal %d"
+msgstr "pack-objects 因信号 %d 而终止"
+
+#: odb/source-files.c
+msgid "could not spawn pack-objects"
+msgstr "无法创建 pack-objects 进程"
+
+#: odb/source-files.c
+msgid "error writing to pack-objects"
+msgstr "写入 pack-objects 时出错"
+
 #: odb/source-loose.c
 #, c-format
 msgid "unable to open loose object %s"
@@ -24875,6 +25409,112 @@ msgstr "%s 的头部太长，超出了 %d 字节"
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "松散对象 %s（保存在 %s）已损坏"
 
+#: odb/source-loose.c
+msgid "error when closing loose object file"
+msgstr "关闭松散对象文件时出错"
+
+#: odb/source-loose.c
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr "权限不足，无法在仓库对象库 %s 中添加对象"
+
+#: odb/source-loose.c
+msgid "unable to create temporary file"
+msgstr "无法创建临时文件"
+
+#: odb/source-loose.c
+msgid "unable to write loose object file"
+msgstr "无法写入松散对象文件"
+
+#: odb/source-loose.c
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "无法压缩新对象 %s（%d）"
+
+#: odb/source-loose.c
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
+
+#: odb/source-loose.c
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "由于 %s 的对象源数据不稳定而无法处理"
+
+#: odb/source-loose.c
+#, c-format
+msgid "write stream object %<PRIuMAX> != %<PRIuMAX>"
+msgstr "写入流对象 %<PRIuMAX> != %<PRIuMAX>"
+
+#: odb/source-loose.c
+#, c-format
+msgid "unable to stream deflate new object (%d)"
+msgstr "无法流式压缩新对象（%d）"
+
+#: odb/source-loose.c
+#, c-format
+msgid "deflateEnd on stream object failed (%d)"
+msgstr "在流对象上调用 deflateEnd 失败（%d）"
+
+#: odb/source-loose.c
+#, c-format
+msgid "unable to create directory %s"
+msgstr "无法创建目录 %s"
+
+#: odb/source-loose.c
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s：哈希路径不匹配，发现于 %s"
+
+#: odb/source-loose.c
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s：对象损坏或丢失：%s"
+
+#: odb/source-loose.c
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "坏的 sha1 文件：%s"
+
+#: odb/source-loose.c
+msgid "Checking object directory"
+msgstr "正在检查对象目录"
+
+#: odb/source-loose.c
+msgid "Checking object directories"
+msgstr "正在检查对象目录"
+
+#: odb/source-packed.c
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "打包对象 %s（保存在 %s）已损坏"
+
+#: odb/source-packed.c
+#, c-format
+msgid "unable to load rev-index for pack '%s'"
+msgstr "无法为包文件 %s 加载反向索引"
+
+#: odb/source-packed.c
+#, c-format
+msgid "invalid rev-index for pack '%s'"
+msgstr "包文件 '%s' 的反向索引文件无效"
+
+#: odb/transaction.c
+msgid "object database transaction already pending"
+msgstr "对象数据库事务已处于待处理状态"
+
+#: odb/transaction.h
+msgid "failed to start ODB transaction"
+msgstr "启动 ODB 事务失败"
+
+#: odb/transaction.h
+msgid "failed to commit ODB transaction"
+msgstr "提交 ODB 事务失败"
+
+#: odb/transaction.h
+msgid "failed to finalize ODB transaction"
+msgstr "完成 ODB 事务失败"
+
 #: pack-bitmap-write.c
 #, c-format
 msgid "duplicate entry when writing bitmap index: %s"
@@ -24967,6 +25607,10 @@ msgstr "多包位图缺少必需的反向索引"
 msgid "could not open pack %s"
 msgstr "无法打开包 %s"
 
+#: pack-bitmap.c
+msgid "could not open bitmap for base MIDX"
+msgstr "无法为基准 MIDX 打开位图"
+
 #: pack-bitmap.c
 msgid "corrupt bitmap lookup table: triplet position out of index"
 msgstr "损坏的位图查询表：三元组位置超出索引"
@@ -25646,6 +26290,51 @@ msgstr "无法从承诺者远程获取 %s"
 msgid "unsupported field '%s' in '%s' config"
 msgstr "配置 '%2$s' 中存在不支持的字段 '%1$s'"
 
+#: promisor-remote.c
+#, c-format
+msgid ""
+"invalid remote name '%s' before '=' sign in '%s' from "
+"promisor.acceptFromServerUrl config"
+msgstr ""
+"来自 promisor.acceptFromServerUrl 配置的 '%2$s' 中 '=' 号前的远程名称 '%1$s' "
+"无效"
+
+#: promisor-remote.c
+#, c-format
+msgid ""
+"invalid url pattern '%s' in '%s' from promisor.acceptFromServerUrl config"
+msgstr ""
+"来自 promisor.acceptFromServerUrl 配置的 '%2$s' 中的 URL 模式 '%1$s' 无效"
+
+#: promisor-remote.c
+#, c-format
+msgid ""
+"couldn't generate a valid remote name from advertised url '%s', ignoring "
+"this remote"
+msgstr "无法从通告的 URL '%s' 生成有效的远程名称，忽略此远程"
+
+#: promisor-remote.c
+#, c-format
+msgid ""
+"generated remote name '%s' from advertised url '%s' is invalid, ignoring "
+"this remote"
+msgstr "从通告的 URL '%s' 生成的远程名称 '%s' 无效，忽略此远程"
+
+#: promisor-remote.c
+#, c-format
+msgid "couldn't normalize advertised url '%s', ignoring this remote"
+msgstr "无法规范化通告的 URL '%s'，忽略此远程"
+
+#: promisor-remote.c
+#, c-format
+msgid "Auto-creating promisor remote '%s' for URL '%s'\n"
+msgstr "正在为 URL '%2$s' 自动创建承诺者远程 '%1$s'\n"
+
+#: promisor-remote.c
+#, c-format
+msgid "too many remotes accepted with name like '%s-X', ignoring this remote"
+msgstr "接受了太多名称类似于 '%s-X' 的远程，忽略此远程"
+
 #: promisor-remote.c
 #, c-format
 msgid ""
@@ -25826,6 +26515,11 @@ msgstr "无效的额外废弃对象 tip：'%s'"
 msgid "unable to enumerate additional recent objects"
 msgstr "无法枚举额外的近期对象"
 
+#: read-cache.c
+#, c-format
+msgid "remove '%s'\n"
+msgstr "删除 '%s'\n"
+
 #: read-cache.c
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
@@ -26017,11 +26711,6 @@ msgstr ""
 msgid "unexpected diff status %c"
 msgstr "意外的差异状态 %c"
 
-#: read-cache.c
-#, c-format
-msgid "remove '%s'\n"
-msgstr "删除 '%s'\n"
-
 #: rebase-interactive.c
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
@@ -27186,6 +27875,12 @@ msgid_plural ""
 msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
 msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
 
+#  译者：注意保持前导空格
+#: remote.c
+#, c-format
+msgid "  (use \"git pull %s %s\" to update your local branch)\n"
+msgstr "  （使用 \"git pull %s %s\" 来更新您的本地分支）\n"
+
 #  译者：注意保持前导空格
 #: remote.c
 msgid "  (use \"git pull\" to update your local branch)\n"
@@ -27206,6 +27901,14 @@ msgstr[1] ""
 "您的分支和 '%s' 出现了偏离，\n"
 "并且分别有 %d 和 %d 处不同的提交。\n"
 
+#  译者：注意保持前导空格
+#: remote.c
+#, c-format
+msgid ""
+"  (use \"git pull %s %s\" if you want to integrate the remote branch with "
+"yours)\n"
+msgstr "  （如果您想将远程分支与您的分支整合，请使用 \"git pull %s %s\"）\n"
+
 #  译者：注意保持前导空格
 #: remote.c
 msgid ""
@@ -27357,6 +28060,11 @@ msgstr "对象 %s 的替换层级太深"
 msgid "'%s' is not a valid commit-ish for %s"
 msgstr "'%s' 不是 %s 的有效提交号"
 
+#: replay.c
+#, c-format
+msgid "'%s' does not point to a commit for %s"
+msgstr "'%s' 没有指向 %s 的提交"
+
 #: replay.c
 #, c-format
 msgid "argument to %s must be a reference"
@@ -27377,11 +28085,20 @@ msgstr "需要一些提交来重放"
 msgid "all positive revisions given must be references"
 msgstr "提供的所有正向版本必须为引用"
 
+#: replay.c
+#, c-format
+msgid "merge of %s onto %s failed"
+msgstr "将 %s 合并到 %s 失败"
+
 #: replay.c
 #, c-format
 msgid "commit %s became empty after replay"
 msgstr "提交 %s 在重放后变空"
 
+#: replay.c
+msgid "'--linearize' cannot be used with multiple branches"
+msgstr "'--linearize' 不能与多个分支一起使用"
+
 #: replay.c
 msgid "'--ref' cannot be used with multiple revision ranges"
 msgstr "'--ref' 不能与多个版本范围一起使用"
@@ -28682,6 +29399,10 @@ msgstr ""
 "运行 \"git reset --hard\"，以后再运行 \"git stash pop\" 来重新应用\n"
 "这些本地修改。\n"
 
+#: sequencer.c
+msgid "could not apply autostash; your changes are safe in the stash"
+msgstr "无法应用自动储藏；您的修改安全地存放在储藏区中"
+
 #: sequencer.c
 #, c-format
 msgid ""
@@ -28690,7 +29411,7 @@ msgid ""
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
 "自动储藏已存在，创建一个新的储藏条目。\n"
-"您的修改在储藏区中很安全。\n"
+"您的修改安全地存放在储藏区中。\n"
 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
 
 #: sequencer.c
@@ -28946,8 +29667,8 @@ msgstr "在 gitfile 中没有路径：%s"
 
 #: setup.c
 #, c-format
-msgid "not a git repository: %s"
-msgstr "不是 Git 仓库：%s"
+msgid "gitfile does not point to a valid repository: %s"
+msgstr "gitfile 没有指向一个有效的仓库：%s"
 
 #: setup.c
 #, c-format
@@ -29093,6 +29814,10 @@ msgstr "无效的初始分支名：'%s'"
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init：已忽略 --initial-branch=%s"
 
+#: setup.c
+msgid "failed creating object database"
+msgstr "创建对象数据库失败"
+
 #: setup.c
 #, c-format
 msgid "unable to handle file type %d"
@@ -29726,7 +30451,7 @@ msgstr "无法为 '%s' 找到远程助手"
 
 #: transport-helper.c
 msgid "can't dup helper output fd"
-msgstr "无法复制助手输出文件句柄"
+msgstr "无法复制助手输出文件描述符"
 
 #: transport-helper.c
 #, c-format
@@ -29749,6 +30474,10 @@ msgstr "%s 意外地说：'%s'"
 msgid "%s also locked %s"
 msgstr "%s 也锁定了 %s"
 
+#: transport-helper.c
+msgid "could not dup helper output fd"
+msgstr "无法复制助手输出文件描述符"
+
 #: transport-helper.c
 msgid "couldn't run fast-import"
 msgstr "无法执行 fast-import"
@@ -29850,6 +30579,11 @@ msgstr "无法执行 fast-export"
 msgid "error while running fast-export"
 msgstr "执行 fast-export 时出错"
 
+#: transport-helper.c
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "无法将 '%s' 重命名为 '%s'"
+
 #: transport-helper.c
 #, c-format
 msgid ""
@@ -29931,6 +30665,10 @@ msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
 msgid "server options require protocol version 2 or later"
 msgstr "服务端选项需要版本 2 协议或更高"
 
+#: transport.c
+msgid "remote does not support object-info"
+msgstr "远程仓库不支持 object-info"
+
 #: transport.c
 msgid "server does not support wait-for-done"
 msgstr "服务器不支持 wait-for-done"
@@ -30337,31 +31075,32 @@ msgstr "警告："
 
 #: usage.c
 #, c-format
-msgid "'%s' is nominated for removal.\n"
-msgstr "'%s' 已被列入移除计划。\n"
+msgid "'%s' will be removed soon.\n"
+msgstr "'%s' 将很快被移除。\n"
 
 #: usage.c
 #, c-format
 msgid ""
-"If you still use this command, here's what you can do:\n"
+"If you need a replacement:\n"
+"\n"
+"- Read https://git-scm.com/docs/BreakingChanges.html.\n"
 "\n"
-"- read https://git-scm.com/docs/BreakingChanges.html\n"
-"- check if anyone has discussed this on the mailing\n"
-"  list and if they came up with something that can\n"
-"  help you: https://lore.kernel.org/git/?q=%s\n"
-"- send an email to <git@vger.kernel.org> to let us\n"
-"  know that you still use this command and were unable\n"
-"  to determine a suitable replacement\n"
+"- Check what others on the mailing list suggest as a replacement:\n"
+"  https://lore.kernel.org/git/?q=%s\n"
+"\n"
+"- Send an email to <git@vger.kernel.org> asking for help, only if\n"
+"  suggestions by others do not work for you.\n"
 "\n"
 msgstr ""
-"如果您仍在使用此命令，以下是您可以做的事情：\n"
+"如果您需要替代方案：\n"
 "\n"
-"- 阅读 https://git-scm.com/docs/BreakingChanges.html\n"
-"- 检查邮件列表中是否有人讨论过此问题，\n"
-"  以及他们是否提出了可以帮助您的建议：\n"
+"- 请阅读 https://git-scm.com/docs/BreakingChanges.html\n"
+"\n"
+"- 检查邮件列表上其他人建议的替代方案：\n"
 "  https://lore.kernel.org/git/?q=%s\n"
-"- 发送电子邮件至 <git@vger.kernel.org>，让我们知道\n"
-"  您仍在使用此命令且无法确定合适的替代方案\n"
+"\n"
+"- 仅当其他人的建议对您无效时，\n"
+"  发送电子邮件至 <git@vger.kernel.org> 寻求帮助。\n"
 "\n"
 
 #: usage.c
@@ -31305,8 +32044,8 @@ msgstr ""
 
 #: git-send-email.perl
 #, perl-format
-msgid "No subject line in %s?"
-msgstr "在 %s 中没有标题行？"
+msgid "No 'Subject:' line in '%s'\n"
+msgstr "'%s' 中没有 'Subject:' 行\n"
 
 #: git-send-email.perl
 #, perl-format

From baa20f2c7c01a083d87f3ae714de223e1dbfcc61 Mon Sep 17 00:00:00 2001
From: lilydjwg <lilydjwg@gmail.com>
Date: Thu, 17 Sep 2026 12:08:51 +0800
Subject: [PATCH 013/247] l10n: zh_CN: adopt review suggestions

Signed-off-by: lilydjwg <lilydjwg@gmail.com>
---
 po/zh_CN.po | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index c6beb01edebc68..6353640322d911 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3822,7 +3822,7 @@ msgstr "不能将 -a 和 -d 同时使用"
 #: builtin/branch.c
 #, c-format
 msgid "cannot delete branch '%s' used by worktree at '%s' for bisect"
-msgstr "无法删除分支 '%s'，它被位于 '%s' 的工作区用于二分查找"
+msgstr "无法删除分支 '%s'，其在工作区 '%s' 中用于二分查找"
 
 #: builtin/branch.c
 #, c-format
@@ -3970,7 +3970,7 @@ msgstr "--set-upstream-to 接收单个 <远程>/<分支> 参数"
 #: builtin/branch.c
 #, c-format
 msgid "Did you mean to use: git branch --set-upstream-to=%s/%s?"
-msgstr "您是否想要使用：git branch --set-upstream-to=%s/%s？"
+msgstr "您是想用 git branch --set-upstream-to=%s/%s 吗？"
 
 #: builtin/branch.c
 msgid "Generic options"
@@ -4222,7 +4222,7 @@ msgid ""
 "Did you mean to use: -a|-r --list <pattern>?"
 msgstr ""
 "'git branch' 的 -a 和 -r 选项不带一个分支名。\n"
-"您是否想要使用：-a|-r --list <模式>？"
+"您是想用 -a|-r --list <模式> 吗？"
 
 #: builtin/branch.c
 msgid ""
@@ -4419,7 +4419,7 @@ msgstr "使用 remote-object-info 时必须提供有效的远程仓库"
 #: builtin/cat-file.c
 #, c-format
 msgid "remote-object-info does not support short oids, %d characters required"
-msgstr "remote-object-info 不支持简短 oid，需要 %d 个字符"
+msgstr "remote-object-info 不支持简短对象 ID，需要 %d 个字符"
 
 #: builtin/cat-file.c
 #, c-format
@@ -5035,7 +5035,7 @@ msgstr ""
 "\n"
 "    git %s --track <远程>/%s\n"
 "\n"
-"若您希望在检出有歧义的名称时总是偏好某个远程（例如'origin' 远程），\n"
+"若您希望在检出有歧义的名称时总是偏好某个远程（例如 'origin' 远程），\n"
 "请考虑在配置中设置 checkout.defaultRemote=origin。"
 
 #: builtin/checkout.c
@@ -6471,7 +6471,7 @@ msgstr "您正处于一个拣选过程中 -- 不能修订提交。"
 
 #: builtin/commit.c
 msgid "The now-empty commit has been dropped -- cannot amend."
-msgstr "现为空的提交已经被丢弃 -- 不能修订提交。"
+msgstr "当前为空的提交已经被丢弃 -- 不能修订提交。"
 
 #: builtin/commit.c
 msgid "You are in the middle of a revert -- cannot amend."
@@ -8497,7 +8497,7 @@ msgstr "--cat-blob-fd 不能超过 %d"
 
 #: builtin/fast-import.c
 msgid "expected format name:filename for submodule rewrite option"
-msgstr "子模组重写选项的预期格式为 name:filename"
+msgstr "子模组重写选项的预期格式为 <名称>:<文件名>"
 
 #: builtin/fast-import.c
 msgid "--max-pack-size: argument must be a non-negative integer"
@@ -8593,7 +8593,7 @@ msgstr "最大增量深度"
 
 #: builtin/fast-import.c
 msgid "maximum number of branches to maintain active"
-msgstr "保持活动状态的分支的最大数量"
+msgstr "保持活动状态的最大分支数量"
 
 #: builtin/fast-import.c
 msgid "Marks"
@@ -8621,7 +8621,7 @@ msgstr "子模组重写"
 
 #: builtin/fast-import.c
 msgid "name:filename"
-msgstr "名称:文件名"
+msgstr "<名称>:<文件名>"
 
 #: builtin/fast-import.c
 msgid "rewrite object IDs for submodule <name> from <filename>"
@@ -12615,7 +12615,7 @@ msgstr "git multi-pack-index [<选项>] repack [--batch-size=<数量>]"
 #: builtin/multi-pack-index.c
 #, c-format
 msgid "object directory is not an alternate of the current repository: '%s'"
-msgstr "对象目标不是当前仓库的备用：'%s'"
+msgstr "对象目录不是当前仓库的备用：'%s'"
 
 #: builtin/multi-pack-index.c
 msgid "directory"
@@ -15126,7 +15126,7 @@ msgstr "git reflog exists <引用>"
 
 #: builtin/reflog.c
 msgid "git reflog write <ref> <old-oid> <new-oid> <message>"
-msgstr "git reflog write <引用> <旧OID> <新OID> <消息>"
+msgstr "git reflog write <引用> <旧对象> <新对象> <消息>"
 
 #: builtin/reflog.c
 msgid ""

From f7dcca73f3bc394203d6f3fd731897c4053463cc Mon Sep 17 00:00:00 2001
From: Mikel Forcada <mikel.forcada@gmail.com>
Date: Tue, 22 Sep 2026 18:51:31 +0200
Subject: [PATCH 014/247] l10n: Update Catalan Translation

Signed-off-by: Mikel Forcada <mikel.forcada@gmail.com>
---
 po/ca.po | 2505 +++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 1718 insertions(+), 787 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index e8cfa5e92531c2..48ababf31d003f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,6 +12,7 @@
 #   abort v.intr.    |  abandonar
 #   ahead            |  davant per
 #   amend            |  esmenar
+#   background       |  segon pla
 #   bare adj.        |  nu
 #   bogus adj.       |  erroni
 #   boundary         |  limit
@@ -79,7 +80,8 @@
 #   use              |  utilitzar, usar [Guia afavoreix mots curts]
 #   unsupported adj. |  no admès
 #   unsupported p.p. |  [intentar "no s'admet"]
-#   upstream adj.    |  amunt [sense substantiu: branca o repositori]
+#   upstream adj.    |  amunt [amb substantiu]
+#   upstream n.      |  font
 #   upstream adv.    |  amunt
 #   watch v.tr.      |  vigilar
 #   watch n.		 |  vigilància
@@ -110,6 +112,169 @@
 #
 # Vegeu també https://git.github.io/htmldocs/gitglossary.html
 #
+# Traducció de paràmetres entre <...>
+# <action> → <acció>
+# <algorithm> → <algorisme>
+# <arg> → <argument>
+# <args> → <arguments>
+# <base> → <base>
+# <base-tree> → <arbre-base>
+# <blob> → <blob>
+# <branch> → <branca>
+# <branch1> → <branca1>
+# <branch2> → <branca2>
+# <branch-name> → <nom-branca>
+# <char> → <caràcter>
+# <cmd> → <ordre>
+# <color> → <color>
+# <comment string> → <cadena-comentari>
+# <commit> → <comissió>
+# <committish> → <comissió-o-similar>
+# <component> → <component>
+# <config> → <configuració>
+# <contact> → <contacte>
+# <contents> → <contingut>
+# <count> → <recompte>
+# <default> → <valor-per-defecte>
+# <depth> → <profunditat>
+# <destination> → <destinació>
+# <destination-directory> → <directori-destinació>
+# <diff-options → <opcions-diferencia>
+# <dir> → <directori>
+# <directory> → <directori>
+# <display-option> → <opció-presentació>
+# <doc> → <doc>
+# <end> → <final>
+# <enlistment> → <allistament>
+# <expect> → <esperat>
+# <expire> → <caducitat>
+# <fd> → <fd>
+# <file> → <fitxer>
+# <filename> → <nom-fitxer>
+# <file-option> → <opció-fitxer>
+# <fitxer-registre>
+# <format> → <format>
+# <from> → <de>
+# <from-object> → <objecte-de>
+# <funcname> → <nom-funció>
+# <git-dir> → <directori-git>
+# <group> → <grup>
+# <head> → <cap>
+# <hook-name> → <nom-lligam>
+# <i1> → <i1>
+# <i2> → <i2>
+# <key> → <clau>
+# <key> → <clau>
+# <key-alias> → <àlies-clau>
+# <kind> → <classe>
+# <limit> → <límit>
+# <log-options> → <opcions-registre>
+# <m> → <m>
+# <Maildir> → <directori-correu>
+# <mark> → <marca>
+# <max-wait> → <espera-màxima>
+# <mbox> → <bústia>
+# <message> → <missatge>
+# <message-id> → <id-missatge>
+# <mode> → <mode>
+# <msg> → <msg>
+# <n> → <n>
+# <N> → <N>
+# <name> → <nom>
+# <name-width> → <amplada-nom>
+# <new> → <nou>
+# <new-base> → <base-nova>
+# <new-branch> → <branca-nova>
+# <new-name> → <nom-nou>
+# <new-oid> → <oid-nou>
+# <new-path> → <camí-nou>
+# <new-ref> → <referència-nova>
+# <new-tip> → <cim-nou>
+# <newurl> → <url-nou>
+# <no-such-branch> → <branca-inexistent>
+# <notes-ref> → <referència-notes>
+# <object> → <objecte>
+# <object-id> →  <id-objecte>
+# <offset> → <desplaçament>
+# <old> → <antic>
+# <old-base> → <base-antiga>
+# <old-branch> → <branca-antiga>
+# <old-name> → <nom-antic>
+# <old-oid> → <oid-antic>
+# <old-ref> → <referència-antiga>
+# <old-term> → <term-antic>
+# <old-tip> → <cim-antic>
+# <oldurl> → <url-antic>
+# <old-value> → <valor-antic>
+# <options> → <opcions>
+# <packfile> → <fitxer-paquet>
+# <paragraph-break> → <salt-paràgraf>
+# <param1> → <param1>
+# <param2> → <param2>
+# <parent> → <pare>
+# <patch> → <pedaç>
+# <path> → <camí>
+# <pathspec> → <especificació-camí>
+# <pattern> → <patró>
+# <patterns> → <patrons>
+# <position> → <posició>
+# <prefix> → <prefix>
+# <PRIdMAX> → <PRIdMAX>
+# <PRIu32> → <PRIu32>
+# <PRIuMAX> → <PRIuMAX>
+# <PRIx32> → <PRIx32>
+# <PRIx64>→ <PRIx64>
+# <range> → <rang>
+# <reason> → <raó>
+# <ref> → <referència>
+# <refs> → <referències>
+# <refspec> → <especificació-referència>
+# <regex> → <expr-reg>
+# <remote> → <remot>
+# <replacement> → <reemplaçament>
+# <repository> → 	<repositori>
+# <ret> → <intro>
+# <rev> → <revisió>
+# <revision-options> → <opcions-revisió>
+# <revision-range> → <rang-revisions>
+# <rfc> → <rfc>
+# <root> → <arrel>
+# <scheduler> → <planificador>
+# <since> → 	<des-de>
+# <size> → <mida>
+# <source> → <origen>
+# <start> → <inici>
+# <start-point> → <punt-inici>
+# <stash> → <stash>
+# <stdout-is-tty> → <stdout-is-tty>
+# <string> → <cadena>
+# <subdirectory> →  <subdirectori>
+# <suffix> → <sufix>
+# <suite> → <conjunt>
+# <tag> → <etiqueta>
+# <tagname> → <nom-etiqueta>
+# <term-nou> → <terme-nou>
+# <text> → <text>
+# <threads> → <fils>
+# <time> → <data>
+# <to> → <a>
+# <token> → <testimoni>
+# <to-object> → <objecte-a>
+# <tool> → <eina>
+# <tree> → <arbre>
+# <type> → <tipus>
+# <upstream> → <amunt>
+# <url> → <url>
+# <value> → <valor>
+# <value-pattern> → <patró-valors>
+# <version> → <versió>
+# <w> →  <w>
+# <when> → <quan>
+# <where> → <on>
+# <width> → <amplada>
+# <worktree> → <arbre-treball>
+#
+#
 # Criteris
 #   - Mantingueu en anglès les referències a seccions de la documentació, ja que no està traduïda.
 #   - Usem la convenció valenciana per a «per / per a», que inclou l'ús de «per a» davant d'infinitiu
@@ -118,8 +283,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2026-06-21 09:29+0200\n"
-"PO-Revision-Date: 2026-06-24 19:00+0200\n"
+"POT-Creation-Date: 2026-09-22 17:15+0200\n"
+"PO-Revision-Date: 2026-09-22 18:20+0200\n"
 "Last-Translator: Mikel Forcada <mikel.forcada@gmail.com>\n"
 "Language-Team: Catalan\n"
 "Language: ca\n"
@@ -127,7 +292,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.4.2\n"
+"X-Generator: Poedit 3.2.2\n"
 
 #: add-interactive.c
 #, c-format
@@ -214,7 +379,7 @@ msgstr[1] "afegits %d camins\n"
 #: add-interactive.c
 #, c-format
 msgid "ignoring unmerged: %s"
-msgstr "s'està ignorant allò no fusionat: %s"
+msgstr "s'ignora %s no fusionat"
 
 #: add-interactive.c
 #, c-format
@@ -734,7 +899,8 @@ msgid ""
 "aborted and the hunk is left unchanged.\n"
 msgstr ""
 "Si no s'aplica correctament, tindreu una oportunitat per a editar-lo\n"
-"de nou. Si s'eliminen totes les línies del tros, llavors l'edició s'avorta\n"
+"de nou. Si s'eliminen totes les línies del tros, llavors l'edició "
+"s'abandona\n"
 "i el tros es deixa sense cap canvi.\n"
 
 #: add-patch.c
@@ -943,27 +1109,27 @@ msgstr "%sconsell:%s%.*s%s\n"
 
 #: advice.c
 msgid "Cherry-picking is not possible because you have unmerged files."
-msgstr "Fer «cherry pick» no és possible perquè teniu fitxers sense fusionar."
+msgstr "No es pot fer «cherry pick» perquè teniu fitxers sense fusionar."
 
 #: advice.c
 msgid "Committing is not possible because you have unmerged files."
-msgstr "Cometre no és possible perquè teniu fitxers sense fusionar."
+msgstr "No és possible cometre perquè teniu fitxers sense fusionar."
 
 #: advice.c
 msgid "Merging is not possible because you have unmerged files."
-msgstr "Fusionar no és possible perquè teniu fitxers sense fusionar."
+msgstr "No és possible fusionar perquè teniu fitxers sense fusionar."
 
 #: advice.c
 msgid "Pulling is not possible because you have unmerged files."
-msgstr "Baixar no és possible perquè teniu fitxers sense fusionar."
+msgstr "No és possible baixar perquè teniu fitxers sense fusionar."
 
 #: advice.c
 msgid "Reverting is not possible because you have unmerged files."
-msgstr "Revertir no és possible perquè teniu fitxers sense fusionar."
+msgstr "No és possible revertir perquè teniu fitxers sense fusionar."
 
 #: advice.c
 msgid "Rebasing is not possible because you have unmerged files."
-msgstr "Fer «rebase» no és possible perquè teniu fitxers sense fusionar."
+msgstr "No és possible fer «rebase» perquè teniu fitxers sense fusionar."
 
 #: advice.c
 msgid ""
@@ -976,7 +1142,7 @@ msgstr ""
 
 #: advice.c
 msgid "Exiting because of an unresolved conflict."
-msgstr "S'està sortint a causa d'un conflicte no resolt."
+msgstr "Se surt a causa d'un conflicte no resolt."
 
 #: advice.c builtin/merge.c
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
@@ -988,7 +1154,7 @@ msgstr "Cometeu els vostres canvis abans de fusionar."
 
 #: advice.c
 msgid "Exiting because of unfinished merge."
-msgstr "S'està sortint a causa d'una fusió no terminada."
+msgstr "Se surt a causa d'una fusió no terminada."
 
 #: advice.c
 msgid ""
@@ -1055,14 +1221,14 @@ msgid ""
 "false\n"
 "\n"
 msgstr ""
-"Avís: s'està canviant a «%s».\n"
+"Avís: es canvia a «%s».\n"
 "\n"
 "Esteu en un estat de «HEAD separat». Podeu donar un cop d'ull, fer canvis\n"
 "experimentals i cometre'ls. Podeu descartar qualsevol comissió que feu\n"
 "en aquest estat, sense impactar a cap branca, tornant a una branca.\n"
 "\n"
 "Si voleu crear una branca nova per a conservar les comissions que creeu,\n"
-"poder fer-ho (ara o més tard) usant -c amb l'ordre switch. Exemple:\n"
+"podeu fer-ho (ara o més tard) usant -c amb l'ordre switch. Exemple:\n"
 "\n"
 "  git switch -c <nom-de-branca-nova>\n"
 "\n"
@@ -1119,9 +1285,9 @@ msgstr "opció d'espai en blanc «%s» no reconeguda"
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "opció ignora l'espai en blanc «%s» no reconeguda"
 
-#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c
-#: builtin/checkout.c builtin/clean.c builtin/clone.c builtin/commit.c
-#: builtin/describe.c builtin/diff-tree.c builtin/difftool.c
+#: apply.c archive.c builtin/add.c builtin/bisect.c builtin/branch.c
+#: builtin/checkout-index.c builtin/checkout.c builtin/clean.c builtin/clone.c
+#: builtin/commit.c builtin/describe.c builtin/diff-tree.c builtin/difftool.c
 #: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c
 #: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c
 #: builtin/merge-tree.c builtin/merge.c builtin/rebase.c builtin/repack.c
@@ -1419,7 +1585,7 @@ msgstr "s'ha produït un error en llegir %s"
 #: apply.c
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
-msgstr "s'està llegint de «%s» més enllà d'un enllaç simbòlic"
+msgstr "es llegeix de «%s» més enllà d'un enllaç simbòlic"
 
 #: apply.c
 #, c-format
@@ -1444,7 +1610,7 @@ msgstr ""
 #: apply.c
 #, c-format
 msgid "Performing three-way merge...\n"
-msgstr "S'està fent una fusió de 3 vies...\n"
+msgstr "Es fa una fusió de 3 vies...\n"
 
 #: apply.c
 #, c-format
@@ -1469,7 +1635,7 @@ msgstr "S'ha aplicat el pedaç a «%s» netament.\n"
 #: apply.c
 #, c-format
 msgid "Falling back to direct application...\n"
-msgstr "S'està usant alternativament l'aplicació directa...\n"
+msgstr "Es retrocedeix a l'aplicació directa...\n"
 
 #: apply.c
 msgid "removal patch leaves file contents"
@@ -1485,7 +1651,7 @@ msgstr "%s: tipus erroni"
 msgid "%s has type %o, expected %o"
 msgstr "%s és del tipus %o, s'esperava %o"
 
-#: apply.c builtin/fast-import.c read-cache.c
+#: apply.c builtin/fast-import.c builtin/worktree.c read-cache.c
 #, c-format
 msgid "invalid path '%s'"
 msgstr "camí no vàlid: «%s»"
@@ -1523,7 +1689,7 @@ msgstr "%s: el pedaç no s'aplica"
 #: apply.c
 #, c-format
 msgid "Checking patch %s..."
-msgstr "S'està comprovant el pedaç %s..."
+msgstr "Comprovació del pedaç %s en curs..."
 
 #: apply.c
 #, c-format
@@ -1584,7 +1750,7 @@ msgstr "no s'ha pogut escriure en «%s»"
 #: apply.c
 #, c-format
 msgid "closing file '%s'"
-msgstr "s'està tancant el fitxer «%s»"
+msgstr "es tanca el fitxer «%s»"
 
 #: apply.c
 #, c-format
@@ -1604,8 +1770,8 @@ msgstr "error intern"
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] "S'està aplicant el pedaç %%s amb %d rebuig..."
-msgstr[1] "S'està aplicant el pedaç %%s amb %d rebutjos..."
+msgstr[0] "S'aplica el pedaç %%s amb %d rebuig..."
+msgstr[1] "S'aplica el pedaç %%s amb %d rebutjos..."
 
 #: apply.c
 #, c-format
@@ -1870,14 +2036,14 @@ msgstr "marca de temps massa gran per a aquest sistema: %<PRIuMAX>"
 
 #: archive.c
 msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<opcions>] <arbre> [<camí>...]"
+msgstr "git archive [<opcions>] <arbre-o-similar> [<camí>...]"
 
 #: archive.c
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
-"git archive --remote <repositori> [--exec <ordre>] [<opcions>] <arbre> "
-"[<camí>...]"
+"git archive --remote <repositori> [--exec <ordre>] [<opcions>] <arbre-o-"
+"similar> [<camí>...]"
 
 #: archive.c
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
@@ -1944,7 +2110,7 @@ msgstr "hi manquen els dos punts: «%s»"
 msgid "empty file name: '%s'"
 msgstr "nom de fitxer buit: «%s»"
 
-#: archive.c
+#: archive.c builtin/fast-import.c
 msgid "fmt"
 msgstr "format"
 
@@ -1961,8 +2127,9 @@ msgid "prepend prefix to each pathname in the archive"
 msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
 
 #: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c
-#: builtin/fast-export.c builtin/gc.c builtin/grep.c builtin/hash-object.c
-#: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h
+#: builtin/fast-export.c builtin/fast-import.c builtin/gc.c builtin/grep.c
+#: builtin/hash-object.c builtin/ls-files.c builtin/notes.c builtin/read-tree.c
+#: parse-options.h
 msgid "file"
 msgstr "fitxer"
 
@@ -2201,6 +2368,16 @@ msgstr "no s'ha pogut iniciar «show» per a l'objecte «%s»"
 msgid "could not read file '%s'"
 msgstr "no s'ha pogut llegir el fitxer «%s»"
 
+#: bisect.c
+#, c-format
+msgid "could not read bad term from file '%s'"
+msgstr "no s'ha pogut llegir el terme dolent del fitxer «%s»"
+
+#: bisect.c
+#, c-format
+msgid "could not read good term from file '%s'"
+msgstr "no s'ha pogut llegir el terme bo del fitxer «%s»"
+
 #: bisect.c
 msgid "reading bisect refs failed"
 msgstr "la lectura de les referències de bisecció ha fallat"
@@ -2279,7 +2456,7 @@ msgstr ""
 #: branch.c
 #, c-format
 msgid "not setting branch '%s' as its own upstream"
-msgstr "no s'està establert la branca «%s» com a la seva pròpia font"
+msgstr "no s'estableix la branca «%s» com a la seva pròpia font"
 
 #: branch.c
 #, c-format
@@ -2326,14 +2503,12 @@ msgstr ""
 #: branch.c
 #, c-format
 msgid "not tracking: ambiguous information for ref '%s'"
-msgstr "no s'està seguint: informació ambigua per a la referència «%s»"
+msgstr "no se'n fa seguiment: informació ambigua per a la referència «%s»"
 
-#. #-#-#-#-#  branch.c.po  #-#-#-#-#
 #. TRANSLATORS: This is a line listing a remote with duplicate
 #. refspecs in the advice message below. For RTL languages you'll
 #. probably want to swap the "%s" and leading "  " space around.
 #.
-#. #-#-#-#-#  object-name.c.po  #-#-#-#-#
 #. TRANSLATORS: This is line item of ambiguous object output
 #. from describe_ambiguous_object() above. For RTL languages
 #. you'll probably want to swap the "%s" and leading " " space
@@ -2448,7 +2623,7 @@ msgid ""
 "You may try updating the submodules using 'git checkout --no-recurse-"
 "submodules %s && git submodule update --init'"
 msgstr ""
-"Podeu provar d'actualitzar els submòduls utilitzant «git checkout --no-"
+"Podeu provar d'actualitzar els submòduls tot utilitzant «git checkout --no-"
 "recurse-submodules %s && git submodule update --init»"
 
 #: branch.c
@@ -2474,7 +2649,7 @@ msgstr "no es pot fer chmod %cx «%s»"
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Canvis «unstaged» després d'actualitzar l'índex:"
 
-#: builtin/add.c
+#: builtin/add.c builtin/repack.c
 msgid "could not read the index"
 msgstr "no s'ha pogut llegir l'índex"
 
@@ -2491,6 +2666,14 @@ msgstr "no s'ha pogut fer stat a «%s»"
 msgid "empty patch. aborted"
 msgstr "pedaç buit. interromput"
 
+#: builtin/add.c
+msgid "could not initialize apply state"
+msgstr "no s'ha pogut inicialitzar l'estat d'apply"
+
+#: builtin/add.c
+msgid "could not check apply state"
+msgstr "no s'ha pogut comprovar l'estat d'apply"
+
 #: builtin/add.c
 #, c-format
 msgid "could not apply '%s'"
@@ -2543,6 +2726,10 @@ msgstr "actualitza els fitxers seguits"
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "torna a normalitzar EOL dels fitxers seguits (implica -u)"
 
+#: builtin/add.c
+msgid "add conflict-resolved tracked files"
+msgstr "afegeix fitxers seguits amb conflictes resolts"
+
 #: builtin/add.c
 msgid "record only the fact that the path will be added later"
 msgstr "registra només el fet que el camí s'afegirà més tard"
@@ -2615,7 +2802,7 @@ msgstr ""
 #: builtin/add.c
 #, c-format
 msgid "adding embedded git repository: %s"
-msgstr "s'està afegint un repositori incrustat: %s"
+msgstr "s'afig un repositori incrustat: %s"
 
 #: builtin/add.c
 msgid "Use -f if you really want to add them."
@@ -2625,11 +2812,30 @@ msgstr "\"Useu -f si realment voleu afegir-los."
 msgid "adding files failed"
 msgstr "l'afegiment de fitxers ha fallat"
 
+#: builtin/add.c
+#, c-format
+msgid "updating file '%s' failed"
+msgstr "ha fallat l'actualització del fitxer «%s»"
+
+#: builtin/add.c
+#, c-format
+msgid ""
+"the following paths still have conflict markers:\n"
+"%s"
+msgstr ""
+"els camins següents encara tenen marcadors de conflicte:\n"
+"%s"
+
+#: builtin/add.c
+#, c-format
+msgid "cannot lstat: '%s'"
+msgstr "no es pot fer lstat a «%s»"
+
 #: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c
 #: builtin/stash.c
 #, c-format
 msgid "'%s' cannot be negative"
-msgstr "'%s' no pot ser negatiu"
+msgstr "«%s» no pot ser negatiu"
 
 #: builtin/add.c
 #, c-format
@@ -2675,7 +2881,8 @@ msgstr "acció «%s» incorrecta per a «%s»"
 msgid "invalid value for '%s': '%s'"
 msgstr "valor no vàlid per a «%s»: «%s»"
 
-#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c trailer.c
+#: builtin/am.c builtin/bisect.c builtin/commit.c builtin/merge.c sequencer.c
+#: trailer.c
 #, c-format
 msgid "could not read '%s'"
 msgstr "no s'ha pogut llegir «%s»"
@@ -2806,7 +3013,7 @@ msgstr ""
 
 #: builtin/am.c
 msgid "Using index info to reconstruct a base tree..."
-msgstr "S'està usant la informació d'índex per a reconstruir un arbre base..."
+msgstr "S'usa la informació d'índex per a reconstruir un arbre base..."
 
 #: builtin/am.c
 msgid ""
@@ -2818,7 +3025,7 @@ msgstr ""
 
 #: builtin/am.c
 msgid "Falling back to patching base and 3-way merge..."
-msgstr "S'està retrocedint a apedaçar la base i una fusió de 3 vies..."
+msgstr "Es retrocedeix a apedaçar la base i una fusió de 3 vies..."
 
 #: builtin/am.c
 msgid "Failed to merge in the changes."
@@ -2830,7 +3037,7 @@ msgstr "git write-tree ha fallat en escriure un arbre"
 
 #: builtin/am.c
 msgid "applying to an empty history"
-msgstr "s'està aplicant a una història buida"
+msgstr "s'aplica a una història buida"
 
 #: builtin/am.c builtin/commit.c builtin/merge.c replay.c sequencer.c
 msgid "failed to write commit object"
@@ -2868,12 +3075,12 @@ msgstr "Índex brut: no es poden aplicar pedaços (bruts: %s)"
 #: builtin/am.c
 #, c-format
 msgid "Skipping: %.*s"
-msgstr "S'està ometent: %.*s"
+msgstr "S'omet: %.*s"
 
 #: builtin/am.c
 #, c-format
 msgid "Creating an empty commit: %.*s"
-msgstr "S'està creant una comissió buida: %.*s"
+msgstr "Es crea una comissió buida: %.*s"
 
 #: builtin/am.c
 msgid "Patch is empty."
@@ -2882,7 +3089,7 @@ msgstr "El pedaç està buit."
 #: builtin/am.c
 #, c-format
 msgid "Applying: %.*s"
-msgstr "S'està aplicant: %.*s"
+msgstr "Aplicació de %.*s en curs"
 
 #: builtin/am.c
 msgid "No changes -- Patch already applied."
@@ -2940,7 +3147,7 @@ msgid ""
 "Not rewinding to ORIG_HEAD"
 msgstr ""
 "Sembla que heu mogut HEAD després de l'última fallada de «am».\n"
-"No s'està rebobinant a ORIG_HEAD"
+"No es rebobina a ORIG_HEAD"
 
 #: builtin/am.c builtin/bisect.c builtin/tag.c worktree.c
 #, c-format
@@ -2949,7 +3156,7 @@ msgstr "s'ha produït un error en llegir «%s»"
 
 #: builtin/am.c
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
-msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]"
+msgstr "git am [<opcions>] [(<bústia> | <directori-correu>)...]"
 
 #: builtin/am.c
 msgid "git am [<options>] (--continue | --skip | --abort)"
@@ -3012,9 +3219,10 @@ msgstr "passa-ho a través del git-mailinfo"
 msgid "pass it through git-apply"
 msgstr "passa-ho a través de git-apply"
 
-#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c builtin/grep.c
-#: builtin/merge.c builtin/pull.c builtin/rebase.c builtin/repack.c
-#: builtin/show-branch.c builtin/show-ref.c builtin/tag.c parse-options.h
+#: builtin/am.c builtin/commit.c builtin/fast-import.c builtin/fmt-merge-msg.c
+#: builtin/grep.c builtin/merge.c builtin/pull.c builtin/rebase.c
+#: builtin/repack.c builtin/show-branch.c builtin/show-ref.c builtin/tag.c
+#: parse-options.h
 msgid "n"
 msgstr "n"
 
@@ -3056,7 +3264,7 @@ msgstr "interromp l'operació d'apedaçament però manté HEAD on és"
 
 #: builtin/am.c
 msgid "show the patch being applied"
-msgstr "mostra el pedaç que s'està aplicant"
+msgstr "mostra el pedaç en procés d'aplicació"
 
 #: builtin/am.c
 msgid "try to apply current patch again"
@@ -3187,7 +3395,7 @@ msgstr "Restringeix els objectes que manquen al sparse-checkout actual"
 
 #: builtin/backfill.c
 msgid "Include blobs from boundary commits in the backfill"
-msgstr "inclou blobs de les comissions límit en el «backfill»"
+msgstr "Inclou blobs de les comissions límit en el «backfill»"
 
 #: builtin/backfill.c builtin/diff-pairs.c builtin/log.c builtin/replay.c
 #: builtin/shortlog.c bundle.c
@@ -3198,21 +3406,22 @@ msgstr "argument no reconegut: %s"
 #: builtin/bisect.c
 msgid ""
 "git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n"
-"                 [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
-"[<pathspec>...]"
+"                 [--no-checkout] [--first-parent] [--reset-when-"
+"found[=<where>]] [<bad> [<good>...]] [--] [<pathspec>...]"
 msgstr ""
-"git bisect start [--term-(bad|new)=<term-nou> --term-(good|old)=<term-"
+"git bisect start [--term-(bad|new)=<terme-nou> --term-(good|old)=<terme-"
 "antic>]\n"
-"                 [--no-checkout] [--first-parent] [<dolent> [<bo>...]] [--] "
-"[<especificació-camí>...]"
+"                 [--no-checkout] [--first-parent] [--reset-when-"
+"found[=<on>]] [<comissió-dolenta> [<comissió-bona>...]] [--] [<especificació-"
+"camí>...]"
 
 #: builtin/bisect.c
 msgid "git bisect (bad|new|<term-new>) [<rev>]"
-msgstr "git bisect (bad|new|<term-nou>) [<revisió>]"
+msgstr "git bisect (bad|new|<terme-nou>) [<revisió>]"
 
 #: builtin/bisect.c
 msgid "git bisect (good|old|<term-old>) [<rev>...]"
-msgstr "git bisect (good|old|<term-antic>) [<revisió>...]"
+msgstr "git bisect (good|old|<terme-antic>) [<revisió>...]"
 
 #: builtin/bisect.c
 msgid "git bisect skip [(<rev>|<range>)...]"
@@ -3227,8 +3436,8 @@ msgid "git bisect replay <logfile>"
 msgstr "git bisect replay <fitxer-registre>"
 
 #: builtin/bisect.c
-msgid "git bisect run <cmd> [<arg>...]"
-msgstr "git bisect run <ordre> [<arg>...]"
+msgid "git bisect run [--reset-when-found[=<where>]] <cmd> [<arg>...]"
+msgstr "git bisect run [--reset-when-found[=<on>]] <ordre> [<argument>...]"
 
 #: builtin/bisect.c
 #, c-format
@@ -3267,7 +3476,7 @@ msgstr "useu dos termes diferents"
 #: builtin/bisect.c
 #, c-format
 msgid "We are not bisecting.\n"
-msgstr "No estem bisecant.\n"
+msgstr "No hi ha cap bisecció en curs.\n"
 
 #: builtin/bisect.c
 #, c-format
@@ -3282,6 +3491,11 @@ msgstr ""
 "no s'ha pogut agafar la HEAD original «%s». Proveu «git bisect reset "
 "<comissió>»."
 
+#: builtin/bisect.c
+#, c-format
+msgid "invalid value for '--reset-when-found': '%s'"
+msgstr "valor no vàlid per a «--reset-when-found»: «%s»"
+
 #: builtin/bisect.c
 #, c-format
 msgid "Bad bisect_write argument: %s"
@@ -3339,16 +3553,15 @@ msgstr "N'esteu segur [Y/n]? "
 #, c-format
 msgid "status: waiting for both '%s' and '%s' commits\n"
 msgstr ""
-"estat: s'estan esperant tant les comissions de tipus «%s» com les de tipus "
-"«%s»\n"
+"estat: s'esperen tant les comissions de tipus «%s» com les de tipus «%s»\n"
 
 #: builtin/bisect.c
 #, c-format
 msgid "status: waiting for '%s' commit, %d '%s' commit known\n"
 msgid_plural "status: waiting for '%s' commit, %d '%s' commits known\n"
-msgstr[0] "estat: s'espera la comissió '%s', es coneix %d comissió '%s'\n"
+msgstr[0] "estat: s'espera la comissió «%s», es coneix %d comissió «%s»\n"
 msgstr[1] ""
-"estat: s'esperen les comissions '%s', es coneixen %d comissions '%s'\n"
+"estat: s'esperen les comissions «%s», es coneixen %d comissions «%s»\n"
 
 #: builtin/bisect.c
 #, c-format
@@ -3384,6 +3597,11 @@ msgstr ""
 msgid "could not open '%s' for appending"
 msgstr "no s'ha pogut obrir «%s» per a afegir-hi"
 
+#: builtin/bisect.c
+#, c-format
+msgid "could not find commit for '%s'"
+msgstr "no s'ha pogut trobar la comissió per a «%s»"
+
 #: builtin/bisect.c
 msgid "'' is not a valid term"
 msgstr "«%s» no és un terme vàlid"
@@ -3450,7 +3668,7 @@ msgstr "Entrada de revisió errònia (no és una comissió): %s"
 
 #: builtin/bisect.c
 msgid "We are not bisecting."
-msgstr "No estem bisecant."
+msgstr "No hi ha cap bisecció en curs."
 
 #: builtin/bisect.c
 #, c-format
@@ -3465,7 +3683,7 @@ msgstr "no es pot llegir «%s» per a la reproducció"
 #: builtin/bisect.c
 #, c-format
 msgid "running %s\n"
-msgstr "s'està executant %s\n"
+msgstr "%s en execució\n"
 
 #: builtin/bisect.c
 msgid "bisect run failed: no command provided."
@@ -3493,6 +3711,10 @@ msgstr ""
 msgid "cannot open file '%s' for writing"
 msgstr "no es pot obrir «%s» per a escriptura"
 
+#: builtin/bisect.c diagnose.c
+msgid "could not duplicate stdout"
+msgstr "no s'ha pogut duplicar stdout"
+
 #: builtin/bisect.c
 msgid "bisect run cannot continue any more"
 msgstr "l'execució de la bisecció no pot continuar més"
@@ -3552,7 +3774,7 @@ msgstr "git blame [<opcions>] [<opcions-revisió>] [<revisió>] [--] fitxer"
 
 #: builtin/blame.c
 msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>"
-msgstr "git annotate [<opcions>] [<opcions-revisió>] [<rev>] [--] <fitxer>"
+msgstr "git annotate [<opcions>] [<opcions-revisió>] [<revisió>] [--] <fitxer>"
 
 #: builtin/blame.c
 msgid "<rev-opts> are documented in git-rev-list(1)"
@@ -3743,11 +3965,15 @@ msgstr[1] "el fitxer %s té només %lu línies"
 
 #: builtin/blame.c
 msgid "Blaming lines"
-msgstr "S'està fent un «blame»"
+msgstr "S'assigna «blame» a les línies"
 
 #: builtin/branch.c
-msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
-msgstr "git branch [<opcions>] [-r | -a] [--merged | --no-merged]"
+msgid ""
+"git branch [<options>] [-r | -a] [--merged] [--no-merged] [(--forked "
+"<branch>)...]"
+msgstr ""
+"git branch [<opcions>] [-r | -a] [--merged] [--no-merged] [(--forked "
+"<branca>)...]"
 
 #: builtin/branch.c
 msgid ""
@@ -3763,7 +3989,7 @@ msgstr "git branch [<opcions>] [-l] [<patró>...]"
 
 #: builtin/branch.c
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
-msgstr "git branch [<opcions>] [-r] (-d | -D) <nom-de-branca>..."
+msgstr "git branch [<opcions>] [-r] (-d | -D) <nom-branca>..."
 
 #: builtin/branch.c
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
@@ -3781,13 +4007,19 @@ msgstr "git branch [<opcions>] [-r | -a] [--points-at]"
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<opcions>] [-r | -a] [--format]"
 
+#: builtin/branch.c
+msgid ""
+"git branch [<options>] (--delete-merged <pattern>)... [<branch-pattern>...]"
+msgstr ""
+"git branch [<opcions>] (--delete-merged <patró>)... [<patró-branca>...]"
+
 #: builtin/branch.c
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
 "         '%s', but not yet merged to HEAD"
 msgstr ""
-"s'està suprimint la branca «%s» que s'ha fusionat a\n"
+"se suprimeix la branca «%s» que s'ha fusionat a\n"
 "         «%s», però encara no s'ha fusionat a HEAD"
 
 #: builtin/branch.c
@@ -3796,7 +4028,7 @@ msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
 "         '%s', even though it is merged to HEAD"
 msgstr ""
-"no s'està suprimint la branca «%s» que encara no s'ha fusionat a\n"
+"no se suprimeix la branca «%s» que encara no s'ha fusionat a\n"
 "         «%s», encara que s'hagi fusionat a HEAD"
 
 #: builtin/branch.c
@@ -3822,6 +4054,13 @@ msgstr "ha fallat l'actualització del fitxer de configuració"
 msgid "cannot use -a with -d"
 msgstr "no es pot usar -a amb -d"
 
+#: builtin/branch.c
+#, c-format
+msgid "cannot delete branch '%s' used by worktree at '%s' for bisect"
+msgstr ""
+"no es pot suprimir la branca «%s» utilitzada per l'arbre de treball a «%s» "
+"per a fer una bisecció"
+
 #: builtin/branch.c
 #, c-format
 msgid "cannot delete branch '%s' used by worktree at '%s'"
@@ -3847,6 +4086,16 @@ msgstr ""
 msgid "branch '%s' not found"
 msgstr "no s'ha trobat la branca «%s»"
 
+#: builtin/branch.c
+#, c-format
+msgid "Would delete remote-tracking branch %s (was %s).\n"
+msgstr "S'esborraria la branca amb seguiment remot %s (era %s).\n"
+
+#: builtin/branch.c
+#, c-format
+msgid "Would delete branch %s (was %s).\n"
+msgstr "S'esborraria la branca %s (era %s).\n"
+
 #: builtin/branch.c
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
@@ -3878,7 +4127,7 @@ msgstr "a la branca %s se li està fent a «rebase» a %s"
 #: builtin/branch.c
 #, c-format
 msgid "branch %s is being bisected at %s"
-msgstr "la branca %s s'està bisecant a %s"
+msgstr "bisecció de la branca %s a %s en curs"
 
 #: builtin/branch.c
 #, c-format
@@ -3935,6 +4184,16 @@ msgstr ""
 "s'ha copiat la branca, però ha fallat l'actualització del fitxer de "
 "configuració"
 
+#: builtin/branch.c
+#, c-format
+msgid "'%s' is not a valid branch or pattern"
+msgstr "«%s» no és una branca vàlida ni un patró vàlid"
+
+#: builtin/branch.c
+#, c-format
+msgid "Skipping '%s' (branch.%s.deleteMerged is false)\n"
+msgstr "S'omet «%s» (branch.%s.deleteMerged és fals)\n"
+
 #: builtin/branch.c
 #, c-format
 msgid ""
@@ -3947,6 +4206,15 @@ msgstr ""
 "S'eliminaran les línies que comencin amb «%s».\n"
 "\"\n"
 
+#: builtin/branch.c
+msgid "--set-upstream-to takes a single <remote>/<branch> argument"
+msgstr "--set-upstream-to pren un únic argument <remot>/<branca>"
+
+#: builtin/branch.c
+#, c-format
+msgid "Did you mean to use: git branch --set-upstream-to=%s/%s?"
+msgstr "Volíeu fer servir: git branch --set-upstream-to=%s/%s?"
+
 #: builtin/branch.c
 msgid "Generic options"
 msgstr "Opcions genèriques"
@@ -4048,6 +4316,22 @@ msgstr "crea el registre de referències de la branca"
 msgid "edit the description for the branch"
 msgstr "edita la descripció de la branca"
 
+#: builtin/branch.c builtin/clean.c builtin/config.c builtin/describe.c
+#: builtin/grep.c builtin/log.c builtin/ls-files.c builtin/name-rev.c
+#: builtin/show-ref.c pack-refs.c ref-filter.h
+msgid "pattern"
+msgstr "patró"
+
+#: builtin/branch.c
+msgid "delete merged branches whose upstream matches <pattern> (repeatable)"
+msgstr ""
+"esborrar les branques fusionades amb una branca amunt que coincideix amb "
+"<patró> (repetible)"
+
+#: builtin/branch.c
+msgid "with --delete-merged, only print which branches would be deleted"
+msgstr "amb --delete-merged, només mostra quines branques s'eliminarien"
+
 #: builtin/branch.c
 msgid "force creation, move/rename, deletion"
 msgstr "força creació, moviment/canvi de nom, supressió"
@@ -4060,6 +4344,18 @@ msgstr "imprimeix només les branques que s'han fusionat"
 msgid "print only branches that are not merged"
 msgstr "imprimeix només les branques que no s'han fusionat"
 
+#: builtin/branch.c builtin/checkout.c builtin/clone.c builtin/remote.c
+#: builtin/replay.c builtin/submodule--helper.c builtin/worktree.c
+msgid "branch"
+msgstr "branca"
+
+# l'upstream és una "branca amunt"?
+#: builtin/branch.c
+msgid "print only branches whose upstream matches <branch> (repeatable)"
+msgstr ""
+"imprimeix només les branques amb una font que coincideix amb <branca> "
+"(repetible)"
+
 #: builtin/branch.c
 msgid "list branches in columns"
 msgstr "llista les branques en columnes"
@@ -4093,6 +4389,10 @@ msgstr "no s'ha pogut resoldre HEAD com a referència vàlida"
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD no trobat sota refs/heads!"
 
+#: builtin/branch.c
+msgid "--dry-run requires --delete-merged"
+msgstr "--dry-run requereix --delete-merged"
+
 #: builtin/branch.c
 msgid ""
 "branch with --recurse-submodules can only be used if submodule."
@@ -4198,8 +4498,7 @@ msgstr "informació de la libc: "
 
 #: builtin/bugreport.c
 msgid "not run from a git repository - no hooks to show\n"
-msgstr ""
-"no s'està executant en un repositori de git - no hi ha lligams a mostrar\n"
+msgstr "no executat des d'un repositori de git - no hi ha lligams a mostrar\n"
 
 #: builtin/bugreport.c
 msgid ""
@@ -4246,8 +4545,8 @@ msgstr ""
 "Podeu eliminar qualsevol línia que vulgueu.\n"
 
 #: builtin/bugreport.c builtin/commit.c builtin/fast-export.c
-#: builtin/pack-objects.c builtin/rebase.c builtin/repack.c builtin/replay.c
-#: parse-options.h
+#: builtin/fast-import.c builtin/pack-objects.c builtin/rebase.c
+#: builtin/repack.c builtin/replay.c parse-options.h
 msgid "mode"
 msgstr "mode"
 
@@ -4334,10 +4633,6 @@ msgstr "mostra l'indicador de progrés"
 msgid "historical; same as --progress"
 msgstr "històric; el mateix que --progress"
 
-#: builtin/bundle.c
-msgid "historical; does nothing"
-msgstr "històric; no fa res"
-
 #: builtin/bundle.c
 msgid "specify bundle format version"
 msgstr "especifica la versió del format del farcell"
@@ -4365,18 +4660,55 @@ msgstr "Cal un repositori per a desfer un farcell."
 
 #: builtin/bundle.c
 msgid "Unbundling objects"
-msgstr "S'estan desagrupant objectes"
+msgstr "Desempaquetament dels objectes del farcell en curs"
 
 #: builtin/cat-file.c
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "no es pot llegir l'objecte %s «%s»"
 
+#: builtin/cat-file.c
+msgid "must supply valid remote when using remote-object-info"
+msgstr "cal subministrar un remot vàlid en utilitzar remote-object-info"
+
+#: builtin/cat-file.c
+#, c-format
+msgid "remote-object-info does not support short oids, %d characters required"
+msgstr "remote-object-info no admet oids curts; calen %d caràcters"
+
+#: builtin/cat-file.c
+#, c-format
+msgid "not a valid object name '%s'"
+msgstr "no és un nom d'objecte vàlid: «%s»"
+
+#: builtin/cat-file.c
+msgid "remote-object-info requires objects"
+msgstr "remote-object-info requereix objectes"
+
 #: builtin/cat-file.c
 #, c-format
 msgid "mailmap: invalid boolean '%s'"
 msgstr "mailmap: booleà invàlid «%s»"
 
+#: builtin/cat-file.c
+msgid "remote-object-info command too long"
+msgstr "l'ordre remote-object-info és massa llarga"
+
+#: builtin/cat-file.c
+#, c-format
+msgid "remote-object-info: failed to parse command line: %s"
+msgstr "remote-object-info: no s'ha pogut analitzar la línia d'ordres: %s"
+
+#: builtin/cat-file.c
+#, c-format
+msgid "remote-object-info supports at most %d objects"
+msgstr "remote-object-info admet com a molt %d objectes"
+
+#: builtin/cat-file.c
+#, c-format
+msgid "failed to get object info from the remote: %s"
+msgstr "no s'ha pogut obtenir la informació d'objecte del remot: %s"
+
 #: builtin/cat-file.c
 msgid "flush is only for --buffer mode"
 msgstr "flush només és per al mode --buffer"
@@ -4418,7 +4750,8 @@ msgid ""
 "             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
 msgstr ""
 "git cat-file (--textconv | --filters)\n"
-"             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
+"             [<revisió>:<camí|arbre-o-similar> | --path=<camí|arbre-o-"
+"similar> <revisió>]"
 
 #: builtin/cat-file.c
 msgid ""
@@ -4472,7 +4805,7 @@ msgstr "mostra el contingut complet de <objecte> o <revisió>"
 
 #: builtin/cat-file.c
 msgid "like --batch, but don't emit <contents>"
-msgstr "com a --batch, però no emetis <contents>"
+msgstr "com a --batch, però no emetis <contingut>"
 
 #: builtin/cat-file.c
 msgid "stdin is NUL-terminated"
@@ -4546,7 +4879,7 @@ msgstr "«%s=<%s>» necessita «%s» o «%s»"
 
 #: builtin/cat-file.c
 msgid "path|tree-ish"
-msgstr "path|tree-ish"
+msgstr "camí|arbre-o-similar"
 
 #: builtin/cat-file.c
 #, c-format
@@ -4582,14 +4915,15 @@ msgid ""
 "git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] "
 "<pathname>..."
 msgstr ""
-"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] "
+"git check-attr [--source <arbre-o-similar>] [-a | --all | <attr>...] [--] "
 "<pathname>..."
 
 #: builtin/check-attr.c
 msgid ""
 "git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]"
 msgstr ""
-"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]"
+"git check-attr --stdin [-z] [--source <arbre-o-similar>] [-a | --all | "
+"<attr>...]"
 
 #: builtin/check-attr.c
 msgid "report all attributes set on file"
@@ -4609,11 +4943,11 @@ msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL"
 
 #: builtin/check-attr.c
 msgid "<tree-ish>"
-msgstr "<tree-ish>"
+msgstr "<arbre-o-similar>"
 
 #: builtin/check-attr.c
 msgid "which tree-ish to check attributes at"
-msgstr "a quin tree-ish s'han de comprovar els atributs"
+msgstr "a quin arbre o similar s'han de comprovar els atributs"
 
 #: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c
 msgid "suppress progress reporting"
@@ -4941,38 +5275,48 @@ msgstr "Sou en una branca que encara ha de néixer"
 msgid "The following paths have local changes:\n"
 msgstr "Els camins següents tenen modificacions locals:\n"
 
-#: builtin/checkout.c
+#: builtin/checkout.c builtin/worktree.c
 #, 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» podria ser tant un fitxer local com una branca de seguiment.\n"
-"Useu -- (i opcionalment --no-guess) per a desambiguar-ho"
+msgid "Branch name '%s' appears in multiple remotes:"
+msgstr "El nom de branca «%s» apareix en múltiples remots:"
+
+#: builtin/checkout.c builtin/worktree.c
+#, c-format
+msgid "  %s"
+msgstr "  %s"
 
 #: builtin/checkout.c
 #, c-format
 msgid ""
-"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"If you meant to check out a remote tracking branch on <remote>,\n"
 "you can do so by fully qualifying the name with the --track option:\n"
 "\n"
-"    git %s --track origin/<name>\n"
+"    git %s --track <remote>/%s\n"
 "\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\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 ""
-"Si voleu agafar una branca de seguiment remota, p. ex. «origin», podeu\n"
-"fer-ho especificant el nom complet amb l'opció --track:\n"
+"Si el que volíeu era agafar una branca de seguiment remota a <remote>,\n"
+"podeu fer-ho especificant el nom complet amb l'opció --track:\n"
 "\n"
-"    git %s --track origin/<nom>\n"
+"    git %s --track <remot>/%s\n"
 "\n"
-"Si voleu que en agafar un branca amb un <nom> ambigu s'usi una branca\n"
-"remota, p. ex. «origin» al remot, considereu configurar l'opció\n"
-"checkout.defaultRemote=origin en la vostra configuració."
+"Si voleu que, en fer checkout d'un nom ambigu, es prioritzi sempre\n"
+"un remot concret, per exemple, el remot «origin», considereu establir\n"
+"checkout.defaultRemote=origin a la vostra configuració."
 
 #: builtin/checkout.c
 #, 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» podria ser tant un fitxer local com una branca de seguiment.\n"
+"Useu -- (i opcionalment --no-guess) per a desambiguar-ho"
+
+#: builtin/checkout.c builtin/worktree.c
+#, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "«%s» coincideixen múltiples (%d) branques de seguiment remotes"
 
@@ -5059,12 +5403,12 @@ msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
 msgstr ""
-"no es pot canviar de branca mentre s'està revertint\n"
+"no es pot canviar de branca durant la reversió\n"
 "Considereu «git revert --quit» o «git worktree add»."
 
 #: builtin/checkout.c
 msgid "you are switching branch while bisecting"
-msgstr "s'està canviant la branca mentre es fa una bisecció"
+msgstr "esteu canviant la branca mentre es fa una bisecció"
 
 #: builtin/checkout.c
 msgid "paths cannot be used with switching branches"
@@ -5089,7 +5433,7 @@ msgstr "«%s» no es pot usar amb «%s»"
 #: builtin/checkout.c
 #, c-format
 msgid "'%s' cannot take <start-point>"
-msgstr "«%s» no pot prendre <start-point>"
+msgstr "«%s» no pot prendre <punt-inici>"
 
 #: builtin/checkout.c
 #, c-format
@@ -5216,11 +5560,6 @@ msgstr ""
 msgid "you must specify path(s) to restore"
 msgstr "heu d'especificar el camí o camins a restaurar"
 
-#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c
-#: builtin/submodule--helper.c builtin/worktree.c
-msgid "branch"
-msgstr "branca"
-
 #: builtin/checkout.c
 msgid "create and checkout a new branch"
 msgstr "crea i agafa una branca nova"
@@ -5235,7 +5574,9 @@ msgstr "crea un registre de referències per a la branca nova"
 
 #: builtin/checkout.c
 msgid "second guess 'git checkout <no-such-branch>' (default)"
-msgstr "segona deducció «git checkout <no-such-branch>» (per defecte)"
+msgstr ""
+"intenta deduir la intenció darrere de «git checkout <branca-"
+"inexistent>» (per defecte)"
 
 #: builtin/checkout.c
 msgid "use overlay mode (default)"
@@ -5251,7 +5592,7 @@ msgstr "crea/restableix i canvia a una branca"
 
 #: builtin/checkout.c
 msgid "second guess 'git switch <no-such-branch>'"
-msgstr "segona deducció «git switch <no-such-branch>»"
+msgstr "intenta deduir la intenció darrere de «git switch <branca-inexistent>»"
 
 #: builtin/checkout.c
 msgid "throw away local modifications"
@@ -5259,7 +5600,7 @@ msgstr "descarta les modificacions locals"
 
 #: builtin/checkout.c
 msgid "which tree-ish to checkout from"
-msgstr "des de quin arbre agafar"
+msgstr "des de quin arbre o similar agafar"
 
 #: builtin/checkout.c
 msgid "restore the index"
@@ -5288,7 +5629,7 @@ msgstr ""
 #: builtin/clean.c builtin/sparse-checkout.c
 #, c-format
 msgid "Removing %s\n"
-msgstr "S'està eliminant %s\n"
+msgstr "S'elimina %s\n"
 
 #: builtin/clean.c builtin/sparse-checkout.c
 #, c-format
@@ -5298,7 +5639,7 @@ msgstr "Eliminaria %s\n"
 #: builtin/clean.c
 #, c-format
 msgid "Skipping repository %s\n"
-msgstr "S'està ometent el repositori %s\n"
+msgstr "S'omet el repositori %s\n"
 
 #: builtin/clean.c
 #, c-format
@@ -5408,7 +5749,7 @@ msgstr[1] "Eliminaria els ítems següents:"
 
 #: builtin/clean.c
 msgid "No more files to clean, exiting."
-msgstr "No hi ha més fitxers a netejar; s'està sortint."
+msgstr "No hi ha més fitxers a netejar; se surt."
 
 #: builtin/clean.c
 msgid "do not print names of files removed"
@@ -5426,12 +5767,6 @@ msgstr "neteja interactiva"
 msgid "remove whole directories"
 msgstr "elimina directoris sencers"
 
-#: builtin/clean.c builtin/config.c builtin/describe.c builtin/grep.c
-#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c
-#: pack-refs.c ref-filter.h
-msgid "pattern"
-msgstr "patró"
-
 #: builtin/clean.c
 msgid "add <pattern> to ignore rules"
 msgstr "afegiu <patró> per a ignorar les regles"
@@ -5602,7 +5937,7 @@ msgstr "nombre de submòduls clonats en paral·lel"
 
 #: builtin/clone.c builtin/init-db.c
 msgid "template-directory"
-msgstr "directori-de-plantilla"
+msgstr "directori-plantilla"
 
 #: builtin/clone.c builtin/init-db.c
 msgid "directory from which templates will be used"
@@ -5624,7 +5959,7 @@ msgstr "nom"
 
 #: builtin/clone.c
 msgid "use <name> instead of 'origin' to track upstream"
-msgstr "useu <nom> en lloc d'«origin» per a seguir el repositori amunt"
+msgstr "useu <nom> en lloc d'«origin» per a seguir la font"
 
 #: builtin/clone.c
 msgid "checkout <branch> instead of the remote's HEAD"
@@ -5632,7 +5967,7 @@ msgstr "agafa <branca> en lloc de la HEAD del remot"
 
 #: builtin/clone.c
 msgid "clone single revision <rev> and check out"
-msgstr "clona només la revisió <rev> i agafa"
+msgstr "clona només la revisió <revisió> i agafa"
 
 #: builtin/clone.c
 msgid "path to git-upload-pack on the remote"
@@ -5778,12 +6113,12 @@ msgstr "no s'ha pogut crear el directori d'arbre de treball «%s»"
 #: builtin/clone.c
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
-msgstr "S'està clonant al repositori nu «%s»...\n"
+msgstr "Clonació en el repositori nu «%s» en curs...\n"
 
 #: builtin/clone.c
 #, c-format
 msgid "Cloning into '%s'...\n"
-msgstr "S'està clonant a «%s»...\n"
+msgstr "Clonació a «%s» en curs...\n"
 
 #: builtin/clone.c
 msgid ""
@@ -5822,7 +6157,7 @@ msgstr "el repositori font és superficial, es rebutja clonar-ho."
 
 #: builtin/clone.c
 msgid "source repository is shallow, ignoring --local"
-msgstr "el repositori font és superficial, s'està ignorant --local"
+msgstr "el repositori font és superficial, s'ignora --local"
 
 #: builtin/clone.c
 msgid "--local is ignored"
@@ -5852,12 +6187,12 @@ msgstr "el transport remot ha informat d'un error"
 #: builtin/clone.c
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
-msgstr "No s'ha trobat la branca remota %s al repositori amunt %s"
+msgstr "No s'ha trobat la branca remota %s a la font %s"
 
 #: builtin/clone.c
 #, c-format
 msgid "Remote revision %s not found in upstream %s"
-msgstr "La branca remota %s no es troba al repositori amunt %s"
+msgstr "La revisió remota %s no es troba a la font %s"
 
 #: builtin/clone.c
 msgid "You appear to have cloned an empty repository."
@@ -6012,7 +6347,7 @@ msgstr "usa com a màxim un entre --reachable, --stdin-commits, o --stdin-packs"
 
 #: builtin/commit-graph.c
 msgid "Collecting commits from input"
-msgstr "S'estan recollint les comissions de l'entrada"
+msgstr "Recollida de les comissions de l'entrada en curs"
 
 #: builtin/commit-tree.c
 msgid "git commit-tree <tree> [(-p <parent>)...]"
@@ -6198,8 +6533,18 @@ msgid "cannot do a partial commit during a cherry-pick."
 msgstr "no es pot fer una comissió parcial durant un «cherry pick»."
 
 #: builtin/commit.c
-msgid "cannot do a partial commit during a rebase."
-msgstr "no es pot fer una comissió parcial durant un «rebase»."
+msgid "cannot do a partial commit during a revert."
+msgstr "no es pot fer una comissió parcial durant una reversió."
+
+#: builtin/commit.c
+msgid "cannot do a partial commit during an am session."
+msgstr "no es pot fer una comissió parcial durant una sessió «am»."
+
+#: builtin/commit.c
+msgid "cannot do a partial commit while resolving conflicts during a rebase."
+msgstr ""
+"no es pot fer una comissió parcial mentre es resolen conflictes durant un "
+"«rebase»"
 
 #: builtin/commit.c
 msgid "cannot read the index"
@@ -6244,7 +6589,7 @@ msgstr "no s'ha pogut cercar la comissió «%s»"
 #: builtin/commit.c builtin/shortlog.c
 #, c-format
 msgid "(reading log message from standard input)\n"
-msgstr "(s'està llegint el missatge de registre des de l'entrada estàndard)\n"
+msgstr "(es llig el missatge de registre des de l'entrada estàndard)\n"
 
 #: builtin/commit.c
 msgid "could not read log from standard input"
@@ -6295,7 +6640,7 @@ msgid ""
 msgstr ""
 "Introduïu el missatge de comissió dels vostres canvis.\n"
 "S'ignoraran les línies que comencin amb «%s». Un missatge de\n"
-"comissió buit avorta la comissió.\n"
+"comissió buit interromp la comissió.\n"
 
 #: builtin/commit.c
 #, c-format
@@ -6315,8 +6660,8 @@ msgid ""
 "An empty message aborts the commit.\n"
 msgstr ""
 "Introduïu el missatge de comissió dels vostres canvis.\n"
-"Es mantindran les línies que comencin amb «%s»; podeu eliminar-les \n"
-"vosaltres mateixos si voleu. Un missatge buit avorta la comissió.\n"
+"Es mantindran les línies que comencin amb «%s»; podeu eliminar-les\n"
+"vosaltres mateixos si voleu. Un missatge buit interromp la comissió.\n"
 
 #: builtin/commit.c
 msgid ""
@@ -6426,8 +6771,20 @@ msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Esteu enmig d'un «cherry pick» -- no es pot esmenar."
 
 #: builtin/commit.c
-msgid "You are in the middle of a rebase -- cannot amend."
-msgstr "Esteu enmig d'un «rebase» -- no es pot esmenar."
+msgid "The now-empty commit has been dropped -- cannot amend."
+msgstr "La comissió que ara és buida s'ha descartat: no es pot esmenar"
+
+#: builtin/commit.c
+msgid "You are in the middle of a revert -- cannot amend."
+msgstr "Esteu enmig d'una reversió; no es pot esmenar."
+
+#: builtin/commit.c
+msgid "You are in the middle of an am session -- cannot amend."
+msgstr "Esteu enmig d'una sessió «am»; no es pot esmenar."
+
+#: builtin/commit.c
+msgid "You are resolving conflicts during a rebase -- cannot amend."
+msgstr "Esteu resolent conflictes durant un «rebase»; no es pot esmenar."
 
 #: builtin/commit.c
 msgid "--reset-author can be used only with -C, -c or --amend."
@@ -6716,8 +7073,8 @@ msgid ""
 "url=<url>] <name>"
 msgstr ""
 "git config get [<opció-fitxer>] [<opció-presentació>] [--includes] [--all] "
-"[--regexp] [--value=<patró>] [--fixed-value] [--default=<default>] [--"
-"url=<url>] <nom>"
+"[--regexp] [--value=<patró>] [--fixed-value] [--default=<valor-per-defecte>] "
+"[--url=<url>] <nom>"
 
 # Cal traduir els paràmetres amb <...>?
 #: builtin/config.c
@@ -6739,7 +7096,7 @@ msgstr ""
 
 #: builtin/config.c
 msgid "git config rename-section [<file-option>] <old-name> <new-name>"
-msgstr "git config rename-section [<opció-fitxer>] <nom-vell> <nom-nou>"
+msgstr "git config rename-section [<opció-fitxer>] <nom-antic> <nom-nou>"
 
 # Cal traduir els paràmetres amb <...>?
 #: builtin/config.c
@@ -6764,8 +7121,8 @@ msgid ""
 "<name>"
 msgstr ""
 "git config get [<opció-fitxer>] [<opció-presentació>] [--includes] [--all] "
-"[--regexp=<expr-reg>] [--value=<patró>] [--fixed-value] [--"
-"default=<default>] <nom>"
+"[--regexp=<expr-reg>] [--value=<patró>] [--fixed-value] [--default=<valor-"
+"per-defecte>] <nom>"
 
 # Cal traduir els paràmetres amb <...>?
 #: builtin/config.c
@@ -7067,8 +7424,7 @@ msgstr "reemplaça l'opció de configuració multivalor amb el valor nou"
 #: builtin/config.c
 msgid "human-readable comment string (# will be prepended as needed)"
 msgstr ""
-"cadena de comentari llegible per humans (s'hi afegirà \n"
-"# al davant si cal)"
+"cadena de comentari llegible per humans (s'hi afegirà # al davant si cal)"
 
 #: builtin/config.c
 msgid "add a new line without altering any existing values"
@@ -7183,7 +7539,7 @@ msgstr "obre un editor"
 # slot → ??? ; <default> → ???
 #: builtin/config.c
 msgid "find the color configured: slot [<default>]"
-msgstr "troba el color configurat: slot [<default>]"
+msgstr "troba el color configurat: slot [<valor-per-defecte>]"
 
 #: builtin/config.c
 msgid "find the color setting: slot [<stdout-is-tty>]"
@@ -7550,6 +7906,11 @@ msgstr "No és un repositori de git"
 msgid "invalid object '%s' given."
 msgstr "s'ha donat un objecte no vàlid «%s»."
 
+#: builtin/diff.c
+#, c-format
+msgid "unable to read tree object for commit '%s'"
+msgstr "no s'ha pogut llegir l'objecte d'arbre per a la comissió «%s»"
+
 #: builtin/diff.c
 #, c-format
 msgid "more than two blobs given: '%s'"
@@ -7563,7 +7924,7 @@ msgstr "s'ha donat l'objecte no gestionat «%s»."
 #: builtin/diff.c
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
-msgstr "%s...%s: múltiples bases de fusió, utilitzant %s"
+msgstr "%s...%s: múltiples bases de fusió, s'utilitza %s"
 
 #: builtin/difftool.c
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
@@ -7678,8 +8039,8 @@ msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "no s'ha proporcionat l'<ordre> per a --extcmd=<ordre>"
 
 #: builtin/fast-export.c
-msgid "git fast-export [<rev-list-opts>]"
-msgstr "git fast-export [<rev-list-opts>]"
+msgid "git fast-export [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git fast-export [<opcions>] [<rang-revisions>] [[--] <camí>...]"
 
 #: builtin/fast-export.c
 #, c-format
@@ -7742,12 +8103,13 @@ msgstr ""
 #: builtin/fast-export.c
 #, c-format
 msgid "exporting %<PRIuMAX> signature(s) for commit %s"
-msgstr "exportant %<PRIuMAX> signatura/es per a la comissió %s"
+msgstr ""
+"exportació de signatures (total: %<PRIuMAX>) en curs per a la comissió %s "
 
 #: builtin/fast-export.c
 #, c-format
 msgid "stripping signature(s) from commit %s"
-msgstr "eliminant signatura/es de la comissió %s"
+msgstr "s'elimina la signatura o les signatures de la comissió %s"
 
 #: builtin/fast-export.c
 #, c-format
@@ -7774,12 +8136,12 @@ msgstr "no s'ha pogut llegir la etiqueta %s"
 #: builtin/fast-export.c
 #, c-format
 msgid "exporting signed tag %s"
-msgstr "exportant l'etiqueta signada %s"
+msgstr "s'exporta l'etiqueta signada %s"
 
 #: builtin/fast-export.c
 #, c-format
 msgid "stripping signature from tag %s"
-msgstr "eliminant la signatura de l'etiqueta %s"
+msgstr "s'elimina la signatura de l'etiqueta %s"
 
 #: builtin/fast-export.c
 #, c-format
@@ -8035,7 +8397,7 @@ msgstr "els no-directoris no pòden tenir subarbres"
 #: builtin/fast-import.c
 #, c-format
 msgid "dropping %s since it would point to itself (i.e. to %s)"
-msgstr "descartant %s, ja que s'apuntaria a si mateix (és a dir, a %s)"
+msgstr "es descarta %s, ja que s'apuntaria a si mateix (és a dir, a %s)"
 
 #: builtin/fast-import.c
 #, c-format
@@ -8297,7 +8659,7 @@ msgid ""
 "stripping invalid signature for commit '%.100s...'\n"
 "  allegedly by %s"
 msgstr ""
-"eliminant la signatura invàlida de la comissió «%.100s...»\n"
+"s'elimina la signatura invàlida de la comissió «%.100s...»\n"
 "  presumptament de %s"
 
 #: builtin/fast-import.c
@@ -8306,7 +8668,7 @@ msgid ""
 "stripping invalid signature for commit '%.*s'\n"
 "  allegedly by %s"
 msgstr ""
-"eliminant la signatura invàlida de la comissió «%.*s»\n"
+"s'elimina la signatura invàlida de la comissió «%.*s»\n"
 "  presumptament de %s"
 
 #: builtin/fast-import.c
@@ -8315,7 +8677,7 @@ msgid ""
 "stripping invalid signature for commit\n"
 "  allegedly by %s"
 msgstr ""
-"eliminant la signatura invàlida de la comissió\n"
+"s'elimina la signatura invàlida de la comissió\n"
 "  presumptament de %s"
 
 #: builtin/fast-import.c
@@ -8324,7 +8686,7 @@ msgid ""
 "replacing invalid signature for commit '%.100s...'\n"
 "  allegedly by %s"
 msgstr ""
-"eliminant la signatura invàlida de la comissió «%.100s...»\n"
+"es reemplaça la signatura invàlida de la comissió «%.100s...»\n"
 "  presumptament de %s"
 
 #: builtin/fast-import.c
@@ -8333,7 +8695,7 @@ msgid ""
 "replacing invalid signature for commit '%.*s'\n"
 "  allegedly by %s"
 msgstr ""
-"eliminant la signatura invàlida de la comissió «%.*s»\n"
+"es reemplaça la signatura invàlida de la comissió «%.*s»\n"
 "  presumptament de %s"
 
 #: builtin/fast-import.c
@@ -8342,7 +8704,7 @@ msgid ""
 "replacing invalid signature for commit\n"
 "  allegedly by %s"
 msgstr ""
-"eliminant la signatura invàlida de la comissió\n"
+"es reemplaça la signatura invàlida de la comissió\n"
 "  presumptament de %s"
 
 #: builtin/fast-import.c
@@ -8369,11 +8731,11 @@ msgstr ""
 
 #: builtin/fast-import.c
 msgid "stripping a commit signature"
-msgstr "eliminant una signatura de comissió"
+msgstr "s'elimina una signatura de comissió"
 
 #: builtin/fast-import.c
 msgid "importing a commit signature verbatim"
-msgstr "important una firma de comissió de manera literal"
+msgstr "s'importa una firma de comissió de manera literal"
 
 #: builtin/fast-import.c
 msgid "failed to sign tag object"
@@ -8382,12 +8744,12 @@ msgstr "no s'ha pogut signar l'objecte d'etiqueta"
 #: builtin/fast-import.c
 #, c-format
 msgid "importing a tag signature verbatim for tag '%s'"
-msgstr "important una signatura d'etiqueta literalment per a l'etiqueta «%s»"
+msgstr "s'importa una signatura d'etiqueta literalment per a l'etiqueta «%s»"
 
 #: builtin/fast-import.c
 #, c-format
 msgid "stripping a tag signature for tag '%s'"
-msgstr "s'està eliminant la signatura d'etiqueta de l'etiqueta «%s»"
+msgstr "s'elimina la signatura d'etiqueta de l'etiqueta «%s»"
 
 #: builtin/fast-import.c
 msgid "encountered signed tag; use --signed-tags=<mode> to handle it"
@@ -8518,6 +8880,10 @@ msgstr ""
 "s'esperava el format «nom:nom-de-fitxer» per a l'opció de reescriptura de "
 "submòdul"
 
+#: builtin/fast-import.c
+msgid "--max-pack-size: argument must be a non-negative integer"
+msgstr "--max-pack-size: l'argument ha de ser un enter no negatiu"
+
 #: builtin/fast-import.c
 #, c-format
 msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum"
@@ -8528,6 +8894,10 @@ msgstr ""
 msgid "minimum max-pack-size is 1 MiB"
 msgstr "la mida mínima de max-pack-size és 1 MiB"
 
+#: builtin/fast-import.c
+msgid "--big-file-threshold: argument must be a non-negative integer"
+msgstr "--big-file-threshold: l'argument ha de ser un enter no negatiu"
+
 #: builtin/fast-import.c
 #, c-format
 msgid "unknown --signed-commits mode '%s'"
@@ -8565,15 +8935,119 @@ msgstr "s'ha rebut una ordre d'opció «%s» després de l'ordre de dades"
 msgid "this version of fast-import does not support option: %s"
 msgstr "aquesta versió de fast-import no admet l'opció: %s"
 
-#: builtin/fast-import.c builtin/merge-recursive.c
-#, c-format
-msgid "unknown option %s"
-msgstr "opció desconeguda %s"
+#: builtin/fast-import.c
+msgid "git fast-import [<options>]"
+msgstr "git fast-import [<opcions>]"
 
 #: builtin/fast-import.c
-#, c-format
-msgid "unknown option --%s"
-msgstr "opció desconeguda --%s"
+msgid "Common"
+msgstr "Comú"
+
+#: builtin/fast-import.c
+msgid "format of the commit/tag dates"
+msgstr "format de les dates de comissió/etiqueta"
+
+#: builtin/fast-import.c
+msgid "display some basic statistics (objects, packfiles and memory)"
+msgstr ""
+"mostra algunes estadístiques bàsiques (objectes, fitxers de paquet i memòria)"
+
+#: builtin/fast-import.c
+msgid "disable the output shown by --stats"
+msgstr "inhabilita la sortida mostrada per --stats"
+
+#: builtin/fast-import.c
+msgid "force updating modified existing branches"
+msgstr "força l'actualització de branques existents modificades"
+
+#: builtin/fast-import.c
+msgid "require a terminating 'done' command"
+msgstr "requereix una ordre «done» de finalització"
+
+#: builtin/fast-import.c builtin/pack-objects.c
+msgid "maximum size of each output pack file"
+msgstr "mida màxima de cada fitxer empaquetat de sortida"
+
+#: builtin/fast-import.c
+msgid "maximum size of a blob that will be deltified"
+msgstr "mida màxima d'un blob que se sotmetrà a deltificació"
+
+#: builtin/fast-import.c
+msgid "maximum delta depth"
+msgstr "profunditat màxima de les diferències"
+
+#: builtin/fast-import.c
+msgid "maximum number of branches to maintain active"
+msgstr "nombre màxim de branques que s'han de mantenir actives"
+
+#: builtin/fast-import.c
+msgid "Marks"
+msgstr "Marques"
+
+#: builtin/fast-import.c
+msgid "import marks from <file>"
+msgstr "importa les marques de <fitxer>"
+
+#: builtin/fast-import.c
+msgid "import marks from <file> if it exists"
+msgstr "importa les marques de <fitxer> si existeix"
+
+#: builtin/fast-import.c
+msgid "dump marks to <file>"
+msgstr "bolca les marques a <fitxer>"
+
+#: builtin/fast-import.c
+msgid "are --(import|export)-marks= paths relative to '.git/info/fast-import'?"
+msgstr ""
+"els camins --(import|export)-marks= són relatius a «.git/info/fast-import»?"
+
+#: builtin/fast-import.c
+msgid "Submodule rewrite"
+msgstr "Reescriptura del submòdul"
+
+#: builtin/fast-import.c
+msgid "name:filename"
+msgstr "nom:nom-de-fitxer"
+
+#: builtin/fast-import.c
+msgid "rewrite object IDs for submodule <name> from <filename>"
+msgstr "reescriu els ID d'objecte per al submòdul <nom> des de <nom-fitxer>"
+
+#: builtin/fast-import.c
+msgid "rewrite object IDs for submodule <name> to <filename>"
+msgstr "reescriu els ID d'objecte del submòdul <nom> a <nom-fitxer>"
+
+#: builtin/fast-import.c
+msgid "Signing"
+msgstr "Signatura"
+
+#: builtin/fast-import.c
+msgid "how to handle signed commits"
+msgstr "com gestionar les comissions signades"
+
+#: builtin/fast-import.c
+msgid "how to handle signed tags"
+msgstr "com gestionar les etiquetes signades"
+
+#: builtin/fast-import.c
+msgid "Advanced"
+msgstr "Avançat"
+
+#: builtin/fast-import.c
+msgid "allow unsafe mark commands from the stream"
+msgstr "permet ordres de marca no segures des del flux"
+
+#: builtin/fast-import.c
+msgid "dump edge commits to <file>"
+msgstr "bolca les comissions de vora a <fitxer>"
+
+#: builtin/fast-import.c
+msgid "fd"
+msgstr "fd"
+
+#: builtin/fast-import.c
+msgid "write some responses to <fd> instead of stdout"
+msgstr "escriu algunes respostes a <fd> en lloc d'a stdout"
 
 #: builtin/fast-import.c
 #, c-format
@@ -8609,6 +9083,11 @@ msgstr "git fetch --all [<opcions>]"
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel no pot ser negatiu"
 
+#: builtin/fetch.c
+#, c-format
+msgid "unrecognized fetch.followRemoteHEAD value '%s' ignored"
+msgstr "el valor «%s» no reconegut de fetch.followRemoteHEAD s'ha ignorat"
+
 #: builtin/fetch.c
 msgid "couldn't find remote ref HEAD"
 msgstr "no s'ha pogut trobar la referència HEAD remota"
@@ -8743,22 +9222,31 @@ msgstr "s'ignora %s=%s perquè no coincideix amb cap referència"
 #: builtin/fetch.c
 #, c-format
 msgid "ignoring %s because the protocol does not support it"
-msgstr "s'està ignorant %s perquè el protocol no l'admet"
+msgstr "s'ignora %s perquè el protocol no l'admet"
 
 #: builtin/fetch.c
 #, c-format
 msgid ""
-"Run 'git remote set-head %s %s' to follow the change, or set\n"
-"'remote.%s.followRemoteHEAD' configuration option to a different value\n"
-"if you do not want to see this message. Specifically running\n"
-"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"
-"will disable the warning until the remote changes HEAD to something else."
+"Run 'git remote set-head %s %s' to follow the change, or modify\n"
+"either of the 'remote.%s.followRemoteHEAD' or 'fetch.followRemoteHEAD'\n"
+"configuration variables to handle the situation differently.\n"
+"\n"
+"Using this specific setting\n"
+"\n"
+"    git config set remote.%s.followRemoteHEAD warn-if-not-%s\n"
+"\n"
+"will suppress the warning until the remote changes HEAD to something else."
 msgstr ""
-"Executeu 'git remote set-head %s %s' per a seguir el canvi, o fixeu\n"
-"l'opció de configuració 'remote.%s.followRemoteHEAD' a un valor diferent\n"
-"si no voleu veure aquest missatge. Específicament, si executeu\n"
-"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"
-"es deshabilitarà l'avís fins que el remot canviï HEAD a alguna altra cosa."
+"Executeu «git remote set-head %s %s» per a seguir el canvi, o modifiqueu\n"
+"bé l'opció de configuració «remote.%s.followRemoteHEAD» o bé «fetch."
+"followRemoteHEAD»\n"
+"per a gestionar de manera diferent la situació.\n"
+"\n"
+"L'ús d'aquesta configuració específica:\n"
+"\n"
+"    git config set remote.%s.followRemoteHEAD warn-if-not-%s\n"
+"\n"
+"suprimirà l'avís fins que el remot canviï HEAD a alguna altra cosa."
 
 #: builtin/fetch.c
 msgid ""
@@ -8817,16 +9305,16 @@ msgid ""
 "could not set upstream of HEAD to '%s' from '%s' when it does not point to "
 "any branch."
 msgstr ""
-"no s'ha pogut establir la branca amunt de HEAD a «%s» des de «%s» quan no "
-"apunta a cap branca."
+"no s'ha pogut establir la font de HEAD a «%s» des de «%s» quan no apunta a "
+"cap branca."
 
 #: builtin/fetch.c
 msgid "not setting upstream for a remote remote-tracking branch"
-msgstr "no s'estableix el repositori amunt per a una branca de seguiment remot"
+msgstr "no s'estableix la font per a una branca de seguiment remot"
 
 #: builtin/fetch.c
 msgid "not setting upstream for a remote tag"
-msgstr "no s'estableix el repositori amunt per a una etiqueta remota"
+msgstr "no s'estableix la font per a una etiqueta remota"
 
 #: builtin/fetch.c
 msgid "unknown branch type"
@@ -8843,7 +9331,7 @@ msgstr ""
 #: builtin/fetch.c
 #, c-format
 msgid "Fetching %s\n"
-msgstr "S'està obtenint %s\n"
+msgstr "Obtenció de %s en curs\n"
 
 #: builtin/fetch.c
 #, c-format
@@ -8873,7 +9361,7 @@ msgstr "obtén de tots els remots"
 
 #: builtin/fetch.c builtin/pull.c
 msgid "set upstream for git pull/fetch"
-msgstr "estableix la branca amunt per a git pull/fetch"
+msgstr "estableix la font per a git pull/fetch"
 
 #: builtin/fetch.c builtin/pull.c
 msgid "append to .git/FETCH_HEAD instead of overwriting"
@@ -9189,7 +9677,7 @@ msgstr "git for-each-ref "
 
 #: builtin/for-each-repo.c
 msgid "git for-each-repo --config=<config> [--] <arguments>"
-msgstr "git for-each-repo --config=<config> [--] <arguments>"
+msgstr "git for-each-repo --config=<configuració> [--] <arguments>"
 
 #: builtin/for-each-repo.c
 msgid "config"
@@ -9205,7 +9693,7 @@ msgstr "continua fins i tot si l'ordre falla en un repositori"
 
 #: builtin/for-each-repo.c
 msgid "missing --config=<config>"
-msgstr "hi manca --config=<config>"
+msgstr "hi manca --config=<configuració>"
 
 #: builtin/for-each-repo.c
 #, c-format
@@ -9244,7 +9732,7 @@ msgstr ""
 
 #: builtin/fsck.c builtin/prune.c connected.c
 msgid "Checking connectivity"
-msgstr "S'està comprovant la connectivitat"
+msgstr "Comprovació de la connectivitat en curs"
 
 #: builtin/fsck.c
 #, c-format
@@ -9279,17 +9767,22 @@ msgstr "no s'ha pogut finalitzar «%s»"
 #: builtin/fsck.c
 #, c-format
 msgid "Checking %s"
-msgstr "S'està comprovant %s"
+msgstr "Comprovació de %s en curs"
 
 #: builtin/fsck.c
 #, c-format
 msgid "Checking connectivity (%d objects)"
-msgstr "S'està comprovant la connectivitat (%d objectes)"
+msgstr "Comprovació de la connectivitat en curs (%d objectes)"
+
+#: builtin/fsck.c
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s: objecte corrupte o no trobat"
 
 #: builtin/fsck.c
 #, c-format
 msgid "Checking %s %s"
-msgstr "S'està comprovant %s %s"
+msgstr "Comprovació de %s %s en curs"
 
 #: builtin/fsck.c
 msgid "broken links"
@@ -9305,11 +9798,6 @@ msgstr "arrel %s"
 msgid "tagged %s %s (%s) in %s"
 msgstr "marcat %s %s (%s) a %s"
 
-#: builtin/fsck.c
-#, c-format
-msgid "%s: object corrupt or missing"
-msgstr "%s: objecte corrupte o no trobat"
-
 #: builtin/fsck.c
 #, c-format
 msgid "%s: invalid reflog entry %s"
@@ -9318,7 +9806,7 @@ msgstr "%s: entrada de registre de referències no vàlida %s"
 #: builtin/fsck.c
 #, c-format
 msgid "Checking reflog %s->%s"
-msgstr "S'està comprovant el registre de referències %s->%s"
+msgstr "Comprovació del registre de referències %s->%s en curs"
 
 #: builtin/fsck.c
 #, c-format
@@ -9341,64 +9829,26 @@ msgstr "avís: no hi ha referències per defecte"
 
 #: builtin/fsck.c
 #, c-format
-msgid "%s: hash-path mismatch, found at: %s"
-msgstr "%s: el resum del camí no coincideix, trobat a: %s"
+msgid "Checking cache tree of %s"
+msgstr "Comprovació de l'arbre de la memòria cau %s en curs"
 
 #: builtin/fsck.c
 #, c-format
-msgid "%s: object corrupt or missing: %s"
-msgstr "%s: objecte corrupte o no trobat: %s"
+msgid "%s: invalid sha1 pointer in cache-tree of %s"
+msgstr "%s: punter sha1 no vàlid a l'arbre de la memòria cau %s"
 
 #: builtin/fsck.c
-#, c-format
-msgid "%s: object could not be parsed: %s"
-msgstr "%s: no s'ha pogut analitzar l'objecte: %s"
-
-#: builtin/fsck.c
-#, c-format
-msgid "bad sha1 file: %s"
-msgstr "fitxer sha1 malmès: %s"
-
-#: builtin/fsck.c
-msgid "Checking object directory"
-msgstr "S'està comprovant el directori d'objecte"
-
-#: builtin/fsck.c
-msgid "Checking object directories"
-msgstr "S'estan comprovant els directoris d'objecte"
-
-#: builtin/fsck.c
-#, c-format
-msgid "Checking cache tree of %s"
-msgstr "S'està comprovant l'arbre de la memòria cau %s"
-
-#: builtin/fsck.c
-#, c-format
-msgid "%s: invalid sha1 pointer in cache-tree of %s"
-msgstr "%s: punter sha1 no vàlid a l'arbre de la memòria cau %s"
-
-#: builtin/fsck.c
-msgid "non-tree in cache-tree"
-msgstr "un no arbre en l'arbre de la memòria cau"
+msgid "non-tree in cache-tree"
+msgstr "un no arbre en l'arbre de la memòria cau"
 
 #: builtin/fsck.c
 #, c-format
 msgid "%s: invalid sha1 pointer in resolve-undo of %s"
 msgstr "%s: punter sha1 no vàlid a «resolve-undo» de %s"
 
-#: builtin/fsck.c
-#, c-format
-msgid "unable to load rev-index for pack '%s'"
-msgstr "no s'ha pogut carregar l'índex de reversió per al paquet «%s»"
-
-#: builtin/fsck.c
-#, c-format
-msgid "invalid rev-index for pack '%s'"
-msgstr "rev-index no vàlid per al paquet «%s»"
-
 #: builtin/fsck.c
 msgid "Checking ref database"
-msgstr "S'està comprovant la base de dades de referències"
+msgstr "Comprovació de la base de dades de referències en curs"
 
 #: builtin/fsck.c
 msgid ""
@@ -9464,10 +9914,6 @@ msgstr "mostra els noms detallats dels objectes abastables"
 msgid "check reference database consistency"
 msgstr "comprova la consistència de les base de dades de referències"
 
-#: builtin/fsck.c builtin/index-pack.c
-msgid "Checking objects"
-msgstr "S'estan comprovant els objectes"
-
 #: builtin/fsmonitor--daemon.c
 msgid "git fsmonitor--daemon start [<options>]"
 msgstr "git fsmonitor--daemon start [<opcions>]"
@@ -9545,7 +9991,7 @@ msgstr "fsmonitor--daemon is already running «%s»"
 #: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "running fsmonitor-daemon in '%s'\n"
-msgstr "s'està executant fsmonitor-daemon en «%s»\n"
+msgstr "fsmonitor-daemon en execució en «%s»\n"
 
 #: builtin/fsmonitor--daemon.c setup.c
 msgid "setsid failed"
@@ -9554,7 +10000,7 @@ msgstr "«setsid» ha fallat"
 #: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "starting fsmonitor-daemon in '%s'\n"
-msgstr "s'està iniciant fsmonitor-daemon a «%s»\n"
+msgstr "s'inicia fsmonitor-daemon a «%s»\n"
 
 #: builtin/fsmonitor--daemon.c
 msgid "daemon failed to start"
@@ -9684,14 +10130,13 @@ msgstr "no s'ha pogut analitzar el valor de venciment de la poda %s"
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
-"S'està empaquetant el repositori automàticament en el rerefons per a un "
-"rendiment òptim.\n"
+"S'empaqueta el repositori automàticament en segon pla per a un rendiment "
+"òptim.\n"
 
 #: builtin/gc.c
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
-msgstr ""
-"S'està empaquetant automàticament el repositori per a un rendiment òptim.\n"
+msgstr "S'empaqueta automàticament el repositori per a un rendiment òptim.\n"
 
 #: builtin/gc.c
 #, c-format
@@ -9703,14 +10148,7 @@ msgstr "Vegeu «git help gc» per a neteja manual.\n"
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
-"gc ja s'està executant en la màquina «%s» pid %<PRIuMAX> (useu --force si no)"
-
-#: builtin/gc.c
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr ""
-"Hi ha massa objectes solts inabastables; executeu «git prune» per a eliminar-"
-"los."
+"gc ja està en execució en la màquina «%s» pid %<PRIuMAX> (useu --force si no)"
 
 #: builtin/gc.c
 msgid ""
@@ -9759,12 +10197,7 @@ msgstr "ha fallat l'execució de «git multi-pack-index repack»"
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr ""
-"s'està ometent la tasca incremental-repack perquè core.multiPackIndex està "
-"desactivat"
-
-#: builtin/gc.c
-msgid "failed to perform geometric repack"
-msgstr "no s'ha pogut fer el reempaquetament geomètric"
+"s'omet la tasca incremental-repack perquè core.multiPackIndex està desactivat"
 
 #: builtin/gc.c
 #, c-format
@@ -9932,8 +10365,8 @@ msgid ""
 msgstr ""
 "no s'ha pogut crear «%s.lock»: %s.\n"
 "\n"
-"Sembla que un altre procés git-maintenance(1) s'està executant en aquest\n"
-"repositori. Assegureu-vos que no hi ha cap altre proés de manteniment en "
+"Sembla que hi ha un altre procés git-maintenance(1) en execució en aquest\n"
+"repositori. Assegureu-vos que no hi ha cap altre procés de manteniment en "
 "execució\n"
 "i llavors proveu de nou. Si encara falla, potser un procés git-"
 "maintenance(1) \n"
@@ -9946,7 +10379,7 @@ msgstr "no puc adquirir un blocatge per al manteniment en segona mà planificat"
 
 #: builtin/gc.c
 msgid "git maintenance start [--scheduler=<scheduler>]"
-msgstr "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<planificador>]"
 
 #: builtin/gc.c
 msgid "scheduler"
@@ -9986,7 +10419,6 @@ msgstr "grep: s'ha produït un error en crear fil: %s"
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s"
 
-#. #-#-#-#-#  grep.c.po  #-#-#-#-#
 #. TRANSLATORS: %s is the configuration
 #. variable for tweaking threads, currently
 #. grep.threads
@@ -10222,7 +10654,7 @@ msgstr "--untracked no s'admet amb --recurse-submodules"
 
 #: builtin/grep.c
 msgid "invalid option combination, ignoring --threads"
-msgstr "combinació d'opcions no vàlida, s'està ignorant --threads"
+msgstr "combinació d'opcions no vàlida, s'ignora --threads"
 
 #: builtin/grep.c builtin/pack-objects.c
 msgid "no threads support, ignoring --threads"
@@ -10425,6 +10857,14 @@ msgstr "ús: %s%s"
 msgid "'git help config' for more information"
 msgstr "«git help config» per a més informació"
 
+#: builtin/history.c
+msgid ""
+"git history drop <commit> [--dry-run] [--update-refs=(branches|head)] [--"
+"empty=(drop|keep|abort)]"
+msgstr ""
+"git history drop <comissió> [--dry-run] [--update-refs=(branches|head)] [--"
+"empty=(drop|keep|abort)]"
+
 #: builtin/history.c
 msgid ""
 "git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--"
@@ -10454,7 +10894,12 @@ msgid ""
 msgstr ""
 "Introduïu el missatge de comissió dels canvis %s.\n"
 "S'ignoraran les línies que comencin amb «%s». Un missatge de\n"
-"comissió buit avorta la comissió.\n"
+"comissió buit interromp la comissió.\n"
+
+#: builtin/history.c editor.c sequencer.c wrapper.c
+#, c-format
+msgid "could not write to '%s'"
+msgstr "no s'ha pogut escriure a «%s»"
 
 #: builtin/history.c
 #, c-format
@@ -10579,7 +11024,7 @@ msgstr "la fusió ha fallat mentre s'aplicava la correcció"
 
 #: builtin/history.c
 msgid "fixup would produce conflicts; aborting"
-msgstr "la correcció produiria conflictes; s'interromp"
+msgstr "la correcció produiria conflictes; s'abandona"
 
 #: builtin/history.c
 #, c-format
@@ -10605,13 +11050,18 @@ msgstr "no s'han pogut reproduir els descendents"
 msgid "failed writing reworded commit"
 msgstr "no s'ha pogut escriure la comissió reformulada"
 
+#: builtin/history.c
+#, c-format
+msgid "unable to parse tree %s"
+msgstr "no s'ha pogut analitzar l'arbre %s"
+
 #: builtin/history.c
 msgid "unable to populate index with tree"
 msgstr "no s'ha pogut emplenar l'índex amb l'arbre"
 
 #: builtin/history.c
 msgid "unable to acquire index lock"
-msgstr "no puc adquirir un blocatge d'índex"
+msgstr "no s'ha pogut adquirir un blocatge d'índex"
 
 #: builtin/history.c
 msgid "failed reading temporary index"
@@ -10649,6 +11099,37 @@ msgstr "l'ordre espera una comissió o similar"
 msgid "cannot split up merge commit"
 msgstr "no es pot dividir la comissió de fusió"
 
+#: builtin/history.c
+msgid "cannot resolve HEAD commit"
+msgstr "no es pot resoldre la comissió HEAD"
+
+#: builtin/history.c
+msgid "cannot resolve tree for HEAD"
+msgstr "no es pot resoldre l'arbre per a HEAD"
+
+#: builtin/history.c
+msgid "how to handle descendants that become empty"
+msgstr "com gestionar els descendents que queden buits"
+
+#: builtin/history.c
+#, c-format
+msgid "cannot drop merge commit: %s"
+msgstr "no es pot descartar la comissió de fusió %s"
+
+#: builtin/history.c
+msgid "dropping this commit would overwrite local changes; aborting"
+msgstr ""
+"descartar aquesta comissió sobreescriuria els canvis locals; s'abandona"
+
+#: builtin/history.c
+msgid "failed to update references"
+msgstr "s'ha produït un error en actualitzar les referències"
+
+#: builtin/history.c
+#, c-format
+msgid "could not update working tree to new commit %s"
+msgstr "no s'ha pogut actualitzar l'arbre de treball a la nova comissió %s"
+
 #: builtin/hook.c
 msgid ""
 "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-"
@@ -10735,6 +11216,10 @@ msgstr "no s'ha rebut l'objecte esperat %s"
 msgid "object %s: expected type %s, found %s"
 msgstr "objecte %s: s'esperava el tipus %s, s'ha trobat %s"
 
+#: builtin/index-pack.c odb/source-packed.c
+msgid "Checking objects"
+msgstr "Comprovació dels objectes en curs"
+
 #: builtin/index-pack.c
 #, c-format
 msgid "cannot fill %d byte"
@@ -10856,11 +11341,11 @@ msgstr "s'ha produït un error en aplicar la diferència"
 
 #: builtin/index-pack.c
 msgid "Receiving objects"
-msgstr "S'estan rebent objectes"
+msgstr "Recepció d'objectes en curs"
 
 #: builtin/index-pack.c
 msgid "Indexing objects"
-msgstr "S'estan indexant objectes"
+msgstr "Indexació dels objectes en curs"
 
 #: builtin/index-pack.c
 msgid "pack is corrupted (SHA1 mismatch)"
@@ -10880,7 +11365,7 @@ msgstr "confusió més enllà de la bogeria en parse_pack_objects()"
 
 #: builtin/index-pack.c
 msgid "Resolving deltas"
-msgstr "S'estan resolent les diferències"
+msgstr "Resolució de les diferències en curs"
 
 #: builtin/index-pack.c builtin/pack-objects.c
 #, c-format
@@ -11042,11 +11527,11 @@ msgid ""
 "         [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "         [--shared[=<permissions>]] [<directory>]"
 msgstr ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n"
-"         [--separate-git-dir <git-dir>] [--object-format=<format>]\n"
+"git init [-q | --quiet] [--bare] [--template=<directori-plantilla>]\n"
+"         [--separate-git-dir <directori-git>] [--object-format=<format>]\n"
 "         [--ref-format=<format>]\n"
-"         [-b <branch-name> | --initial-branch=<branch-name>]\n"
-"         [--shared[=<permissions>]] [<directori>]"
+"         [-b <nom-branca> | --initial-branch=<nom-branca>]\n"
+"         [--shared[=<permissos>]] [<directori>]"
 
 #: builtin/init-db.c
 msgid "permissions"
@@ -11225,7 +11710,7 @@ msgstr "les línies se separen amb el caràcter NUL"
 
 #: builtin/log.c
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
-msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camí>...]"
+msgstr "git log [<opcions>] [<rang-revisions>] [[--] <camí>...]"
 
 #: builtin/log.c
 msgid "git show [<options>] <object>..."
@@ -11323,7 +11808,7 @@ msgid ""
 "'%s' used to accept any value and treat that as 'true'.\n"
 "Now it only accepts boolean values, like what '%s' does.\n"
 msgstr ""
-"'%s' solia acceptar qualsevol valor i el tractava com a «true».\n"
+"«%s» solia acceptar qualsevol valor i el tractava com a «true».\n"
 "Ara sols accepta valors booleans, com fa «%s».\n"
 
 #: builtin/log.c
@@ -11364,7 +11849,7 @@ msgstr "in-reply-to boig: %s"
 
 #: builtin/log.c
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
-msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
+msgstr "git format-patch [<opcions>] [<des-de> | <rang-revisions>]"
 
 #: builtin/log.c
 msgid "two output directories?"
@@ -11390,10 +11875,10 @@ msgid ""
 "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 ""
-"no s'ha pogut obtenir la branca amunt. Si voleu registrar la comissió base\n"
+"no s'ha pogut obtenir la font. Si voleu registrar la comissió base\n"
 "automàticament, useu git branch --set-upstream-to per a seguir una\n"
 "branca remota. També podeu especificar la comissió base amb --base=<id-"
-"comissio-base> manualment"
+"comissió-base> manualment"
 
 #: builtin/log.c
 msgid "failed to find exact merge base"
@@ -11419,7 +11904,7 @@ msgstr ""
 #: builtin/log.c
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
-msgstr "utilitzant «%s» com a origen de rang de diferències de la sèrie actual"
+msgstr "s'utilitza «%s» com a origen de rang de diferències de la sèrie actual"
 
 #: builtin/log.c
 msgid "use [PATCH n/m] even with a single patch"
@@ -11565,7 +12050,7 @@ msgstr "ID de missatge"
 
 #: builtin/log.c
 msgid "make first mail a reply to <message-id>"
-msgstr "fes que el primer missatge sigui una resposta a <ID de missatge>"
+msgstr "fes que el primer missatge sigui una resposta a <id-missatge>"
 
 #: builtin/log.c
 msgid "boundary"
@@ -11619,7 +12104,8 @@ msgstr ""
 #: builtin/log.c
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
-"mostra els canvis contra <refspec> a la carta de presentació o a un sol pedaç"
+"mostra els canvis contra <especificació-referència> a la carta de "
+"presentació o a un sol pedaç"
 
 #: builtin/log.c builtin/range-diff.c
 msgid "percentage by which creation is weighted"
@@ -11690,7 +12176,7 @@ msgstr "no s'ha pogut llegir el fitxer de signatura «%s»"
 
 #: builtin/log.c
 msgid "Generating patches"
-msgstr "S'estan generant els pedaços"
+msgstr "Generació dels pedaços en curs"
 
 #: builtin/log.c
 msgid "failed to create output files"
@@ -11698,14 +12184,14 @@ msgstr "no s'han pogut crear els fitxers de sortida"
 
 #: builtin/log.c
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
-msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
+msgstr "git cherry [-v] [<amunt> [<cap> [<límit>]]]"
 
 #: builtin/log.c
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr ""
-"No s'ha pogut trobar una branca remota seguida. Especifiqueu <font> "
+"No s'ha pogut trobar una branca remota seguida. Especifiqueu <amunt> "
 "manualment.\n"
 
 #: builtin/ls-files.c builtin/ls-tree.c
@@ -11808,12 +12294,13 @@ msgstr "si qualsevol <fitxer> no és en l'índex, tracta-ho com a error"
 
 #: builtin/ls-files.c builtin/merge-tree.c
 msgid "tree-ish"
-msgstr "arbre"
+msgstr "arbre o similar"
 
 #: builtin/ls-files.c
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr ""
-"pretén que els camins eliminats després de <arbre> encara siguin presents"
+"fes com que els camins eliminats des d'\"print only branches whose upstream "
+"matches <branch> (repeatable)\"<arbre-o-similar> encara són presents"
 
 #: builtin/ls-files.c
 msgid "show debugging data"
@@ -11888,7 +12375,7 @@ msgstr "mostra la referència subjacent a més de l'objecte que assenyali"
 
 #: builtin/ls-tree.c
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
-msgstr "git ls-tree [<opcions>] <arbre> [<camí>...]"
+msgstr "git ls-tree [<opcions>] <arbre-o-similar> [<camí>...]"
 
 #: builtin/ls-tree.c
 msgid "only show trees"
@@ -11978,7 +12465,7 @@ msgstr "utilitza les capçaleres en el cos del missatge"
 
 #: builtin/mailsplit.c
 msgid "reading patches from stdin/tty..."
-msgstr "s'estan llegint pedaços de stdin/tty..."
+msgstr "els pedaços es llegeixen de stdin/tty..."
 
 #: builtin/mailsplit.c
 #, c-format
@@ -12071,6 +12558,11 @@ msgstr "l'objecte «%s» no existeix"
 msgid "Could not write object file"
 msgstr "No s'ha pogut escriure el fitxer de l'objecte"
 
+#: builtin/merge-recursive.c
+#, c-format
+msgid "unknown option %s"
+msgstr "opció desconeguda %s"
+
 #: builtin/merge-recursive.c
 #, c-format
 msgid "could not parse object '%s'"
@@ -12080,12 +12572,12 @@ msgstr "no s'ha pogut analitzar l'objecte «%s»"
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] "no es pot gestionar més d'%d base. S'està ignorant %s."
-msgstr[1] "no es poden gestionar més de %d bases. S'està ignorant %s."
+msgstr[0] "no es pot gestionar més d'%d base. S'ignora %s."
+msgstr[1] "no es poden gestionar més de %d bases. S'ignora %s."
 
 #: builtin/merge-recursive.c
 msgid "not handling anything other than two heads merge."
-msgstr "no s'està gestionant res a part de la fusió de dos caps."
+msgstr "no es gestiona res a banda de la fusió de dos caps."
 
 #: builtin/merge-recursive.c
 #, c-format
@@ -12095,7 +12587,7 @@ msgstr "no s'ha pogut resoldre la referència «%s»"
 #: builtin/merge-recursive.c
 #, c-format
 msgid "Merging %s with %s\n"
-msgstr "S'està fusionant %s amb %s\n"
+msgstr "Fusió de %s amb %s en curs\n"
 
 #: builtin/merge-tree.c
 #, c-format
@@ -12108,7 +12600,7 @@ msgstr "no és quelcom que puguem fusionar"
 
 #: builtin/merge-tree.c builtin/merge.c
 msgid "refusing to merge unrelated histories"
-msgstr "s'està refusant fusionar històries no relacionades"
+msgstr "es refusa fusionar històries no relacionades"
 
 #: builtin/merge-tree.c
 msgid "failure to merge"
@@ -12120,7 +12612,7 @@ msgstr "git merge-tree [--write-tree] [<opcions>] <branca1> <branca2>"
 
 #: builtin/merge-tree.c
 msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>"
-msgstr "git merge-tree [--trivial-merge] <base-tree> <branca1> <branca2>"
+msgstr "git merge-tree [--trivial-merge] <arbre-base> <branca1> <branca2>"
 
 #: builtin/merge-tree.c
 msgid "do a real merge instead of a trivial merge"
@@ -12244,7 +12736,7 @@ msgstr "permet l'avanç ràpid (per defecte)"
 
 #: builtin/merge.c builtin/pull.c
 msgid "abort if fast-forward is not possible"
-msgstr "avorta si l'avanç ràpid no és possible"
+msgstr "interromp si l'avanç ràpid no és possible"
 
 #: builtin/merge.c builtin/pull.c
 msgid "verify that the named commit has a valid GPG signature"
@@ -12269,7 +12761,7 @@ msgstr "usa <nom> en lloc de destinació real"
 
 #: builtin/merge.c
 msgid "abort the current in-progress merge"
-msgstr "avorta la fusió en curs actual"
+msgstr "interromp la fusió en curs actual"
 
 #: builtin/merge.c
 msgid "--abort but leave index and working tree alone"
@@ -12306,12 +12798,12 @@ msgstr "Ja està al dia."
 #: builtin/merge.c
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
-msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n"
+msgstr "Comissió «squash» -- no s'actualitza HEAD\n"
 
 #: builtin/merge.c
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
-msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n"
+msgstr "Cap missatge de fusió -- no s'actualitza el HEAD\n"
 
 #: builtin/merge.c
 #, c-format
@@ -12329,7 +12821,7 @@ msgstr "No s'ha pogut escriure l'índex."
 
 #: builtin/merge.c
 msgid "Not handling anything other than two heads merge."
-msgstr "No s'està gestionant res a part de la fusió de dos caps."
+msgstr "No es gestiona res a banda de la fusió de dos caps."
 
 #: builtin/merge.c builtin/sparse-checkout.c
 #, c-format
@@ -12344,8 +12836,7 @@ msgstr "No s'ha pogut llegir de «%s»"
 #: builtin/merge.c
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
-msgstr ""
-"No s'està cometent la fusió; useu «git commit» per a completar la fusió.\n"
+msgstr "No es comet la fusió; useu «git commit» per a completar la fusió.\n"
 
 #: builtin/merge.c
 msgid ""
@@ -12354,8 +12845,8 @@ msgid ""
 "\n"
 msgstr ""
 "Introduïu un missatge de comissió per a explicar per què aquesta fusió és\n"
-"necessària, especialment si es fusiona una branca amunt actualitzada amb una "
-"branca de tòpic.\n"
+"necessària, especialment si es fusiona una font actualitzada amb una branca "
+"de tòpic.\n"
 "\n"
 
 #: builtin/merge.c
@@ -12370,7 +12861,7 @@ msgid ""
 "the commit.\n"
 msgstr ""
 "Les línies que comencin amb «%s» s'ignoraran, i un missatge buit\n"
-"avorta la comissió.\n"
+"interromp la comissió.\n"
 
 #: builtin/merge.c
 msgid "Empty commit message."
@@ -12398,7 +12889,7 @@ msgstr "No hi ha cap remot per a la branca actual."
 
 #: builtin/merge.c
 msgid "No default upstream defined for the current branch."
-msgstr "No hi ha cap branca amunt per defecte definida per a la branca actual."
+msgstr "No hi ha cap font per defecte definida per a la branca actual."
 
 #: builtin/merge.c
 #, c-format
@@ -12426,7 +12917,7 @@ msgstr "--abort no espera cap argument"
 
 #: builtin/merge.c
 msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."
+msgstr "No hi ha fusió a interrompre (manca MERGE_HEAD)."
 
 #: builtin/merge.c
 msgid "--quit expects no arguments"
@@ -12486,7 +12977,7 @@ msgstr "Es pot fusionar només una comissió a una HEAD buida"
 #: builtin/merge.c
 #, c-format
 msgid "Updating %s..%s\n"
-msgstr "S'estan actualitzant %s..%s\n"
+msgstr "Actualització de %s..%s en curs\n"
 
 #: builtin/merge.c merge-ort-wrappers.c
 #, c-format
@@ -12500,7 +12991,7 @@ msgstr ""
 #: builtin/merge.c
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
-msgstr "S'està intentant una fusió molt trivial en l'índex...\n"
+msgstr "S'intenta una fusió molt trivial dins de l'índex...\n"
 
 #: builtin/merge.c
 #, c-format
@@ -12510,12 +13001,12 @@ msgstr "No.\n"
 #: builtin/merge.c
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
-msgstr "S'està rebobinant l'arbre a la pristina...\n"
+msgstr "Es rebobina l'arbre a l'original...\n"
 
 #: builtin/merge.c
 #, c-format
 msgid "Trying merge strategy %s...\n"
-msgstr "S'està intentant l'estratègia de fusió %s...\n"
+msgstr "S'intenta l'estratègia de fusió %s...\n"
 
 #: builtin/merge.c
 #, c-format
@@ -12530,7 +13021,7 @@ msgstr "L'estratègia de fusió %s ha fallat.\n"
 #: builtin/merge.c
 #, c-format
 msgid "Using the %s strategy to prepare resolving by hand.\n"
-msgstr "S'està usant l'estratègia %s per a preparar la resolució a mà.\n"
+msgstr "S'usa l'estratègia %s per a preparar la resolució a mà.\n"
 
 #: builtin/merge.c
 #, c-format
@@ -12622,6 +13113,12 @@ msgstr "git multi-pack-index [<opcions>] expire"
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<opcions>] repack [--batch-size=<mida>]"
 
+#: builtin/multi-pack-index.c
+#, c-format
+msgid "object directory is not an alternate of the current repository: '%s'"
+msgstr ""
+"el directori d'objectes no és una alternativa del repositori actual: «%s»"
+
 #: builtin/multi-pack-index.c
 msgid "directory"
 msgstr "directori"
@@ -12703,11 +13200,11 @@ msgstr ""
 
 #: builtin/mv.c
 msgid "git mv [-v] [-f] [-n] [-k] <source> <destination>"
-msgstr "git mv [-v] [-f] [-n] [-k] <origen> <destinacio>"
+msgstr "git mv [-v] [-f] [-n] [-k] <origen> <destinació>"
 
 #: builtin/mv.c
 msgid "git mv [-v] [-f] [-n] [-k] <source>... <destination-directory>"
-msgstr "git mv [-v] [-f] [-n] [-k] <origen>... <directori-destinacio>"
+msgstr "git mv [-v] [-f] [-n] [-k] <origen>... <directori-destinació>"
 
 #: builtin/mv.c
 #, c-format
@@ -12741,7 +13238,7 @@ msgstr "la destinació «%s» no és un directori"
 #: builtin/mv.c
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
-msgstr "S'està comprovant el canvi de nom de «%s» a «%s»\n"
+msgstr "Comprovació del canvi de nom de «%s» a «%s» en curs\n"
 
 #: builtin/mv.c
 msgid "bad source"
@@ -12774,7 +13271,7 @@ msgstr "en conflicte"
 #: builtin/mv.c
 #, c-format
 msgid "overwriting '%s'"
-msgstr "s'està sobreescrivint «%s»"
+msgstr "sobreescriptura de «%s»"
 
 #: builtin/mv.c
 msgid "Cannot overwrite"
@@ -12788,6 +13285,14 @@ msgstr "múltiples orígens per a la mateixa destinació"
 msgid "destination directory does not exist"
 msgstr "el directori de destinació no existeix"
 
+#: builtin/mv.c
+msgid "destination is beyond a symbolic link"
+msgstr "la destinació està més enllà d'un enllaç simbòlic"
+
+#: builtin/mv.c
+msgid "destination is not a directory"
+msgstr "la destinació no és un directori"
+
 #: builtin/mv.c
 msgid "destination exists in the index"
 msgstr "la destinació existeix a l'índex"
@@ -12805,12 +13310,12 @@ msgstr "no puc moure «%s» i el seu directori pare «%s» simultàniament"
 #: builtin/mv.c
 #, c-format
 msgid "Renaming %s to %s\n"
-msgstr "S'està canviant el nom de %s a %s\n"
+msgstr "Es canvia el nom de %s a %s\n"
 
 #: builtin/mv.c
 #, c-format
-msgid "renaming '%s' failed"
-msgstr "el canvi del nom de «%s» ha fallat"
+msgid "renaming '%s' to '%s' failed"
+msgstr "el canvi del nom de «%s» a «%s» ha fallat"
 
 #: builtin/name-rev.c
 msgid "git name-rev [<options>] <commit>..."
@@ -12900,15 +13405,15 @@ msgstr "z"
 
 #: builtin/name-rev.c
 msgid "Use NUL for input and output termination"
-msgstr "l'entrada i la sortida es terminen amb NUL"
+msgstr "L'entrada i la sortida s'han de terminar amb NUL"
 
 #: builtin/name-rev.c
 msgid "Use NUL for input termination"
-msgstr "l'entrada es termina amb NUL"
+msgstr "L'entrada s'ha de terminar amb NUL"
 
 #: builtin/name-rev.c
 msgid "Use NUL for output termination"
-msgstr "la sortida es termina amb NUL"
+msgstr "La sortida s'ha de terminar amb NUL"
 
 #: builtin/name-rev.c
 #, c-format
@@ -13077,7 +13582,7 @@ msgstr "s'ha produït un error en copiar les notes de «%s» a «%s»"
 #: builtin/notes.c
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
-msgstr "s'està refusant %s les notes en %s (fora de refs/notes/)"
+msgstr "es refusa aplicar l'ordre %s a les notes en %s (fora de refs/notes/)"
 
 #: builtin/notes.c
 #, c-format
@@ -13114,7 +13619,7 @@ msgstr "reemplaça les notes existents"
 
 #: builtin/notes.c
 msgid "<paragraph-break>"
-msgstr "<paragraph-break>"
+msgstr "<salt-paràgraf>"
 
 #: builtin/notes.c
 msgid "insert <paragraph-break> between paragraphs"
@@ -13136,12 +13641,12 @@ msgstr ""
 #: builtin/notes.c
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
-msgstr "S'estan sobreescrivint les notes existents de l'objecte %s\n"
+msgstr "Se sobreescriuen les notes existents de l'objecte %s\n"
 
 #: builtin/notes.c
 #, c-format
 msgid "Removing note for object %s\n"
-msgstr "S'està eliminant la nota de l'objecte %s\n"
+msgstr "S'elimina la nota de l'objecte %s\n"
 
 #: builtin/notes.c
 msgid "read objects from stdin"
@@ -13235,7 +13740,7 @@ msgstr ""
 
 #: builtin/notes.c
 msgid "Committing unmerged notes"
-msgstr "S'estan cometent les notes sense fusionar"
+msgstr "Es cometen les notes sense fusionar"
 
 #: builtin/notes.c
 msgid "finalize notes merge by committing unmerged notes"
@@ -13247,7 +13752,7 @@ msgstr "S'interromp la resolució de fusió de notes"
 
 #: builtin/notes.c
 msgid "abort notes merge"
-msgstr "avorta la fusió de notes"
+msgstr "interromp la fusió de notes"
 
 #: builtin/notes.c
 msgid "cannot mix --commit, --abort or -s/--strategy"
@@ -13282,8 +13787,8 @@ msgid ""
 "abort'.\n"
 msgstr ""
 "La fusió de notes automàtica ha fallat. Arregleu els conflictes en %s i "
-"cometeu el resultat amb «git notes merge --commit», o avorteu la fusió amb "
-"«git notes merge --abort».\n"
+"cometeu el resultat amb «git notes merge --commit», o interrompeu la fusió "
+"amb «git notes merge --abort».\n"
 
 #: builtin/notes.c builtin/tag.c
 #, c-format
@@ -13398,19 +13903,19 @@ msgstr "objecte esperat a la posició %<PRIuMAX> al paquet %s"
 #: builtin/pack-objects.c
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
-"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets "
-"a causa de pack.packSizeLimit"
+"s'inhabilita l'escriptura de mapes de bits, es divideixen els paquets a "
+"causa de pack.packSizeLimit"
 
 #: builtin/pack-objects.c
 msgid "Writing objects"
-msgstr "S'estan escrivint els objectes"
+msgstr "Escriptura dels objectes en curs"
 
 #: builtin/pack-objects.c builtin/update-index.c
 #, c-format
 msgid "failed to stat %s"
 msgstr "s'ha produït un error en fer stat a %s"
 
-#: builtin/pack-objects.c object-file.c
+#: builtin/pack-objects.c odb/source-loose.c
 #, c-format
 msgid "failed utime() on %s"
 msgstr "ha fallat utime() a %s"
@@ -13427,7 +13932,7 @@ msgstr "escrits %<PRIu32> objectes mentre s'esperaven %<PRIu32>"
 #: builtin/pack-objects.c builtin/repack.c
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
-"s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no "
+"s'inhabilita l'escriptura de mapes de bits, perquè alguns objectes no "
 "s'empaqueten"
 
 #: builtin/pack-objects.c
@@ -13442,7 +13947,7 @@ msgstr "desplaçament base de diferències fora dels límits per a %s"
 
 #: builtin/pack-objects.c builtin/repo.c
 msgid "Counting objects"
-msgstr "S'estan comptant els objectes"
+msgstr "Recompte dels objectes en curs"
 
 #: builtin/pack-objects.c pack-bitmap.c
 #, c-format
@@ -13487,7 +13992,7 @@ msgstr "no s'ha pogut obtenir el tipus de l'objecte: %s"
 
 #: builtin/pack-objects.c
 msgid "Compressing objects by path"
-msgstr "S'estan comprimint els objectes per camí"
+msgstr "Compressió dels objectes per camí en curs"
 
 #: builtin/pack-objects.c
 #, c-format
@@ -13498,7 +14003,7 @@ msgstr[1] "La compressió de diferències basada en camins usa fins a %d fils"
 
 #: builtin/pack-objects.c
 msgid "Compressing objects"
-msgstr "S'estan comprimint els objectes"
+msgstr "Compressió dels objectes en curs"
 
 #: builtin/pack-objects.c
 msgid "inconsistency with delta count"
@@ -13550,7 +14055,7 @@ msgstr "no es pot accedir al fitxer de paquet %s"
 
 #: builtin/pack-objects.c
 msgid "Enumerating cruft objects"
-msgstr "S'estan enumerant els objectes superflus"
+msgstr "Enumeració dels objectes superflus en curs"
 
 #: builtin/pack-objects.c
 msgid "unable to add cruft objects"
@@ -13558,7 +14063,7 @@ msgstr "no s'han pogut afegir els objectes superflus"
 
 #: builtin/pack-objects.c
 msgid "Traversing cruft objects"
-msgstr "S'estan recorrent els objectes superflus"
+msgstr "Recorregut dels objectes superflus en curs"
 
 #: builtin/pack-objects.c
 #, c-format
@@ -13587,10 +14092,25 @@ msgstr "no s'ha pogut obrir l'índex del paquet"
 msgid "loose object at %s could not be examined"
 msgstr "no s'ha pogut examinar l'objecte solt a %s"
 
+#: builtin/pack-objects.c
+#, c-format
+msgid "cannot read object for %s"
+msgstr "no es pot llegir l'objecte per a %s"
+
+#: builtin/pack-objects.c
+#, c-format
+msgid "cannot map object %s to %s"
+msgstr "no és possible mapar l'objecte %s a %s"
+
 #: builtin/pack-objects.c
 msgid "unable to force loose object"
 msgstr "no s'ha pogut forçar l'objecte solt"
 
+#: builtin/pack-objects.c commit-graph.c
+#, c-format
+msgid "could not find commit %s"
+msgstr "no s'ha pogut trobar la comissió %s"
+
 #: builtin/pack-objects.c
 #, c-format
 msgid "not a rev '%s'"
@@ -13637,10 +14157,6 @@ msgstr ""
 "escriu el fitxer d'índex de paquet en la versió de format d'índex "
 "especificada"
 
-#: builtin/pack-objects.c
-msgid "maximum size of each output pack file"
-msgstr "mida màxima de cada fitxer empaquetat de sortida"
-
 #: builtin/pack-objects.c
 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
@@ -13859,7 +14375,7 @@ msgstr "no es pot utilitzar la llista de revisió interna amb --cruft"
 
 #: builtin/pack-objects.c
 msgid "Enumerating objects"
-msgstr "S'estan enumerant els objectes"
+msgstr "Enumeració dels objectes en curs"
 
 #: builtin/pack-objects.c
 #, c-format
@@ -14005,7 +14521,7 @@ msgstr "refspec no vàlida: «%s»"
 
 #: builtin/pull.c
 msgid "ignoring --verify-signatures for rebase"
-msgstr "s'està ignorant --verify-signatures en fer «rebase»"
+msgstr "s'ignora --verify-signatures en fer «rebase»"
 
 #: builtin/pull.c
 msgid ""
@@ -14084,7 +14600,7 @@ msgstr "usa només adreces IPv6"
 #: builtin/pull.c
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
-"S'està actualitzant una branca no nascuda amb canvis afegits a l'índex."
+"Actualització en curs d'una branca no nascuda amb canvis afegits a l'índex."
 
 #: builtin/pull.c
 msgid "pull with rebase"
@@ -14102,7 +14618,7 @@ msgid ""
 "commit %s."
 msgstr ""
 "l'obtenció ha actualitzat el HEAD de la branca actual.\n"
-"s'està avançant ràpidament el vostre arbre de treball des de\n"
+"Avanç ràpid del vostre arbre de treball des de\n"
 "la comissió %s."
 
 #: builtin/pull.c
@@ -14225,9 +14741,8 @@ msgid ""
 "upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
 msgstr ""
 "\n"
-"Perquè això passe automàticament en les branques que no tenen una\n"
-"branca amunt de seguiment, vegeu «push.autoSetupRemote» a «git help "
-"config».\n"
+"Perquè això passi automàticament en les branques que no tenen una\n"
+"font de seguiment, vegeu «push.autoSetupRemote» a «git help config».\n"
 
 #: builtin/push.c
 #, c-format
@@ -14263,7 +14778,7 @@ msgid ""
 "your current branch '%s', without telling me what to push\n"
 "to update which remote branch."
 msgstr ""
-"Esteu pujant al remot «%s», que no és la branca amunt de la vostra\n"
+"Esteu pujant al remot «%s», que no és la font de la vostra\n"
 "branca actual «%s», sense especificar què s'ha de pujar ni quina\n"
 "branca remota s'ha d'actualitzar."
 
@@ -14337,7 +14852,7 @@ msgstr ""
 #: builtin/push.c
 #, c-format
 msgid "Pushing to %s\n"
-msgstr "S'està pujant a %s\n"
+msgstr "Pujada a %s en curs\n"
 
 #: builtin/push.c
 #, c-format
@@ -14349,8 +14864,8 @@ msgid ""
 "recursing into submodule with push.recurseSubmodules=only; using on-demand "
 "instead"
 msgstr ""
-"cerca recursivament en el submòdul amb push.recurseSubmodules=only; "
-"utilitzant «on-demand» en el seu lloc"
+"cerca recursivament en el submòdul amb push.recurseSubmodules=only; utilitza "
+"«on-demand» en el seu lloc"
 
 #: builtin/push.c builtin/send-pack.c submodule-config.c
 #, c-format
@@ -14362,6 +14877,16 @@ msgstr "valor no vàlid per a «%s»"
 msgid "could not push to %s"
 msgstr "no s'ha pogut pujar a %s"
 
+#: builtin/push.c
+#, c-format
+msgid "'%s' is not a valid push target"
+msgstr "«%s» no és una destinació de pujada vàlida"
+
+#: builtin/push.c
+#, c-format
+msgid "Did you mean to use: git push %s %s?"
+msgstr "Volíeu usar: git push %s %s?"
+
 #: builtin/push.c builtin/submodule--helper.c
 msgid "repository"
 msgstr "repositori"
@@ -14412,7 +14937,7 @@ msgstr "programa que rep els paquets"
 
 #: builtin/push.c
 msgid "set upstream for git pull/status"
-msgstr "estableix la branca amunt per a git pull/status"
+msgstr "estableix la font per a git pull/status"
 
 #: builtin/push.c
 msgid "prune locally removed refs"
@@ -14499,15 +15024,16 @@ msgstr "--atomic només es pot usar quan es puja a un sol remot"
 
 #: builtin/range-diff.c
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
-msgstr "git range-diff [<opcions>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr ""
+"git range-diff [<opcions>] <base-antiga>..<cim-antic> <base-nova>..<cim-nou>"
 
 #: builtin/range-diff.c
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
-msgstr "git range-diff [<opcions>] <old-tip>...<new-tip>"
+msgstr "git range-diff [<opcions>] <cim-antic>...<cim-nou>"
 
 #: builtin/range-diff.c
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
-msgstr "git range-diff [<opcions>] <base> <old-tip> <new-tip>"
+msgstr "git range-diff [<opcions>] <base> <cim-antic> <cim-nou>"
 
 #: builtin/range-diff.c
 #, c-format
@@ -14579,7 +15105,7 @@ msgstr "només buida l'índex"
 
 #: builtin/read-tree.c
 msgid "Merging"
-msgstr "S'està fusionant"
+msgstr "Fusió en curs"
 
 #: builtin/read-tree.c
 msgid "perform a merge in addition to a read"
@@ -14646,8 +15172,8 @@ msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
 msgstr ""
-"git rebase [-i] [options] [--exec <ordre>] [--onto <newbase> | --keep-base] "
-"[<font> [<branca>]]"
+"git rebase [-i] [options] [--exec <ordre>] [--onto <base-nova> | --keep-"
+"base] [<amunt> [<branca>]]"
 
 #: builtin/rebase.c
 msgid ""
@@ -14800,11 +15326,11 @@ msgstr "ordre exec buida"
 
 #: builtin/rebase.c
 msgid "rebase onto given branch instead of upstream"
-msgstr "fes un «rebase» en la branca donada en comptes de la branca amunt"
+msgstr "fes un «rebase» sobre la branca donada en comptes de la font"
 
 #: builtin/rebase.c
 msgid "use the merge-base of upstream and branch as the current base"
-msgstr "usa la base de fusió de la branca amunt i la branca com a base actual"
+msgstr "usa la base de fusió de la font i la branca com a base actual"
 
 #: builtin/rebase.c
 msgid "allow pre-rebase hook to run"
@@ -14816,7 +15342,7 @@ msgstr "silenciós. Implica --no-stat"
 
 #: builtin/rebase.c
 msgid "display a diffstat of what changed upstream"
-msgstr "mostra un «diffstat» del que ha canviat a la font"
+msgstr "mostra un «diffstat» del que ha canviat amunt"
 
 #: builtin/rebase.c
 msgid "do not show diffstat of what changed upstream"
@@ -14872,7 +15398,7 @@ msgstr "edita la llista de coses a fer durant un «rebase» interactiu"
 
 #: builtin/rebase.c
 msgid "show the patch file being applied or merged"
-msgstr "mostra el pedaç que s'està aplicant o fusionant"
+msgstr "mostra el pedaç en procés d'aplicació o fusió"
 
 #: builtin/rebase.c
 msgid "use apply strategies to rebase"
@@ -14918,7 +15444,7 @@ msgstr "intenta fer «rebase» de les fusions en comptes d'ometre-les"
 
 #: builtin/rebase.c
 msgid "use 'merge-base --fork-point' to refine upstream"
-msgstr "useu «merge-base --fork-point» per a refinar la branca amunt"
+msgstr "useu «merge-base --fork-point» per a refinar la font"
 
 #: builtin/rebase.c
 msgid "use the given merge strategy"
@@ -14942,9 +15468,7 @@ msgstr "torna a planificar automàticament qualsevol «exec» que falli"
 
 #: builtin/rebase.c
 msgid "apply all changes, even those already present upstream"
-msgstr ""
-"aplica tots els canvis, fins i tot els que ja estan presents a la branca "
-"amunt"
+msgstr "aplica tots els canvis, fins i tot els que ja estan presents amunt"
 
 #: builtin/rebase.c
 msgid "It looks like 'git am' is in progress. Cannot rebase."
@@ -15051,7 +15575,7 @@ msgstr "--reschedule-failed-exec requereix --exec o --interactive"
 #: builtin/rebase.c
 #, c-format
 msgid "invalid upstream '%s'"
-msgstr "la referència amunt «%s» no és vàlida"
+msgstr "la font «%s» no és vàlida"
 
 #: builtin/rebase.c
 msgid "Could not create new root commit"
@@ -15122,8 +15646,7 @@ msgstr "Canvis de %s a %s:\n"
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
-"Primer, s'està rebobinant HEAD per a reproduir el vostre treball al "
-"damunt...\n"
+"Primer, es rebobina el HEAD per a reproduir el vostre treball al damunt...\n"
 
 #: builtin/rebase.c
 msgid "Could not detach HEAD"
@@ -15136,7 +15659,7 @@ msgstr "Avanç ràpid %s a %s.\n"
 
 #: builtin/receive-pack.c
 msgid "git receive-pack <git-dir>"
-msgstr "git receive-pack <git-dir>"
+msgstr "git receive-pack <directori-git>"
 
 #: builtin/receive-pack.c
 msgid ""
@@ -15226,7 +15749,7 @@ msgstr ""
 
 #: builtin/reflog.c
 msgid "git reflog drop [--all [--single-worktree] | <refs>...]"
-msgstr "git reflog drop [--all [--single-worktree] | <refs>...]"
+msgstr "git reflog drop [--all [--single-worktree] | <referències>...]"
 
 #: builtin/reflog.c
 msgid ""
@@ -15235,10 +15758,10 @@ msgid ""
 "                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
 "<refs>...]"
 msgstr ""
-"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
+"git reflog expire [--expire=<data>] [--expire-unreachable=<data>]\n"
 "                  [--rewrite] [--updateref] [--stale-fix]\n"
 "                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
-"<refs>...]"
+"<referèn>...]"
 
 #: builtin/reflog.c
 #, c-format
@@ -15282,8 +15805,8 @@ msgid ""
 "prune entries older than <time> that are not reachable from the current tip "
 "of the branch"
 msgstr ""
-"poda les entrades més antigues de <data> que no es poden accedir des de la "
-"punta actual de la branca"
+"poda les entrades més antigues que <data> a les quals no es pot accedir des "
+"de la punta actual de la branca"
 
 #: builtin/reflog.c
 msgid "prune any reflog entries that point to broken commits"
@@ -15304,12 +15827,12 @@ msgstr ""
 #: builtin/reflog.c
 #, c-format
 msgid "Marking reachable objects..."
-msgstr "S'estan marcant els objectes abastables..."
+msgstr "Es marquen els objectes abastables..."
 
 #: builtin/reflog.c
 #, c-format
 msgid "reflog could not be found: '%s'"
-msgstr "no s'ha pogut trobar el reflog: «%s»"
+msgstr "no s'ha pogut trobar el registre de referències: «%s»"
 
 #: builtin/reflog.c
 msgid "no reflog specified to delete"
@@ -15322,11 +15845,12 @@ msgstr "format de referència no vàlid: %s"
 
 #: builtin/reflog.c
 msgid "drop the reflogs of all references"
-msgstr "descarta els reflogs de totes les referències"
+msgstr "descarta els registres de referències de totes les referències"
 
 #: builtin/reflog.c
 msgid "drop reflogs from the current worktree only"
-msgstr "descarta només els reflogs de l'arbre de treball actual"
+msgstr ""
+"descarta només els registres de referències de l'arbre de treball actual"
 
 #: builtin/reflog.c
 msgid "references specified along with --all"
@@ -15337,7 +15861,7 @@ msgstr "referències especificades conjuntament amb --all"
 msgid "invalid reference name: %s"
 msgstr "nom de referència no vàlid: %s"
 
-#: builtin/reflog.c
+#: builtin/reflog.c builtin/refs.c
 #, c-format
 msgid "invalid old object ID: '%s'"
 msgstr "ID invàlid d'objecte antic: «%s»"
@@ -15347,7 +15871,7 @@ msgstr "ID invàlid d'objecte antic: «%s»"
 msgid "old object '%s' does not exist"
 msgstr "l'objecte antic «%s» no existeix"
 
-#: builtin/reflog.c
+#: builtin/reflog.c builtin/refs.c
 #, c-format
 msgid "invalid new object ID: '%s'"
 msgstr "ID invàlid d'objecte nou: «%s»"
@@ -15388,6 +15912,32 @@ msgstr "git refs exists <referència>"
 msgid "git refs optimize "
 msgstr "git refs optimize "
 
+#: builtin/refs.c
+msgid ""
+"git refs create [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value>"
+msgstr ""
+"git refs create [--message=<raó>] [--no-deref] [--create-reflog] "
+"<referència> <valor-nou>"
+
+#: builtin/refs.c
+msgid "git refs delete [--message=<reason>] [--no-deref] <ref> [<old-value>]"
+msgstr ""
+"git refs delete [--message=<raó>] [--no-deref] <referència> [<valor-antic>]"
+
+#: builtin/refs.c
+msgid ""
+"git refs update [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value> [<old-value>]"
+msgstr ""
+"git refs update [--message=<raó>] [--no-deref] [--create-reflog] "
+"<referència> <valor-nou> [<valor-antic>]"
+
+#: builtin/refs.c
+msgid "git refs rename [--message=<reason>] <old-ref> <new-ref>"
+msgstr ""
+"git refs rename [--message=<raó>] <referència-antiga> <referència-nova>"
+
 #: builtin/refs.c
 msgid "specify the reference format to convert to"
 msgstr "especifiqueu el format de referència al qual voleu convertir"
@@ -15398,7 +15948,7 @@ msgstr "fes una prova no destructiva"
 
 #: builtin/refs.c
 msgid "drop reflogs entirely during the migration"
-msgstr "descarta completament els reflogs durant la migració"
+msgstr "descarta completament els registres de referències durant la migració"
 
 #: builtin/refs.c
 msgid "missing --ref-format=<format>"
@@ -15433,6 +15983,71 @@ msgstr "la referència no existeix"
 msgid "failed to look up reference"
 msgstr "s'ha produït un error en cercar la referència"
 
+#: builtin/refs.c builtin/symbolic-ref.c builtin/update-ref.c
+msgid "reason"
+msgstr "raó"
+
+#: builtin/refs.c builtin/symbolic-ref.c builtin/update-ref.c
+msgid "reason of the update"
+msgstr "raó de l'actualització"
+
+#: builtin/refs.c builtin/update-ref.c
+msgid "update <refname> not the one it points to"
+msgstr "actualitza <nom-referència>, no la que apunti"
+
+#: builtin/refs.c builtin/tag.c builtin/update-ref.c
+msgid "create a reflog"
+msgstr "crea un registre de referències"
+
+#: builtin/refs.c
+msgid "create requires reference name and an object ID"
+msgstr "create requereix un nom de referència i un ID d'objecte"
+
+#: builtin/refs.c
+msgid "refusing to perform update with empty message"
+msgstr "s'ha rebutjat l'actualització amb un missatge buit"
+
+#: builtin/refs.c
+#, c-format
+msgid "invalid object ID: '%s'"
+msgstr "ID d'objecte invàlid: «%s»"
+
+#: builtin/refs.c
+msgid "cannot create reference with null new object ID"
+msgstr "no es pot crear una referència amb un ID d'objecte nou nul"
+
+#: builtin/refs.c
+msgid "delete requires reference name and an optional old object ID"
+msgstr "delete requereix un nom de referència i un ID opcional d'objecte antic"
+
+#: builtin/refs.c
+msgid "cannot delete reference with null old object ID"
+msgstr "no es pot esborrar una referència amb un ID d'objecte antic nul"
+
+#: builtin/refs.c
+msgid "update requires reference name, new value and an optional old value"
+msgstr ""
+"update requereix un nom de referència, un valor nou i un valor antic opcional"
+
+#: builtin/refs.c
+msgid "rename requires old and new reference name"
+msgstr "rename requereix els noms de referència antic i nou"
+
+#: builtin/refs.c
+#, c-format
+msgid "invalid ref format: '%s'"
+msgstr "format de referència no vàlid: «%s»"
+
+#: builtin/refs.c
+#, c-format
+msgid "reference does not exist: '%s'"
+msgstr "la referència «%s» no existeix"
+
+#: builtin/refs.c
+#, c-format
+msgid "reference already exists: '%s'"
+msgstr "la referència «%s» ja existeix"
+
 #: builtin/remote.c
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
@@ -15443,7 +16058,7 @@ msgstr ""
 
 #: builtin/remote.c
 msgid "git remote rename [--[no-]progress] <old> <new>"
-msgstr "git remote rename [--[no-]progress] <vell> <nou>"
+msgstr "git remote rename [--[no-]progress] <antic> <nou>"
 
 #: builtin/remote.c
 msgid "git remote remove <name>"
@@ -15477,7 +16092,7 @@ msgstr "git remote get-url [--push] [--all] <nom>"
 
 #: builtin/remote.c
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
-msgstr "<git remote set-url [--push] <nom> <url-nou> [<url-vell>]"
+msgstr "git remote set-url [--push] <nom> <url-nou> [<url-antic>]"
 
 #: builtin/remote.c
 msgid "git remote set-url --add <name> <newurl>"
@@ -15514,7 +16129,7 @@ msgstr "git remote update [<opcions>] [<grup> | <remot>]..."
 #: builtin/remote.c
 #, c-format
 msgid "Updating %s"
-msgstr "S'està actualitzant %s"
+msgstr "Actualització de %s en curs"
 
 #: builtin/remote.c
 #, c-format
@@ -15598,7 +16213,7 @@ msgstr "més d'un %s"
 #: builtin/remote.c
 #, c-format
 msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
-msgstr "no s'ha gestionat branch.%s.rebase=%s; assumint «true»"
+msgstr "no s'ha gestionat branch.%s.rebase=%s; s'assumeix «true»"
 
 #: builtin/remote.c
 #, c-format
@@ -15664,7 +16279,7 @@ msgstr "No s'ha pogut canviar el nom de la secció de configuració «%s» a «%
 
 #: builtin/remote.c
 msgid "Renaming remote references"
-msgstr "S'està canviant el nom de les referències remotes"
+msgstr "Canvi del nom de les referències remotes en curs"
 
 #: builtin/remote.c
 #, c-format
@@ -15678,8 +16293,7 @@ msgid ""
 "\t%s\n"
 "\tPlease update the configuration manually if necessary."
 msgstr ""
-"No s'està actualitzant l'especificació de referències d'obtenció no per "
-"defecte\n"
+"No s'actualitza l'especificació de referències d'obtenció no per defecte\n"
 "\t%s\n"
 "\tActualitzeu la configuració manualment si és necessari."
 
@@ -15942,7 +16556,7 @@ msgstr "No s'ha pogut configurar %s"
 #: builtin/remote.c
 #, c-format
 msgid "Pruning %s"
-msgstr "S'està podant %s"
+msgstr "Poda de %s en curs"
 
 #: builtin/remote.c
 #, c-format
@@ -16022,11 +16636,13 @@ msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
 msgid ""
 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]"
+"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]\n"
+"[--filter=<filter-spec>] [--drop-filtered [--dry-run]]"
 msgstr ""
 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<nom-paquet>]\n"
-"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]"
+"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]\n"
+"[--filter=<especificació-filtre>] [--drop-filtered [--dry-run]]"
 
 #: builtin/repack.c
 msgid ""
@@ -16164,6 +16780,47 @@ msgstr ""
 "prefix del paquet per a emmagatzemar un paquet que contingui objectes "
 "filtrats"
 
+#: builtin/repack.c
+msgid "delete filtered out objects (requires --filter)"
+msgstr "esborra els objectes descartats (requereix --filter)"
+
+#: builtin/repack.c
+msgid "only show which objects would be dropped"
+msgstr "només mostra quins objectes es descartarien"
+
+#: builtin/repack.c
+msgid "--dry-run only takes effect with --drop-filtered"
+msgstr "--dry-run només té efecte amb --drop-filtered"
+
+#: builtin/repack.c
+msgid "--drop-filtered requires --filter"
+msgstr "--drop-filtered requereix --filter"
+
+#: builtin/repack.c
+msgid "--drop-filtered requires -a"
+msgstr "--drop-filtered requereix -a"
+
+#: builtin/repack.c
+msgid "--drop-filtered only supports --filter=blob:limit=<n> for now"
+msgstr "--drop-filtered només admet --filter=blob:limit=<n> de moment"
+
+#: builtin/repack.c
+msgid "--drop-filtered requires a promisor remote"
+msgstr "--drop-filtered requereix un remot garant"
+
+#: builtin/repack.c
+msgid ""
+"--drop-filtered cannot be used while another operation (merge, rebase, am, "
+"cherry-pick, revert, or bisect) is in progress"
+msgstr ""
+"no es pot usar --drop-filtered mentre s'executa una altra operació (merge, "
+"rebase, am, cherry-pick, revert, or bisect)"
+
+#: builtin/repack.c
+#, c-format
+msgid "cannot drop '%s' (%s): it is referenced by the current index"
+msgstr "no es pot descartar «%s» (%s): hi fa referència l'índex actual"
+
 #: builtin/repack.c
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "no es poden suprimir paquets en un repositori d'objectes preciosos"
@@ -16386,7 +17043,7 @@ msgstr "usa aquest format"
 
 #: builtin/replace.c
 msgid "--format cannot be used when not listing"
-msgstr "no es pot utilitzar «--format» quan no s'està llistant"
+msgstr "no es pot utilitzar «--format» quan no hi ha un llistat en curs"
 
 #: builtin/replace.c
 msgid "-f only makes sense when writing a replacement"
@@ -16429,11 +17086,11 @@ msgstr "valor de %s invàlid: «%s»"
 msgid ""
 "(EXPERIMENTAL!) git replay ([--contained] --onto=<newbase> | --"
 "advance=<branch> | --revert=<branch>)\n"
-"[--ref=<ref>] [--ref-action=<mode>] <revision-range>"
+"[--ref=<ref>] [--ref-action=<mode>] [--linearize] <revision-range>"
 msgstr ""
 "(EXPERIMENTAL!) git replay ([--contained] --onto=<base-nova> | --"
 "advance=<branca> | --revert=<branca>)\n"
-"[--ref=<referència>] [--ref-action=<mode>] <rang-revisions>"
+"[--ref=<referència>] [--ref-action=<mode>] [--linearize] <rang-revisions>"
 
 #: builtin/replay.c
 msgid "update all branches that point at commits in <revision-range>"
@@ -16461,6 +17118,12 @@ msgid "control ref update behavior (update|print)"
 msgstr ""
 "controlar el comportament de l'actualització de referències (update|print)"
 
+#: builtin/replay.c
+msgid "drop merge commits, replaying only non-merge commits"
+msgstr ""
+"descarta les comissions de fusió, tot reproduint només les comissions que no "
+"ho són"
+
 #: builtin/replay.c
 msgid "exactly one of --onto, --advance, or --revert is required"
 msgstr "es requereix exactament una de: --onto, --advance, o --revert"
@@ -16474,6 +17137,14 @@ msgstr ""
 "algunes opcions de referència se sobreescriuran de forma forçada com a «%s» "
 "bits a «struct rev_info»"
 
+#: builtin/repo.c
+msgid "unable to get common directory"
+msgstr "no s'ha pogut obtenir el directori comú"
+
+#: builtin/repo.c
+msgid "unable to get git directory"
+msgstr "no s'ha pogut obtenir el directori git"
+
 #: builtin/repo.c
 #, c-format
 msgid "key '%s' not found"
@@ -16506,7 +17177,7 @@ msgstr "mostra les claus"
 
 #: builtin/repo.c
 msgid "--keys cannot be used with a <key> or --all"
-msgstr "--keys no es pot usar amb <key> o --all"
+msgstr "--keys no es pot usar amb <clau> o --all"
 
 #: builtin/repo.c
 msgid "unsupported output format"
@@ -16514,7 +17185,7 @@ msgstr "format de sortida no admès"
 
 #: builtin/repo.c
 msgid "--all and <key> cannot be used together"
-msgstr "--all i <key> no es poden usar simultàniament"
+msgstr "--all i <clau> no es poden usar simultàniament"
 
 #: builtin/repo.c
 msgid "References"
@@ -16590,7 +17261,7 @@ msgstr "Valor"
 
 #: builtin/repo.c
 msgid "Counting references"
-msgstr "Comptant referències"
+msgstr "Recompte de referències en curs"
 
 #: builtin/rerere.c
 msgid ""
@@ -16620,17 +17291,18 @@ msgstr ""
 
 #: builtin/reset.c
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
-msgstr "git reset [-q] [<tree-ish>] [--] <especificació-camí>..."
+msgstr "git reset [-q] [<arbre-o-similar>] [--] <especificació-camí>..."
 
 #: builtin/reset.c
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
-"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<arbre-o-"
+"similar>]"
 
 #: builtin/reset.c
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
-msgstr "git reset --patch [<tree-ish>] [--] [<especificació-camí>...]"
+msgstr "git reset --patch [<arbre-o-similar>] [--] [<especificació-camí>...]"
 
 #: builtin/reset.c
 msgid "mixed"
@@ -16757,6 +17429,10 @@ msgstr "No s'ha pogut escriure el fitxer d'índex nou."
 msgid "unable to get disk usage of %s"
 msgstr "no s'ha pogut obtenir l'ús del disc de %s"
 
+#: builtin/rev-list.c
+msgid "--missing-only requires --missing=print or --missing=print-info"
+msgstr "--missing-only requereix --missing=print o --missing=print-info"
+
 #: builtin/rev-list.c
 #, c-format
 msgid "invalid value for '%s': '%s', the only allowed format is '%s'"
@@ -16815,9 +17491,9 @@ msgid ""
 "\n"
 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
 msgstr ""
-"git rev-parse --parseopt [<opcions>] -- [<args>...]\n"
-"   o bé: git rev-parse --sq-quote [<arg>...]\n"
-"   o bé: git rev-parse [<opcions>] [<arg>...]\n"
+"git rev-parse --parseopt [<opcions>] -- [<arguments>...]\n"
+"   o bé: git rev-parse --sq-quote [<argument>...]\n"
+"   o bé: git rev-parse [<opcions>] [<argument>...]\n"
 "\n"
 "Executeu «git rev-parse --parseopt -h» per a més informació sobre el primer "
 "ús."
@@ -17113,7 +17789,7 @@ msgstr "imprimeix l'estat des de l'ajudant remot"
 
 #: builtin/shortlog.c
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
-msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] <camí>...]"
+msgstr "git shortlog [<opcions>] [<rang-revisions>] [[--] <camí>...]"
 
 #: builtin/shortlog.c
 msgid "git log --pretty=short | git shortlog [<options>]"
@@ -17193,8 +17869,8 @@ msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referència>]"
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
-msgstr[0] "s'està ignorant %s; no es pot gestionar més de %d referència"
-msgstr[1] "s'està ignorant %s; no es poden gestionar més de %d referències"
+msgstr[0] "s'ignora %s; no es pot gestionar més de %d referència"
+msgstr[1] "s'ignora %s; no es poden gestionar més de %d referències"
 
 #: builtin/show-branch.c
 #, c-format
@@ -17632,7 +18308,7 @@ msgstr ""
 
 #: builtin/sparse-checkout.c
 msgid "use patterns in <file> instead of the current ones."
-msgstr "utilitza patrons en <file> en lloc dels actuals."
+msgstr "utilitza patrons en <fitxer> en lloc dels actuals."
 
 #: builtin/stash.c
 msgid "git stash list [<log-options>]"
@@ -17664,7 +18340,7 @@ msgstr ""
 
 #: builtin/stash.c
 msgid "git stash branch <branchname> [<stash>]"
-msgstr "git stash branch <nom-de-branca> [<stash>]"
+msgstr "git stash branch <nom-branca> [<stash>]"
 
 #: builtin/stash.c
 msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>"
@@ -17739,7 +18415,7 @@ msgid ""
 "            %s -> %s\n"
 "         to make room.\n"
 msgstr ""
-"AVÍS: El fitxer no seguit en el camí del fitxer seguit!  S'està reanomenant\n"
+"AVÍS: El fitxer no seguit en el camí del fitxer seguit!  Es reanomena\n"
 "            %s -> %s\n"
 "         per a fer-ne espai.\n"
 
@@ -17763,7 +18439,7 @@ msgstr "no s'ha pogut desar l'arbre d'índex"
 #: builtin/stash.c
 #, c-format
 msgid "Merging %s with %s"
-msgstr "S'està fusionant %s amb %s"
+msgstr "Fusió de %s amb %s en curs"
 
 #: builtin/stash.c
 msgid "Index was not unstashed."
@@ -18033,7 +18709,7 @@ msgid ""
 "authoritative upstream."
 msgstr ""
 "no s'ha pogut trobar la configuració «%s». S'assumeix que aquest repositori "
-"és el seu repositori amunt de referència."
+"és la seva font de referència."
 
 #: builtin/submodule--helper.c
 #, c-format
@@ -18052,7 +18728,7 @@ msgstr "No s'ha trobat cap url per al camí de submòdul «%s» a .gitmodules"
 #: builtin/submodule--helper.c
 #, c-format
 msgid "Entering '%s'\n"
-msgstr "S'està entrant a «%s»\n"
+msgstr "S'entra a «%s»\n"
 
 #: builtin/submodule--helper.c
 #, c-format
@@ -18094,8 +18770,9 @@ msgid ""
 "submodule.%s.gitdir .git/modules/%s'"
 msgstr ""
 "no s'ha pogut establir una configuració per defecte vàlida per a 'submodule."
-"%s.gitdir'. Si us plau, assegureu-vos que està d, per exemple, executant "
-"alguna ordre de l'estil de: 'git config submodule.%s.gitdir .git/modules/%s'"
+"%s.gitdir'. Si us plau, assegureu-vos que està definit, per exemple, "
+"executant alguna ordre de l'estil de: 'git config submodule.%s.gitdir .git/"
+"modules/%s'"
 
 #: builtin/submodule--helper.c
 #, c-format
@@ -18240,7 +18917,7 @@ msgstr ""
 #: builtin/submodule--helper.c
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
-msgstr "S'està sincronitzant l'url del submòdul per a «%s»\n"
+msgstr "Sincronització de l'url del submòdul per a «%s» en curs\n"
 
 #: builtin/submodule--helper.c
 #, c-format
@@ -18431,12 +19108,12 @@ msgstr "Potser voleu usar «update --init»?"
 #: builtin/submodule--helper.c
 #, c-format
 msgid "Skipping unmerged submodule %s"
-msgstr "S'està ometent el submòdul no fusionat %s"
+msgstr "S'omet el submòdul no fusionat %s"
 
 #: builtin/submodule--helper.c
 #, c-format
 msgid "Skipping submodule '%s'"
-msgstr "S'està ometent el submòdul «%s»"
+msgstr "S'omet el submòdul «%s»"
 
 #: builtin/submodule--helper.c
 #, c-format
@@ -18497,7 +19174,7 @@ msgstr "El camí de submòdul «%s»: '%s %s'\n"
 #, c-format
 msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
 msgstr ""
-"No s'ha pogut obtenir en el camí de submòdul «$%s»; s'està intentant obtenir "
+"No s'ha pogut obtenir en el camí de submòdul «$%s»; s'intenta obtenir "
 "directament %s:"
 
 #: builtin/submodule--helper.c
@@ -18672,12 +19349,12 @@ msgstr ""
 #: builtin/submodule--helper.c
 #, c-format
 msgid "creating branch '%s'"
-msgstr "s'està creant la branca «%s»"
+msgstr "es crea la branca «%s»"
 
 #: builtin/submodule--helper.c
 #, c-format
 msgid "Adding existing repo at '%s' to the index\n"
-msgstr "S'està afegint el repositori existent a «%s» a l'índex\n"
+msgstr "S'afig el repositori existent a «%s» a l'índex\n"
 
 #: builtin/submodule--helper.c
 #, c-format
@@ -18710,7 +19387,7 @@ msgstr ""
 #: builtin/submodule--helper.c
 #, c-format
 msgid "Reactivating local git directory for submodule '%s'\n"
-msgstr "S'està reactivant el directori de git local per al submòdul «%s»\n"
+msgstr "Es reactiva el directori de git local per al submòdul «%s»\n"
 
 #: builtin/submodule--helper.c
 #, c-format
@@ -18823,14 +19500,6 @@ msgstr "escurça la sortida de referències"
 msgid "recursively dereference (default)"
 msgstr "desreferencia recursivament (per defecte)"
 
-#: builtin/symbolic-ref.c builtin/update-ref.c
-msgid "reason"
-msgstr "raó"
-
-#: builtin/symbolic-ref.c builtin/update-ref.c
-msgid "reason of the update"
-msgstr "raó de l'actualització"
-
 #: builtin/tag.c
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
@@ -18974,10 +19643,6 @@ msgstr "usa una altra clau per a signar l'etiqueta"
 msgid "replace the tag if exists"
 msgstr "reemplaça l'etiqueta si existeix"
 
-#: builtin/tag.c builtin/update-ref.c
-msgid "create a reflog"
-msgstr "crea un registre de referències"
-
 #: builtin/tag.c
 msgid "Tag listing options"
 msgstr "Opcions de llistat d'etiquetes"
@@ -19054,7 +19719,7 @@ msgstr "l'objecte blob del flux no és vàlid"
 
 #: builtin/unpack-objects.c
 msgid "Unpacking objects"
-msgstr "S'estan desempaquetant els objectes"
+msgstr "Desempaquetament dels objectes en curs"
 
 #: builtin/update-index.c
 #, c-format
@@ -19074,7 +19739,7 @@ msgstr "s'ha produït un error en suprimir el directori %s"
 #: builtin/update-index.c
 #, c-format
 msgid "Testing mtime in '%s' "
-msgstr "S'està provant mtime en «%s» "
+msgstr "Comprovació de mtime en «%s» en curs "
 
 #: builtin/update-index.c
 msgid "directory stat info does not change after adding a new file"
@@ -19276,7 +19941,7 @@ msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgstr ""
-"core.splitIndex s'ha definit com a fals; elimineu-lo o canviar-lo, si "
+"core.splitIndex s'ha definit com a fals; elimineu-lo o canvieu-lo, si "
 "realment voleu habilitar l'índex dividit"
 
 #: builtin/update-index.c
@@ -19335,11 +20000,11 @@ msgstr "fsmonitor inhabilitat"
 
 #: builtin/update-ref.c
 msgid "git update-ref [<options>] -d <refname> [<old-oid>]"
-msgstr "git update-ref [<opcions>] -d <nom-referència> [<oid-vell>]"
+msgstr "git update-ref [<opcions>] -d <nom-referència> [<oid-antic>]"
 
 #: builtin/update-ref.c
 msgid "git update-ref [<options>]    <refname> <new-oid> [<old-oid>]"
-msgstr "git update-ref [<opcions>]    <nom-referència> <oid-nou> [<oid-vell>]"
+msgstr "git update-ref [<opcions>]    <nom-referència> <oid-nou> [<oid-antic>]"
 
 #: builtin/update-ref.c
 msgid "git update-ref [<options>] --stdin [-z] [--batch-updates]"
@@ -19349,10 +20014,6 @@ msgstr "git update-ref [<opcions>] --stdin [-z] [--batch-updates]"
 msgid "delete the reference"
 msgstr "suprimeix la referència"
 
-#: builtin/update-ref.c
-msgid "update <refname> not the one it points to"
-msgstr "actualitza <nom-referència>, no la que apunti"
-
 #: builtin/update-ref.c
 msgid "stdin has NUL-terminated arguments"
 msgstr "stdin té arguments acabats amb NUL"
@@ -19462,7 +20123,7 @@ msgstr "git worktree move <arbre-treball> <camí-nou>"
 
 #: builtin/worktree.c
 msgid "git worktree prune [-n] [-v] [--expire <expire>]"
-msgstr "git worktree prune [-n] [-v] [--expire <expire>]"
+msgstr "git worktree prune [-n] [-v] [--expire <caducitat>]"
 
 #: builtin/worktree.c
 msgid "git worktree remove [-f] <worktree>"
@@ -19489,9 +20150,9 @@ msgid ""
 "\n"
 "    git worktree add --orphan -b %s %s\n"
 msgstr ""
-"Si voleu crear un arbre de treball que contingui una branca no nascuda\n"
-"nova (branca sense comissions) per a aquest repositori, podeu fer-ho\n"
-"utilitzant l'argument --orphan:\n"
+"Si voleu crear un arbre de treball que contingui una branca nova no\n"
+"nascuda (branca sense comissions) per a aquest repositori, podeu fer-ho\n"
+"tot utilitzant l'argument --orphan:\n"
 "\n"
 "    git worktree add --orphan -b %s %s\n"
 
@@ -19504,16 +20165,16 @@ msgid ""
 "\n"
 "    git worktree add --orphan %s\n"
 msgstr ""
-"Si voleu crear un arbre de treball que contingui una branca no nascuda\n"
-"nova (branca sense comissions) per a aquest repositori, podeu fer-ho\n"
-"utilitzant l'argument --orphan:\n"
+"Si voleu crear un arbre de treball que contingui una branca nova no \n"
+"nascuda (branca sense comissions) per a aquest repositori, podeu fer-ho\n"
+"tot utilitzant l'argument --orphan:\n"
 "\n"
 "    git worktree add --orphan %s\n"
 
 #: builtin/worktree.c
 #, c-format
 msgid "Removing %s/%s: %s"
-msgstr "S'està eliminant %s/%s: %s"
+msgstr "S'elimina %s/%s: %s"
 
 #: builtin/worktree.c
 msgid "report pruned working trees"
@@ -19577,7 +20238,7 @@ msgstr "no s'ha pogut crear directori de «%s»"
 
 #: builtin/worktree.c
 msgid "initializing"
-msgstr "s'està inicialitzant"
+msgstr "inicialització en curs"
 
 #: builtin/worktree.c
 #, c-format
@@ -19587,24 +20248,24 @@ msgstr "no s'ha pogut trobar l'arbre de treball creat «%s»"
 #: builtin/worktree.c
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
-msgstr "S'està preparant l'arbre de treball (branca nova «%s»)"
+msgstr "Preparació de l'arbre de treball en curs (branca nova «%s»)"
 
 #: builtin/worktree.c
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
-"S'està preparant l'arbre de treball (s'està reiniciant la branca «%s»; "
-"estava a %s)"
+"Preparació de l'arbre de treball en curs (es reinicia la branca «%s»; era a "
+"%s)"
 
 #: builtin/worktree.c
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
-msgstr "S'està preparant l'arbre de treball (s'està agafant «%s»)"
+msgstr "Preparació de l'arbre de treball en curs (s'agafa «%s»)"
 
 #: builtin/worktree.c
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
-msgstr "S'està preparant l'arbre de treball (HEAD %s separat)"
+msgstr "Preparació de l'arbre de treball en curs (HEAD separat %s)"
 
 #: builtin/worktree.c
 msgid "HEAD points to an invalid (or orphaned) reference.\n"
@@ -19618,6 +20279,26 @@ msgstr ""
 "No hi ha referències locals o remotes malgrat hi existeix almenys un\n"
 "remot, aturada; useu «add -f» per a anul·lar o obtenir primer un remot"
 
+#: builtin/worktree.c
+#, c-format
+msgid ""
+"If you meant to create a worktree from a remote tracking branch on\n"
+"<remote>, you can do so by:\n"
+"\n"
+"    git worktree add -b %s %s <remote>/%s\n"
+"\n"
+"If you'd like to always prefer some remote, e.g. 'origin',\n"
+"consider setting checkout.defaultRemote=origin in your config."
+msgstr ""
+"Si el que volíeu era crear un arbre de treball a partir d'una branca de "
+"seguiment remota en\n"
+"<remot>, podeu fer-ho així:\n"
+"\n"
+"    git worktree add -b %s %s <remot>/%s\n"
+"\n"
+"Si voldríeu preferir sempre algun remot, p.ex. «origin»,\n"
+"considereu establir checkout.defaultRemote=origin en la vostra configuració."
+
 #: builtin/worktree.c
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "agafa <branca> encara que sigui agafada en altre arbre de treball"
@@ -19889,6 +20570,11 @@ msgstr "no s'ha pogut baixar el paquet de l'URI «%s»"
 msgid "file at URI '%s' is not a bundle or bundle list"
 msgstr "el fitxer a l'URI «%s» no és farcell o una llista de farcells"
 
+#: bundle-uri.c
+#, c-format
+msgid "config '%s' has no value"
+msgstr "hi manca el valor de la configuració «%s»"
+
 #: bundle-uri.c
 #, c-format
 msgid "bundle-uri: unexpected argument: '%s'"
@@ -19999,7 +20685,7 @@ msgstr "no es pot escriure la versió del farcell %d amb l'algorisme %s"
 
 #: bundle.c
 msgid "Refusing to create empty bundle."
-msgstr "S'està refusant crear un farcell buit."
+msgstr "Es refusa crear un farcell buit."
 
 #: bundle.c
 #, c-format
@@ -20150,7 +20836,7 @@ msgstr "Copia fitxers des de l'índex a l'arbre de treball"
 
 #: command-list.h
 msgid "Find commits yet to be applied to upstream"
-msgstr "Troba les comissions pendents d'integrar a la branca amunt"
+msgstr "Troba les comissions pendents d'integrar a la font"
 
 #: command-list.h
 msgid "Apply the changes introduced by some existing commits"
@@ -20364,9 +21050,8 @@ msgid "Instantly browse your working repository in gitweb"
 msgstr "Navegueu instantàniament pel vostre repositori de treball a gitweb"
 
 #: command-list.h
-msgid "Add or parse structured information in commit messages"
-msgstr ""
-"Afegeix o analitza la informació estructurada en els missatges de comissió"
+msgid "Add or parse metadata in commit messages"
+msgstr "Afegeix o analitza les metadades en els missatges de comissió"
 
 #: command-list.h
 msgid "EXPERIMENTAL: Show when files were last modified"
@@ -20742,6 +21427,10 @@ msgstr "Proporcionar noms d'usuari i contrasenyes a Git"
 msgid "Git for CVS users"
 msgstr "Git per a usuaris del CVS"
 
+#: command-list.h
+msgid "Git's core data model"
+msgstr "Model de dades central del Git"
+
 #: command-list.h
 msgid "Tweaking diff output"
 msgstr "Ajustament de la sortida de diferències"
@@ -20840,7 +21529,7 @@ msgstr "L'especificació de revisions i rangs per al Git"
 
 #: command-list.h
 msgid "Mounting one repository inside another"
-msgstr "Muntant un repositori dins un altre"
+msgstr "Es munta un repositori dins un altre"
 
 #: command-list.h
 msgid "A tutorial introduction to Git"
@@ -20881,7 +21570,8 @@ msgstr "el fragment de cerca OID és de mida incorrecta"
 
 #: commit-graph.c
 msgid "commit-graph commit data chunk is wrong size"
-msgstr "el fragment de dades del graf de comissions és de mida incorrecta"
+msgstr ""
+"el fragment de dades de comissió del graf de comissions és de mida incorrecta"
 
 #: commit-graph.c
 msgid "commit-graph generations chunk is wrong size"
@@ -20940,8 +21630,8 @@ msgstr ""
 #: commit-graph.c
 msgid "commit-graph required commit data chunk missing or corrupted"
 msgstr ""
-"manca o està corromput el fragment de dades de publicació requerit pel graf "
-"de comissions"
+"manca o està corromput el fragment de dades de comissió requerit pel graf de "
+"comissions"
 
 #: commit-graph.c
 #, c-format
@@ -20990,11 +21680,6 @@ msgstr ""
 "posició de la comissió no vàlida. Probablement el graf de comissions està "
 "malmès"
 
-#: commit-graph.c
-#, c-format
-msgid "could not find commit %s"
-msgstr "no s'ha pogut trobar la comissió %s"
-
 #: commit-graph.c
 msgid "commit-graph requires overflow generation data but has none"
 msgstr ""
@@ -21013,41 +21698,42 @@ msgstr "punter de vores extra del graf de comissió està fora dels límits"
 
 #: commit-graph.c
 msgid "Loading known commits in commit graph"
-msgstr "S'estan carregant comissions conegudes al graf de comissions"
+msgstr "Càrrega de comissions conegudes al graf de comissions en curs"
 
 #: commit-graph.c
 msgid "Expanding reachable commits in commit graph"
-msgstr "S'estan expandint les comissions abastables al graf de comissions"
+msgstr "Expansió de les comissions abastables al graf de comissions en curs"
 
 #: commit-graph.c
 msgid "Clearing commit marks in commit graph"
-msgstr "S'estan esborrant les marques de comissions al graf de comissions"
+msgstr "S'esborren les marques de comissions al graf de comissions"
 
 #: commit-graph.c
 msgid "Computing commit graph topological levels"
-msgstr "S'estan calculant els nivells topològics del graf de comissions"
+msgstr "Es calculen els nivells topològics del graf de comissions"
 
 #: commit-graph.c
 msgid "Computing commit graph generation numbers"
-msgstr "S'estan calculant els nombres de generació del graf de comissions"
+msgstr "Es calculen els nombres de generació del graf de comissions"
 
 #: commit-graph.c
 msgid "Computing commit changed paths Bloom filters"
-msgstr ""
-"S'estan calculant els canvis les rutes de la comissió en els filtres de Bloom"
+msgstr "Càlcul dels filtres de Bloom de les rutes modificades de la comissió"
 
 #: commit-graph.c
 msgid "Collecting referenced commits"
-msgstr "S'estan recollint els objectes referenciats"
+msgstr "Recollida de les comissions referenciades en curs"
 
 #: commit-graph.c
 #, c-format
 msgid "Finding commits for commit graph in %<PRIuMAX> pack"
 msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
 msgstr[0] ""
-"S'estan cercant les comissions pel graf de comissions en %<PRIuMAX> paquet"
+"Cerca de les comissions per al graf de comissions en %<PRIuMAX> paquet en "
+"curs"
 msgstr[1] ""
-"S'estan cercant les comissions pel graf de comissions en %<PRIuMAX> paquets"
+"Cerca de les comissions per al graf de comissions en %<PRIuMAX> paquets en "
+"curs"
 
 #: commit-graph.c
 #, c-format
@@ -21062,12 +21748,12 @@ msgstr "s'ha produït un error en obrir l'índex per «%s»"
 #: commit-graph.c
 msgid "Finding commits for commit graph among packed objects"
 msgstr ""
-"S'estan cercant les comissions pel graf de comissions entre els objectes "
-"empaquetats"
+"Cerca de les comissions per al graf de comissions entre els objectes "
+"empaquetats en curs"
 
 #: commit-graph.c
 msgid "Finding extra edges in commit graph"
-msgstr "S'estan cercant les vores addicionals al graf de comissions"
+msgstr "Cerca en curs de les vores addicionals al graf de comissions"
 
 #: commit-graph.c
 msgid "failed to write correct number of base graph ids"
@@ -21087,8 +21773,8 @@ msgstr "no s'han pogut ajustar els permisos compartits per a «%s»"
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
-msgstr[0] "S'està escrivint el graf de comissions en %d pas"
-msgstr[1] "S'està escrivint el graf de comissions en %d passos"
+msgstr[0] "S'escriu el graf de comissions en %d passada"
+msgstr[1] "S'escriu el graf de comissions en %d passades"
 
 #: commit-graph.c
 msgid "unable to open commit-graph chain file"
@@ -21115,17 +21801,17 @@ msgstr "no es pot fusionar el graf %s, hi ha massa comissions: %<PRIuMAX>"
 
 #: commit-graph.c
 msgid "Scanning merged commits"
-msgstr "S'estan escanejant les comissions fusionades"
+msgstr "Escaneig de les comissions fusionades en curs"
 
 #: commit-graph.c
 msgid "Merging commit-graph"
-msgstr "S'està fusionant el graf de comissions"
+msgstr "Fusió del graf de comissions en curs"
 
 #: commit-graph.c
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr ""
-"s'està intentant escriure un graf de comissions, però «core.commitGraph» "
-"està desactivat"
+"s'intenta escriure un graf de comissions, però «core.commitGraph» està "
+"desactivat"
 
 #: commit-graph.c
 #, c-format
@@ -21220,13 +21906,21 @@ msgstr ""
 
 #: commit-graph.c
 msgid "Verifying commits in commit graph"
-msgstr "S'estan verificant les comissions al graf de comissions"
+msgstr "Verificació de les comissions al graf de comissions en curs"
 
 #: commit-reach.c sequencer.c
 #, c-format
 msgid "could not parse commit %s"
 msgstr "no s'ha pogut analitzar la comissió %s"
 
+#: commit-reach.c
+msgid "commit ancestry contains a cycle"
+msgstr "l'ascendència de la comissió conté un cicle"
+
+#: commit-reach.c
+msgid "failed to check reachability"
+msgstr "no s'ha pogut comprovar l'accessibilitat"
+
 #: commit.c object.c
 #, c-format
 msgid "object %s is a %s, not a %s"
@@ -21321,7 +22015,7 @@ msgstr "[GLE %ld] el fil de salut no ha pogut obrir «%ls»"
 #: compat/fsmonitor/fsm-health-win32.c
 #, c-format
 msgid "[GLE %ld] health thread getting BHFI for '%ls'"
-msgstr "[GLE %ld] s'està obtenint BHFI del fil de salut per a «%ls»"
+msgstr "[GLE %ld] el fil de salut recupera el BHFI per a «%ls»"
 
 #: compat/fsmonitor/fsm-health-win32.c compat/fsmonitor/fsm-listen-win32.c
 #, c-format
@@ -21613,8 +22307,8 @@ msgid ""
 "remote URLs cannot be configured in file directly or indirectly included by "
 "includeIf.hasconfig:remote.*.url"
 msgstr ""
-"URL remots no es poden configurar en un fitxer directament o indirectament "
-"inclòs per «includeIf.hasconfig:remote.*.url»"
+"els URL remots no es poden configurar en un fitxer directament o "
+"indirectament inclòs per «includeIf.hasconfig:remote.*.url»"
 
 #: config.c
 #, c-format
@@ -21807,7 +22501,7 @@ msgstr ""
 
 #: config.c
 msgid "<comment string>"
-msgstr "<cadena de comentari>"
+msgstr "<cadena-comentari>"
 
 #: config.c
 #, c-format
@@ -21886,7 +22580,7 @@ msgstr "no s'ha pogut blocar el fitxer de configuració %s"
 #: config.c
 #, c-format
 msgid "opening %s"
-msgstr "s'està obrint %s"
+msgstr "s'obre %s"
 
 #: config.c
 #, c-format
@@ -22021,16 +22715,26 @@ msgid "expected flush after ref listing"
 msgstr "s'esperava un buidatge després del llistat de referències"
 
 #: connect.c
-msgid "unable to set SO_KEEPALIVE on socket"
-msgstr "no s'ha pogut establir SO_KEEPALIVE al sòcol"
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "algoritmes no coincidents: client %s; servidor %s"
 
 #: connect.c
 #, c-format
-msgid "Looking up %s ... "
-msgstr "S'està cercant %s... "
+msgid "the server does not support algorithm '%s'"
+msgstr "el servidor no és compatible amb l'algorisme «%s»"
 
 #: connect.c
-#, c-format
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "no s'ha pogut establir SO_KEEPALIVE al sòcol"
+
+#: connect.c
+#, c-format
+msgid "Looking up %s ... "
+msgstr "Cerca de %s en curs... "
+
+#: connect.c
+#, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr "no s'ha pogut trobar %s (port %s) (%s)"
 
@@ -22042,7 +22746,7 @@ msgid ""
 "Connecting to %s (port %s) ... "
 msgstr ""
 "fet.\n"
-"S'està connectant a %s (port %s) ... "
+"Connexió a %s en curs (port %s) ... "
 
 #: connect.c
 #, c-format
@@ -22264,7 +22968,7 @@ msgstr "%s: ha fallat el filtre smudge %s"
 #: credential.c
 #, c-format
 msgid "skipping credential lookup for key: credential.%s"
-msgstr "s'està ometent la cerca de credencials per una clau: credential.%s"
+msgstr "s'omet la cerca de credencials per a una clau: credential.%s"
 
 #: credential.c
 msgid "refusing to work with credential missing host field"
@@ -22376,7 +23080,7 @@ msgstr[1] "fa %<PRIuMAX> anys"
 
 #: delta-islands.c
 msgid "Propagating island marks"
-msgstr "S'estan propagant les marques d'illa"
+msgstr "Propagació de les marques d'illa en curs"
 
 #: delta-islands.c
 #, c-format
@@ -22421,10 +23125,6 @@ msgstr "no s'ha pogut obrir el directori «%s»"
 msgid "skipping '%s', which is neither file nor directory"
 msgstr "s'omet «%s», que no és ni fitxer ni directori"
 
-#: diagnose.c
-msgid "could not duplicate stdout"
-msgstr "no s'ha pogut duplicar stdout"
-
 #: diagnose.c
 #, c-format
 msgid "could not add directory '%s' to archiver"
@@ -22543,7 +23243,7 @@ msgstr ""
 #: diff.c
 #, c-format
 msgid "external diff died, stopping at %s"
-msgstr "el diff external s'ha mort, s'està aturant a %s"
+msgstr "el diff extern s'ha mort, s'atura a %s"
 
 #: diff.c
 msgid "--follow requires exactly one pathspec"
@@ -22762,7 +23462,7 @@ msgstr "genera diffstat amb una amplada de graf donada"
 
 #: diff.c
 msgid "<count>"
-msgstr "<comptador>"
+msgstr "<recompte>"
 
 #: diff.c
 msgid "generate diffstat with limited lines"
@@ -22896,11 +23596,11 @@ msgstr "continua llistant l'històric d'un fitxer més enllà dels canvis de nom
 
 #: diff.c
 msgid ""
-"prevent rename/copy detection if the number of rename/copy targets exceeds "
-"given limit"
+"limit to cheap rename/copy detection if the number of rename/copy targets "
+"exceeds this value"
 msgstr ""
-"evita la detecció de canvi de nom/còpia si el nombre d'objectius de canvi de "
-"nom/còpia supera el límit indicat"
+"utilitza la detecció de canvis de nom o còpies de baix cost si el nombre de "
+"destinacions de canvi de nom o còpia supera aquest valor"
 
 #: diff.c
 msgid "Diff algorithm options"
@@ -23091,7 +23791,7 @@ msgstr "omet la sortida al camí especificat"
 
 #: diff.c
 msgid "<object-id>"
-msgstr "<id de l'objecte>"
+msgstr "<id-objecte>"
 
 #: diff.c
 msgid ""
@@ -23146,7 +23846,7 @@ msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»"
 
 #: diffcore-rename.c
 msgid "Performing inexact rename detection"
-msgstr "S'està realitzant una detecció inexacta de canvis de nom"
+msgstr "Detecció de canvis de nom inexactes en curs"
 
 #: diffcore-rotate.c
 #, c-format
@@ -23220,12 +23920,7 @@ msgstr "no s'ha pogut migrar el directori de «%s» a «%s»"
 #: editor.c
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
-msgstr "consell: s'està esperant que el vostre editor tanqui el fitxer...%c"
-
-#: editor.c sequencer.c wrapper.c
-#, c-format
-msgid "could not write to '%s'"
-msgstr "no s'ha pogut escriure a «%s»"
+msgstr "consell: En espera que el vostre editor tanqui el fitxer...%c"
 
 #: editor.c
 #, c-format
@@ -23234,7 +23929,7 @@ msgstr "no s'ha pogut editar «%s»"
 
 #: entry.c
 msgid "Filtering content"
-msgstr "S'està filtrant el contingut"
+msgstr "Filtratge del contingut en curs"
 
 #: entry.c
 #, c-format
@@ -23312,6 +24007,64 @@ msgstr ""
 msgid "too many args to run %s"
 msgstr "hi ha massa arguments per a executar %s"
 
+#: fetch-object-info.c fetch-pack.c
+msgid "unable to write request to remote"
+msgstr "no s'ha pogut escriure la sol·licitud al remot"
+
+#: fetch-object-info.c
+msgid "object-info capability is not enabled on the server"
+msgstr "la funcionalitat object-info no està habilitada al servidor"
+
+#: fetch-object-info.c transport-helper.c
+msgid "object-info requires protocol v2"
+msgstr "object-info requereix el protocol v2"
+
+#: fetch-object-info.c
+#, c-format
+msgid "object-info: expected %<PRIuMAX> attributes, got %<PRIuMAX>"
+msgstr "object-info: s'esperaven %<PRIuMAX> atributs, s'han rebut %<PRIuMAX>"
+
+#: fetch-object-info.c
+msgid "object-info: unrequested 'size' attribute"
+msgstr "object-info: atribut «size» no sol·licitat"
+
+#: fetch-object-info.c
+msgid "object-info: duplicate 'size' attribute"
+msgstr "object-info: atribut «size» duplicat"
+
+#: fetch-object-info.c
+msgid "object-info: unrequested 'type' attribute"
+msgstr "object-info: atribut «type» no sol·licitat"
+
+#: fetch-object-info.c
+msgid "object-info: duplicate 'type' attribute"
+msgstr "object-info: atribut «type» duplicat"
+
+#: fetch-object-info.c
+#, c-format
+msgid "object-info: unknown attribute '%s'"
+msgstr "object-info: atribut desconegut «%s»"
+
+#: fetch-object-info.c
+#, c-format
+msgid "object-info: expected %<PRIuMAX> objects, got %<PRIuMAX>"
+msgstr "object-info: s'esperaven %<PRIuMAX> objectes, s'han rebut %<PRIuMAX>"
+
+#: fetch-object-info.c
+#, c-format
+msgid "object-info: expected OID: %s, got %s"
+msgstr "object-info: s'esperava l'OID %s, s'ha rebut %s"
+
+#: fetch-object-info.c
+#, c-format
+msgid "object-info: object %s has invalid type '%s'"
+msgstr "object-info: l'objecte %s té un tipus no vàlid «%s»"
+
+#: fetch-object-info.c
+#, c-format
+msgid "object-info: expected flush after %<PRIuMAX> objects"
+msgstr "object-info: s'esperava un buidatge després de %<PRIuMAX> objectes"
+
 #: fetch-pack.c
 #, c-format
 msgid ""
@@ -23405,7 +24158,7 @@ msgstr "s'ha rebut %s (%d) %s"
 #: fetch-pack.c
 #, c-format
 msgid "Marking %s as complete"
-msgstr "S'està marcant %s com a complet"
+msgstr "Es marca %s com a completat"
 
 #: fetch-pack.c
 #, c-format
@@ -23477,24 +24230,10 @@ msgstr "cap comissió en comú"
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: l'obtenció ha fallat."
 
-#: fetch-pack.c
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr "algoritmes no coincidents: client %s; servidor %s"
-
-#: fetch-pack.c
-#, c-format
-msgid "the server does not support algorithm '%s'"
-msgstr "el servidor no és compatible amb l'algorisme «%s»"
-
 #: fetch-pack.c
 msgid "Server does not support shallow requests"
 msgstr "El servidor no permet sol·licituds superficials"
 
-#: fetch-pack.c
-msgid "unable to write request to remote"
-msgstr "no s'ha pogut escriure la sol·licitud al remot"
-
 #: fetch-pack.c
 #, c-format
 msgid "expected '%s', received '%s'"
@@ -23590,7 +24329,7 @@ msgstr "fsmonitor_ipc__send_query: error no especificat en «%s»"
 
 #: fsmonitor-ipc.c
 msgid "fsmonitor--daemon is not running"
-msgstr "fsmonitor--daemon no s'està executant"
+msgstr "fsmonitor--daemon no està en execució"
 
 #: fsmonitor-ipc.c
 #, c-format
@@ -23683,6 +24422,11 @@ msgstr "-c espera una cadena de configuració\n"
 msgid "no config key given for --config-env\n"
 msgstr "no s'ha indicat cap clau de configuració per a --config-env\n"
 
+#: git.c
+#, c-format
+msgid "no file given for '%s' option\n"
+msgstr "no s'ha especificat un fitxer per a l'opció «%s»\n"
+
 #: git.c
 #, c-format
 msgid "no attribute source given for --attr-source\n"
@@ -24012,7 +24756,7 @@ msgstr ""
 #: help.c
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
-msgstr "El procés continuarà, pressuposant que volíeu dir «%s»."
+msgstr "El procés continuarà, tot suposant que volíeu dir «%s»."
 
 #: help.c
 #, c-format
@@ -24023,7 +24767,7 @@ msgstr "Voleu executar «%s» en el seu lloc? [y/N]? "
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr ""
-"El procés continuarà en %0.1f segons, pressuposant que volíeu dir «%s»."
+"El procés continuarà en %0.1f segons, tot suposant que volíeu dir «%s»."
 
 #: help.c
 msgid ""
@@ -24112,7 +24856,7 @@ msgstr "hook.%s.jobs ha de ser un enter, s'ignora: «%s»"
 #: hook.c
 #, c-format
 msgid "hook.%s.jobs must be a positive integer or -1, ignoring: '%s'"
-msgstr "hook.%s.jobs ha de ser un enter positiu o -1; ignoring: «%s»"
+msgstr "hook.%s.jobs ha de ser un enter positiu o -1; s'ignora: «%s»"
 
 #: hook.c
 #, c-format
@@ -24167,7 +24911,7 @@ msgstr "l'argument a --packfile ha de ser un resum vàlid (s'ha rebut «%s»)"
 #: http.c
 #, c-format
 msgid "negative value for http.postBuffer; defaulting to %d"
-msgstr "valor negatiu per http.postBuffer; utilitzant el valor %d"
+msgstr "valor negatiu per http.postBuffer; s'utilitza el valor %d per defecte"
 
 #: http.c
 msgid "Delegation control is not supported with cURL < 7.22.0"
@@ -24205,7 +24949,7 @@ msgstr "res'ha rebutjat llegir galetes del http.cookiefile «-»"
 
 #: http.c
 msgid "ignoring http.savecookies for empty http.cookiefile"
-msgstr "s'està ignorant http.savecookies per al http.cookiefile buit"
+msgstr "s'ignora http.savecookies per al http.cookiefile buit"
 
 #: http.c
 #, c-format
@@ -24314,9 +25058,12 @@ msgid "name consists only of disallowed characters: %s"
 msgstr "el nom conté només caràcters no permesos: %s"
 
 #: imap-send.c
-msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+msgid ""
+"git imap-send [-v] [-q] [--[no-]curl] [--[no-]draft] [(--folder|-f) "
+"<folder>] < <mbox>"
 msgstr ""
-"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <carpeta>] < <bustia>"
+"git imap-send [-v] [-q] [--[no-]curl] [--[no-]draft] [(--folder|-f) "
+"<carpeta>] < <bústia>"
 
 #: imap-send.c
 msgid "no IMAP host specified"
@@ -24409,6 +25156,10 @@ msgstr "no s'ha pogut accedir a un blob dispers en «%s»"
 msgid "unable to parse sparse filter data in %s"
 msgstr "no s'han pogut analitzar les dades del filtre dispers %s"
 
+#: list-objects-filter.c
+msgid "filter_oidset: only blob:limit filters are supported"
+msgstr "filter_oidset: només s'admeten filtres blob:limit"
+
 #: list-objects.c
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
@@ -24467,7 +25218,7 @@ msgid ""
 "Another git process seems to be running in this repository, or the lock file "
 "may be stale"
 msgstr ""
-"Un altre procés git s'està executant en aquest repositori, o potser el "
+"Hi ha un altre procés git en execució en aquest repositori, o potser el "
 "fitxer de blocatge està estancat"
 
 #: lockfile.c
@@ -24475,7 +25226,7 @@ msgstr ""
 msgid "Unable to create '%s.lock': %s"
 msgstr "No s'ha pogut crear «%s.lock»: %s"
 
-#: log-tree.c
+#: log-tree.c object-file.c
 msgid "unable to create temporary object directory"
 msgstr "no s'ha pogut crear el directori temporal de l'objecte"
 
@@ -24517,6 +25268,11 @@ msgstr "marker-size «%s» invàlid; s'esperava un enter"
 msgid "Could not parse object '%s'"
 msgstr "No s'ha pogut analitzar l'objecte «%s»"
 
+#: merge-ort.c
+#, c-format
+msgid "tree has duplicate entries for '%s'"
+msgstr "l'arbre té entrades duplicades per a «%s»"
+
 #: merge-ort.c
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
@@ -24586,7 +25342,7 @@ msgstr "error: no es pot afegir %s a la base de dades"
 #: merge-ort.c
 #, c-format
 msgid "Auto-merging %s"
-msgstr "S'està autofusionant %s"
+msgstr "Autofusió de %s en curs"
 
 #: merge-ort.c
 #, c-format
@@ -24625,7 +25381,7 @@ msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
 "renamed."
 msgstr ""
-"AVÍS: S'està evitant aplicar el canvi de nom %s -> %s a %s, perquè %s ell "
+"AVÍS: S'ha evitat aplicar el canvi de nom %s -> %s a %s, perquè %s ell "
 "mateix ja havia canviat de nom."
 
 #: merge-ort.c
@@ -24757,7 +25513,7 @@ msgstr ""
 #. conflict in a submodule. The first argument is the submodule
 #. name, and the second argument is the abbreviated id of the
 #. commit that needs to be merged.  For example:
-#.  - go to submodule (mysubmodule), and either merge commit abc1234"
+#. - go to submodule (mysubmodule), and either merge commit abc1234"
 #.
 #: merge-ort.c
 #, c-format
@@ -24870,8 +25626,7 @@ msgstr "no puc fer la compactació MIDX amb el format v1"
 #: midx-write.c
 msgid "ignoring existing multi-pack-index; checksum mismatch"
 msgstr ""
-"s'està ignorant l'índex multipaquet existent; la suma de verificació no "
-"coincideix"
+"s'ignora l'índex multipaquet existent; la suma de verificació no coincideix"
 
 #: midx-write.c
 #, c-format
@@ -24885,7 +25640,7 @@ msgstr "no s'ha pogut carregar l'índex invers per al MIDX %s"
 
 #: midx-write.c
 msgid "Adding packfiles to multi-pack-index"
-msgstr "S'estan afegint fitxers empaquetats a l'índex multipaquet"
+msgstr "S'afigen els fitxers empaquetats a l'índex multipaquet"
 
 #: midx-write.c
 #, c-format
@@ -24918,7 +25673,7 @@ msgstr "no hi ha fitxers empaquetats a indexar."
 
 #: midx-write.c
 msgid "refusing to write multi-pack .bitmap without any objects"
-msgstr "s'està refusant a escriure el .bitmap multipaquet sense cap objecte"
+msgstr "es refusa escriure el .bitmap multipaquet sense cap objecte"
 
 #: midx-write.c
 msgid "unable to create temporary MIDX layer"
@@ -24950,11 +25705,11 @@ msgstr "no es pot fer caducar paquets d'un multi-pack-index incremental"
 
 #: midx-write.c
 msgid "Counting referenced objects"
-msgstr "S'estan comptant els objectes referenciats"
+msgstr "Recompte dels objectes referenciats en curs"
 
 #: midx-write.c
 msgid "Finding and deleting unreferenced packfiles"
-msgstr "S'estan cercant i suprimint els fitxers de paquets no referenciats"
+msgstr "Cerca i supressió dels fitxers de paquets no referenciats en curs"
 
 #: midx-write.c
 msgid "cannot repack an incremental multi-pack-index"
@@ -25116,7 +25871,7 @@ msgstr "suma de verificació incorrecta"
 
 #: midx.c
 msgid "Looking for referenced packfiles"
-msgstr "S'estan cercant fitxers empaquetats referenciats"
+msgstr "Cerca de fitxers empaquetats referenciats en curs"
 
 #: midx.c
 msgid "the midx contains no oid"
@@ -25124,7 +25879,7 @@ msgstr "el midx no conté cap oid"
 
 #: midx.c
 msgid "Verifying OID order in multi-pack-index"
-msgstr "S'està verificant l'ordre OID a l'índex multipaquet"
+msgstr "Verificació de l'ordre OID a l'índex multipaquet en curs"
 
 #: midx.c
 #, c-format
@@ -25133,11 +25888,11 @@ msgstr "oid lookup desordenat: oid[%d] = %s >= %s = oid[%d]"
 
 #: midx.c
 msgid "Sorting objects by packfile"
-msgstr "S'estan ordenant els objectes per fitxer empaquetats"
+msgstr "S'ordenen els objectes per fitxer de paquets"
 
 #: midx.c
 msgid "Verifying object offsets"
-msgstr "S'estan verificant els desplaçaments dels objectes"
+msgstr "Verificació dels desplaçaments dels objectes en curs"
 
 #: midx.c
 #, c-format
@@ -25199,7 +25954,7 @@ msgstr "Valor de notes.rewriteMode erroni: «%s»"
 #: notes-utils.c
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)"
+msgstr "Es refusa reescriure les notes en %s (fora de refs/notes/)"
 
 #. TRANSLATORS: The first %s is the name of
 #. the environment variable, the second %s is
@@ -25271,71 +26026,7 @@ msgstr "no s'ha pogut establir el permís a «%s»"
 
 #: object-file.c
 msgid "core.fsyncMethod = batch is unsupported on this platform"
-msgstr "core.fsyncMethod = batch no és admès em aquesta plataforma"
-
-#: object-file.c
-msgid "error when closing loose object file"
-msgstr "error en tancar el fitxer d'objecte solt"
-
-#: object-file.c
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
-"permisos insuficients per a afegir un objecte a la base de dades del "
-"repositori %s"
-
-#: object-file.c
-msgid "unable to create temporary file"
-msgstr "no s'ha pogut crear un fitxer temporal"
-
-#: object-file.c
-msgid "unable to write loose object file"
-msgstr "no s'ha pogut escriure el fitxer d'objecte solt"
-
-#: object-file.c
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "no s'ha pogut desinflar l'object nou %s (%d)"
-
-#: object-file.c
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "ha fallat deflateEnd a l'objecte %s(%d)"
-
-#: object-file.c
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "confós per la font de dades inestable de l'objecte per a %s"
-
-#: object-file.c
-#, c-format
-msgid "write stream object %<PRIuMAX> != %<PRIuMAX>"
-msgstr "l'objecte de flux d'escriptura %<PRIuMAX> != %<PRIuMAX>"
-
-#: object-file.c
-#, c-format
-msgid "unable to stream deflate new object (%d)"
-msgstr "no s'ha pogut desinflar l'object nou (%d)"
-
-#: object-file.c
-#, c-format
-msgid "deflateEnd on stream object failed (%d)"
-msgstr "ha fallat deflateEnd a l'objecte del flux (%d)"
-
-#: object-file.c
-#, c-format
-msgid "unable to create directory %s"
-msgstr "s'ha produït un error en crear el directori %s"
-
-#: object-file.c
-#, c-format
-msgid "cannot read object for %s"
-msgstr "no es pot llegir l'objecte per a %s"
-
-#: object-file.c
-#, c-format
-msgid "cannot map object %s to %s"
-msgstr "no és possible mapar l'objecte %s a %s"
+msgstr "core.fsyncMethod = batch no és admès en aquesta plataforma"
 
 #: object-file.c
 #, c-format
@@ -25400,6 +26091,10 @@ msgstr "no s'ha pogut analitzar el tipus de la capçalera «%s» de %s"
 msgid "unable to unpack contents of %s"
 msgstr "no s'han pogut desempaquetar els continguts de %s"
 
+#: object-file.c
+msgid "unable to migrate temporary objects"
+msgstr "no s'han pogut migrar els objectes temporals"
+
 #. TRANSLATORS: This is a line of ambiguous object
 #. output shown when we cannot look up or parse the
 #. object in question. E.g. "deadbeef [bad object]".
@@ -25412,7 +26107,7 @@ msgstr "%s [objecte incorrecte]"
 #. TRANSLATORS: This is a line of ambiguous commit
 #. object output. E.g.:
 #. *
-#.    "deadbeef commit 2021-01-01 - Some Commit Message"
+#. "deadbeef commit 2021-01-01 - Some Commit Message"
 #.
 #: object-name.c
 #, c-format
@@ -25422,7 +26117,7 @@ msgstr "%s comissió %s - %s"
 #. TRANSLATORS: This is a line of ambiguous
 #. tag object output. E.g.:
 #. *
-#.    "deadbeef tag 2022-01-01 - Some Tag Message"
+#. "deadbeef tag 2022-01-01 - Some Tag Message"
 #. *
 #. The second argument is the YYYY-MM-DD found
 #. in the tag.
@@ -25439,7 +26134,7 @@ msgstr "%s etiqueta %s - %s"
 #. tag object output where we couldn't parse
 #. the tag itself. E.g.:
 #. *
-#.    "deadbeef [bad tag, could not parse it]"
+#. "deadbeef [bad tag, could not parse it]"
 #.
 #: object-name.c
 #, c-format
@@ -25616,8 +26311,8 @@ msgstr "no s'ha pogut normalitzar el camí a l'objecte alternatiu: %s"
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr ""
-"%s: s'estan ignorant els emmagatzematges alternatius d'objectes, imbricació "
-"massa profunda"
+"%s: s'ignoren els emmagatzematges alternatius d'objectes, imbricació massa "
+"profunda"
 
 #: odb.c
 #, c-format
@@ -25663,8 +26358,8 @@ msgstr "no s'ha trobat el reemplaçament %s per a %s"
 
 #: odb.c
 #, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "l'objecte empaquetat %s (emmagatzemat a %s) és corrupte"
+msgid "object %s is corrupt"
+msgstr "l'objecte %s és malmès"
 
 #: odb.c
 #, c-format
@@ -25681,6 +26376,11 @@ msgstr "%s no és un objecte vàlid"
 msgid "%s is not a valid '%s' object"
 msgstr "%s no és un objecte de «%s» vàlid"
 
+#: odb.c
+msgid "primary object source does not support generating packfiles"
+msgstr ""
+"la font d'objectes principal no admet la generació de fitxers de paquet"
+
 #: odb/source-files.c
 msgid "unable to fdopen alternates lockfile"
 msgstr "no s'ha pogut fer «fdopen» al fitxer de blocatge alternatiu"
@@ -25693,6 +26393,26 @@ msgstr "no es pot llegir el fitxer «alternates»"
 msgid "unable to move new alternates file into place"
 msgstr "no s'ha pogut moure el nou fitxer «alternates» al lloc"
 
+#: odb/source-files.c
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+"Hi ha massa objectes solts inabastables; executeu «git prune» per a eliminar-"
+"los."
+
+#: odb/source-files.c
+#, c-format
+msgid "pack-objects died of signal %d"
+msgstr "el pack-objects s'ha mort amb el senyal %d"
+
+#: odb/source-files.c
+msgid "could not spawn pack-objects"
+msgstr "no s'ha pogut engendrar el pack-objects"
+
+#: odb/source-files.c
+msgid "error writing to pack-objects"
+msgstr "error en escriure a pack-objects"
+
 #: odb/source-loose.c
 #, c-format
 msgid "unable to open loose object %s"
@@ -25722,6 +26442,114 @@ msgstr "la capçalera per a %s és massa llarga, supera els %d octets"
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "l'objecte solt %s (emmagatzemat a %s) és corrupte"
 
+#: odb/source-loose.c
+msgid "error when closing loose object file"
+msgstr "error en tancar el fitxer d'objecte solt"
+
+#: odb/source-loose.c
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
+"permisos insuficients per a afegir un objecte a la base de dades del "
+"repositori %s"
+
+#: odb/source-loose.c
+msgid "unable to create temporary file"
+msgstr "no s'ha pogut crear un fitxer temporal"
+
+#: odb/source-loose.c
+msgid "unable to write loose object file"
+msgstr "no s'ha pogut escriure el fitxer d'objecte solt"
+
+#: odb/source-loose.c
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "no s'ha pogut desinflar l'object nou %s (%d)"
+
+#: odb/source-loose.c
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "ha fallat deflateEnd a l'objecte %s(%d)"
+
+#: odb/source-loose.c
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "confós per la font de dades inestable de l'objecte per a %s"
+
+#: odb/source-loose.c
+#, c-format
+msgid "write stream object %<PRIuMAX> != %<PRIuMAX>"
+msgstr "l'objecte de flux d'escriptura %<PRIuMAX> != %<PRIuMAX>"
+
+#: odb/source-loose.c
+#, c-format
+msgid "unable to stream deflate new object (%d)"
+msgstr "no s'ha pogut desinflar l'object nou (%d)"
+
+#: odb/source-loose.c
+#, c-format
+msgid "deflateEnd on stream object failed (%d)"
+msgstr "ha fallat deflateEnd a l'objecte del flux (%d)"
+
+#: odb/source-loose.c
+#, c-format
+msgid "unable to create directory %s"
+msgstr "s'ha produït un error en crear el directori %s"
+
+#: odb/source-loose.c
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: el resum del camí no coincideix, trobat a: %s"
+
+#: odb/source-loose.c
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s: objecte corrupte o no trobat: %s"
+
+#: odb/source-loose.c
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "fitxer sha1 malmès: %s"
+
+#: odb/source-loose.c
+msgid "Checking object directory"
+msgstr "Comprovació del directori d'objectes en curs"
+
+#: odb/source-loose.c
+msgid "Checking object directories"
+msgstr "Comprovació dels directoris d'objecte en curs"
+
+#: odb/source-packed.c
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "l'objecte empaquetat %s (emmagatzemat a %s) és corrupte"
+
+#: odb/source-packed.c
+#, c-format
+msgid "unable to load rev-index for pack '%s'"
+msgstr "no s'ha pogut carregar l'índex de reversió per al paquet «%s»"
+
+#: odb/source-packed.c
+#, c-format
+msgid "invalid rev-index for pack '%s'"
+msgstr "rev-index no vàlid per al paquet «%s»"
+
+#: odb/transaction.c
+msgid "object database transaction already pending"
+msgstr "transacció de la base de dades d'objectes ja pendent"
+
+#: odb/transaction.h
+msgid "failed to start ODB transaction"
+msgstr "no s'ha pogut iniciar la transacció ODB"
+
+#: odb/transaction.h
+msgid "failed to commit ODB transaction"
+msgstr "no s'ha pogut cometre la transacció ODB"
+
+#: odb/transaction.h
+msgid "failed to finalize ODB transaction"
+msgstr "no s'ha pogut finalitzar la transacció ODB"
+
 #: pack-bitmap-write.c
 #, c-format
 msgid "duplicate entry when writing bitmap index: %s"
@@ -25807,7 +26635,7 @@ msgstr "índex de paquets de mapa de bits malmès"
 
 #: pack-bitmap.c
 msgid "invalid XOR offset in bitmap pack index"
-msgstr "el desplaçament XOR a l'índex de mapa de bits no és vàlid"
+msgstr "desplaçament XOR no vàlid a l'índex de paquet de mapes de bits"
 
 #: pack-bitmap.c
 msgid "cannot fstat bitmap file"
@@ -25826,6 +26654,10 @@ msgstr "al mapa de bits multipaquet li manca l'índex invers obligatori"
 msgid "could not open pack %s"
 msgstr "no s'ha pogut obrir el paquet %s"
 
+#: pack-bitmap.c
+msgid "could not open bitmap for base MIDX"
+msgstr "no s'ha pogut obrir el mapa de bits per al MIDX base"
+
 #: pack-bitmap.c
 msgid "corrupt bitmap lookup table: triplet position out of index"
 msgstr ""
@@ -25855,10 +26687,9 @@ msgstr ""
 #, c-format
 msgid "unable to load pack: '%s', disabling pack-reuse"
 msgstr ""
-"no s'ha pogut carregar el paquet: «%s», s'està inhabilitant lareutilització "
-"de paquets"
+"no s'ha pogut carregar el paquet: «%s», s'inhabilita la reutilització de "
+"paquets"
 
-# s'inhabilita / s'està inhabilitant?
 #: pack-bitmap.c
 msgid "unable to compute preferred pack, disabling pack-reuse"
 msgstr "no s'ha pogut calcular el paquet preferit, s'inhabilita pack-reuse"
@@ -26380,7 +27211,7 @@ msgstr "Màgia d'especificació de camí no vàlida «%.*s» en «%s»"
 #: pathspec.c
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "«)» mancant al final de la màgia d'especificació de camí en «%s»"
+msgstr "manca «)» al final de la màgia d'especificació de camí en «%s»"
 
 #: pathspec.c
 #, c-format
@@ -26483,7 +27314,7 @@ msgstr "error remot: %s"
 
 #: preload-index.c
 msgid "Refreshing index"
-msgstr "S'està actualitzant l'índex"
+msgstr "Actualització de l'índex en curs"
 
 #: preload-index.c
 #, c-format
@@ -26534,6 +27365,57 @@ msgstr "no s'ha pogut obtenir «%s» del remot garant"
 msgid "unsupported field '%s' in '%s' config"
 msgstr "no s'admet el camp «%s» en la configuració «%s»"
 
+#: promisor-remote.c
+#, c-format
+msgid ""
+"invalid remote name '%s' before '=' sign in '%s' from promisor."
+"acceptFromServerUrl config"
+msgstr ""
+"nom remot «%s» no vàlid abans del signe '=' en «%s» de la configuració "
+"promisor.acceptFromServerUrl"
+
+#: promisor-remote.c
+#, c-format
+msgid ""
+"invalid url pattern '%s' in '%s' from promisor.acceptFromServerUrl config"
+msgstr ""
+"patró d'URL no vàlid «%s» a «%s» de la configuració promisor."
+"acceptFromServerUrl"
+
+#: promisor-remote.c
+#, c-format
+msgid ""
+"couldn't generate a valid remote name from advertised url '%s', ignoring "
+"this remote"
+msgstr ""
+"no s'ha pogut generar un nom remot vàlid a partir de l'URL anunciat «%s»; "
+"s'ignora aquest remot"
+
+#: promisor-remote.c
+#, c-format
+msgid ""
+"generated remote name '%s' from advertised url '%s' is invalid, ignoring "
+"this remote"
+msgstr ""
+"el nom remot «%s» generat a partir de l'URL anunciat «%s» no és vàlid; "
+"s'ignora aquest remot"
+
+#: promisor-remote.c
+#, c-format
+msgid "couldn't normalize advertised url '%s', ignoring this remote"
+msgstr "no s'ha pogut normalitzar l'URL anunciat «%s»; s'ignora aquest remot"
+
+#: promisor-remote.c
+#, c-format
+msgid "Auto-creating promisor remote '%s' for URL '%s'\n"
+msgstr "Creant automàticament el remot garant «%s» per a l'URL «%s»\n"
+
+#: promisor-remote.c
+#, c-format
+msgid "too many remotes accepted with name like '%s-X', ignoring this remote"
+msgstr ""
+"s'han acceptat massa remots amb un nom com «%s-X»; s'ignora aquest remot"
+
 #: promisor-remote.c
 #, c-format
 msgid ""
@@ -26563,8 +27445,8 @@ msgid ""
 "Storing new %s from server for remote '%s'.\n"
 "    '%s' -> '%s'\n"
 msgstr ""
-"Emmagatzemant nou %s des del servidor per al remot '%s'.\n"
-"    '%s' -> '%s'\n"
+"Emmagatzemant nou %s des del servidor per al remot «%s».\n"
+"    «%s» -> «%s»\n"
 
 #: promisor-remote.c
 #, c-format
@@ -26589,7 +27471,7 @@ msgstr "no s'ha trobat el remot garant acceptat «%s»"
 #: promisor-remote.c
 #, c-format
 msgid "promisor remote '%s' advertised invalid filter '%s': %s"
-msgstr "el remot garant «%s» ha anunciat un filtre invàlid «%s»:%s"
+msgstr "el remot garant «%s» ha anunciat un filtre invàlid «%s»: %s"
 
 #: protocol-caps.c
 msgid "object-info: expected flush after arguments"
@@ -26597,7 +27479,7 @@ msgstr "object-info: s'esperava un buidatge després dels arguments"
 
 #: prune-packed.c
 msgid "Removing duplicate objects"
-msgstr "S'estan eliminant els objectes duplicats"
+msgstr "S'eliminen els objectes duplicats"
 
 #: pseudo-merge.c
 #, c-format
@@ -26744,6 +27626,11 @@ msgstr "punta extra extra no vàlida: «%s»"
 msgid "unable to enumerate additional recent objects"
 msgstr "no s'han pogut enumerar els objectes recents addicionals"
 
+#: read-cache.c
+#, c-format
+msgid "remove '%s'\n"
+msgstr "elimina «%s»\n"
+
 #: read-cache.c
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
@@ -26785,7 +27672,7 @@ msgid ""
 "Using version %i"
 msgstr ""
 "index.version està establerta, però el valor no és vàlid.\n"
-"S'està usant la versió %i"
+"S'usa la versió %i"
 
 #: read-cache.c
 #, c-format
@@ -26794,7 +27681,7 @@ msgid ""
 "Using version %i"
 msgstr ""
 "GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n"
-"S'està usant la versió %i"
+"S'usa la versió %i"
 
 #: read-cache.c
 #, c-format
@@ -26818,7 +27705,7 @@ msgstr "l'índex usa l'extensió %.4s, que no es pot entendre"
 #: read-cache.c
 #, c-format
 msgid "ignoring %.4s extension"
-msgstr "s'està ignorant l'extensió %.4s"
+msgstr "s'ignora l'extensió %.4s"
 
 #: read-cache.c
 #, c-format
@@ -26936,11 +27823,6 @@ msgstr ""
 msgid "unexpected diff status %c"
 msgstr "estat de diff inesperat %c"
 
-#: read-cache.c
-#, c-format
-msgid "remove '%s'\n"
-msgstr "elimina «%s»\n"
-
 #: rebase-interactive.c
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
@@ -26949,15 +27831,14 @@ msgid ""
 msgstr ""
 "Podeu arreglar-ho amb «git rebase --edit-todo» i després «git rebase --"
 "continue».\n"
-"O bé, podeu avortar el «rebase» amb «git rebase --abort».\n"
+"O bé, podeu interrompre el «rebase» amb «git rebase --abort».\n"
 
 #: rebase-interactive.c
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
-"no s'ha reconegut el paràmetre %s per rebase.missingCommitsCheck. S'està "
-"ignorant."
+"no s'ha reconegut el paràmetre %s per rebase.missingCommitsCheck. S'ignora."
 
 #: rebase-interactive.c
 msgid ""
@@ -27013,9 +27894,9 @@ msgstr ""
 "especificada).\n"
 "        Useu -c <comissió> per a reescriure el missatge de la comissió.\n"
 "u, update-ref <referència> = segueix un marcador de posició per a "
-"actualitzar <ref>\n"
-"                      a aquesta posició en les comissions noves. La <ref> "
-"s'actualitza\n"
+"actualitzar <referència>\n"
+"                      a aquesta posició en les comissions noves. La "
+"<referència> s'actualitza\n"
 "                      al final del «rebase»\n"
 "\n"
 "Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n"
@@ -27065,7 +27946,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"No obstant això, si ho elimineu tot, s'avortarà el «rebase».\n"
+"No obstant això, si ho elimineu tot, s'interromprà el «rebase».\n"
 "\n"
 
 #: rebase-interactive.c
@@ -27222,12 +28103,12 @@ msgstr "amplada positiva esperada amb l'àtom %%(align)"
 #: ref-filter.c
 #, c-format
 msgid "expected format: %%(ahead-behind:<committish>)"
-msgstr "format esperat: %%(ahead-behind:<committish>)"
+msgstr "format esperat: %%(ahead-behind:<comissió-o-similar>)"
 
 #: ref-filter.c
 #, c-format
 msgid "expected format: %%(is-base:<committish>)"
-msgstr "format esperat: %%(is-base:<committish>)"
+msgstr "format esperat: %%(is-base:<comissió-o-similar>)"
 
 #: ref-filter.c
 #, c-format
@@ -27299,12 +28180,12 @@ msgstr "no s'ha pogut executar «describe»"
 #: ref-filter.c
 #, c-format
 msgid "(no branch, rebasing %s)"
-msgstr "(sense branca, s'està fent «rebase» %s)"
+msgstr "(sense branca, es fa «rebase» %s)"
 
 #: ref-filter.c
 #, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(sense branca, s'està fent «rebase» d'un «HEAD» separat %s)"
+msgstr "(sense branca, es fa «rebase» d'un «HEAD» separat %s)"
 
 #: ref-filter.c
 #, c-format
@@ -27338,12 +28219,12 @@ msgstr "objecte mal format a «%s»"
 #: ref-filter.c
 #, c-format
 msgid "ignoring ref with broken name %s"
-msgstr "s'està ignorant la referència amb nom malmès %s"
+msgstr "s'ignora la referència amb nom malmès %s"
 
 #: ref-filter.c refs.c
 #, c-format
 msgid "ignoring broken ref %s"
-msgstr "s'està ignorant la referència malmesa %s"
+msgstr "s'ignora la referència malmesa %s"
 
 #: ref-filter.c
 #, c-format
@@ -27386,11 +28267,11 @@ msgstr "cap registre de referències per a «%s»"
 #, c-format
 msgid "in '%s' phase, update aborted by the reference-transaction hook"
 msgstr ""
-"en la fase «%s», actualització avortada pel lligam reference-transaction"
+"en la fase «%s», actualització interrompuda pel lligam reference-transaction"
 
 #: refs.c
 msgid "Checking references consistency"
-msgstr "S'està comprovant la consistència de les referències"
+msgstr "Comprovació de la consistència de les referències en curs"
 
 #: refs.c
 #, c-format
@@ -27422,7 +28303,8 @@ msgid ""
 "\n"
 "\tgit branch -m <name>\n"
 msgstr ""
-"S'està utilitzant «%s» com a nom de la branca inicial. Aquest nom de branca\n"
+"Es detecta l'ús de «%s» com a nom de la branca inicial. Aquest nom de "
+"branca\n"
 "per defecte canviarà a \"main\" en Git 3.0. Per a configurar el nom inicial "
 "de la branca que\n"
 "s'utilitzarà en tots els repositoris nous, i que suprimirà aquest avís, "
@@ -27445,9 +28327,9 @@ msgid ""
 "\n"
 "\tgit branch -m master\n"
 msgstr ""
-"S'usa '%s' com a nom de la branca inicial des de Git 3.0.\n"
+"S'usa «%s» com a nom de la branca inicial des de Git 3.0.\n"
 "Si esperàveu que Git crearia 'master', es pot canviar el nom\n"
-"de la la branca que s'acaba de crear amb l'ordre:\n"
+"de la branca que s'acaba de crear amb l'ordre:\n"
 "\n"
 "\tgit branch -m master\n"
 
@@ -27464,7 +28346,7 @@ msgstr "nom de branca no vàlida: %s = %s"
 #: refs.c
 #, c-format
 msgid "ignoring dangling symref %s"
-msgstr "s'està ignorant referència simbòlica despenjada %s"
+msgstr "s'ignora la referència simbòlica despenjada %s"
 
 #: refs.c
 #, c-format
@@ -27485,7 +28367,8 @@ msgstr "el registre per a %s és buit"
 #, c-format
 msgid "refusing to update reflog for pseudoref '%s'"
 msgstr ""
-"s'ha rebutjat l'actualització del reflog per a la pseudoreferència «%s»"
+"s'ha rebutjat l'actualització del registre de referències per a la "
+"pseudoreferència «%s»"
 
 #: refs.c
 #, c-format
@@ -27495,12 +28378,13 @@ msgstr "s'ha rebutjat l'actualització de la pseudoreferència «%s»"
 #: refs.c
 #, c-format
 msgid "refusing to update reflog with bad name '%s'"
-msgstr "s'està refusant el reflog amb el nom incorrecte «%s»"
+msgstr ""
+"es refusa actualitzar el registre de referències amb el nom incorrecte «%s»"
 
 #: refs.c
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
-msgstr "s'està refusant la referència amb nom malmès «%s»"
+msgstr "es refusa actualitzar la referència amb nom malmès «%s»"
 
 #: refs.c
 msgid "refusing to force and skip creation of reflog"
@@ -27511,13 +28395,13 @@ msgstr ""
 #, c-format
 msgid "trying to write ref '%s' with nonexistent object %s"
 msgstr ""
-"s'està intentant escriure la referència «%s» amb l'objecte que no existeix %s"
+"s'intenta escriure la referència «%s» amb l'objecte %s, que no existeix"
 
 #: refs.c
 #, c-format
 msgid "trying to write non-commit object %s to branch '%s'"
 msgstr ""
-"s'està intentant escriure un objecte no de comissió %s en la branca «%s»"
+"s'intenta escriure un objecte que no és de comissió %s en la branca «%s»"
 
 #: refs.c
 #, c-format
@@ -27610,8 +28494,7 @@ msgstr ""
 #, c-format
 msgid "trying to write reflog for '%s' with incomplete values"
 msgstr ""
-"s'està intentant escriure el registre de referències «%s» amb valors "
-"incomplets"
+"s'intenta escriure el registre de referències «%s» amb valors incomplets"
 
 #: refs/files-backend.c
 #, c-format
@@ -27747,7 +28630,7 @@ msgstr "el reemplaçament «%s» no té cap «*»"
 #: remote-curl.c
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
-msgstr "citació no vàlida en el valor de l'opció de pujada: «%s»"
+msgstr "citació no vàlida en el valor de push-option: «%s»"
 
 # object-format no traduït perquè és part de --show-object-format
 #: remote-curl.c
@@ -27763,8 +28646,8 @@ msgstr "%sinfo/refs no vàlides: és un repositori git?"
 #: remote-curl.c
 msgid "invalid server response; expected service, got flush packet"
 msgstr ""
-"resposta del servidor no és vàlida; el servei esperat, ha rebut un paquet de "
-"buidatge"
+"resposta del servidor no és vàlida; s'esperava servei, s'ha rebut un paquet "
+"de buidatge"
 
 #: remote-curl.c
 #, c-format
@@ -27807,7 +28690,7 @@ msgstr "no s'ha pogut accedir a «%s»: %s"
 #: remote-curl.c
 #, c-format
 msgid "redirecting to %s"
-msgstr "s'està redirigint a %s"
+msgstr "es redirigeix a %s"
 
 #: remote-curl.c
 msgid "shouldn't have EOF when not gentle on EOF"
@@ -27924,7 +28807,7 @@ msgid ""
 "If you cannot, please let us know why you still need to use it by\n"
 "sending an e-mail to <git@vger.kernel.org>."
 msgstr ""
-"s'està llegint el remot des de «%s/%s», el qual està nominat per a la seva "
+"es llegeix el remot des de «%s/%s», el qual està nominat per a la seva "
 "supressió.\n"
 "\n"
 "Si encara utilitzeu el directori «remotes/», es recomana la migració a\n"
@@ -27932,9 +28815,9 @@ msgstr ""
 "\n"
 "\tgit remote rename %s %s\n"
 "\n"
-"Si no podeu, feu-nos saber, per favor, per què necessiteu fer-lo servir "
+"Si no podeu, feu-nos saber, si us plau, per què necessiteu fer-lo servir "
 "encara\n"
-"tot enviant correu electrònic a <git@vger.kernel.org>."
+"enviant-nos correu electrònic a <git@vger.kernel.org>."
 
 #: remote.c
 #, c-format
@@ -28103,7 +28986,7 @@ msgstr "no existeix la branca: «%s»"
 #: remote.c
 #, c-format
 msgid "no upstream configured for branch '%s'"
-msgstr "cap branca amunt configurada per a la branca «%s»"
+msgstr "cap font configurada per a la branca «%s»"
 
 #: remote.c
 #, c-format
@@ -28143,7 +29026,7 @@ msgstr "no s'ha pogut trobar la referència remota %s"
 #: remote.c
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
-msgstr "* S'estan ignorant les referències «%s» localment"
+msgstr "* S'ignoren les referències «%s» localment"
 
 #: remote.c
 #, c-format
@@ -28192,6 +29075,11 @@ msgstr[1] ""
 "La vostra branca està %2$d comissions per darrere de «%1$s», i pot avançar-"
 "se ràpidament.\n"
 
+#: remote.c
+#, c-format
+msgid "  (use \"git pull %s %s\" to update your local branch)\n"
+msgstr "  (useu «git pull %s %s» per a actualitzar la vostra branca local)\n"
+
 #: remote.c
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (useu «git pull» per a actualitzar la vostra branca local)\n"
@@ -28211,6 +29099,14 @@ msgstr[1] ""
 "La vostra branca i «%s» han divergit,\n"
 "i tenen %d i %d comissions distintes cada una, respectivament.\n"
 
+#: remote.c
+#, c-format
+msgid ""
+"  (use \"git pull %s %s\" if you want to integrate the remote branch with "
+"yours)\n"
+msgstr ""
+"  (useu «git pull %s %s» si voleu integrar la branca remota amb la vostra)\n"
+
 #: remote.c
 msgid ""
 "  (use \"git pull\" if you want to integrate the remote branch with yours)\n"
@@ -28219,8 +29115,7 @@ msgstr "  (useu «git pull» si voleu integrar la branca remota amb la vostra)\n
 #: remote.c
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr ""
-"La vostra branca està basada en «%s», però la branca amunt ha desaparegut.\n"
+msgstr "La vostra branca està basada en «%s», però la font ha desaparegut.\n"
 
 #: remote.c
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
@@ -28376,6 +29271,11 @@ msgstr "la profunditat de reemplaçament és massa alta per l'objecte %s"
 msgid "'%s' is not a valid commit-ish for %s"
 msgstr "«%s» no és una comissió (o similar) vàlida per a %s"
 
+#: replay.c
+#, c-format
+msgid "'%s' does not point to a commit for %s"
+msgstr "«%s» no apunta a una comissió per a %s"
+
 #: replay.c
 #, c-format
 msgid "argument to %s must be a reference"
@@ -28398,12 +29298,21 @@ msgstr "cal especificar comissions per a reproduir"
 msgid "all positive revisions given must be references"
 msgstr "totes les revisions positives que s'han donat han de ser referències"
 
+#: replay.c
+#, c-format
+msgid "merge of %s onto %s failed"
+msgstr "no s'ha pogut fer la fusió de %s sobre %s"
+
 # replay → repetició o reproducció, repassar-los tots
 #: replay.c
 #, c-format
 msgid "commit %s became empty after replay"
 msgstr "la comissió %s ha esdevingut buida després de tornar-la a aplicar"
 
+#: replay.c
+msgid "'--linearize' cannot be used with multiple branches"
+msgstr "«--linearize» no es pot usar amb branques múltiples"
+
 #: replay.c
 msgid "'--ref' cannot be used with multiple revision ranges"
 msgstr "«--ref» no es pot usar amb rangs múltiples de revisió"
@@ -28448,7 +29357,7 @@ msgstr "s'ha produït un error en escriure «%s»"
 #: rerere.c
 #, c-format
 msgid "Staged '%s' using previous resolution."
-msgstr "«Staged» «%s» utilitzant una resolució anterior."
+msgstr "«%s» posat en «stage» tot utilitzant una resolució anterior."
 
 #: rerere.c
 #, c-format
@@ -28543,7 +29452,7 @@ msgstr ""
 
 #: revision.c
 msgid "--unpacked=<packfile> no longer supported"
-msgstr "--unpacked=<packfile> ja no s'admet"
+msgstr "--unpacked=<fitxer-paquet> ja no s'admet"
 
 #: revision.c
 #, c-format
@@ -28714,7 +29623,7 @@ msgstr "no s'ha pogut configurar «%s»"
 
 #: scalar.c
 msgid "partial clone failed; attempting full clone"
-msgstr "ha fallat la clonació parcial; s'està intentant la clonació completa"
+msgstr "ha fallat la clonació parcial; s'intenta la clonació completa"
 
 #: scalar.c
 msgid "could not configure for full clone"
@@ -28881,9 +29790,7 @@ msgstr "send-pack: no es pot bifurcar obtenint un subprocés"
 
 #: send-pack.c
 msgid "push negotiation failed; proceeding anyway with push"
-msgstr ""
-"ha fallat la negociació de la pujada; s'està procedint igualment amb "
-"l'empenta"
+msgstr "ha fallat la negociació de la pujada; es fa la pujada igualment"
 
 #: send-pack.c
 msgid "the receiving end does not support this repository's hash algorithm"
@@ -28898,8 +29805,8 @@ msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr ""
-"no s'està enviant una certificació de pujada perquè la destinació "
-"receptorano admet pujar --signed"
+"no s'envia un certificat de pujada perquè la destinació receptora no admet "
+"una pujada --signed"
 
 #: send-pack.c
 msgid "the receiving end does not support --atomic push"
@@ -28949,7 +29856,7 @@ msgstr ""
 "continue».\n"
 "Alternativament podeu ometre aquesta comissió: executeu «git rebase --"
 "skip».\n"
-"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», "
+"Per a interrompre i tornar a l'estat anterior abans de l'ordre «git rebase», "
 "executeu «git rebase --abort»."
 
 #: sequencer.c
@@ -29406,11 +30313,11 @@ msgstr "no es pot «%s» sense una comissió prèvia"
 
 #: sequencer.c
 msgid "cancelling a cherry picking in progress"
-msgstr "s'està cancel·lant un «cherry pick» en curs"
+msgstr "es cancel·la un «cherry pick» en curs"
 
 #: sequencer.c
 msgid "cancelling a revert in progress"
-msgstr "s'està cancel·lant la reversió en curs"
+msgstr "es cancel·la la reversió en curs"
 
 #: sequencer.c
 msgid "please fix this using 'git rebase --edit-todo'."
@@ -29491,7 +30398,7 @@ msgstr "no es pot resoldre HEAD"
 
 #: sequencer.c
 msgid "cannot abort from a branch yet to be born"
-msgstr "no es pot avortar des d'una branca que encara ha de nàixer"
+msgstr "no es pot interrompre des d'una branca que encara ha de nàixer"
 
 #: sequencer.c
 #, c-format
@@ -29578,7 +30485,7 @@ msgstr "No s'ha pogut fusionar %.*s"
 #: sequencer.c
 #, c-format
 msgid "Executing: %s\n"
-msgstr "S'està executant: %s\n"
+msgstr "%s en curs d'execució\n"
 
 #: sequencer.c
 #, c-format
@@ -29623,11 +30530,11 @@ msgstr "nom d'etiqueta no permès: «%.*s»"
 
 #: sequencer.c
 msgid "writing fake root commit"
-msgstr "s'està escrivint una comissió arrel falsa"
+msgstr "escriptura d'una comissió arrel falsa en curs"
 
 #: sequencer.c
 msgid "writing squash-onto"
-msgstr "s'està escrivint «squash-onto»"
+msgstr "escriptura «squash-onto» en curs"
 
 #: sequencer.c
 msgid "cannot merge without a current revision"
@@ -29667,7 +30574,7 @@ msgstr "fusió: no s'ha pogut escriure un fitxer d'índex nou"
 msgid ""
 "another 'rebase' process appears to be running; '%s.lock' already exists"
 msgstr ""
-"sembla que s'està executant un altre procés «rebase»: «%s.lock» ja existeix"
+"sembla que hi ha un altre procés «rebase» en execució: «%s.lock» ja existeix"
 
 #: sequencer.c
 #, c-format
@@ -29735,6 +30642,12 @@ msgstr ""
 "resoldre ara, executeu «git reset --hard» i apliqueu els\n"
 "canvis locals més tard tot executant «git stash pop».\n"
 
+#: sequencer.c
+msgid "could not apply autostash; your changes are safe in the stash"
+msgstr ""
+"no s'ha pogut aplicar l'«autostash»; els vostres canvis estan segurs a "
+"l'«stash»"
+
 #: sequencer.c
 #, c-format
 msgid ""
@@ -29742,7 +30655,7 @@ msgid ""
 "Your changes are safe in the stash.\n"
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
-"Hi ha un «autostash»; s'està creant una nova entrada\n"
+"Hi ha un «autostash»; es crea una nova entrada\n"
 "de «stash». Els vostres canvis estan segurs en el «stash».\n"
 "Podeu executar «git stash pop» o «git stash drop» en qualsevol moment.\n"
 
@@ -29793,7 +30706,7 @@ msgstr "Aturat a %s...  %.*s\n"
 #: sequencer.c
 #, c-format
 msgid "Rebasing (%d/%d)%s"
-msgstr "S'està fent «rebase» (%d/%d)%s"
+msgstr "«Rebase» en curs (%d/%d)%s"
 
 #: sequencer.c
 #, c-format
@@ -29953,8 +30866,8 @@ msgstr ""
 #: setup.c
 msgid "unable to set up work tree using invalid config"
 msgstr ""
-"no s'ha pogut configurar un arbre de treball utilitzant una configuració no "
-"vàlida"
+"no s'ha pogut configurar un arbre de treball tot utilitzant una configuració "
+"no vàlida"
 
 #: setup.c
 #, c-format
@@ -30005,8 +30918,8 @@ msgstr "sense camí al gitfile: %s"
 
 #: setup.c
 #, c-format
-msgid "not a git repository: %s"
-msgstr "no és un repositori de git: %s"
+msgid "gitfile does not point to a valid repository: %s"
+msgstr "el fitxer git no apunta a un repositori vàlid: «%s»"
 
 #: setup.c
 #, c-format
@@ -30134,7 +31047,7 @@ msgstr "no es pot copiar «%s» a «%s»"
 #: setup.c
 #, c-format
 msgid "ignoring template %s"
-msgstr "s'està ignorant la plantilla %s"
+msgstr "s'ignora la plantilla %s"
 
 #: setup.c
 #, c-format
@@ -30144,7 +31057,7 @@ msgstr "plantilles no trobades a %s"
 #: setup.c
 #, c-format
 msgid "not copying templates from '%s': %s"
-msgstr "no s'estan copiant plantilles de «%s»: %s"
+msgstr "no es copien plantilles de «%s»: %s"
 
 #: setup.c
 #, c-format
@@ -30156,6 +31069,10 @@ msgstr "nom de branca inicial no vàlid: «%s»"
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "reinicialització: s'ha ignorat --initial-branch=%s"
 
+#: setup.c
+msgid "failed creating object database"
+msgstr "no s'ha pogut crear la base de dades d'objectes"
+
 #: setup.c
 #, c-format
 msgid "unable to handle file type %d"
@@ -30315,7 +31232,7 @@ msgstr "%s %s"
 #: submodule-config.c
 #, c-format
 msgid "ignoring suspicious submodule name: %s"
-msgstr "s'està ignorant el nom de submòdul sospitós %s"
+msgstr "s'ignora el nom de submòdul sospitós %s"
 
 #: submodule-config.c
 msgid "negative values not allowed for submodule.fetchJobs"
@@ -30325,8 +31242,7 @@ msgstr "no es permeten els valors negatius a submodule.fetchJobs"
 #, c-format
 msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
 msgstr ""
-"s'està ignorant «%s» que pot interpretar-se com a una opció de línia "
-"d'ordres: %s"
+"s'ignora «%s», que pot interpretar-se com a una opció de línia d'ordres: %s"
 
 #: submodule-config.c
 #, c-format
@@ -30399,7 +31315,7 @@ msgstr "ha fallat el procés per al submòdul «%s»"
 #: submodule.c
 #, c-format
 msgid "Pushing submodule '%s'\n"
-msgstr "S'està pujant el submòdul «%s»\n"
+msgstr "Pujada del submòdul «%s» en curs\n"
 
 #: submodule.c
 #, c-format
@@ -30409,7 +31325,7 @@ msgstr "No s'ha pogut pujar el submòdul «%s»\n"
 #: submodule.c
 #, c-format
 msgid "Fetching submodule %s%s\n"
-msgstr "S'està obtenint el submòdul %s%s\n"
+msgstr "Obtenció del submòdul %s%s en curs\n"
 
 #: submodule.c
 #, c-format
@@ -30424,7 +31340,7 @@ msgstr "No s'ha pogut accedir al submòdul «%s» en la comissió %s\n"
 #: submodule.c
 #, c-format
 msgid "Fetching submodule %s%s at commit %s\n"
-msgstr "S'està obtenint el submòdul %s%s en la comissió %s\n"
+msgstr "Obtenció del submòdul %s%s a la comissió %s en curs\n"
 
 #: submodule.c
 #, c-format
@@ -30522,7 +31438,7 @@ msgid ""
 "'%s' to\n"
 "'%s'\n"
 msgstr ""
-"S'està migrant el directori de «%s%s» des de\n"
+"Migració en curs del directori de «%s%s» des de\n"
 "«%s» a\n"
 "«%s»\n"
 
@@ -30593,7 +31509,7 @@ msgstr "el nombre d'objectes a escriure"
 
 #: t/helper/test-path-walk.c
 msgid "test-tool path-walk <options> -- <revision-options>"
-msgstr "test-tool path-walk <opcions> -- <opcions-revisio>"
+msgstr "test-tool path-walk <opcions> -- <opcions-revisió>"
 
 #: t/helper/test-path-walk.c
 msgid "toggle inclusion of blob objects"
@@ -30663,11 +31579,11 @@ msgstr "test-helper simple-ipc run-daemon   [<nom>] [<fils>]"
 
 #: t/helper/test-simple-ipc.c
 msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
-msgstr "test-helper simple-ipc start-daemon [<nom>] [<fils>] [<max-wait>]"
+msgstr "test-helper simple-ipc start-daemon [<nom>] [<fils>] [<espera-màxima>]"
 
 #: t/helper/test-simple-ipc.c
 msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
-msgstr "test-helper simple-ipc stop-daemon  [<nom>] [<max-wait>]"
+msgstr "test-helper simple-ipc stop-daemon  [<nom>] [<espera-màxima>]"
 
 #: t/helper/test-simple-ipc.c
 msgid "test-helper simple-ipc send         [<name>] [<token>]"
@@ -30836,6 +31752,10 @@ msgstr "%s ha dit inesperadament «%s»"
 msgid "%s also locked %s"
 msgstr "%s també està bloquejat %s"
 
+#: transport-helper.c
+msgid "could not dup helper output fd"
+msgstr "no s'ha pogut duplicar la sortida auxiliar fd"
+
 #: transport-helper.c
 msgid "couldn't run fast-import"
 msgstr "no s'ha pogut executar «fast-import»"
@@ -30874,7 +31794,7 @@ msgstr "--negotiate-only requereix el protocol v2"
 #: transport-helper.c
 #, c-format
 msgid "ignoring %s because the protocol does not support it."
-msgstr "s'està ignorant %s perquè el protocol no l'admet"
+msgstr "s'ignora %s perquè el protocol no l'admet."
 
 #: transport-helper.c
 msgid "'option' without a matching 'ok/error' directive"
@@ -30938,6 +31858,11 @@ msgstr "no s'ha pogut executar l'exportació ràpida"
 msgid "error while running fast-export"
 msgstr "error en executar l'exportació ràpida"
 
+#: transport-helper.c
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "no s'ha pogut canviar el nom «%s» a «%s»"
+
 #: transport-helper.c
 #, c-format
 msgid ""
@@ -30999,7 +31924,7 @@ msgstr "no es pot iniciar el fil per a copiar dades"
 #: transport.c
 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Establiria la referència amunt de «%s» a «%s» de «%s»\n"
+msgstr "Establiria la font de «%s» a «%s» de «%s»\n"
 
 #: transport.c
 #, c-format
@@ -31019,6 +31944,10 @@ msgstr "vegeu «protocol.version» a «git help config» per a més detalls"
 msgid "server options require protocol version 2 or later"
 msgstr "les opcions del servidor requereixen el protocol versió 2 o posterior"
 
+#: transport.c
+msgid "remote does not support object-info"
+msgstr "el remot no admet object-info"
+
 #: transport.c
 msgid "server does not support wait-for-done"
 msgstr "el servidor no admet «wait-for-done»"
@@ -31367,7 +32296,7 @@ msgstr ""
 
 #: unpack-trees.c
 msgid "Updating files"
-msgstr "S'estan actualitzant els fitxers"
+msgstr "Actualització dels fitxers en curs"
 
 #: unpack-trees.c
 msgid ""
@@ -31382,7 +32311,7 @@ msgstr ""
 
 #: unpack-trees.c
 msgid "Updating index flags"
-msgstr "Actualitzant els indicadors d'índex"
+msgstr "Actualització dels indicadors d'índex en curs"
 
 #: unpack-trees.c
 #, c-format
@@ -31446,32 +32375,33 @@ msgstr "avís: "
 
 #: usage.c
 #, c-format
-msgid "'%s' is nominated for removal.\n"
-msgstr "«%s» està nominat per a ser eliminat.\n"
+msgid "'%s' will be removed soon.\n"
+msgstr "«%s» s'eliminarà aviat.\n"
 
 #: usage.c
 #, c-format
 msgid ""
-"If you still use this command, here's what you can do:\n"
+"If you need a replacement:\n"
+"\n"
+"- Read https://git-scm.com/docs/BreakingChanges.html.\n"
 "\n"
-"- read https://git-scm.com/docs/BreakingChanges.html\n"
-"- check if anyone has discussed this on the mailing\n"
-"  list and if they came up with something that can\n"
-"  help you: https://lore.kernel.org/git/?q=%s\n"
-"- send an email to <git@vger.kernel.org> to let us\n"
-"  know that you still use this command and were unable\n"
-"  to determine a suitable replacement\n"
+"- Check what others on the mailing list suggest as a replacement:\n"
+"  https://lore.kernel.org/git/?q=%s\n"
+"\n"
+"- Send an email to <git@vger.kernel.org> asking for help, only if\n"
+"  suggestions by others do not work for you.\n"
 "\n"
 msgstr ""
-"Si encara useu aquesta ordre, podeu fer això:\n"
+"Si necessiteu una alternativa:\n"
+"\n"
+"- Llegiu https://git-scm.com/docs/BreakingChanges.html.\n"
+"\n"
+"- Consulteu quines alternatives suggereixen els altres a la llista de "
+"correu:\n"
+"https://lore.kernel.org/git/?q=%s\n"
 "\n"
-"- llegiu https://git-scm.com/docs/BreakingChanges.html\n"
-"- comproveu si algú ha discutit això en la llista\n"
-"  de correu i si se'ls ha acudit alguna cosa que us\n"
-"  pugui ajudar: https://lore.kernel.org/git/?q=%s\n"
-"- envieu un email a <git@vger.kernel.org> per a fer-nos\n"
-"  saber que encara useu aquesta ordre i no heu pogut\n"
-"  determinar una alternativa adequada\n"
+"- Envieu correu electrònic a <git@vger.kernel.org> demanant ajuda, només si\n"
+"els suggeriments dels altres no us serveixen.\n"
 "\n"
 
 #: usage.c
@@ -31485,7 +32415,7 @@ msgstr "uname() ha fallat amb l'error «%s» (%d)\n"
 
 #: walker.c
 msgid "Fetching objects"
-msgstr "S'estan obtenint objectes"
+msgstr "Obtenció d'objectes en curs"
 
 #: worktree.c
 #, c-format
@@ -31552,7 +32482,7 @@ msgstr "gitdir illegible"
 
 #: worktree.c
 msgid "gitdir absolute/relative path mismatch"
-msgstr "el camins absoluts/relatius del directori git no coincideixen"
+msgstr "els camins absoluts/relatius del directori git no coincideixen"
 
 #: worktree.c
 msgid "gitdir incorrect"
@@ -31639,7 +32569,7 @@ msgstr "no s'han pogut obtenir octets aleatoris"
 #: wrapper.c
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "s'està intentant fer mmap %<PRIuMAX> per sobre del límit %<PRIuMAX>"
+msgstr "s'intenta fer mmap %<PRIuMAX> per sobre del límit %<PRIuMAX>"
 
 #: wrapper.c
 #, c-format
@@ -31828,7 +32758,7 @@ msgstr "  (arregleu els conflictes i executeu «git commit»)"
 
 #: wt-status.c
 msgid "  (use \"git merge --abort\" to abort the merge)"
-msgstr "  (useu «git merge --abort» per a avortar la fusió)"
+msgstr "  (useu «git merge --abort» per a interrompre la fusió)"
 
 #: wt-status.c
 msgid "All conflicts fixed but you are still merging."
@@ -32032,7 +32962,8 @@ msgstr "  (useu «git revert --abort» per a cancel·lar l'operació de reversi
 #: wt-status.c
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
-msgstr "Actualment esteu bisecant, heu començat des de la branca «%s»."
+msgstr ""
+"Actualment teniu una bisecció en curs, heu començat des de la branca «%s»."
 
 #: wt-status.c
 msgid "You are currently bisecting."
@@ -32240,17 +33171,16 @@ msgstr "Ja està al dia amb $pretty_name"
 #: git-merge-octopus.sh
 #, sh-format
 msgid "Fast-forwarding to: $pretty_name"
-msgstr "S'està avançant ràpidament a: $pretty_name"
+msgstr "S'avança ràpidament a: $pretty_name"
 
 #: git-merge-octopus.sh
 #, sh-format
 msgid "Trying simple merge with $pretty_name"
-msgstr "S'està intentant una fusió simple amb $pretty_name"
+msgstr "S'intenta una fusió simple amb $pretty_name"
 
 #: git-merge-octopus.sh
 msgid "Simple merge did not work, trying automatic merge."
-msgstr ""
-"La fusió simple no ha funcionat, s'està intentant una fusió automàtica."
+msgstr "La fusió simple no ha funcionat, s'intenta una fusió automàtica."
 
 #: git-sh-setup.sh
 #, sh-format
@@ -32417,8 +33347,8 @@ msgstr ""
 
 #: git-send-email.perl
 #, perl-format
-msgid "No subject line in %s?"
-msgstr "Sense assumpte a %s?"
+msgid "No 'Subject:' line in '%s'\n"
+msgstr "No hi ha línia «Subject:» en «%s»\n"
 
 #: git-send-email.perl
 #, perl-format
@@ -32599,7 +33529,8 @@ msgstr "Outlook ha reassignat el Message-ID a %s\n"
 #: git-send-email.perl
 msgid "Warning: Could not retrieve Message-ID from server response.\n"
 msgstr ""
-"Avís: no s'ha pogut recuperar el Message-ID de la resposta del servidor.\n"
+"Avís: no s'ha pogut recuperar l'identificador de missatge de la resposta del "
+"servidor.\n"
 
 #: git-send-email.perl
 #, perl-format
@@ -32641,22 +33572,22 @@ msgstr "no es pot obrir el fitxer %s"
 #: git-send-email.perl
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
-msgstr "(mbox) S'està afegint cc: %s des de la línia «%s»\n"
+msgstr "(mbox) S'afig cc: %s des de la línia «%s»\n"
 
 #: git-send-email.perl
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
-msgstr "(mbox) S'està afegint a: %s des de la línia «%s»\n"
+msgstr "(mbox) S'afig a: %s des de la línia «%s»\n"
 
 #: git-send-email.perl
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
-msgstr "(no mbox) S'està afegint cc: %s des de la línia «%s»\n"
+msgstr "(no mbox) S'afig cc: %s des de la línia «%s»\n"
 
 #: git-send-email.perl
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
-msgstr "(cos) S'està afegint cc: %s des de la línia «%s»\n"
+msgstr "(cos) S'afig cc: %s des de la línia «%s»\n"
 
 #: git-send-email.perl
 #, perl-format
@@ -32681,7 +33612,7 @@ msgstr "(%s) s'ha produït un error en tancar el conducte «%s»"
 #: git-send-email.perl
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
-msgstr "(%s) S'està afegint %s: %s des de: «%s»\n"
+msgstr "(%s) Addició en curs de %s: %s des de: «%s»\n"
 
 #: git-send-email.perl
 msgid "cannot send message as 7bit"
@@ -32719,7 +33650,7 @@ msgstr ""
 #: git-send-email.perl
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
-msgstr "S'està ometent %s amb el sufix de còpia de seguretat «%s».\n"
+msgstr "S'omet %s amb el sufix de còpia de seguretat «%s».\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
 #: git-send-email.perl

From a2a8f6ba37019e7c48699bb471312c442c126574 Mon Sep 17 00:00:00 2001
From: Arkadii Yakovets <2201626+arkid15r@users.noreply.github.com>
Date: Sun, 20 Sep 2026 21:40:49 -0700
Subject: [PATCH 015/247] l10n: uk: add 2.56 translation

Co-authored-by: Kate Golovanova <kate@kgthreads.com>
Signed-off-by: Arkadii Yakovets <2201626+arkid15r@users.noreply.github.com>
Signed-off-by: Kate Golovanova <kate@kgthreads.com>
---
 po/uk.po | 1088 ++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 854 insertions(+), 234 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index 7d0451933c0721..839c4f7745ca22 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git v2.55\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2026-06-27 11:33-0700\n"
+"POT-Creation-Date: 2026-09-19 18:45-0700\n"
 "PO-Revision-Date: 2026-06-27 10:23-0700\n"
-"Last-Translator: Kateryna Golovanova <kate@kgthreads.com>\n"
+"Last-Translator: Arkadii Yakovets <ark@cho.red>\n"
 "Language-Team: Ukrainian <https://github.com/arkid15r/git-uk-l10n/>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
@@ -1707,6 +1707,14 @@ msgstr "не вдалося запустити \"show\" для об’єкта \
 msgid "could not read file '%s'"
 msgstr "не вдалося прочитати файл \"%s\""
 
+#, c-format
+msgid "could not read bad term from file '%s'"
+msgstr "не вдалося прочитати поганий термін з файлу \"%s\""
+
+#, c-format
+msgid "could not read good term from file '%s'"
+msgstr "не вдалося прочитати добрий термін з файлу \"%s\""
+
 msgid "reading bisect refs failed"
 msgstr "не вдалося прочитати бісекційні посилання"
 
@@ -1954,6 +1962,12 @@ msgstr "не вдалося виконати stat \"%s\""
 msgid "empty patch. aborted"
 msgstr "порожня латка. перервано"
 
+msgid "could not initialize apply state"
+msgstr "не вдалося ініціалізувати стан застосування"
+
+msgid "could not check apply state"
+msgstr "не вдалося перевірити стан застосування"
+
 #, c-format
 msgid "could not apply '%s'"
 msgstr "не вдалося застосувати \"%s\""
@@ -1990,6 +2004,9 @@ msgstr "оновити відстежувані файли"
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "перенормувати EOL відстежуваних файлів (мається на увазі -u)"
 
+msgid "add conflict-resolved tracked files"
+msgstr "додати відстежувані файли з вирішеними конфліктами"
+
 msgid "record only the fact that the path will be added later"
 msgstr "записати лише той факт, що шлях буде додано пізніше"
 
@@ -2059,6 +2076,22 @@ msgstr "Скористайтесь -f, якщо ви дійсно хочете 
 msgid "adding files failed"
 msgstr "додавання файлів завершилося невдало"
 
+#, c-format
+msgid "updating file '%s' failed"
+msgstr "не вдалося оновити файл \"%s\""
+
+#, c-format
+msgid ""
+"the following paths still have conflict markers:\n"
+"%s"
+msgstr ""
+"у наступних шляхах досі є маркери конфліктів:\n"
+"%s"
+
+#, c-format
+msgid "cannot lstat: '%s'"
+msgstr "неможливо виконати lstat: \"%s\""
+
 #, c-format
 msgid "'%s' cannot be negative"
 msgstr "\"%s\" не може бути відʼємним"
@@ -2499,13 +2532,13 @@ msgstr "нерозпізнаний аргумент: %s"
 
 msgid ""
 "git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n"
-"                 [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
-"[<pathspec>...]"
+"                 [--no-checkout] [--first-parent] [--reset-when-"
+"found[=<where>]] [<bad> [<good>...]] [--] [<pathspec>...]"
 msgstr ""
 "git bisect start [--term-(bad|new)=<новий-термін> --term-(good|old)=<старий-"
 "термін>]\n"
-"                 [--no-checkout] [--first-parent] [<поганий> [<добрий>...]] "
-"[--] [<визначник шляху>...]"
+"                 [--no-checkout] [--first-parent] [--reset-when-"
+"found[=<місце>]] [<поганий> [<добрий>...]] [--] [<визначник шляху>...]"
 
 msgid "git bisect (bad|new|<term-new>) [<rev>]"
 msgstr "git bisect (поганий|новий|<новий-термін>) [<ревізія>...]"
@@ -2522,8 +2555,9 @@ msgstr "git bisect reset [<коміт>]"
 msgid "git bisect replay <logfile>"
 msgstr "git bisect replay <лог файл>"
 
-msgid "git bisect run <cmd> [<arg>...]"
-msgstr "git bisect run <команда> [<аргумент>...]"
+msgid "git bisect run [--reset-when-found[=<where>]] <cmd> [<arg>...]"
+msgstr ""
+"git bisect run [--reset-when-found[=<місце>]] <команда> [<аргумент>...]"
 
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
@@ -2567,6 +2601,10 @@ msgstr ""
 "не вдалося переключитися на початковий HEAD \"%s\". Спробуйте \"git bisect "
 "reset <коміт>\"."
 
+#, c-format
+msgid "invalid value for '--reset-when-found': '%s'"
+msgstr "неприпустиме значення для \"--reset-when-found\": \"%s\""
+
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Невірний bisect_write аргумент: %s"
@@ -2653,6 +2691,10 @@ msgstr ""
 msgid "could not open '%s' for appending"
 msgstr "не вдалося відкрити \"%s\" для додавання"
 
+#, c-format
+msgid "could not find commit for '%s'"
+msgstr "не вдалося знайти коміт для \"%s\""
+
 msgid "'' is not a valid term"
 msgstr "\"\" не є допустимим терміном"
 
@@ -2740,6 +2782,9 @@ msgstr "бісекція завершилася невдало: код вихо
 msgid "cannot open file '%s' for writing"
 msgstr "не вдалося відкрити файл \"%s\" для запису"
 
+msgid "could not duplicate stdout"
+msgstr "не вдалося продублювати stdout"
+
 msgid "bisect run cannot continue any more"
 msgstr "неможливо продовжити бісекцію"
 
@@ -2935,8 +2980,12 @@ msgstr[2] "файл %s містить лише %lu рядків"
 msgid "Blaming lines"
 msgstr "Blaming рядки"
 
-msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
-msgstr "git branch [<опції>] [-r | -a] [--merged] [--no-merged]"
+msgid ""
+"git branch [<options>] [-r | -a] [--merged] [--no-merged] [(--forked "
+"<branch>)...]"
+msgstr ""
+"git branch [<опції>] [-r | -a] [--merged] [--no-merged] [(--forked "
+"<гілка>)...]"
 
 msgid ""
 "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
@@ -2963,6 +3012,10 @@ msgstr "git branch [<опції>] [-r | -a] [--points-at]"
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<опції>] [-r | -a] [--format]"
 
+msgid ""
+"git branch [<options>] (--delete-merged <pattern>)... [<branch-pattern>...]"
+msgstr "git branch [<опції>] (--delete-merged <шаблон>)... [<шаблон-гілки>...]"
+
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -2998,6 +3051,12 @@ msgstr "не вдалося оновити конфігураційний фай
 msgid "cannot use -a with -d"
 msgstr "не можна використовувати -a з -d"
 
+#, c-format
+msgid "cannot delete branch '%s' used by worktree at '%s' for bisect"
+msgstr ""
+"неможливо видалити гілку \"%s\", яка використовується робочим деревом у "
+"\"%s\" для bisect"
+
 #, c-format
 msgid "cannot delete branch '%s' used by worktree at '%s'"
 msgstr ""
@@ -3020,6 +3079,14 @@ msgstr ""
 msgid "branch '%s' not found"
 msgstr "гілка \"%s\" не знайдена"
 
+#, c-format
+msgid "Would delete remote-tracking branch %s (was %s).\n"
+msgstr "Було б видалено гілку віддаленого відстеження %s (була %s).\n"
+
+#, c-format
+msgid "Would delete branch %s (was %s).\n"
+msgstr "Було б видалено гілку %s (була %s).\n"
+
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Видалено гілку віддаленого відстеження %s (була %s).\n"
@@ -3086,6 +3153,14 @@ msgstr "гілку перейменовано, але не вдалося оно
 msgid "branch is copied, but update of config-file failed"
 msgstr "гілку скопійовано, але не вдалося оновити конфігураційний файл"
 
+#, c-format
+msgid "'%s' is not a valid branch or pattern"
+msgstr "\"%s\" не є допустимою гілкою або шаблоном"
+
+#, c-format
+msgid "Skipping '%s' (branch.%s.deleteMerged is false)\n"
+msgstr "Пропуск \"%s\" (branch.%s.deleteMerged має значення false)\n"
+
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -3096,6 +3171,13 @@ msgstr ""
 "  %s\n"
 "Рядки, що починаються з \"%s\", будуть вилучені.\n"
 
+msgid "--set-upstream-to takes a single <remote>/<branch> argument"
+msgstr "--set-upstream-to потребує один аргумент <віддалене>/<гілка>"
+
+#, c-format
+msgid "Did you mean to use: git branch --set-upstream-to=%s/%s?"
+msgstr "Ви мали на увазі \"git branch --set-upstream-to=%s/%s\"?"
+
 msgid "Generic options"
 msgstr "Загальні опції"
 
@@ -3172,6 +3254,17 @@ msgstr "створити журнал посилань гілки"
 msgid "edit the description for the branch"
 msgstr "редагувати опис гілки"
 
+msgid "pattern"
+msgstr "шаблон"
+
+msgid "delete merged branches whose upstream matches <pattern> (repeatable)"
+msgstr ""
+"видалити злиті гілки, висхідна гілка яких відповідає <шаблону> (можна "
+"повторювати)"
+
+msgid "with --delete-merged, only print which branches would be deleted"
+msgstr "з --delete-merged лише вивести, які гілки було б видалено"
+
 msgid "force creation, move/rename, deletion"
 msgstr "примусове створення, переміщення/перейменування, видалення"
 
@@ -3181,6 +3274,14 @@ msgstr "вивести тільки злиті гілки"
 msgid "print only branches that are not merged"
 msgstr "вивести тільки не злиті гілки"
 
+msgid "branch"
+msgstr "гілка"
+
+msgid "print only branches whose upstream matches <branch> (repeatable)"
+msgstr ""
+"виводити тільки гілки, висхідна гілка яких відповідає <гілці> (можна "
+"повторювати)"
+
 msgid "list branches in columns"
 msgstr "виводити гілки в стовпчиках"
 
@@ -3205,6 +3306,9 @@ msgstr "не вдалося розпізнати HEAD як дійсне поси
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD не знайдено під refs/heads!"
 
+msgid "--dry-run requires --delete-merged"
+msgstr "--dry-run потребує --delete-merged"
+
 msgid ""
 "branch with --recurse-submodules can only be used if "
 "submodule.propagateBranches is enabled"
@@ -3405,9 +3509,6 @@ msgstr "показувати хід виконання"
 msgid "historical; same as --progress"
 msgstr "історичний; те саме, що --progress"
 
-msgid "historical; does nothing"
-msgstr "історична; не робить нічогісенько"
-
 msgid "specify bundle format version"
 msgstr "вказати версію формату пакунка"
 
@@ -3434,10 +3535,42 @@ msgstr "Розділення об’єктів"
 msgid "cannot read object %s '%s'"
 msgstr "неможливо прочитати об’єкт %s \"%s\""
 
+msgid "must supply valid remote when using remote-object-info"
+msgstr ""
+"необхідно вказати допустиме віддалене призначення при використанні remote-"
+"object-info"
+
+#, c-format
+msgid "remote-object-info does not support short oids, %d characters required"
+msgstr "remote-object-info не підтримує короткі oid, потрібно %d символів"
+
+#, c-format
+msgid "not a valid object name '%s'"
+msgstr "\"%s\" не є допустимою назвою обʼєкта"
+
+msgid "remote-object-info requires objects"
+msgstr "remote-object-info потребує обʼєктів"
+
 #, c-format
 msgid "mailmap: invalid boolean '%s'"
 msgstr "mailmap: неприпустиме булеве значення \"%s\""
 
+msgid "remote-object-info command too long"
+msgstr "команда remote-object-info занадто довга"
+
+#, c-format
+msgid "remote-object-info: failed to parse command line: %s"
+msgstr "remote-object-info: не вдалося розібрати командний рядок: %s"
+
+#, c-format
+msgid "remote-object-info supports at most %d objects"
+msgstr "remote-object-info підтримує щонайбільше %d обʼєктів"
+
+#, c-format
+msgid "failed to get object info from the remote: %s"
+msgstr ""
+"не вдалося отримати інформацію про обʼєкт з віддаленого призначення: %s"
+
 msgid "flush is only for --buffer mode"
 msgstr "flush тільки для режиму --buffer"
 
@@ -3899,36 +4032,43 @@ msgid "The following paths have local changes:\n"
 msgstr "У наступних шляхах є локальні зміни:\n"
 
 #, 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\" може бути як локальним файлом, так і відстежуваною гілкою.\n"
-"Будь ласка, використовуйте -- (і, за бажанням, --no-guess), для визначення"
+msgid "Branch name '%s' appears in multiple remotes:"
+msgstr "Назва гілки \"%s\" зустрічається в кількох віддалених призначеннях:"
+
+#, c-format
+msgid "  %s"
+msgstr "  %s"
 
 #, c-format
 msgid ""
-"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"If you meant to check out a remote tracking branch on <remote>,\n"
 "you can do so by fully qualifying the name with the --track option:\n"
 "\n"
-"    git %s --track origin/<name>\n"
+"    git %s --track <remote>/%s\n"
 "\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\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 ""
-"Якщо ви хотіли перейти на віддалену гілку відстеження, наприклад, з "
-"\"origin\",\n"
+"Якщо ви хотіли перейти на віддалену гілку відстеження на <віддаленому>,\n"
 "ви можете це зробити, вказавши повну назву за допомогою опції --track:\n"
 "\n"
-"    git %s --track origin/<назва>\n"
+"    git %s --track <віддалене>/%s\n"
 "\n"
-"Якщо ви хочете, щоб при переході на неоднозначний <назва> завжди віддавалась "
+"Якщо ви хочете, щоб при переході на неоднозначну назву завжди віддавалась "
 "перевагу\n"
-"одній віддаленій гілці, наприклад \"origin\", розгляньте можливість "
+"одному віддаленому призначенню, наприклад \"origin\", розгляньте можливість "
 "встановити\n"
 "параметр checkout.defaultRemote=origin у вашому файлі конфігурації."
 
+#, 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\" може бути як локальним файлом, так і відстежуваною гілкою.\n"
+"Будь ласка, використовуйте -- (і, за бажанням, --no-guess), для визначення"
+
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "\"%s\" відповідає кільком (%d) гілкам віддаленого відстежування"
@@ -4122,9 +4262,6 @@ msgstr ""
 msgid "you must specify path(s) to restore"
 msgstr "необхідно вказати шлях(и) для відновлення"
 
-msgid "branch"
-msgstr "гілка"
-
 msgid "create and checkout a new branch"
 msgstr "створити та перейти до нової гілки"
 
@@ -4294,9 +4431,6 @@ msgstr "інтерактивне прибирання"
 msgid "remove whole directories"
 msgstr "видаляти цілі директорії"
 
-msgid "pattern"
-msgstr "шаблон"
-
 msgid "add <pattern> to ignore rules"
 msgstr "додати <шаблон> в правила ігнорування"
 
@@ -4904,8 +5038,16 @@ msgstr "неможливо зробити частковий коміт під 
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "неможливо зробити частковий коміт під час висмикування."
 
-msgid "cannot do a partial commit during a rebase."
-msgstr "неможливо зробити частковий коміт під час перебазування."
+msgid "cannot do a partial commit during a revert."
+msgstr "неможливо зробити частковий коміт під час вивертання."
+
+msgid "cannot do a partial commit during an am session."
+msgstr "неможливо зробити частковий коміт під час сесії am."
+
+msgid "cannot do a partial commit while resolving conflicts during a rebase."
+msgstr ""
+"неможливо зробити частковий коміт під час вирішення конфліктів при "
+"перебазуванні."
 
 msgid "cannot read the index"
 msgstr "неможливо прочитати індекс"
@@ -5090,8 +5232,18 @@ msgstr "Ви перебуваєте в процесі злиття -- немож
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Ви перебуваєте в процесі висмикування - неможливо внести зміни."
 
-msgid "You are in the middle of a rebase -- cannot amend."
-msgstr "Ви перебуваєте в процесі перебазуавння -- неможливо внести зміни."
+msgid "The now-empty commit has been dropped -- cannot amend."
+msgstr "Тепер порожній коміт було відкинуто -- неможливо внести зміни."
+
+msgid "You are in the middle of a revert -- cannot amend."
+msgstr "Ви перебуваєте в процесі вивертання -- неможливо внести зміни."
+
+msgid "You are in the middle of an am session -- cannot amend."
+msgstr "Ви перебуваєте в процесі сесії am -- неможливо внести зміни."
+
+msgid "You are resolving conflicts during a rebase -- cannot amend."
+msgstr ""
+"Ви вирішуєте конфлікти під час перебазування -- неможливо внести зміни."
 
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author можна використовувати лише з -C, -c або --amend."
@@ -5961,6 +6113,10 @@ msgstr "Не є git сховищем"
 msgid "invalid object '%s' given."
 msgstr "надано неприпустимий об’єкт \"%s\"."
 
+#, c-format
+msgid "unable to read tree object for commit '%s'"
+msgstr "не вдалося прочитати обʼєкт дерева для коміту \"%s\""
+
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "надано більше двох blob: \"%s\""
@@ -6060,8 +6216,8 @@ msgstr "не надано <засіб> для --tool=<засіб>"
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "не надана <команда> для --extcmd=<команда>"
 
-msgid "git fast-export [<rev-list-opts>]"
-msgstr "git fast-export [<rev-list-опції>]"
+msgid "git fast-export [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git fast-export [<опції>] [<діапазон-ревізій>] [[--] <шлях>...]"
 
 #, c-format
 msgid "unknown %s mode: %s"
@@ -6725,6 +6881,9 @@ msgstr "--cat-blob-fd не може перевищувати %d"
 msgid "expected format name:filename for submodule rewrite option"
 msgstr "очікуваний формат назва:назва_файлу для опції перезапису підмодуля"
 
+msgid "--max-pack-size: argument must be a non-negative integer"
+msgstr "--max-pack-size: аргумент повинен бути невідʼємним цілим числом"
+
 #, c-format
 msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum"
 msgstr ""
@@ -6733,6 +6892,9 @@ msgstr ""
 msgid "minimum max-pack-size is 1 MiB"
 msgstr "мінімальний розмір пакунка 1 МіБ"
 
+msgid "--big-file-threshold: argument must be a non-negative integer"
+msgstr "--big-file-threshold: аргумент повинен бути невідʼємним цілим числом"
+
 #, c-format
 msgid "unknown --signed-commits mode '%s'"
 msgstr "невідомий --signed-commits режим \"%s\""
@@ -6762,13 +6924,90 @@ msgstr "отримано команду опції \"%s\" після коман
 msgid "this version of fast-import does not support option: %s"
 msgstr "ця версія fast-import не підтримує опцію: %s"
 
-#, c-format
-msgid "unknown option %s"
-msgstr "невідома опція %s"
+msgid "git fast-import [<options>]"
+msgstr "git fast-import [<опції>]"
 
-#, c-format
-msgid "unknown option --%s"
-msgstr "невідома опція --%s"
+msgid "Common"
+msgstr "Загальні"
+
+msgid "format of the commit/tag dates"
+msgstr "формат дат комітів/тегів"
+
+msgid "display some basic statistics (objects, packfiles and memory)"
+msgstr "показати базову статистику (обʼєкти, файли пакунків і памʼять)"
+
+msgid "disable the output shown by --stats"
+msgstr "вимкнути вивід, який показує --stats"
+
+msgid "force updating modified existing branches"
+msgstr "примусово оновлювати змінені наявні гілки"
+
+msgid "require a terminating 'done' command"
+msgstr "вимагати завершальну команду \"done\""
+
+msgid "maximum size of each output pack file"
+msgstr "максимальний розмір кожного файлу вихідного пакунку"
+
+msgid "maximum size of a blob that will be deltified"
+msgstr "максимальний розмір blob, який буде дельтифіковано"
+
+msgid "maximum delta depth"
+msgstr "максимальна глибина дельти"
+
+msgid "maximum number of branches to maintain active"
+msgstr "максимальна кількість активних гілок"
+
+msgid "Marks"
+msgstr "Позначки"
+
+msgid "import marks from <file>"
+msgstr "імпортувати позначки з <файлу>"
+
+msgid "import marks from <file> if it exists"
+msgstr "імпортувати позначки з <файлу>, якщо він існує"
+
+msgid "dump marks to <file>"
+msgstr "експортувати позначки у <файл>"
+
+msgid "are --(import|export)-marks= paths relative to '.git/info/fast-import'?"
+msgstr ""
+"чи шляхи --(import|export)-marks= є відносними до \".git/info/fast-import\"?"
+
+msgid "Submodule rewrite"
+msgstr "Перепис підмодулів"
+
+msgid "name:filename"
+msgstr "назва:файл"
+
+msgid "rewrite object IDs for submodule <name> from <filename>"
+msgstr "переписати ідентифікатори обʼєктів для підмодуля <назва> з <файлу>"
+
+msgid "rewrite object IDs for submodule <name> to <filename>"
+msgstr "переписати ідентифікатори обʼєктів для підмодуля <назва> у <файл>"
+
+msgid "Signing"
+msgstr "Підписування"
+
+msgid "how to handle signed commits"
+msgstr "як обробляти підписані коміти"
+
+msgid "how to handle signed tags"
+msgstr "як обробляти підписані теги"
+
+msgid "Advanced"
+msgstr "Розширені"
+
+msgid "allow unsafe mark commands from the stream"
+msgstr "дозволити небезпечні команди позначок з потоку"
+
+msgid "dump edge commits to <file>"
+msgstr "експортувати граничні коміти у <файл>"
+
+msgid "fd"
+msgstr "fd"
+
+msgid "write some responses to <fd> instead of stdout"
+msgstr "записувати деякі відповіді у <fd> замість stdout"
 
 #, c-format
 msgid "unsupported command: %s"
@@ -6796,6 +7035,10 @@ msgstr "git fetch --all [<опції>]"
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel не може бути відʼємним"
 
+#, c-format
+msgid "unrecognized fetch.followRemoteHEAD value '%s' ignored"
+msgstr "нерозпізнане значення fetch.followRemoteHEAD \"%s\" проігноровано"
+
 msgid "couldn't find remote ref HEAD"
 msgstr "не вдалося знайти посилання для віддаленого HEAD"
 
@@ -6906,17 +7149,25 @@ msgstr "ігнорування %s, оскільки протокол його н
 
 #, c-format
 msgid ""
-"Run 'git remote set-head %s %s' to follow the change, or set\n"
-"'remote.%s.followRemoteHEAD' configuration option to a different value\n"
-"if you do not want to see this message. Specifically running\n"
-"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"
-"will disable the warning until the remote changes HEAD to something else."
+"Run 'git remote set-head %s %s' to follow the change, or modify\n"
+"either of the 'remote.%s.followRemoteHEAD' or 'fetch.followRemoteHEAD'\n"
+"configuration variables to handle the situation differently.\n"
+"\n"
+"Using this specific setting\n"
+"\n"
+"    git config set remote.%s.followRemoteHEAD warn-if-not-%s\n"
+"\n"
+"will suppress the warning until the remote changes HEAD to something else."
 msgstr ""
-"Запустіть \"git remote set-head %s %s\", щоб відстежити зміни, або "
-"встановіть\n"
-"\"remote.%s.followRemoteHEAD\" параметр конфігурації на інше значення\n"
-"якщо ви не хочете бачити це повідомлення. Зокрема, виконання\n"
-"\"git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s\"\n"
+"Запустіть \"git remote set-head %s %s\", щоб відстежити зміни, або змініть\n"
+"один із параметрів конфігурації \"remote.%s.followRemoteHEAD\" чи "
+"\"fetch.followRemoteHEAD\",\n"
+"щоб обробити ситуацію інакше.\n"
+"\n"
+"Використання цього конкретного налаштування\n"
+"\n"
+"    git config set remote.%s.followRemoteHEAD warn-if-not-%s\n"
+"\n"
 "вимкне попередження, доки віддалене призначення не змінить HEAD на щось інше."
 
 msgid ""
@@ -7339,6 +7590,10 @@ msgstr "Перевірка %s"
 msgid "Checking connectivity (%d objects)"
 msgstr "Перевірка підключення (%d обʼєктів)"
 
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s: об’єкт пошкоджений або відсутній"
+
 #, c-format
 msgid "Checking %s %s"
 msgstr "Перевірка %s %s"
@@ -7354,10 +7609,6 @@ msgstr "корінь %s"
 msgid "tagged %s %s (%s) in %s"
 msgstr "з тегом %s %s (%s) в %s"
 
-#, c-format
-msgid "%s: object corrupt or missing"
-msgstr "%s: об’єкт пошкоджений або відсутній"
-
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: неприпустимий запис журналу посилань %s"
@@ -7381,28 +7632,6 @@ msgstr "неприпустимий параметр: очікувалось sha1
 msgid "notice: No default references"
 msgstr "повідомлення: Немає посилань за замовчуванням"
 
-#, c-format
-msgid "%s: hash-path mismatch, found at: %s"
-msgstr "%s: невідповідність хеш/шлях знайдена в: %s"
-
-#, c-format
-msgid "%s: object corrupt or missing: %s"
-msgstr "%s: об’єкт пошкоджений або відсутній: %s"
-
-#, c-format
-msgid "%s: object could not be parsed: %s"
-msgstr "%s: неможливо розібрати об’єкт: %s"
-
-#, c-format
-msgid "bad sha1 file: %s"
-msgstr "невірний sha1 файл: %s"
-
-msgid "Checking object directory"
-msgstr "Перевірка директорії об’єкта"
-
-msgid "Checking object directories"
-msgstr "Перевірка директорій обʼєкта"
-
 #, c-format
 msgid "Checking cache tree of %s"
 msgstr "Перевірка дерева кеша для \"%s\""
@@ -7418,14 +7647,6 @@ msgstr "non-tree в cache-tree"
 msgid "%s: invalid sha1 pointer in resolve-undo of %s"
 msgstr "%s: невірний sha1 вказівник в resolve-undo для %s"
 
-#, c-format
-msgid "unable to load rev-index for pack '%s'"
-msgstr "не вдалося завантажити rev-index для пакунку \"%s\""
-
-#, c-format
-msgid "invalid rev-index for pack '%s'"
-msgstr "неприпустимий rev-index для \"%s\""
-
 msgid "Checking ref database"
 msgstr "Перевірка бази даних посилань"
 
@@ -7479,9 +7700,6 @@ msgstr "показувати докладні назви для доступни
 msgid "check reference database consistency"
 msgstr "перевірити базу даних посилань"
 
-msgid "Checking objects"
-msgstr "Перевірка обʼєктів"
-
 msgid "git fsmonitor--daemon start [<options>]"
 msgstr "git fsmonitor--daemon start [<опції>]"
 
@@ -7672,12 +7890,6 @@ msgstr ""
 "збір сміття вже запущено на машині \"%s\" pid %<PRIuMAX> (скористайтесь --"
 "force, якщо ні)"
 
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr ""
-"Занадто багато недосяжних вільних об’єктів; запустіть \"git prune\", щоб "
-"вилучити їх."
-
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
@@ -7716,9 +7928,6 @@ msgid ""
 msgstr ""
 "пропуск incremental-repack завдання, оскільки core.multiPackIndex вимкнено"
 
-msgid "failed to perform geometric repack"
-msgstr "не вдалося виконати геометричне перепакування"
-
 #, c-format
 msgid "task '%s' failed"
 msgstr "завдання \"%s\" завершилося невдало"
@@ -8227,6 +8436,13 @@ msgstr "використання: %s%s"
 msgid "'git help config' for more information"
 msgstr "\"git help config\" для додаткової інформації"
 
+msgid ""
+"git history drop <commit> [--dry-run] [--update-refs=(branches|head)] [--"
+"empty=(drop|keep|abort)]"
+msgstr ""
+"git history drop <коміт> [--dry-run] [--update-refs=(branches|head)] [--"
+"empty=(drop|keep|abort)]"
+
 msgid ""
 "git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--"
 "reedit-message] [--empty=(drop|keep|abort)]"
@@ -8253,6 +8469,10 @@ msgstr ""
 "з \"%s\", будуть проігноровані, а порожній допис призведе до скасування "
 "коміту.\n"
 
+#, c-format
+msgid "could not write to '%s'"
+msgstr "не вдалося записати в \"%s\""
+
 #, c-format
 msgid "Aborting commit as launching the editor failed.\n"
 msgstr "Переривання коміту через невдалий запуск редактора.\n"
@@ -8370,6 +8590,10 @@ msgstr "відтворення нащадків не вдалося"
 msgid "failed writing reworded commit"
 msgstr "не вдалося записати переформульований коміт"
 
+#, c-format
+msgid "unable to parse tree %s"
+msgstr "не вдалося розібрати дерево %s"
+
 msgid "unable to populate index with tree"
 msgstr "не вдалося заповнити індекс деревом"
 
@@ -8403,6 +8627,29 @@ msgstr "команда очікує на комітоподібне"
 msgid "cannot split up merge commit"
 msgstr "неможливо розділити коміт злиття"
 
+msgid "cannot resolve HEAD commit"
+msgstr "неможливо розпізнати коміт HEAD"
+
+msgid "cannot resolve tree for HEAD"
+msgstr "неможливо розпізнати дерево для HEAD"
+
+msgid "how to handle descendants that become empty"
+msgstr "як обробляти нащадків, які стають порожніми"
+
+#, c-format
+msgid "cannot drop merge commit: %s"
+msgstr "неможливо відкинути коміт злиття: %s"
+
+msgid "dropping this commit would overwrite local changes; aborting"
+msgstr "відкидання цього коміту перезапише локальні зміни; переривання"
+
+msgid "failed to update references"
+msgstr "не вдалося оновити посилання"
+
+#, c-format
+msgid "could not update working tree to new commit %s"
+msgstr "не вдалося оновити робоче дерево до нового коміту %s"
+
 msgid ""
 "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-"
 "stdin=<path>] [(-j|--jobs) <n>]\n"
@@ -8474,6 +8721,9 @@ msgstr "очікуваних обʼєктів не отримано %s"
 msgid "object %s: expected type %s, found %s"
 msgstr "обʼєкт %s: очікувався тип %s, знайдено %s"
 
+msgid "Checking objects"
+msgstr "Перевірка обʼєктів"
+
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
@@ -9515,6 +9765,10 @@ msgstr "об’єкт \"%s\" не існує"
 msgid "Could not write object file"
 msgstr "Не вдалося записати файл обʼєкта"
 
+#, c-format
+msgid "unknown option %s"
+msgstr "невідома опція %s"
+
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "не вдалося розібрати обʼєкт \"%s\""
@@ -9949,6 +10203,12 @@ msgstr "git multi-pack-index [<опції>] expire"
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<опції>] repack [--batch-size=<розмір>]"
 
+#, c-format
+msgid "object directory is not an alternate of the current repository: '%s'"
+msgstr ""
+"директорія обʼєктів не є місцем збереження запозичених обʼєктів поточного "
+"сховища: \"%s\""
+
 msgid "directory"
 msgstr "директорія"
 
@@ -10075,6 +10335,12 @@ msgstr "кілька джерел для однієї цілі"
 msgid "destination directory does not exist"
 msgstr "директорія призначення не існує"
 
+msgid "destination is beyond a symbolic link"
+msgstr "місце призначення знаходиться за символьним посиланням"
+
+msgid "destination is not a directory"
+msgstr "місце призначення не є директорією"
+
 msgid "destination exists in the index"
 msgstr "призначення існує в індексі"
 
@@ -10092,8 +10358,8 @@ msgid "Renaming %s to %s\n"
 msgstr "Перейменування %s на %s\n"
 
 #, c-format
-msgid "renaming '%s' failed"
-msgstr "перейменування \"%s\" завершилося невдало"
+msgid "renaming '%s' to '%s' failed"
+msgstr "не вдалося перейменувати \"%s\" на \"%s\""
 
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<опції>] <коміт>..."
@@ -10708,9 +10974,21 @@ msgstr "не вдалося відкрити індекс пакунка"
 msgid "loose object at %s could not be examined"
 msgstr "не вдалося розглянути вільний обʼєкт у %s"
 
+#, c-format
+msgid "cannot read object for %s"
+msgstr "неможливо прочитати обʼєкт для %s"
+
+#, c-format
+msgid "cannot map object %s to %s"
+msgstr "неможливо зіставити обʼєкт %s з %s"
+
 msgid "unable to force loose object"
 msgstr "не вдалося примусово вивільнити обʼєкт"
 
+#, c-format
+msgid "could not find commit %s"
+msgstr "не вдалося знайти коміт %s"
+
 #, c-format
 msgid "not a rev '%s'"
 msgstr "не є ревізією \"%s\""
@@ -10745,9 +11023,6 @@ msgstr "<версія>[, <зміщення>]"
 msgid "write the pack index file in the specified idx format version"
 msgstr "записати індексний файл пакунка у вказаній версії idx формату"
 
-msgid "maximum size of each output pack file"
-msgstr "максимальний розмір кожного файлу вихідного пакунку"
-
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ігнорувати запозичені обʼєкти з місця збереження запозичених об’єктів"
 
@@ -11346,6 +11621,14 @@ msgstr "неприпустиме значення для \"%s\""
 msgid "could not push to %s"
 msgstr "не вдалося надіслати в %s"
 
+#, c-format
+msgid "'%s' is not a valid push target"
+msgstr "\"%s\" не є допустимою ціллю надсилання"
+
+#, c-format
+msgid "Did you mean to use: git push %s %s?"
+msgstr "Ви мали на увазі \"git push %s %s\"?"
+
 msgid "repository"
 msgstr "сховище"
 
@@ -12188,6 +12471,29 @@ msgstr "git ref exists <посилання>"
 msgid "git refs optimize "
 msgstr "git refs optimize "
 
+msgid ""
+"git refs create [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value>"
+msgstr ""
+"git refs create [--message=<причина>] [--no-deref] [--create-reflog] "
+"<посилання> <нове-значення>"
+
+msgid "git refs delete [--message=<reason>] [--no-deref] <ref> [<old-value>]"
+msgstr ""
+"git refs delete [--message=<причина>] [--no-deref] <посилання> [<старе-"
+"значення>]"
+
+msgid ""
+"git refs update [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value> [<old-value>]"
+msgstr ""
+"git refs update [--message=<причина>] [--no-deref] [--create-reflog] "
+"<посилання> <нове-значення> [<старе-значення>]"
+
+msgid "git refs rename [--message=<reason>] <old-ref> <new-ref>"
+msgstr ""
+"git refs rename [--message=<причина>] <старе-посилання> <нове-посилання>"
+
 msgid "specify the reference format to convert to"
 msgstr "вкажіть формат посилання, в який потрібно конвертувати"
 
@@ -12222,9 +12528,63 @@ msgstr "посилання не існує"
 msgid "failed to look up reference"
 msgstr "не вдалося знайти посилання"
 
-msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
+msgid "reason"
+msgstr "причина"
+
+msgid "reason of the update"
+msgstr "причина оновлення"
+
+msgid "update <refname> not the one it points to"
+msgstr "оновити <назвау-посилання>, а не те, на яке воно вказує"
+
+msgid "create a reflog"
+msgstr "створити журнал посилань"
+
+msgid "create requires reference name and an object ID"
+msgstr "для створення потрібна назва посилання та ідентифікатор обʼєкта"
+
+msgid "refusing to perform update with empty message"
+msgstr "відмовлено в оновленні з порожнім дописом"
+
+#, c-format
+msgid "invalid object ID: '%s'"
+msgstr "неприпустимий ідентифікатор обʼєкта: \"%s\""
+
+msgid "cannot create reference with null new object ID"
+msgstr "неможливо створити посилання з нульовим ідентифікатором нового обʼєкта"
+
+msgid "delete requires reference name and an optional old object ID"
+msgstr ""
+"для видалення потрібна назва посилання та необовʼязковий ідентифікатор "
+"старого обʼєкта"
+
+msgid "cannot delete reference with null old object ID"
+msgstr ""
+"неможливо видалити посилання з нульовим ідентифікатором старого обʼєкта"
+
+msgid "update requires reference name, new value and an optional old value"
+msgstr ""
+"для оновлення потрібна назва посилання, нове значення та необовʼязкове старе "
+"значення"
+
+msgid "rename requires old and new reference name"
+msgstr "для перейменування потрібні стара та нова назва посилання"
+
+#, c-format
+msgid "invalid ref format: '%s'"
+msgstr "неприпустимий формат посилання: \"%s\""
+
+#, c-format
+msgid "reference does not exist: '%s'"
+msgstr "посилання не існує: \"%s\""
+
+#, c-format
+msgid "reference already exists: '%s'"
+msgstr "посилання вже існує: \"%s\""
+
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
 msgstr ""
 "git remote add [-t <гілка>] [-m <мастер>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <назва> <URL-адреса>"
@@ -12706,11 +13066,13 @@ msgstr "розгорнутий вивід; має стояти перед під
 msgid ""
 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]"
+"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]\n"
+"[--filter=<filter-spec>] [--drop-filtered [--dry-run]]"
 msgstr ""
 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
 "[--window=<н>] [--depth=<н>] [--threads=<н>] [--keep-pack=<назва-пакунка>]\n"
-"[--write-midx[=<режим>]] [--name-hash-version=<н>] [--path-walk]"
+"[--write-midx[=<режим>]] [--name-hash-version=<н>] [--path-walk]\n"
+"[--filter=<визначник-фільтру>] [--drop-filtered [--dry-run]]"
 
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
@@ -12811,6 +13173,38 @@ msgstr "записати multi-pack-index результуючих пакунк
 msgid "pack prefix to store a pack containing filtered out objects"
 msgstr "префікс для зберігання пакунка з відфільтрованими  обʼєктами"
 
+msgid "delete filtered out objects (requires --filter)"
+msgstr "видалити відфільтровані обʼєкти (потребує --filter)"
+
+msgid "only show which objects would be dropped"
+msgstr "лише показати, які обʼєкти було б відкинуто"
+
+msgid "--dry-run only takes effect with --drop-filtered"
+msgstr "--dry-run має сенс тільки з --drop-filtered"
+
+msgid "--drop-filtered requires --filter"
+msgstr "--drop-filtered потребує --filter"
+
+msgid "--drop-filtered requires -a"
+msgstr "--drop-filtered потребує -a"
+
+msgid "--drop-filtered only supports --filter=blob:limit=<n> for now"
+msgstr "--drop-filtered наразі підтримує лише --filter=blob:limit=<н>"
+
+msgid "--drop-filtered requires a promisor remote"
+msgstr "--drop-filtered потребує віддаленого promisor"
+
+msgid ""
+"--drop-filtered cannot be used while another operation (merge, rebase, am, "
+"cherry-pick, revert, or bisect) is in progress"
+msgstr ""
+"неможливо використовувати --drop-filtered, поки виконується інша операція "
+"(злиття, перебазування, am, висмикування, вивертання або bisect)"
+
+#, c-format
+msgid "cannot drop '%s' (%s): it is referenced by the current index"
+msgstr "неможливо відкинути \"%s\" (%s): на нього посилається поточний індекс"
+
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "неможливо видалити пакунки в precious-objects сховищі"
 
@@ -13020,11 +13414,11 @@ msgstr "неприпустиме значення %s: \"%s\""
 msgid ""
 "(EXPERIMENTAL!) git replay ([--contained] --onto=<newbase> | --"
 "advance=<branch> | --revert=<branch>)\n"
-"[--ref=<ref>] [--ref-action=<mode>] <revision-range>"
+"[--ref=<ref>] [--ref-action=<mode>] [--linearize] <revision-range>"
 msgstr ""
 "(ЕКСПЕРИМЕНТАЛЬНО!) git replay ([--contained] --onto=<нова-база> | --"
 "advance=<гілка> | --revert=<гілка>)\n"
-"[--ref=<посилання>] [--ref-action=<режим>] <діапазон-ревізій>"
+"[--ref=<посилання>] [--ref-action=<режим>] [--linearize] <діапазон-ревізій>"
 
 msgid "update all branches that point at commits in <revision-range>"
 msgstr "оновити всі гілки, які вказують на коміти в <діапазоні-ревізій>"
@@ -13044,6 +13438,9 @@ msgstr "посилання для оновлення з результатом"
 msgid "control ref update behavior (update|print)"
 msgstr "управління поведінкою оновлення посилань (update|print)"
 
+msgid "drop merge commits, replaying only non-merge commits"
+msgstr "відкидати коміти злиття, відтворюючи лише коміти без злиття"
+
 msgid "exactly one of --onto, --advance, or --revert is required"
 msgstr ""
 "потрібно вказати лише один з параметрів: --onto, --advance або --revert"
@@ -13056,6 +13453,12 @@ msgstr ""
 "деякі опції проходження по ревізіям будуть перевизначені, оскільки біт "
 "\"%s\" у \"struct rev_info\" буде примусово використано"
 
+msgid "unable to get common directory"
+msgstr "не вдалося отримати спільну директорію"
+
+msgid "unable to get git directory"
+msgstr "не вдалося отримати git директорію"
+
 #, c-format
 msgid "key '%s' not found"
 msgstr "ключ \"%s\" не знайдено"
@@ -13278,6 +13681,9 @@ msgstr "Не вдалося записати новий індексний фа
 msgid "unable to get disk usage of %s"
 msgstr "не вдалося отримати дані про використання диска %s"
 
+msgid "--missing-only requires --missing=print or --missing=print-info"
+msgstr "--missing-only потребує --missing=print або --missing=print-info"
+
 #, c-format
 msgid "invalid value for '%s': '%s', the only allowed format is '%s'"
 msgstr ""
@@ -14946,12 +15352,6 @@ msgstr "скоротити вивід посилань"
 msgid "recursively dereference (default)"
 msgstr "рекурсивне розіменування (за замовчуванням)"
 
-msgid "reason"
-msgstr "причина"
-
-msgid "reason of the update"
-msgstr "причина оновлення"
-
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
 "        [(--trailer <token>[(=|:)<value>])...]\n"
@@ -15072,9 +15472,6 @@ msgstr "використати інший ключ для підпису тег
 msgid "replace the tag if exists"
 msgstr "замінити тег, якщо він існує"
 
-msgid "create a reflog"
-msgstr "створити журнал посилань"
-
 msgid "Tag listing options"
 msgstr "Опції виводу тегів"
 
@@ -15358,9 +15755,6 @@ msgstr "git update-ref [<опції>] --stdin [-z] [--batch-updates]"
 msgid "delete the reference"
 msgstr "видалити посилання"
 
-msgid "update <refname> not the one it points to"
-msgstr "оновити <назвау-посилання>, а не те, на яке воно вказує"
-
 msgid "stdin has NUL-terminated arguments"
 msgstr "stdin має аргументи, що закінчуються NUL"
 
@@ -15575,6 +15969,26 @@ msgstr ""
 "призначення, зупинка; скористайтесь \"add -f\", щоб перевизначити, або "
 "спочатку виконайте отримання з віддаленного сховища"
 
+#, c-format
+msgid ""
+"If you meant to create a worktree from a remote tracking branch on\n"
+"<remote>, you can do so by:\n"
+"\n"
+"    git worktree add -b %s %s <remote>/%s\n"
+"\n"
+"If you'd like to always prefer some remote, e.g. 'origin',\n"
+"consider setting checkout.defaultRemote=origin in your config."
+msgstr ""
+"Якщо ви хотіли створити робоче дерево з віддаленої гілки відстеження на\n"
+"<віддаленому>, ви можете це зробити так:\n"
+"\n"
+"    git worktree add -b %s %s <віддалене>/%s\n"
+"\n"
+"Якщо ви хочете завжди віддавати перевагу певному віддаленому призначенню, "
+"наприклад \"origin\",\n"
+"розгляньте можливість встановити параметр checkout.defaultRemote=origin у "
+"вашому файлі конфігурації."
+
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "перейти на <гілку>, навіть якщо вона вже активна в іншому робочому дереві"
@@ -15793,6 +16207,10 @@ msgstr "не вдалося завантажити пакунок з URI \"%s\""
 msgid "file at URI '%s' is not a bundle or bundle list"
 msgstr "файл з URI \"%s\" не є пакунком або списком пакунків"
 
+#, c-format
+msgid "config '%s' has no value"
+msgstr "відсутнє значення конфігурації \"%s\""
+
 #, c-format
 msgid "bundle-uri: unexpected argument: '%s'"
 msgstr "bundle-uri: неочікуваний аргумент: \"%s\""
@@ -16152,8 +16570,8 @@ msgstr "Створити порожнє Git сховище або переіні
 msgid "Instantly browse your working repository in gitweb"
 msgstr "Миттєво переглянути своє робоче сховище в gitweb"
 
-msgid "Add or parse structured information in commit messages"
-msgstr "Додати або розібрати структуровану інформацію в дописах до комітів"
+msgid "Add or parse metadata in commit messages"
+msgstr "Додати або розібрати метадані в дописах до комітів"
 
 msgid "EXPERIMENTAL: Show when files were last modified"
 msgstr "ЕКСПЕРИМЕНТАЛЬНО: Показати, коли файли були змінені востаннє"
@@ -16214,7 +16632,7 @@ msgid "Move or rename a file, a directory, or a symlink"
 msgstr "Перемістити або перейменувати файл, директорію або символьне посилання"
 
 msgid "Find symbolic names for given revs"
-msgstr "Знайти символьни назви для заданих ревізій"
+msgstr "Знайти символьні назви для заданих ревізій"
 
 msgid "Add or inspect object notes"
 msgstr "Додати або перевірити нотатки до обʼєктів"
@@ -16431,6 +16849,9 @@ msgstr "Надання імен користувачів та паролів д
 msgid "Git for CVS users"
 msgstr "Git для користувачів CVS"
 
+msgid "Git's core data model"
+msgstr "Основна модель даних Git"
+
 msgid "Tweaking diff output"
 msgstr "Налаштування виводу різниці"
 
@@ -16609,10 +17030,6 @@ msgstr "не вдалося знайти всі файли коміт-графа
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "неприпустима позиція коміту, ймовірно, коміт-граф пошкоджено"
 
-#, c-format
-msgid "could not find commit %s"
-msgstr "не вдалося знайти коміт %s"
-
 msgid "commit-graph requires overflow generation data but has none"
 msgstr "коміт-граф потребує даних генерації переповнення, але не має їх"
 
@@ -16776,6 +17193,12 @@ msgstr "Перевірка комітів у коміт-графі"
 msgid "could not parse commit %s"
 msgstr "не вдалося розібрати коміт %s"
 
+msgid "commit ancestry contains a cycle"
+msgstr "походження комітів містить цикл"
+
+msgid "failed to check reachability"
+msgstr "не вдалося перевірити досяжність"
+
 #, c-format
 msgid "object %s is a %s, not a %s"
 msgstr "обʼєкт %s є %s, а не %s"
@@ -17415,6 +17838,14 @@ msgstr "неприпустима ls-refs відповідь: %s"
 msgid "expected flush after ref listing"
 msgstr "очікувалось flush після виводу посилань"
 
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "невідповідність алгоритмів: клієнт %s; сервер %s"
+
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "сервер не підтримує алгоритм \"%s\""
+
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "не вдалося встановити SO_KEEPALIVE сокету"
 
@@ -17745,9 +18176,6 @@ msgstr "не вдалося відкрити директорію \"%s\""
 msgid "skipping '%s', which is neither file nor directory"
 msgstr "пропускання \"%s\", який не є ні файлом, ні директорією"
 
-msgid "could not duplicate stdout"
-msgstr "не вдалося продублювати stdout"
-
 #, c-format
 msgid "could not add directory '%s' to archiver"
 msgstr "не вдалося додати директорію \"%s\" до архіватора"
@@ -18112,11 +18540,11 @@ msgid "continue listing the history of a file beyond renames"
 msgstr "продовжити виведення історії файлу після перейменування"
 
 msgid ""
-"prevent rename/copy detection if the number of rename/copy targets exceeds "
-"given limit"
+"limit to cheap rename/copy detection if the number of rename/copy targets "
+"exceeds this value"
 msgstr ""
-"запобігати виявленню перейменування/копіювання, якщо кількість обʼєктів "
-"перейменування/копіювання перевищує заданий ліміт"
+"обмежитися спрощеним виявленням перейменування/копіювання, якщо кількість "
+"цілей перейменування/копіювання перевищує це значення"
 
 msgid "Diff algorithm options"
 msgstr "Варіанти алгоритмів різниці"
@@ -18363,10 +18791,6 @@ msgstr "не вдалося перенести git директорію з \"%s\
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "підказка: чекаємо, поки редактор закриє файл...%c"
 
-#, c-format
-msgid "could not write to '%s'"
-msgstr "не вдалося записати в \"%s\""
-
 #, c-format
 msgid "could not edit '%s'"
 msgstr "не вдалося відредагувати \"%s\""
@@ -18432,6 +18856,51 @@ msgstr "має бути одним з nothing, matching, simple, upstream або
 msgid "too many args to run %s"
 msgstr "забагато аргументів для запуску %s"
 
+msgid "unable to write request to remote"
+msgstr "не вдалося записати запит до віддаленого сховища"
+
+msgid "object-info capability is not enabled on the server"
+msgstr "можливість object-info не ввімкнено на сервері"
+
+msgid "object-info requires protocol v2"
+msgstr "object-info потребує протоколу v2"
+
+#, c-format
+msgid "object-info: expected %<PRIuMAX> attributes, got %<PRIuMAX>"
+msgstr "object-info: очікувалось %<PRIuMAX> атрибутів, отримано %<PRIuMAX>"
+
+msgid "object-info: unrequested 'size' attribute"
+msgstr "object-info: незапитаний атрибут \"size\""
+
+msgid "object-info: duplicate 'size' attribute"
+msgstr "object-info: дубльований атрибут \"size\""
+
+msgid "object-info: unrequested 'type' attribute"
+msgstr "object-info: незапитуваний атрибут \"type\""
+
+msgid "object-info: duplicate 'type' attribute"
+msgstr "object-info: дубльований атрибут \"type\""
+
+#, c-format
+msgid "object-info: unknown attribute '%s'"
+msgstr "object-info: невідомий атрибут \"%s\""
+
+#, c-format
+msgid "object-info: expected %<PRIuMAX> objects, got %<PRIuMAX>"
+msgstr "object-info: очікувалось %<PRIuMAX> обʼєктів, отримано %<PRIuMAX>"
+
+#, c-format
+msgid "object-info: expected OID: %s, got %s"
+msgstr "object-info: очікувався OID: %s, отримано %s"
+
+#, c-format
+msgid "object-info: object %s has invalid type '%s'"
+msgstr "object-info: обʼєкт %s має неприпустимий тип \"%s\""
+
+#, c-format
+msgid "object-info: expected flush after %<PRIuMAX> objects"
+msgstr "object-info: очікувався flush після %<PRIuMAX> обʼєктів"
+
 #, c-format
 msgid ""
 "You are attempting to fetch %s, which is in the commit graph file but not in "
@@ -18561,20 +19030,9 @@ msgstr "немає спільних комітів"
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: помилка отримання."
 
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr "невідповідність алгоритмів: клієнт %s; сервер %s"
-
-#, c-format
-msgid "the server does not support algorithm '%s'"
-msgstr "сервер не підтримує алгоритм \"%s\""
-
 msgid "Server does not support shallow requests"
 msgstr "Сервер не підтримує неглибокі запити"
 
-msgid "unable to write request to remote"
-msgstr "не вдалося записати запит до віддаленого сховища"
-
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "очікувалось \"%s\", отримано \"%s\""
@@ -18732,6 +19190,10 @@ msgstr "-c очікує на рядок конфігурації\n"
 msgid "no config key given for --config-env\n"
 msgstr "не вказано ключ конфігурації для --config-env\n"
 
+#, c-format
+msgid "no file given for '%s' option\n"
+msgstr "не вказано файл для опції \"%s\"\n"
+
 #, c-format
 msgid "no attribute source given for --attr-source\n"
 msgstr "для --attr-source не вказано джерело атрибутів\n"
@@ -19252,9 +19714,12 @@ msgstr "порожнє імʼя особистості (для <%s>) забор
 msgid "name consists only of disallowed characters: %s"
 msgstr "імʼя складається лише з заборонених символів: %s"
 
-msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+msgid ""
+"git imap-send [-v] [-q] [--[no-]curl] [--[no-]draft] [(--folder|-f) "
+"<folder>] < <mbox>"
 msgstr ""
-"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <директорія>] < <mbox>"
+"git imap-send [-v] [-q] [--[no-]curl] [--[no-]draft] [(--folder|-f) "
+"<директорія>] < <mbox>"
 
 msgid "no IMAP host specified"
 msgstr "не вказано хост IMAP"
@@ -19327,6 +19792,9 @@ msgstr "не вдалося отримати доступ до розрідже
 msgid "unable to parse sparse filter data in %s"
 msgstr "не вдалося розібрати дані розрідженого фільтра в %s"
 
+msgid "filter_oidset: only blob:limit filters are supported"
+msgstr "filter_oidset: підтримуються лише фільтри blob:limit"
+
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
 msgstr "запис \"%s\" у дереві %s має режим tree, але не є деревом"
@@ -19416,6 +19884,10 @@ msgstr "неправильний розмір маркера \"%s\", очіку
 msgid "Could not parse object '%s'"
 msgstr "Не вдалося розібрати обʼєкт \"%s\""
 
+#, c-format
+msgid "tree has duplicate entries for '%s'"
+msgstr "дерево містить дубльовані записи для \"%s\""
+
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "Не вдалося обʼєднати підмодуль %s (не активне)"
@@ -20017,55 +20489,6 @@ msgstr "не вдалося встановити дозволи для \"%s\""
 msgid "core.fsyncMethod = batch is unsupported on this platform"
 msgstr "core.fsyncMethod = batch не підтримується на цій платформі"
 
-msgid "error when closing loose object file"
-msgstr "помилка при закритті файла вільного об’єкта"
-
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr "недостатньо дозволу для додавання обʼєкта до бази даних сховища %s"
-
-msgid "unable to create temporary file"
-msgstr "не вдалося створити тимчасовий файл"
-
-msgid "unable to write loose object file"
-msgstr "не вдалося записати файл вільного об’єкта"
-
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "не вдалося запакувати новий обʼєкт %s (%d)"
-
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "операція deflateEnd на обʼєкті %s завершилася невдало (%d)"
-
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "збентежений нестабільними початковими даними обʼєкта для %s"
-
-#, c-format
-msgid "write stream object %<PRIuMAX> != %<PRIuMAX>"
-msgstr "об’єкт потоку запису %<PRIuMAX> != %<PRIuMAX>"
-
-#, c-format
-msgid "unable to stream deflate new object (%d)"
-msgstr "не вдалося запакувати новий обʼєкт (%d) при передачі"
-
-#, c-format
-msgid "deflateEnd on stream object failed (%d)"
-msgstr "операція deflateEnd на обʼєкті потоку завершилася невдало (%d)"
-
-#, c-format
-msgid "unable to create directory %s"
-msgstr "не вдалося створити директорію %s"
-
-#, c-format
-msgid "cannot read object for %s"
-msgstr "неможливо прочитати обʼєкт для %s"
-
-#, c-format
-msgid "cannot map object %s to %s"
-msgstr "неможливо зіставити обʼєкт %s з %s"
-
 #, c-format
 msgid "object fails fsck: %s"
 msgstr "об’єкт не пройшов перевірку fsck: %s"
@@ -20116,6 +20539,9 @@ msgstr "не вдалося розібрати тип з заголовка \"%s
 msgid "unable to unpack contents of %s"
 msgstr "не вдалося розпакувати вміст %s"
 
+msgid "unable to migrate temporary objects"
+msgstr "не вдалося перенести тимчасові обʼєкти"
+
 #. TRANSLATORS: This is a line of ambiguous object
 #. output shown when we cannot look up or parse the
 #. object in question. E.g. "deadbeef [bad object]".
@@ -20339,8 +20765,8 @@ msgid "replacement %s not found for %s"
 msgstr "заміна %s не знайдена для %s"
 
 #, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "упакований обʼєкт %s (що зберігається у %s) пошкоджено"
+msgid "object %s is corrupt"
+msgstr "обʼєкт %s пошкоджено"
 
 #, c-format
 msgid "missing mapping of %s to %s"
@@ -20354,6 +20780,9 @@ msgstr "%s не є припустимим об’єктом"
 msgid "%s is not a valid '%s' object"
 msgstr "%s не є допустимим \"%s\" обʼєктом"
 
+msgid "primary object source does not support generating packfiles"
+msgstr "основне джерело обʼєктів не підтримує створення файлів пакунків"
+
 msgid "unable to fdopen alternates lockfile"
 msgstr "не вдалося виконати fdopen для файла блокування запозичених обʼєктів"
 
@@ -20363,6 +20792,22 @@ msgstr "не вдалося прочитати файл запозичених 
 msgid "unable to move new alternates file into place"
 msgstr "не вдалося перемістити файл нових запозичених обʼєктів на місце"
 
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+"Занадто багато недосяжних вільних об’єктів; запустіть \"git prune\", щоб "
+"вилучити їх."
+
+#, c-format
+msgid "pack-objects died of signal %d"
+msgstr "pack-objects завершився через сигнал %d"
+
+msgid "could not spawn pack-objects"
+msgstr "не вдалося розмножити pack-objects"
+
+msgid "error writing to pack-objects"
+msgstr "помилка запису в pack-objects"
+
 #, c-format
 msgid "unable to open loose object %s"
 msgstr "не вдалося відкрити вільний обʼєкт %s"
@@ -20386,6 +20831,89 @@ msgstr "заголовок для %s занадто довгий, перевищ
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "вільний обʼєкт %s (що зберігається у %s) пошкоджено"
 
+msgid "error when closing loose object file"
+msgstr "помилка при закритті файла вільного об’єкта"
+
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr "недостатньо дозволу для додавання обʼєкта до бази даних сховища %s"
+
+msgid "unable to create temporary file"
+msgstr "не вдалося створити тимчасовий файл"
+
+msgid "unable to write loose object file"
+msgstr "не вдалося записати файл вільного об’єкта"
+
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "не вдалося запакувати новий обʼєкт %s (%d)"
+
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "операція deflateEnd на обʼєкті %s завершилася невдало (%d)"
+
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "збентежений нестабільними початковими даними обʼєкта для %s"
+
+#, c-format
+msgid "write stream object %<PRIuMAX> != %<PRIuMAX>"
+msgstr "об’єкт потоку запису %<PRIuMAX> != %<PRIuMAX>"
+
+#, c-format
+msgid "unable to stream deflate new object (%d)"
+msgstr "не вдалося запакувати новий обʼєкт (%d) при передачі"
+
+#, c-format
+msgid "deflateEnd on stream object failed (%d)"
+msgstr "операція deflateEnd на обʼєкті потоку завершилася невдало (%d)"
+
+#, c-format
+msgid "unable to create directory %s"
+msgstr "не вдалося створити директорію %s"
+
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: невідповідність хеш/шлях знайдена в: %s"
+
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s: об’єкт пошкоджений або відсутній: %s"
+
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "невірний sha1 файл: %s"
+
+msgid "Checking object directory"
+msgstr "Перевірка директорії об’єкта"
+
+msgid "Checking object directories"
+msgstr "Перевірка директорій обʼєкта"
+
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "упакований обʼєкт %s (що зберігається у %s) пошкоджено"
+
+#, c-format
+msgid "unable to load rev-index for pack '%s'"
+msgstr "не вдалося завантажити rev-index для пакунку \"%s\""
+
+#, c-format
+msgid "invalid rev-index for pack '%s'"
+msgstr "неприпустимий rev-index для \"%s\""
+
+msgid "object database transaction already pending"
+msgstr "транзакція бази даних обʼєктів уже очікує виконання"
+
+msgid "failed to start ODB transaction"
+msgstr "не вдалося розпочати транзакцію ODB"
+
+msgid "failed to commit ODB transaction"
+msgstr "не вдалося зробити коміт транзакції ODB"
+
+msgid "failed to finalize ODB transaction"
+msgstr "не вдалося завершити транзакцію ODB"
+
 #, c-format
 msgid "duplicate entry when writing bitmap index: %s"
 msgstr "дубльований елемент під час запису bitmap індексу: \"%s\""
@@ -20463,6 +20991,9 @@ msgstr "у мультіпакунковому bitmap відсутній необ
 msgid "could not open pack %s"
 msgstr "не вдалося відкрити пакунок %s"
 
+msgid "could not open bitmap for base MIDX"
+msgstr "не вдалося відкрити bitmap для базового MIDX"
+
 msgid "corrupt bitmap lookup table: triplet position out of index"
 msgstr "пошкоджена bitmap таблиця пошуку: триплетна позиція поза індексом"
 
@@ -21027,6 +21558,54 @@ msgstr "не вдалося отримати %s з віддаленого promis
 msgid "unsupported field '%s' in '%s' config"
 msgstr "непідтримуване поле \"%s\" у конфігурації \"%s\""
 
+#, c-format
+msgid ""
+"invalid remote name '%s' before '=' sign in '%s' from "
+"promisor.acceptFromServerUrl config"
+msgstr ""
+"неприпустима назва віддаленого призначення \"%s\" перед знаком \"=\" у "
+"\"%s\" з конфігурації promisor.acceptFromServerUrl"
+
+#, c-format
+msgid ""
+"invalid url pattern '%s' in '%s' from promisor.acceptFromServerUrl config"
+msgstr ""
+"неприпустимий шаблон URL-адреси \"%s\" у \"%s\" з конфігурації "
+"promisor.acceptFromServerUrl"
+
+#, c-format
+msgid ""
+"couldn't generate a valid remote name from advertised url '%s', ignoring "
+"this remote"
+msgstr ""
+"не вдалося згенерувати допустиму назву віддаленого призначення з оголошеної "
+"URL-адреси \"%s\", це віддалене призначення буде проігноровано"
+
+#, c-format
+msgid ""
+"generated remote name '%s' from advertised url '%s' is invalid, ignoring "
+"this remote"
+msgstr ""
+"згенерована назва віддаленого призначення \"%s\" з оголошеної URL-адреси "
+"\"%s\" є неприпустимою, це віддалене призначення буде проігноровано"
+
+#, c-format
+msgid "couldn't normalize advertised url '%s', ignoring this remote"
+msgstr ""
+"не вдалося нормалізувати оголошену URL-адресу \"%s\", це віддалене "
+"призначення буде проігноровано"
+
+#, c-format
+msgid "Auto-creating promisor remote '%s' for URL '%s'\n"
+msgstr ""
+"Автоматичне створення віддаленого promisor \"%s\" для URL-адреси \"%s\"\n"
+
+#, c-format
+msgid "too many remotes accepted with name like '%s-X', ignoring this remote"
+msgstr ""
+"прийнято забагато віддалених призначень із назвою на кшталт \"%s-X\", це "
+"віддалене призначення буде проігноровано"
+
 #, c-format
 msgid ""
 "known remote named '%s' but with URL '%s' instead of '%s', ignoring this "
@@ -21191,6 +21770,10 @@ msgstr "неприпустима додаткова марна верхівка:
 msgid "unable to enumerate additional recent objects"
 msgstr "не вдалося перерахувати додаткові нещодавні обʼєкти"
 
+#, c-format
+msgid "remove '%s'\n"
+msgstr "видалити \"%s\"\n"
+
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr "не додаємо псевдонім файлу \"%s\" (\"%s\" вже існує в індексі)"
@@ -21346,10 +21929,6 @@ msgstr ""
 msgid "unexpected diff status %c"
 msgstr "неочікуваний статус diff %c"
 
-#, c-format
-msgid "remove '%s'\n"
-msgstr "видалити \"%s\"\n"
-
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
 "continue'.\n"
@@ -22371,6 +22950,11 @@ msgstr[2] ""
 "Ваша гілка відстає від гілки \"%s\" на %d комітів, і її можна перемотати "
 "вперед.\n"
 
+#, c-format
+msgid "  (use \"git pull %s %s\" to update your local branch)\n"
+msgstr ""
+"  (використовуйте \"git pull %s %s\", щоб оновити вашу локальну гілку)\n"
+
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (використовуйте \"git pull\", щоб оновити вашу локальну гілку)\n"
 
@@ -22391,6 +22975,14 @@ msgstr[2] ""
 "Ваша гілка і гілка \"%s\" розійшлися,\n"
 "і мають %d і %d різних комітів відповідно.\n"
 
+#, c-format
+msgid ""
+"  (use \"git pull %s %s\" if you want to integrate the remote branch with "
+"yours)\n"
+msgstr ""
+"  (скористайтесь \"git pull %s %s\", якщо ви хочете інтегрувати віддалену "
+"гілку зі своєю)\n"
+
 msgid ""
 "  (use \"git pull\" if you want to integrate the remote branch with yours)\n"
 msgstr ""
@@ -22515,6 +23107,10 @@ msgstr "глибина заміни занадто висока для обʼє
 msgid "'%s' is not a valid commit-ish for %s"
 msgstr "\"%s\" не є допустимим комітоподібним для %s"
 
+#, c-format
+msgid "'%s' does not point to a commit for %s"
+msgstr "\"%s\" не вказує на коміт для %s"
+
 #, c-format
 msgid "argument to %s must be a reference"
 msgstr "аргумент для %s повинен бути посиланням"
@@ -22533,10 +23129,17 @@ msgstr "потрібні деякі коміти для відтворення"
 msgid "all positive revisions given must be references"
 msgstr "всі надані позитивні ревізії мають бути посиланнями"
 
+#, c-format
+msgid "merge of %s onto %s failed"
+msgstr "злиття %s на %s не вдалося"
+
 #, c-format
 msgid "commit %s became empty after replay"
 msgstr "коміт %s став порожнім після відтворення"
 
+msgid "'--linearize' cannot be used with multiple branches"
+msgstr "\"--linearize\" неможливо використовувати з кількома гілками"
+
 msgid "'--ref' cannot be used with multiple revision ranges"
 msgstr "\"--ref\" неможливо використовувати з кількома діапазонами ревізій"
 
@@ -23624,6 +24227,10 @@ msgstr ""
 "ви не хочете вирішувати їх зараз, виконати команду \"git reset --hard\" і\n"
 "застосувати локальні зміни пізніше за допомогою команди \"git stash pop\".\n"
 
+msgid "could not apply autostash; your changes are safe in the stash"
+msgstr ""
+"не вдалося застосувати автосхов; ваші зміни надійно збережені у сховищі"
+
 #, c-format
 msgid ""
 "Autostash exists; creating a new stash entry.\n"
@@ -23851,8 +24458,8 @@ msgid "no path in gitfile: %s"
 msgstr "немає шляху в gitfile: %s"
 
 #, c-format
-msgid "not a git repository: %s"
-msgstr "не є git сховищем: %s"
+msgid "gitfile does not point to a valid repository: %s"
+msgstr "gitfile не вказує на дійсне сховище: %s"
 
 #, c-format
 msgid "'$%s' too big"
@@ -23976,6 +24583,9 @@ msgstr "неприпустиме початкове ім’я гілки: \"%s\"
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init: ігноровано --initial-branch=%s"
 
+msgid "failed creating object database"
+msgstr "не вдалося створити базу даних обʼєктів"
+
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "не вдалося обробити тип файлу %d"
@@ -24524,6 +25134,9 @@ msgstr "%s несподівано сказав: \"%s\""
 msgid "%s also locked %s"
 msgstr "%s також заблокувало %s"
 
+msgid "could not dup helper output fd"
+msgstr "не вдалося скопіювати дескриптор файлу виводу помічника"
+
 msgid "couldn't run fast-import"
 msgstr "не вдалося запустити fast-import"
 
@@ -24603,6 +25216,10 @@ msgstr "не вдалося запустити fast-export"
 msgid "error while running fast-export"
 msgstr "помилка під час виконання швидкого експорту"
 
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "не вдалося перейменувати \"%s\" на \"%s\""
+
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -24670,6 +25287,9 @@ msgstr ""
 msgid "server options require protocol version 2 or later"
 msgstr "опції сервера вимагають протокол версії 2 або пізнішої"
 
+msgid "remote does not support object-info"
+msgstr "віддалене призначення не підтримує object-info"
+
 msgid "server does not support wait-for-done"
 msgstr "сервер не підтримує wait-for-done"
 
@@ -25035,32 +25655,32 @@ msgid "warning: "
 msgstr "попередження: "
 
 #, c-format
-msgid "'%s' is nominated for removal.\n"
-msgstr "\"%s\" номіновано на видалення.\n"
+msgid "'%s' will be removed soon.\n"
+msgstr "\"%s\" незабаром буде видалено.\n"
 
 #, c-format
 msgid ""
-"If you still use this command, here's what you can do:\n"
+"If you need a replacement:\n"
+"\n"
+"- Read https://git-scm.com/docs/BreakingChanges.html.\n"
+"\n"
+"- Check what others on the mailing list suggest as a replacement:\n"
+"  https://lore.kernel.org/git/?q=%s\n"
 "\n"
-"- read https://git-scm.com/docs/BreakingChanges.html\n"
-"- check if anyone has discussed this on the mailing\n"
-"  list and if they came up with something that can\n"
-"  help you: https://lore.kernel.org/git/?q=%s\n"
-"- send an email to <git@vger.kernel.org> to let us\n"
-"  know that you still use this command and were unable\n"
-"  to determine a suitable replacement\n"
+"- Send an email to <git@vger.kernel.org> asking for help, only if\n"
+"  suggestions by others do not work for you.\n"
 "\n"
 msgstr ""
-"Якщо ви все ще використовуєте цю команду, ось що ви можете зробити:\n"
+"Якщо вам потрібна заміна:\n"
+"\n"
+"- прочитайте https://git-scm.com/docs/BreakingChanges.html.\n"
+"\n"
+"- перевірте, що інші пропонують як заміну у розсилці:\n"
+"  https://lore.kernel.org/git/?q=%s\n"
 "\n"
-"- прочитайте https://git-scm.com/docs/BreakingChanges.html\n"
-"- перевірте, чи хтось обговорював це у розсилці\n"
-"  і чи знайшли вони щось, що може\n"
-"  вам допомогти: https://lore.kernel.org/git/?q=%s\n"
-"- надішліть електронного листа на адресу <git@vger.kernel.org>, щоб "
-"повідомити нас,\n"
-"  що ви все ще використовуєте цю команду і не змогли\n"
-"  знайти їй гідну заміну\n"
+"- надішліть електронного листа на адресу <git@vger.kernel.org> з проханням "
+"про допомогу, лише якщо\n"
+"  пропозиції інших вам не підходять.\n"
 "\n"
 
 msgid "refusing to run without --i-still-use-this"
@@ -25818,8 +26438,8 @@ msgstr ""
 "\n"
 
 #, perl-format
-msgid "No subject line in %s?"
-msgstr "Немає рядка теми в %s?"
+msgid "No 'Subject:' line in '%s'\n"
+msgstr "Немає рядка \"Subject:\" у \"%s\"\n"
 
 #, perl-format
 msgid "Failed to open for writing %s: %s"

From 0a961ebf01737f50c491ce12f7be3998a7f73fd1 Mon Sep 17 00:00:00 2001
From: Jiang Xin <worldhello.net@gmail.com>
Date: Sun, 27 Sep 2026 16:55:56 +0800
Subject: [PATCH 016/247] l10n: restore translations after upstream revert

Restore translations for the new translatable strings reintroduced by
commit 0f8e75abeb (Revert "Merge branch 'en/no-amend-during-conflicts'",
2026-09-23).

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
 po/ca.po    | 56 +++++++++++++++++++++++++------------------------
 po/fr.po    | 58 +++++++++++++++++++++++++++++----------------------
 po/ga.po    | 58 +++++++++++++++++++++++++++++----------------------
 po/id.po    | 60 +++++++++++++++++++++++++++--------------------------
 po/sv.po    | 51 +++++++++++++++++++++++++--------------------
 po/tr.po    | 53 ++++++++++++++++++++++++++--------------------
 po/uk.po    | 53 ++++++++++++++++++++++++++--------------------
 po/zh_CN.po | 52 ++++++++++++++++++++++++----------------------
 8 files changed, 243 insertions(+), 198 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index 48ababf31d003f..ed1c237bfe60b3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -283,7 +283,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2026-09-22 17:15+0200\n"
+"POT-Creation-Date: 2026-09-27 15:58+0800\n"
 "PO-Revision-Date: 2026-09-22 18:20+0200\n"
 "Last-Translator: Mikel Forcada <mikel.forcada@gmail.com>\n"
 "Language-Team: Catalan\n"
@@ -6533,18 +6533,8 @@ msgid "cannot do a partial commit during a cherry-pick."
 msgstr "no es pot fer una comissió parcial durant un «cherry pick»."
 
 #: builtin/commit.c
-msgid "cannot do a partial commit during a revert."
-msgstr "no es pot fer una comissió parcial durant una reversió."
-
-#: builtin/commit.c
-msgid "cannot do a partial commit during an am session."
-msgstr "no es pot fer una comissió parcial durant una sessió «am»."
-
-#: builtin/commit.c
-msgid "cannot do a partial commit while resolving conflicts during a rebase."
-msgstr ""
-"no es pot fer una comissió parcial mentre es resolen conflictes durant un "
-"«rebase»"
+msgid "cannot do a partial commit during a rebase."
+msgstr "no es pot fer una comissió parcial durant un «rebase»."
 
 #: builtin/commit.c
 msgid "cannot read the index"
@@ -6771,20 +6761,8 @@ msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Esteu enmig d'un «cherry pick» -- no es pot esmenar."
 
 #: builtin/commit.c
-msgid "The now-empty commit has been dropped -- cannot amend."
-msgstr "La comissió que ara és buida s'ha descartat: no es pot esmenar"
-
-#: builtin/commit.c
-msgid "You are in the middle of a revert -- cannot amend."
-msgstr "Esteu enmig d'una reversió; no es pot esmenar."
-
-#: builtin/commit.c
-msgid "You are in the middle of an am session -- cannot amend."
-msgstr "Esteu enmig d'una sessió «am»; no es pot esmenar."
-
-#: builtin/commit.c
-msgid "You are resolving conflicts during a rebase -- cannot amend."
-msgstr "Esteu resolent conflictes durant un «rebase»; no es pot esmenar."
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "Esteu enmig d'un «rebase» -- no es pot esmenar."
 
 #: builtin/commit.c
 msgid "--reset-author can be used only with -C, -c or --amend."
@@ -33657,3 +33635,27 @@ msgstr "S'omet %s amb el sufix de còpia de seguretat «%s».\n"
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Esteu segur que voleu enviar %s? [y|N]: "
+
+#~ msgid "cannot do a partial commit during a revert."
+#~ msgstr "no es pot fer una comissió parcial durant una reversió."
+
+#~ msgid "cannot do a partial commit during an am session."
+#~ msgstr "no es pot fer una comissió parcial durant una sessió «am»."
+
+#~ msgid ""
+#~ "cannot do a partial commit while resolving conflicts during a rebase."
+#~ msgstr ""
+#~ "no es pot fer una comissió parcial mentre es resolen conflictes durant un "
+#~ "«rebase»"
+
+#~ msgid "The now-empty commit has been dropped -- cannot amend."
+#~ msgstr "La comissió que ara és buida s'ha descartat: no es pot esmenar"
+
+#~ msgid "You are in the middle of a revert -- cannot amend."
+#~ msgstr "Esteu enmig d'una reversió; no es pot esmenar."
+
+#~ msgid "You are in the middle of an am session -- cannot amend."
+#~ msgstr "Esteu enmig d'una sessió «am»; no es pot esmenar."
+
+#~ msgid "You are resolving conflicts during a rebase -- cannot amend."
+#~ msgstr "Esteu resolent conflictes durant un «rebase»; no es pot esmenar."
diff --git a/po/fr.po b/po/fr.po
index 1443625eb198a4..e31fc5dfed3872 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -87,7 +87,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2026-09-15 23:12+0000\n"
+"POT-Creation-Date: 2026-09-27 15:58+0800\n"
 "PO-Revision-Date: 2026-09-20 16:00+0200\n"
 "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n"
 "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
@@ -5134,16 +5134,8 @@ msgstr "impossible de faire une validation partielle pendant une fusion."
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "impossible de faire une validation partielle pendant un picorage."
 
-msgid "cannot do a partial commit during a revert."
-msgstr "impossible de faire une validation partielle pendant un revert."
-
-msgid "cannot do a partial commit during an am session."
-msgstr "impossible de faire une validation partielle pendant une session am."
-
-msgid "cannot do a partial commit while resolving conflicts during a rebase."
-msgstr ""
-"impossible de faire une validation partielle en résolvant les conflits "
-"pendant un rebasage."
+msgid "cannot do a partial commit during a rebase."
+msgstr "impossible de faire une validation partielle pendant un rebasage."
 
 msgid "cannot read the index"
 msgstr "impossible de lire l'index"
@@ -5334,20 +5326,8 @@ msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."
 
-msgid "The now-empty commit has been dropped -- cannot amend."
-msgstr ""
-"Le commit désormais vide a été éliminé -- impossible de corriger (amend)."
-
-msgid "You are in the middle of a revert -- cannot amend."
-msgstr "Vous êtes en plein retour -- impossible de corriger (amend)."
-
-msgid "You are in the middle of an am session -- cannot amend."
-msgstr "Vous êtes en pleine session am -- impossible de corriger (amend)."
-
-msgid "You are resolving conflicts during a rebase -- cannot amend."
-msgstr ""
-"Vous résolvez des conflits pendant un rebasage -- impossible de corriger "
-"(amend)."
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "Vous êtes en plein rebasage -- impossible de corriger (amend)."
 
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."
@@ -27022,3 +27002,31 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n"
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
+
+#~ msgid "cannot do a partial commit during a revert."
+#~ msgstr "impossible de faire une validation partielle pendant un revert."
+
+#~ msgid "cannot do a partial commit during an am session."
+#~ msgstr ""
+#~ "impossible de faire une validation partielle pendant une session am."
+
+#~ msgid ""
+#~ "cannot do a partial commit while resolving conflicts during a rebase."
+#~ msgstr ""
+#~ "impossible de faire une validation partielle en résolvant les conflits "
+#~ "pendant un rebasage."
+
+#~ msgid "The now-empty commit has been dropped -- cannot amend."
+#~ msgstr ""
+#~ "Le commit désormais vide a été éliminé -- impossible de corriger (amend)."
+
+#~ msgid "You are in the middle of a revert -- cannot amend."
+#~ msgstr "Vous êtes en plein retour -- impossible de corriger (amend)."
+
+#~ msgid "You are in the middle of an am session -- cannot amend."
+#~ msgstr "Vous êtes en pleine session am -- impossible de corriger (amend)."
+
+#~ msgid "You are resolving conflicts during a rebase -- cannot amend."
+#~ msgstr ""
+#~ "Vous résolvez des conflits pendant un rebasage -- impossible de corriger "
+#~ "(amend)."
diff --git a/po/ga.po b/po/ga.po
index 89866cf0bf4650..f92d70c66aeccf 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2026-09-15 23:12+0000\n"
+"POT-Creation-Date: 2026-09-27 15:58+0800\n"
 "PO-Revision-Date: 2026-09-20 12:43+0100\n"
 "Last-Translator: Aindriú Mac Giolla Eoin <aindriu80@yahoo.com>\n"
 "Language-Team: none\n"
@@ -5078,16 +5078,8 @@ msgstr "ní féidir le tiomantas páirteach a dhéanamh le linn cumaisc."
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "ní féidir le tiomantas páirteach a dhéanamh le linn pioc silíní."
 
-msgid "cannot do a partial commit during a revert."
-msgstr "ní féidir tiomantas páirteach a dhéanamh le linn aisiompaithe."
-
-msgid "cannot do a partial commit during an am session."
-msgstr "ní féidir tiomantas páirteach a dhéanamh le linn seisiúin am."
-
-msgid "cannot do a partial commit while resolving conflicts during a rebase."
-msgstr ""
-"ní féidir tiomantas páirteach a dhéanamh agus coinbhleachtaí á réiteach le "
-"linn athbhunaithe (rebase)."
+msgid "cannot do a partial commit during a rebase."
+msgstr "ní féidir le tiomantas páirteach a dhéanamh le linn athbhunaithe."
 
 msgid "cannot read the index"
 msgstr "ní féidir leis an innéacs a léamh"
@@ -5277,20 +5269,8 @@ msgstr "Tá tú i lár cumaisc - ní féidir leat leasú."
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Tá tú i lár rogha silíní - ní féidir leat leasú."
 
-msgid "The now-empty commit has been dropped -- cannot amend."
-msgstr ""
-"Tá an tiomantas, atá folamh anois, curtha ar ceal -- ní féidir é a leasú."
-
-msgid "You are in the middle of a revert -- cannot amend."
-msgstr "Tá tú i mbun aisiompaithe faoi láthair -- ní féidir leasú a dhéanamh."
-
-msgid "You are in the middle of an am session -- cannot amend."
-msgstr "Tá tú i lár seisiúin am -- ní féidir leasú a dhéanamh."
-
-msgid "You are resolving conflicts during a rebase -- cannot amend."
-msgstr ""
-"Tá tú ag réiteach coinbhleachtaí le linn rebase -- ní féidir leasú a "
-"dhéanamh."
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "Tá tú i lár athbhunaithe - ní féidir leat leasú."
 
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "Ní féidir --reset-author a úsáid ach le -C, -c nó --amend."
@@ -26770,3 +26750,31 @@ msgstr "Ag scipeáil %s leis an iarmhír chúltaca '%s'.\n"
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "An bhfuil tú ag iarraidh %s a sheoladh i ndáiríre? [y|N]: "
+
+#~ msgid "cannot do a partial commit during a revert."
+#~ msgstr "ní féidir tiomantas páirteach a dhéanamh le linn aisiompaithe."
+
+#~ msgid "cannot do a partial commit during an am session."
+#~ msgstr "ní féidir tiomantas páirteach a dhéanamh le linn seisiúin am."
+
+#~ msgid ""
+#~ "cannot do a partial commit while resolving conflicts during a rebase."
+#~ msgstr ""
+#~ "ní féidir tiomantas páirteach a dhéanamh agus coinbhleachtaí á réiteach "
+#~ "le linn athbhunaithe (rebase)."
+
+#~ msgid "The now-empty commit has been dropped -- cannot amend."
+#~ msgstr ""
+#~ "Tá an tiomantas, atá folamh anois, curtha ar ceal -- ní féidir é a leasú."
+
+#~ msgid "You are in the middle of a revert -- cannot amend."
+#~ msgstr ""
+#~ "Tá tú i mbun aisiompaithe faoi láthair -- ní féidir leasú a dhéanamh."
+
+#~ msgid "You are in the middle of an am session -- cannot amend."
+#~ msgstr "Tá tú i lár seisiúin am -- ní féidir leasú a dhéanamh."
+
+#~ msgid "You are resolving conflicts during a rebase -- cannot amend."
+#~ msgstr ""
+#~ "Tá tú ag réiteach coinbhleachtaí le linn rebase -- ní féidir leasú a "
+#~ "dhéanamh."
diff --git a/po/id.po b/po/id.po
index e5316047952390..7d7b966354cd75 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2026-09-21 08:19+0700\n"
+"POT-Creation-Date: 2026-09-27 15:58+0800\n"
 "PO-Revision-Date: 2026-09-21 14:57+0700\n"
 "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n"
 "Language-Team: Indonesian\n"
@@ -6198,18 +6198,8 @@ msgid "cannot do a partial commit during a cherry-pick."
 msgstr "tidak dapat melakukan komit sebagian selama pemetikan ceri."
 
 #: builtin/commit.c
-msgid "cannot do a partial commit during a revert."
-msgstr "tidak dapat melakukan komit sebagian selama pembalikan."
-
-#: builtin/commit.c
-msgid "cannot do a partial commit during an am session."
-msgstr "tidak dapat melakukan komit sebagian dalam sesi am."
-
-#: builtin/commit.c
-msgid "cannot do a partial commit while resolving conflicts during a rebase."
-msgstr ""
-"tidak dapat melakukan komit sebagian ketika menyelesaikan konflik di tengah "
-"pendasaran ulang."
+msgid "cannot do a partial commit during a rebase."
+msgstr "tidak dapat melakukan komit sebagian selama pendasaran ulang."
 
 #: builtin/commit.c
 msgid "cannot read the index"
@@ -6433,22 +6423,8 @@ msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Anda berada di tengah pemetikan ceri -- tidak dapat mengubah."
 
 #: builtin/commit.c
-msgid "The now-empty commit has been dropped -- cannot amend."
-msgstr "Komit yang tak kosong telah dijatuhkan -- tidak dapat mengubah."
-
-#: builtin/commit.c
-msgid "You are in the middle of a revert -- cannot amend."
-msgstr "Anda berada di tengah pembalikan -- tidak dapat mengubah."
-
-#: builtin/commit.c
-msgid "You are in the middle of an am session -- cannot amend."
-msgstr "Anda berada di tengah sesi am -- tidak dapat mengubah."
-
-#: builtin/commit.c
-msgid "You are resolving conflicts during a rebase -- cannot amend."
-msgstr ""
-"Anda sedang menyelesaikan konflik di tengah pendasaran ulang -- tidak dapat "
-"mengubah."
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "Anda berada di tengah pendasaran ulang -- tidak dapat mengubah."
 
 #: builtin/commit.c
 msgid "--reset-author can be used only with -C, -c or --amend."
@@ -32854,3 +32830,29 @@ msgstr "Melewati %s dengan akhiran cadangan '%s'.\n"
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Anda benar-benar ingin mengirim %s? [y|N]: "
+
+#~ msgid "cannot do a partial commit during a revert."
+#~ msgstr "tidak dapat melakukan komit sebagian selama pembalikan."
+
+#~ msgid "cannot do a partial commit during an am session."
+#~ msgstr "tidak dapat melakukan komit sebagian dalam sesi am."
+
+#~ msgid ""
+#~ "cannot do a partial commit while resolving conflicts during a rebase."
+#~ msgstr ""
+#~ "tidak dapat melakukan komit sebagian ketika menyelesaikan konflik di "
+#~ "tengah pendasaran ulang."
+
+#~ msgid "The now-empty commit has been dropped -- cannot amend."
+#~ msgstr "Komit yang tak kosong telah dijatuhkan -- tidak dapat mengubah."
+
+#~ msgid "You are in the middle of a revert -- cannot amend."
+#~ msgstr "Anda berada di tengah pembalikan -- tidak dapat mengubah."
+
+#~ msgid "You are in the middle of an am session -- cannot amend."
+#~ msgstr "Anda berada di tengah sesi am -- tidak dapat mengubah."
+
+#~ msgid "You are resolving conflicts during a rebase -- cannot amend."
+#~ msgstr ""
+#~ "Anda sedang menyelesaikan konflik di tengah pendasaran ulang -- tidak "
+#~ "dapat mengubah."
diff --git a/po/sv.po b/po/sv.po
index 248ea7f010758d..5615e044dc1c85 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git 2.56.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2026-09-15 23:12+0000\n"
+"POT-Creation-Date: 2026-09-27 15:58+0800\n"
 "PO-Revision-Date: 2026-09-21 14:24+0100\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n"
@@ -4926,16 +4926,8 @@ msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "kan inte utföra en delvis incheckning under en cherry-pick."
 
-msgid "cannot do a partial commit during a revert."
-msgstr "kan inte utföra en delvis incheckning under en återställning."
-
-msgid "cannot do a partial commit during an am session."
-msgstr "kan inte utföra en delvis incheckning under en am-körning."
-
-msgid "cannot do a partial commit while resolving conflicts during a rebase."
-msgstr ""
-"kan inte utföra en delvis incheckning vid konfliktlösning under en "
-"ombasering."
+msgid "cannot do a partial commit during a rebase."
+msgstr "kan inte utföra en delvis incheckning under en ombasering."
 
 msgid "cannot read the index"
 msgstr "kan inte läsa indexet"
@@ -5119,17 +5111,8 @@ msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."
 
-msgid "The now-empty commit has been dropped -- cannot amend."
-msgstr "Den numera tomma incheckningen har kastats -- kan inte utöka."
-
-msgid "You are in the middle of a revert -- cannot amend."
-msgstr "Du är i mitten av en återställning -- kan inte utöka."
-
-msgid "You are in the middle of an am session -- cannot amend."
-msgstr "Du är i mitten av en am-körning -- kan inte utöka."
-
-msgid "You are resolving conflicts during a rebase -- cannot amend."
-msgstr "Du löser konflikter under en ombasering -- kan inte utöka."
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "Du är i mitten av en ombasering -- kan inte utöka."
 
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author kan endast användas med -C, -c eller --amend."
@@ -26209,3 +26192,27 @@ msgstr ""
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
+
+#~ msgid "cannot do a partial commit during a revert."
+#~ msgstr "kan inte utföra en delvis incheckning under en återställning."
+
+#~ msgid "cannot do a partial commit during an am session."
+#~ msgstr "kan inte utföra en delvis incheckning under en am-körning."
+
+#~ msgid ""
+#~ "cannot do a partial commit while resolving conflicts during a rebase."
+#~ msgstr ""
+#~ "kan inte utföra en delvis incheckning vid konfliktlösning under en "
+#~ "ombasering."
+
+#~ msgid "The now-empty commit has been dropped -- cannot amend."
+#~ msgstr "Den numera tomma incheckningen har kastats -- kan inte utöka."
+
+#~ msgid "You are in the middle of a revert -- cannot amend."
+#~ msgstr "Du är i mitten av en återställning -- kan inte utöka."
+
+#~ msgid "You are in the middle of an am session -- cannot amend."
+#~ msgstr "Du är i mitten av en am-körning -- kan inte utöka."
+
+#~ msgid "You are resolving conflicts during a rebase -- cannot amend."
+#~ msgstr "Du löser konflikter under en ombasering -- kan inte utöka."
diff --git a/po/tr.po b/po/tr.po
index 0b750f549a6270..2065ad68a46c78 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -97,7 +97,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git Turkish Localization Project\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2026-09-15 23:12+0000\n"
+"POT-Creation-Date: 2026-09-27 15:58+0800\n"
 "PO-Revision-Date: 2026-09-16 10:00+0300\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: Turkish <kde-i18n-doc@kde.org>\n"
@@ -5030,15 +5030,8 @@ msgstr "Birleştirme sırasında kısmi işleme yapılamaz."
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "Seç-al sırasında kısmi işleme yapılamaz."
 
-msgid "cannot do a partial commit during a revert."
-msgstr "Geri alma sırasında kısmi işleme yapılamaz."
-
-msgid "cannot do a partial commit during an am session."
-msgstr "\"am\" oturumu sırasında kısmi işleme yapılamaz."
-
-msgid "cannot do a partial commit while resolving conflicts during a rebase."
-msgstr ""
-"Yeniden temellendirme sırasında çakışmaları çözerken kısmi işleme yapılamaz."
+msgid "cannot do a partial commit during a rebase."
+msgstr "Bir yeniden temellendirme sırasında kısmi işleme yapılamaz."
 
 msgid "cannot read the index"
 msgstr "indeks okunamıyor"
@@ -5223,19 +5216,9 @@ msgstr "Bir birleştirmenin tam ortasındasınız -- değiştirme yapılamıyor.
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Bir seç-al'ın tam ortasındasınız -- değiştirme yapılamıyor."
 
-msgid "The now-empty commit has been dropped -- cannot amend."
-msgstr "Şimdi boş olan işleme bırakıldı -- değiştirme yapılamıyor."
-
-msgid "You are in the middle of a revert -- cannot amend."
-msgstr "Bir geri almanın tam ortasındasınız -- değiştirme yapılamıyor."
-
-msgid "You are in the middle of an am session -- cannot amend."
-msgstr "Bir \"am\" oturumunun tam ortasındasınız -- değiştirme yapılamıyor."
-
-msgid "You are resolving conflicts during a rebase -- cannot amend."
+msgid "You are in the middle of a rebase -- cannot amend."
 msgstr ""
-"Bir yeniden temellendirme sırasında çakışma çözüyorsunuz -- değiştirme "
-"yapılamıyor."
+"Bir yeniden temellendirmenin tam ortasındasınız -- değiştirme yapılamıyor."
 
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
@@ -26354,3 +26337,29 @@ msgstr "%s, yedek sonek \"%s\" ile atlanıyor.\n"
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "%s ögesini göndermeyi gerçekten istiyor musunuz? [y|N]: "
+
+#~ msgid "cannot do a partial commit during a revert."
+#~ msgstr "Geri alma sırasında kısmi işleme yapılamaz."
+
+#~ msgid "cannot do a partial commit during an am session."
+#~ msgstr "\"am\" oturumu sırasında kısmi işleme yapılamaz."
+
+#~ msgid ""
+#~ "cannot do a partial commit while resolving conflicts during a rebase."
+#~ msgstr ""
+#~ "Yeniden temellendirme sırasında çakışmaları çözerken kısmi işleme "
+#~ "yapılamaz."
+
+#~ msgid "The now-empty commit has been dropped -- cannot amend."
+#~ msgstr "Şimdi boş olan işleme bırakıldı -- değiştirme yapılamıyor."
+
+#~ msgid "You are in the middle of a revert -- cannot amend."
+#~ msgstr "Bir geri almanın tam ortasındasınız -- değiştirme yapılamıyor."
+
+#~ msgid "You are in the middle of an am session -- cannot amend."
+#~ msgstr "Bir \"am\" oturumunun tam ortasındasınız -- değiştirme yapılamıyor."
+
+#~ msgid "You are resolving conflicts during a rebase -- cannot amend."
+#~ msgstr ""
+#~ "Bir yeniden temellendirme sırasında çakışma çözüyorsunuz -- değiştirme "
+#~ "yapılamıyor."
diff --git a/po/uk.po b/po/uk.po
index 839c4f7745ca22..15eeb9d61e446d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git v2.55\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2026-09-19 18:45-0700\n"
+"POT-Creation-Date: 2026-09-27 15:58+0800\n"
 "PO-Revision-Date: 2026-06-27 10:23-0700\n"
 "Last-Translator: Arkadii Yakovets <ark@cho.red>\n"
 "Language-Team: Ukrainian <https://github.com/arkid15r/git-uk-l10n/>\n"
@@ -5038,16 +5038,8 @@ msgstr "неможливо зробити частковий коміт під 
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "неможливо зробити частковий коміт під час висмикування."
 
-msgid "cannot do a partial commit during a revert."
-msgstr "неможливо зробити частковий коміт під час вивертання."
-
-msgid "cannot do a partial commit during an am session."
-msgstr "неможливо зробити частковий коміт під час сесії am."
-
-msgid "cannot do a partial commit while resolving conflicts during a rebase."
-msgstr ""
-"неможливо зробити частковий коміт під час вирішення конфліктів при "
-"перебазуванні."
+msgid "cannot do a partial commit during a rebase."
+msgstr "неможливо зробити частковий коміт під час перебазування."
 
 msgid "cannot read the index"
 msgstr "неможливо прочитати індекс"
@@ -5232,18 +5224,8 @@ msgstr "Ви перебуваєте в процесі злиття -- немож
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Ви перебуваєте в процесі висмикування - неможливо внести зміни."
 
-msgid "The now-empty commit has been dropped -- cannot amend."
-msgstr "Тепер порожній коміт було відкинуто -- неможливо внести зміни."
-
-msgid "You are in the middle of a revert -- cannot amend."
-msgstr "Ви перебуваєте в процесі вивертання -- неможливо внести зміни."
-
-msgid "You are in the middle of an am session -- cannot amend."
-msgstr "Ви перебуваєте в процесі сесії am -- неможливо внести зміни."
-
-msgid "You are resolving conflicts during a rebase -- cannot amend."
-msgstr ""
-"Ви вирішуєте конфлікти під час перебазування -- неможливо внести зміни."
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "Ви перебуваєте в процесі перебазуавння -- неможливо внести зміни."
 
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author можна використовувати лише з -C, -c або --amend."
@@ -26691,3 +26673,28 @@ msgstr "Пропуск %s з суфіксом резервної копії \"%s
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Ви дійсно хочете відправити %s? [y|N]: "
+
+#~ msgid "cannot do a partial commit during a revert."
+#~ msgstr "неможливо зробити частковий коміт під час вивертання."
+
+#~ msgid "cannot do a partial commit during an am session."
+#~ msgstr "неможливо зробити частковий коміт під час сесії am."
+
+#~ msgid ""
+#~ "cannot do a partial commit while resolving conflicts during a rebase."
+#~ msgstr ""
+#~ "неможливо зробити частковий коміт під час вирішення конфліктів при "
+#~ "перебазуванні."
+
+#~ msgid "The now-empty commit has been dropped -- cannot amend."
+#~ msgstr "Тепер порожній коміт було відкинуто -- неможливо внести зміни."
+
+#~ msgid "You are in the middle of a revert -- cannot amend."
+#~ msgstr "Ви перебуваєте в процесі вивертання -- неможливо внести зміни."
+
+#~ msgid "You are in the middle of an am session -- cannot amend."
+#~ msgstr "Ви перебуваєте в процесі сесії am -- неможливо внести зміни."
+
+#~ msgid "You are resolving conflicts during a rebase -- cannot amend."
+#~ msgstr ""
+#~ "Ви вирішуєте конфлікти під час перебазування -- неможливо внести зміни."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6353640322d911..9a485ba41d4b87 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -176,7 +176,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2026-09-16 23:08+0800\n"
+"POT-Creation-Date: 2026-09-27 15:58+0800\n"
 "PO-Revision-Date: 2025-11-16 01:03+0800\n"
 "Last-Translator: Teng Long <dyroneteng@gmail.com>\n"
 "Language-Team: GitHub <https://github.com/dyrone/git/>\n"
@@ -6242,16 +6242,8 @@ msgid "cannot do a partial commit during a cherry-pick."
 msgstr "在拣选过程中不能做部分提交。"
 
 #: builtin/commit.c
-msgid "cannot do a partial commit during a revert."
-msgstr "在还原过程中不能做部分提交。"
-
-#: builtin/commit.c
-msgid "cannot do a partial commit during an am session."
-msgstr "在 am 会话过程中不能做部分提交。"
-
-#: builtin/commit.c
-msgid "cannot do a partial commit while resolving conflicts during a rebase."
-msgstr "在解决变基冲突过程中不能做部分提交。"
+msgid "cannot do a partial commit during a rebase."
+msgstr "在变基过程中不能做部分提交。"
 
 #: builtin/commit.c
 msgid "cannot read the index"
@@ -6470,20 +6462,8 @@ msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "您正处于一个拣选过程中 -- 不能修订提交。"
 
 #: builtin/commit.c
-msgid "The now-empty commit has been dropped -- cannot amend."
-msgstr "当前为空的提交已经被丢弃 -- 不能修订提交。"
-
-#: builtin/commit.c
-msgid "You are in the middle of a revert -- cannot amend."
-msgstr "您正处于一个还原过程中 -- 不能修订提交。"
-
-#: builtin/commit.c
-msgid "You are in the middle of an am session -- cannot amend."
-msgstr "您正处于一个 am 会话过程中 -- 不能修订提交。"
-
-#: builtin/commit.c
-msgid "You are resolving conflicts during a rebase -- cannot amend."
-msgstr "您正处于一个解决变基冲突的过程中 -- 不能修订提交。"
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "您正处于一个变基过程中 -- 不能修订提交。"
 
 #: builtin/commit.c
 msgid "--reset-author can be used only with -C, -c or --amend."
@@ -32335,3 +32315,25 @@ msgstr "略过 %s 含备份后缀 '%s'。\n"
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "您真的要发送 %s？[y|N]："
+
+#~ msgid "cannot do a partial commit during a revert."
+#~ msgstr "在还原过程中不能做部分提交。"
+
+#~ msgid "cannot do a partial commit during an am session."
+#~ msgstr "在 am 会话过程中不能做部分提交。"
+
+#~ msgid ""
+#~ "cannot do a partial commit while resolving conflicts during a rebase."
+#~ msgstr "在解决变基冲突过程中不能做部分提交。"
+
+#~ msgid "The now-empty commit has been dropped -- cannot amend."
+#~ msgstr "当前为空的提交已经被丢弃 -- 不能修订提交。"
+
+#~ msgid "You are in the middle of a revert -- cannot amend."
+#~ msgstr "您正处于一个还原过程中 -- 不能修订提交。"
+
+#~ msgid "You are in the middle of an am session -- cannot amend."
+#~ msgstr "您正处于一个 am 会话过程中 -- 不能修订提交。"
+
+#~ msgid "You are resolving conflicts during a rebase -- cannot amend."
+#~ msgstr "您正处于一个解决变基冲突的过程中 -- 不能修订提交。"

From bc312c315c1a142ac4513aea3e1f00f7ea9419aa Mon Sep 17 00:00:00 2001
From: Daniel Pereira <danielmaraboo@gmail.com>
Date: Thu, 17 Sep 2026 21:20:39 -0300
Subject: [PATCH 017/247] l10n: pt_BR: add Brazilian Portuguese translation

Add the initial Brazilian Portuguese translation of Git and register
the language team in po/TEAMS.

All 6476 messages are translated against the git.pot for v2.56.0-rc1.
The file header carries a glossary documenting the terminology in use:
Git command and concept names (branch, commit, merge, rebase, checkout,
push, fetch, stash, tag, pack, worktree, ...) are kept in English while
the surrounding prose is translated, and literal configuration values
and command-line options are never translated.

Signed-off-by: Daniel Pereira <danielmaraboo@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
 po/TEAMS    |     4 +
 po/pt_BR.po | 26593 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 26597 insertions(+)
 create mode 100644 po/pt_BR.po

diff --git a/po/TEAMS b/po/TEAMS
index 0fd009b2400647..880ee6cf0526bb 100644
--- a/po/TEAMS
+++ b/po/TEAMS
@@ -54,6 +54,10 @@ Language:	pl (Polish)
 Repository:	https://github.com/Arusekk/git-po
 Members:	Arusekk <arek_koz@o2.pl>
 
+Language:	pt_BR (Portuguese - Brazil)
+Repository:	https://github.com/Daniel-Pereira-Linux/git-po
+Leader:		Daniel Pereira <danielmaraboo@gmail.com>
+
 Language:	pt_PT (Portuguese - Portugal)
 Repository:	https://gitlab.com/alexandre1985/git-pt/
 Members:	Daniel Santos <dacs.git@brilhante.top>
diff --git a/po/pt_BR.po b/po/pt_BR.po
new file mode 100644
index 00000000000000..85f49b3b4c488f
--- /dev/null
+++ b/po/pt_BR.po
@@ -0,0 +1,26593 @@
+# Brazilian Portuguese translations for Git.
+# Traduções para português do Brasil do pacote Git.
+# Copyright (C) 2026 Daniel Pereira <danielmaraboo@gmail.com>
+# This file is distributed under the same license as the Git package.
+# Daniel Pereira <danielmaraboo@gmail.com>, 2026.
+#
+# Glossário / Glossary of Git terms used in this translation.
+#
+# Termos técnicos do Git são mantidos em inglês quando são também o nome de um
+# comando, opção ou conceito que o usuário digita ou lê na documentação.
+# Git technical terms are kept in English when they are also the name of a
+# command, option or concept the user types or reads in the documentation.
+#
+#   English                          |  Português (pt_BR)
+#   ---------------------------------+--------------------------------------
+#   amend                            |  amend (fazer amend)
+#   bare repository                  |  repositório bare
+#   bisect                           |  bisect (fazer bisect)
+#   blob                             |  blob
+#   branch                           |  branch (masculino: o branch)
+#   bundle                           |  bundle
+#   checkout                         |  checkout (fazer checkout)
+#   cherry-pick                      |  cherry-pick (fazer cherry-pick)
+#   chunk                            |  chunk
+#   commit (n./v.)                   |  commit / fazer commit
+#   committed                        |  commitado
+#   detached HEAD                    |  HEAD desanexado
+#   diff                             |  diff
+#   fast-forward                     |  fast-forward
+#   fetch                            |  fetch (fazer fetch)
+#   hint:                            |  hint:  (prefixo literal, NÃO traduzir)
+#   hunk                             |  pedaço
+#   index                            |  índice
+#   loose object                     |  objeto solto
+#   merge (n./v.)                    |  merge / fazer merge
+#   pack / packfile                  |  pack / packfile
+#   pull                             |  pull (fazer pull)
+#   push                             |  push (fazer push)
+#   rebase                           |  rebase (fazer rebase)
+#   ref / refspec                    |  ref / refspec
+#   remote (n./adj.)                 |  remoto
+#   repack                           |  fazer repack
+#   revert                           |  revert (fazer revert)
+#   shallow                          |  raso
+#   sparse-checkout                  |  sparse-checkout
+#   squash                           |  squash (fazer squash)
+#   stage (v.) / staged              |  preparar / preparado (no stage)
+#   stash                            |  stash (fazer stash)
+#   submodule                        |  submódulo
+#   tag                              |  tag
+#   thread                           |  thread
+#   tree / tree-ish                  |  tree / tree-ish
+#   unstage                          |  remover do stage
+#   untracked                        |  não rastreado
+#   working tree                     |  árvore de trabalho
+#   worktree (git worktree)          |  worktree (feminino: a worktree)
+#
+# Valores literais de configuração e opções de linha de comando (por exemplo
+# 'nothing', 'simple', --mixed, --soft) NUNCA são traduzidos.
+# Literal config values and command-line options are NEVER translated.
+#
+# Por decisão da equipe, as linhas de uso ("git add [<options>] [--]
+# <pathspec>...") e os nomes de metavariáveis (<options>, <pathspec>,
+# <commit>, ...) são mantidos em inglês, para coincidir com a documentação
+# do Git. Por isso o número de mensagens idênticas ao original é mais alto
+# nesta tradução do que em equipes que traduzem as metavariáveis.
+# By team decision, usage lines and metavariable names are kept in English
+# to match the Git documentation; this is why the count of messages that are
+# identical to the original is higher here than for teams that translate
+# metavariable names.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Git\n"
+"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
+"POT-Creation-Date: 2026-09-27 15:58+0800\n"
+"PO-Revision-Date: 2026-09-17 21:30-0300\n"
+"Last-Translator: Daniel Pereira <danielmaraboo@gmail.com>\n"
+"Language-Team: Brazilian Portuguese\n"
+"Language: pt_BR\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"
+
+#, c-format
+msgid "Huh (%s)?"
+msgstr "Hein (%s)?"
+
+msgid "could not read index"
+msgstr "não foi possível ler o índice"
+
+msgid "binary"
+msgstr "binário"
+
+msgid "nothing"
+msgstr "nada"
+
+msgid "unchanged"
+msgstr "inalterado"
+
+msgid "Update"
+msgstr "Atualizar"
+
+#, c-format
+msgid "could not stage '%s'"
+msgstr "não foi possível preparar '%s'"
+
+msgid "could not write index"
+msgstr "não foi possível escrever o índice"
+
+#, c-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "atualizado %d caminho\n"
+msgstr[1] "atualizados %d caminhos\n"
+
+#, c-format
+msgid "note: %s is untracked now.\n"
+msgstr "nota: %s não está rastreado agora.\n"
+
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry falhou no caminho '%s'"
+
+msgid "Revert"
+msgstr "Reverter"
+
+msgid "Could not parse HEAD^{tree}"
+msgstr "Não foi possível analisar HEAD^{tree}"
+
+#, c-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "revertido %d caminho\n"
+msgstr[1] "revertidos %d caminhos\n"
+
+#, c-format
+msgid "No untracked files.\n"
+msgstr "Nenhum arquivo não rastreado.\n"
+
+msgid "Add untracked"
+msgstr "Adicionar não rastreado"
+
+#, c-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "adicionado %d caminho\n"
+msgstr[1] "adicionados %d caminhos\n"
+
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "ignorando não mesclado: %s"
+
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Apenas arquivos binários foram alterados.\n"
+
+#, c-format
+msgid "No changes.\n"
+msgstr "Sem alterações.\n"
+
+msgid "Patch update"
+msgstr "Atualização de patches"
+
+msgid "Review diff"
+msgstr "Revisar o diff"
+
+msgid "show paths with changes"
+msgstr "mostrar caminhos com mudanças"
+
+msgid "add working tree state to the staged set of changes"
+msgstr ""
+"adicionar o estado da árvore de trabalho ao conjunto de alterações preparadas"
+
+msgid "revert staged set of changes back to the HEAD version"
+msgstr ""
+"reverter o conjunto de alterações preparadas de volta para a versão HEAD"
+
+msgid "pick hunks and update selectively"
+msgstr "escolher trechos e atualizar seletivamente"
+
+msgid "view diff between HEAD and index"
+msgstr "ver diff entre HEAD e o índice"
+
+msgid "add contents of untracked files to the staged set of changes"
+msgstr ""
+"adicionar o conteúdo de arquivos não rastreados ao conjunto de alterações "
+"preparadas"
+
+msgid "Prompt help:"
+msgstr "Ajuda do prompt:"
+
+msgid "select a single item"
+msgstr "selecionar um único item"
+
+msgid "select a range of items"
+msgstr "selecionar um intervalo de itens"
+
+msgid "select multiple ranges"
+msgstr "selecionar múltiplos intervalos"
+
+msgid "select item based on unique prefix"
+msgstr "selecionar item com base em prefixo único"
+
+msgid "unselect specified items"
+msgstr "desmarcar itens especificados"
+
+msgid "choose all items"
+msgstr "escolher todos os itens"
+
+msgid "(empty) finish selecting"
+msgstr "(vazio) concluir seleção"
+
+msgid "select a numbered item"
+msgstr "selecionar um item numerado"
+
+msgid "(empty) select nothing"
+msgstr "(vazio) não selecionar nada"
+
+msgid "*** Commands ***"
+msgstr "*** Comandos ***"
+
+msgid "What now"
+msgstr "E agora"
+
+msgid "staged"
+msgstr "preparado"
+
+msgid "unstaged"
+msgstr "não preparado"
+
+msgid "path"
+msgstr "caminho"
+
+msgid "could not refresh index"
+msgstr "não foi possível atualizar o índice"
+
+#, c-format
+msgid "Bye.\n"
+msgstr "Tchau.\n"
+
+#, c-format
+msgid "Stage mode change%s [y,n,q,a,d%s,?]? "
+msgstr "Preparar alteração de modo%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Stage deletion%s [y,n,q,a,d%s,?]? "
+msgstr "Preparar exclusão%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Stage addition%s [y,n,q,a,d%s,?]? "
+msgstr "Preparar adição%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Stage this hunk%s [y,n,q,a,d%s,?]? "
+msgstr "Preparar este pedaço%s [y,n,q,a,d%s,?]? "
+
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"staging."
+msgstr ""
+"Se o patch for aplicado corretamente, o pedaço editado será imediatamente "
+"marcado para ser preparado."
+
+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 - preparar este pedaço\n"
+"n - não preparar este pedaço\n"
+"q - sair; não preparar este pedaço nem nenhum dos restantes\n"
+"a - preparar este pedaço e todos os pedaços posteriores no arquivo\n"
+"d - não preparar este pedaço nem nenhum dos pedaços posteriores no arquivo\n"
+
+#, c-format
+msgid "Stash mode change%s [y,n,q,a,d%s,?]? "
+msgstr "Fazer stash da alteração de modo%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Stash deletion%s [y,n,q,a,d%s,?]? "
+msgstr "Fazer stash da exclusão%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Stash addition%s [y,n,q,a,d%s,?]? "
+msgstr "Fazer stash da adição%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Stash this hunk%s [y,n,q,a,d%s,?]? "
+msgstr "Fazer stash deste pedaço%s [y,n,q,a,d%s,?]? "
+
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"stashing."
+msgstr ""
+"Se o patch for aplicado corretamente, o pedaço editado será imediatamente "
+"marcado para stash."
+
+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 - fazer stash deste pedaço\n"
+"n - não fazer stash deste pedaço\n"
+"q - sair; não fazer stash deste pedaço nem de nenhum dos restantes\n"
+"a - fazer stash deste pedaço e de todos os pedaços posteriores no arquivo\n"
+"d - não fazer stash deste pedaço nem de nenhum dos pedaços posteriores no "
+"arquivo\n"
+
+#, c-format
+msgid "Unstage mode change%s [y,n,q,a,d%s,?]? "
+msgstr "Remover do stage a alteração de modo%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Unstage deletion%s [y,n,q,a,d%s,?]? "
+msgstr "Remover do stage a exclusão%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Unstage addition%s [y,n,q,a,d%s,?]? "
+msgstr "Remover do stage a adição%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Unstage this hunk%s [y,n,q,a,d%s,?]? "
+msgstr "Remover este pedaço do stage%s [y,n,q,a,d%s,?]? "
+
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr ""
+"Se o patch for aplicado corretamente, o pedaço editado será imediatamente "
+"marcado para ser removido do stage."
+
+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 - remover este pedaço do stage\n"
+"n - não remover este pedaço do stage\n"
+"q - sair; não remover este pedaço do stage nem nenhum dos restantes\n"
+"a - remover do stage este pedaço e todos os pedaços posteriores no arquivo\n"
+"d - não remover do stage este pedaço nem nenhum dos pedaços posteriores no "
+"arquivo\n"
+
+#, c-format
+msgid "Apply mode change to index%s [y,n,q,a,d%s,?]? "
+msgstr "Aplicar alteração de modo ao índice%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Apply deletion to index%s [y,n,q,a,d%s,?]? "
+msgstr "Aplicar exclusão ao índice%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Apply addition to index%s [y,n,q,a,d%s,?]? "
+msgstr "Aplicar adição ao índice%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Apply this hunk to index%s [y,n,q,a,d%s,?]? "
+msgstr "Aplicar este pedaço ao índice%s [y,n,q,a,d%s,?]? "
+
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"applying."
+msgstr ""
+"Se o patch for aplicado corretamente, o pedaço editado será imediatamente "
+"marcado para aplicação."
+
+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 - aplicar este pedaço ao índice\n"
+"n - não aplicar este pedaço ao índice\n"
+"q - sair; não aplicar este pedaço nem nenhum dos restantes\n"
+"a - aplicar este pedaço e todos os pedaços posteriores no arquivo\n"
+"d - não aplicar este pedaço nem nenhum dos pedaços posteriores no arquivo\n"
+
+#, c-format
+msgid "Discard mode change from worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Descartar alteração de modo da árvore de trabalho%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Discard deletion from worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Descartar exclusão da árvore de trabalho%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Discard addition from worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Descartar adição da árvore de trabalho%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Discard this hunk from worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Descartar este pedaço da árvore de trabalho%s [y,n,q,a,d%s,?]? "
+
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"discarding."
+msgstr ""
+"Se o patch for aplicado corretamente, o pedaço editado será imediatamente "
+"marcado para descarte."
+
+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 - descartar este pedaço da árvore de trabalho\n"
+"n - não descartar este pedaço da árvore de trabalho\n"
+"q - sair; não descartar este pedaço nem nenhum dos restantes\n"
+"a - descartar este pedaço e todos os pedaços posteriores no arquivo\n"
+"d - não descartar este pedaço nem nenhum dos pedaços posteriores no arquivo\n"
+
+#, c-format
+msgid "Discard mode change from index and worktree%s [y,n,q,a,d%s,?]? "
+msgstr ""
+"Descartar alteração de modo do índice e da árvore de trabalho%s "
+"[y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Discard deletion from index and worktree%s [y,n,q,a,d%s,?]? "
+msgstr ""
+"Descartar exclusão do índice e da árvore de trabalho%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Discard addition from index and worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Descartar adição do índice e da árvore de trabalho%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Discard this hunk from index and worktree%s [y,n,q,a,d%s,?]? "
+msgstr ""
+"Descartar este pedaço do índice e da árvore de trabalho%s [y,n,q,a,d%s,?]? "
+
+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 - descartar este pedaço do índice e da árvore de trabalho\n"
+"n - não descartar este pedaço do índice e da árvore de trabalho\n"
+"q - sair; não descartar este pedaço nem nenhum dos restantes\n"
+"a - descartar este pedaço e todos os pedaços posteriores no arquivo\n"
+"d - não descartar este pedaço nem nenhum dos pedaços posteriores no arquivo\n"
+
+#, c-format
+msgid "Apply mode change to index and worktree%s [y,n,q,a,d%s,?]? "
+msgstr ""
+"Aplicar alteração de modo ao índice e à árvore de trabalho%s "
+"[y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Apply deletion to index and worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Aplicar exclusão ao índice e à árvore de trabalho%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Apply addition to index and worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Aplicar adição ao índice e à árvore de trabalho%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Apply this hunk to index and worktree%s [y,n,q,a,d%s,?]? "
+msgstr ""
+"Aplicar este pedaço ao índice e à árvore de trabalho%s [y,n,q,a,d%s,?]? "
+
+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 - aplicar este pedaço ao índice e à árvore de trabalho\n"
+"n - não aplicar este pedaço ao índice e à árvore de trabalho\n"
+"q - sair; não aplicar este pedaço nem nenhum dos restantes\n"
+"a - aplicar este pedaço e todos os pedaços posteriores no arquivo\n"
+"d - não aplicar este pedaço nem nenhum dos pedaços posteriores no arquivo\n"
+
+#, c-format
+msgid "Apply mode change to worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Aplicar alteração de modo à árvore de trabalho%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Apply deletion to worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Aplicar exclusão à árvore de trabalho%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Apply addition to worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Aplicar adição à árvore de trabalho%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Apply this hunk to worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Aplicar este pedaço à árvore de trabalho%s [y,n,q,a,d%s,?]? "
+
+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 - aplicar este pedaço à árvore de trabalho\n"
+"n - não aplicar este pedaço à árvore de trabalho\n"
+"q - sair; não aplicar este pedaço nem nenhum dos restantes\n"
+"a - aplicar este pedaço e todos os pedaços posteriores no arquivo\n"
+"d - não aplicar este pedaço nem nenhum dos pedaços posteriores no arquivo\n"
+
+#, c-format
+msgid "%s cannot be negative"
+msgstr "%s não pode ser negativo"
+
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "não foi possível analisar o cabeçalho do pedaço '%.*s'"
+
+msgid "could not parse diff"
+msgstr "não foi possível analisar o diff"
+
+msgid "could not parse colored diff"
+msgstr "não foi possível analisar o diff colorido"
+
+#, c-format
+msgid "failed to run '%s'"
+msgstr "falha ao executar '%s'"
+
+msgid "mismatched output from interactive.diffFilter"
+msgstr "saída incompatível de interactive.diffFilter"
+
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"Seu filtro deve manter uma correspondência um-para-um\n"
+"entre suas linhas de entrada e saída."
+
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"linha de contexto esperada #%d em\n"
+"%.*s"
+
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"pedaços não se sobrepõem:\n"
+"%.*s\n"
+"\tnão termina com:\n"
+"%.*s"
+
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr "Modo de edição manual de pedaços -- veja abaixo um guia rápido.\n"
+
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %s will be removed.\n"
+msgstr ""
+"---\n"
+"Para remover linhas '%c', transforme-as em linhas ' ' (contexto).\n"
+"Para remover linhas '%c', exclua-as.\n"
+"As linhas que começam com %s serão removidas.\n"
+
+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 ""
+"Se não for aplicado corretamente, você terá a oportunidade de\n"
+"editar novamente. Se todas as linhas do pedaço forem removidas, a edição\n"
+"será abortada e o pedaço permanecerá inalterado.\n"
+
+msgid "could not parse hunk header"
+msgstr "não foi possível analisar o cabeçalho do pedaço"
+
+msgid "'git apply --cached' failed"
+msgstr "'git apply --cached' falhou"
+
+#. 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.
+#.
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"Seu pedaço editado não se aplica. Editar novamente (dizer \"não\" descarta!) "
+"[y/n]? "
+
+msgid "The selected hunks do not apply to the index!"
+msgstr "Os pedaços selecionados não se aplicam ao índice!"
+
+msgid "Apply them to the worktree anyway? "
+msgstr "Aplicá-los à árvore de trabalho mesmo assim? "
+
+msgid "Nothing was applied.\n"
+msgstr "Nada foi aplicado.\n"
+
+#, c-format
+msgid ""
+"j - go to the next undecided hunk, roll over at the bottom\n"
+"J - go to the next hunk, roll over at the bottom\n"
+"k - go to the previous undecided hunk, roll over at the top\n"
+"K - go to the previous hunk, roll over at the top\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"
+"p - print the current hunk\n"
+"P - print the current hunk using the pager\n"
+"> - go to the next file, roll over at the bottom\n"
+"< - go to the previous file, roll over at the top\n"
+"? - print help\n"
+"HUNKS SUMMARY - Hunks: %d, USE: %d, SKIP: %d\n"
+msgstr ""
+"j - ir para o próximo pedaço indeciso, recomeçar do início ao atingir o "
+"final\n"
+"J - ir para o próximo pedaço, recomeçar do início ao atingir o final\n"
+"k - ir para o pedaço indeciso anterior, recomeçar do fim ao atingir o "
+"início\n"
+"K - ir para o pedaço anterior, recomeçar do fim ao atingir o início\n"
+"g - selecionar um pedaço para ir\n"
+"/ - procurar um pedaço que corresponda à regex fornecida\n"
+"s - dividir o pedaço atual em pedaços menores\n"
+"e - editar manualmente o pedaço atual\n"
+"p - exibir o pedaço atual\n"
+"P - exibir o pedaço atual usando o paginador\n"
+"> - ir para o próximo arquivo, recomeçar do início ao atingir o final\n"
+"< - ir para o arquivo anterior, recomeçar do fim ao atingir o início\n"
+"? - imprimir ajuda\n"
+"RESUMO DE PEDAÇOS - Pedaços: %d, USE: %d, SKIP: %d\n"
+
+msgid "'git apply' failed"
+msgstr "'git apply' falhou"
+
+msgid " (was: y)"
+msgstr " (era: y)"
+
+msgid " (was: n)"
+msgstr " (era: n)"
+
+#, c-format
+msgid "Only one letter is expected, got '%s'"
+msgstr "Apenas uma letra é esperada, obteve '%s'"
+
+msgid "No next file"
+msgstr "Nenhum próximo arquivo"
+
+msgid "No previous file"
+msgstr "Nenhum arquivo anterior"
+
+msgid "No other hunk"
+msgstr "Nenhum outro pedaço"
+
+msgid "No other undecided hunk"
+msgstr "Nenhum outro pedaço indeciso"
+
+msgid "No other hunks to goto"
+msgstr "Não há outros pedaços para ir"
+
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "ir para qual pedaço (<ret> para ver mais)? "
+
+msgid "go to which hunk? "
+msgstr "ir para qual pedaço? "
+
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Número inválido: '%s'"
+
+#, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+msgstr[0] "Desculpe, apenas %d pedaço disponível."
+msgstr[1] "Desculpe, apenas %d pedaços disponíveis."
+
+msgid "No other hunks to search"
+msgstr "Não há outros pedaços para pesquisar"
+
+msgid "search for regex? "
+msgstr "procurar por regex? "
+
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "Expressão regular de pesquisa malformada %s: %s"
+
+msgid "No hunk matches the given pattern"
+msgstr "Nenhum pedaço corresponde ao padrão fornecido"
+
+msgid "Sorry, cannot split this hunk"
+msgstr "Desculpe, não é possível dividir este pedaço"
+
+#, c-format
+msgid "Split into %d hunks."
+msgstr "Dividido em %d pedaços."
+
+msgid "Sorry, cannot edit this hunk"
+msgstr "Desculpe, não é possível editar este pedaço"
+
+#, c-format
+msgid "Unknown command '%s' (use '?' for help)"
+msgstr "Comando desconhecido '%s' (use '?' para obter ajuda)"
+
+msgid "No changes."
+msgstr "Sem alterações."
+
+msgid "Only binary files changed."
+msgstr "Apenas arquivos binários foram alterados."
+
+#, c-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Preparar alteração de modo [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Preparar exclusão [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Stage addition [y,n,q,a,d%s,?]? "
+msgstr "Preparar adição [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Preparar este pedaço [y,n,q,a,d%s,?]? "
+
+msgid "Revision does not refer to a commit"
+msgstr "A revisão não se refere a um commit"
+
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config set advice.%s false\""
+msgstr ""
+"\n"
+"Desative esta mensagem com \"git config set advice.%s false\""
+
+#, c-format
+msgid "%shint:%s%.*s%s\n"
+msgstr "%shint:%s%.*s%s\n"
+
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr ""
+"Não é possível fazer cherry-pick porque você tem arquivos não mesclados."
+
+msgid "Committing is not possible because you have unmerged files."
+msgstr "Não é possível fazer commit porque você tem arquivos não mesclados."
+
+msgid "Merging is not possible because you have unmerged files."
+msgstr "Não é possível fazer merge porque você tem arquivos não mesclados."
+
+msgid "Pulling is not possible because you have unmerged files."
+msgstr "Não é possível fazer pull porque você tem arquivos não mesclados."
+
+msgid "Reverting is not possible because you have unmerged files."
+msgstr "Não é possível reverter porque você tem arquivos não mesclados."
+
+msgid "Rebasing is not possible because you have unmerged files."
+msgstr "Não é possível fazer rebase porque você tem arquivos não mesclados."
+
+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 ""
+"Corrija-os na árvore de trabalho e use 'git add/rm <file>'\n"
+"conforme apropriado para marcar a resolução e fazer um commit."
+
+msgid "Exiting because of an unresolved conflict."
+msgstr "Saindo devido a um conflito não resolvido."
+
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr "Você não concluiu seu merge (MERGE_HEAD existe)."
+
+msgid "Please, commit your changes before merging."
+msgstr "Por favor, faça commit das suas alterações antes do merge."
+
+msgid "Exiting because of unfinished merge."
+msgstr "Saindo devido a um merge inacabado."
+
+msgid ""
+"Diverging branches can't be fast-forwarded, you need to either:\n"
+"\n"
+"\tgit merge --no-ff\n"
+"\n"
+"or:\n"
+"\n"
+"\tgit rebase\n"
+msgstr ""
+"Branches divergentes não podem receber fast-forward, você precisa de:\n"
+"\n"
+"\tgit merge --no-ff\n"
+"\n"
+"ou:\n"
+"\n"
+"\tgit rebase\n"
+
+msgid "Not possible to fast-forward, aborting."
+msgstr "Não é possível fazer fast-forward, abortando."
+
+#, c-format
+msgid ""
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
+msgstr ""
+"Os seguintes caminhos e/ou pathspecs correspondem a caminhos existentes\n"
+"fora da sua definição de sparse-checkout, portanto não serão\n"
+"atualizados no índice:\n"
+
+msgid ""
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
+msgstr ""
+"Se você pretende atualizar essas entradas, tente um dos seguintes:\n"
+"* Use a opção --sparse.\n"
+"* Desative ou modifique as regras de dispersão."
+
+#, 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 ""
+"Nota: alternando para '%s'.\n"
+"\n"
+"Você está no estado 'detached HEAD'. Você pode olhar ao redor, fazer "
+"alterações\n"
+"experimentais e fazer commit delas, e pode descartar qualquer commit que "
+"fizer neste\n"
+"estado sem afetar nenhum branch, bastando voltar para um branch.\n"
+"\n"
+"Se quiser criar um novo branch para reter os commits que criar, você pode\n"
+"fazê-lo (agora ou depois) usando -c com o comando switch. Exemplo:\n"
+"\n"
+"  git switch -c <new-branch-name>\n"
+"\n"
+"Ou desfaça esta operação com:\n"
+"\n"
+"  git switch -\n"
+"\n"
+"Desative este aviso definindo a variável de configuração advice.detachedHead "
+"como false\n"
+"\n"
+
+#, c-format
+msgid ""
+"The following paths have been moved outside the\n"
+"sparse-checkout definition but are not sparse due to local\n"
+"modifications.\n"
+msgstr ""
+"Os seguintes caminhos foram movidos para fora da\n"
+"definição de sparse-checkout, mas não são esparsos devido a\n"
+"modificações locais.\n"
+
+msgid ""
+"To correct the sparsity of these paths, do the following:\n"
+"* Use \"git add --sparse <paths>\" to update the index\n"
+"* Use \"git sparse-checkout reapply\" to apply the sparsity rules"
+msgstr ""
+"Para corrigir a esparsidade desses caminhos, faça o seguinte:\n"
+"* Use \"git add --sparse <paths>\" para atualizar o índice\n"
+"* Use \"git sparse-checkout reapply\" para aplicar as regras de esparsidade"
+
+msgid "cmdline ends with \\"
+msgstr "cmdline termina com \\"
+
+msgid "unclosed quote"
+msgstr "aspas não fechadas"
+
+msgid "too many arguments"
+msgstr "muitos argumentos"
+
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "opção de espaço em branco não reconhecida '%s'"
+
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "opção de ignorar espaço em branco não reconhecida '%s'"
+
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "as opções '%s' e '%s' não podem ser usadas juntas"
+
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' fora de um repositório"
+
+msgid "failed to read patch"
+msgstr "falha ao ler o patch"
+
+msgid "patch too large"
+msgstr "patch muito grande"
+
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "Não é possível preparar a regexp do carimbo de data/hora %s"
+
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec retornou %d para entrada: %s"
+
+#, c-format
+msgid "unable to find filename in patch at %s:%d"
+msgstr "não foi possível encontrar o nome do arquivo no patch em %s:%d"
+
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s at %s:%d"
+msgstr "git apply: git-diff inválido - esperado /dev/null, obteve %s em %s:%d"
+
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr ""
+"git apply: git-diff inválido - esperado /dev/null, obteve %s na linha %d"
+
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename at %s:%d"
+msgstr ""
+"git apply: git-diff inválido - novo nome de arquivo inconsistente em %s:%d"
+
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename at %s:%d"
+msgstr ""
+"git apply: git-diff inválido - nome de arquivo antigo inconsistente em %s:%d"
+
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr ""
+"git apply: git-diff inválido - novo nome de arquivo inconsistente na linha %d"
+
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr ""
+"git apply: git-diff inválido - nome de arquivo antigo inconsistente na linha "
+"%d"
+
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null at %s:%d"
+msgstr "git apply: git-diff inválido - esperado /dev/null em %s:%d"
+
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply: git-diff inválido - esperado /dev/null na linha %d"
+
+#, c-format
+msgid "invalid mode at %s:%d: %s"
+msgstr "modo inválido em %s:%d: %s"
+
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "modo inválido na linha %d: %s"
+
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr "linhas de cabeçalho inconsistentes %d e %d"
+
+#, c-format
+msgid ""
+"git diff header lacks filename information when removing %d leading pathname "
+"component at %s:%d"
+msgid_plural ""
+"git diff header lacks filename information when removing %d leading pathname "
+"components at %s:%d"
+msgstr[0] ""
+"o cabeçalho do git diff não contém informações de nome de arquivo ao remover "
+"%d componente inicial do caminho em %s:%d"
+msgstr[1] ""
+"o cabeçalho do git diff não contém informações de nome de arquivo ao remover "
+"%d componentes iniciais do caminho em %s:%d"
+
+#, 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] ""
+"o cabeçalho do git diff não contém informações de nome de arquivo ao remover "
+"%d componente inicial do caminho (linha %d)"
+msgstr[1] ""
+"o cabeçalho do git diff não contém informações de nome de arquivo ao remover "
+"%d componentes iniciais do caminho (linha %d)"
+
+#, c-format
+msgid "git diff header lacks filename information at %s:%d"
+msgstr ""
+"o cabeçalho do git diff não contém informações de nome de arquivo em %s:%d"
+
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr ""
+"o cabeçalho do git diff não contém informações de nome de arquivo (linha %d)"
+
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recontagem: linha inesperada: %.*s"
+
+#, c-format
+msgid "patch fragment without header at %s:%d: %.*s"
+msgstr "fragmento de patch sem cabeçalho em %s:%d: %.*s"
+
+msgid "new file depends on old contents"
+msgstr "novo arquivo depende do conteúdo antigo"
+
+msgid "deleted file still has contents"
+msgstr "arquivo excluído ainda tem conteúdo"
+
+#, c-format
+msgid "corrupt patch at %s:%d"
+msgstr "patch corrompido em %s:%d"
+
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "o novo arquivo %s depende do conteúdo antigo"
+
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "o arquivo excluído %s ainda tem conteúdo"
+
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** aviso: o arquivo %s fica vazio, mas não é excluído"
+
+#, c-format
+msgid "corrupt binary patch at %s:%d: %.*s"
+msgstr "patch binário corrompido em %s:%d: %.*s"
+
+#, c-format
+msgid "unrecognized binary patch at %s:%d"
+msgstr "patch binário não reconhecido em %s:%d"
+
+#, c-format
+msgid "patch with only garbage at %s:%d"
+msgstr "patch com apenas lixo em %s:%d"
+
+#, c-format
+msgid "unable to read symlink %s"
+msgstr "não foi possível ler o link simbólico %s"
+
+#, c-format
+msgid "unable to open or read %s"
+msgstr "não foi possível abrir ou ler %s"
+
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "início de linha inválido: '%c'"
+
+#, c-format
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgstr[0] "Pedaço #%d aplicado com sucesso em %d (deslocamento de %d linha)."
+msgstr[1] "Pedaço #%d aplicado com sucesso em %d (deslocamento de %d linhas)."
+
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "Contexto reduzido para (%ld/%ld) para aplicar fragmento em %d"
+
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+"enquanto procura por:\n"
+"%.*s"
+
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr "faltando dados de patch binário para '%s'"
+
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
+msgstr ""
+"não é possível aplicar um patch binário de forma reversa sem o pedaço "
+"reverso em '%s'"
+
+#, c-format
+msgid "cannot apply binary patch to '%s' without full index line"
+msgstr ""
+"não é possível aplicar patch binário a '%s' sem linha de índice completa"
+
+#, c-format
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr "o patch se aplica a '%s' (%s), que não corresponde ao conteúdo atual."
+
+#, c-format
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr "o patch se aplica a um '%s' vazio, mas não está vazio"
+
+#, c-format
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "a pós-imagem necessária %s para '%s' não pode ser lida"
+
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr "patch binário não se aplica a '%s'"
+
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr ""
+"patch binário para '%s' cria resultado incorreto (esperava %s, obteve %s)"
+
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "falha no patch: %s:%ld"
+
+#, c-format
+msgid "cannot checkout %s"
+msgstr "não é possível fazer checkout de %s"
+
+#, c-format
+msgid "failed to read %s"
+msgstr "falha ao ler %s"
+
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "lendo de '%s' além de um link simbólico"
+
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr "caminho %s foi renomeado/excluído"
+
+#, c-format
+msgid "%s: does not exist in index"
+msgstr "%s: não existe no índice"
+
+#, c-format
+msgid "%s: does not match index"
+msgstr "%s: não corresponde ao índice"
+
+msgid "repository lacks the necessary blob to perform 3-way merge."
+msgstr ""
+"o repositório não possui o blob necessário para realizar o merge de 3 vias."
+
+#, c-format
+msgid "Performing three-way merge...\n"
+msgstr "Executando o merge de 3 vias...\n"
+
+#, c-format
+msgid "cannot read the current contents of '%s'"
+msgstr "não é possível ler o conteúdo atual de '%s'"
+
+#, c-format
+msgid "Failed to perform three-way merge...\n"
+msgstr "Falha ao realizar o merge de 3 vias...\n"
+
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "Aplicado patch em '%s' com conflitos.\n"
+
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "Patch aplicado a '%s' com sucesso.\n"
+
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr "Voltando à aplicação direta...\n"
+
+msgid "removal patch leaves file contents"
+msgstr "patch de remoção deixa o conteúdo do arquivo"
+
+#, c-format
+msgid "%s: wrong type"
+msgstr "%s: tipo errado"
+
+#, c-format
+msgid "%s has type %o, expected %o"
+msgstr "%s tem tipo %o, esperado %o"
+
+#, c-format
+msgid "invalid path '%s'"
+msgstr "caminho inválido '%s'"
+
+#, c-format
+msgid "%s: already exists in index"
+msgstr "%s: já existe no índice"
+
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr "%s: já existe no diretório de trabalho"
+
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr "o novo modo (%o) de %s não corresponde ao modo antigo (%o)"
+
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+msgstr "o novo modo (%o) de %s não corresponde ao modo antigo (%o) de %s"
+
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "o arquivo afetado '%s' está além de um link simbólico"
+
+#, c-format
+msgid "%s: patch does not apply"
+msgstr "%s: patch não se aplica"
+
+#, c-format
+msgid "Checking patch %s..."
+msgstr "Verificando patch %s..."
+
+#, c-format
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "informações sha1 estão faltando ou são inúteis para o submódulo %s"
+
+#, c-format
+msgid "mode change for %s, which is not in current HEAD"
+msgstr "alteração de modo para %s, que não está no HEAD atual"
+
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "informações sha1 estão faltando ou são inúteis (%s)."
+
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr "não foi possível adicionar %s ao índice temporário"
+
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr "não foi possível gravar o índice temporário em %s"
+
+#, c-format
+msgid "unable to remove %s from index"
+msgstr "não foi possível remover %s do índice"
+
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr "patch corrompido para o submódulo %s"
+
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "não foi possível executar stat no arquivo recém-criado '%s'"
+
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr ""
+"não foi possível criar um armazenamento de apoio para o arquivo recém-criado "
+"%s"
+
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr "não foi possível adicionar entrada de cache para %s"
+
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "falha ao gravar em '%s'"
+
+#, c-format
+msgid "closing file '%s'"
+msgstr "fechando arquivo '%s'"
+
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "não foi possível gravar o arquivo '%s' no modo %o"
+
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "Patch %s aplicado com sucesso."
+
+msgid "internal error"
+msgstr "erro interno"
+
+#, c-format
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] "Aplicando patch %%s com %d rejeição..."
+msgstr[1] "Aplicando patch %%s com %d rejeições..."
+
+#, c-format
+msgid "cannot open %s"
+msgstr "não é possível abrir %s"
+
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "não é possível desvincular '%s'"
+
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "Pedaço #%d aplicado com sucesso."
+
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr "Pedaço #%d rejeitado."
+
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "Patch '%s' ignorado."
+
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "Nenhum patch válido na entrada (permitir com \"--allow-empty\")"
+
+msgid "unable to read index file"
+msgstr "não foi possível ler o arquivo de índice"
+
+#, c-format
+msgid "option -p expects a non-negative integer, got '%s'"
+msgstr "a opção -p espera um inteiro não negativo, mas recebeu '%s'"
+
+#, c-format
+msgid "unable to normalize directory: '%s'"
+msgstr "não foi possível normalizar o diretório: '%s'"
+
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr "não foi possível abrir o patch '%s': %s"
+
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "suprimido %d erro de espaço em branco"
+msgstr[1] "suprimidos %d erros de espaço em branco"
+
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d linha adiciona erros de espaço em branco."
+msgstr[1] "%d linhas adicionam erros de espaço em branco."
+
+#, c-format
+msgid "%d line applied after fixing whitespace errors."
+msgid_plural "%d lines applied after fixing whitespace errors."
+msgstr[0] "%d linha aplicada após corrigir erros de espaço em branco."
+msgstr[1] "%d linhas aplicadas após corrigir erros de espaço em branco."
+
+msgid "Unable to write new index file"
+msgstr "Não foi possível gravar o novo arquivo de índice"
+
+msgid "don't apply changes matching the given path"
+msgstr "não aplicar alterações que correspondam ao caminho fornecido"
+
+msgid "apply changes matching the given path"
+msgstr "aplicar alterações que correspondam ao caminho fornecido"
+
+msgid "num"
+msgstr "num"
+
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "remover <num> barras iniciais dos caminhos de diff tradicionais"
+
+msgid "ignore additions made by the patch"
+msgstr "ignorar adições feitas pelo patch"
+
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr "em vez de aplicar o patch, exibir o diffstat para a entrada"
+
+msgid "show number of added and deleted lines in decimal notation"
+msgstr "mostrar o número de linhas adicionadas e excluídas em notação decimal"
+
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "em vez de aplicar o patch, exibir um resumo para a entrada"
+
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr "em vez de aplicar o patch, verificar se o patch é aplicável"
+
+msgid "make sure the patch is applicable to the current index"
+msgstr "garantir que o patch seja aplicável ao índice atual"
+
+msgid "mark new files with `git add --intent-to-add`"
+msgstr "marcar novos arquivos com `git add --intent-to-add`"
+
+msgid "apply a patch without touching the working tree"
+msgstr "aplicar um patch sem modificar a árvore de trabalho"
+
+msgid "accept a patch that touches outside the working area"
+msgstr "aceitar um patch que modifica fora da área de trabalho"
+
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "também aplicar o patch (usar com --stat/--summary/--check)"
+
+msgid "attempt three-way merge, fall back on normal patch if that fails"
+msgstr "tentar merge de três vias, usar o patch normal se isso falhar"
+
+msgid "for conflicts, use our version"
+msgstr "para conflitos, usar nossa versão"
+
+msgid "for conflicts, use their version"
+msgstr "para conflitos, usar a versão deles"
+
+msgid "for conflicts, use a union version"
+msgstr "para conflitos, usar uma versão união"
+
+msgid "build a temporary index based on embedded index information"
+msgstr ""
+"construir um índice temporário baseado nas informações de índice embutidas"
+
+msgid "paths are separated with NUL character"
+msgstr "caminhos são separados pelo caractere NUL"
+
+msgid "ensure at least <n> lines of context match"
+msgstr "garantir que pelo menos <n> linhas de contexto correspondam"
+
+msgid "action"
+msgstr "ação"
+
+msgid "detect new or modified lines that have whitespace errors"
+msgstr ""
+"detectar linhas novas ou modificadas que possuam erros de espaço em branco"
+
+msgid "ignore changes in whitespace when finding context"
+msgstr "ignorar alterações em espaço em branco ao localizar contexto"
+
+msgid "apply the patch in reverse"
+msgstr "aplicar o patch na ordem inversa"
+
+msgid "don't expect at least one line of context"
+msgstr "não exigir ao menos uma linha de contexto"
+
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "deixar os pedaços rejeitados nos arquivos *.rej correspondentes"
+
+msgid "allow overlapping hunks"
+msgstr "permitir pedaços sobrepostos"
+
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr "tolerar detecção incorreta de nova linha ausente no final do arquivo"
+
+msgid "do not trust the line counts in the hunk headers"
+msgstr "não confiar na contagem de linhas nos cabeçalhos de pedaço"
+
+msgid "root"
+msgstr "root"
+
+msgid "prepend <root> to all filenames"
+msgstr "prefixar <root> a todos os nomes de arquivo"
+
+msgid "don't return error for empty patches"
+msgstr "não retornar erro para patches vazios"
+
+msgid "--ours, --theirs, and --union require --3way"
+msgstr "--ours, --theirs e --union requerem --3way"
+
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "não é possível transmitir o blob %s"
+
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "modo de arquivo não suportado: 0%o (SHA1: %s)"
+
+#, c-format
+msgid "deflate error (%d)"
+msgstr "erro de deflate (%d)"
+
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "não foi possível iniciar o filtro '%s'"
+
+msgid "unable to redirect descriptor"
+msgstr "não foi possível redirecionar o descritor"
+
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "o filtro '%s' relatou um erro"
+
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "o caminho não é UTF-8 válido: %s"
+
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr "caminho muito longo (%d caracteres, SHA1: %s): %s"
+
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "timestamp muito grande para este sistema: %<PRIuMAX>"
+
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<options>] <tree-ish> [<path>...]"
+
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <repo> [--exec <cmd>] --list"
+
+#, c-format
+msgid "cannot read '%s'"
+msgstr "não é possível ler '%s'"
+
+#, c-format
+msgid "pathspec '%s' matches files outside the current directory"
+msgstr "o pathspec '%s' corresponde a arquivos fora do diretório atual"
+
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "o pathspec '%s' não corresponde a nenhum arquivo"
+
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "referência inexistente: %.*s"
+
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "não é um nome de objeto válido: %s"
+
+#, c-format
+msgid "not a tree object: %s"
+msgstr "não é um objeto tree: %s"
+
+#, c-format
+msgid "failed to unpack tree object %s"
+msgstr "falha ao descompactar o objeto tree %s"
+
+#, c-format
+msgid "File not found: %s"
+msgstr "Arquivo não encontrado: %s"
+
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "Não é um arquivo regular: %s"
+
+#, c-format
+msgid "unclosed quote: '%s'"
+msgstr "aspas não fechadas: '%s'"
+
+#, c-format
+msgid "missing colon: '%s'"
+msgstr "dois-pontos ausente: '%s'"
+
+#, c-format
+msgid "empty file name: '%s'"
+msgstr "nome de arquivo vazio: '%s'"
+
+msgid "fmt"
+msgstr "formato"
+
+msgid "archive format"
+msgstr "formato do arquivo compactado"
+
+msgid "prefix"
+msgstr "prefixo"
+
+msgid "prepend prefix to each pathname in the archive"
+msgstr "prefixar cada caminho no arquivo compactado com o prefixo"
+
+msgid "file"
+msgstr "arquivo"
+
+msgid "add untracked file to archive"
+msgstr "adicionar arquivo não rastreado ao arquivo compactado"
+
+msgid "path:content"
+msgstr "caminho:conteúdo"
+
+msgid "write the archive to this file"
+msgstr "escrever o arquivo compactado neste arquivo"
+
+msgid "read .gitattributes in working directory"
+msgstr "ler .gitattributes no diretório de trabalho"
+
+msgid "report archived files on stderr"
+msgstr "reportar arquivos arquivados na stderr"
+
+msgid "time"
+msgstr "tempo"
+
+msgid "set modification time of archive entries"
+msgstr "definir o tempo de modificação das entradas do arquivo compactado"
+
+msgid "set compression level"
+msgstr "definir o nível de compressão"
+
+msgid "list supported archive formats"
+msgstr "listar os formatos de arquivo compactado suportados"
+
+msgid "repo"
+msgstr "repositório"
+
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "recuperar o arquivo compactado do repositório remoto <repo>"
+
+msgid "command"
+msgstr "comando"
+
+msgid "path to the remote git-upload-archive command"
+msgstr "caminho para o comando remoto git-upload-archive"
+
+msgid "Unexpected option --remote"
+msgstr "Opção inesperada --remote"
+
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "a opção '%s' requer '%s'"
+
+msgid "Unexpected option --output"
+msgstr "Opção inesperada --output"
+
+#, c-format
+msgid "extra command line parameter '%s'"
+msgstr "parâmetro de linha de comando extra '%s'"
+
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Formato de arquivo compactado desconhecido '%s'"
+
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argumento não suportado para o formato '%s': -%d"
+
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%.*s não é um nome de atributo válido"
+
+msgid "unable to add additional attribute"
+msgstr "não foi possível adicionar atributo adicional"
+
+#, c-format
+msgid "ignoring overly long attributes line %d"
+msgstr "ignorando linha de atributos excessivamente longa %d"
+
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "%s não permitido: %s:%d"
+
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+"Padrões negativos são ignorados nos atributos do git\n"
+"Use '\\!' para um ponto de exclamação literal no início."
+
+#, c-format
+msgid "cannot fstat gitattributes file '%s'"
+msgstr "não foi possível executar fstat no arquivo gitattributes '%s'"
+
+#, c-format
+msgid "ignoring overly large gitattributes file '%s'"
+msgstr "ignorando arquivo gitattributes excessivamente grande '%s'"
+
+#, c-format
+msgid "ignoring overly large gitattributes blob '%s'"
+msgstr "ignorando blob gitattributes excessivamente grande '%s'"
+
+msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo"
+msgstr ""
+"não é possível usar --attr-source ou GIT_ATTR_SOURCE sem um repositório"
+
+msgid "bad --attr-source or GIT_ATTR_SOURCE"
+msgstr "--attr-source ou GIT_ATTR_SOURCE inválido"
+
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "não foi possível executar stat em '%s'"
+
+#, c-format
+msgid "unable to read %s"
+msgstr "não foi possível ler %s"
+
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "Conteúdo com aspas incorretas no arquivo '%s': %s"
+
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "Não é possível fazer mais bisect!\n"
+
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "Nome de commit inválido %s"
+
+#, c-format
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+"O merge base %s é ruim.\n"
+"Isso significa que o bug foi corrigido entre %s e [%s].\n"
+
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"O merge base %s é novo.\n"
+"A propriedade foi alterada entre %s e [%s].\n"
+
+#, c-format
+msgid ""
+"The merge base %s is '%s'.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"O merge base %s é '%s'.\n"
+"Isso significa que o primeiro commit '%s' está entre %s e [%s].\n"
+
+#, 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 ""
+"Algumas revisões '%s' não são ancestrais da revisão '%s'.\n"
+"O git bisect não pode funcionar corretamente neste caso.\n"
+"Talvez você tenha confundido as revisões '%s' e '%s'?\n"
+
+#, 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 ""
+"o merge base entre %s e [%s] deve ser ignorado.\n"
+"Portanto, não podemos ter certeza de que o primeiro commit '%s' está entre "
+"%s e %s.\n"
+"Continuamos mesmo assim."
+
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "Bisecting: um merge base deve ser testado\n"
+
+#, c-format
+msgid "a '%s' revision is needed"
+msgstr "é necessária uma revisão '%s'"
+
+#, c-format
+msgid "could not create file '%s'"
+msgstr "não foi possível criar o arquivo '%s'"
+
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr "não foi possível iniciar 'show' para o objeto '%s'"
+
+#, c-format
+msgid "could not read file '%s'"
+msgstr "não foi possível ler o arquivo '%s'"
+
+#, c-format
+msgid "could not read bad term from file '%s'"
+msgstr "não foi possível ler o termo 'bad' do arquivo '%s'"
+
+#, c-format
+msgid "could not read good term from file '%s'"
+msgstr "não foi possível ler o termo 'good' do arquivo '%s'"
+
+msgid "reading bisect refs failed"
+msgstr "falha ao ler as refs de bisect"
+
+#, c-format
+msgid "%s was both '%s' and '%s'\n"
+msgstr "%s era ao mesmo tempo '%s' e '%s'\n"
+
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path arguments?\n"
+msgstr ""
+"Nenhum commit testável encontrado.\n"
+"Talvez você tenha iniciado com argumentos de caminho inválidos?\n"
+
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(aproximadamente %d passo)"
+msgstr[1] "(aproximadamente %d passos)"
+
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
+#, 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] "Bisecting: %d revisão restante para testar após este %s\n"
+msgstr[1] "Bisecting: %d revisões restantes para testar após este %s\n"
+
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents e --reverse não funcionam bem juntos."
+
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"--reverse e --first-parent juntos requerem que o commit mais recente seja "
+"especificado"
+
+msgid "revision walk setup failed"
+msgstr "falha na configuração da caminhada de revisão"
+
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+"--reverse --first-parent juntos requerem um intervalo ao longo da cadeia "
+"first-parent"
+
+#, c-format
+msgid "no such path %s in %s"
+msgstr "nenhum caminho %s em %s"
+
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "não foi possível ler o blob %s para o caminho %s"
+
+msgid ""
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
+msgstr ""
+"não é possível herdar a configuração de rastreamento upstream de múltiplas "
+"refs quando o rebase é solicitado"
+
+#, c-format
+msgid "not setting branch '%s' as its own upstream"
+msgstr "não configurando o branch '%s' como seu próprio upstream"
+
+#, c-format
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "branch '%s' configurado para rastrear '%s' por rebase."
+
+#, c-format
+msgid "branch '%s' set up to track '%s'."
+msgstr "branch '%s' configurado para rastrear '%s'."
+
+#, c-format
+msgid "branch '%s' set up to track:"
+msgstr "branch '%s' configurado para rastrear:"
+
+msgid "unable to write upstream branch configuration"
+msgstr "não foi possível gravar a configuração do branch upstream"
+
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
+msgstr ""
+"\n"
+"Após corrigir a causa do erro, você pode tentar corrigir\n"
+"as informações de rastreamento do remoto invocando:"
+
+#, c-format
+msgid "asked to inherit tracking from '%s', but no remote is set"
+msgstr ""
+"solicitado para herdar rastreamento de '%s', mas nenhum remoto está definido"
+
+#, c-format
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
+msgstr ""
+"solicitado para herdar rastreamento de '%s', mas nenhuma configuração de "
+"merge está definida"
+
+#, c-format
+msgid "not tracking: ambiguous information for ref '%s'"
+msgstr "sem rastreamento: informação ambígua para o ref '%s'"
+
+#. #-#-#-#-#  branch.c.po  #-#-#-#-#
+#. TRANSLATORS: This is a line listing a remote with duplicate
+#. refspecs in the advice message below. For RTL languages you'll
+#. probably want to swap the "%s" and leading "  " space around.
+#.
+#. #-#-#-#-#  object-name.c.po  #-#-#-#-#
+#. TRANSLATORS: This is line item of ambiguous object output
+#. from describe_ambiguous_object() above. For RTL languages
+#. you'll probably want to swap the "%s" and leading " " space
+#. around.
+#.
+#, c-format
+msgid "  %s\n"
+msgstr "  %s\n"
+
+#. TRANSLATORS: The second argument is a \n-delimited list of
+#. duplicate refspecs, composed above.
+#.
+#, c-format
+msgid ""
+"There are multiple remotes whose fetch refspecs map to the remote\n"
+"tracking ref '%s':\n"
+"%s\n"
+"This is typically a configuration error.\n"
+"\n"
+"To support setting up tracking branches, ensure that\n"
+"different remotes' fetch refspecs map into different\n"
+"tracking namespaces."
+msgstr ""
+"Existem múltiplos remotos cujos refspecs de fetch mapeiam para o ref\n"
+"de rastreamento remoto '%s':\n"
+"%s\n"
+"Isso é tipicamente um erro de configuração.\n"
+"\n"
+"Para permitir a configuração de branches de rastreamento, certifique-se de "
+"que\n"
+"os refspecs de fetch de remotos diferentes mapeiem para\n"
+"namespaces de rastreamento diferentes."
+
+#, c-format
+msgid "'%s' is not a valid branch name"
+msgstr "'%s' não é um nome de branch válido"
+
+msgid "See 'git help check-ref-format'"
+msgstr "Consulte 'git help check-ref-format'"
+
+#, c-format
+msgid "a branch named '%s' already exists"
+msgstr "já existe um branch chamado '%s'"
+
+#, c-format
+msgid "cannot force update the branch '%s' used by worktree at '%s'"
+msgstr ""
+"não é possível forçar a atualização do branch '%s' utilizado pelo worktree "
+"em '%s'"
+
+#, c-format
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr ""
+"não é possível configurar informações de rastreamento; o ponto de partida "
+"'%s' não é um branch"
+
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "o branch upstream solicitado '%s' não existe"
+
+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"
+"Se você planeja basear seu trabalho em um branch upstream\n"
+"que já existe no remoto, pode ser necessário executar\n"
+"\"git fetch\" para recuperá-lo.\n"
+"\n"
+"Se você planeja enviar um novo branch local que\n"
+"rastreará sua contraparte remota, você pode usar\n"
+"\"git push -u\" para definir a configuração de upstream ao fazer o push."
+
+#, c-format
+msgid "not a valid object name: '%s'"
+msgstr "não é um nome de objeto válido: '%s'"
+
+#, c-format
+msgid "ambiguous object name: '%s'"
+msgstr "nome de objeto ambíguo: '%s'"
+
+#, c-format
+msgid "not a valid branch point: '%s'"
+msgstr "não é um ponto de partida válido para branch: '%s'"
+
+#, c-format
+msgid "submodule '%s': unable to find submodule"
+msgstr "submódulo '%s': não foi possível encontrar o submódulo"
+
+#, c-format
+msgid ""
+"You may try updating the submodules using 'git checkout --no-recurse-"
+"submodules %s && git submodule update --init'"
+msgstr ""
+"Você pode tentar atualizar os submódulos usando 'git checkout --no-recurse-"
+"submodules %s && git submodule update --init'"
+
+#, c-format
+msgid "submodule '%s': cannot create branch '%s'"
+msgstr "submódulo '%s': não é possível criar o branch '%s'"
+
+#, c-format
+msgid "'%s' is already used by worktree at '%s'"
+msgstr "'%s' já está sendo utilizado pelo worktree em '%s'"
+
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<options>] [--] <pathspec>..."
+
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "não foi possível executar chmod %cx '%s'"
+
+msgid "Unstaged changes after refreshing the index:"
+msgstr "Alterações não preparadas após atualizar o índice:"
+
+msgid "could not read the index"
+msgstr "não foi possível ler o índice"
+
+msgid "editing patch failed"
+msgstr "falha ao editar o patch"
+
+#, c-format
+msgid "could not stat '%s'"
+msgstr "não foi possível obter o status de '%s'"
+
+msgid "empty patch. aborted"
+msgstr "patch vazio. operação cancelada"
+
+msgid "could not initialize apply state"
+msgstr "não foi possível inicializar o estado do apply"
+
+msgid "could not check apply state"
+msgstr "não foi possível verificar o estado do apply"
+
+#, c-format
+msgid "could not apply '%s'"
+msgstr "não foi possível aplicar '%s'"
+
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr ""
+"Os seguintes caminhos são ignorados por um dos seus arquivos .gitignore:\n"
+
+msgid "dry run"
+msgstr "simulação"
+
+msgid "be verbose"
+msgstr "ser verboso"
+
+msgid "interactive picking"
+msgstr "seleção interativa"
+
+msgid "select hunks interactively"
+msgstr "selecionar pedaços interativamente"
+
+msgid "auto advance to the next file when selecting hunks interactively"
+msgstr ""
+"avançar automaticamente para o próximo arquivo ao selecionar pedaços "
+"interativamente"
+
+msgid "edit current diff and apply"
+msgstr "editar o diff atual e aplicar"
+
+msgid "allow adding otherwise ignored files"
+msgstr "permitir a adição de arquivos que seriam ignorados"
+
+msgid "update tracked files"
+msgstr "atualizar arquivos rastreados"
+
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr "renormalizar EOL dos arquivos rastreados (implica -u)"
+
+msgid "add conflict-resolved tracked files"
+msgstr "adicionar arquivos rastreados com conflitos resolvidos"
+
+msgid "record only the fact that the path will be added later"
+msgstr ""
+"registrar apenas o fato de que o caminho será adicionado posteriormente"
+
+msgid "add changes from all tracked and untracked files"
+msgstr "adicionar alterações de todos os arquivos rastreados e não rastreados"
+
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr ""
+"ignorar caminhos removidos na árvore de trabalho (o mesmo que --no-all)"
+
+msgid "don't add, only refresh the index"
+msgstr "não adicionar, apenas atualizar o índice"
+
+msgid "just skip files which cannot be added because of errors"
+msgstr ""
+"apenas ignorar arquivos que não podem ser adicionados por causa de erros"
+
+msgid "check if - even missing - files are ignored in dry run"
+msgstr ""
+"verificar se arquivos — mesmo ausentes — são ignorados em modo de simulação"
+
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "permitir a atualização de entradas fora do cone do sparse-checkout"
+
+msgid "override the executable bit of the listed files"
+msgstr "substituir o bit executável dos arquivos listados"
+
+msgid "warn when adding an embedded repository"
+msgstr "avisar ao adicionar um repositório incorporado"
+
+#, 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 ""
+"Você adicionou outro repositório git dentro do seu repositório atual.\n"
+"Clones do repositório externo não conterão o conteúdo do\n"
+"repositório incorporado e não saberão como obtê-lo.\n"
+"Se você pretendia adicionar um submódulo, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"Se você adicionou este caminho por engano, você pode removê-lo do\n"
+"índice com:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"Consulte \"git help submodule\" para mais informações."
+
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr "adicionando repositório git incorporado: %s"
+
+msgid "Use -f if you really want to add them."
+msgstr "Use -f se você realmente quiser adicioná-los."
+
+msgid "adding files failed"
+msgstr "falha ao adicionar arquivos"
+
+#, c-format
+msgid "updating file '%s' failed"
+msgstr "falha ao atualizar o arquivo '%s'"
+
+#, c-format
+msgid ""
+"the following paths still have conflict markers:\n"
+"%s"
+msgstr ""
+"os seguintes caminhos ainda possuem marcadores de conflito:\n"
+"%s"
+
+#, c-format
+msgid "cannot lstat: '%s'"
+msgstr "não é possível executar lstat em: '%s'"
+
+#, c-format
+msgid "'%s' cannot be negative"
+msgstr "'%s' não pode ser negativo"
+
+#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "o parâmetro --chmod '%s' deve ser -x ou +x"
+
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "Os argumentos '%s' e pathspec não podem ser usados juntos"
+
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr "Nada especificado, nada adicionado.\n"
+
+msgid "Maybe you wanted to say 'git add .'?"
+msgstr "Talvez você quisesse dizer 'git add .'?"
+
+msgid "index file corrupt"
+msgstr "arquivo de índice corrompido"
+
+msgid "unable to write new index file"
+msgstr "não foi possível gravar o novo arquivo de índice"
+
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "ação inválida '%s' para '%s'"
+
+#, c-format
+msgid "invalid value for '%s': '%s'"
+msgstr "valor inválido para '%s': '%s'"
+
+#, c-format
+msgid "could not read '%s'"
+msgstr "não foi possível ler '%s'"
+
+msgid "could not parse author script"
+msgstr "não foi possível analisar o script de autor"
+
+#, c-format
+msgid "could not parse %s"
+msgstr "não foi possível analisar %s"
+
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "'%s' foi excluído pelo hook applypatch-msg"
+
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr "Linha de entrada malformada: '%s'."
+
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "Falha ao copiar notas de '%s' para '%s'"
+
+msgid "fseek failed"
+msgstr "fseek falhou"
+
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "não foi possível abrir '%s' para leitura"
+
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "não foi possível abrir '%s' para gravação"
+
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr "não foi possível analisar o patch '%s'"
+
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "Apenas uma série de patches StGIT pode ser aplicada por vez"
+
+msgid "invalid timestamp"
+msgstr "timestamp inválido"
+
+msgid "invalid Date line"
+msgstr "linha Date inválida"
+
+msgid "invalid timezone offset"
+msgstr "deslocamento de fuso horário inválido"
+
+msgid "Patch format detection failed."
+msgstr "Falha na detecção do formato do patch."
+
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr "falha ao criar o diretório '%s'"
+
+msgid "Failed to split patches."
+msgstr "Falha ao dividir patches."
+
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\".\n"
+msgstr ""
+"Quando você tiver resolvido este problema, execute \"%s --continue\".\n"
+
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead.\n"
+msgstr "Se você preferir pular este patch, execute \"%s --skip\".\n"
+
+#, c-format
+msgid ""
+"To record the empty patch as an empty commit, run \"%s --allow-empty\".\n"
+msgstr ""
+"Para registrar o patch vazio como um commit vazio, execute \"%s --allow-"
+"empty\".\n"
+
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr ""
+"Para restaurar o branch original e interromper a aplicação de patches, "
+"execute \"%s --abort\"."
+
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+msgstr ""
+"Patch enviado com format=flowed; espaços no final das linhas podem ter sido "
+"perdidos."
+
+#, c-format
+msgid "missing author line in commit %s"
+msgstr "linha de autor ausente no commit %s"
+
+#, c-format
+msgid "invalid ident line: %.*s"
+msgstr "linha de identificação inválida: %.*s"
+
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "não foi possível analisar o commit %s"
+
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr ""
+"O repositório não possui os blobs necessários para recorrer ao merge de 3 "
+"vias."
+
+msgid "Using index info to reconstruct a base tree..."
+msgstr "Usando informações do índice para reconstruir uma árvore base..."
+
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"Você editou seu patch manualmente?\n"
+"Ele não se aplica aos blobs registrados em seu índice."
+
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "Recorrendo à aplicação de patch na base e merge de 3 vias..."
+
+msgid "Failed to merge in the changes."
+msgstr "Falha ao fazer merge das alterações."
+
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree falhou ao gravar uma tree"
+
+msgid "applying to an empty history"
+msgstr "aplicando a um histórico vazio"
+
+msgid "failed to write commit object"
+msgstr "falha ao gravar o objeto de commit"
+
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr "não é possível retomar: %s não existe."
+
+msgid "Commit Body is:"
+msgstr "O corpo do commit é:"
+
+#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
+#. in your translation. The program will only accept English
+#. input at this point.
+#.
+#, c-format
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr "Aplicar? [y]sim/[n]ão/[e]ditar/[v]isualizar patch/[a]ceitar todos: "
+
+msgid "unable to write index file"
+msgstr "não foi possível gravar o arquivo de índice"
+
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "Índice sujo: não é possível aplicar patches (sujo: %s)"
+
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Ignorando: %.*s"
+
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "Criando um commit vazio: %.*s"
+
+msgid "Patch is empty."
+msgstr "O patch está vazio."
+
+#, c-format
+msgid "Applying: %.*s"
+msgstr "Aplicando: %.*s"
+
+msgid "No changes -- Patch already applied."
+msgstr "Sem alterações -- Patch já aplicado."
+
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr "Falha no patch em %s %.*s"
+
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
+msgstr "Use 'git am --show-current-patch=diff' para ver o patch com falha"
+
+msgid "No changes - recorded it as an empty commit."
+msgstr "Sem alterações - registrado como um commit vazio."
+
+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 ""
+"Sem alterações - você esqueceu de usar 'git add'?\n"
+"Se não há mais nada para preparar, é provável que outra coisa\n"
+"já tenha introduzido as mesmas alterações; você pode querer ignorar este "
+"patch."
+
+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 ""
+"Você ainda tem caminhos não mesclados no seu índice.\n"
+"Você deve executar 'git add' em cada arquivo com conflitos resolvidos para "
+"marcá-los como tal.\n"
+"Você pode executar `git rm` em um arquivo para aceitar \"excluído por eles\" "
+"para ele."
+
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr "Não foi possível analisar o objeto '%s'."
+
+msgid "failed to clean index"
+msgstr "falha ao limpar o índice"
+
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+"Parece que você moveu o HEAD desde a última falha do 'am'.\n"
+"Não rebobinando para ORIG_HEAD"
+
+#, c-format
+msgid "failed to read '%s'"
+msgstr "falha ao ler '%s'"
+
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
+
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<options>] (--continue | --skip | --abort)"
+
+msgid "run interactively"
+msgstr "executar interativamente"
+
+msgid "bypass pre-applypatch and applypatch-msg hooks"
+msgstr "ignorar os hooks pre-applypatch e applypatch-msg"
+
+msgid "historical option -- no-op"
+msgstr "opção histórica -- sem efeito"
+
+msgid "allow fall back on 3way merging if needed"
+msgstr "permitir recorrer ao merge de 3 vias se necessário"
+
+msgid "be quiet"
+msgstr "ser silencioso"
+
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr "adicionar um trailer Signed-off-by à mensagem do commit"
+
+msgid "recode into utf8 (default)"
+msgstr "recodificar para utf8 (padrão)"
+
+msgid "pass -k flag to git-mailinfo"
+msgstr "passar o sinalizador -k ao git-mailinfo"
+
+msgid "pass -b flag to git-mailinfo"
+msgstr "passar o sinalizador -b ao git-mailinfo"
+
+msgid "pass -m flag to git-mailinfo"
+msgstr "passar o sinalizador -m ao git-mailinfo"
+
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr "passar o sinalizador --keep-cr ao git-mailsplit para o formato mbox"
+
+msgid "strip everything before a scissors line"
+msgstr "remover tudo antes de uma linha de tesoura"
+
+msgid "pass it through git-mailinfo"
+msgstr "processar com git-mailinfo"
+
+msgid "pass it through git-apply"
+msgstr "passar pelo git-apply"
+
+msgid "n"
+msgstr "n"
+
+msgid "format"
+msgstr "formato"
+
+msgid "format the patch(es) are in"
+msgstr "formato em que o(s) patch(es) estão"
+
+msgid "override error message when patch failure occurs"
+msgstr "substituir a mensagem de erro quando ocorrer falha no patch"
+
+msgid "continue applying patches after resolving a conflict"
+msgstr "continuar aplicando patches após resolver um conflito"
+
+msgid "synonyms for --continue"
+msgstr "sinônimos para --continue"
+
+msgid "skip the current patch"
+msgstr "ignorar o patch atual"
+
+msgid "restore the original branch and abort the patching operation"
+msgstr ""
+"restaurar o branch original e cancelar a operação de aplicação de patches"
+
+msgid "abort the patching operation but keep HEAD where it is"
+msgstr ""
+"abortar a operação de aplicação de patches, mas manter o HEAD onde está"
+
+msgid "show the patch being applied"
+msgstr "exibir o patch sendo aplicado"
+
+msgid "try to apply current patch again"
+msgstr "tentar aplicar o patch atual novamente"
+
+msgid "record the empty patch as an empty commit"
+msgstr "registrar o patch vazio como um commit vazio"
+
+msgid "lie about committer date"
+msgstr "falsificar a data do committer"
+
+msgid "use current timestamp for author date"
+msgstr "usar o timestamp atual para a data do autor"
+
+msgid "key-id"
+msgstr "id-da-chave"
+
+msgid "GPG-sign commits"
+msgstr "assinar os commits com GPG"
+
+msgid "how to handle empty patches"
+msgstr "como lidar com patches vazios"
+
+msgid "(internal use for git-rebase)"
+msgstr "(uso interno para git-rebase)"
+
+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 ""
+"A opção -b/--binary não tem efeito há muito tempo e\n"
+"será removida. Por favor, não a use mais."
+
+msgid "failed to read the index"
+msgstr "falha ao ler o índice"
+
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr ""
+"o diretório de rebase anterior %s ainda existe, mas o mbox foi fornecido."
+
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"Diretório %s perdido encontrado.\n"
+"Use \"git am --abort\" para removê-lo."
+
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "Operação de resolução não está em andamento, não estamos retomando."
+
+msgid "interactive mode requires patches on the command line"
+msgstr "o modo interativo requer patches na linha de comando"
+
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<options>] [<patch>...]"
+
+msgid "could not redirect output"
+msgstr "não foi possível redirecionar a saída"
+
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive: esperava ACK/NAK, obteve um pacote de flush"
+
+#, c-format
+msgid "git archive: NACK %s"
+msgstr "git archive: NACK %s"
+
+msgid "git archive: protocol error"
+msgstr "git archive: erro de protocolo"
+
+msgid "git archive: expected a flush"
+msgstr "git archive: esperava um flush"
+
+msgid ""
+"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] "
+"[<revision-range>]"
+msgstr ""
+"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] "
+"[<revision-range>]"
+
+#, c-format
+msgid "'%s' cannot be used with 'git backfill'"
+msgstr "'%s' não pode ser usado com 'git backfill'"
+
+msgid "cannot backfill with these filter options"
+msgstr "não é possível fazer backfill com estas opções de filtro"
+
+msgid "cannot backfill with blob size limits"
+msgstr "não é possível fazer backfill com limites de tamanho de blob"
+
+msgid "problem loading sparse-checkout"
+msgstr "problema ao carregar o sparse-checkout"
+
+msgid "Minimum number of objects to request at a time"
+msgstr "Número mínimo de objetos para solicitar de uma vez"
+
+msgid "Restrict the missing objects to the current sparse-checkout"
+msgstr "Restringir os objetos ausentes ao sparse-checkout atual"
+
+msgid "Include blobs from boundary commits in the backfill"
+msgstr "Incluir blobs de commits de limite no backfill"
+
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "argumento não reconhecido: %s"
+
+msgid ""
+"git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n"
+"                 [--no-checkout] [--first-parent] [--reset-when-"
+"found[=<where>]] [<bad> [<good>...]] [--] [<pathspec>...]"
+msgstr ""
+"git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n"
+"                 [--no-checkout] [--first-parent] [--reset-when-"
+"found[=<where>]] [<bad> [<good>...]] [--] [<pathspec>...]"
+
+msgid "git bisect (bad|new|<term-new>) [<rev>]"
+msgstr "git bisect (bad|new|<term-new>) [<rev>]"
+
+msgid "git bisect (good|old|<term-old>) [<rev>...]"
+msgstr "git bisect (good|old|<term-old>) [<rev>...]"
+
+msgid "git bisect skip [(<rev>|<range>)...]"
+msgstr "git bisect skip [(<rev>|<range>)...]"
+
+msgid "git bisect reset [<commit>]"
+msgstr "git bisect reset [<commit>]"
+
+msgid "git bisect replay <logfile>"
+msgstr "git bisect replay <logfile>"
+
+msgid "git bisect run [--reset-when-found[=<where>]] <cmd> [<arg>...]"
+msgstr "git bisect run [--reset-when-found[=<where>]] <cmd> [<arg>...]"
+
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "não é possível abrir o arquivo '%s' no modo '%s'"
+
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "não foi possível gravar no arquivo '%s'"
+
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "não é possível abrir o arquivo '%s' para leitura"
+
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr "'%s' não é um termo válido"
+
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
+msgstr "não é possível usar o comando embutido '%s' como um termo"
+
+#, c-format
+msgid "can't change the meaning of the term '%s'"
+msgstr "não é possível alterar o significado do termo '%s'"
+
+msgid "please use two different terms"
+msgstr "por favor, use dois termos diferentes"
+
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr "Não estamos em um bisect.\n"
+
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr "'%s' não é um commit válido"
+
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
+"não foi possível fazer o checkout do HEAD original '%s'. Tente 'git bisect "
+"reset <commit>'."
+
+#, c-format
+msgid "invalid value for '--reset-when-found': '%s'"
+msgstr "valor inválido para '--reset-when-found': '%s'"
+
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "Argumento bisect_write inválido: %s"
+
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "não foi possível obter o oid da revisão '%s'"
+
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr "não foi possível abrir o arquivo '%s'"
+
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr "Comando inválido: você está atualmente em um bisect %s/%s"
+
+#, 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 ""
+"Você precisa me dar pelo menos uma revisão %s e %s.\n"
+"Você pode usar \"git bisect %s\" e \"git bisect %s\" para isso."
+
+#, 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 ""
+"Você precisa começar com \"git bisect start\".\n"
+"Depois, você precisa me dar pelo menos uma revisão %s e %s.\n"
+"Você pode usar \"git bisect %s\" e \"git bisect %s\" para isso."
+
+#, c-format
+msgid "bisecting only with a %s commit"
+msgstr "fazendo bisect apenas com um commit %s"
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+msgid "Are you sure [Y/n]? "
+msgstr "Você tem certeza [Y/n]? "
+
+#, c-format
+msgid "status: waiting for both '%s' and '%s' commits\n"
+msgstr "status: aguardando ambos os commits '%s' e '%s'\n"
+
+#, c-format
+msgid "status: waiting for '%s' commit, %d '%s' commit known\n"
+msgid_plural "status: waiting for '%s' commit, %d '%s' commits known\n"
+msgstr[0] "status: aguardando o commit '%s', %d commit '%s' conhecido\n"
+msgstr[1] "status: aguardando o commit '%s', %d commits '%s' conhecidos\n"
+
+#, c-format
+msgid "status: waiting for '%s' commit(s), '%s' commit known\n"
+msgstr "status: aguardando commit(s) '%s', commit '%s' conhecido\n"
+
+msgid "no terms defined"
+msgstr "nenhum termo definido"
+
+#, c-format
+msgid ""
+"Your current terms are '%s' for the old state\n"
+"and '%s' for the new state.\n"
+msgstr ""
+"Seus termos atuais são '%s' para o estado antigo\n"
+"e '%s' para o estado novo.\n"
+
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"argumento inválido %s para 'git bisect terms'.\n"
+"As opções suportadas são: --term-good|--term-old e --term-bad|--term-new."
+
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "não foi possível abrir '%s' para adição"
+
+#, c-format
+msgid "could not find commit for '%s'"
+msgstr "não foi possível encontrar o commit para '%s'"
+
+msgid "'' is not a valid term"
+msgstr "'' não é um termo válido"
+
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr "opção não reconhecida: '%s'"
+
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr "'%s' não parece ser uma revisão válida"
+
+msgid "bad HEAD - I need a HEAD"
+msgstr "HEAD inválido - preciso de um HEAD"
+
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr ""
+"falha ao fazer checkout de '%s'. Tente 'git bisect start <valid-branch>'."
+
+msgid "bad HEAD - strange symbolic ref"
+msgstr "HEAD inválido - ref simbólica estranha"
+
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "referência inválida: '%s'"
+
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Você precisa começar por \"git bisect start\"\n"
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr "Você quer que eu faça isso por você [Y/n]? "
+
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "Por favor, chame `--bisect-state` com pelo menos um argumento"
+
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "'git bisect %s' aceita apenas um argumento."
+
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "Entrada de rev inválida: %s"
+
+#, c-format
+msgid "Bad rev input (not a commit): %s"
+msgstr "Entrada de rev inválida (não é um commit): %s"
+
+msgid "We are not bisecting."
+msgstr "Não estamos em um bisect."
+
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "'%s'?? do que você está falando?"
+
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "não é possível ler o arquivo '%s' para reprodução"
+
+#, c-format
+msgid "running %s\n"
+msgstr "executando %s\n"
+
+msgid "bisect run failed: no command provided."
+msgstr "falha na execução do bisect: nenhum comando fornecido."
+
+#, c-format
+msgid "unable to verify %s on '%s' revision"
+msgstr "não foi possível verificar %s na revisão '%s'"
+
+#, c-format
+msgid "bogus exit code %d for '%s' revision"
+msgstr "código de saída %d inválido para a revisão '%s'"
+
+#, c-format
+msgid "bisect run failed: exit code %d from %s is < 0 or >= 128"
+msgstr ""
+"falha na execução do bisect: o código de saída %d de %s é < 0 ou >= 128"
+
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "não é possível abrir o arquivo '%s' para gravação"
+
+msgid "could not duplicate stdout"
+msgstr "não foi possível duplicar o stdout"
+
+msgid "bisect run cannot continue any more"
+msgstr "bisect run não pode mais continuar"
+
+msgid "bisect run success"
+msgstr "bisect run concluído com sucesso"
+
+#, c-format
+msgid "bisect found first '%s' commit\n"
+msgstr "bisect encontrou o primeiro commit '%s'\n"
+
+#, c-format
+msgid "bisect run failed: 'git bisect %s' exited with error code %d"
+msgstr ""
+"falha na execução do bisect: 'git bisect %s' saiu com código de erro %d"
+
+#, c-format
+msgid "'%s' requires either no argument or a commit"
+msgstr "'%s' aceita nenhum argumento ou um commit"
+
+#, c-format
+msgid "'%s' requires 0 or 1 argument"
+msgstr "'%s' requer 0 ou 1 argumento"
+
+#, c-format
+msgid "'%s' requires 0 arguments"
+msgstr "'%s' requer 0 argumentos"
+
+msgid "no logfile given"
+msgstr "nenhum arquivo de log fornecido"
+
+#, c-format
+msgid "'%s' failed: no command provided."
+msgstr "falha em '%s': nenhum comando fornecido."
+
+msgid "need a command"
+msgstr "é necessário um comando"
+
+#, c-format
+msgid "unknown command: '%s'"
+msgstr "comando desconhecido: '%s'"
+
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+
+msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>"
+
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr "<rev-opts> estão documentadas em git-rev-list(1)"
+
+#, c-format
+msgid "expecting a color: %s"
+msgstr "esperando uma cor: %s"
+
+msgid "must end with a color"
+msgstr "deve terminar com uma cor"
+
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "valor desconhecido para a configuração '%s': %s"
+
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"opção diff-algorithm aceita \"myers\", \"minimal\", \"patience\" e "
+"\"histogram\""
+
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "não é possível encontrar a revisão %s para ignorar"
+
+msgid "show blame entries as we find them, incrementally"
+msgstr "exibir entradas de blame conforme encontradas, de forma incremental"
+
+msgid "do not show object names of boundary commits (Default: off)"
+msgstr "não mostrar nomes de objetos de commits de limite (Padrão: off)"
+
+msgid "do not treat root commits as boundaries (Default: off)"
+msgstr "não tratar commits raiz como limites (Padrão: off)"
+
+msgid "show work cost statistics"
+msgstr "mostrar estatísticas de custo de trabalho"
+
+msgid "force progress reporting"
+msgstr "forçar relatórios de progresso"
+
+msgid "show output score for blame entries"
+msgstr "mostrar pontuação de saída para entradas de blame"
+
+msgid "show original filename (Default: auto)"
+msgstr "mostrar nome de arquivo original (Padrão: auto)"
+
+msgid "show original linenumber (Default: off)"
+msgstr "mostrar número de linha original (Padrão: off)"
+
+msgid "show in a format designed for machine consumption"
+msgstr "exibir em formato projetado para consumo por máquinas"
+
+msgid "show porcelain format with per-line commit information"
+msgstr "mostrar formato porcelain com informações de commit por linha"
+
+msgid "use the same output mode as git-annotate (Default: off)"
+msgstr "usar o mesmo modo de saída do git-annotate (Padrão: desativado)"
+
+msgid "show raw timestamp (Default: off)"
+msgstr "exibir timestamp bruto (Padrão: desativado)"
+
+msgid "show long commit SHA1 (Default: off)"
+msgstr "mostrar SHA1 longo do commit (Padrão: desativado)"
+
+msgid "suppress author name and timestamp (Default: off)"
+msgstr "suprimir nome do autor e timestamp (Padrão: desativado)"
+
+msgid "show author email instead of name (Default: off)"
+msgstr "mostrar e-mail do autor ao invés do nome (Padrão: desativado)"
+
+msgid "ignore whitespace differences"
+msgstr "ignorar diferenças de espaço em branco"
+
+msgid "<algorithm>"
+msgstr "<algorithm>"
+
+msgid "choose a diff algorithm"
+msgstr "escolher um algoritmo de diff"
+
+msgid "rev"
+msgstr "rev"
+
+msgid "ignore <rev> when blaming"
+msgstr "ignorar <rev> ao fazer o blame"
+
+msgid "ignore revisions from <file>"
+msgstr "ignorar revisões de <file>"
+
+msgid "color redundant metadata from previous line differently"
+msgstr "colorir metadados redundantes da linha anterior de maneira diferente"
+
+msgid "color lines by age"
+msgstr "colorir linhas por idade"
+
+msgid "spend extra cycles to find a better match"
+msgstr "gastar ciclos extras para encontrar uma correspondência melhor"
+
+msgid "use revisions from <file> instead of calling git-rev-list"
+msgstr "usar revisões de <file> ao invés de chamar git-rev-list"
+
+msgid "use <file>'s contents as the final image"
+msgstr "usar o conteúdo de <file> como a imagem final"
+
+msgid "score"
+msgstr "pontuação"
+
+msgid "find line copies within and across files"
+msgstr "encontrar cópias de linha dentro e entre arquivos"
+
+msgid "find line movements within and across files"
+msgstr "encontrar movimentos de linha dentro e entre arquivos"
+
+msgid "range"
+msgstr "intervalo"
+
+msgid "process only line range <start>,<end> or function :<funcname>"
+msgstr ""
+"processar apenas o intervalo de linhas <start>,<end> ou função :<funcname>"
+
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr ""
+"--progress não pode ser usado com os formatos --incremental ou porcelain"
+
+#. 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.
+#.
+msgid "4 years, 11 months ago"
+msgstr "4 anos, 11 meses atrás"
+
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] "o arquivo %s tem apenas %lu linha"
+msgstr[1] "o arquivo %s tem apenas %lu linhas"
+
+msgid "Blaming lines"
+msgstr "Anotando linhas"
+
+msgid ""
+"git branch [<options>] [-r | -a] [--merged] [--no-merged] [(--forked "
+"<branch>)...]"
+msgstr ""
+"git branch [<options>] [-r | -a] [--merged] [--no-merged] [(--forked "
+"<branch>)...]"
+
+msgid ""
+"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
+"point>]"
+msgstr ""
+"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
+"point>]"
+
+msgid "git branch [<options>] [-l] [<pattern>...]"
+msgstr "git branch [<options>] [-l] [<pattern>...]"
+
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<options>] [-r | -a] [--points-at]"
+
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<options>] [-r | -a] [--format]"
+
+msgid ""
+"git branch [<options>] (--delete-merged <pattern>)... [<branch-pattern>...]"
+msgstr ""
+"git branch [<options>] (--delete-merged <pattern>)... [<branch-pattern>...]"
+
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+"         '%s', but not yet merged to HEAD"
+msgstr ""
+"excluindo o branch '%s' que foi mesclado a\n"
+"         '%s', mas ainda não foi mesclado ao HEAD"
+
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+"         '%s', even though it is merged to HEAD"
+msgstr ""
+"não excluindo o branch '%s' que ainda não foi mesclado a\n"
+"         '%s', mesmo tendo sido mesclado ao HEAD"
+
+#, c-format
+msgid "couldn't look up commit object for '%s'"
+msgstr "não foi possível procurar o objeto commit de '%s'"
+
+#, c-format
+msgid "the branch '%s' is not fully merged"
+msgstr "o branch '%s' não foi totalmente mesclado"
+
+#, c-format
+msgid "If you are sure you want to delete it, run 'git branch -D %s'"
+msgstr "Se você tem certeza que deseja excluí-lo, execute 'git branch -D %s'"
+
+msgid "update of config-file failed"
+msgstr "falha ao atualizar o arquivo de configuração"
+
+msgid "cannot use -a with -d"
+msgstr "não é possível usar -a com -d"
+
+#, c-format
+msgid "cannot delete branch '%s' used by worktree at '%s' for bisect"
+msgstr ""
+"não é possível excluir o branch '%s' usado pela worktree em '%s' para o "
+"bisect"
+
+#, c-format
+msgid "cannot delete branch '%s' used by worktree at '%s'"
+msgstr "não é possível excluir o branch '%s' usado pela worktree em '%s'"
+
+#, c-format
+msgid "remote-tracking branch '%s' not found"
+msgstr "branch de rastreamento remoto '%s' não encontrado"
+
+#, c-format
+msgid ""
+"branch '%s' not found.\n"
+"Did you forget --remote?"
+msgstr ""
+"branch '%s' não encontrado.\n"
+"Você esqueceu da opção --remote?"
+
+#, c-format
+msgid "branch '%s' not found"
+msgstr "branch '%s' não encontrado"
+
+#, c-format
+msgid "Would delete remote-tracking branch %s (was %s).\n"
+msgstr "Excluiria a branch de rastreamento remoto %s (era %s).\n"
+
+#, c-format
+msgid "Would delete branch %s (was %s).\n"
+msgstr "Excluiria a branch %s (era %s).\n"
+
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr "Branch de rastreamento remoto %s excluído (era %s).\n"
+
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr "Branch %s excluído (era %s).\n"
+
+msgid "unable to parse format string"
+msgstr "não foi possível analisar a string de formato"
+
+msgid "could not resolve HEAD"
+msgstr "não foi possível resolver o HEAD"
+
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "HEAD (%s) aponta para fora de refs/heads/"
+
+#, c-format
+msgid "branch %s is being rebased at %s"
+msgstr "o branch %s está passando por rebase em %s"
+
+#, c-format
+msgid "branch %s is being bisected at %s"
+msgstr "o branch %s está passando por bisect em %s"
+
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "o HEAD da árvore de trabalho %s não está atualizado"
+
+#, c-format
+msgid "invalid branch name: '%s'"
+msgstr "nome de branch inválido: '%s'"
+
+#, c-format
+msgid "no commit on branch '%s' yet"
+msgstr "ainda não há commit no branch '%s'"
+
+#, c-format
+msgid "no branch named '%s'"
+msgstr "não há branch chamado '%s'"
+
+msgid "branch rename failed"
+msgstr "falha ao renomear branch"
+
+msgid "branch copy failed"
+msgstr "falha ao copiar branch"
+
+#, c-format
+msgid "created a copy of a misnamed branch '%s'"
+msgstr "criada uma cópia do branch com nome incorreto '%s'"
+
+#, c-format
+msgid "renamed a misnamed branch '%s' away"
+msgstr "renomeado o branch com nome incorreto '%s'"
+
+#, c-format
+msgid "branch renamed to %s, but HEAD is not updated"
+msgstr "branch renomeado para %s, mas HEAD não foi atualizado"
+
+msgid "branch is renamed, but update of config-file failed"
+msgstr ""
+"o branch foi renomeado, mas a atualização do arquivo de configuração falhou"
+
+msgid "branch is copied, but update of config-file failed"
+msgstr ""
+"o branch foi copiado, mas a atualização do arquivo de configuração falhou"
+
+#, c-format
+msgid "'%s' is not a valid branch or pattern"
+msgstr "'%s' não é um branch nem um padrão válido"
+
+#, c-format
+msgid "Skipping '%s' (branch.%s.deleteMerged is false)\n"
+msgstr "Ignorando '%s' (branch.%s.deleteMerged é false)\n"
+
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+"  %s\n"
+"Lines starting with '%s' will be stripped.\n"
+msgstr ""
+"Por favor, edite a descrição do branch\n"
+"  %s\n"
+"Linhas começando com '%s' serão removidas.\n"
+
+msgid "--set-upstream-to takes a single <remote>/<branch> argument"
+msgstr "--set-upstream-to aceita apenas um argumento <remote>/<branch>"
+
+#, c-format
+msgid "Did you mean to use: git branch --set-upstream-to=%s/%s?"
+msgstr "Você quis dizer: git branch --set-upstream-to=%s/%s?"
+
+msgid "Generic options"
+msgstr "Opções genéricas"
+
+msgid "show hash and subject, give twice for upstream branch"
+msgstr "mostrar hash e assunto, forneça duas vezes para o branch upstream"
+
+msgid "suppress informational messages"
+msgstr "suprimir mensagens informativas"
+
+msgid "set branch tracking configuration"
+msgstr "definir configuração de rastreamento de branch"
+
+msgid "do not use"
+msgstr "não usar"
+
+msgid "upstream"
+msgstr "upstream"
+
+msgid "change the upstream info"
+msgstr "alterar as informações de upstream"
+
+msgid "unset the upstream info"
+msgstr "remover as informações do upstream"
+
+msgid "use colored output"
+msgstr "usar saída colorida"
+
+msgid "act on remote-tracking branches"
+msgstr "atuar em branches de rastreamento remoto"
+
+msgid "print only branches that contain the commit"
+msgstr "exibir apenas branches que contêm o commit"
+
+msgid "print only branches that don't contain the commit"
+msgstr "exibir apenas branches que não contêm o commit"
+
+msgid "Specific git-branch actions:"
+msgstr "Ações específicas do git-branch:"
+
+msgid "list both remote-tracking and local branches"
+msgstr "listar tanto branches de rastreamento remoto quanto branches locais"
+
+msgid "delete fully merged branch"
+msgstr "excluir branch totalmente mesclado"
+
+msgid "delete branch (even if not merged)"
+msgstr "excluir branch (mesmo que não tenha sido mesclado)"
+
+msgid "move/rename a branch and its reflog"
+msgstr "mover/renomear um branch e seu reflog"
+
+msgid "move/rename a branch, even if target exists"
+msgstr "mover/renomear um branch, mesmo que o destino já exista"
+
+msgid "do not output a newline after empty formatted refs"
+msgstr "não exibir uma nova linha após refs formatadas vazias"
+
+msgid "copy a branch and its reflog"
+msgstr "copiar um branch e seu reflog"
+
+msgid "copy a branch, even if target exists"
+msgstr "copiar um branch, mesmo que o destino já exista"
+
+msgid "list branch names"
+msgstr "listar nomes de branch"
+
+msgid "show current branch name"
+msgstr "mostrar o nome do branch atual"
+
+msgid "create the branch's reflog"
+msgstr "criar o reflog do branch"
+
+msgid "edit the description for the branch"
+msgstr "editar a descrição do branch"
+
+msgid "pattern"
+msgstr "padrão"
+
+msgid "delete merged branches whose upstream matches <pattern> (repeatable)"
+msgstr ""
+"excluir os branches já mesclados cujo upstream corresponda a <pattern> "
+"(repetível)"
+
+msgid "with --delete-merged, only print which branches would be deleted"
+msgstr "com --delete-merged, apenas exibir quais branches seriam excluídos"
+
+msgid "force creation, move/rename, deletion"
+msgstr "forçar criação, mover/renomear, exclusão"
+
+msgid "print only branches that are merged"
+msgstr "exibir apenas branches que foram mesclados"
+
+msgid "print only branches that are not merged"
+msgstr "exibir apenas branches que não foram mesclados"
+
+msgid "branch"
+msgstr "branch"
+
+msgid "print only branches whose upstream matches <branch> (repeatable)"
+msgstr ""
+"exibir apenas os branches cujo upstream corresponda a <branch> (repetível)"
+
+msgid "list branches in columns"
+msgstr "listar branches em colunas"
+
+msgid "object"
+msgstr "objeto"
+
+msgid "print only branches of the object"
+msgstr "imprimir apenas os branches do objeto"
+
+msgid "sorting and filtering are case insensitive"
+msgstr "ordenação e filtragem não diferenciam maiúsculas de minúsculas"
+
+msgid "recurse through submodules"
+msgstr "percorrer os submódulos recursivamente"
+
+msgid "format to use for the output"
+msgstr "formato a ser usado para a saída"
+
+msgid "failed to resolve HEAD as a valid ref"
+msgstr "falha ao resolver HEAD como uma ref válida"
+
+msgid "HEAD not found below refs/heads!"
+msgstr "HEAD não encontrado abaixo de refs/heads!"
+
+msgid "--dry-run requires --delete-merged"
+msgstr "--dry-run requer --delete-merged"
+
+msgid ""
+"branch with --recurse-submodules can only be used if "
+"submodule.propagateBranches is enabled"
+msgstr ""
+"branch com --recurse-submodules só pode ser usado se "
+"submodule.propagateBranches estiver ativado"
+
+msgid "--recurse-submodules can only be used to create branches"
+msgstr "--recurse-submodules só pode ser usado para criar branches"
+
+msgid "branch name required"
+msgstr "nome do branch é obrigatório"
+
+msgid "cannot give description to detached HEAD"
+msgstr "não é possível dar uma descrição a um HEAD desanexado"
+
+msgid "cannot edit description of more than one branch"
+msgstr "não é possível editar a descrição de mais de um branch"
+
+msgid "cannot copy the current branch while not on any"
+msgstr "não é possível copiar o branch atual enquanto não estiver em nenhum"
+
+msgid "cannot rename the current branch while not on any"
+msgstr "não é possível renomear o branch atual enquanto não estiver em nenhum"
+
+msgid "too many branches for a copy operation"
+msgstr "muitos branches para uma operação de cópia"
+
+msgid "too many arguments for a rename operation"
+msgstr "muitos argumentos para uma operação de renomear"
+
+msgid "too many arguments to set new upstream"
+msgstr "muitos argumentos para definir um novo upstream"
+
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch"
+msgstr ""
+"não foi possível definir o upstream de HEAD para %s quando ele não aponta "
+"para nenhum branch"
+
+#, c-format
+msgid "no such branch '%s'"
+msgstr "não há branch '%s'"
+
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr "o branch '%s' não existe"
+
+msgid "too many arguments to unset upstream"
+msgstr "muitos argumentos para remover upstream"
+
+msgid "could not unset upstream of HEAD when it does not point to any branch"
+msgstr ""
+"não foi possível remover o upstream de HEAD quando ele não aponta para "
+"nenhum branch"
+
+#, c-format
+msgid "branch '%s' has no upstream information"
+msgstr "o branch '%s' não tem informações de upstream"
+
+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 ""
+"as opções -a e -r do 'git branch' não aceitam um nome de branch.\n"
+"Você quis dizer: -a|-r --list <pattern>?"
+
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead"
+msgstr ""
+"a opção '--set-upstream' não é mais suportada. Por favor, use '--track' ou "
+"'--set-upstream-to' em vez disso"
+
+msgid "git version:\n"
+msgstr "versão do git:\n"
+
+msgid "compiler info: "
+msgstr "informação do compilador: "
+
+msgid "libc info: "
+msgstr "informação da libc: "
+
+msgid "not run from a git repository - no hooks to show\n"
+msgstr ""
+"não executado a partir de um repositório git - nenhum hook para mostrar\n"
+
+msgid ""
+"git bugreport [(-o | --output-directory) <path>]\n"
+"              [(-s | --suffix) <format> | --no-suffix]\n"
+"              [--diagnose[=<mode>]]"
+msgstr ""
+"git bugreport [(-o | --output-directory) <path>]\n"
+"              [(-s | --suffix) <format> | --no-suffix]\n"
+"              [--diagnose[=<mode>]]"
+
+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 ""
+"Obrigado por preencher um relatório de bug do Git!\n"
+"Por favor, responda às seguintes perguntas para nos ajudar a entender o seu "
+"problema.\n"
+"\n"
+"O que você fez antes de o bug acontecer? (Passos para reproduzir o "
+"problema)\n"
+"\n"
+"O que você esperava que acontecesse? (Comportamento esperado)\n"
+"\n"
+"O que aconteceu em vez disso? (Comportamento real)\n"
+"\n"
+"Qual é a diferença entre o que você esperava e o que realmente aconteceu?\n"
+"\n"
+"Algo mais que você queira adicionar:\n"
+"\n"
+"Por favor, revise o restante do relatório de bug abaixo.\n"
+"Você pode excluir quaisquer linhas que não deseja compartilhar.\n"
+
+msgid "mode"
+msgstr "modo"
+
+msgid ""
+"create an additional zip archive of detailed diagnostics (default 'stats')"
+msgstr ""
+"criar um arquivo zip adicional com diagnósticos detalhados (padrão 'stats')"
+
+msgid "specify a destination for the bugreport file(s)"
+msgstr "especificar um destino para o(s) arquivo(s) de bugreport"
+
+msgid "specify a strftime format suffix for the filename(s)"
+msgstr "especificar um sufixo de formato strftime para o(s) nome(s) de arquivo"
+
+#, c-format
+msgid "unknown argument `%s'"
+msgstr "argumento desconhecido `%s'"
+
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "não foi possível criar diretórios principais de '%s'"
+
+#, c-format
+msgid "unable to create diagnostics archive %s"
+msgstr "não foi possível criar o arquivo de diagnóstico %s"
+
+msgid "System Info"
+msgstr "Informações do sistema"
+
+msgid "Enabled Hooks"
+msgstr "Hooks habilitados"
+
+#, c-format
+msgid "unable to write to %s"
+msgstr "não foi possível gravar em %s"
+
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "Novo relatório criado em '%s'.\n"
+
+msgid ""
+"git bundle create [-q | --quiet | --progress]\n"
+"                  [--version=<version>] <file> <git-rev-list-args>"
+msgstr ""
+"git bundle create [-q | --quiet | --progress]\n"
+"                  [--version=<version>] <file> <git-rev-list-args>"
+
+msgid "git bundle verify [-q | --quiet] <file>"
+msgstr "git bundle verify [-q | --quiet] <file>"
+
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <file> [<refname>...]"
+
+msgid "git bundle unbundle [--progress] <file> [<refname>...]"
+msgstr "git bundle unbundle [--progress] <file> [<refname>...]"
+
+msgid "need a <file> argument"
+msgstr "é necessário um argumento <file>"
+
+msgid "do not show progress meter"
+msgstr "não exibir o medidor de progresso"
+
+msgid "show progress meter"
+msgstr "exibir o medidor de progresso"
+
+msgid "historical; same as --progress"
+msgstr "histórico; o mesmo que --progress"
+
+msgid "specify bundle format version"
+msgstr "especificar a versão de formato do bundle"
+
+msgid "Need a repository to create a bundle."
+msgstr "É necessário um repositório para criar um bundle."
+
+msgid "do not show bundle details"
+msgstr "não exibir detalhes do bundle"
+
+msgid "need a repository to verify a bundle"
+msgstr "é necessário um repositório para verificar um bundle"
+
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s está ok\n"
+
+msgid "Need a repository to unbundle."
+msgstr "É necessário um repositório para desempacotar o bundle."
+
+msgid "Unbundling objects"
+msgstr "Desempacotando objetos"
+
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "não é possível ler o objeto %s '%s'"
+
+msgid "must supply valid remote when using remote-object-info"
+msgstr "deve fornecer um remoto válido ao usar remote-object-info"
+
+#, c-format
+msgid "remote-object-info does not support short oids, %d characters required"
+msgstr "remote-object-info não suporta oids curtos, %d caracteres necessários"
+
+#, c-format
+msgid "not a valid object name '%s'"
+msgstr "não é um nome de objeto válido '%s'"
+
+msgid "remote-object-info requires objects"
+msgstr "remote-object-info requer objetos"
+
+#, c-format
+msgid "mailmap: invalid boolean '%s'"
+msgstr "mailmap: booleano inválido '%s'"
+
+msgid "remote-object-info command too long"
+msgstr "comando remote-object-info longo demais"
+
+#, c-format
+msgid "remote-object-info: failed to parse command line: %s"
+msgstr "remote-object-info: falha ao analisar a linha de comando: %s"
+
+#, c-format
+msgid "remote-object-info supports at most %d objects"
+msgstr "remote-object-info suporta no máximo %d objetos"
+
+#, c-format
+msgid "failed to get object info from the remote: %s"
+msgstr "falha ao obter informações do objeto no remoto: %s"
+
+msgid "flush is only for --buffer mode"
+msgstr "flush é apenas para o modo --buffer"
+
+msgid "empty command in input"
+msgstr "comando vazio na entrada"
+
+#, c-format
+msgid "whitespace before command: '%s'"
+msgstr "espaço em branco antes do comando: '%s'"
+
+#, c-format
+msgid "%s requires arguments"
+msgstr "%s requer argumentos"
+
+#, c-format
+msgid "%s takes no arguments"
+msgstr "%s não aceita argumentos"
+
+msgid "only one batch option may be specified"
+msgstr "apenas uma opção batch pode ser especificada"
+
+msgid "git cat-file <type> <object>"
+msgstr "git cat-file <type> <object>"
+
+msgid "git cat-file (-e | -p | -t | -s) <object>"
+msgstr "git cat-file (-e | -p | -t | -s) <object>"
+
+msgid ""
+"git cat-file (--textconv | --filters)\n"
+"             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
+msgstr ""
+"git cat-file (--textconv | --filters)\n"
+"             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
+
+msgid ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+"             [--buffer] [--follow-symlinks] [--unordered]\n"
+"             [--textconv | --filters] [-Z]"
+msgstr ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+"             [--buffer] [--follow-symlinks] [--unordered]\n"
+"             [--textconv | --filters] [-Z]"
+
+msgid "Check object existence or emit object contents"
+msgstr "Verificar a existência do objeto ou emitir o conteúdo do objeto"
+
+msgid "check if <object> exists"
+msgstr "verificar se <object> existe"
+
+msgid "pretty-print <object> content"
+msgstr "imprimir o conteúdo de <object> de forma legível"
+
+msgid "Emit [broken] object attributes"
+msgstr "Emitir atributos de objeto [quebrados]"
+
+msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
+msgstr "mostrar o tipo de objeto (um de 'blob', 'tree', 'commit', 'tag', ...)"
+
+msgid "show object size"
+msgstr "exibir o tamanho do objeto"
+
+msgid "use mail map file"
+msgstr "usar arquivo mail map"
+
+msgid "Batch objects requested on stdin (or --batch-all-objects)"
+msgstr ""
+"Processar em lote objetos solicitados no stdin (ou --batch-all-objects)"
+
+msgid "show full <object> or <rev> contents"
+msgstr "mostrar o conteúdo completo de <object> ou <rev>"
+
+msgid "like --batch, but don't emit <contents>"
+msgstr "como --batch, mas não emitir <contents>"
+
+msgid "stdin is NUL-terminated"
+msgstr "a entrada padrão é terminada por NUL"
+
+msgid "stdin and stdout is NUL-terminated"
+msgstr "stdin e stdout são terminados por NUL"
+
+msgid "read commands from stdin"
+msgstr "ler comandos da entrada padrão"
+
+msgid "with --batch[-check]: ignores stdin, batches all known objects"
+msgstr ""
+"com --batch[-check]: ignora stdin, processa em lote todos os objetos "
+"conhecidos"
+
+msgid "Change or optimize batch output"
+msgstr "Alterar ou otimizar a saída do lote"
+
+msgid "buffer --batch output"
+msgstr "usar buffer para a saída do --batch"
+
+msgid "follow in-tree symlinks"
+msgstr "seguir links simbólicos na árvore"
+
+msgid "do not order objects before emitting them"
+msgstr "não ordenar os objetos antes de emiti-los"
+
+msgid ""
+"Emit object (blob or tree) with conversion or filter (stand-alone, or with "
+"batch)"
+msgstr ""
+"Emitir objeto (blob ou árvore) com conversão ou filtro (independente, ou com "
+"lote)"
+
+msgid "run textconv on object's content"
+msgstr "executar textconv no conteúdo do objeto"
+
+msgid "run filters on object's content"
+msgstr "executar filtros no conteúdo do objeto"
+
+msgid "blob|tree"
+msgstr "blob|tree"
+
+msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
+msgstr "usar um <path> para (--textconv | --filters); não com 'batch'"
+
+msgid "objects filter only supported in batch mode"
+msgstr "filtro de objetos suportado apenas no modo batch"
+
+#, c-format
+msgid "objects filter not supported: '%s'"
+msgstr "filtro de objetos não suportado: '%s'"
+
+#, c-format
+msgid "'%s=<%s>' needs '%s' or '%s'"
+msgstr "'%s=<%s>' precisa de '%s' ou '%s'"
+
+msgid "path|tree-ish"
+msgstr "path|tree-ish"
+
+#, c-format
+msgid "'%s' requires a batch mode"
+msgstr "'%s' requer um modo batch"
+
+#, c-format
+msgid "'-%c' is incompatible with batch mode"
+msgstr "'-%c' é incompatível com o modo batch"
+
+msgid "batch modes take no arguments"
+msgstr "modos batch não aceitam argumentos"
+
+#, c-format
+msgid "<rev> required with '%s'"
+msgstr "<rev> é necessário com '%s'"
+
+#, c-format
+msgid "<object> required with '-%c'"
+msgstr "<object> é necessário com '-%c'"
+
+#, c-format
+msgid "only two arguments allowed in <type> <object> mode, not %d"
+msgstr "apenas dois argumentos permitidos no modo <type> <object>, não %d"
+
+msgid ""
+"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] "
+"<pathname>..."
+msgstr ""
+"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] "
+"<pathname>..."
+
+msgid ""
+"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]"
+msgstr ""
+"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]"
+
+msgid "report all attributes set on file"
+msgstr "reportar todos os atributos definidos no arquivo"
+
+msgid "use .gitattributes only from the index"
+msgstr "usar .gitattributes apenas do índice"
+
+msgid "read file names from stdin"
+msgstr "ler nomes de arquivos do stdin"
+
+msgid "terminate input and output records by a NUL character"
+msgstr "terminar registros de entrada e saída com um caractere NUL"
+
+msgid "<tree-ish>"
+msgstr "<tree-ish>"
+
+msgid "which tree-ish to check attributes at"
+msgstr "em qual tree-ish verificar os atributos"
+
+msgid "suppress progress reporting"
+msgstr "suprimir relatórios de progresso"
+
+msgid "show non-matching input paths"
+msgstr "mostrar caminhos de entrada que não correspondem"
+
+msgid "ignore index when checking"
+msgstr "ignorar o índice ao verificar"
+
+msgid "cannot specify pathnames with --stdin"
+msgstr "não é possível especificar nomes de caminho com --stdin"
+
+msgid "-z only makes sense with --stdin"
+msgstr "-z só faz sentido com --stdin"
+
+msgid "no path specified"
+msgstr "nenhum caminho especificado"
+
+msgid "--quiet is only valid with a single pathname"
+msgstr "--quiet é válido apenas com um único nome de caminho"
+
+msgid "cannot have both --quiet and --verbose"
+msgstr "não pode haver ambos --quiet e --verbose"
+
+msgid "--non-matching is only valid with --verbose"
+msgstr "--non-matching só é válido com --verbose"
+
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr "git check-mailmap [<options>] <contact>..."
+
+msgid "also read contacts from stdin"
+msgstr "ler também contatos de stdin"
+
+msgid "read additional mailmap entries from file"
+msgstr "ler entradas adicionais do mailmap do arquivo"
+
+msgid "blob"
+msgstr "blob"
+
+msgid "read additional mailmap entries from blob"
+msgstr "ler entradas adicionais do mailmap do blob"
+
+msgid "no contacts specified"
+msgstr "nenhum contato especificado"
+
+msgid "git checkout--worker [<options>]"
+msgstr "git checkout--worker [<options>]"
+
+msgid "string"
+msgstr "string"
+
+msgid "when creating files, prepend <string>"
+msgstr "ao criar arquivos, prefixar <string>"
+
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr "git checkout-index [<options>] [--] [<file>...]"
+
+msgid "stage should be between 1 and 3 or all"
+msgstr "stage deve ser entre 1 e 3 ou all"
+
+msgid "check out all files in the index"
+msgstr "fazer checkout de todos os arquivos no índice"
+
+msgid "do not skip files with skip-worktree set"
+msgstr "não pular arquivos com skip-worktree definido"
+
+msgid "force overwrite of existing files"
+msgstr "forçar sobrescrita de arquivos existentes"
+
+msgid "no warning for existing files and files not in index"
+msgstr ""
+"nenhum aviso para arquivos existentes e arquivos que não estão no índice"
+
+msgid "don't checkout new files"
+msgstr "não fazer checkout de novos arquivos"
+
+msgid "update stat information in the index file"
+msgstr "atualizar as informações de stat no arquivo de índice"
+
+msgid "read list of paths from the standard input"
+msgstr "ler lista de caminhos da entrada padrão"
+
+msgid "write the content to temporary files"
+msgstr "escrever o conteúdo em arquivos temporários"
+
+msgid "copy out the files from named stage"
+msgstr "copiar os arquivos do stage nomeado"
+
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr "o caminho '%s' não possui nossa versão"
+
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr "o caminho '%s' não possui a versão deles"
+
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr "o caminho '%s' não possui todas as versões necessárias"
+
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr "o caminho '%s' não possui versões necessárias"
+
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr "caminho '%s': não é possível fazer merge"
+
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr "Não foi possível adicionar o resultado do merge para '%s'"
+
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "Recriado %d conflito de merge"
+msgstr[1] "Recriados %d conflitos de merge"
+
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "Atualizado %d caminho a partir de %s"
+msgstr[1] "Atualizados %d caminhos a partir de %s"
+
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "Atualizado %d caminho a partir do índice"
+msgstr[1] "Atualizados %d caminhos a partir do índice"
+
+#, c-format
+msgid "'%s' cannot be used with updating paths"
+msgstr "'%s' não pode ser usado com atualização de caminhos"
+
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr ""
+"Não é possível atualizar caminhos e alternar para o branch '%s' ao mesmo "
+"tempo."
+
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr "nem '%s' nem '%s' são especificados"
+
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "'%s' deve ser usado quando '%s' não for especificado"
+
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' ou '%s' não podem ser usados com %s"
+
+#, c-format
+msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree"
+msgstr ""
+"'%s', '%s' ou '%s' não podem ser usados ao fazer checkout de uma árvore"
+
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "o caminho '%s' não foi mesclado"
+
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr "não foi possível ler a tree (%s)"
+
+msgid "you need to resolve your current index first"
+msgstr "você precisa resolver seu índice atual primeiro"
+
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
+msgstr "Não é possível fazer reflog para '%s': %s\n"
+
+msgid "HEAD is now at"
+msgstr "HEAD está agora em"
+
+msgid "unable to update HEAD"
+msgstr "não foi possível atualizar o HEAD"
+
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr "Redefinir o branch '%s'\n"
+
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "Já em '%s'\n"
+
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr "Mudou para e redefiniu o branch '%s'\n"
+
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "Mudou para um novo branch '%s'\n"
+
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "Mudou para o branch '%s'\n"
+
+#, c-format
+msgid " ... and %d more.\n"
+msgstr " ... e %d mais.\n"
+
+#, 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] ""
+"Aviso: você está deixando para trás %d commit que não está conectado a\n"
+"nenhum dos seus branches:\n"
+"\n"
+"%s\n"
+msgstr[1] ""
+"Aviso: você está deixando para trás %d commits que não estão conectados a\n"
+"nenhum dos seus branches:\n"
+"\n"
+"%s\n"
+
+#, 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] ""
+"Se você quiser mantê-lo criando um novo branch, este pode ser um bom "
+"momento\n"
+"para fazê-lo com:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgstr[1] ""
+"Se você quiser mantê-los criando um novo branch, este pode ser um bom "
+"momento\n"
+"para fazê-lo com:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+
+msgid "internal error in revision walk"
+msgstr "erro interno na caminhada de revisão"
+
+msgid "Previous HEAD position was"
+msgstr "A posição HEAD anterior era"
+
+msgid "You are on a branch yet to be born"
+msgstr "Você está em um branch que ainda não nasceu"
+
+#, c-format
+msgid "The following paths have local changes:\n"
+msgstr "Os seguintes caminhos têm alterações locais:\n"
+
+#, c-format
+msgid "Branch name '%s' appears in multiple remotes:"
+msgstr "O nome de branch '%s' aparece em vários remotos:"
+
+#, c-format
+msgid "  %s"
+msgstr "  %s"
+
+#, c-format
+msgid ""
+"If you meant to check out a remote tracking branch on <remote>,\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+"    git %s --track <remote>/%s\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 ""
+"Se a intenção era fazer checkout de um branch de rastreamento remoto em "
+"<remote>,\n"
+"isso é possível qualificando o nome por completo com a opção --track:\n"
+"\n"
+"    git %s --track <remote>/%s\n"
+"\n"
+"Se você prefere que o checkout de um nome ambíguo sempre use\n"
+"um remoto específico, por exemplo o remoto 'origin', considere definir\n"
+"checkout.defaultRemote=origin na sua configuração."
+
+#, 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' pode ser tanto um arquivo local quanto um branch de rastreamento.\n"
+"Por favor use -- (e opcionalmente --no-guess) para desambiguar"
+
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "'%s' correspondeu a múltiplos (%d) branches de rastreamento remoto"
+
+msgid "only one reference expected"
+msgstr "apenas uma referência esperada"
+
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "apenas uma referência esperada, %d fornecida."
+
+#, c-format
+msgid "invalid reference: %s"
+msgstr "referência inválida: %s"
+
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "referência não é uma árvore: %s"
+
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "um branch é esperado, obteve a tag '%s'"
+
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "um branch é esperado, obteve o branch remoto '%s'"
+
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "um branch é esperado, obteve '%s'"
+
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "um branch é esperado, obteve o commit '%s'"
+
+msgid ""
+"If you want to detach HEAD at the commit, try again with the --detach option."
+msgstr ""
+"Se você deseja desanexar o HEAD no commit, tente novamente com a opção --"
+"detach."
+
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"não é possível mudar de branch durante um merge\n"
+"Considere \"git merge --quit\" ou \"git worktree add\"."
+
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"não é possível mudar de branch no meio de uma sessão am\n"
+"Considere \"git am --quit\" ou \"git worktree add\"."
+
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"não é possível mudar de branch durante o rebase\n"
+"Considere \"git rebase --quit\" ou \"git worktree add\"."
+
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"não é possível mudar de branch durante um cherry-pick\n"
+"Considere \"git cherry-pick --quit\" ou \"git worktree add\"."
+
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"não é possível mudar de branch durante um revert\n"
+"Considere \"git revert --quit\" ou \"git worktree add\"."
+
+msgid "you are switching branch while bisecting"
+msgstr "você está trocando de branch enquanto faz bisect"
+
+msgid "paths cannot be used with switching branches"
+msgstr "caminhos não podem ser usados com a troca de branches"
+
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr "'%s' não pode ser usado com a troca de branches"
+
+#, c-format
+msgid "'%s' needs the paths to check out"
+msgstr "'%s' precisa dos caminhos para fazer checkout"
+
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr "'%s' não pode ser usado com '%s'"
+
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "'%s' não pode receber <start-point>"
+
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr "Não é possível mudar o branch para um '%s' sem commit"
+
+msgid "missing branch or commit argument"
+msgstr "branch ausente ou argumento de commit"
+
+#, c-format
+msgid "unknown conflict style '%s'"
+msgstr "estilo de conflito desconhecido '%s'"
+
+msgid "perform a 3-way merge with the new branch"
+msgstr "realizar um merge de 3 vias com o novo branch"
+
+msgid "style"
+msgstr "estilo"
+
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "estilo de conflito (merge, diff3 ou zdiff3)"
+
+msgid "detach HEAD at named commit"
+msgstr "desanexar o HEAD no commit nomeado"
+
+msgid "force checkout (throw away local modifications)"
+msgstr "forçar checkout (descartar modificações locais)"
+
+msgid "new-branch"
+msgstr "new-branch"
+
+msgid "new unborn branch"
+msgstr "novo branch não nascido"
+
+msgid "update ignored files (default)"
+msgstr "atualizar arquivos ignorados (padrão)"
+
+msgid "do not check if another worktree is using this branch"
+msgstr "não verificar se outra árvore de trabalho está usando este branch"
+
+msgid "checkout our version for unmerged files"
+msgstr "fazer checkout da nossa versão para arquivos não mesclados"
+
+msgid "checkout their version for unmerged files"
+msgstr "fazer checkout da versão deles para arquivos não mesclados"
+
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "não limitar pathspecs apenas a entradas esparsas"
+
+msgid "git checkout [<options>] <branch>"
+msgstr "git checkout [<options>] <branch>"
+
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr "git checkout [<options>] [<branch>] -- <file>..."
+
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<options>] [<branch>]"
+
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<options>] [--source=<branch>] <file>..."
+
+#, c-format
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "as opções '-%c', '-%c' e '%s' não podem ser usadas juntas"
+
+msgid "--track needs a branch name"
+msgstr "--track precisa de um nome de branch"
+
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "nome do branch ausente; tente -%c"
+
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "não foi possível resolver '%s'"
+
+msgid "invalid path specification"
+msgstr "especificação de caminho inválida"
+
+#, c-format
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgstr ""
+"'%s' não é um commit e um branch '%s' não pode ser criado a partir dele"
+
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr "git checkout: --detach não aceita um argumento de caminho '%s'"
+
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+"git checkout: --ours/--theirs, --force e --merge são incompatíveis ao\n"
+"fazer checkout a partir do índice."
+
+msgid "you must specify path(s) to restore"
+msgstr "você deve especificar o(s) caminho(s) para restaurar"
+
+msgid "create and checkout a new branch"
+msgstr "criar e fazer checkout de um novo branch"
+
+msgid "create/reset and checkout a branch"
+msgstr "criar/redefinir e fazer checkout de um branch"
+
+msgid "create reflog for new branch"
+msgstr "criar reflog para nova branch"
+
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "segundo palpite 'git checkout <no-such-branch>' (padrão)"
+
+msgid "use overlay mode (default)"
+msgstr "usar o modo de sobreposição (padrão)"
+
+msgid "create and switch to a new branch"
+msgstr "criar e mudar para um novo branch"
+
+msgid "create/reset and switch to a branch"
+msgstr "criar/redefinir e mudar para um branch"
+
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "segundo palpite 'git switch <no-such-branch>'"
+
+msgid "throw away local modifications"
+msgstr "descartar as modificações locais"
+
+msgid "which tree-ish to checkout from"
+msgstr "de qual tree-ish fazer o checkout"
+
+msgid "restore the index"
+msgstr "restaurar o índice"
+
+msgid "restore the working tree (default)"
+msgstr "restaurar a árvore de trabalho (padrão)"
+
+msgid "ignore unmerged entries"
+msgstr "ignorar entradas não mescladas"
+
+msgid "use overlay mode"
+msgstr "usar o modo de sobreposição"
+
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "
+"[<pathspec>...]"
+msgstr ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "
+"[<pathspec>...]"
+
+#, c-format
+msgid "Removing %s\n"
+msgstr "Removendo %s\n"
+
+#, c-format
+msgid "Would remove %s\n"
+msgstr "Removeria %s\n"
+
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr "Ignorando o repositório %s\n"
+
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr "Ignoraria o repositório %s\n"
+
+#, c-format
+msgid "failed to remove %s"
+msgstr "falha ao remover %s"
+
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "não foi possível executar lstat em %s\n"
+
+msgid "Refusing to remove current working directory\n"
+msgstr "Recusando-se a remover o diretório de trabalho atual\n"
+
+msgid "Would refuse to remove current working directory\n"
+msgstr "Se recusaria a remover o diretório de trabalho atual\n"
+
+#, 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 ""
+"Ajuda do prompt:\n"
+"1          - selecionar um item numerado\n"
+"foo        - selecionar item baseado num prefixo único\n"
+"           - (vazio) não selecionar nada\n"
+
+#, 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 ""
+"Ajuda do prompt:\n"
+"1          - selecionar um único item\n"
+"3-5        - selecionar um intervalo de itens\n"
+"2-3,6-9    - selecionar múltiplos intervalos\n"
+"foo        - selecionar item baseado num prefixo único\n"
+"-...       - cancelar seleção de itens especificados\n"
+"*          - escolher todos os itens\n"
+"           - (vazio) concluir seleção\n"
+
+#, c-format
+msgid "Huh (%s)?\n"
+msgstr "Hein (%s)?\n"
+
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr "Inserir padrões de ignorar>> "
+
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr "AVISO: Não é possível encontrar itens correspondentes a: %s"
+
+msgid "Select items to delete"
+msgstr "Selecione os itens para excluir"
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr "Remover %s [y/N]? "
+
+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               - iniciar limpeza\n"
+"filter by pattern   - excluir itens da remoção\n"
+"select by numbers   - selecionar itens a serem removidos por números\n"
+"ask each            - confirmar cada remoção (como \"rm -i\")\n"
+"quit                - interromper limpeza\n"
+"help                - esta tela\n"
+"?                   - ajuda para seleção do prompt"
+
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] "Removeria o seguinte item:"
+msgstr[1] "Removeria os seguintes itens:"
+
+msgid "No more files to clean, exiting."
+msgstr "Não há mais arquivos para limpar, saindo."
+
+msgid "do not print names of files removed"
+msgstr "não imprimir os nomes dos arquivos removidos"
+
+msgid "force"
+msgstr "forçar"
+
+msgid "interactive cleaning"
+msgstr "limpeza interativa"
+
+msgid "remove whole directories"
+msgstr "remover diretórios inteiros"
+
+msgid "add <pattern> to ignore rules"
+msgstr "adicionar <pattern> às regras de ignorar"
+
+msgid "remove ignored files, too"
+msgstr "remover também os arquivos ignorados"
+
+msgid "remove only ignored files"
+msgstr "remover apenas os arquivos ignorados"
+
+msgid "clean.requireForce is true and -f not given: refusing to clean"
+msgstr "clean.requireForce é true e -f não fornecido: recusando-se a limpar"
+
+#, c-format
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr "info: Não foi possível adicionar alternativa para '%s': %s\n"
+
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "falha ao executar stat em '%s'"
+
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "%s existe e não é um diretório"
+
+#, c-format
+msgid "'%s' is a symlink, refusing to clone with --local"
+msgstr "'%s' é um link simbólico, recusando-se a clonar com --local"
+
+#, c-format
+msgid "failed to start iterator over '%s'"
+msgstr "falha ao iniciar o iterador sobre '%s'"
+
+#, c-format
+msgid "symlink '%s' exists, refusing to clone with --local"
+msgstr "o link simbólico '%s' existe, recusando-se a clonar com --local"
+
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "falha ao desvincular '%s'"
+
+#, c-format
+msgid "hardlink cannot be checked at '%s'"
+msgstr "hardlink não pode ser verificado em '%s'"
+
+#, c-format
+msgid "hardlink different from source at '%s'"
+msgstr "hardlink diferente da fonte em '%s'"
+
+#, c-format
+msgid "failed to create link '%s'"
+msgstr "falha ao criar o link '%s'"
+
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr "falha ao copiar o arquivo para '%s'"
+
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "falha ao iterar sobre '%s'"
+
+#, c-format
+msgid "done.\n"
+msgstr "concluído.\n"
+
+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 ""
+"A clonagem foi bem-sucedida, mas o checkout falhou.\n"
+"Você pode inspecionar o que foi extraído com 'git status'\n"
+"e tentar novamente com 'git restore --source=HEAD :/'\n"
+
+msgid "remote did not send all necessary objects"
+msgstr "remoto não enviou todos os objetos necessários"
+
+#, c-format
+msgid "unable to update %s"
+msgstr "não foi possível atualizar %s"
+
+msgid "failed to initialize sparse-checkout"
+msgstr "falha ao inicializar o checkout esparso"
+
+msgid "remote HEAD refers to nonexistent ref, unable to checkout"
+msgstr ""
+"o HEAD remoto se refere a uma ref inexistente, não foi possível fazer "
+"checkout"
+
+msgid "unable to checkout working tree"
+msgstr "não foi possível fazer checkout da árvore de trabalho"
+
+msgid "unable to write parameters to config file"
+msgstr "não foi possível gravar os parâmetros no arquivo de configuração"
+
+msgid "cannot repack to clean up"
+msgstr "não é possível fazer repack para limpar"
+
+msgid "cannot unlink temporary alternates file"
+msgstr "não é possível desvincular o arquivo alternativo temporário"
+
+msgid "don't clone shallow repository"
+msgstr "não clonar repositório raso"
+
+msgid "don't create a checkout"
+msgstr "não criar um checkout"
+
+msgid "create a bare repository"
+msgstr "criar um repositório bare"
+
+msgid "create a mirror repository (implies --bare)"
+msgstr "criar um repositório espelho (implica --bare)"
+
+msgid "to clone from a local repository"
+msgstr "clonar de um repositório local"
+
+msgid "don't use local hardlinks, always copy"
+msgstr "não usar hardlinks locais, sempre copiar"
+
+msgid "setup as shared repository"
+msgstr "configurar como repositório compartilhado"
+
+msgid "pathspec"
+msgstr "especificação de caminho"
+
+msgid "initialize submodules in the clone"
+msgstr "inicializar submódulos no clone"
+
+msgid "number of submodules cloned in parallel"
+msgstr "número de submódulos clonados em paralelo"
+
+msgid "template-directory"
+msgstr "diretório de modelo"
+
+msgid "directory from which templates will be used"
+msgstr "diretório a partir do qual os modelos serão usados"
+
+msgid "reference repository"
+msgstr "repositório de referência"
+
+msgid "use --reference only while cloning"
+msgstr "use --reference apenas durante a clonagem"
+
+msgid "name"
+msgstr "nome"
+
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr "usar <name> em vez de 'origin' para rastrear o upstream"
+
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr "fazer checkout do <branch> em vez do HEAD do remoto"
+
+msgid "clone single revision <rev> and check out"
+msgstr "clonar a revisão única <rev> e fazer checkout"
+
+msgid "path to git-upload-pack on the remote"
+msgstr "caminho para o git-upload-pack no remoto"
+
+msgid "depth"
+msgstr "profundidade"
+
+msgid "create a shallow clone of that depth"
+msgstr "criar um clone raso dessa profundidade"
+
+msgid "create a shallow clone since a specific time"
+msgstr "criar um clone raso desde um horário específico"
+
+msgid "ref"
+msgstr "referência"
+
+msgid "deepen history of shallow clone, excluding ref"
+msgstr "aprofundar o histórico do clone raso, excluindo ref"
+
+msgid "clone only one branch, HEAD or --branch"
+msgstr "clonar apenas um branch, HEAD ou --branch"
+
+msgid "clone tags, and make later fetches not to follow them"
+msgstr "clonar tags e fazer com que fetches posteriores não as sigam"
+
+msgid "any cloned submodules will be shallow"
+msgstr "quaisquer submódulos clonados serão superficiais"
+
+msgid "gitdir"
+msgstr "gitdir"
+
+msgid "separate git dir from working tree"
+msgstr "separar o diretório git da árvore de trabalho"
+
+msgid "specify the reference format to use"
+msgstr "especificar o formato de referência a ser usado"
+
+msgid "key=value"
+msgstr "chave=valor"
+
+msgid "set config inside the new repository"
+msgstr "definir configuração dentro do novo repositório"
+
+msgid "server-specific"
+msgstr "específico do servidor"
+
+msgid "option to transmit"
+msgstr "opção de transmitir"
+
+msgid "apply partial clone filters to submodules"
+msgstr "aplicar filtros de clone parcial a submódulos"
+
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "quaisquer submódulos clonados usarão seu branch de rastreamento remoto"
+
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr ""
+"inicializar o arquivo sparse-checkout para incluir apenas arquivos na raiz"
+
+msgid "uri"
+msgstr "uri"
+
+msgid "a URI for downloading bundles before fetching from origin remote"
+msgstr "um URI para baixar bundles antes de fazer fetch do remoto origin"
+
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [<options>] [--] <repo> [<dir>]"
+
+msgid "Too many arguments."
+msgstr "Muitos argumentos."
+
+msgid "You must specify a repository to clone."
+msgstr "Você deve especificar um repositório para clonar."
+
+#, c-format
+msgid "unknown ref storage format '%s'"
+msgstr "formato de armazenamento de referência desconhecido '%s'"
+
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr "o repositório '%s' não existe"
+
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr "profundidade %s não é um número positivo"
+
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr "o caminho de destino '%s' já existe e não é um diretório vazio."
+
+#, c-format
+msgid "repository path '%s' already exists and is not an empty directory."
+msgstr "o caminho do repositório '%s' já existe e não é um diretório vazio."
+
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr "a árvore de trabalho '%s' já existe."
+
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "não foi possível criar diretórios principais de '%s'"
+
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr "não foi possível criar o diretório da árvore de trabalho '%s'"
+
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr "Clonando no repositório bare '%s'...\n"
+
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr "Clonando em '%s'...\n"
+
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+"clone --recursive não é compatível com --reference e --reference-if-able"
+
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' não é um nome remoto válido"
+
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr "--depth é ignorado em clones locais; use file:// em vez disso."
+
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr "--shallow-since é ignorado em clones locais; use file:// em vez disso."
+
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr ""
+"--shallow-exclude é ignorado em clones locais; use file:// em vez disso."
+
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr "--filter é ignorado em clones locais; use file:// em vez disso."
+
+msgid "source repository is shallow, reject to clone."
+msgstr "o repositório de origem é raso, recusando-se a clonar."
+
+msgid "source repository is shallow, ignoring --local"
+msgstr "o repositório de origem é raso, ignorando --local"
+
+msgid "--local is ignored"
+msgstr "--local é ignorado"
+
+msgid "cannot clone from filtered bundle"
+msgstr "não é possível clonar de um bundle filtrado"
+
+msgid "failed to initialize the repo, skipping bundle URI"
+msgstr "falha ao inicializar o repositório, ignorando a URI de bundle"
+
+#, c-format
+msgid "failed to fetch objects from bundle URI '%s'"
+msgstr "falha ao buscar objetos da URI de bundle '%s'"
+
+msgid "failed to fetch advertised bundles"
+msgstr "falha ao buscar os bundles anunciados"
+
+msgid "remote transport reported error"
+msgstr "erro relatado de transporte remoto"
+
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr "Branch remoto %s não encontrado no upstream %s"
+
+#, c-format
+msgid "Remote revision %s not found in upstream %s"
+msgstr "Revisão remota %s não encontrada no upstream %s"
+
+msgid "You appear to have cloned an empty repository."
+msgstr "Parece que você clonou um repositório vazio."
+
+msgid "git column [<options>]"
+msgstr "git column [<options>]"
+
+msgid "lookup config vars"
+msgstr "pesquisar variáveis de configuração"
+
+msgid "layout to use"
+msgstr "layout para ser usado"
+
+msgid "maximum width"
+msgstr "largura máxima"
+
+msgid "padding space on left border"
+msgstr "espaço de preenchimento na borda esquerda"
+
+msgid "padding space on right border"
+msgstr "espaço de preenchimento na borda direita"
+
+msgid "padding space between columns"
+msgstr "espaço de preenchimento entre as colunas"
+
+#, c-format
+msgid "%s must be non-negative"
+msgstr "%s deve ser não negativo"
+
+msgid "--command must be the first argument"
+msgstr "--command deve ser o primeiro argumento"
+
+msgid ""
+"git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]"
+msgstr ""
+"git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]"
+
+msgid ""
+"git commit-graph write [--object-dir <dir>] [--append]\n"
+"                       [--split[=<strategy>]] [--reachable | --stdin-packs | "
+"--stdin-commits]\n"
+"                       [--changed-paths] [--[no-]max-new-filters <n>] [--"
+"[no-]progress]\n"
+"                       <split-options>"
+msgstr ""
+"git commit-graph write [--object-dir <dir>] [--append]\n"
+"                       [--split[=<strategy>]] [--reachable | --stdin-packs | "
+"--stdin-commits]\n"
+"                       [--changed-paths] [--[no-]max-new-filters <n>] [--"
+"[no-]progress]\n"
+"                       <split-options>"
+
+msgid "dir"
+msgstr "dir"
+
+msgid "the object directory to store the graph"
+msgstr "o diretório de objetos para armazenar o grafo"
+
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr "se o commit-graph está dividido, verificar apenas o arquivo tip"
+
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Não foi possível abrir o commit-graph '%s'"
+
+#, c-format
+msgid "could not open commit-graph chain '%s'"
+msgstr "não foi possível abrir a cadeia de commit-graph '%s'"
+
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "argumento --split não reconhecido, %s"
+
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "ID de objeto não hexadecimal inesperado: %s"
+
+#, c-format
+msgid "invalid object: %s"
+msgstr "objeto inválido: %s"
+
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "a opção '%s' espera um valor numérico"
+
+msgid "start walk at all refs"
+msgstr "iniciar travessia em todas as refs"
+
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "escanear os pack-indexes listados por stdin por commits"
+
+msgid "start walk at commits listed by stdin"
+msgstr "iniciar travessia nos commits listados por stdin"
+
+msgid "include all commits already in the commit-graph file"
+msgstr "incluir todos os commits já no arquivo commit-graph"
+
+msgid "enable computation for changed paths"
+msgstr "habilitar computação para caminhos modificados"
+
+msgid "allow writing an incremental commit-graph file"
+msgstr "permitir a escrita de um arquivo commit-graph incremental"
+
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr "número máximo de commits em um commit-graph dividido não-base"
+
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "proporção máxima entre dois níveis de um commit-graph dividido"
+
+msgid "only expire files older than a given date-time"
+msgstr "expirar apenas arquivos mais antigos que uma data/hora fornecida"
+
+msgid "maximum number of changed-path Bloom filters to compute"
+msgstr "número máximo de filtros Bloom de caminhos modificados a computar"
+
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr "usar no máximo um entre --reachable, --stdin-commits ou --stdin-packs"
+
+msgid "Collecting commits from input"
+msgstr "Coletando commits da entrada"
+
+msgid "git commit-tree <tree> [(-p <parent>)...]"
+msgstr "git commit-tree <tree> [(-p <parent>)...]"
+
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n"
+"                [(-F <file>)...] <tree>"
+msgstr ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n"
+"                [(-F <file>)...] <tree>"
+
+#, c-format
+msgid "duplicate parent %s ignored"
+msgstr "pai %s duplicado ignorado"
+
+#, c-format
+msgid "not a valid object name %s"
+msgstr "não é um nome de objeto válido %s"
+
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git commit-tree: falha ao ler '%s'"
+
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr "git commit-tree: falha ao fechar '%s'"
+
+msgid "parent"
+msgstr "pai"
+
+msgid "id of a parent commit object"
+msgstr "id de um objeto de commit pai"
+
+msgid "message"
+msgstr "mensagem"
+
+msgid "commit message"
+msgstr "mensagem de commit"
+
+msgid "read commit log message from file"
+msgstr "ler mensagem de log de commit do arquivo"
+
+msgid "GPG sign commit"
+msgstr "assinar o commit com GPG"
+
+msgid "must give exactly one tree"
+msgstr "deve fornecer exatamente uma tree"
+
+msgid "git commit-tree: failed to read"
+msgstr "git commit-tree: falha ao ler"
+
+msgid ""
+"git commit [-a | --interactive | --patch] [-s] [-v] [-u[<mode>]] [--amend]\n"
+"           [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|"
+"reword):]<commit>]\n"
+"           [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n"
+"           [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n"
+"           [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n"
+"           [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"           [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n"
+"           [--] [<pathspec>...]"
+msgstr ""
+"git commit [-a | --interactive | --patch] [-s] [-v] [-u[<mode>]] [--amend]\n"
+"           [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|"
+"reword):]<commit>]\n"
+"           [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n"
+"           [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n"
+"           [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n"
+"           [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"           [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n"
+"           [--] [<pathspec>...]"
+
+msgid "git status [<options>] [--] [<pathspec>...]"
+msgstr "git status [<options>] [--] [<pathspec>...]"
+
+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 ""
+"Você pediu para fazer um amend no commit mais recente, mas fazer isso o "
+"tornaria\n"
+"vazio. Você pode repetir o seu comando com --allow-empty, ou você pode\n"
+"remover o commit inteiramente com \"git reset HEAD^\".\n"
+
+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 ""
+"O cherry-pick anterior agora está vazio, possivelmente devido à resolução de "
+"conflitos.\n"
+"Se você deseja fazer o commit de qualquer maneira, use:\n"
+"\n"
+"    git commit --allow-empty\n"
+"\n"
+
+msgid "Otherwise, please use 'git rebase --skip'\n"
+msgstr "Caso contrário, por favor, use 'git rebase --skip'\n"
+
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "Caso contrário, por favor, use 'git cherry-pick --skip'\n"
+
+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 ""
+"e então use:\n"
+"\n"
+"    git cherry-pick --continue\n"
+"\n"
+"para retomar o cherry-pick dos commits restantes.\n"
+"Se você deseja pular este commit, use:\n"
+"\n"
+"    git cherry-pick --skip\n"
+"\n"
+
+msgid "updating files failed"
+msgstr "falha ao atualizar os arquivos"
+
+msgid "failed to unpack HEAD tree object"
+msgstr "falha ao descompactar o objeto tree de HEAD"
+
+msgid "No paths with --include/--only does not make sense."
+msgstr "Nenhum caminho com --include/--only não faz sentido."
+
+msgid "unable to create temporary index"
+msgstr "não foi possível criar o índice temporário"
+
+msgid "interactive add failed"
+msgstr "falha na adição interativa"
+
+msgid "unable to update temporary index"
+msgstr "não foi possível atualizar o índice temporário"
+
+msgid "Failed to update main cache tree"
+msgstr "Falha ao atualizar a tree do cache principal"
+
+msgid "cannot do a partial commit during a merge."
+msgstr "não é possível fazer um commit parcial durante um merge."
+
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr "não é possível fazer um commit parcial durante um cherry-pick."
+
+msgid "cannot do a partial commit during a rebase."
+msgstr "não é possível fazer um commit parcial durante um rebase."
+
+msgid "cannot read the index"
+msgstr "não é possível ler o índice"
+
+msgid "unable to write temporary index file"
+msgstr "não foi possível gravar o arquivo de índice temporário"
+
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr "commit '%s' não possui cabeçalho de autor"
+
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr "commit '%s' tem linha de autor malformada"
+
+msgid "malformed --author parameter"
+msgstr "parâmetro --author malformado"
+
+#, c-format
+msgid "invalid date format: %s"
+msgstr "formato de data inválido: %s"
+
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr ""
+"não foi possível selecionar um caractere de comentário que não seja usado\n"
+"na mensagem atual do commit"
+
+#, c-format
+msgid "could not lookup commit '%s'"
+msgstr "não foi possível localizar o commit '%s'"
+
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr "(lendo mensagem de log da entrada padrão)\n"
+
+msgid "could not read log from standard input"
+msgstr "não foi possível ler o log da entrada padrão"
+
+#, c-format
+msgid "could not read log file '%s'"
+msgstr "não foi possível ler o arquivo de log '%s'"
+
+#, c-format
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "as opções '%s' e '%s:%s' não podem ser usadas juntas"
+
+msgid "could not read SQUASH_MSG"
+msgstr "não foi possível ler SQUASH_MSG"
+
+msgid "could not read MERGE_MSG"
+msgstr "não foi possível ler MERGE_MSG"
+
+#, c-format
+msgid "could not open '%s'"
+msgstr "não foi possível abrir '%s'"
+
+msgid "could not write commit template"
+msgstr "não foi possível gravar o modelo de commit"
+
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%s' will be ignored.\n"
+msgstr ""
+"Por favor, insira a mensagem de commit para as suas alterações. Linhas que "
+"começam\n"
+"com '%s' serão ignoradas.\n"
+
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%s' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"Por favor, insira a mensagem de commit para as suas alterações. Linhas que "
+"começam\n"
+"com '%s' serão ignoradas, e uma mensagem vazia aborta o commit.\n"
+
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%s' will be kept; you may remove them yourself if you want to.\n"
+msgstr ""
+"Por favor, insira a mensagem de commit para as suas alterações. Linhas que "
+"começam\n"
+"com '%s' serão mantidas; você mesmo pode removê-las se quiser.\n"
+
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%s' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"Por favor, insira a mensagem de commit para as suas alterações. Linhas que "
+"começam\n"
+"com '%s' serão mantidas; você mesmo pode removê-las se quiser.\n"
+"Uma mensagem vazia aborta o commit.\n"
+
+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"
+"Parece que você pode estar fazendo um commit de um merge.\n"
+"Se isso não estiver correto, por favor, execute\n"
+"\tgit update-ref -d MERGE_HEAD\n"
+"e tente novamente.\n"
+
+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"
+"Parece que você pode estar fazendo um commit de um cherry-pick.\n"
+"Se isso não estiver correto, por favor, execute\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
+"e tente novamente.\n"
+
+#, c-format
+msgid "%sAuthor:    %.*s <%.*s>"
+msgstr "%sAutor:    %.*s <%.*s>"
+
+#, c-format
+msgid "%sDate:      %s"
+msgstr "%sData:      %s"
+
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr "%sCommitter: %.*s <%.*s>"
+
+msgid "Cannot read index"
+msgstr "Não é possível ler o índice"
+
+msgid "unable to pass trailers to --trailers"
+msgstr "não foi possível passar trailers para --trailers"
+
+msgid "Error building trees"
+msgstr "Erro ao construir trees"
+
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr "Por favor, forneça a mensagem usando a opção -m ou -F.\n"
+
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgstr ""
+"--author '%s' não é 'Nome <email>' e não corresponde a nenhum autor existente"
+
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "Modo de ignorados inválido '%s'"
+
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr "Modo de arquivos não rastreados inválido '%s'"
+
+msgid "You are in the middle of a merge -- cannot reword."
+msgstr "Você está no meio de um merge -- não é possível reescrever a mensagem."
+
+msgid "You are in the middle of a cherry-pick -- cannot reword."
+msgstr ""
+"Você está no meio de um cherry-pick -- não é possível reescrever a mensagem."
+
+#, c-format
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr "a opção reword de '%s' e o caminho '%s' não podem ser usados juntos"
+
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "a opção reword de '%s' e '%s' não podem ser usadas juntas"
+
+msgid "You have nothing to amend."
+msgstr "Você não tem nada para fazer amend."
+
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr "Você está no meio de um merge -- não é possível fazer amend."
+
+msgid "You are in the middle of a cherry-pick -- cannot amend."
+msgstr "Você está no meio de um cherry-pick -- não é possível fazer amend."
+
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "Você está no meio de um rebase -- não é possível fazer amend."
+
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr "--reset-author só pode ser usado com -C, -c ou --amend."
+
+#, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr "opção desconhecida: --fixup=%s:%s"
+
+#, c-format
+msgid "paths '%s ...' with -a does not make sense"
+msgstr "caminhos '%s ...' com -a não fazem sentido"
+
+msgid "show status concisely"
+msgstr "mostrar status de forma concisa"
+
+msgid "show branch information"
+msgstr "mostrar informações do branch"
+
+msgid "show stash information"
+msgstr "mostrar informações do stash"
+
+msgid "compute full ahead/behind values"
+msgstr "computar valores completos de ahead/behind"
+
+msgid "version"
+msgstr "versão"
+
+msgid "machine-readable output"
+msgstr "saída legível por máquina"
+
+msgid "show status in long format (default)"
+msgstr "mostrar status em formato longo (padrão)"
+
+msgid "terminate entries with NUL"
+msgstr "terminar entradas com NUL"
+
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+msgstr ""
+"mostrar arquivos não rastreados, modos opcionais: all, normal, no. (Padrão: "
+"all)"
+
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+"mostrar arquivos ignorados, modos opcionais: traditional, matching, no. "
+"(Padrão: traditional)"
+
+msgid "when"
+msgstr "quando"
+
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+"ignorar alterações em submódulos, opcional quando: all, dirty, untracked. "
+"(Padrão: all)"
+
+msgid "list untracked files in columns"
+msgstr "listar arquivos não rastreados em colunas"
+
+msgid "do not detect renames"
+msgstr "não detectar renomeações"
+
+msgid "detect renames, optionally set similarity index"
+msgstr "detectar renomeações, opcionalmente definir índice de similaridade"
+
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr ""
+"Combinação não suportada de argumentos de arquivos ignorados e não rastreados"
+
+msgid "suppress summary after successful commit"
+msgstr "suprimir resumo após commit bem-sucedido"
+
+msgid "show diff in commit message template"
+msgstr "mostrar diff no modelo de mensagem do commit"
+
+msgid "Commit message options"
+msgstr "Opções da mensagem de commit"
+
+msgid "read message from file"
+msgstr "ler mensagem de um arquivo"
+
+msgid "author"
+msgstr "autor"
+
+msgid "override author for commit"
+msgstr "substituir autor do commit"
+
+msgid "date"
+msgstr "data"
+
+msgid "override date for commit"
+msgstr "substituir data do commit"
+
+msgid "commit"
+msgstr "commit"
+
+msgid "reuse and edit message from specified commit"
+msgstr "reutilizar e editar mensagem do commit especificado"
+
+msgid "reuse message from specified commit"
+msgstr "reutilizar mensagem do commit especificado"
+
+#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
+#. and only translate <commit>.
+#.
+msgid "[(amend|reword):]commit"
+msgstr "[(amend|reword):]commit"
+
+msgid ""
+"use autosquash formatted message to fixup or amend/reword specified commit"
+msgstr ""
+"usar mensagem formatada do autosquash para fazer fixup ou amend/reword no "
+"commit especificado"
+
+msgid "use autosquash formatted message to squash specified commit"
+msgstr ""
+"usar mensagem formatada do autosquash para fazer squash no commit "
+"especificado"
+
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
+msgstr "o commit é de minha autoria agora (usado com -C/-c/--amend)"
+
+msgid "trailer"
+msgstr "trailer"
+
+msgid "add custom trailer(s)"
+msgstr "adicionar trailer(s) personalizado(s)"
+
+msgid "add a Signed-off-by trailer"
+msgstr "adicionar um trailer Signed-off-by"
+
+msgid "use specified template file"
+msgstr "usar arquivo de modelo especificado"
+
+msgid "force edit of commit"
+msgstr "forçar a edição do commit"
+
+msgid "include status in commit message template"
+msgstr "incluir status no modelo de mensagem do commit"
+
+msgid "Commit contents options"
+msgstr "Opções de conteúdo do commit"
+
+msgid "commit all changed files"
+msgstr "fazer commit de todos os arquivos modificados"
+
+msgid "add specified files to index for commit"
+msgstr "adicionar os arquivos especificados ao índice para o commit"
+
+msgid "interactively add files"
+msgstr "adicionar arquivos interativamente"
+
+msgid "interactively add changes"
+msgstr "adicionar alterações interativamente"
+
+msgid "commit only specified files"
+msgstr "fazer o commit apenas de arquivos especificados"
+
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "ignorar hooks pre-commit e commit-msg"
+
+msgid "show what would be committed"
+msgstr "mostrar o que seria commitado"
+
+msgid "amend previous commit"
+msgstr "fazer amend do commit anterior"
+
+msgid "bypass post-rewrite hook"
+msgstr "ignorar o hook post-rewrite"
+
+msgid "ok to record an empty change"
+msgstr "ok para gravar uma alteração vazia"
+
+msgid "ok to record a change with an empty message"
+msgstr "ok para gravar uma alteração com uma mensagem vazia"
+
+msgid "could not parse HEAD commit"
+msgstr "não foi possível analisar o commit do HEAD"
+
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr "Arquivo MERGE_HEAD corrompido (%s)"
+
+msgid "could not read MERGE_MODE"
+msgstr "não foi possível ler MERGE_MODE"
+
+#, c-format
+msgid "could not read commit message: %s"
+msgstr "não foi possível ler a mensagem de commit: %s"
+
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr "Abortando commit devido à mensagem de commit vazia.\n"
+
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "Abortando commit; você não editou a mensagem.\n"
+
+#, c-format
+msgid "Aborting commit due to empty commit message body.\n"
+msgstr "Abortando commit devido ao corpo da mensagem de commit vazio.\n"
+
+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 ""
+"o repositório foi atualizado, mas não foi possível escrever\n"
+"o novo arquivo de índice. Verifique se o disco não está cheio e se a cota\n"
+"não foi excedida e, em seguida, execute \"git restore --staged :/\" para "
+"recuperar."
+
+msgid "git config list [<file-option>] [<display-option>] [--includes]"
+msgstr "git config list [<file-option>] [<display-option>] [--includes]"
+
+msgid ""
+"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
+"regexp] [--value=<pattern>] [--fixed-value] [--default=<default>] [--"
+"url=<url>] <name>"
+msgstr ""
+"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
+"regexp] [--value=<pattern>] [--fixed-value] [--default=<default>] [--"
+"url=<url>] <name>"
+
+msgid ""
+"git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] "
+"[--fixed-value] <name> <value>"
+msgstr ""
+"git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] "
+"[--fixed-value] <name> <value>"
+
+msgid ""
+"git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "
+"<name>"
+msgstr ""
+"git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "
+"<name>"
+
+msgid "git config rename-section [<file-option>] <old-name> <new-name>"
+msgstr "git config rename-section [<file-option>] <old-name> <new-name>"
+
+msgid "git config remove-section [<file-option>] <name>"
+msgstr "git config remove-section [<file-option>] <name>"
+
+msgid "git config edit [<file-option>]"
+msgstr "git config edit [<file-option>]"
+
+msgid "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]"
+msgstr "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]"
+
+msgid ""
+"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
+"regexp=<regexp>] [--value=<pattern>] [--fixed-value] [--default=<default>] "
+"<name>"
+msgstr ""
+"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
+"regexp=<regexp>] [--value=<pattern>] [--fixed-value] [--default=<default>] "
+"<name>"
+
+msgid ""
+"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "
+"[--value=<pattern>] [--fixed-value] <name> <value>"
+msgstr ""
+"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "
+"[--value=<pattern>] [--fixed-value] <name> <value>"
+
+msgid "Config file location"
+msgstr "Localização do arquivo de configuração"
+
+msgid "use global config file"
+msgstr "usar arquivo de configuração global"
+
+msgid "use system config file"
+msgstr "usar arquivo de configuração do sistema"
+
+msgid "use repository config file"
+msgstr "usar arquivo de configuração do repositório"
+
+msgid "use per-worktree config file"
+msgstr "usar arquivo de configuração por worktree"
+
+msgid "use given config file"
+msgstr "usar o arquivo de configuração fornecido"
+
+msgid "blob-id"
+msgstr "blob-id"
+
+msgid "read config from given blob object"
+msgstr "ler configuração do objeto blob fornecido"
+
+msgid "Type"
+msgstr "Tipo"
+
+msgid "type"
+msgstr "tipo"
+
+msgid "value is given this type"
+msgstr "o valor é deste tipo"
+
+msgid "value is \"true\" or \"false\""
+msgstr "o valor é \"true\" ou \"false\""
+
+msgid "value is decimal number"
+msgstr "o valor é um número decimal"
+
+msgid "value is --bool or --int"
+msgstr "o valor é --bool ou --int"
+
+msgid "value is --bool or string"
+msgstr "o valor é --bool ou string"
+
+msgid "value is a path (file or directory name)"
+msgstr "o valor é um caminho (nome de arquivo ou diretório)"
+
+msgid "value is an expiry date"
+msgstr "o valor é uma data de validade"
+
+msgid "Display options"
+msgstr "Opções de exibição"
+
+msgid "terminate values with NUL byte"
+msgstr "terminar valores com byte NUL"
+
+msgid "show variable names only"
+msgstr "mostrar apenas nomes de variáveis"
+
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr ""
+"mostrar origem da configuração (arquivo, entrada padrão, blob, linha de "
+"comando)"
+
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"mostrar escopo da configuração (worktree, local, global, system, command)"
+
+msgid "show config keys in addition to their values"
+msgstr "mostrar chaves de configuração além de seus valores"
+
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr "argumento --type não reconhecido, %s"
+
+msgid "only one type at a time"
+msgstr "apenas um tipo por vez"
+
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr "número errado de argumentos, deveria ser %d"
+
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr "número errado de argumentos, deveria ser de %d a %d"
+
+#, c-format
+msgid "missing value to set to the variable '%s'"
+msgstr "valor ausente para definir na variável '%s'"
+
+#, c-format
+msgid "did you mean \"git config set %s %s\"?"
+msgstr "você quis dizer \"git config set %s %s\"?"
+
+#, c-format
+msgid "missing value to set to a variable with an invalid name '%s'"
+msgstr "valor ausente para definir em uma variável com um nome inválido '%s'"
+
+#, c-format
+msgid "invalid key pattern: %s"
+msgstr "padrão de chave inválido: %s"
+
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "padrão inválido: %s"
+
+#, c-format
+msgid "failed to format default config value: %s"
+msgstr "falha ao formatar o valor padrão de configuração: %s"
+
+#, c-format
+msgid "cannot parse color '%s'"
+msgstr "não é possível analisar a cor '%s'"
+
+msgid "unable to parse default color value"
+msgstr "não foi possível analisar o valor de cor padrão"
+
+msgid "not in a git directory"
+msgstr "não está em um diretório git"
+
+msgid "writing to stdin is not supported"
+msgstr "não há suporte para escrita na entrada padrão"
+
+msgid "writing config blobs is not supported"
+msgstr "não há suporte para escrever blobs de configuração"
+
+#, 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 ""
+"# Este é o arquivo de configuração por usuário do Git.\n"
+"[user]\n"
+"# Por favor, adapte e descomente as seguintes linhas:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+
+msgid "only one config file at a time"
+msgstr "apenas um arquivo de configuração por vez"
+
+msgid "--local can only be used inside a git repository"
+msgstr "--local só pode ser usado dentro de um repositório git"
+
+msgid "--blob can only be used inside a git repository"
+msgstr "--blob só pode ser usado dentro de um repositório git"
+
+msgid "--worktree can only be used inside a git repository"
+msgstr "--worktree só pode ser usado dentro de um repositório git"
+
+msgid "$HOME not set"
+msgstr "$HOME não definido"
+
+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 não pode ser usado com múltiplas árvores de trabalho a menos que "
+"a extensão\n"
+"de configuração worktreeConfig esteja habilitada. Por favor, leia a seção "
+"\"CONFIGURATION FILE\"\n"
+"em \"git help worktree\" para obter detalhes"
+
+msgid "Other"
+msgstr "Outros"
+
+msgid "respect include directives on lookup"
+msgstr "respeitar diretivas de inclusão na consulta"
+
+#, c-format
+msgid "unable to read config file '%s'"
+msgstr "não foi possível ler o arquivo de configuração '%s'"
+
+msgid "error processing config file(s)"
+msgstr "erro ao processar o(s) arquivo(s) de configuração"
+
+msgid "Filter options"
+msgstr "Opções de filtro"
+
+msgid "return all values for multi-valued config options"
+msgstr ""
+"retornar todos os valores para opções de configuração com múltiplos valores"
+
+msgid "interpret the name as a regular expression"
+msgstr "interpretar o nome como uma expressão regular"
+
+msgid "show config with values matching the pattern"
+msgstr "mostrar configuração com valores que correspondam ao padrão"
+
+msgid "use string equality when comparing values to value pattern"
+msgstr "usar igualdade de string ao comparar valores com o padrão de valor"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "show config matching the given URL"
+msgstr "mostrar configuração que corresponda à URL fornecida"
+
+msgid "value"
+msgstr "valor"
+
+msgid "use default value when missing entry"
+msgstr "usar valor padrão quando a entrada estiver ausente"
+
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value se aplica apenas com 'value-pattern'"
+
+msgid "--default= cannot be used with --all or --url="
+msgstr "--default= não pode ser usado com --all ou --url="
+
+msgid "--url= cannot be used with --all, --regexp or --value"
+msgstr "--url= não pode ser usado com --all, --regexp ou --value"
+
+msgid "Filter"
+msgstr "Filtro"
+
+msgid "replace multi-valued config option with new value"
+msgstr "substituir opção de configuração com múltiplos valores pelo novo valor"
+
+msgid "human-readable comment string (# will be prepended as needed)"
+msgstr ""
+"string de comentário legível por humanos (# será prefixado conforme "
+"necessário)"
+
+msgid "add a new line without altering any existing values"
+msgstr "adicionar uma nova linha sem alterar os valores existentes"
+
+msgid "--fixed-value only applies with --value=<pattern>"
+msgstr "--fixed-value se aplica apenas com --value=<pattern>"
+
+msgid "--append cannot be used with --value=<pattern>"
+msgstr "--append não pode ser usado com --value=<pattern>"
+
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+"       Use --value=<pattern>, --append or --all to change %s."
+msgstr ""
+"não é possível sobrescrever múltiplos valores com um único valor\n"
+"       Use --value=<pattern>, --append ou --all para alterar %s."
+
+msgid "unset all multi-valued config options"
+msgstr "remover todas as opções de configuração com múltiplos valores"
+
+msgid "unset multi-valued config options with matching values"
+msgstr ""
+"remover opções de configuração com múltiplos valores com valores "
+"correspondentes"
+
+#, c-format
+msgid "no such section: %s"
+msgstr "não há seção: %s"
+
+msgid "editing stdin is not supported"
+msgstr "não há suporte para edição da entrada padrão"
+
+msgid "editing blobs is not supported"
+msgstr "não há suporte para edição de blobs"
+
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr "não é possível criar o arquivo de configuração %s"
+
+msgid "Action"
+msgstr "Ação"
+
+msgid "get value: name [<value-pattern>]"
+msgstr "obter valor: name [<value-pattern>]"
+
+msgid "get all values: key [<value-pattern>]"
+msgstr "obter todos os valores: key [<value-pattern>]"
+
+msgid "get values for regexp: name-regex [<value-pattern>]"
+msgstr "obter valores para regexp: name-regex [<value-pattern>]"
+
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "obter valor específico para a URL: seção[.var] URL"
+
+msgid "replace all matching variables: name value [<value-pattern>]"
+msgstr ""
+"substituir todas as variáveis correspondentes: name value [<value-pattern>]"
+
+msgid "add a new variable: name value"
+msgstr "adicionar uma nova variável: name value"
+
+msgid "remove a variable: name [<value-pattern>]"
+msgstr "remover uma variável: name [<value-pattern>]"
+
+msgid "remove all matches: name [<value-pattern>]"
+msgstr "remover todas as correspondências: name [<value-pattern>]"
+
+msgid "rename section: old-name new-name"
+msgstr "renomear seção: old-name new-name"
+
+msgid "remove a section: name"
+msgstr "remover uma seção: name"
+
+msgid "list all"
+msgstr "listar tudo"
+
+msgid "open an editor"
+msgstr "abrir um editor"
+
+msgid "find the color configured: slot [<default>]"
+msgstr "encontrar a cor configurada: slot [<default>]"
+
+msgid "find the color setting: slot [<stdout-is-tty>]"
+msgstr "encontrar a configuração de cor: slot [<stdout-is-tty>]"
+
+msgid "with --get, use default value when missing entry"
+msgstr "com --get, usar valor padrão quando faltar entrada"
+
+msgid "--get-color and variable type are incoherent"
+msgstr "--get-color e tipo da variável são incoerentes"
+
+msgid "no action specified"
+msgstr "nenhuma ação especificada"
+
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr "--name-only é aplicável apenas a --list ou --get-regexp"
+
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr ""
+"--show-origin é aplicável apenas a --get, --get-all, --get-regexp e --list"
+
+msgid "--default is only applicable to --get"
+msgstr "--default é aplicável apenas a --get"
+
+msgid "--comment is only applicable to add/set/replace operations"
+msgstr "--comment é aplicável apenas a operações de add/set/replace"
+
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+"       Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+"não é possível sobrescrever múltiplos valores com um único valor\n"
+"       Use uma regexp, --add ou --replace-all para alterar %s."
+
+msgid "print sizes in human readable format"
+msgstr "imprimir tamanhos em formato legível por humanos"
+
+#, 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 ""
+"As permissões no seu diretório de socket são muito permissivas; outros\n"
+"usuários podem ler suas credenciais em cache. Considere executar:\n"
+"\n"
+"\tchmod 0700 %s"
+
+msgid "print debugging messages to stderr"
+msgstr "imprimir mensagens de depuração no stderr"
+
+msgid "credential-cache--daemon unavailable; no unix socket support"
+msgstr "credential-cache--daemon indisponível; não há suporte para socket unix"
+
+msgid "credential-cache unavailable; no unix socket support"
+msgstr "credential-cache indisponível; não há suporte para socket unix"
+
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr ""
+"não foi possível obter o bloqueio do armazenamento de credenciais em %d ms"
+
+msgid ""
+"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]"
+msgstr ""
+"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]"
+
+msgid ""
+"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]"
+msgstr ""
+"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]"
+
+msgid "git describe <blob>"
+msgstr "git describe <blob>"
+
+msgid "head"
+msgstr "head"
+
+msgid "lightweight"
+msgstr "leve"
+
+msgid "annotated"
+msgstr "anotada"
+
+#, c-format
+msgid "annotated tag %s not available"
+msgstr "tag anotada %s indisponível"
+
+#, c-format
+msgid "tag '%s' is externally known as '%s'"
+msgstr "a tag '%s' é conhecida externamente como '%s'"
+
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr "nenhuma tag corresponde exatamente a '%s'"
+
+#, c-format
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr ""
+"Nenhuma correspondência exata em refs ou tags, pesquisando para descrever\n"
+
+#, c-format
+msgid "finished search at %s\n"
+msgstr "pesquisa concluída em %s\n"
+
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
+msgstr ""
+"Nenhuma tag anotada pode descrever '%s'.\n"
+"No entanto, havia tags não anotadas: tente --tags."
+
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr ""
+"Nenhuma tag pode descrever '%s'.\n"
+"Tente --always, ou crie algumas tags."
+
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr "%lu commits percorridos\n"
+
+#, c-format
+msgid "found %i tags; gave up search at %s\n"
+msgstr "%i tags encontradas; pesquisa abandonada em %s\n"
+
+#, c-format
+msgid "cannot search for blob '%s' on an unborn branch"
+msgstr "não é possível pesquisar pelo blob '%s' em um branch não nascido"
+
+#, c-format
+msgid "blob '%s' not reachable from HEAD"
+msgstr "blob '%s' não alcançável a partir de HEAD"
+
+#, c-format
+msgid "describe %s\n"
+msgstr "descrever %s\n"
+
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "Nome de objeto inválido %s"
+
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s não é um commit nem um blob"
+
+msgid "find the tag that comes after the commit"
+msgstr "encontrar a tag que vem após o commit"
+
+msgid "debug search strategy on stderr"
+msgstr "depurar estratégia de pesquisa no stderr"
+
+msgid "use any ref"
+msgstr "usar qualquer ref"
+
+msgid "use any tag, even unannotated"
+msgstr "usar qualquer tag, mesmo as não anotadas"
+
+msgid "always use long format"
+msgstr "sempre usar o formato longo"
+
+msgid "only follow first parent"
+msgstr "seguir apenas o primeiro pai"
+
+msgid "only output exact matches"
+msgstr "imprimir apenas correspondências exatas"
+
+msgid "consider <n> most recent tags (default: 10)"
+msgstr "considerar as <n> tags mais recentes (padrão: 10)"
+
+msgid "only consider tags matching <pattern>"
+msgstr "considerar apenas tags que correspondam a <pattern>"
+
+msgid "do not consider tags matching <pattern>"
+msgstr "não considerar tags que correspondam a <pattern>"
+
+msgid "show abbreviated commit object as fallback"
+msgstr "mostrar objeto commit abreviado como alternativa"
+
+msgid "mark"
+msgstr "marca"
+
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr "acrescentar <mark> em árvore de trabalho suja (padrão: \"-dirty\")"
+
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr ""
+"acrescentar <mark> em árvore de trabalho quebrada (padrão: \"-broken\")"
+
+msgid "No names found, cannot describe anything."
+msgstr "Nenhum nome encontrado, não é possível descrever nada."
+
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "a opção '%s' e commit-ishes não podem ser usados juntos"
+
+msgid ""
+"git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n"
+"             [--mode=<mode>]"
+msgstr ""
+"git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n"
+"             [--mode=<mode>]"
+
+msgid "specify a destination for the diagnostics archive"
+msgstr "especificar um destino para o arquivo de diagnóstico"
+
+msgid "specify a strftime format suffix for the filename"
+msgstr "especificar um sufixo de formato strftime para o nome do arquivo"
+
+msgid "specify the content of the diagnostic archive"
+msgstr "especificar o conteúdo do arquivo de diagnóstico"
+
+#, c-format
+msgid "unable to parse mode: %s"
+msgstr "não foi possível analisar o modo: %s"
+
+#, c-format
+msgid "unable to parse object id: %s"
+msgstr "não foi possível analisar o id de objeto: %s"
+
+msgid "git diff-pairs -z [<diff-options>]"
+msgstr "git diff-pairs -z [<diff-options>]"
+
+msgid "working without -z is not supported"
+msgstr "não há suporte para trabalhar sem -z"
+
+msgid "pathspec arguments not supported"
+msgstr "argumentos de pathspec não são suportados"
+
+msgid "revision arguments not allowed"
+msgstr "argumentos de revisão não são permitidos"
+
+msgid "invalid raw diff input"
+msgstr "entrada bruta de diff inválida"
+
+msgid "tree objects not supported"
+msgstr "não há suporte para objetos tree"
+
+msgid "got EOF while reading path"
+msgstr "EOF recebido ao ler o caminho"
+
+msgid "got EOF while reading destination path"
+msgstr "EOF recebido ao ler o caminho de destino"
+
+#, c-format
+msgid "unable to parse rename/copy score: %s"
+msgstr "não foi possível analisar a pontuação de renomeação/cópia: %s"
+
+#, c-format
+msgid "unknown diff status: %c"
+msgstr "status de diff desconhecido: %c"
+
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base funciona apenas com dois commits"
+
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr "'%s': não é um arquivo regular ou link simbólico"
+
+msgid "no merge given, only parents."
+msgstr "nenhum merge fornecido, apenas pais."
+
+#, c-format
+msgid "invalid option: %s"
+msgstr "opção inválida: %s"
+
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s: nenhuma base de merge"
+
+msgid "cannot come back to cwd"
+msgstr "não é possível voltar para o cwd"
+
+msgid "Not a git repository"
+msgstr "Não é um repositório git"
+
+#, c-format
+msgid "invalid object '%s' given."
+msgstr "objeto inválido '%s' fornecido."
+
+#, c-format
+msgid "unable to read tree object for commit '%s'"
+msgstr "não foi possível ler o objeto tree do commit '%s'"
+
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr "mais de dois blobs fornecidos: '%s'"
+
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr "objeto não tratado '%s' fornecido."
+
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr "%s...%s: múltiplas bases de merge, usando %s"
+
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+
+#, c-format
+msgid "could not read symlink %s"
+msgstr "não foi possível ler o link simbólico %s"
+
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "não foi possível ler o arquivo de link simbólico %s"
+
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr "não foi possível ler o objeto %s para o link simbólico %s"
+
+msgid ""
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
+msgstr ""
+"formatos combinados de diff ('-c' e '--cc') não são suportados no\n"
+"modo de diff de diretório ('-d' e '--dir-diff')."
+
+#, c-format
+msgid "both files modified: '%s' and '%s'."
+msgstr "ambos os arquivos modificados: '%s' e '%s'."
+
+msgid "working tree file has been left."
+msgstr "o arquivo da árvore de trabalho foi mantido."
+
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "não foi possível copiar '%s' para '%s'"
+
+#, c-format
+msgid "temporary files exist in '%s'."
+msgstr "arquivos temporários existem em '%s'."
+
+msgid "you may want to cleanup or recover these."
+msgstr "você pode querer limpá-los ou recuperá-los."
+
+#, c-format
+msgid "failed: %d"
+msgstr "falhou: %d"
+
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr "usar `diff.guitool` em vez de `diff.tool`"
+
+msgid "perform a full-directory diff"
+msgstr "realizar um diff de todo o diretório"
+
+msgid "do not prompt before launching a diff tool"
+msgstr "não perguntar antes de iniciar uma ferramenta de diff"
+
+msgid "use symlinks in dir-diff mode"
+msgstr "usar links simbólicos no modo dir-diff"
+
+msgid "tool"
+msgstr "ferramenta"
+
+msgid "use the specified diff tool"
+msgstr "usar a ferramenta de diff especificada"
+
+msgid "print a list of diff tools that may be used with `--tool`"
+msgstr ""
+"imprimir uma lista de ferramentas de diff que podem ser usadas com `--tool`"
+
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
+"code"
+msgstr ""
+"fazer o 'git-difftool' sair quando uma ferramenta de diff invocada retornar "
+"um código de saída não nulo"
+
+msgid "specify a custom command for viewing diffs"
+msgstr "especificar um comando personalizado para visualizar diffs"
+
+msgid "passed to `diff`"
+msgstr "passado para o `diff`"
+
+msgid "difftool requires worktree or --no-index"
+msgstr "difftool requer worktree ou --no-index"
+
+msgid "no <tool> given for --tool=<tool>"
+msgstr "nenhum <tool> fornecido para --tool=<tool>"
+
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr "nenhum <cmd> fornecido para --extcmd=<cmd>"
+
+msgid "git fast-export [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git fast-export [<options>] [<revision-range>] [[--] <path>...]"
+
+#, c-format
+msgid "unknown %s mode: %s"
+msgstr "modo %s desconhecido: %s"
+
+#, c-format
+msgid "unknown tag-of-filtered mode: %s"
+msgstr "modo tag-of-filtered desconhecido: %s"
+
+#, c-format
+msgid "unknown reencoding mode: %s"
+msgstr "modo de recodificação desconhecido: %s"
+
+#, c-format
+msgid "could not read blob %s"
+msgstr "não foi possível ler o blob %s"
+
+#, c-format
+msgid "oid mismatch in blob %s"
+msgstr "incompatibilidade de oid no blob %s"
+
+#, c-format
+msgid "could not write blob '%s'"
+msgstr "não foi possível gravar o blob '%s'"
+
+#, c-format
+msgid "unexpected comparison status '%c' for %s, %s"
+msgstr "status de comparação inesperado '%c' para %s, %s"
+
+msgid "none"
+msgstr "nenhum"
+
+#, c-format
+msgid "could not find author in commit %s"
+msgstr "não foi possível encontrar o autor no commit %s"
+
+#, c-format
+msgid "could not find committer in commit %s"
+msgstr "não foi possível encontrar o committer no commit %s"
+
+#, c-format
+msgid ""
+"encountered commit-specific encoding %.*s in commit %s; use --reencode=[yes|"
+"no] to handle it"
+msgstr ""
+"encontrada codificação específica de commit %.*s no commit %s; use --"
+"reencode=[yes|no] para lidar com isso"
+
+#, c-format
+msgid "exporting %<PRIuMAX> signature(s) for commit %s"
+msgstr "exportando %<PRIuMAX> assinatura(s) para o commit %s"
+
+#, c-format
+msgid "stripping signature(s) from commit %s"
+msgstr "removendo assinatura(s) do commit %s"
+
+#, c-format
+msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it"
+msgstr ""
+"encontrado commit %s assinado; use --signed-commits=<mode> para lidar com "
+"isso"
+
+#, c-format
+msgid ""
+"omitting tag %s,\n"
+"since tags of trees (or tags of tags of trees, etc.) are not supported."
+msgstr ""
+"omitindo a tag %s,\n"
+"já que tags de trees (ou tags de tags de trees, etc.) não são suportadas."
+
+#, c-format
+msgid "could not read tag %s"
+msgstr "não foi possível ler a tag %s"
+
+#, c-format
+msgid "exporting signed tag %s"
+msgstr "exportando a tag %s assinada"
+
+#, c-format
+msgid "stripping signature from tag %s"
+msgstr "removendo assinatura da tag %s"
+
+#, c-format
+msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it"
+msgstr ""
+"encontrada tag %s assinada; use --signed-tags=<mode> para lidar com isso"
+
+#, c-format
+msgid ""
+"tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle "
+"it"
+msgstr ""
+"a tag %s marca um objeto não exportado; use --tag-of-filtered-object=<mode> "
+"para lidar com isso"
+
+msgid "cannot export nested tags unless --mark-tags is specified."
+msgstr ""
+"não é possível exportar tags aninhadas a menos que --mark-tags seja "
+"especificado."
+
+#, c-format
+msgid "tag %s points nowhere?"
+msgstr "a tag %s não aponta para lugar nenhum?"
+
+#, c-format
+msgid "%s: unexpected object of type %s, skipping."
+msgstr "%s: objeto inesperado do tipo %s, ignorando."
+
+#, c-format
+msgid "tag points to object of unexpected type %s, skipping."
+msgstr "a tag aponta para um objeto de tipo inesperado %s, ignorando."
+
+#, c-format
+msgid "unable to open marks file %s for writing."
+msgstr "não foi possível abrir o arquivo de marcas %s para escrita."
+
+#, c-format
+msgid "unable to write marks file %s."
+msgstr "não foi possível gravar o arquivo de marcas %s."
+
+#, c-format
+msgid "corrupt mark line: %s"
+msgstr "linha de marca corrompida: %s"
+
+#, c-format
+msgid "object not found: %s"
+msgstr "objeto não encontrado: %s"
+
+#, c-format
+msgid "not a commit? can't happen: %s"
+msgstr "não é um commit? não pode acontecer: %s"
+
+#, c-format
+msgid "object %s already has a mark"
+msgstr "o objeto %s já tem uma marca"
+
+msgid "--anonymize-map token cannot be empty"
+msgstr "o token de --anonymize-map não pode estar vazio"
+
+msgid "show progress after <n> objects"
+msgstr "exibir progresso após <n> objetos"
+
+msgid "select handling of signed tags"
+msgstr "selecionar o tratamento de tags assinadas"
+
+msgid "select handling of signed commits"
+msgstr "selecionar o tratamento de commits assinados"
+
+msgid "select handling of tags that tag filtered objects"
+msgstr "selecionar o tratamento de tags que marcam objetos filtrados"
+
+msgid "select handling of commit messages in an alternate encoding"
+msgstr ""
+"selecionar o tratamento de mensagens de commit em uma codificação alternativa"
+
+msgid "dump marks to this file"
+msgstr "despejar marcas neste arquivo"
+
+msgid "import marks from this file"
+msgstr "importar marcas deste arquivo"
+
+msgid "import marks from this file if it exists"
+msgstr "importar marcas deste arquivo se ele existir"
+
+msgid "fake a tagger when tags lack one"
+msgstr "forjar um tagger quando as tags não tiverem um"
+
+msgid "output full tree for each commit"
+msgstr "produzir a tree completa para cada commit"
+
+msgid "use the done feature to terminate the stream"
+msgstr "usar o recurso done para terminar o fluxo"
+
+msgid "skip output of blob data"
+msgstr "ignorar a saída de dados blob"
+
+msgid "refspec"
+msgstr "refspec"
+
+msgid "apply refspec to exported refs"
+msgstr "aplicar refspec às refs exportadas"
+
+msgid "anonymize output"
+msgstr "anonimizar a saída"
+
+msgid "from:to"
+msgstr "de:para"
+
+msgid "convert <from> to <to> in anonymized output"
+msgstr "converter <from> para <to> na saída anonimizada"
+
+msgid "reference parents which are not in fast-export stream by object id"
+msgstr "referenciar pais que não estão no fluxo fast-export por id de objeto"
+
+msgid "show original object ids of blobs/commits"
+msgstr "mostrar ids de objeto originais de blobs/commits"
+
+msgid "label tags with mark ids"
+msgstr "rotular tags com ids de marca"
+
+#, c-format
+msgid "can't write crash report %s"
+msgstr "não é possível gravar o relatório de falha %s"
+
+#, c-format
+msgid "fast-import: dumping crash report to %s\n"
+msgstr "fast-import: despejando relatório de falha para %s\n"
+
+#, c-format
+msgid "mark :%<PRIuMAX> not declared"
+msgstr "marca :%<PRIuMAX> não declarada"
+
+#, c-format
+msgid "invalid attempt to create duplicate branch: %s"
+msgstr "tentativa inválida de criar um branch duplicado: %s"
+
+#, c-format
+msgid "branch name doesn't conform to Git standards: %s"
+msgstr "o nome do branch não está de acordo com os padrões do Git: %s"
+
+msgid "internal consistency error creating the index"
+msgstr "erro de consistência interna ao criar o índice"
+
+msgid "cannot create keep file"
+msgstr "não é possível criar o arquivo keep"
+
+msgid "failed to write keep file"
+msgstr "falha ao gravar o arquivo keep"
+
+msgid "cannot store pack file"
+msgstr "não é possível armazenar o arquivo de pack"
+
+msgid "cannot store index file"
+msgstr "não é possível armazenar o arquivo de índice"
+
+#, c-format
+msgid "failed seeking to start of '%s'"
+msgstr "falha ao buscar o início de '%s'"
+
+#, c-format
+msgid "core Git rejected index %s"
+msgstr "o core do Git rejeitou o índice %s"
+
+msgid "cannot truncate pack to skip duplicate"
+msgstr "não é possível truncar o pack para pular a duplicata"
+
+#, c-format
+msgid "EOF in data (%<PRIuMAX> bytes remaining)"
+msgstr "EOF nos dados (%<PRIuMAX> bytes restando)"
+
+#, c-format
+msgid "unexpected deflate failure: %d"
+msgstr "falha inesperada de deflate: %d"
+
+#, c-format
+msgid "not a tree: %s"
+msgstr "não é uma tree: %s"
+
+#, c-format
+msgid "can't load tree %s"
+msgstr "não é possível carregar a tree %s"
+
+#, c-format
+msgid "corrupt mode in %s"
+msgstr "modo corrompido em %s"
+
+msgid "root cannot be a non-directory"
+msgstr "root não pode ser um não-diretório"
+
+msgid "empty path component found in input"
+msgstr "componente de caminho vazio encontrado na entrada"
+
+msgid "non-directories cannot have subtrees"
+msgstr "não-diretórios não podem ter sub-trees"
+
+#, c-format
+msgid "dropping %s since it would point to itself (i.e. to %s)"
+msgstr "descartando %s já que ele apontaria para si mesmo (ou seja, para %s)"
+
+#, c-format
+msgid "branch %s is missing commits."
+msgstr "o branch %s está sem commits."
+
+#, c-format
+msgid "not updating %s (new tip %s does not contain %s)"
+msgstr "não atualizando %s (a nova ponta %s não contém %s)"
+
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "não foi possível criar os diretórios principais de %s"
+
+#, c-format
+msgid "unable to write marks file %s"
+msgstr "não foi possível gravar o arquivo de marcas %s"
+
+#, c-format
+msgid "unable to write marks file %s: %s"
+msgstr "não foi possível gravar o arquivo de marcas %s: %s"
+
+#, c-format
+msgid "unable to write file %s"
+msgstr "não foi possível gravar o arquivo %s"
+
+#, c-format
+msgid "expected 'data n' command, found: %s"
+msgstr "esperado o comando 'data n', encontrado: %s"
+
+#, c-format
+msgid "EOF in data (terminator '%s' not found)"
+msgstr "EOF nos dados (terminador '%s' não encontrado)"
+
+msgid "data is too large to use in this context"
+msgstr "os dados são muito grandes para usar neste contexto"
+
+#, c-format
+msgid "EOF in data (%lu bytes remaining)"
+msgstr "EOF nos dados (%lu bytes restando)"
+
+#, c-format
+msgid "missing < in ident string: %s"
+msgstr "faltando < na string ident: %s"
+
+#, c-format
+msgid "missing space before < in ident string: %s"
+msgstr "faltando espaço antes de < na string ident: %s"
+
+#, c-format
+msgid "missing > in ident string: %s"
+msgstr "faltando > na string ident: %s"
+
+#, c-format
+msgid "missing space after > in ident string: %s"
+msgstr "faltando espaço depois de > na string ident: %s"
+
+#, c-format
+msgid "invalid raw date \"%s\" in ident: %s"
+msgstr "data raw inválida \"%s\" no ident: %s"
+
+#, c-format
+msgid "invalid rfc2822 date \"%s\" in ident: %s"
+msgstr "data rfc2822 inválida \"%s\" no ident: %s"
+
+#, c-format
+msgid "date in ident must be 'now': %s"
+msgstr "a data no ident deve ser 'now': %s"
+
+#, c-format
+msgid "too large fanout (%u)"
+msgstr "fanout muito grande (%u)"
+
+#, c-format
+msgid "failed to remove path %s"
+msgstr "falha ao remover o caminho %s"
+
+#, c-format
+msgid "no value after ':' in mark: %s"
+msgstr "nenhum valor depois de ':' na marca: %s"
+
+#, c-format
+msgid "garbage after mark: %s"
+msgstr "lixo após a marca: %s"
+
+#, c-format
+msgid "missing space after mark: %s"
+msgstr "faltando espaço após a marca: %s"
+
+#, c-format
+msgid "invalid %s: %s"
+msgstr "%s inválido: %s"
+
+#, c-format
+msgid "NUL in %s: %s"
+msgstr "NUL em %s: %s"
+
+#, c-format
+msgid "garbage after %s: %s"
+msgstr "lixo após %s: %s"
+
+#, c-format
+msgid "missing space after %s: %s"
+msgstr "faltando espaço após %s: %s"
+
+#, c-format
+msgid "corrupt mode: %s"
+msgstr "modo corrompido: %s"
+
+#, c-format
+msgid "invalid dataref: %s"
+msgstr "dataref inválido: %s"
+
+#, c-format
+msgid "missing space after SHA1: %s"
+msgstr "faltando espaço após SHA1: %s"
+
+#, c-format
+msgid "Git links cannot be specified 'inline': %s"
+msgstr "Git links não podem ser especificados 'inline': %s"
+
+#, c-format
+msgid "not a commit (actually a %s): %s"
+msgstr "não é um commit (na verdade é um %s): %s"
+
+#, c-format
+msgid "directories cannot be specified 'inline': %s"
+msgstr "diretórios não podem ser especificados 'inline': %s"
+
+#, c-format
+msgid "%s not found: %s"
+msgstr "%s não encontrado: %s"
+
+msgid "tree"
+msgstr "tree"
+
+#, c-format
+msgid "not a %s (actually a %s): %s"
+msgstr "não é um %s (na verdade é um %s): %s"
+
+#, c-format
+msgid "path %s not in branch"
+msgstr "caminho %s não está no branch"
+
+msgid "can't add a note on empty branch."
+msgstr "não é possível adicionar uma nota em um branch vazio."
+
+#, c-format
+msgid "mark :%<PRIuMAX> not a commit"
+msgstr "marca :%<PRIuMAX> não é um commit"
+
+#, c-format
+msgid "not a valid commit: %s"
+msgstr "não é um commit válido: %s"
+
+#, c-format
+msgid "invalid ref name or SHA1 expression: %s"
+msgstr "nome de ref ou expressão SHA1 inválida: %s"
+
+#, c-format
+msgid "not a blob (actually a %s): %s"
+msgstr "não é um blob (na verdade é um %s): %s"
+
+#, c-format
+msgid "blob not found: %s"
+msgstr "blob não encontrado: %s"
+
+#, c-format
+msgid "the commit %s is corrupt"
+msgstr "o commit %s está corrompido"
+
+#, c-format
+msgid "can't create a branch from itself: %s"
+msgstr "não é possível criar um branch a partir de si mesmo: %s"
+
+#, c-format
+msgid ""
+"expected gpgsig format: 'gpgsig <hash-algo> <signature-format>', got 'gpgsig "
+"%s'"
+msgstr ""
+"formato gpgsig esperado: 'gpgsig <hash-algo> <signature-format>', obtido "
+"'gpgsig %s'"
+
+#, c-format
+msgid "unknown git hash algorithm in gpgsig: '%s'"
+msgstr "algoritmo de hash git desconhecido em gpgsig: '%s'"
+
+#, c-format
+msgid "invalid signature format in gpgsig: '%s'"
+msgstr "formato de assinatura inválido em gpgsig: '%s'"
+
+msgid "'unknown' signature format in gpgsig"
+msgstr "formato de assinatura 'unknown' em gpgsig"
+
+#, c-format
+msgid "multiple %s signatures found, ignoring additional signature"
+msgstr "múltiplas assinaturas %s encontradas, ignorando a assinatura adicional"
+
+msgid "parse_one_signature() returned unknown hash algo"
+msgstr "parse_one_signature() retornou um algoritmo de hash desconhecido"
+
+msgid "unknown"
+msgstr "desconhecido"
+
+#, c-format
+msgid ""
+"stripping invalid signature for commit '%.100s...'\n"
+"  allegedly by %s"
+msgstr ""
+"removendo assinatura inválida para o commit '%.100s...'\n"
+"  supostamente de %s"
+
+#, c-format
+msgid ""
+"stripping invalid signature for commit '%.*s'\n"
+"  allegedly by %s"
+msgstr ""
+"removendo assinatura inválida para o commit '%.*s'\n"
+"  supostamente de %s"
+
+#, c-format
+msgid ""
+"stripping invalid signature for commit\n"
+"  allegedly by %s"
+msgstr ""
+"removendo assinatura inválida para o commit\n"
+"  supostamente de %s"
+
+#, c-format
+msgid ""
+"replacing invalid signature for commit '%.100s...'\n"
+"  allegedly by %s"
+msgstr ""
+"substituindo assinatura inválida para o commit '%.100s...'\n"
+"  supostamente de %s"
+
+#, c-format
+msgid ""
+"replacing invalid signature for commit '%.*s'\n"
+"  allegedly by %s"
+msgstr ""
+"substituindo assinatura inválida para o commit '%.*s'\n"
+"  supostamente de %s"
+
+#, c-format
+msgid ""
+"replacing invalid signature for commit\n"
+"  allegedly by %s"
+msgstr ""
+"substituindo assinatura inválida para o commit\n"
+"  supostamente de %s"
+
+msgid "aborting due to invalid signature"
+msgstr "abortando devido a assinatura inválida"
+
+msgid "signing commits in interoperability mode is unsupported"
+msgstr "assinar commits em modo de interoperabilidade não é suportado"
+
+msgid "failed to sign commit object"
+msgstr "falha ao assinar o objeto de commit"
+
+msgid "expected committer but didn't get one"
+msgstr "esperado committer, mas não obteve um"
+
+msgid "encountered signed commit; use --signed-commits=<mode> to handle it"
+msgstr ""
+"encontrado commit assinado; use --signed-commits=<mode> para lidar com isso"
+
+msgid "stripping a commit signature"
+msgstr "removendo uma assinatura de commit"
+
+msgid "importing a commit signature verbatim"
+msgstr "importando uma assinatura de commit literalmente"
+
+msgid "failed to sign tag object"
+msgstr "falha ao assinar o objeto de tag"
+
+#, c-format
+msgid "importing a tag signature verbatim for tag '%s'"
+msgstr "importando uma assinatura de tag literalmente para a tag '%s'"
+
+#, c-format
+msgid "stripping a tag signature for tag '%s'"
+msgstr "removendo uma assinatura de tag para a tag '%s'"
+
+msgid "encountered signed tag; use --signed-tags=<mode> to handle it"
+msgstr "encontrada tag assinada; use --signed-tags=<mode> para lidar com isso"
+
+#, c-format
+msgid "expected 'from' command, got '%s'"
+msgstr "esperado o comando 'from', obtido '%s'"
+
+msgid "can't tag an empty branch."
+msgstr "não é possível fazer tag em um branch vazio."
+
+#, c-format
+msgid "not a valid object: %s"
+msgstr "não é um objeto válido: %s"
+
+msgid "write to frontend failed"
+msgstr "falha ao escrever para o frontend"
+
+#, c-format
+msgid "can't read object %s"
+msgstr "não é possível ler o objeto %s"
+
+#, c-format
+msgid "object %s is a %s but a blob was expected."
+msgstr "o objeto %s é um %s mas era esperado um blob."
+
+#, c-format
+msgid "not a mark: %s"
+msgstr "não é uma marca: %s"
+
+#, c-format
+msgid "unknown mark: %s"
+msgstr "marca desconhecida: %s"
+
+#, c-format
+msgid "garbage after SHA1: %s"
+msgstr "lixo após SHA1: %s"
+
+#, c-format
+msgid "not a tree-ish: %s"
+msgstr "não é um tree-ish: %s"
+
+#, c-format
+msgid "can't load object %s"
+msgstr "não é possível carregar o objeto %s"
+
+#, c-format
+msgid "invalid SHA1 in tag: %s"
+msgstr "SHA1 inválido na tag: %s"
+
+#, c-format
+msgid "invalid SHA1 in commit: %s"
+msgstr "SHA1 inválido no commit: %s"
+
+#, c-format
+msgid "missing from marks for submodule '%s'"
+msgstr "faltando as marcas from para o submódulo '%s'"
+
+#, c-format
+msgid "missing to marks for submodule '%s'"
+msgstr "faltando as marcas to para o submódulo '%s'"
+
+#, c-format
+msgid "missing space after tree-ish: %s"
+msgstr "faltando espaço após tree-ish: %s"
+
+#, c-format
+msgid "not in a commit: %s"
+msgstr "não está em um commit: %s"
+
+#, c-format
+msgid "expected 'mark' command, got %s"
+msgstr "esperado o comando 'mark', obtido %s"
+
+#, c-format
+msgid "expected 'to' command, got %s"
+msgstr "esperado o comando 'to', obtido %s"
+
+msgid "only one import-marks command allowed per stream"
+msgstr "apenas um comando import-marks permitido por fluxo"
+
+#, c-format
+msgid "unknown --date-format argument %s"
+msgstr "argumento --date-format desconhecido %s"
+
+#, c-format
+msgid "%s: argument must be a non-negative integer"
+msgstr "%s: o argumento deve ser um inteiro não negativo"
+
+#, c-format
+msgid "--depth cannot exceed %u"
+msgstr "--depth não pode exceder %u"
+
+#, c-format
+msgid "--cat-blob-fd cannot exceed %d"
+msgstr "--cat-blob-fd não pode exceder %d"
+
+msgid "expected format name:filename for submodule rewrite option"
+msgstr ""
+"esperado o formato name:filename para a opção de reescrita de submódulo"
+
+msgid "--max-pack-size: argument must be a non-negative integer"
+msgstr "--max-pack-size: o argumento deve ser um inteiro não negativo"
+
+#, c-format
+msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum"
+msgstr "max-pack-size agora é em bytes, assumindo --max-pack-size=%lum"
+
+msgid "minimum max-pack-size is 1 MiB"
+msgstr "o max-pack-size mínimo é 1 MiB"
+
+msgid "--big-file-threshold: argument must be a non-negative integer"
+msgstr "--big-file-threshold: o argumento deve ser um inteiro não negativo"
+
+#, c-format
+msgid "unknown --signed-commits mode '%s'"
+msgstr "modo '%s' desconhecido de --signed-commits"
+
+#, c-format
+msgid "unknown --signed-tags mode '%s'"
+msgstr "modo '%s' desconhecido de --signed-tags"
+
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "funcionalidade '%s' proibida na entrada sem --allow-unsafe-features"
+
+#, c-format
+msgid "got feature command '%s' after data command"
+msgstr "obtido o comando de feature '%s' após o comando de dados"
+
+#, c-format
+msgid "this version of fast-import does not support feature %s."
+msgstr "esta versão do fast-import não suporta a funcionalidade %s."
+
+#, c-format
+msgid "got option command '%s' after data command"
+msgstr "obtido o comando de opção '%s' após o comando de dados"
+
+#, c-format
+msgid "this version of fast-import does not support option: %s"
+msgstr "esta versão do fast-import não suporta a opção: %s"
+
+msgid "git fast-import [<options>]"
+msgstr "git fast-import [<options>]"
+
+msgid "Common"
+msgstr "Comuns"
+
+msgid "format of the commit/tag dates"
+msgstr "formato das datas de commit/tag"
+
+msgid "display some basic statistics (objects, packfiles and memory)"
+msgstr ""
+"exibir algumas estatísticas básicas (objetos, arquivos de pack e memória)"
+
+msgid "disable the output shown by --stats"
+msgstr "desativar a saída exibida por --stats"
+
+msgid "force updating modified existing branches"
+msgstr "forçar a atualização dos branches existentes que foram modificados"
+
+msgid "require a terminating 'done' command"
+msgstr "exigir um comando 'done' de encerramento"
+
+msgid "maximum size of each output pack file"
+msgstr "tamanho máximo de cada arquivo de pack de saída"
+
+msgid "maximum size of a blob that will be deltified"
+msgstr "tamanho máximo de um blob que será deltificado"
+
+msgid "maximum delta depth"
+msgstr "profundidade máxima de delta"
+
+msgid "maximum number of branches to maintain active"
+msgstr "número máximo de branches mantidos ativos"
+
+msgid "Marks"
+msgstr "Marcas"
+
+msgid "import marks from <file>"
+msgstr "importar as marcas de <file>"
+
+msgid "import marks from <file> if it exists"
+msgstr "importar as marcas de <file> caso ele exista"
+
+msgid "dump marks to <file>"
+msgstr "despejar as marcas em <file>"
+
+msgid "are --(import|export)-marks= paths relative to '.git/info/fast-import'?"
+msgstr ""
+"os caminhos de --(import|export)-marks= são relativos a '.git/info/fast-"
+"import'?"
+
+msgid "Submodule rewrite"
+msgstr "Reescrita de submódulo"
+
+msgid "name:filename"
+msgstr "name:filename"
+
+msgid "rewrite object IDs for submodule <name> from <filename>"
+msgstr "reescrever os IDs de objeto do submódulo <name> a partir de <filename>"
+
+msgid "rewrite object IDs for submodule <name> to <filename>"
+msgstr "reescrever os IDs de objeto do submódulo <name> para <filename>"
+
+msgid "Signing"
+msgstr "Assinatura"
+
+msgid "how to handle signed commits"
+msgstr "como tratar commits assinados"
+
+msgid "how to handle signed tags"
+msgstr "como tratar tags assinadas"
+
+msgid "Advanced"
+msgstr "Avançado"
+
+msgid "allow unsafe mark commands from the stream"
+msgstr "permitir comandos de marca inseguros vindos do fluxo"
+
+msgid "dump edge commits to <file>"
+msgstr "despejar os commits de borda em <file>"
+
+msgid "fd"
+msgstr "fd"
+
+msgid "write some responses to <fd> instead of stdout"
+msgstr "escrever algumas respostas em <fd> em vez da saída padrão"
+
+#, c-format
+msgid "unsupported command: %s"
+msgstr "comando não suportado: %s"
+
+msgid "stream ends early"
+msgstr "fluxo terminou prematuramente"
+
+#, c-format
+msgid "Lockfile created but not reported: %s"
+msgstr "Arquivo de lock criado, mas não relatado: %s"
+
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<options>] [<repository> [<refspec>...]]"
+
+msgid "git fetch [<options>] <group>"
+msgstr "git fetch [<options>] <group>"
+
+msgid "git fetch --multiple [<options>] [(<repository>|<group>)...]"
+msgstr "git fetch --multiple [<options>] [(<repository>|<group>)...]"
+
+msgid "git fetch --all [<options>]"
+msgstr "git fetch --all [<options>]"
+
+msgid "fetch.parallel cannot be negative"
+msgstr "fetch.parallel não pode ser negativo"
+
+#, c-format
+msgid "unrecognized fetch.followRemoteHEAD value '%s' ignored"
+msgstr "valor fetch.followRemoteHEAD não reconhecido '%s' ignorado"
+
+msgid "couldn't find remote ref HEAD"
+msgstr "não foi possível encontrar a ref remota HEAD"
+
+#, c-format
+msgid "From %.*s\n"
+msgstr "De %.*s\n"
+
+#, c-format
+msgid "object %s not found"
+msgstr "objeto %s não encontrado"
+
+msgid "[up to date]"
+msgstr "[atualizado]"
+
+msgid "[rejected]"
+msgstr "[rejeitado]"
+
+msgid "can't fetch into checked-out branch"
+msgstr "não é possível fazer fetch para um branch em checkout"
+
+msgid "[tag update]"
+msgstr "[tag atualizada]"
+
+msgid "unable to update local ref"
+msgstr "não foi possível atualizar o ref local"
+
+msgid "would clobber existing tag"
+msgstr "sobrescreveria a tag existente"
+
+msgid "[new tag]"
+msgstr "[nova tag]"
+
+msgid "[new branch]"
+msgstr "[novo branch]"
+
+msgid "[new ref]"
+msgstr "[nova ref]"
+
+msgid "forced update"
+msgstr "atualização forçada"
+
+msgid "non-fast-forward"
+msgstr "não fast-forward"
+
+#, c-format
+msgid "cannot open '%s'"
+msgstr "não é possível abrir '%s'"
+
+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 ""
+"o fetch normalmente indica quais branches tiveram uma atualização forçada,\n"
+"mas essa verificação foi desativada; para reativar, use a flag\n"
+"'--show-forced-updates' ou execute 'git config fetch.showForcedUpdates true'"
+
+#, 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 ""
+"levou %.2f segundos para verificar as atualizações forçadas; você pode usar\n"
+"'--no-show-forced-updates' ou executar 'git config fetch.showForcedUpdates "
+"false'\n"
+"para evitar essa verificação\n"
+
+#, c-format
+msgid "%s did not send all necessary objects"
+msgstr "%s não enviou todos os objetos necessários"
+
+#, c-format
+msgid "rejected %s because shallow roots are not allowed to be updated"
+msgstr "rejeitado %s porque shallow roots não podem ser atualizadas"
+
+msgid "[deleted]"
+msgstr "[excluído]"
+
+msgid "(none)"
+msgstr "(nenhum)"
+
+#, c-format
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "recusando-se a fazer fetch no branch '%s' em checkout em '%s'"
+
+#, c-format
+msgid "option \"%s\" value \"%s\" is not valid for %s"
+msgstr "o valor \"%s\" da opção \"%s\" não é válido para %s"
+
+#, c-format
+msgid "option \"%s\" is ignored for %s"
+msgstr "a opção \"%s\" é ignorada para %s"
+
+#, c-format
+msgid "the object %s does not exist"
+msgstr "o objeto %s não existe"
+
+#, c-format
+msgid "ignoring %s=%s because it does not match any refs"
+msgstr "ignorando %s=%s porque não corresponde a nenhuma ref"
+
+#, c-format
+msgid "ignoring %s because the protocol does not support it"
+msgstr "ignorando %s porque o protocolo não suporta isso"
+
+#, c-format
+msgid ""
+"Run 'git remote set-head %s %s' to follow the change, or modify\n"
+"either of the 'remote.%s.followRemoteHEAD' or 'fetch.followRemoteHEAD'\n"
+"configuration variables to handle the situation differently.\n"
+"\n"
+"Using this specific setting\n"
+"\n"
+"    git config set remote.%s.followRemoteHEAD warn-if-not-%s\n"
+"\n"
+"will suppress the warning until the remote changes HEAD to something else."
+msgstr ""
+"Execute 'git remote set-head %s %s' para acompanhar a alteração, ou "
+"modifique\n"
+"qualquer uma das variáveis de configuração 'remote.%s.followRemoteHEAD' ou\n"
+"'fetch.followRemoteHEAD' para lidar com a situação de forma diferente.\n"
+"\n"
+"Usar esta configuração específica\n"
+"\n"
+"    git config set remote.%s.followRemoteHEAD warn-if-not-%s\n"
+"\n"
+"desativará o aviso até que o remoto altere o HEAD para outra coisa."
+
+msgid ""
+"You're on a case-insensitive filesystem, and the remote you are\n"
+"trying to fetch from has references that only differ in casing. It\n"
+"is impossible to store such references with the 'files' backend. You\n"
+"can either accept this as-is, in which case you won't be able to\n"
+"store all remote references on disk. Or you can alternatively\n"
+"migrate your repository to use the 'reftable' backend with the\n"
+"following command:\n"
+"\n"
+"    git refs migrate --ref-format=reftable\n"
+"\n"
+"Please keep in mind that not all implementations of Git support this\n"
+"new format yet. So if you use tools other than Git to access this\n"
+"repository it may not be an option to migrate to reftables.\n"
+msgstr ""
+"Você está em um sistema de arquivos insensível a maiúsculas/minúsculas, e o "
+"remoto do qual você está\n"
+"tentando fazer fetch possui referências que diferem apenas em maiúsculas/"
+"minúsculas. É\n"
+"impossível armazenar essas referências com o backend 'files'. Você\n"
+"pode aceitar isso como está, caso em que não será capaz de\n"
+"armazenar todas as referências do remoto no disco. Ou você pode "
+"alternativamente\n"
+"migrar seu repositório para usar o backend 'reftable' com o\n"
+"seguinte comando:\n"
+"\n"
+"    git refs migrate --ref-format=reftable\n"
+"\n"
+"Por favor, tenha em mente que nem todas as implementações do Git suportam "
+"este\n"
+"novo formato ainda. Portanto, se você usa ferramentas além do Git para "
+"acessar este\n"
+"repositório, migrar para reftables pode não ser uma opção.\n"
+
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"algumas refs locais não puderam ser atualizadas; tente executar\n"
+" 'git remote prune %s' para remover quaisquer branches velhos e conflitantes"
+
+#, c-format
+msgid "fetching ref %s failed: %s"
+msgstr "falha ao buscar a ref %s: %s"
+
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr "múltiplos branches detectados, incompatível com --set-upstream"
+
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"não foi possível definir o upstream de HEAD para '%s' a partir de '%s' "
+"quando ele não aponta para nenhum branch."
+
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr "não definindo o upstream para um branch remoto de rastreamento remoto"
+
+msgid "not setting upstream for a remote tag"
+msgstr "não definindo o upstream para uma tag remota"
+
+msgid "unknown branch type"
+msgstr "tipo de branch desconhecido"
+
+msgid ""
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
+msgstr ""
+"nenhum branch de origem encontrado;\n"
+"você precisa especificar exatamente um branch com a opção --set-upstream"
+
+#, c-format
+msgid "Fetching %s\n"
+msgstr "Fazendo fetch de %s\n"
+
+#, c-format
+msgid "could not fetch %s"
+msgstr "não foi possível fazer fetch de %s"
+
+#, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
+msgstr "não foi possível fazer fetch de '%s' (código de saída: %d)\n"
+
+msgid ""
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
+msgstr ""
+"nenhum repositório remoto especificado; por favor, especifique uma URL ou "
+"um\n"
+"nome de remoto de onde as novas revisões devem ser obtidas via fetch"
+
+msgid "you need to specify a tag name"
+msgstr "você precisa especificar um nome de tag"
+
+msgid "fetch from all remotes"
+msgstr "fazer fetch de todos os remotos"
+
+msgid "set upstream for git pull/fetch"
+msgstr "configurar upstream para git pull/fetch"
+
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr "acrescentar ao .git/FETCH_HEAD em vez de sobrescrever"
+
+msgid "use atomic transaction to update references"
+msgstr "usar transação atômica para atualizar as referências"
+
+msgid "path to upload pack on remote end"
+msgstr "caminho para o upload pack no lado remoto"
+
+msgid "force overwrite of local reference"
+msgstr "forçar a sobrescrita da referência local"
+
+msgid "fetch from multiple remotes"
+msgstr "fazer fetch de múltiplos remotos"
+
+msgid "fetch all tags and associated objects"
+msgstr "fazer fetch de todas as tags e objetos associados"
+
+msgid "do not fetch all tags (--no-tags)"
+msgstr "não fazer fetch de todas as tags (--no-tags)"
+
+msgid "number of submodules fetched in parallel"
+msgstr "número de submódulos buscados em paralelo"
+
+msgid "modify the refspec to place all refs within refs/prefetch/"
+msgstr ""
+"modificar o refspec para colocar todas as refs dentro de refs/prefetch/"
+
+msgid "prune remote-tracking branches no longer on remote"
+msgstr "remover branches de rastreamento remoto que não existem mais no remoto"
+
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr ""
+"fazer prune de tags locais que não estão mais no remoto e sobrescrever as "
+"tags alteradas"
+
+msgid "on-demand"
+msgstr "sob demanda"
+
+msgid "control recursive fetching of submodules"
+msgstr "controlar o fetch recursivo de submódulos"
+
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr "gravar as referências baixadas no arquivo FETCH_HEAD"
+
+msgid "keep downloaded pack"
+msgstr "manter o pack baixado"
+
+msgid "allow updating of HEAD ref"
+msgstr "permitir a atualização do ref HEAD"
+
+msgid "deepen history of shallow clone"
+msgstr "aprofundar o histórico do clone raso"
+
+msgid "deepen history of shallow repository based on time"
+msgstr "aprofundar o histórico do repositório raso com base no tempo"
+
+msgid "convert to a complete repository"
+msgstr "converter para um repositório completo"
+
+msgid "re-fetch without negotiating common commits"
+msgstr "fazer re-fetch sem negociar commits comuns"
+
+msgid "prepend this to submodule path output"
+msgstr "preceder isto à saída do caminho do submódulo"
+
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
+"padrão para fetch recursivo de submódulos (prioridade menor que arquivos de "
+"configuração)"
+
+msgid "accept refs that update .git/shallow"
+msgstr "aceitar refs que atualizam .git/shallow"
+
+msgid "refmap"
+msgstr "refmap"
+
+msgid "specify fetch refmap"
+msgstr "especificar refmap de fetch"
+
+msgid "revision"
+msgstr "revisão"
+
+msgid "report that we have only objects reachable from this object"
+msgstr "relatar que temos apenas objetos alcançáveis deste objeto"
+
+msgid "ensure this ref is always sent as a negotiation have"
+msgstr "garantir que este ref seja sempre enviado como uma negociação de have"
+
+msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
+msgstr ""
+"não fazer fetch de um packfile; em vez disso, imprimir ancestrais de dicas "
+"de negociação"
+
+msgid "run 'maintenance --auto' after fetching"
+msgstr "executar 'maintenance --auto' após o fetch"
+
+msgid "check for forced-updates on all updated branches"
+msgstr "verificar atualizações forçadas em todos os branches atualizados"
+
+msgid "write the commit-graph after fetching"
+msgstr "escrever o commit-graph após o fetch"
+
+msgid "accept refspecs from stdin"
+msgstr "aceitar refspecs do stdin"
+
+msgid "negative depth in --deepen is not supported"
+msgstr "profundidade negativa em --deepen não é suportada"
+
+msgid "--unshallow on a complete repository does not make sense"
+msgstr "--unshallow em um repositório completo não faz sentido"
+
+#, c-format
+msgid "failed to fetch bundles from '%s'"
+msgstr "falha ao buscar bundles de '%s'"
+
+msgid "fetch --all does not take a repository argument"
+msgstr "fetch --all não aceita um argumento de repositório"
+
+msgid "fetch --all does not make sense with refspecs"
+msgstr "fetch --all não faz sentido com refspecs"
+
+#, c-format
+msgid "no such remote or remote group: %s"
+msgstr "não há remoto nem grupo de remotos: %s"
+
+msgid "fetching a group and specifying refspecs does not make sense"
+msgstr "fazer fetch de um grupo e especificar refspecs não faz sentido"
+
+msgid "must supply remote when using --negotiate-only"
+msgstr "deve fornecer o remoto ao usar --negotiate-only"
+
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "o protocolo não suporta --negotiate-only, saindo"
+
+#, c-format
+msgid "%s needs one or more %s"
+msgstr "%s precisa de um ou mais %s"
+
+msgid ""
+"--filter can only be used with the remote configured in "
+"extensions.partialclone"
+msgstr ""
+"--filter só pode ser usado com o remoto configurado em "
+"extensions.partialclone"
+
+msgid "--atomic can only be used when fetching from one remote"
+msgstr "--atomic só pode ser usado ao buscar de um único remoto"
+
+msgid "--stdin can only be used when fetching from one remote"
+msgstr "--stdin só pode ser usado ao buscar de um único remoto"
+
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+msgstr ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+
+msgid "populate log with at most <n> entries from shortlog"
+msgstr "popular o log com no máximo <n> entradas do shortlog"
+
+msgid "alias for --log (deprecated)"
+msgstr "alias para --log (obsoleto)"
+
+msgid "text"
+msgstr "texto"
+
+msgid "use <text> as start of message"
+msgstr "usar <text> como início da mensagem"
+
+msgid "use <name> instead of the real target branch"
+msgstr "usar <name> em vez do branch de destino real"
+
+msgid "file to read from"
+msgstr "arquivo de onde ler"
+
+msgid "quote placeholders suitably for shells"
+msgstr "citar placeholders adequadamente para shells"
+
+msgid "quote placeholders suitably for perl"
+msgstr "citar placeholders adequadamente para perl"
+
+msgid "quote placeholders suitably for python"
+msgstr "citar placeholders adequadamente para python"
+
+msgid "quote placeholders suitably for Tcl"
+msgstr "citar placeholders adequadamente para Tcl"
+
+msgid "show only <n> matched refs"
+msgstr "mostrar apenas <n> refs correspondentes"
+
+msgid "marker"
+msgstr "marcador"
+
+msgid "start iteration after the provided marker"
+msgstr "iniciar iteração após o marcador fornecido"
+
+msgid "respect format colors"
+msgstr "respeitar cores do formato"
+
+msgid "print only refs which points at the given object"
+msgstr "imprimir apenas refs que apontam para o objeto fornecido"
+
+msgid "print only refs that are merged"
+msgstr "imprimir apenas refs que foram mescladas"
+
+msgid "print only refs that are not merged"
+msgstr "imprimir apenas refs que não foram mescladas"
+
+msgid "print only refs which contain the commit"
+msgstr "imprimir apenas refs que contêm o commit"
+
+msgid "print only refs which don't contain the commit"
+msgstr "imprimir apenas refs que não contêm o commit"
+
+msgid "read reference patterns from stdin"
+msgstr "ler padrões de referência do stdin"
+
+msgid "also include HEAD ref and pseudorefs"
+msgstr "incluir também o ref HEAD e pseudorefs"
+
+msgid "cannot use --start-after with custom sort options"
+msgstr ""
+"não é possível usar --start-after com opções de ordenação personalizadas"
+
+msgid "unknown arguments supplied with --stdin"
+msgstr "argumentos desconhecidos fornecidos com --stdin"
+
+msgid "cannot use --start-after with patterns"
+msgstr "não é possível usar --start-after com padrões"
+
+msgid "git for-each-ref "
+msgstr "git for-each-ref "
+
+msgid "git for-each-repo --config=<config> [--] <arguments>"
+msgstr "git for-each-repo --config=<config> [--] <arguments>"
+
+msgid "config"
+msgstr "configuração"
+
+msgid "config key storing a list of repository paths"
+msgstr "chave de configuração armazenando uma lista de caminhos de repositório"
+
+msgid "keep going even if command fails in a repository"
+msgstr "continuar mesmo se o comando falhar em um repositório"
+
+msgid "missing --config=<config>"
+msgstr "faltando --config=<config>"
+
+#, c-format
+msgid "got bad config --config=%s"
+msgstr "configuração incorreta --config=%s"
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#, c-format
+msgid "error in %s %s: %s"
+msgstr "erro em %s %s: %s"
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr "aviso em %s %s: %s"
+
+#, c-format
+msgid "broken link from %7s %s"
+msgstr "link quebrado de %7s %s"
+
+msgid "wrong object type in link"
+msgstr "tipo de objeto errado no link"
+
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+"              to %7s %s"
+msgstr ""
+"link quebrado de %7s %s\n"
+"              para %7s %s"
+
+msgid "Checking connectivity"
+msgstr "Verificando conectividade"
+
+#, c-format
+msgid "missing %s %s"
+msgstr "%s %s ausente"
+
+#, c-format
+msgid "unreachable %s %s"
+msgstr "%s %s inalcançável"
+
+#, c-format
+msgid "dangling %s %s"
+msgstr "%s %s pendente"
+
+msgid "could not create lost-found"
+msgstr "não foi possível criar lost-found"
+
+#, c-format
+msgid "could not write '%s'"
+msgstr "não foi possível gravar '%s'"
+
+#, c-format
+msgid "could not finish '%s'"
+msgstr "não foi possível finalizar '%s'"
+
+#, c-format
+msgid "Checking %s"
+msgstr "Verificando %s"
+
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr "Verificando conectividade (%d objetos)"
+
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s: objeto corrompido ou ausente"
+
+#, c-format
+msgid "Checking %s %s"
+msgstr "Verificando %s %s"
+
+msgid "broken links"
+msgstr "links quebrados"
+
+#, c-format
+msgid "root %s"
+msgstr "raiz %s"
+
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr "%s com tag %s (%s) em %s"
+
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr "%s: entrada de reflog inválida %s"
+
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr "Verificando reflog %s->%s"
+
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr "%s: ponteiro sha1 inválido %s"
+
+#, c-format
+msgid "%s: not a commit"
+msgstr "%s: não é um commit"
+
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "parâmetro inválido: esperado sha1, obtido '%s'"
+
+msgid "notice: No default references"
+msgstr "aviso: Nenhuma referência padrão"
+
+#, c-format
+msgid "Checking cache tree of %s"
+msgstr "Verificando cache tree de %s"
+
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree of %s"
+msgstr "%s: ponteiro sha1 inválido no cache-tree de %s"
+
+msgid "non-tree in cache-tree"
+msgstr "não-tree no cache-tree"
+
+#, c-format
+msgid "%s: invalid sha1 pointer in resolve-undo of %s"
+msgstr "%s: ponteiro sha1 inválido no resolve-undo de %s"
+
+msgid "Checking ref database"
+msgstr "Verificando o banco de dados de refs"
+
+msgid ""
+"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
+"         [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
+"         [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n"
+"         [--[no-]name-objects] [--[no-]references] [<object>...]"
+msgstr ""
+"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
+"         [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
+"         [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n"
+"         [--[no-]name-objects] [--[no-]references] [<object>...]"
+
+msgid "show unreachable objects"
+msgstr "mostrar objetos inalcançáveis"
+
+msgid "show dangling objects"
+msgstr "mostrar objetos pendentes"
+
+msgid "report tags"
+msgstr "relatar tags"
+
+msgid "report root nodes"
+msgstr "relatar nós raiz"
+
+msgid "make index objects head nodes"
+msgstr "tornar objetos do índice nós head"
+
+msgid "make reflogs head nodes (default)"
+msgstr "tornar reflogs nós head (padrão)"
+
+msgid "also consider packs and alternate objects"
+msgstr "considerar também packs e objetos alternativos"
+
+msgid "check only connectivity"
+msgstr "verificar apenas conectividade"
+
+msgid "enable more strict checking"
+msgstr "ativar verificação mais rigorosa"
+
+msgid "write dangling objects in .git/lost-found"
+msgstr "escrever objetos dangling em .git/lost-found"
+
+msgid "show progress"
+msgstr "exibir progresso"
+
+msgid "show verbose names for reachable objects"
+msgstr "mostrar nomes detalhados para objetos alcançáveis"
+
+msgid "check reference database consistency"
+msgstr "verificar consistência do banco de dados de referência"
+
+msgid "git fsmonitor--daemon start [<options>]"
+msgstr "git fsmonitor--daemon start [<options>]"
+
+msgid "git fsmonitor--daemon run [<options>]"
+msgstr "git fsmonitor--daemon run [<options>]"
+
+#, c-format
+msgid "value of '%s' out of range: %d"
+msgstr "valor de '%s' fora do intervalo: %d"
+
+#, c-format
+msgid "value of '%s' not bool or int: %d"
+msgstr "valor de '%s' não é bool ou int: %d"
+
+#, c-format
+msgid "daemon did not stop within %d seconds"
+msgstr "daemon não parou em %d segundos"
+
+#, c-format
+msgid "fsmonitor-daemon is watching '%s'\n"
+msgstr "fsmonitor-daemon está observando '%s'\n"
+
+#, c-format
+msgid "fsmonitor-daemon is not watching '%s'\n"
+msgstr "fsmonitor-daemon não está observando '%s'\n"
+
+#, c-format
+msgid "could not create fsmonitor cookie '%s'"
+msgstr "não foi possível criar o cookie do fsmonitor '%s'"
+
+#, c-format
+msgid "fsmonitor: cookie_result '%d' != SEEN"
+msgstr "fsmonitor: cookie_result '%d' != SEEN"
+
+#, c-format
+msgid "could not start IPC thread pool on '%s'"
+msgstr "não foi possível iniciar o pool de threads IPC em '%s'"
+
+msgid "could not start fsmonitor listener thread"
+msgstr "não foi possível iniciar a thread do listener do fsmonitor"
+
+msgid "could not start fsmonitor health thread"
+msgstr "não foi possível iniciar a thread de health do fsmonitor"
+
+msgid "could not initialize listener thread"
+msgstr "não foi possível inicializar a thread do listener"
+
+msgid "could not initialize health thread"
+msgstr "não foi possível inicializar a thread de health"
+
+#, c-format
+msgid "could not cd home '%s'"
+msgstr "não foi possível fazer cd para o home '%s'"
+
+#, c-format
+msgid "fsmonitor--daemon is already running '%s'"
+msgstr "fsmonitor--daemon já está em execução '%s'"
+
+#, c-format
+msgid "running fsmonitor-daemon in '%s'\n"
+msgstr "executando fsmonitor-daemon em '%s'\n"
+
+msgid "setsid failed"
+msgstr "setsid falhou"
+
+#, c-format
+msgid "starting fsmonitor-daemon in '%s'\n"
+msgstr "iniciando fsmonitor-daemon em '%s'\n"
+
+msgid "daemon failed to start"
+msgstr "o daemon falhou ao iniciar"
+
+msgid "daemon not online yet"
+msgstr "daemon ainda não está online"
+
+msgid "daemon terminated"
+msgstr "daemon encerrado"
+
+msgid "detach from console"
+msgstr "desanexar do console"
+
+msgid "use <n> ipc worker threads"
+msgstr "usar <n> threads de worker ipc"
+
+msgid "max seconds to wait for background daemon startup"
+msgstr ""
+"máximo de segundos para esperar pela inicialização do daemon em segundo plano"
+
+#, c-format
+msgid "invalid 'ipc-threads' value (%d)"
+msgstr "valor 'ipc-threads' inválido (%d)"
+
+#, c-format
+msgid "Unhandled subcommand '%s'"
+msgstr "Subcomando não tratado '%s'"
+
+msgid "fsmonitor--daemon not supported on this platform"
+msgstr "fsmonitor--daemon não é suportado nesta plataforma"
+
+msgid "git gc [<options>]"
+msgstr "git gc [<options>]"
+
+#, c-format
+msgid "Failed to fstat %s: %s"
+msgstr "Falha ao fazer fstat em %s: %s"
+
+#, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr "falha ao analisar o valor '%s' de '%s'"
+
+#, c-format
+msgid "cannot stat '%s'"
+msgstr "não é possível executar stat em '%s'"
+
+#, 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 ""
+"A última execução do gc relatou o seguinte. Por favor, corrija a causa raiz\n"
+"e remova %s\n"
+"A limpeza automática não será realizada até que o arquivo seja removido.\n"
+"\n"
+"%s"
+
+msgid "prune unreferenced objects"
+msgstr "podar objetos não referenciados"
+
+msgid "pack unreferenced objects separately"
+msgstr "empacotar objetos não referenciados separadamente"
+
+msgid "with --cruft, limit the size of new cruft packs"
+msgstr "com --cruft, limitar o tamanho de novos cruft packs"
+
+msgid "be more thorough (increased runtime)"
+msgstr "ser mais minucioso (aumento no tempo de execução)"
+
+msgid "enable auto-gc mode"
+msgstr "ativar modo auto-gc"
+
+msgid "perform garbage collection in the background"
+msgstr "realizar coleta de lixo em segundo plano"
+
+msgid "force running gc even if there may be another gc running"
+msgstr "forçar a execução do gc mesmo se houver outro gc em execução"
+
+msgid "repack all other packs except the largest pack"
+msgstr "fazer repack de todos os outros packs, exceto o maior pack"
+
+msgid "pack prefix to store a pack containing pruned objects"
+msgstr "prefixo do pack para armazenar um pack contendo objetos podados"
+
+msgid "skip maintenance tasks typically done in the foreground"
+msgstr "ignorar tarefas de manutenção tipicamente feitas em primeiro plano"
+
+#, c-format
+msgid "failed to parse gc.logExpiry value %s"
+msgstr "falha ao analisar o valor %s de gc.logExpiry"
+
+#, c-format
+msgid "failed to parse prune expiry value %s"
+msgstr "falha ao analisar valor de expiração de prune %s"
+
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr ""
+"Empacotando automaticamente o repositório em segundo plano para um "
+"desempenho ideal.\n"
+
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr "Empacotando automaticamente o repositório para um desempenho ideal.\n"
+
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr "Veja \"git help gc\" para limpeza manual.\n"
+
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+"gc já está em execução na máquina '%s' pid %<PRIuMAX> (use --force se não "
+"estiver)"
+
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+
+msgid "--no-schedule is not allowed"
+msgstr "--no-schedule não é permitido"
+
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "argumento --schedule não reconhecido '%s'"
+
+msgid "failed to write commit-graph"
+msgstr "falha ao gravar o commit-graph"
+
+msgid "failed to prefetch remotes"
+msgstr "falha ao fazer prefetch dos remotos"
+
+msgid "failed to start 'git pack-objects' process"
+msgstr "falha ao iniciar o processo 'git pack-objects'"
+
+msgid "failed to finish 'git pack-objects' process"
+msgstr "falha ao finalizar o processo 'git pack-objects'"
+
+msgid "failed to write multi-pack-index"
+msgstr "falha ao escrever o multi-pack-index"
+
+msgid "'git multi-pack-index expire' failed"
+msgstr "'git multi-pack-index expire' falhou"
+
+msgid "'git multi-pack-index repack' failed"
+msgstr "'git multi-pack-index repack' falhou"
+
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr ""
+"ignorando tarefa incremental-repack porque core.multiPackIndex está "
+"desabilitado"
+
+#, c-format
+msgid "task '%s' failed"
+msgstr "tarefa '%s' falhou"
+
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "arquivo de bloqueio '%s' existe, ignorando a manutenção"
+
+#, c-format
+msgid "unknown maintenance strategy: '%s'"
+msgstr "estratégia de manutenção desconhecida: '%s'"
+
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "'%s' não é uma tarefa válida"
+
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "a tarefa '%s' não pode ser selecionada várias vezes"
+
+msgid "run tasks based on the state of the repository"
+msgstr "executar tarefas com base no estado do repositório"
+
+msgid "perform maintenance in the background"
+msgstr "realizar manutenção em segundo plano"
+
+msgid "frequency"
+msgstr "frequência"
+
+msgid "run tasks based on frequency"
+msgstr "executar tarefas com base na frequência"
+
+msgid "do not report progress or other information over stderr"
+msgstr "não relatar progresso ou outras informações via stderr"
+
+msgid "task"
+msgstr "tarefa"
+
+msgid "run a specific task"
+msgstr "executar uma tarefa específica"
+
+#, c-format
+msgid "unable to add '%s' value of '%s'"
+msgstr "não foi possível adicionar o valor '%s' de '%s'"
+
+msgid "return success even if repository was not registered"
+msgstr "retornar sucesso mesmo se o repositório não estiver registrado"
+
+#, c-format
+msgid "unable to unset '%s' value of '%s'"
+msgstr "não foi possível desdefinir o valor '%s' de '%s'"
+
+#, c-format
+msgid "repository '%s' is not registered"
+msgstr "o repositório '%s' não está registrado"
+
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "falha ao expandir o caminho '%s'"
+
+msgid "failed to start launchctl"
+msgstr "falha ao iniciar o launchctl"
+
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "falha ao criar os diretórios para '%s'"
+
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "falha ao inicializar o serviço %s"
+
+msgid "failed to create temp xml file"
+msgstr "falha ao criar o arquivo xml temporário"
+
+msgid "failed to start schtasks"
+msgstr "falha ao iniciar o schtasks"
+
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr "falha ao executar 'crontab -l'; seu sistema pode não suportar 'cron'"
+
+msgid "failed to create crontab temporary file"
+msgstr "falha ao criar o arquivo temporário do crontab"
+
+msgid "failed to open temporary file"
+msgstr "falha ao abrir o arquivo temporário"
+
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr "falha ao executar 'crontab'; seu sistema pode não suportar 'cron'"
+
+msgid "'crontab' died"
+msgstr "'crontab' morreu"
+
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "falha ao excluir '%s'"
+
+#, c-format
+msgid "failed to flush '%s'"
+msgstr "falha ao fazer flush de '%s'"
+
+msgid "failed to start systemctl"
+msgstr "falha ao iniciar o systemctl"
+
+msgid "failed to run systemctl"
+msgstr "falha ao executar o systemctl"
+
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "argumento --scheduler não reconhecido '%s'"
+
+msgid "neither systemd timers nor crontab are available"
+msgstr "nem systemd timers nem crontab estão disponíveis"
+
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "agendador %s não está disponível"
+
+#, c-format
+msgid ""
+"unable to create '%s.lock': %s.\n"
+"\n"
+"Another scheduled git-maintenance(1) process seems to be running in this\n"
+"repository. Please make sure no other maintenance processes are running and\n"
+"then try again. If it still fails, a git-maintenance(1) process may have\n"
+"crashed in this repository earlier: remove the file manually to continue."
+msgstr ""
+"não foi possível criar '%s.lock': %s.\n"
+"\n"
+"Outro processo agendado git-maintenance(1) parece estar em execução neste\n"
+"repositório. Por favor, certifique-se de que não há outros processos de "
+"maintenance em execução e\n"
+"tente novamente. Se ainda falhar, um processo git-maintenance(1) pode ter\n"
+"travado neste repositório anteriormente: remova o arquivo manualmente para "
+"continuar."
+
+msgid "cannot acquire lock for scheduled background maintenance"
+msgstr ""
+"não é possível adquirir o bloqueio para a manutenção agendada em segundo "
+"plano"
+
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<scheduler>]"
+
+msgid "scheduler"
+msgstr "agendador"
+
+msgid "scheduler to trigger git maintenance run"
+msgstr "agendador para acionar a execução do git maintenance"
+
+msgid "failed to set up maintenance schedule"
+msgstr "falha ao configurar o agendamento de manutenção"
+
+msgid "failed to add repo to global config"
+msgstr "falha ao adicionar repositório à configuração global"
+
+msgid "check a specific task"
+msgstr "verificar uma tarefa específica"
+
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <subcommand> [<options>]"
+
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr "grep: falha ao criar a thread: %s"
+
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
+msgstr "número inválido de threads especificado (%d) para %s"
+
+#. #-#-#-#-#  grep.c.po  #-#-#-#-#
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "não há suporte para threads, ignorando %s"
+
+#, c-format
+msgid "unable to read tree %s"
+msgstr "não foi possível ler a tree %s"
+
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr "não foi possível fazer grep de um objeto do tipo %s"
+
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr "a opção '%c' espera um valor numérico"
+
+msgid "search in index instead of in the work tree"
+msgstr "pesquisar no índice em vez de na árvore de trabalho"
+
+msgid "find in contents not managed by git"
+msgstr "pesquisar em conteúdos não gerenciados pelo git"
+
+msgid "search in both tracked and untracked files"
+msgstr "pesquisar tanto em arquivos rastreados quanto não rastreados"
+
+msgid "ignore files specified via '.gitignore'"
+msgstr "ignorar arquivos especificados via '.gitignore'"
+
+msgid "recursively search in each submodule"
+msgstr "pesquisar recursivamente em cada submódulo"
+
+msgid "show non-matching lines"
+msgstr "mostrar linhas sem correspondência"
+
+msgid "case insensitive matching"
+msgstr "correspondência sem distinção de maiúsculas/minúsculas"
+
+msgid "match patterns only at word boundaries"
+msgstr "corresponder padrões apenas nos limites de palavras"
+
+msgid "process binary files as text"
+msgstr "processar arquivos binários como texto"
+
+msgid "don't match patterns in binary files"
+msgstr "não corresponder a padrões em arquivos binários"
+
+msgid "process binary files with textconv filters"
+msgstr "processar arquivos binários com filtros textconv"
+
+msgid "search in subdirectories (default)"
+msgstr "pesquisar em subdiretórios (padrão)"
+
+msgid "descend at most <n> levels"
+msgstr "descer no máximo <n> níveis"
+
+msgid "use extended POSIX regular expressions"
+msgstr "usar expressões regulares POSIX estendidas"
+
+msgid "use basic POSIX regular expressions (default)"
+msgstr "usar expressões regulares POSIX básicas (padrão)"
+
+msgid "interpret patterns as fixed strings"
+msgstr "interpretar padrões como strings fixas"
+
+msgid "use Perl-compatible regular expressions"
+msgstr "usar expressões regulares compatíveis com Perl"
+
+msgid "show line numbers"
+msgstr "mostrar números de linha"
+
+msgid "show column number of first match"
+msgstr "mostrar o número da coluna da primeira correspondência"
+
+msgid "don't show filenames"
+msgstr "não mostrar nomes de arquivos"
+
+msgid "show filenames"
+msgstr "mostrar nomes de arquivos"
+
+msgid "show filenames relative to top directory"
+msgstr "mostrar nomes de arquivos relativos ao diretório superior"
+
+msgid "show only filenames instead of matching lines"
+msgstr "mostrar apenas os nomes de arquivos em vez das linhas correspondentes"
+
+msgid "synonym for --files-with-matches"
+msgstr "sinônimo de --files-with-matches"
+
+msgid "show only the names of files without match"
+msgstr "mostrar apenas os nomes de arquivos sem correspondência"
+
+msgid "print NUL after filenames"
+msgstr "imprimir NUL após os nomes de arquivo"
+
+msgid "show only matching parts of a line"
+msgstr "mostrar apenas as partes correspondentes de uma linha"
+
+msgid "show the number of matches instead of matching lines"
+msgstr "mostrar o número de correspondências em vez das linhas correspondentes"
+
+msgid "highlight matches"
+msgstr "destacar correspondências"
+
+msgid "print empty line between matches from different files"
+msgstr "imprimir linha vazia entre correspondências de arquivos diferentes"
+
+msgid "show filename only once above matches from same file"
+msgstr ""
+"mostrar nome do arquivo apenas uma vez acima das correspondências do mesmo "
+"arquivo"
+
+msgid "show <n> context lines before and after matches"
+msgstr "mostrar <n> linhas de contexto antes e depois das correspondências"
+
+msgid "show <n> context lines before matches"
+msgstr "mostrar <n> linhas de contexto antes das correspondências"
+
+msgid "show <n> context lines after matches"
+msgstr "mostrar <n> linhas de contexto após as correspondências"
+
+msgid "use <n> worker threads"
+msgstr "usar <n> threads de trabalho"
+
+msgid "shortcut for -C NUM"
+msgstr "atalho para -C NUM"
+
+msgid "show a line with the function name before matches"
+msgstr "mostrar uma linha com o nome da função antes das correspondências"
+
+msgid "show the surrounding function"
+msgstr "exibir a função ao redor"
+
+msgid "read patterns from file"
+msgstr "ler padrões do arquivo"
+
+msgid "match <pattern>"
+msgstr "corresponder a <pattern>"
+
+msgid "combine patterns specified with -e"
+msgstr "combinar padrões especificados com -e"
+
+msgid "indicate hit with exit status without output"
+msgstr "indicar correspondência com status de saída sem saída"
+
+msgid "show only matches from files that match all patterns"
+msgstr ""
+"mostrar apenas correspondências de arquivos que correspondem a todos os "
+"padrões"
+
+msgid "pager"
+msgstr "pager"
+
+msgid "show matching files in the pager"
+msgstr "mostrar arquivos correspondentes no pager"
+
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr "permitir chamada de grep(1) (ignorado por esta compilação)"
+
+msgid "maximum number of results per file"
+msgstr "número máximo de resultados por arquivo"
+
+msgid "no pattern given"
+msgstr "nenhum padrão fornecido"
+
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index ou --untracked não podem ser usados com revs"
+
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "não foi possível resolver a revisão: %s"
+
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked não é suportado com --recurse-submodules"
+
+msgid "invalid option combination, ignoring --threads"
+msgstr "combinação de opções inválida, ignorando --threads"
+
+msgid "no threads support, ignoring --threads"
+msgstr "não há suporte para threads, ignorando --threads"
+
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "número inválido de threads especificado (%d)"
+
+msgid "--open-files-in-pager only works on the worktree"
+msgstr "--open-files-in-pager funciona apenas no worktree"
+
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
+msgstr "--[no-]exclude-standard não pode ser usado para conteúdos rastreados"
+
+msgid "both --cached and trees are given"
+msgstr "tanto --cached quanto trees foram fornecidos"
+
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n"
+"                [--stdin [--literally]] [--] <file>..."
+msgstr ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n"
+"                [--stdin [--literally]] [--] <file>..."
+
+msgid "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]"
+msgstr "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]"
+
+msgid "object type"
+msgstr "tipo de objeto"
+
+msgid "write the object into the object database"
+msgstr "gravar o objeto no banco de dados de objetos"
+
+msgid "read the object from stdin"
+msgstr "ler o objeto da entrada padrão"
+
+msgid "store file as is without filters"
+msgstr "armazenar o arquivo como está, sem filtros"
+
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr ""
+"apenas calcular o hash de qualquer lixo aleatório para criar objetos "
+"corrompidos para depuração do Git"
+
+msgid "process file as it were from this path"
+msgstr "processar o arquivo como se fosse deste caminho"
+
+msgid "print all available commands"
+msgstr "imprimir todos os comandos disponíveis"
+
+msgid "show external commands in --all"
+msgstr "exibir comandos externos em --all"
+
+msgid "show aliases in --all"
+msgstr "exibir aliases em --all"
+
+msgid "exclude guides"
+msgstr "excluir guias"
+
+msgid "show man page"
+msgstr "mostrar man page"
+
+msgid "show manual in web browser"
+msgstr "mostrar manual no navegador da web"
+
+msgid "show info page"
+msgstr "mostrar página de informações"
+
+msgid "print command description"
+msgstr "imprimir a descrição do comando"
+
+msgid "print list of useful guides"
+msgstr "imprimir lista de guias úteis"
+
+msgid "print list of user-facing repository, command and file interfaces"
+msgstr ""
+"imprimir lista de repositório, comandos e interfaces de arquivo voltados "
+"para o usuário"
+
+msgid "print list of file formats, protocols and other developer interfaces"
+msgstr ""
+"imprimir lista de formatos de arquivo, protocolos e outras interfaces de "
+"desenvolvedor"
+
+msgid "print all configuration variable names"
+msgstr "imprimir todos os nomes das variáveis de configuração"
+
+msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]"
+msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]"
+
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr "formato de ajuda não reconhecido '%s'"
+
+msgid "Failed to start emacsclient."
+msgstr "Falha ao iniciar o emacsclient."
+
+msgid "Failed to parse emacsclient version."
+msgstr "Falha ao analisar a versão do emacsclient."
+
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
+msgstr "a versão '%d' do emacsclient é muito antiga (< 22)."
+
+#, c-format
+msgid "failed to exec '%s'"
+msgstr "falha ao executar '%s'"
+
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+"'%s': caminho para um visualizador de man não suportado.\n"
+"Por favor, considere usar 'man.<tool>.cmd' em vez disso."
+
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+"'%s': cmd para um visualizador de man suportado.\n"
+"Por favor, considere usar 'man.<tool>.path' em vez disso."
+
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr "'%s': visualizador de man desconhecido."
+
+msgid "no man viewer handled the request"
+msgstr "nenhum visualizador de man lidou com a solicitação"
+
+msgid "no info viewer handled the request"
+msgstr "nenhum visualizador de informações lidou com a solicitação"
+
+#, c-format
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s' é um alias para '%s'"
+
+#, c-format
+msgid "bad alias.%s string: %s"
+msgstr "string de alias.%s inválida: %s"
+
+#, c-format
+msgid "the '%s' option doesn't take any non-option arguments"
+msgstr "a opção '%s' não aceita argumentos que não sejam opção"
+
+msgid ""
+"the '--no-[external-commands|aliases]' options can only be used with '--all'"
+msgstr ""
+"as opções '--no-[external-commands|aliases]' só podem ser usadas com '--all'"
+
+#, c-format
+msgid "usage: %s%s"
+msgstr "uso: %s%s"
+
+msgid "'git help config' for more information"
+msgstr "'git help config' para mais informações"
+
+msgid ""
+"git history drop <commit> [--dry-run] [--update-refs=(branches|head)] [--"
+"empty=(drop|keep|abort)]"
+msgstr ""
+"git history drop <commit> [--dry-run] [--update-refs=(branches|head)] [--"
+"empty=(drop|keep|abort)]"
+
+msgid ""
+"git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--"
+"reedit-message] [--empty=(drop|keep|abort)]"
+msgstr ""
+"git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--"
+"reedit-message] [--empty=(drop|keep|abort)]"
+
+msgid "git history reword <commit> [--dry-run] [--update-refs=(branches|head)]"
+msgstr ""
+"git history reword <commit> [--dry-run] [--update-refs=(branches|head)]"
+
+msgid ""
+"git history split <commit> [--dry-run] [--update-refs=(branches|head)] [--] "
+"[<pathspec>...]"
+msgstr ""
+"git history split <commit> [--dry-run] [--update-refs=(branches|head)] [--] "
+"[<pathspec>...]"
+
+#, c-format
+msgid ""
+"Please enter the commit message for the %s changes. Lines starting\n"
+"with '%s' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"Por favor, insira a mensagem de commit para as alterações %s. Linhas que "
+"começam\n"
+"com '%s' serão ignoradas, e uma mensagem vazia aborta o commit.\n"
+
+#, c-format
+msgid "could not write to '%s'"
+msgstr "não foi possível gravar em '%s'"
+
+#, c-format
+msgid "Aborting commit as launching the editor failed.\n"
+msgstr "Abortando o commit, pois a inicialização do editor falhou.\n"
+
+#, c-format
+msgid "unable to parse parent commit %s"
+msgstr "não foi possível analisar o commit pai %s"
+
+#, c-format
+msgid "%s expects one of 'branches' or 'head'"
+msgstr "%s espera 'branches' ou 'head'"
+
+msgid "error preparing revisions"
+msgstr "erro ao preparar as revisões"
+
+msgid "replaying merge commits is not supported yet!"
+msgstr "reproduzir commits de merge ainda não é suportado!"
+
+msgid "cannot look up HEAD"
+msgstr "não é possível procurar o HEAD"
+
+msgid "cannot determine descendance"
+msgstr "não é possível determinar a descendência"
+
+msgid ""
+"rewritten commit must be an ancestor of HEAD when using --update-refs=head"
+msgstr ""
+"o commit reescrito deve ser um ancestral de HEAD ao usar --update-refs=head"
+
+#, c-format
+msgid "failed to begin ref transaction: %s"
+msgstr "falha ao iniciar a transação de refs: %s"
+
+#, c-format
+msgid "failed to update ref '%s': %s"
+msgstr "falha ao atualizar o ref '%s': %s"
+
+#, c-format
+msgid "failed to commit ref transaction: %s"
+msgstr "falha ao efetivar a transação de refs: %s"
+
+#, c-format
+msgid "unable to parse parent of %s"
+msgstr "não foi possível analisar o pai de %s"
+
+#, c-format
+msgid ""
+"unrecognized '--empty=' action '%s'; valid values are \"drop\", \"keep\", "
+"and \"abort\"."
+msgstr ""
+"ação '--empty=' não reconhecida '%s'; os valores válidos são \"drop\", "
+"\"keep\" e \"abort\"."
+
+msgid "control which refs should be updated"
+msgstr "controlar quais refs devem ser atualizadas"
+
+msgid "perform a dry-run without updating any refs"
+msgstr "realizar uma simulação (dry-run) sem atualizar nenhuma ref"
+
+msgid "open an editor to modify the commit message"
+msgstr "abrir um editor para modificar a mensagem do commit"
+
+msgid "how to handle commits that become empty"
+msgstr "como tratar commits que se tornam vazios"
+
+msgid "command expects a single revision"
+msgstr "o comando espera uma única revisão"
+
+msgid "cannot run fixup in a bare repository"
+msgstr "não é possível executar fixup em um repositório bare"
+
+#, c-format
+msgid "commit cannot be found: %s"
+msgstr "o commit não pode ser encontrado: %s"
+
+msgid "cannot get tree for HEAD"
+msgstr "não é possível obter a tree de HEAD"
+
+msgid "unable to read index"
+msgstr "não foi possível ler o índice"
+
+msgid "nothing to fixup: no staged changes"
+msgstr "nada para fazer fixup: nenhuma alteração no stage"
+
+msgid "unable to write index as a tree"
+msgstr "não foi possível gravar o índice como uma tree"
+
+#, c-format
+msgid "cannot get tree for commit %s"
+msgstr "não é possível obter a tree do commit %s"
+
+msgid "merge failed while applying fixup"
+msgstr "falha no merge ao aplicar a correção (fixup)"
+
+msgid "fixup would produce conflicts; aborting"
+msgstr "a correção (fixup) produziria conflitos; abortando"
+
+#, c-format
+msgid "cannot drop root commit %s: it has no parent to replay onto"
+msgstr ""
+"não é possível descartar (drop) o root commit %s: não tem pai no qual ser "
+"reproduzido"
+
+#, c-format
+msgid "fixup makes commit %s empty"
+msgstr "a correção (fixup) torna o commit %s vazio"
+
+msgid "failed writing fixed-up commit"
+msgstr "falha ao gravar o commit corrigido"
+
+msgid "failed replaying descendants"
+msgstr "falha ao reproduzir os descendentes"
+
+msgid "failed writing reworded commit"
+msgstr "falha ao gravar o commit reformulado"
+
+#, c-format
+msgid "unable to parse tree %s"
+msgstr "não foi possível analisar a tree %s"
+
+msgid "unable to populate index with tree"
+msgstr "não foi possível popular o índice com a tree"
+
+msgid "unable to acquire index lock"
+msgstr "não foi possível adquirir o lock do índice"
+
+msgid "failed reading temporary index"
+msgstr "falha ao ler o índice temporário"
+
+msgid "failed split tree"
+msgstr "falha ao dividir a tree"
+
+msgid "split commit is empty"
+msgstr "o commit dividido está vazio"
+
+msgid "split commit tree matches original commit"
+msgstr "a tree do commit dividido corresponde ao commit original"
+
+msgid "failed writing first commit"
+msgstr "falha ao gravar o primeiro commit"
+
+msgid "failed writing second commit"
+msgstr "falha ao gravar o segundo commit"
+
+msgid "control ref update behavior"
+msgstr "controlar o comportamento de atualização de ref"
+
+msgid "command expects a committish"
+msgstr "o comando espera um committish"
+
+msgid "cannot split up merge commit"
+msgstr "não é possível dividir o merge commit"
+
+msgid "cannot resolve HEAD commit"
+msgstr "não é possível resolver o commit do HEAD"
+
+msgid "cannot resolve tree for HEAD"
+msgstr "não é possível resolver a tree do HEAD"
+
+msgid "how to handle descendants that become empty"
+msgstr "como lidar com descendentes que se tornam vazios"
+
+#, c-format
+msgid "cannot drop merge commit: %s"
+msgstr "não é possível descartar o commit de merge: %s"
+
+msgid "dropping this commit would overwrite local changes; aborting"
+msgstr "descartar este commit substituiria as alterações locais; abortando"
+
+msgid "failed to update references"
+msgstr "falha ao atualizar as referências"
+
+#, c-format
+msgid "could not update working tree to new commit %s"
+msgstr "não foi possível atualizar a árvore de trabalho para o novo commit %s"
+
+msgid ""
+"git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-"
+"stdin=<path>] [(-j|--jobs) <n>]\n"
+"<hook-name> [-- <hook-args>]"
+msgstr ""
+"git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-"
+"stdin=<path>] [(-j|--jobs) <n>]\n"
+"<hook-name> [-- <hook-args>]"
+
+msgid ""
+"git hook list [--allow-unknown-hook-name] [-z] [--show-scope] <hook-name>"
+msgstr ""
+"git hook list [--allow-unknown-hook-name] [-z] [--show-scope] <hook-name>"
+
+msgid "use NUL as line terminator"
+msgstr "usar NUL como terminador de linha"
+
+msgid "show the config scope that defined each hook"
+msgstr "mostrar o escopo de configuração que definiu cada hook"
+
+msgid "allow running a hook with a non-native hook name"
+msgstr "permitir a execução de um hook com um nome de hook não nativo"
+
+msgid "you must specify a hook event name to list"
+msgstr "você deve especificar um nome de evento de hook para listar"
+
+#, c-format
+msgid ""
+"unknown hook event '%s';\n"
+"use --allow-unknown-hook-name to allow non-native hook names"
+msgstr ""
+"evento de hook desconhecido '%s';\n"
+"use --allow-unknown-hook-name para permitir nomes de hook não nativos"
+
+#, c-format
+msgid "no hooks found for event '%s'"
+msgstr "nenhum hook encontrado para o evento '%s'"
+
+msgid "hook from hookdir"
+msgstr "hook do hookdir"
+
+msgid "silently ignore missing requested <hook-name>"
+msgstr "ignorar silenciosamente o <hook-name> ausente solicitado"
+
+msgid "file to read into hooks' stdin"
+msgstr "arquivo a ser lido para a stdin dos hooks"
+
+msgid "run up to <n> hooks simultaneously (-1 for CPU count)"
+msgstr "executar até <n> hooks simultaneamente (-1 para o número de CPUs)"
+
+#, c-format
+msgid "invalid value for -j: %d (use -1 for CPU count or a positive integer)"
+msgstr ""
+"valor inválido para -j: %d (use -1 para a contagem de CPU ou um inteiro "
+"positivo)"
+
+#, c-format
+msgid "object type mismatch at %s"
+msgstr "incompatibilidade de tipo de objeto em %s"
+
+#, c-format
+msgid "did not receive expected object %s"
+msgstr "não recebeu o objeto esperado %s"
+
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr "objeto %s: tipo esperado %s, encontrado %s"
+
+msgid "Checking objects"
+msgstr "Verificando objetos"
+
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] "não é possível preencher %d byte"
+msgstr[1] "não é possível preencher %d bytes"
+
+msgid "early EOF"
+msgstr "EOF antecipado"
+
+msgid "read error on input"
+msgstr "erro de leitura na entrada"
+
+msgid "used more bytes than were available"
+msgstr "usou mais bytes do que estavam disponíveis"
+
+msgid "pack too large for current definition of off_t"
+msgstr "pack muito grande para a definição atual de off_t"
+
+#, c-format
+msgid "pack exceeds maximum allowed size (%s)"
+msgstr "o pack excede o tamanho máximo permitido (%s)"
+
+msgid "pack signature mismatch"
+msgstr "incompatibilidade de assinatura do pack"
+
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr "versão do pack %<PRIu32> não suportada"
+
+#, c-format
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "o pack tem objeto inválido no deslocamento %<PRIuMAX>: %s"
+
+#, c-format
+msgid "inflate returned %d"
+msgstr "inflate retornou %d"
+
+msgid "object size too large for this platform"
+msgstr "tamanho do objeto muito grande para esta plataforma"
+
+msgid "offset value overflow for delta base object"
+msgstr "estouro de valor de deslocamento para objeto base delta"
+
+msgid "delta base offset is out of bound"
+msgstr "o deslocamento base delta está fora do limite"
+
+#, c-format
+msgid "unknown object type %d"
+msgstr "tipo de objeto desconhecido %d"
+
+msgid "cannot pread pack file"
+msgstr "não é possível fazer pread do arquivo de pack"
+
+#, c-format
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
+msgstr[0] "fim prematuro do arquivo de pack, faltando %<PRIuMAX> byte"
+msgstr[1] "fim prematuro do arquivo de pack, faltando %<PRIuMAX> bytes"
+
+msgid "serious inflate inconsistency"
+msgstr "inconsistência grave de inflate"
+
+#, c-format
+msgid "SHA1 COLLISION FOUND WITH %s !"
+msgstr "COLISÃO SHA1 ENCONTRADA COM %s !"
+
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "não é possível ler informações do objeto existente %s"
+
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "não é possível ler o objeto existente %s"
+
+#, c-format
+msgid "invalid blob object %s"
+msgstr "objeto blob inválido %s"
+
+msgid "fsck error in packed object"
+msgstr "erro fsck no objeto empacotado"
+
+#, c-format
+msgid "invalid %s"
+msgstr "%s inválido"
+
+#, c-format
+msgid "Not all child objects of %s are reachable"
+msgstr "Nem todos os objetos filhos de %s são acessíveis"
+
+msgid "failed to apply delta"
+msgstr "falha ao aplicar o delta"
+
+msgid "Receiving objects"
+msgstr "Recebendo objetos"
+
+msgid "Indexing objects"
+msgstr "Indexando objetos"
+
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr "o pack está corrompido (incompatibilidade SHA1)"
+
+msgid "cannot fstat packfile"
+msgstr "não é possível executar fstat no packfile"
+
+msgid "pack has junk at the end"
+msgstr "o pack tem lixo no final"
+
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "confusão além da insanidade em parse_pack_objects()"
+
+msgid "Resolving deltas"
+msgstr "Resolvendo deltas"
+
+#, c-format
+msgid "unable to create thread: %s"
+msgstr "não foi possível criar a thread: %s"
+
+msgid "confusion beyond insanity"
+msgstr "confusão além da insanidade"
+
+#, c-format
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "concluído com %d objeto local"
+msgstr[1] "concluído com %d objetos locais"
+
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr "Soma de verificação final inesperada para %s (corrupção de disco?)"
+
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] "o pack tem %d delta não resolvido"
+msgstr[1] "o pack tem %d deltas não resolvidos"
+
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr "não foi possível fazer deflate do objeto anexado (%d)"
+
+#, c-format
+msgid "local object %s is corrupt"
+msgstr "o objeto local %s está corrompido"
+
+#, c-format
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "o nome do packfile '%s' não termina com '.%s'"
+
+#, c-format
+msgid "cannot write %s file '%s'"
+msgstr "não é possível gravar o arquivo %s '%s'"
+
+#, c-format
+msgid "cannot close written %s file '%s'"
+msgstr "não é possível fechar o arquivo %s escrito '%s'"
+
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "não foi possível renomear o arquivo temporário '*.%s' para '%s'"
+
+msgid "error while closing pack file"
+msgstr "erro ao fechar o arquivo do pacote"
+
+#, c-format
+msgid "bad pack.indexVersion=%<PRIu32>"
+msgstr "pack.indexVersion=%<PRIu32> inválido"
+
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr "Não é possível abrir o arquivo de pack existente '%s'"
+
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr "Não é possível abrir o arquivo idx de pack existente para '%s'"
+
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] "não delta: %d objeto"
+msgstr[1] "não delta: %d objetos"
+
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] "comprimento da cadeia = %d: %lu objeto"
+msgstr[1] "comprimento da cadeia = %d: %lu objetos"
+
+msgid "could not start pack-objects to repack local links"
+msgstr ""
+"não foi possível iniciar o pack-objects para fazer repack dos links locais"
+
+msgid "failed to feed local object to pack-objects"
+msgstr "falha ao alimentar o objeto local para pack-objects"
+
+msgid "index-pack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+"index-pack: Esperando linhas de ID de objeto hexadecimal completas apenas de "
+"pack-objects."
+
+msgid "could not finish pack-objects to repack local links"
+msgstr ""
+"não foi possível finalizar o pack-objects para fazer repack dos links locais"
+
+msgid "Cannot come back to cwd"
+msgstr "Não é possível voltar para o cwd"
+
+#, c-format
+msgid "bad --pack_header: %s"
+msgstr "--pack_header inválido: %s"
+
+#, c-format
+msgid "bad %s"
+msgstr "%s inválido"
+
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "algoritmo de hash desconhecido '%s'"
+
+msgid "--promisor cannot be used with a pack name"
+msgstr "--promisor não pode ser usado com um nome de pack"
+
+msgid "--stdin requires a git repository"
+msgstr "--stdin requer um repositório git"
+
+msgid "--verify with no packfile name given"
+msgstr "--verify sem nenhum nome de packfile fornecido"
+
+msgid "cannot perform queued object checks outside of a repository"
+msgstr ""
+"não é possível realizar verificações de objetos enfileirados fora de um "
+"repositório"
+
+msgid "fsck error in pack objects"
+msgstr "erro fsck em objetos de pack"
+
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n"
+"         [--separate-git-dir <git-dir>] [--object-format=<format>]\n"
+"         [--ref-format=<format>]\n"
+"         [-b <branch-name> | --initial-branch=<branch-name>]\n"
+"         [--shared[=<permissions>]] [<directory>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n"
+"         [--separate-git-dir <git-dir>] [--object-format=<format>]\n"
+"         [--ref-format=<format>]\n"
+"         [-b <branch-name> | --initial-branch=<branch-name>]\n"
+"         [--shared[=<permissions>]] [<directory>]"
+
+msgid "permissions"
+msgstr "permissões"
+
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr ""
+"especificar que o repositório git será compartilhado entre vários usuários"
+
+msgid "override the name of the initial branch"
+msgstr "substituir o nome do branch inicial"
+
+msgid "hash"
+msgstr "hash"
+
+msgid "specify the hash algorithm to use"
+msgstr "especificar o algoritmo de hash a ser usado"
+
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "não é possível criar o diretório %s"
+
+#, c-format
+msgid "cannot chdir to %s"
+msgstr "não é possível mudar para o diretório %s"
+
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+"%s (ou --work-tree=<directory>) não é permitido sem especificar %s (ou --git-"
+"dir=<directory>)"
+
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr "Não é possível acessar a árvore de trabalho '%s'"
+
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr "--separate-git-dir é incompatível com um repositório bare"
+
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty]\n"
+"                       [(--trailer (<key>|<key-alias>)[(=|:)<value>])...]\n"
+"                       [--parse] [<file>...]"
+msgstr ""
+"git interpret-trailers [--in-place] [--trim-empty]\n"
+"                       [(--trailer (<key>|<key-alias>)[(=|:)<value>])...]\n"
+"                       [--parse] [<file>...]"
+
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "não foi possível ler o arquivo de entrada '%s'"
+
+msgid "could not read from stdin"
+msgstr "não foi possível ler do stdin"
+
+#, c-format
+msgid "could not write to temporary file '%s'"
+msgstr "não foi possível gravar no arquivo temporário '%s'"
+
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "não foi possível renomear o arquivo temporário para %s"
+
+msgid "edit files in place"
+msgstr "editar arquivos no local (in-place)"
+
+msgid "trim empty trailers"
+msgstr "remover trailers vazios"
+
+msgid "placement"
+msgstr "posicionamento"
+
+msgid "where to place the new trailer"
+msgstr "onde colocar o novo trailer"
+
+msgid "action if trailer already exists"
+msgstr "ação se o trailer já existir"
+
+msgid "action if trailer is missing"
+msgstr "ação se o trailer estiver ausente"
+
+msgid "output only the trailers"
+msgstr "imprimir apenas os trailers"
+
+msgid "do not apply trailer.<key-alias> configuration variables"
+msgstr "não aplicar as variáveis de configuração trailer.<key-alias>"
+
+msgid "reformat multiline trailer values as single-line values"
+msgstr ""
+"reformatar valores de trailer de várias linhas como valores de linha única"
+
+msgid "alias for --only-trailers --only-input --unfold"
+msgstr "alias para --only-trailers --only-input --unfold"
+
+msgid "do not treat \"---\" as the end of input"
+msgstr "não tratar \"---\" como o fim da entrada"
+
+msgid "trailer(s) to add"
+msgstr "trailer(s) a adicionar"
+
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer com --only-input não faz sentido"
+
+msgid "no input file given for in-place editing"
+msgstr "nenhum arquivo de entrada fornecido para edição no local (in-place)"
+
+msgid "last-modified can only operate on one commit at a time"
+msgstr "last-modified só pode operar em um commit de cada vez"
+
+#, c-format
+msgid "revision argument '%s' is a %s, not a commit-ish"
+msgstr "o argumento de revisão '%s' é um %s, não um commit-ish"
+
+#, c-format
+msgid "unknown last-modified argument: %s"
+msgstr "argumento last-modified desconhecido: %s"
+
+msgid ""
+"git last-modified [--recursive] [--show-trees] [--max-depth=<depth>] [-z]\n"
+"                  [<revision-range>] [[--] <pathspec>...]"
+msgstr ""
+"git last-modified [--recursive] [--show-trees] [--max-depth=<depth>] [-z]\n"
+"                  [<revision-range>] [[--] <pathspec>...]"
+
+msgid "recurse into subtrees"
+msgstr "recursão em subtrees"
+
+msgid "show tree entries when recursing into subtrees"
+msgstr "mostrar entradas de tree ao usar recursão em subtrees"
+
+msgid "maximum tree depth to recurse"
+msgstr "profundidade máxima de tree para recursão"
+
+msgid "lines are separated with NUL character"
+msgstr "as linhas são separadas por caracteres NUL"
+
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git log [<options>] [<revision-range>] [[--] <path>...]"
+
+msgid "git show [<options>] <object>..."
+msgstr "git show [<options>] <object>..."
+
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr "opção --decorate inválida: %s"
+
+msgid "suppress diff output"
+msgstr "suprimir a saída diff"
+
+msgid "show source"
+msgstr "mostrar fonte"
+
+msgid "clear all previously-defined decoration filters"
+msgstr "limpar todos os filtros de decoration previamente definidos"
+
+msgid "only decorate refs that match <pattern>"
+msgstr "decorar apenas as refs que correspondam a <pattern>"
+
+msgid "do not decorate refs that match <pattern>"
+msgstr "não decorar refs que correspondam a <pattern>"
+
+msgid "decorate options"
+msgstr "opções de decoração"
+
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
+"rastrear a evolução do intervalo de linhas <start>,<end> ou da função :"
+"<funcname> em <file>"
+
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "-L<range>:<file> não pode ser usado com pathspec"
+
+msgid ""
+"\n"
+"hint: You can replace 'git whatchanged <opts>' with:\n"
+"hint:\tgit log <opts> --raw --no-merges\n"
+"hint: Or make an alias:\n"
+"hint:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n"
+"\n"
+msgstr ""
+"\n"
+"hint: Você pode substituir 'git whatchanged <opts>' por:\n"
+"hint:\tgit log <opts> --raw --no-merges\n"
+"hint: Ou criar um alias:\n"
+"hint:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n"
+"\n"
+
+#, c-format
+msgid "git show %s: bad file"
+msgstr "git show %s: arquivo inválido"
+
+#, c-format
+msgid "could not read object %s"
+msgstr "não foi possível ler o objeto %s"
+
+#, c-format
+msgid "unknown type: %d"
+msgstr "tipo desconhecido: %d"
+
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s: modo inválido para cover-from-description"
+
+msgid "format.headers without value"
+msgstr "format.headers sem valor"
+
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "valor booleano de configuração inválido '%s' para '%s'"
+
+#, c-format
+msgid ""
+"'%s' used to accept any value and treat that as 'true'.\n"
+"Now it only accepts boolean values, like what '%s' does.\n"
+msgstr ""
+"'%s' costumava aceitar qualquer valor e tratá-lo como 'true'.\n"
+"Agora só aceita valores booleanos, assim como '%s' faz.\n"
+
+#, c-format
+msgid "cannot open patch file %s"
+msgstr "não é possível abrir o arquivo de patch %s"
+
+msgid "need exactly one range"
+msgstr "é necessário exatamente um intervalo"
+
+msgid "not a range"
+msgstr "não é um intervalo"
+
+#, c-format
+msgid "unable to read branch description file '%s'"
+msgstr "não foi possível ler o arquivo de descrição do branch '%s'"
+
+msgid "cover letter needs email format"
+msgstr "a carta de apresentação precisa estar no formato de e-mail"
+
+msgid "failed to create cover-letter file"
+msgstr "falha ao criar o arquivo de cover-letter"
+
+#, c-format
+msgid "'%s' is not a valid format string"
+msgstr "'%s' não é uma string de formato válida"
+
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr "in-reply-to insano: %s"
+
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr "git format-patch [<options>] [<since> | <revision-range>]"
+
+msgid "two output directories?"
+msgstr "dois diretórios de saída?"
+
+#, c-format
+msgid "unknown commit %s"
+msgstr "commit desconhecido %s"
+
+#, c-format
+msgid "failed to resolve '%s' as a valid ref"
+msgstr "falha ao resolver '%s' como uma ref válida"
+
+msgid "could not find exact merge base"
+msgstr "não foi possível encontrar a base de merge exata"
+
+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 ""
+"falha ao obter o upstream, se você deseja registrar o commit base "
+"automaticamente,\n"
+"por favor use git branch --set-upstream-to para rastrear um branch do "
+"remoto.\n"
+"Ou você pode especificar o commit base usando --base=<base-commit-id> "
+"manualmente"
+
+msgid "failed to find exact merge base"
+msgstr "falha ao encontrar a base de merge exata"
+
+msgid "base commit should be the ancestor of revision list"
+msgstr "o commit base deve ser o ancestral da lista de revisões"
+
+msgid "base commit shouldn't be in revision list"
+msgstr "o commit base não deve estar na lista de revisões"
+
+msgid "cannot get patch id"
+msgstr "não é possível obter o id do patch"
+
+msgid "failed to infer range-diff origin of current series"
+msgstr "falha ao inferir a origem do range-diff da série atual"
+
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr "usando '%s' como origem do range-diff da série atual"
+
+msgid "use [PATCH n/m] even with a single patch"
+msgstr "usar [PATCH n/m] mesmo com um único patch"
+
+msgid "use [PATCH] even with multiple patches"
+msgstr "usar [PATCH] mesmo com vários patches"
+
+msgid "print patches to standard out"
+msgstr "imprimir patches para a saída padrão"
+
+msgid "generate a cover letter"
+msgstr "gerar uma carta de apresentação"
+
+msgid "format-spec"
+msgstr "format-spec"
+
+msgid "format spec used for the commit list in the cover letter"
+msgstr ""
+"especificação de formato usada para a lista de commit na carta de "
+"apresentação"
+
+msgid "use simple number sequence for output file names"
+msgstr "usar sequência numérica simples para os nomes dos arquivos de saída"
+
+msgid "sfx"
+msgstr "sfx"
+
+msgid "use <sfx> instead of '.patch'"
+msgstr "usar <sfx> em vez de '.patch'"
+
+msgid "start numbering patches at <n> instead of 1"
+msgstr "iniciar a numeração dos patches em <n> em vez de 1"
+
+msgid "reroll-count"
+msgstr "reroll-count"
+
+msgid "mark the series as Nth re-roll"
+msgstr "marcar a série como a N-ésima re-roll"
+
+msgid "max length of output filename"
+msgstr "comprimento máximo do nome de arquivo de saída"
+
+msgid "rfc"
+msgstr "rfc"
+
+msgid "add <rfc> (default 'RFC') before 'PATCH'"
+msgstr "adicione <rfc> (padrão 'RFC') antes de 'PATCH'"
+
+msgid "cover-from-description-mode"
+msgstr "cover-from-description-mode"
+
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr ""
+"gerar partes de uma carta de apresentação baseado na descrição de um branch"
+
+msgid "use branch description from file"
+msgstr "usar descrição do branch a partir do arquivo"
+
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr "usar [<prefix>] em vez de [PATCH]"
+
+msgid "store resulting files in <dir>"
+msgstr "armazenar os arquivos resultantes em <dir>"
+
+msgid "don't strip/add [PATCH]"
+msgstr "não remover/adicionar [PATCH]"
+
+msgid "don't output binary diffs"
+msgstr "não exibir diffs binários"
+
+msgid "output all-zero hash in From header"
+msgstr "exibir hash todo com zeros no cabeçalho From"
+
+msgid "don't include a patch matching a commit upstream"
+msgstr "não incluir um patch correspondente a um commit do upstream"
+
+msgid "show patch format instead of default (patch + stat)"
+msgstr "mostrar formato de patch em vez do padrão (patch + stat)"
+
+msgid "Messaging"
+msgstr "Mensagens"
+
+msgid "header"
+msgstr "cabeçalho"
+
+msgid "add email header"
+msgstr "adicionar cabeçalho de e-mail"
+
+msgid "email"
+msgstr "e-mail"
+
+msgid "add To: header"
+msgstr "adicionar cabeçalho To:"
+
+msgid "add Cc: header"
+msgstr "adicionar cabeçalho Cc:"
+
+msgid "ident"
+msgstr "ident"
+
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr "definir endereço From para <ident> (ou ident do committer se ausente)"
+
+msgid "message-id"
+msgstr "message-id"
+
+msgid "make first mail a reply to <message-id>"
+msgstr "tornar o primeiro e-mail uma resposta a <message-id>"
+
+msgid "boundary"
+msgstr "limite"
+
+msgid "attach the patch"
+msgstr "anexar o patch"
+
+msgid "inline the patch"
+msgstr "incorporar o patch no corpo"
+
+msgid "enable message threading, styles: shallow, deep"
+msgstr "habilitar encadeamento de mensagens, estilos: shallow, deep"
+
+msgid "signature"
+msgstr "assinatura"
+
+msgid "add a signature"
+msgstr "adicionar uma assinatura"
+
+msgid "base-commit"
+msgstr "base-commit"
+
+msgid "add prerequisite tree info to the patch series"
+msgstr "adicionar informação de tree de pré-requisito à série de patches"
+
+msgid "add a signature from a file"
+msgstr "adicionar uma assinatura de um arquivo"
+
+msgid "don't print the patch filenames"
+msgstr "não exibir os nomes dos arquivos de patch"
+
+msgid "show progress while generating patches"
+msgstr "mostrar o progresso ao gerar patches"
+
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr ""
+"mostrar mudanças em relação a <rev> na carta de apresentação ou patch único"
+
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr ""
+"mostrar mudanças em relação a <refspec> na carta de apresentação ou patch "
+"único"
+
+msgid "percentage by which creation is weighted"
+msgstr "porcentagem pela qual a criação é ponderada"
+
+msgid "show in-body From: even if identical to the e-mail header"
+msgstr "mostrar in-body From: mesmo se for idêntico ao cabeçalho de e-mail"
+
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "linha de identificação inválida: %s"
+
+msgid "--name-only does not make sense"
+msgstr "--name-only não faz sentido"
+
+msgid "--name-status does not make sense"
+msgstr "--name-status não faz sentido"
+
+msgid "--check does not make sense"
+msgstr "--check não faz sentido"
+
+msgid "--remerge-diff does not make sense"
+msgstr "--remerge-diff não faz sentido"
+
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "não foi possível criar o diretório '%s'"
+
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr "--interdiff requer --cover-letter ou patch único"
+
+msgid "Interdiff:"
+msgstr "Interdiff:"
+
+#, c-format
+msgid "Interdiff against v%d:"
+msgstr "Interdiff em relação a v%d:"
+
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr "--range-diff requer --cover-letter ou patch único"
+
+msgid "Range-diff:"
+msgstr "Range-diff:"
+
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr "Range-diff em relação a v%d:"
+
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr "não foi possível ler o arquivo de assinatura '%s'"
+
+msgid "Generating patches"
+msgstr "Gerando patches"
+
+msgid "failed to create output files"
+msgstr "falha ao criar os arquivos de saída"
+
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+"Não foi possível encontrar um branch remoto rastreado, por favor especifique "
+"o <upstream> manualmente.\n"
+
+#, c-format
+msgid "could not get object info about '%s'"
+msgstr "não foi possível obter informações de objeto sobre '%s'"
+
+msgid "git ls-files [<options>] [<file>...]"
+msgstr "git ls-files [<options>] [<file>...]"
+
+msgid "separate paths with the NUL character"
+msgstr "separar caminhos com o caractere NUL"
+
+msgid "identify the file status with tags"
+msgstr "identificar o status do arquivo com tags"
+
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr "usar letras minúsculas para arquivos 'assume unchanged'"
+
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "usar letras minúsculas para arquivos 'fsmonitor clean'"
+
+msgid "show cached files in the output (default)"
+msgstr "mostrar arquivos no cache na saída (padrão)"
+
+msgid "show deleted files in the output"
+msgstr "mostrar arquivos excluídos na saída"
+
+msgid "show modified files in the output"
+msgstr "mostrar arquivos modificados na saída"
+
+msgid "show other files in the output"
+msgstr "mostrar outros arquivos na saída"
+
+msgid "show ignored files in the output"
+msgstr "mostrar arquivos ignorados na saída"
+
+msgid "show staged contents' object name in the output"
+msgstr "mostrar o nome de objeto dos conteúdos preparados (staged) na saída"
+
+msgid "show files on the filesystem that need to be removed"
+msgstr "mostrar arquivos no sistema de arquivos que precisam ser removidos"
+
+msgid "show 'other' directories' names only"
+msgstr "mostrar apenas os nomes de diretórios 'other'"
+
+msgid "show line endings of files"
+msgstr "mostrar finais de linha de arquivos"
+
+msgid "don't show empty directories"
+msgstr "não mostrar diretórios vazios"
+
+msgid "show unmerged files in the output"
+msgstr "mostrar arquivos não mesclados na saída"
+
+msgid "show resolve-undo information"
+msgstr "mostrar informações de resolve-undo"
+
+msgid "skip files matching pattern"
+msgstr "pular arquivos correspondentes ao padrão"
+
+msgid "read exclude patterns from <file>"
+msgstr "ler os padrões de exclusão a partir de <file>"
+
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr "ler padrões de exclusão adicionais por diretório em <file>"
+
+msgid "add the standard git exclusions"
+msgstr "adicionar as exclusões padrão do git"
+
+msgid "make the output relative to the project top directory"
+msgstr "tornar a saída relativa ao diretório superior do projeto"
+
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr "se qualquer <file> não estiver no índice, tratar isso como um erro"
+
+msgid "tree-ish"
+msgstr "tree-ish"
+
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr ""
+"fingir que os caminhos removidos desde <tree-ish> ainda estão presentes"
+
+msgid "show debugging data"
+msgstr "mostrar dados de depuração"
+
+msgid "suppress duplicate entries"
+msgstr "suprimir entradas duplicadas"
+
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "mostrar diretórios esparsos na presença de um índice esparso"
+
+msgid ""
+"--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, "
+"--eol"
+msgstr ""
+"--format não pode ser usado com -s, -o, -k, -t, --resolve-undo, --"
+"deduplicate, --eol"
+
+msgid ""
+"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n"
+"              [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"
+"              [--symref] [<repository> [<patterns>...]]"
+msgstr ""
+"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n"
+"              [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"
+"              [--symref] [<repository> [<patterns>...]]"
+
+msgid "do not print remote URL"
+msgstr "não imprimir a URL do remoto"
+
+msgid "exec"
+msgstr "exec"
+
+msgid "path of git-upload-pack on the remote host"
+msgstr "caminho para o git-upload-pack no host remoto"
+
+msgid "limit to tags"
+msgstr "limitar a tags"
+
+msgid "limit to branches"
+msgstr "limitar a branches"
+
+msgid "deprecated synonym for --branches"
+msgstr "sinônimo obsoleto para --branches"
+
+msgid "do not show peeled tags"
+msgstr "não mostrar tags peeled"
+
+msgid "take url.<base>.insteadOf into account"
+msgstr "levar em conta url.<base>.insteadOf"
+
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr ""
+"sair com código de saída 2 se nenhuma ref correspondente for encontrada"
+
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr "mostrar a ref subjacente em adição ao objeto apontado por ela"
+
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr "git ls-tree [<options>] <tree-ish> [<path>...]"
+
+msgid "only show trees"
+msgstr "mostrar apenas trees"
+
+msgid "show trees when recursing"
+msgstr "mostrar trees ao ser recursivo"
+
+msgid "terminate entries with NUL byte"
+msgstr "terminar as entradas com o byte NUL"
+
+msgid "include object size"
+msgstr "incluir o tamanho do objeto"
+
+msgid "list only filenames"
+msgstr "listar apenas nomes de arquivo"
+
+msgid "list only objects"
+msgstr "listar apenas objetos"
+
+msgid "use full path names"
+msgstr "usar nomes completos dos caminhos"
+
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr ""
+"listar a tree inteira; não apenas o diretório atual (implica em --full-name)"
+
+msgid "--format can't be combined with other format-altering options"
+msgstr ""
+"--format não pode ser combinado com outras opções que alteram o formato"
+
+#. TRANSLATORS: keep <> in "<" mail ">" info.
+msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
+msgstr "git mailinfo [<options>] <msg> <patch> < mail >info"
+
+msgid "keep subject"
+msgstr "manter o assunto"
+
+msgid "keep non patch brackets in subject"
+msgstr "manter colchetes não relacionados a patch no assunto"
+
+msgid "copy Message-ID to the end of commit message"
+msgstr "copiar o Message-ID para o final da mensagem de commit"
+
+msgid "re-code metadata to i18n.commitEncoding"
+msgstr "re-codificar os metadados para i18n.commitEncoding"
+
+msgid "disable charset re-coding of metadata"
+msgstr "desativar re-codificação de charset de metadados"
+
+msgid "encoding"
+msgstr "codificação"
+
+msgid "re-code metadata to this encoding"
+msgstr "re-codificar metadados para esta codificação"
+
+msgid "use scissors"
+msgstr "usar a linha de tesoura"
+
+msgid "<action>"
+msgstr "<action>"
+
+msgid "action when quoted CR is found"
+msgstr "ação quando o CR citado for encontrado"
+
+msgid "use headers in message's body"
+msgstr "usar os cabeçalhos no corpo da mensagem"
+
+msgid "reading patches from stdin/tty..."
+msgstr "lendo patches de stdin/tty..."
+
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr "mbox vazio: '%s'"
+
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <commit> <commit>..."
+
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <commit>..."
+
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <commit> <commit>"
+
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <commit>..."
+
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <ref> [<commit>]"
+
+msgid "output all common ancestors"
+msgstr "exibir todos os ancestrais comuns"
+
+msgid "find ancestors for a single n-way merge"
+msgstr "encontrar ancestrais para um único merge de n vias"
+
+msgid "list revs not reachable from others"
+msgstr "listar as revisões não alcançáveis a partir de outras"
+
+msgid "is the first one ancestor of the other?"
+msgstr "o primeiro é ancestral do outro?"
+
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "encontrar onde <commit> fez o fork a partir do reflog de <ref>"
+
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+
+msgid "send results to standard output"
+msgstr "enviar resultados para a saída padrão"
+
+msgid "use object IDs instead of filenames"
+msgstr "usar IDs de objeto em vez de nomes de arquivos"
+
+msgid "use a diff3 based merge"
+msgstr "usar um merge baseado em diff3"
+
+msgid "use a zealous diff3 based merge"
+msgstr "usar um merge zeloso baseado em diff3"
+
+msgid "for conflicts, use this marker size"
+msgstr "para conflitos, usar este tamanho de marcador"
+
+msgid "do not warn about conflicts"
+msgstr "não avisar sobre conflitos"
+
+msgid "set labels for file1/orig-file/file2"
+msgstr "definir os rótulos para file1/orig-file/file2"
+
+#, c-format
+msgid "object '%s' does not exist"
+msgstr "o objeto '%s' não existe"
+
+msgid "Could not write object file"
+msgstr "Não foi possível gravar o arquivo de objeto"
+
+#, c-format
+msgid "unknown option %s"
+msgstr "opção desconhecida %s"
+
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "não foi possível analisar o objeto '%s'"
+
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] "não é possível lidar com mais de %d base. Ignorando %s."
+msgstr[1] "não é possível lidar com mais de %d bases. Ignorando %s."
+
+msgid "not handling anything other than two heads merge."
+msgstr "não é possível lidar com nada além do merge de duas heads."
+
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "não foi possível resolver o ref '%s'"
+
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Fazendo merge de %s com %s\n"
+
+#, c-format
+msgid "could not parse as tree '%s'"
+msgstr "não foi possível analisar '%s' como uma tree"
+
+msgid "not something we can merge"
+msgstr "não é algo que possamos fazer o merge"
+
+msgid "refusing to merge unrelated histories"
+msgstr "recusando-se a fazer merge de históricos não relacionados"
+
+msgid "failure to merge"
+msgstr "falha ao fazer o merge"
+
+msgid "git merge-tree [--write-tree] [<options>] <branch1> <branch2>"
+msgstr "git merge-tree [--write-tree] [<options>] <branch1> <branch2>"
+
+msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>"
+msgstr "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>"
+
+msgid "do a real merge instead of a trivial merge"
+msgstr "fazer um merge real ao invés de um merge trivial"
+
+msgid "do a trivial merge only"
+msgstr "fazer apenas um merge trivial"
+
+msgid "also show informational/conflict messages"
+msgstr "também mostrar mensagens informativas/de conflito"
+
+msgid "suppress all output; only exit status wanted"
+msgstr "suprimir toda a saída; deseja-se apenas o status de saída"
+
+msgid "list filenames without modes/oids/stages"
+msgstr "listar nomes de arquivos sem modes/oids/stages"
+
+msgid "allow merging unrelated histories"
+msgstr "permitir o merge de históricos não relacionados"
+
+msgid "perform multiple merges, one per line of input"
+msgstr "realizar vários merges, um por linha de entrada"
+
+msgid "specify a merge-base for the merge"
+msgstr "especificar uma merge-base para o merge"
+
+msgid "option=value"
+msgstr "opção=valor"
+
+msgid "option for selected merge strategy"
+msgstr "opção para a estratégia de merge selecionada"
+
+msgid "--trivial-merge is incompatible with all other options"
+msgstr "--trivial-merge é incompatível com todas as outras opções"
+
+#, c-format
+msgid "unknown strategy option: -X%s"
+msgstr "opção de estratégia desconhecida: -X%s"
+
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "linha de entrada malformada: '%s'."
+
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<options>] [<commit>...]"
+
+msgid "switch `m' requires a value"
+msgstr "a opção `m' requer um valor"
+
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "a opção `%s' requer um valor"
+
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Não foi possível encontrar a estratégia de merge '%s'.\n"
+
+#, c-format
+msgid "Available strategies are:"
+msgstr "As estratégias disponíveis são:"
+
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "As estratégias personalizadas disponíveis são:"
+
+msgid "do not show a diffstat at the end of the merge"
+msgstr "não mostrar um diffstat no final do merge"
+
+msgid "show a diffstat at the end of the merge"
+msgstr "mostrar um diffstat no final do merge"
+
+msgid "(synonym to --stat)"
+msgstr "(sinônimo de --stat)"
+
+msgid "show a compact-summary at the end of the merge"
+msgstr "mostrar um compact-summary no final do merge"
+
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr ""
+"adicionar (no máximo <n>) entradas do shortlog à mensagem de commit do merge"
+
+msgid "create a single commit instead of doing a merge"
+msgstr "criar um único commit em vez de fazer um merge"
+
+msgid "perform a commit if the merge succeeds (default)"
+msgstr "realizar um commit se o merge for bem-sucedido (padrão)"
+
+msgid "edit message before committing"
+msgstr "editar a mensagem antes de fazer o commit"
+
+msgid "allow fast-forward (default)"
+msgstr "permitir fast-forward (padrão)"
+
+msgid "abort if fast-forward is not possible"
+msgstr "abortar se o fast-forward não for possível"
+
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "verificar se o commit nomeado tem uma assinatura GPG válida"
+
+msgid "strategy"
+msgstr "estratégia"
+
+msgid "merge strategy to use"
+msgstr "estratégia de merge a ser usada"
+
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr "mensagem de commit do merge (para um merge não fast-forward)"
+
+msgid "use <name> instead of the real target"
+msgstr "usar <name> em vez do destino real"
+
+msgid "abort the current in-progress merge"
+msgstr "abortar o merge atualmente em andamento"
+
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort, mas deixa o índice e a árvore de trabalho intactos"
+
+msgid "continue the current in-progress merge"
+msgstr "continuar o merge atualmente em andamento"
+
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "ignorar os hooks pre-merge-commit e commit-msg"
+
+msgid "could not run stash."
+msgstr "não foi possível executar o stash."
+
+msgid "stash failed"
+msgstr "falha no stash"
+
+msgid "read-tree failed"
+msgstr "falha no read-tree"
+
+msgid "Already up to date. (nothing to squash)"
+msgstr "Já está atualizado. (nada para fazer squash)"
+
+msgid "Already up to date."
+msgstr "Já está atualizado."
+
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Squash commit -- HEAD não atualizado\n"
+
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "Sem mensagem de merge -- HEAD não atualizado\n"
+
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' não aponta para um commit"
+
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "String branch.%s.mergeoptions inválida: %s"
+
+msgid "Unable to write index."
+msgstr "Não foi possível escrever o índice."
+
+msgid "Not handling anything other than two heads merge."
+msgstr "Não estamos lidando com nada além de um merge de dois heads."
+
+#, c-format
+msgid "unable to write %s"
+msgstr "não foi possível gravar %s"
+
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "Não foi possível ler de '%s'"
+
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr "Não fazendo commit do merge; use 'git commit' para concluir o merge.\n"
+
+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 ""
+"Por favor, insira uma mensagem de commit para explicar por que este merge é "
+"necessário,\n"
+"especialmente se ele faz o merge de um upstream atualizado em um branch de "
+"tópico.\n"
+"\n"
+
+msgid "An empty message aborts the commit.\n"
+msgstr "Uma mensagem vazia aborta o commit.\n"
+
+#, c-format
+msgid ""
+"Lines starting with '%s' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"Linhas começando com '%s' serão ignoradas e uma mensagem vazia aborta\n"
+"o commit.\n"
+
+msgid "Empty commit message."
+msgstr "Mensagem de commit vazia."
+
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Maravilhoso.\n"
+
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+"O merge automático falhou; corrija os conflitos e faça um commit do "
+"resultado.\n"
+
+msgid "No current branch."
+msgstr "Nenhum branch atual."
+
+msgid "No remote for the current branch."
+msgstr "Nenhum remoto para o branch atual."
+
+msgid "No default upstream defined for the current branch."
+msgstr "Nenhum upstream padrão definido para o branch atual."
+
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "Nenhum branch de rastreamento remoto para %s de %s"
+
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Valor inválido '%s' no ambiente '%s'"
+
+#, c-format
+msgid "could not close '%s'"
+msgstr "não foi possível fechar '%s'"
+
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "não é algo que possamos fazer merge em %s: %s"
+
+msgid "--abort expects no arguments"
+msgstr "--abort não espera argumentos"
+
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "Não há merge para abortar (MERGE_HEAD ausente)."
+
+msgid "--quit expects no arguments"
+msgstr "--quit não espera argumentos"
+
+msgid "--continue expects no arguments"
+msgstr "--continue não espera argumentos"
+
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "Não há merge em andamento (MERGE_HEAD ausente)."
+
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"Você não concluiu seu merge (MERGE_HEAD existe).\n"
+"Por favor, faça um commit das suas alterações antes do merge."
+
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"Você não concluiu seu cherry-pick (CHERRY_PICK_HEAD existe).\n"
+"Por favor, faça um commit das suas alterações antes do merge."
+
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr "Você não concluiu seu cherry-pick (CHERRY_PICK_HEAD existe)."
+
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+"Nenhum commit especificado e merge.defaultToUpstream não está definido."
+
+msgid "Squash commit into empty head not supported yet"
+msgstr "O squash de commit em um head vazio ainda não é suportado"
+
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr "Um commit non-fast-forward não faz sentido em um head vazio"
+
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - não é algo que possamos fazer merge"
+
+msgid "Can merge only exactly one commit into empty head"
+msgstr "Só é possível fazer merge de exatamente um commit em um head vazio"
+
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Atualizando %s..%s\n"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Suas alterações locais nos seguintes arquivos seriam substituídas pelo "
+"merge:\n"
+"  %s"
+
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Tentando um merge muito trivial no índice...\n"
+
+#, c-format
+msgid "Nope.\n"
+msgstr "Não.\n"
+
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Rebobinando a árvore para o estado original...\n"
+
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Tentando a estratégia de merge %s...\n"
+
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Nenhuma estratégia de merge lidou com o merge.\n"
+
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "Merge com a estratégia %s falhou.\n"
+
+#, c-format
+msgid "Using the %s strategy to prepare resolving by hand.\n"
+msgstr "Usando a estratégia %s para preparar a resolução manual.\n"
+
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+"O merge automático ocorreu bem; parado antes do commit como solicitado\n"
+
+#, c-format
+msgid "When finished, apply stashed changes with `git stash pop`\n"
+msgstr "Quando terminar, aplique as alterações do stash com `git stash pop`\n"
+
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "aviso: a entrada da tag não passa no fsck: %s"
+
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "erro: a entrada da tag não passa no fsck: %s"
+
+#, c-format
+msgid "could not read tagged object '%s'"
+msgstr "não foi possível ler o objeto marcado com tag '%s'"
+
+#, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "objeto '%s' marcado como tag '%s', mas é do tipo '%s'"
+
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr ""
+"a tag na entrada padrão não passou na nossa verificação rigorosa do fsck"
+
+msgid "tag on stdin did not refer to a valid object"
+msgstr "a tag na entrada padrão não se referia a um objeto válido"
+
+msgid "unable to write tag file"
+msgstr "não foi possível gravar o arquivo de tag"
+
+msgid "input is NUL terminated"
+msgstr "a entrada termina com NUL"
+
+msgid "allow missing objects"
+msgstr "permitir objetos ausentes"
+
+msgid "allow creation of more than one tree"
+msgstr "permitir a criação de mais de uma tree"
+
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n"
+"  [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n"
+"  [--refs-snapshot=<path>] [--[no-]write-chain-file]\n"
+"  [--base=<checksum>]"
+msgstr ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n"
+"  [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n"
+"  [--refs-snapshot=<path>] [--[no-]write-chain-file]\n"
+"  [--base=<checksum>]"
+
+msgid ""
+"git multi-pack-index [<options>] compact [--[no-]incremental]\n"
+"  [--[no-]bitmap] [--base=<checksum>] [--[no-]write-chain-file]\n"
+"  <from> <to>"
+msgstr ""
+"git multi-pack-index [<options>] compact [--[no-]incremental]\n"
+"  [--[no-]bitmap] [--base=<checksum>] [--[no-]write-chain-file]\n"
+"  <from> <to>"
+
+msgid "git multi-pack-index [<options>] verify"
+msgstr "git multi-pack-index [<options>] verify"
+
+msgid "git multi-pack-index [<options>] expire"
+msgstr "git multi-pack-index [<options>] expire"
+
+msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
+msgstr "git multi-pack-index [<options>] repack [--batch-size=<size>]"
+
+#, c-format
+msgid "object directory is not an alternate of the current repository: '%s'"
+msgstr "o diretório de objetos não é um alternate do repositório atual: '%s'"
+
+msgid "directory"
+msgstr "diretório"
+
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr ""
+"diretório de objetos contendo um conjunto de pares de packfile e pack-index"
+
+msgid "preferred-pack"
+msgstr "preferred-pack"
+
+msgid "pack for reuse when computing a multi-pack bitmap"
+msgstr "pack para reutilização ao computar um bitmap de multi-pack"
+
+msgid "write multi-pack bitmap"
+msgstr "gravar bitmap de multi-pack"
+
+msgid "checksum"
+msgstr "checksum"
+
+msgid "base MIDX for incremental writes"
+msgstr "MIDX base para gravações incrementais"
+
+msgid "write a new incremental MIDX"
+msgstr "gravar um novo MIDX incremental"
+
+msgid "write the multi-pack-index chain file"
+msgstr "gravar o arquivo chain de multi-pack-index"
+
+msgid "write multi-pack index containing only given indexes"
+msgstr "gravar o multi-pack index contendo apenas os índices fornecidos"
+
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "snapshot de refs para seleção de commits de bitmap"
+
+#, c-format
+msgid "cannot use %s without %s"
+msgstr "não é possível usar %s sem %s"
+
+msgid "cannot use --base without --no-write-chain-file"
+msgstr "não é possível usar --base sem --no-write-chain-file"
+
+#, c-format
+msgid "could not find MIDX: %s"
+msgstr "não foi possível encontrar o MIDX: %s"
+
+msgid "MIDX compaction endpoints must be unique"
+msgstr "os endpoints de compactação do MIDX devem ser únicos"
+
+#, c-format
+msgid "MIDX %s must be an ancestor of %s"
+msgstr "o MIDX %s deve ser um ancestral de %s"
+
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+"durante o repack, coletar pack-files de tamanho menor em um lote maior que "
+"este tamanho"
+
+msgid "git mv [-v] [-f] [-n] [-k] <source> <destination>"
+msgstr "git mv [-v] [-f] [-n] [-k] <source> <destination>"
+
+msgid "git mv [-v] [-f] [-n] [-k] <source>... <destination-directory>"
+msgstr "git mv [-v] [-f] [-n] [-k] <source>... <destination-directory>"
+
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr "O diretório %s está no índice e não é um submódulo?"
+
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+"Por favor, adicione suas alterações do .gitmodules à área de stage ou faça "
+"um stash para prosseguir"
+
+#, c-format
+msgid "%.*s is in index"
+msgstr "%.*s está no índice"
+
+msgid "force move/rename even if target exists"
+msgstr "forçar movimento/renomeação mesmo que o destino exista"
+
+msgid "skip move/rename errors"
+msgstr "pular erros de movimento/renomeação"
+
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr "o destino '%s' não é um diretório"
+
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr "Verificando renomeação de '%s' para '%s'\n"
+
+msgid "bad source"
+msgstr "origem inválida"
+
+msgid "destination exists"
+msgstr "o destino existe"
+
+msgid "can not move directory into itself"
+msgstr "não é possível mover o diretório para si mesmo"
+
+msgid "destination already exists"
+msgstr "o destino já existe"
+
+msgid "source directory is empty"
+msgstr "o diretório de origem está vazio"
+
+msgid "not under version control"
+msgstr "não está sob controle de versão"
+
+msgid "conflicted"
+msgstr "em conflito"
+
+#, c-format
+msgid "overwriting '%s'"
+msgstr "sobrescrevendo '%s'"
+
+msgid "Cannot overwrite"
+msgstr "Não é possível sobrescrever"
+
+msgid "multiple sources for the same target"
+msgstr "múltiplas origens para o mesmo destino"
+
+msgid "destination directory does not exist"
+msgstr "o diretório de destino não existe"
+
+msgid "destination is beyond a symbolic link"
+msgstr "o destino está além de um link simbólico"
+
+msgid "destination is not a directory"
+msgstr "o destino não é um diretório"
+
+msgid "destination exists in the index"
+msgstr "o destino existe no índice"
+
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr "%s, origem=%s, destino=%s"
+
+#, c-format
+msgid "cannot move both '%s' and its parent directory '%s'"
+msgstr "não é possível mover ao mesmo tempo '%s' e seu diretório pai '%s'"
+
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr "Renomeando %s para %s\n"
+
+#, c-format
+msgid "renaming '%s' to '%s' failed"
+msgstr "falha ao renomear '%s' para '%s'"
+
+msgid "git name-rev [<options>] <commit>..."
+msgstr "git name-rev [<options>] <commit>..."
+
+msgid "git name-rev [<options>] --all"
+msgstr "git name-rev [<options>] --all"
+
+msgid "git name-rev [<options>] --annotate-stdin"
+msgstr "git name-rev [<options>] --annotate-stdin"
+
+msgid "print only ref-based names (no object names)"
+msgstr "imprimir apenas nomes baseados em ref (sem nomes de objetos)"
+
+msgid "only use tags to name the commits"
+msgstr "usar apenas tags para nomear os commits"
+
+msgid "only use refs matching <pattern>"
+msgstr "usar apenas refs que correspondam a <pattern>"
+
+msgid "ignore refs matching <pattern>"
+msgstr "ignorar refs que correspondam a <pattern>"
+
+msgid "list all commits reachable from all refs"
+msgstr "listar todos os commits alcançáveis a partir de todas as refs"
+
+msgid "deprecated: use --annotate-stdin instead"
+msgstr "obsoleto: use --annotate-stdin em vez disso"
+
+msgid "annotate text from stdin"
+msgstr "anotar texto da entrada padrão"
+
+msgid "allow to print `undefined` names (default)"
+msgstr "permitir imprimir nomes `undefined` (padrão)"
+
+msgid "dereference tags in the input (internal use)"
+msgstr "desreferenciar tags na entrada (uso interno)"
+
+#, c-format
+msgid "'%s' needs to be either text, revs, or rev"
+msgstr "'%s' precisa ser text, revs ou rev"
+
+msgid ""
+"(EXPERIMENTAL!) git format-rev --stdin-mode=<mode> --format=<pretty> [--"
+"[no-]notes=<ref>] [-z] [--[no-]null-output] [--[no-]null-input]"
+msgstr ""
+"(EXPERIMENTAL!) git format-rev --stdin-mode=<mode> --format=<pretty> [--"
+"[no-]notes=<ref>] [-z] [--[no-]null-output] [--[no-]null-input]"
+
+msgid "pretty format to use"
+msgstr "formato pretty a ser usado"
+
+msgid "stdin-mode"
+msgstr "stdin-mode"
+
+msgid "how revs are processed"
+msgstr "como os revs são processados"
+
+msgid "notes"
+msgstr "notas"
+
+msgid "display notes for pretty format"
+msgstr "exibir notas para formato pretty"
+
+msgid "z"
+msgstr "z"
+
+msgid "Use NUL for input and output termination"
+msgstr "Usar NUL para terminação de entrada e saída"
+
+msgid "Use NUL for input termination"
+msgstr "Usar NUL para terminação de entrada"
+
+msgid "Use NUL for output termination"
+msgstr "Usar NUL para terminação de saída"
+
+#, c-format
+msgid "'%s' is required"
+msgstr "'%s' é obrigatório"
+
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr "git notes [--ref <notes-ref>] [list [<object>]]"
+
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--"
+"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
+"| -C) <object>] [<object>] [-e]"
+msgstr ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--"
+"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
+"| -C) <object>] [<object>] [-e]"
+
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--"
+"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
+"| -C) <object>] [<object>] [-e]"
+msgstr ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--"
+"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
+"| -C) <object>] [<object>] [-e]"
+
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr "git notes [--ref <notes-ref>] show [<object>]"
+
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr "git notes [--ref <notes-ref>] remove [<object>...]"
+
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref <notes-ref>] prune [-n] [-v]"
+
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr "git notes [--ref <notes-ref>] get-ref"
+
+msgid "git notes [list [<object>]]"
+msgstr "git notes [list [<object>]]"
+
+msgid "git notes add [<options>] [<object>]"
+msgstr "git notes add [<options>] [<object>]"
+
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr "git notes copy [<options>] <from-object> <to-object>"
+
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr "git notes copy --stdin [<from-object> <to-object>]..."
+
+msgid "git notes append [<options>] [<object>]"
+msgstr "git notes append [<options>] [<object>]"
+
+msgid "git notes edit [<object>]"
+msgstr "git notes edit [<object>]"
+
+msgid "git notes show [<object>]"
+msgstr "git notes show [<object>]"
+
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr "git notes merge [<options>] <notes-ref>"
+
+msgid "git notes merge --commit [<options>]"
+msgstr "git notes merge --commit [<options>]"
+
+msgid "git notes merge --abort [<options>]"
+msgstr "git notes merge --abort [<options>]"
+
+msgid "git notes remove [<object>]"
+msgstr "git notes remove [<object>]"
+
+msgid "git notes prune [<options>]"
+msgstr "git notes prune [<options>]"
+
+msgid "Write/edit the notes for the following object:"
+msgstr "Gravar/editar as notas para o seguinte objeto:"
+
+msgid "could not read 'show' output"
+msgstr "não foi possível ler a saída de 'show'"
+
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr "falha ao finalizar o 'show' para o objeto '%s'"
+
+msgid "please supply the note contents using either -m or -F option"
+msgstr "por favor, forneça o conteúdo da nota usando a opção -m ou -F"
+
+msgid "unable to write note object"
+msgstr "não foi possível gravar o objeto de nota"
+
+#, c-format
+msgid "the note contents have been left in %s"
+msgstr "o conteúdo da nota foi deixado em %s"
+
+#, c-format
+msgid "could not open or read '%s'"
+msgstr "não foi possível abrir ou ler '%s'"
+
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "falha ao resolver '%s' como uma ref válida."
+
+#, c-format
+msgid "failed to read object '%s'."
+msgstr "falha ao ler o objeto '%s'."
+
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
+msgstr "não é possível ler dados de nota de um objeto '%s' que não é blob."
+
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr "falha ao copiar notas de '%s' para '%s'"
+
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#, c-format
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
+msgstr "recusando-se a fazer %s em notas em %s (fora de refs/notes/)"
+
+#, c-format
+msgid "no note found for object %s."
+msgstr "nenhuma nota encontrada para o objeto %s."
+
+msgid "note contents as a string"
+msgstr "conteúdo da nota como uma string"
+
+msgid "note contents in a file"
+msgstr "conteúdo da nota em um arquivo"
+
+msgid "reuse and edit specified note object"
+msgstr "reutilizar e editar o objeto de nota especificado"
+
+msgid "edit note message in editor"
+msgstr "editar mensagem da nota no editor"
+
+msgid "reuse specified note object"
+msgstr "reutilizar o objeto de nota especificado"
+
+msgid "allow storing empty note"
+msgstr "permitir o armazenamento de nota vazia"
+
+msgid "replace existing notes"
+msgstr "substituir notas existentes"
+
+msgid "<paragraph-break>"
+msgstr "<paragraph-break>"
+
+msgid "insert <paragraph-break> between paragraphs"
+msgstr "inserir <paragraph-break> entre parágrafos"
+
+msgid "remove unnecessary whitespace"
+msgstr "remover espaços em branco desnecessários"
+
+#, c-format
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+"Não é possível adicionar notas. Notas existentes encontradas para o objeto "
+"%s. Use '-f' para sobrescrever as notas existentes"
+
+#, c-format
+msgid "Overwriting existing notes for object %s\n"
+msgstr "Sobrescrevendo notas existentes para o objeto %s\n"
+
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr "Removendo a nota do objeto %s\n"
+
+msgid "read objects from stdin"
+msgstr "ler objetos da entrada padrão"
+
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr "carregar configuração de reescrita para <command> (implica --stdin)"
+
+msgid "too few arguments"
+msgstr "poucos argumentos"
+
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+"Não é possível copiar notas. Notas existentes encontradas para o objeto %s. "
+"Use '-f' para sobrescrever as notas existentes"
+
+#, c-format
+msgid "missing notes on source object %s. Cannot copy."
+msgstr "faltando notas no objeto de origem %s. Não é possível copiar."
+
+#, 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 ""
+"As opções -m/-F/-c/-C foram descontinuadas para o subcomando 'edit'.\n"
+"Por favor, use 'git notes add -f -m/-F/-c/-C' em vez disso.\n"
+
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "falha ao excluir a ref NOTES_MERGE_PARTIAL"
+
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "falha ao excluir a ref NOTES_MERGE_REF"
+
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "falha ao remover a worktree de 'git notes merge'"
+
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "falha ao ler a ref NOTES_MERGE_PARTIAL"
+
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "não foi possível encontrar o commit de NOTES_MERGE_PARTIAL."
+
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "não foi possível fazer o parse do commit de NOTES_MERGE_PARTIAL."
+
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "falha ao resolver NOTES_MERGE_REF"
+
+msgid "failed to finalize notes merge"
+msgstr "falha ao finalizar o merge de notas"
+
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "estratégia de merge de notas desconhecida %s"
+
+msgid "General options"
+msgstr "Opções gerais"
+
+msgid "Merge options"
+msgstr "Opções de merge"
+
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+"resolver conflitos de notas usando a estratégia fornecida (manual/ours/"
+"theirs/union/cat_sort_uniq)"
+
+msgid "Committing unmerged notes"
+msgstr "Fazendo commit de notas não mescladas"
+
+msgid "finalize notes merge by committing unmerged notes"
+msgstr "finalizar o merge de notas fazendo o commit das notas não resolvidas"
+
+msgid "Aborting notes merge resolution"
+msgstr "Abortando a resolução do merge de notas"
+
+msgid "abort notes merge"
+msgstr "abortar o merge de notas"
+
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "não é possível misturar --commit, --abort ou -s/--strategy"
+
+msgid "must specify a notes ref to merge"
+msgstr "deve especificar uma ref de notas para fazer merge"
+
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr "opção -s/--strategy desconhecida: %s"
+
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr "um merge de notas em %s já está em andamento em %s"
+
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr "falha ao armazenar o link para a ref de notas atual (%s)"
+
+#, 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 ""
+"Falha no merge automático de notas. Corrija os conflitos em %s e faça o "
+"commit do resultado com 'git notes merge --commit', ou aborte o merge com "
+"'git notes merge --abort'.\n"
+
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Falha ao resolver '%s' como uma ref válida."
+
+#, c-format
+msgid "Object %s has no note\n"
+msgstr "O objeto %s não tem nota\n"
+
+msgid "attempt to remove non-existent note is not an error"
+msgstr "a tentativa de remover uma nota inexistente não é um erro"
+
+msgid "read object names from the standard input"
+msgstr "ler os nomes dos objetos da entrada padrão"
+
+msgid "do not remove, show only"
+msgstr "não remover, apenas exibir"
+
+msgid "report pruned notes"
+msgstr "relatar notas podadas"
+
+msgid "notes-ref"
+msgstr "notes-ref"
+
+msgid "use notes from <notes-ref>"
+msgstr "usar notas de <notes-ref>"
+
+#, c-format
+msgid "unknown subcommand: `%s'"
+msgstr "subcomando desconhecido: `%s'"
+
+msgid ""
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+"                 [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+"                 [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+"                 [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
+"                 [--cruft] [--cruft-expiration=<time>]\n"
+"                 [--stdout [--filter=<filter-spec>] | <base-name>]\n"
+"                 [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+"                 [--name-hash-version=<n>] [--path-walk] < <object-list>"
+msgstr ""
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+"                 [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+"                 [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+"                 [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
+"                 [--cruft] [--cruft-expiration=<time>]\n"
+"                 [--stdout [--filter=<filter-spec>] | <base-name>]\n"
+"                 [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+"                 [--name-hash-version=<n>] [--path-walk] < <object-list>"
+
+#, c-format
+msgid "invalid --name-hash-version option: %d"
+msgstr "opção --name-hash-version inválida: %d"
+
+msgid "currently, --write-bitmap-index requires --name-hash-version=1"
+msgstr "atualmente, --write-bitmap-index requer --name-hash-version=1"
+
+#, c-format
+msgid "write_reuse_object: unable to parse object header of %s"
+msgstr ""
+"write_reuse_object: não foi possível fazer o parse do cabeçalho do objeto de "
+"%s"
+
+#, c-format
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr ""
+"write_reuse_object: não foi possível localizar %s, esperado no deslocamento "
+"%<PRIuMAX> no pack %s"
+
+#, c-format
+msgid "bad packed object CRC for %s"
+msgstr "CRC inválido de objeto empacotado para %s"
+
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr "objeto empacotado corrompido para %s"
+
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr "delta recursivo detectado para o objeto %s"
+
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr "ordenados %u objetos, esperados %<PRIu32>"
+
+#, c-format
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "objeto esperado no deslocamento %<PRIuMAX> no pack %s"
+
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+"desativando a escrita de bitmap, os packs estão divididos devido a "
+"pack.packSizeLimit"
+
+msgid "Writing objects"
+msgstr "Escrevendo objetos"
+
+#, c-format
+msgid "failed to stat %s"
+msgstr "falha ao executar stat em %s"
+
+#, c-format
+msgid "failed utime() on %s"
+msgstr "falha em utime() em %s"
+
+msgid "failed to write bitmap index"
+msgstr "falha ao gravar o índice de bitmap"
+
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr "escritos %<PRIu32> objetos quando esperado %<PRIu32>"
+
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr ""
+"desativando a escrita de bitmap, já que alguns objetos não estão sendo "
+"empacotados"
+
+#, c-format
+msgid "delta base offset overflow in pack for %s"
+msgstr "estouro do deslocamento base delta no pack para %s"
+
+#, c-format
+msgid "delta base offset out of bound for %s"
+msgstr "deslocamento base delta fora do limite para %s"
+
+msgid "Counting objects"
+msgstr "Contando objetos"
+
+#, c-format
+msgid "unable to get size of %s"
+msgstr "não foi possível obter o tamanho de %s"
+
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr "não foi possível analisar o cabeçalho de objeto de %s"
+
+#, c-format
+msgid "object %s cannot be read"
+msgstr "o objeto %s não pode ser lido"
+
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
+msgstr ""
+"objeto %s com comprimento de objeto inconsistente (%<PRIuMAX> vs %<PRIuMAX>)"
+
+msgid "suboptimal pack - out of memory"
+msgstr "pack subótimo - sem memória"
+
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr "Compressão delta usando até %d threads"
+
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr "não foi possível empacotar objetos alcançáveis a partir da tag %s"
+
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "não foi possível obter o tipo do objeto %s"
+
+msgid "Compressing objects by path"
+msgstr "Comprimindo objetos por caminho"
+
+#, c-format
+msgid "Path-based delta compression using up to %d thread"
+msgid_plural "Path-based delta compression using up to %d threads"
+msgstr[0] "Compressão delta baseada em caminho usando até %d thread"
+msgstr[1] "Compressão delta baseada em caminho usando até %d threads"
+
+msgid "Compressing objects"
+msgstr "Comprimindo objetos"
+
+msgid "inconsistency with delta count"
+msgstr "inconsistência com a contagem de delta"
+
+#, c-format
+msgid "invalid pack.allowPackReuse value: '%s'"
+msgstr "valor inválido de pack.allowPackReuse: '%s'"
+
+#, c-format
+msgid ""
+"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
+"hash> <uri>' (got '%s')"
+msgstr ""
+"o valor de uploadpack.blobpackfileuri deve ser da forma '<object-hash> <pack-"
+"hash> <uri>' (obtido '%s')"
+
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
+"objeto já configurado em outro uploadpack.blobpackfileuri (obtido '%s')"
+
+#, c-format
+msgid "could not get type of object %s in pack %s"
+msgstr "não foi possível obter o tipo do objeto %s no pack %s"
+
+#, c-format
+msgid "could not find pack '%s'"
+msgstr "não foi possível encontrar o pack '%s'"
+
+#, c-format
+msgid "packfile %s is a promisor but --exclude-promisor-objects was given"
+msgstr ""
+"o packfile %s é um promisor, mas --exclude-promisor-objects foi fornecido"
+
+#, c-format
+msgid "packfile %s cannot be accessed"
+msgstr "o packfile %s não pode ser acessado"
+
+msgid "Enumerating cruft objects"
+msgstr "Enumerando objetos cruft"
+
+msgid "unable to add cruft objects"
+msgstr "não foi possível adicionar objetos cruft"
+
+msgid "Traversing cruft objects"
+msgstr "Percorrendo objetos cruft"
+
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+"ID do objeto de borda esperado, lixo recebido:\n"
+" %s"
+
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+"ID do objeto esperado, lixo recebido:\n"
+" %s"
+
+msgid "cannot open pack index"
+msgstr "não é possível abrir o índice do pack"
+
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr "o objeto solto em %s não pôde ser examinado"
+
+#, c-format
+msgid "cannot read object for %s"
+msgstr "não é possível ler o objeto para %s"
+
+#, c-format
+msgid "cannot map object %s to %s"
+msgstr "não é possível mapear o objeto %s para %s"
+
+msgid "unable to force loose object"
+msgstr "não foi possível forçar objeto solto"
+
+#, c-format
+msgid "could not find commit %s"
+msgstr "não foi possível encontrar o commit %s"
+
+#, c-format
+msgid "not a rev '%s'"
+msgstr "não é uma rev '%s'"
+
+#, c-format
+msgid "bad revision '%s'"
+msgstr "revisão inválida '%s'"
+
+msgid "failed to pack objects via path-walk"
+msgstr "falha ao empacotar objetos via path-walk"
+
+msgid "unable to add recent objects"
+msgstr "não foi possível adicionar objetos recentes"
+
+#, c-format
+msgid "unsupported index version %s"
+msgstr "versão de índice não suportada %s"
+
+#, c-format
+msgid "bad index version '%s'"
+msgstr "versão de índice inválida '%s'"
+
+msgid "show progress meter during object writing phase"
+msgstr "exibir o medidor de progresso durante a fase de escrita de objetos"
+
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "semelhante a --all-progress quando o medidor de progresso é exibido"
+
+msgid "<version>[,<offset>]"
+msgstr "<version>[,<offset>]"
+
+msgid "write the pack index file in the specified idx format version"
+msgstr ""
+"escrever o arquivo de índice do pack na versão de formato idx especificada"
+
+msgid "ignore borrowed objects from alternate object store"
+msgstr "ignorar objetos emprestados de armazenamentos de objetos alternativos"
+
+msgid "ignore packed objects"
+msgstr "ignorar objetos empacotados"
+
+msgid "limit pack window by objects"
+msgstr "limitar a janela do pack por objetos"
+
+msgid "limit pack window by memory in addition to object limit"
+msgstr "limitar a janela do pack por memória além do limite de objetos"
+
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr "comprimento máximo da cadeia delta permitido no pack resultante"
+
+msgid "reuse existing deltas"
+msgstr "reutilizar deltas existentes"
+
+msgid "reuse existing objects"
+msgstr "reutilizar objetos existentes"
+
+msgid "use OFS_DELTA objects"
+msgstr "usar objetos OFS_DELTA"
+
+msgid "use threads when searching for best delta matches"
+msgstr "usar threads ao pesquisar pelas melhores correspondências de delta"
+
+msgid "do not create an empty pack output"
+msgstr "não criar uma saída de pack vazia"
+
+msgid "read revision arguments from standard input"
+msgstr "ler os argumentos de revisão da entrada padrão"
+
+msgid "limit the objects to those that are not yet packed"
+msgstr "limitar os objetos àqueles que ainda não foram empacotados"
+
+msgid "include objects reachable from any reference"
+msgstr "incluir objetos alcançáveis a partir de qualquer referência"
+
+msgid "include objects referred by reflog entries"
+msgstr "incluir objetos referenciados por entradas de reflog"
+
+msgid "include objects referred to by the index"
+msgstr "incluir objetos referenciados pelo índice"
+
+msgid "read packs from stdin"
+msgstr "ler packs da entrada padrão"
+
+msgid "output pack to stdout"
+msgstr "enviar pack para a saída padrão"
+
+msgid "include tag objects that refer to objects to be packed"
+msgstr "incluir objetos de tag que se referem a objetos a serem empacotados"
+
+msgid "keep unreachable objects"
+msgstr "manter objetos inalcançáveis"
+
+msgid "pack loose unreachable objects"
+msgstr "empacotar objetos soltos inalcançáveis"
+
+msgid "unpack unreachable objects newer than <time>"
+msgstr "desempacotar objetos inalcançáveis mais recentes que <time>"
+
+msgid "create a cruft pack"
+msgstr "criar um cruft pack"
+
+msgid "expire cruft objects older than <time>"
+msgstr "expirar objetos cruft mais antigos que <time>"
+
+msgid "use the sparse reachability algorithm"
+msgstr "usar o algoritmo de alcançabilidade esparso"
+
+msgid "create thin packs"
+msgstr "criar packs finos"
+
+msgid "use the path-walk API to walk objects when possible"
+msgstr "usar a API path-walk para percorrer objetos quando possível"
+
+msgid "create packs suitable for shallow fetches"
+msgstr "criar packs adequados para fetches rasos"
+
+msgid "ignore packs that have companion .keep file"
+msgstr "ignorar packs que possuem o arquivo .keep associado"
+
+msgid "ignore this pack"
+msgstr "ignorar este pack"
+
+msgid "pack compression level"
+msgstr "nível de compressão do pack"
+
+msgid "do not hide commits by grafts"
+msgstr "não ocultar commits por grafts"
+
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr ""
+"usar um índice bitmap, se disponível, para acelerar a contagem de objetos"
+
+msgid "write a bitmap index together with the pack index"
+msgstr "escrever um índice bitmap junto com o índice do pack"
+
+msgid "write a bitmap index if possible"
+msgstr "escrever um índice de bitmap se possível"
+
+msgid "handling for missing objects"
+msgstr "tratamento de objetos ausentes"
+
+msgid "do not pack objects in promisor packfiles"
+msgstr "não empacotar objetos em packfiles promisors"
+
+msgid "implies --missing=allow-any"
+msgstr "implica em --missing=allow-any"
+
+msgid "respect islands during delta compression"
+msgstr "respeitar islands durante a compressão delta"
+
+msgid "protocol"
+msgstr "protocolo"
+
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr ""
+"excluir qualquer uploadpack.blobpackfileuri configurado com este protocolo"
+
+msgid "use the specified name-hash function to group similar objects"
+msgstr "usar a função name-hash especificada para agrupar objetos semelhantes"
+
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr "a profundidade da cadeia de delta %d é muito profunda, forçando %d"
+
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr "pack.deltaCacheLimit é muito alto, forçando %d"
+
+#, c-format
+msgid "cannot use %s with %s"
+msgstr "não é possível usar %s com %s"
+
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "nível de compressão de pack inválido %d"
+
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr ""
+"--max-pack-size não pode ser usado para construir um pack para transferência"
+
+msgid "minimum pack size limit is 1 MiB"
+msgstr "o limite mínimo do tamanho do pack é 1 MiB"
+
+msgid "--thin cannot be used to build an indexable pack"
+msgstr "--thin não pode ser usado para construir um pack indexável"
+
+msgid "cannot use internal rev list with --stdin-packs"
+msgstr "não é possível usar a lista interna de revisões com --stdin-packs"
+
+msgid "cannot use internal rev list with --cruft"
+msgstr "não é possível usar a lista interna de revisões com --cruft"
+
+msgid "Enumerating objects"
+msgstr "Enumerando objetos"
+
+#, c-format
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32> (from %<PRIuMAX>)"
+msgstr ""
+"Total %<PRIu32> (delta %<PRIu32>), reutilizados %<PRIu32> (delta %<PRIu32>), "
+"pack reutilizados %<PRIu32> (de %<PRIuMAX>)"
+
+msgid "git pack-refs "
+msgstr "git pack-refs "
+
+msgid "git patch-id [--stable | --unstable | --verbatim]"
+msgstr "git patch-id [--stable | --unstable | --verbatim]"
+
+msgid "use the unstable patch ID algorithm"
+msgstr "usar o algoritmo de patch ID instável"
+
+msgid "use the stable patch ID algorithm"
+msgstr "usar o algoritmo de patch ID estável"
+
+msgid "don't strip whitespace from the patch"
+msgstr "não remover espaços em branco do patch"
+
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+
+msgid "report pruned objects"
+msgstr "relatar objetos podados"
+
+msgid "expire objects older than <time>"
+msgstr "expirar objetos mais antigos que <time>"
+
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr "limitar a travessia aos objetos fora dos packfiles promisors"
+
+msgid "cannot prune in a precious-objects repo"
+msgstr "não é possível fazer prune em um repositório precious-objects"
+
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr "git pull [<options>] [<repository> [<refspec>...]]"
+
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr ""
+"Não há nenhum candidato para fazer o rebase entre as refs que você acabou de "
+"fazer o fetch."
+
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr ""
+"Não há candidatos para merge entre as refs que você acabou de fazer o fetch."
+
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+"Geralmente isso significa que você forneceu um refspec curinga que não teve\n"
+"correspondências no lado remoto."
+
+#, 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 ""
+"Você pediu para fazer o pull do remoto '%s', mas não especificou\n"
+"um branch. Como este não é o remoto configurado por padrão\n"
+"para o seu branch atual, você deve especificar um branch na linha de comando."
+
+msgid "You are not currently on a branch."
+msgstr "Você não está atualmente em nenhum branch."
+
+msgid "Please specify which branch you want to rebase against."
+msgstr "Por favor, especifique contra qual branch você deseja fazer o rebase."
+
+msgid "Please specify which branch you want to merge with."
+msgstr "Por favor, especifique com qual branch você deseja fazer o merge."
+
+msgid "See git-pull(1) for details."
+msgstr "Consulte git-pull(1) para obter detalhes."
+
+msgid "<remote>"
+msgstr "<remote>"
+
+msgid "<branch>"
+msgstr "<branch>"
+
+msgid "There is no tracking information for the current branch."
+msgstr "Não há informações de rastreamento para o branch atual."
+
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr ""
+"Se você deseja definir as informações de rastreamento para este branch, pode "
+"fazê-lo com:"
+
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr ""
+"Sua configuração especifica fazer merge com o ref '%s'\n"
+"do remoto, mas esse ref não foi obtido via fetch."
+
+#, c-format
+msgid "unable to access commit %s"
+msgstr "não foi possível acessar o commit %s"
+
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "refspec inválido '%s'"
+
+msgid "ignoring --verify-signatures for rebase"
+msgstr "ignorando --verify-signatures para rebase"
+
+msgid ""
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
+"\n"
+"  git config pull.rebase false  # merge\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 ""
+"Você tem branches divergentes e precisa especificar como reconciliá-los.\n"
+"Você pode fazer isso executando um dos comandos a seguir antes do\n"
+"seu próximo pull:\n"
+"\n"
+"  git config pull.rebase false  # merge\n"
+"  git config pull.rebase true   # rebase\n"
+"  git config pull.ff only       # apenas fast-forward\n"
+"\n"
+"Você pode substituir \"git config\" por \"git config --global\" para definir "
+"uma preferência\n"
+"padrão para todos os repositórios. Você também pode passar --rebase, --no-"
+"rebase,\n"
+"ou --ff-only na linha de comando para substituir o padrão configurado por\n"
+"invocação.\n"
+
+msgid "control for recursive fetching of submodules"
+msgstr "controlar o fetch recursivo de submódulos"
+
+msgid "Options related to merging"
+msgstr "Opções relacionadas a merge"
+
+msgid "incorporate changes by rebasing rather than merging"
+msgstr "incorporar as mudanças por rebase em vez de merge"
+
+msgid "allow fast-forward"
+msgstr "permitir fast-forward"
+
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "controlar o uso dos hooks pre-merge-commit e commit-msg"
+
+msgid "automatically stash/stash pop before and after"
+msgstr "fazer stash/stash pop automaticamente antes e depois"
+
+msgid "Options related to fetching"
+msgstr "Opções relacionadas a fetch"
+
+msgid "force overwrite of local branch"
+msgstr "forçar a substituição do branch local"
+
+msgid "number of submodules pulled in parallel"
+msgstr "número de submódulos puxados (pull) em paralelo"
+
+msgid "use IPv4 addresses only"
+msgstr "usar apenas endereços IPv4"
+
+msgid "use IPv6 addresses only"
+msgstr "usar apenas endereços IPv6"
+
+msgid "Updating an unborn branch with changes added to the index."
+msgstr "Atualizando um branch não nascido com mudanças adicionadas ao índice."
+
+msgid "pull with rebase"
+msgstr "fazer pull com rebase"
+
+msgid "Please commit or stash them."
+msgstr "Por favor, faça o commit ou stash deles."
+
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+"o fetch atualizou o head do branch atual.\n"
+"fazendo o fast-forward da sua árvore de trabalho a partir do\n"
+"commit %s."
+
+#, 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 ""
+"Não é possível fazer o fast-forward da sua árvore de trabalho.\n"
+"Após certificar-se de que salvou tudo de importante da saída de\n"
+"$ git diff %s\n"
+"execute\n"
+"$ git reset --hard\n"
+"para recuperar."
+
+msgid "Cannot merge multiple branches into empty head."
+msgstr "Não é possível fazer o merge de múltiplos branches em um head vazio."
+
+msgid "Cannot rebase onto multiple branches."
+msgstr "Não é possível fazer o rebase sobre múltiplos branches."
+
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Não é possível fazer o fast-forward para múltiplos branches."
+
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Necessário especificar como reconciliar branches divergentes."
+
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr ""
+"não é possível fazer rebase com modificações de submódulo gravadas localmente"
+
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr "git push [<options>] [<repository> [<refspec>...]]"
+
+msgid "tag shorthand without <tag>"
+msgstr "abreviação de tag sem <tag>"
+
+msgid "--delete only accepts plain target ref names"
+msgstr "--delete aceita apenas nomes de referência de destino simples"
+
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'.\n"
+msgstr ""
+"\n"
+"Para escolher qualquer uma das opções permanentemente, consulte push.default "
+"em 'git help config'.\n"
+
+msgid ""
+"\n"
+"To avoid automatically configuring an upstream branch when its name\n"
+"won't match the local branch, see option 'simple' of branch.autoSetupMerge\n"
+"in 'git help config'.\n"
+msgstr ""
+"\n"
+"Para evitar a configuração automática de um branch upstream quando seu nome\n"
+"não corresponder ao branch local, consulte a opção 'simple' de "
+"branch.autoSetupMerge\n"
+"em 'git help config'.\n"
+
+#, 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%s"
+msgstr ""
+"O branch upstream do seu branch atual não corresponde\n"
+"ao nome do seu branch atual.  Para fazer push para o branch upstream\n"
+"no remoto, use\n"
+"\n"
+"    git push %s HEAD:%s\n"
+"\n"
+"Para fazer push para o branch de mesmo nome no remoto, use\n"
+"\n"
+"    git push %s HEAD\n"
+"%s%s"
+
+#, 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 ""
+"Você não está atualmente em nenhum branch.\n"
+"Para fazer push do histórico que leva ao estado atual\n"
+"(detached HEAD) agora, use\n"
+"\n"
+"    git push %s HEAD:<name-of-remote-branch>\n"
+
+msgid ""
+"\n"
+"To have this happen automatically for branches without a tracking\n"
+"upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
+msgstr ""
+"\n"
+"Para que isso aconteça automaticamente para branches sem um upstream de\n"
+"rastreamento, consulte 'push.autoSetupRemote' em 'git help config'.\n"
+
+#, 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"
+"%s"
+msgstr ""
+"O branch atual %s não possui um branch upstream.\n"
+"Para enviar o branch atual e definir o remoto como upstream, use\n"
+"\n"
+"    git push --set-upstream %s %s\n"
+"%s"
+
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr ""
+"O branch atual %s possui vários branches upstream, recusando-se a fazer push."
+
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"Você não especificou nenhum refspec para push e push.default é \"nothing\"."
+
+#, 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 ""
+"Você está fazendo push para o remoto '%s', que não é o upstream do\n"
+"seu branch atual '%s', sem me dizer o que enviar\n"
+"para atualizar qual branch remoto."
+
+msgid ""
+"Updates were rejected because the tip of your current branch is behind\n"
+"its remote counterpart. If you want to integrate the remote changes,\n"
+"use 'git pull' before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"As atualizações foram rejeitadas porque a ponta do seu branch atual está "
+"atrás\n"
+"da sua contraparte remota. Se você quiser integrar as alterações remotas,\n"
+"use 'git pull' antes de fazer push novamente.\n"
+"Veja a 'Note about fast-forwards' em 'git push --help' para mais detalhes."
+
+msgid ""
+"Updates were rejected because a pushed branch tip is behind its remote\n"
+"counterpart. If you want to integrate the remote changes, use 'git pull'\n"
+"before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"As atualizações foram rejeitadas porque a ponta de um branch enviado está "
+"atrás da\n"
+"sua contraparte remota. Se você quiser integrar as alterações remotas, use "
+"'git pull'\n"
+"antes de fazer push novamente.\n"
+"Veja a 'Note about fast-forwards' em 'git push --help' para mais detalhes."
+
+msgid ""
+"Updates were rejected because the remote contains work that you do not\n"
+"have locally. This is usually caused by another repository pushing to\n"
+"the same ref. If you want to integrate the remote changes, use\n"
+"'git pull' before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"As atualizações foram rejeitadas porque o remoto contém trabalho que você "
+"não\n"
+"tem localmente. Isso normalmente é causado por outro repositório ter feito "
+"push para\n"
+"a mesma ref. Se você quiser integrar as alterações remotas, use\n"
+"'git pull' antes de fazer push novamente.\n"
+"Veja a 'Note about fast-forwards' em 'git push --help' para mais detalhes."
+
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr "As atualizações foram rejeitadas porque a tag já existe no remoto."
+
+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 ""
+"Você não pode atualizar uma referência remota que aponta para um objeto que "
+"não é\n"
+"um commit, nem atualizar uma referência remota para fazê-la apontar para um "
+"objeto\n"
+"que não é um commit, sem usar a opção '--force'.\n"
+
+msgid ""
+"Updates were rejected because the tip of the remote-tracking branch has\n"
+"been updated since the last checkout. If you want to integrate the\n"
+"remote changes, use 'git pull' before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"As atualizações foram rejeitadas porque a ponta do branch de rastreamento "
+"remoto foi\n"
+"atualizada desde o último checkout. Se você quiser integrar as\n"
+"alterações remotas, use 'git pull' antes de fazer push novamente.\n"
+"Veja a 'Note about fast-forwards' em 'git push --help' para mais detalhes."
+
+#, c-format
+msgid "Pushing to %s\n"
+msgstr "Fazendo push para %s\n"
+
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr "falha ao enviar algumas referências para '%s'"
+
+msgid ""
+"recursing into submodule with push.recurseSubmodules=only; using on-demand "
+"instead"
+msgstr ""
+"entrando recursivamente no submódulo com push.recurseSubmodules=only; usando "
+"on-demand em vez disso"
+
+#, c-format
+msgid "invalid value for '%s'"
+msgstr "valor inválido para '%s'"
+
+#, c-format
+msgid "could not push to %s"
+msgstr "não foi possível enviar para %s"
+
+#, c-format
+msgid "'%s' is not a valid push target"
+msgstr "'%s' não é um destino de push válido"
+
+#, c-format
+msgid "Did you mean to use: git push %s %s?"
+msgstr "Você quis dizer: git push %s %s?"
+
+msgid "repository"
+msgstr "repositório"
+
+msgid "push all branches"
+msgstr "fazer push de todos os branches"
+
+msgid "mirror all refs"
+msgstr "espelhar todas as referências"
+
+msgid "delete refs"
+msgstr "excluir referências"
+
+msgid "push tags (can't be used with --all or --branches or --mirror)"
+msgstr ""
+"fazer push de tags (não pode ser usado com --all, --branches ou --mirror)"
+
+msgid "force updates"
+msgstr "forçar atualizações"
+
+msgid "<refname>:<expect>"
+msgstr "<refname>:<expect>"
+
+msgid "require old value of ref to be at this value"
+msgstr "exigir que o valor antigo de ref esteja neste valor"
+
+msgid "require remote updates to be integrated locally"
+msgstr "exigir que as atualizações remotas sejam integradas localmente"
+
+msgid "control recursive pushing of submodules"
+msgstr "controlar o envio recursivo de submódulos"
+
+msgid "use thin pack"
+msgstr "usar pack fino"
+
+msgid "receive pack program"
+msgstr "programa receive-pack"
+
+msgid "set upstream for git pull/status"
+msgstr "configurar upstream para git pull/status"
+
+msgid "prune locally removed refs"
+msgstr "podar referências removidas localmente"
+
+msgid "bypass pre-push hook"
+msgstr "ignorar o hook pre-push"
+
+msgid "push missing but relevant tags"
+msgstr "enviar tags ausentes, mas relevantes"
+
+msgid "GPG sign the push"
+msgstr "assinar o push com GPG"
+
+msgid "request atomic transaction on remote side"
+msgstr "solicitar transação atômica no lado remoto"
+
+msgid "--delete doesn't make sense without any refs"
+msgstr "--delete não faz sentido sem nenhuma referência"
+
+#, c-format
+msgid "bad repository '%s'"
+msgstr "repositório inválido '%s'"
+
+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"
+"\n"
+"To push to multiple remotes at once, configure a remote group using\n"
+"\n"
+"    git config remotes.<groupname> \"<remote1> <remote2>\"\n"
+"\n"
+"and then push using the group name\n"
+"\n"
+"    git push <groupname>\n"
+msgstr ""
+"Nenhum destino de push configurado.\n"
+"Especifique a URL na linha de comando ou configure um repositório remoto "
+"usando\n"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"e então faça push usando o nome do remoto\n"
+"\n"
+"    git push <name>\n"
+"\n"
+"Para fazer push para vários remotos de uma vez, configure um grupo de "
+"remotos usando\n"
+"\n"
+"    git config remotes.<groupname> \"<remote1> <remote2>\"\n"
+"\n"
+"e então faça push usando o nome do grupo\n"
+"\n"
+"    git push <groupname>\n"
+
+msgid "push options must not have new line characters"
+msgstr "as opções push não devem ter caracteres de nova linha"
+
+msgid "--all can't be combined with refspecs"
+msgstr "--all não pode ser combinado com refspecs"
+
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror não pode ser combinado com refspecs"
+
+msgid "--atomic can only be used when pushing to one remote"
+msgstr "--atomic só pode ser usado ao enviar para um único remoto"
+
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+msgstr "git range-diff [<options>] <old-tip>...<new-tip>"
+
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+msgstr "git range-diff [<options>] <base> <old-tip> <new-tip>"
+
+#, c-format
+msgid "invalid max-memory value: %s"
+msgstr "valor max-memory inválido: %s"
+
+msgid "use simple diff colors"
+msgstr "usar cores de diff simples"
+
+msgid "passed to 'git log'"
+msgstr "passado para o 'git log'"
+
+msgid "size"
+msgstr "tamanho"
+
+msgid "maximum memory for cost matrix (default 4G)"
+msgstr "memória máxima para a matriz de custos (padrão 4G)"
+
+msgid "only emit output related to the first range"
+msgstr "emitir apenas saída relacionada ao primeiro intervalo"
+
+msgid "only emit output related to the second range"
+msgstr "emitir apenas saída relacionada ao segundo intervalo"
+
+#, c-format
+msgid "not a revision: '%s'"
+msgstr "não é uma revisão: '%s'"
+
+#, c-format
+msgid "not a commit range: '%s'"
+msgstr "não é um intervalo de commits: '%s'"
+
+#, c-format
+msgid "not a symmetric range: '%s'"
+msgstr "não é um intervalo simétrico: '%s'"
+
+msgid "need two commit ranges"
+msgstr "são necessários dois intervalos de commits"
+
+msgid ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
+"prefix=<prefix>)\n"
+"              [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n"
+"              (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+msgstr ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
+"prefix=<prefix>)\n"
+"              [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n"
+"              (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+
+msgid "write resulting index to <file>"
+msgstr "escrever o índice resultante em <file>"
+
+msgid "only empty the index"
+msgstr "apenas esvaziar o índice"
+
+msgid "Merging"
+msgstr "Fazendo merge"
+
+msgid "perform a merge in addition to a read"
+msgstr "realizar um merge além de uma leitura"
+
+msgid "3-way merge if no file level merging required"
+msgstr "merge de 3 vias se não for necessário nenhum merge no nível de arquivo"
+
+msgid "3-way merge in presence of adds and removes"
+msgstr "merge de 3 vias na presença de adições e remoções"
+
+msgid "same as -m, but discard unmerged entries"
+msgstr "o mesmo que -m, mas descartar entradas não mescladas"
+
+msgid "<subdirectory>/"
+msgstr "<subdirectory>/"
+
+msgid "read the tree into the index under <subdirectory>/"
+msgstr "ler a tree para o índice sob <subdirectory>/"
+
+msgid "update working tree with merge result"
+msgstr "atualizar a árvore de trabalho com o resultado do merge"
+
+msgid "gitignore"
+msgstr "gitignore"
+
+msgid "allow explicitly ignored files to be overwritten"
+msgstr "permitir que arquivos explicitamente ignorados sejam sobrescritos"
+
+msgid "don't check the working tree after merging"
+msgstr "não verificar a árvore de trabalho após o merge"
+
+msgid "don't update the index or the work tree"
+msgstr "não atualizar o índice ou a árvore de trabalho"
+
+msgid "skip applying sparse checkout filter"
+msgstr "pular a aplicação do filtro de sparse checkout"
+
+msgid "debug unpack-trees"
+msgstr "depurar unpack-trees"
+
+msgid "suppress feedback messages"
+msgstr "suprimir mensagens de feedback"
+
+msgid "You need to resolve your current index first"
+msgstr "Você precisa resolver seu índice atual primeiro"
+
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
+msgstr ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
+
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+
+#, c-format
+msgid "could not read '%s'."
+msgstr "não foi possível ler '%s'."
+
+#, c-format
+msgid "could not create temporary %s"
+msgstr "não foi possível criar o %s temporário"
+
+msgid "could not mark as interactive"
+msgstr "não foi possível marcar como interativo"
+
+msgid "could not generate todo list"
+msgstr "não foi possível gerar a lista de tarefas (todo)"
+
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr "um commit base deve ser fornecido com --upstream ou --onto"
+
+#, c-format
+msgid "%s requires the merge backend"
+msgstr "%s requer o backend de merge"
+
+#, c-format
+msgid "invalid onto: '%s'"
+msgstr "onto inválido: '%s'"
+
+#, c-format
+msgid "invalid orig-head: '%s'"
+msgstr "orig-head inválido: '%s'"
+
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
+msgstr "ignorando allow_rerere_autoupdate inválido: '%s'"
+
+#, c-format
+msgid "could not remove '%s'"
+msgstr "não foi possível remover '%s'"
+
+#, 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"
+"o git encontrou um erro ao preparar os patches para reproduzir\n"
+"estas revisões:\n"
+"\n"
+"    %s\n"
+"\n"
+"Como resultado, o git não pode fazer o rebase delas."
+
+#, c-format
+msgid "Unknown rebase-merges mode: %s"
+msgstr "Modo de rebase-merges desconhecido: %s"
+
+#, c-format
+msgid "could not switch to %s"
+msgstr "não foi possível mudar para %s"
+
+msgid "apply options and merge options cannot be used together"
+msgstr "opções de apply e opções de merge não podem ser usadas juntas"
+
+msgid "--empty=ask is deprecated; use '--empty=stop' instead."
+msgstr "--empty=ask está obsoleto; use '--empty=stop' em vez disso."
+
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and "
+"\"stop\"."
+msgstr ""
+"tipo empty não reconhecido '%s'; os valores válidos são \"drop\", \"keep\" e "
+"\"stop\"."
+
+msgid ""
+"--rebase-merges with an empty string argument is deprecated and will stop "
+"working in a future version of Git. Use --rebase-merges without an argument "
+"instead, which does the same thing."
+msgstr ""
+"--rebase-merges com um argumento de string vazio está obsoleto e deixará de "
+"funcionar em uma versão futura do Git. Use --rebase-merges sem um argumento, "
+"o que faz a mesma coisa."
+
+#, 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"
+"Por favor, especifique contra qual branch você deseja fazer o rebase.\n"
+"Veja git-rebase(1) para obter detalhes.\n"
+"\n"
+"    git rebase '<branch>'\n"
+"\n"
+
+#, 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 ""
+"Se você deseja definir as informações de rastreamento para este branch, pode "
+"fazê-lo com:\n"
+"\n"
+"    git branch --set-upstream-to=%s/<branch> %s\n"
+"\n"
+
+msgid "exec commands cannot contain newlines"
+msgstr "comandos exec não podem conter novas linhas"
+
+msgid "empty exec command"
+msgstr "comando exec vazio"
+
+msgid "rebase onto given branch instead of upstream"
+msgstr "fazer rebase no branch fornecido em vez do upstream"
+
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr "usar o merge-base do upstream e do branch como a base atual"
+
+msgid "allow pre-rebase hook to run"
+msgstr "permitir a execução do hook pre-rebase"
+
+msgid "be quiet. implies --no-stat"
+msgstr "ser silencioso. implica --no-stat"
+
+msgid "display a diffstat of what changed upstream"
+msgstr "exibir um diffstat do que mudou no upstream"
+
+msgid "do not show diffstat of what changed upstream"
+msgstr "não exibir diffstat do que mudou no upstream"
+
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "adicionar um trailer Signed-off-by a cada commit"
+
+msgid "make committer date match author date"
+msgstr "fazer a data do committer corresponder à data do autor"
+
+msgid "ignore author date and use current date"
+msgstr "ignorar a data do autor e usar a data atual"
+
+msgid "synonym of --reset-author-date"
+msgstr "sinônimo de --reset-author-date"
+
+msgid "passed to 'git apply'"
+msgstr "passado para 'git apply'"
+
+msgid "ignore changes in whitespace"
+msgstr "ignorar mudanças em espaços em branco"
+
+msgid "cherry-pick all commits, even if unchanged"
+msgstr "fazer cherry-pick de todos os commits, mesmo se não modificados"
+
+msgid "continue"
+msgstr "continuar"
+
+msgid "skip current patch and continue"
+msgstr "ignorar o patch atual e continuar"
+
+msgid "abort and check out the original branch"
+msgstr "abortar e fazer checkout do branch original"
+
+msgid "abort but keep HEAD where it is"
+msgstr "abortar, mas manter o HEAD onde está"
+
+msgid "edit the todo list during an interactive rebase"
+msgstr "editar a lista de tarefas durante um rebase interativo"
+
+msgid "show the patch file being applied or merged"
+msgstr "mostrar o arquivo patch sendo aplicado ou feito merge"
+
+msgid "use apply strategies to rebase"
+msgstr "usar estratégias de apply para o rebase"
+
+msgid "use merging strategies to rebase"
+msgstr "usar estratégias de merge para fazer rebase"
+
+msgid "let the user edit the list of commits to rebase"
+msgstr "permitir que o usuário edite a lista de commits para fazer rebase"
+
+msgid "(REMOVED) was: try to recreate merges instead of ignoring them"
+msgstr "(REMOVIDO) era: tentar recriar merges em vez de ignorá-los"
+
+msgid "keep commits which start empty"
+msgstr "manter commits que começam vazios"
+
+msgid "move commits that begin with squash!/fixup! under -i"
+msgstr "mover commits que começam com squash!/fixup! sob -i"
+
+msgid "update branches that point to commits that are being rebased"
+msgstr "atualizar branches que apontam para commits que estão sofrendo rebase"
+
+msgid "add exec lines after each commit of the editable list"
+msgstr "adicionar linhas exec após cada commit da lista editável"
+
+msgid "allow rebasing commits with empty messages"
+msgstr "permitir fazer rebase de commits com mensagens vazias"
+
+msgid "try to rebase merges instead of skipping them"
+msgstr "tentar fazer rebase de merges em vez de ignorá-los"
+
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr "usar 'merge-base --fork-point' para refinar o upstream"
+
+msgid "use the given merge strategy"
+msgstr "usar a estratégia de merge fornecida"
+
+msgid "option"
+msgstr "opção"
+
+msgid "pass the argument through to the merge strategy"
+msgstr "passar o argumento para a estratégia de merge"
+
+msgid "rebase all reachable commits up to the root(s)"
+msgstr "fazer rebase de todos os commits alcançáveis até a(s) raiz(es)"
+
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "reagendar automaticamente qualquer `exec` que falhar"
+
+msgid "apply all changes, even those already present upstream"
+msgstr "aplicar todas as alterações, mesmo aquelas já presentes no upstream"
+
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr "Parece que um 'git am' está em andamento. Não é possível fazer rebase."
+
+msgid ""
+"`rebase --preserve-merges` (-p) is no longer supported.\n"
+"Use `git rebase --abort` to terminate current rebase.\n"
+"Or downgrade to v2.33, or earlier, to complete the rebase."
+msgstr ""
+"`rebase --preserve-merges` (-p) não é mais suportado.\n"
+"Use `git rebase --abort` para encerrar o rebase atual.\n"
+"Ou faça o downgrade para a v2.33, ou anterior, para concluir o rebase."
+
+msgid ""
+"--preserve-merges was replaced by --rebase-merges\n"
+"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
+"which is no longer supported; use 'merges' instead"
+msgstr ""
+"--preserve-merges foi substituído por --rebase-merges\n"
+"Nota: Sua configuração `pull.rebase` também pode estar definida como "
+"'preserve',\n"
+"o que não é mais suportado; use 'merges' em vez disso"
+
+msgid "no rebase in progress"
+msgstr "nenhum rebase em andamento"
+
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr "A ação --edit-todo só pode ser usada durante um rebase interativo."
+
+msgid "Cannot read HEAD"
+msgstr "Não é possível ler o HEAD"
+
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+"Você deve editar todos os conflitos de merge e então\n"
+"marcá-los como resolvidos usando git add"
+
+msgid "could not discard worktree changes"
+msgstr "não foi possível descartar as alterações da worktree"
+
+#, c-format
+msgid "could not move back to %s"
+msgstr "não foi possível voltar para %s"
+
+#, 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 ""
+"Parece que já existe um diretório %s e\n"
+"eu me pergunto se você está no meio de outro rebase. Se for esse o\n"
+"caso, por favor tente\n"
+"\t%s\n"
+"Se não for o caso, por favor\n"
+"\t%s\n"
+"e execute-me novamente. Estou parando caso você ainda tenha algo\n"
+"valioso lá.\n"
+
+msgid "switch `C' expects a numerical value"
+msgstr "a opção `C' espera um valor numérico"
+
+msgid ""
+"apply options are incompatible with rebase.rebaseMerges.  Consider adding --"
+"no-rebase-merges"
+msgstr ""
+"opções de apply são incompatíveis com rebase.rebaseMerges. Considere "
+"adicionar --no-rebase-merges"
+
+msgid ""
+"apply options are incompatible with rebase.updateRefs.  Consider adding --no-"
+"update-refs"
+msgstr ""
+"opções de apply são incompatíveis com rebase.updateRefs. Considere adicionar "
+"--no-update-refs"
+
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "Backend de rebase desconhecido: %s"
+
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--reschedule-failed-exec requer --exec ou --interactive"
+
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr "upstream inválido '%s'"
+
+msgid "Could not create new root commit"
+msgstr "Não foi possível criar o novo commit raiz"
+
+#, c-format
+msgid "no such branch/commit '%s'"
+msgstr "não há branch/commit '%s'"
+
+#, c-format
+msgid "No such ref: %s"
+msgstr "Ref inexistente: %s"
+
+msgid "Could not resolve HEAD to a commit"
+msgstr "Não foi possível resolver o HEAD para um commit"
+
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr "'%s': precisa de exatamente um merge base com o branch"
+
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr "'%s': precisa de exatamente um merge base"
+
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr "Não aponta para um commit válido '%s'"
+
+msgid "HEAD is up to date."
+msgstr "HEAD está atualizado."
+
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr "O branch atual %s está atualizado.\n"
+
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD está atualizado, rebase forçado."
+
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
+msgstr "O branch atual %s está atualizado, rebase forçado.\n"
+
+msgid "The pre-rebase hook refused to rebase."
+msgstr "O hook pre-rebase recusou o rebase."
+
+#, c-format
+msgid "Changes to %s:\n"
+msgstr "Alterações em %s:\n"
+
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr "Mudanças de %s para %s:\n"
+
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
+msgstr ""
+"Primeiro, retrocedendo o head para reproduzir seu trabalho no topo dele...\n"
+
+msgid "Could not detach HEAD"
+msgstr "Não foi possível desanexar o HEAD"
+
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr "Fast-forward de %s para %s.\n"
+
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <git-dir>"
+
+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 ""
+"Por padrão, atualizar o branch atual em um repositório não-bare\n"
+"é negado, porque tornará o índice e a árvore de trabalho inconsistentes\n"
+"com o que você fez push, e exigirá 'git reset --hard' para corresponder\n"
+"a árvore de trabalho ao HEAD.\n"
+"\n"
+"Você pode definir a variável de configuração 'receive.denyCurrentBranch'\n"
+"como 'ignore' ou 'warn' no repositório remoto para permitir o push para\n"
+"seu branch atual; no entanto, isso não é recomendado a menos que você\n"
+"tenha providenciado a atualização da árvore de trabalho para corresponder ao "
+"que você fez push de\n"
+"alguma outra forma.\n"
+"\n"
+"Para suprimir esta mensagem e ainda manter o comportamento padrão, defina\n"
+"a variável de configuração 'receive.denyCurrentBranch' como 'refuse'."
+
+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 ""
+"Por padrão, excluir o branch atual é negado, porque o próximo\n"
+"'git clone' não resultará em nenhum arquivo em checkout, causando confusão.\n"
+"\n"
+"Você pode definir a variável de configuração 'receive.denyDeleteCurrent' "
+"como\n"
+"'warn' ou 'ignore' no repositório remoto para permitir a exclusão do\n"
+"branch atual, com ou sem uma mensagem de aviso.\n"
+"\n"
+"Para suprimir esta mensagem, você pode defini-la como 'refuse'."
+
+msgid "quiet"
+msgstr "silencioso"
+
+msgid "you must specify a directory"
+msgstr "você deve especificar um diretório"
+
+msgid "git reflog [show] [<log-options>] [<ref>]"
+msgstr "git reflog [show] [<log-options>] [<ref>]"
+
+msgid "git reflog list"
+msgstr "git reflog list"
+
+msgid "git reflog exists <ref>"
+msgstr "git reflog exists <ref>"
+
+msgid "git reflog write <ref> <old-oid> <new-oid> <message>"
+msgstr "git reflog write <ref> <old-oid> <new-oid> <message>"
+
+msgid ""
+"git reflog delete [--rewrite] [--updateref]\n"
+"                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
+msgstr ""
+"git reflog delete [--rewrite] [--updateref]\n"
+"                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
+
+msgid "git reflog drop [--all [--single-worktree] | <refs>...]"
+msgstr "git reflog drop [--all [--single-worktree] | <refs>...]"
+
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
+"                  [--rewrite] [--updateref] [--stale-fix]\n"
+"                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
+msgstr ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
+"                  [--rewrite] [--updateref] [--stale-fix]\n"
+"                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
+
+#, c-format
+msgid "invalid timestamp '%s' given to '--%s'"
+msgstr "timestamp inválido '%s' fornecido a '--%s'"
+
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s não aceita argumentos: '%s'"
+
+msgid "do not actually prune any entries"
+msgstr "não podar de fato nenhuma entrada"
+
+msgid ""
+"rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
+msgstr ""
+"reescrever o SHA1 antigo com o novo SHA1 da entrada que agora o precede"
+
+msgid "update the reference to the value of the top reflog entry"
+msgstr "atualizar a referência para o valor da entrada de reflog do topo"
+
+msgid "print extra information on screen"
+msgstr "imprimir informações extras na tela"
+
+msgid "timestamp"
+msgstr "timestamp"
+
+msgid "prune entries older than the specified time"
+msgstr "podar entradas mais antigas que o tempo especificado"
+
+msgid ""
+"prune entries older than <time> that are not reachable from the current tip "
+"of the branch"
+msgstr ""
+"podar entradas mais antigas que <time> que não são alcançáveis a partir da "
+"ponta atual do branch"
+
+msgid "prune any reflog entries that point to broken commits"
+msgstr "podar quaisquer entradas de reflog que apontem para commits quebrados"
+
+msgid "process the reflogs of all references"
+msgstr "processar os reflogs de todas as referências"
+
+msgid "limits processing to reflogs from the current worktree only"
+msgstr "limita o processamento a reflogs apenas da worktree atual"
+
+#, c-format
+msgid "Marking reachable objects..."
+msgstr "Marcando objetos alcançáveis..."
+
+#, c-format
+msgid "reflog could not be found: '%s'"
+msgstr "o reflog não pôde ser encontrado: '%s'"
+
+msgid "no reflog specified to delete"
+msgstr "nenhum reflog especificado para excluir"
+
+#, c-format
+msgid "invalid ref format: %s"
+msgstr "formato de ref inválido: %s"
+
+msgid "drop the reflogs of all references"
+msgstr "descartar os reflogs de todas as referências"
+
+msgid "drop reflogs from the current worktree only"
+msgstr "descartar reflogs apenas da worktree atual"
+
+msgid "references specified along with --all"
+msgstr "referências especificadas junto com --all"
+
+#, c-format
+msgid "invalid reference name: %s"
+msgstr "referência inválida: %s"
+
+#, c-format
+msgid "invalid old object ID: '%s'"
+msgstr "ID de objeto antigo inválido: '%s'"
+
+#, c-format
+msgid "old object '%s' does not exist"
+msgstr "o objeto antigo '%s' não existe"
+
+#, c-format
+msgid "invalid new object ID: '%s'"
+msgstr "novo ID de objeto inválido: '%s'"
+
+#, c-format
+msgid "new object '%s' does not exist"
+msgstr "o novo objeto '%s' não existe"
+
+#, c-format
+msgid "cannot start transaction: %s"
+msgstr "não é possível iniciar a transação: %s"
+
+#, c-format
+msgid "cannot queue reflog update: %s"
+msgstr "não é possível enfileirar a atualização do reflog: %s"
+
+#, c-format
+msgid "cannot commit reflog update: %s"
+msgstr "não é possível fazer commit da atualização do reflog: %s"
+
+msgid "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]"
+msgstr "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]"
+
+msgid "git refs verify [--strict] [--verbose]"
+msgstr "git refs verify [--strict] [--verbose]"
+
+msgid "git refs exists <ref>"
+msgstr "git refs exists <ref>"
+
+msgid "git refs optimize "
+msgstr "git refs optimize "
+
+msgid ""
+"git refs create [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value>"
+msgstr ""
+"git refs create [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value>"
+
+msgid "git refs delete [--message=<reason>] [--no-deref] <ref> [<old-value>]"
+msgstr "git refs delete [--message=<reason>] [--no-deref] <ref> [<old-value>]"
+
+msgid ""
+"git refs update [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value> [<old-value>]"
+msgstr ""
+"git refs update [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value> [<old-value>]"
+
+msgid "git refs rename [--message=<reason>] <old-ref> <new-ref>"
+msgstr "git refs rename [--message=<reason>] <old-ref> <new-ref>"
+
+msgid "specify the reference format to convert to"
+msgstr "especificar o formato de referência para o qual converter"
+
+msgid "perform a non-destructive dry-run"
+msgstr "realizar um dry-run não destrutivo"
+
+msgid "drop reflogs entirely during the migration"
+msgstr "descartar reflogs inteiramente durante a migração"
+
+msgid "missing --ref-format=<format>"
+msgstr "faltando --ref-format=<format>"
+
+#, c-format
+msgid "repository already uses '%s' format"
+msgstr "o repositório já usa o formato '%s'"
+
+msgid "enable strict checking"
+msgstr "ativar verificação rigorosa"
+
+msgid "'git refs verify' takes no arguments"
+msgstr "'git refs verify' não aceita argumentos"
+
+msgid "git refs list "
+msgstr "git refs list "
+
+msgid "'git refs exists' requires a reference"
+msgstr "'git refs exists' requer uma referência"
+
+msgid "reference does not exist"
+msgstr "a referência não existe"
+
+msgid "failed to look up reference"
+msgstr "falha ao procurar referência"
+
+msgid "reason"
+msgstr "motivo"
+
+msgid "reason of the update"
+msgstr "motivo da atualização"
+
+msgid "update <refname> not the one it points to"
+msgstr "atualizar <refname>, não o que ele aponta"
+
+msgid "create a reflog"
+msgstr "criar um reflog"
+
+msgid "create requires reference name and an object ID"
+msgstr "create requer o nome da referência e um ID de objeto"
+
+msgid "refusing to perform update with empty message"
+msgstr "recusando-se a realizar atualização com mensagem vazia"
+
+#, c-format
+msgid "invalid object ID: '%s'"
+msgstr "ID de objeto inválido: '%s'"
+
+msgid "cannot create reference with null new object ID"
+msgstr "não é possível criar uma referência com novo ID de objeto nulo"
+
+msgid "delete requires reference name and an optional old object ID"
+msgstr ""
+"a exclusão requer o nome da referência e um ID de objeto antigo opcional"
+
+msgid "cannot delete reference with null old object ID"
+msgstr "não é possível excluir uma referência com ID de objeto antigo nulo"
+
+msgid "update requires reference name, new value and an optional old value"
+msgstr ""
+"a atualização requer o nome da referência, novo valor e um valor antigo "
+"opcional"
+
+msgid "rename requires old and new reference name"
+msgstr "renomear requer o nome da referência antiga e nova"
+
+#, c-format
+msgid "invalid ref format: '%s'"
+msgstr "formato de ref inválido: '%s'"
+
+#, c-format
+msgid "reference does not exist: '%s'"
+msgstr "a referência não existe: '%s'"
+
+#, c-format
+msgid "reference already exists: '%s'"
+msgstr "a referência já existe: '%s'"
+
+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>"
+
+msgid "git remote rename [--[no-]progress] <old> <new>"
+msgstr "git remote rename [--[no-]progress] <old> <new>"
+
+msgid "git remote remove <name>"
+msgstr "git remote remove <name>"
+
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr "git remote [-v | --verbose] show [-n] <name>"
+
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr "git remote prune [-n | --dry-run] <name>"
+
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr "git remote set-branches [--add] <name> <branch>..."
+
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <name>"
+
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+
+msgid "git remote set-url --add <name> <newurl>"
+msgstr "git remote set-url --add <name> <newurl>"
+
+msgid "git remote set-url --delete <name> <url>"
+msgstr "git remote set-url --delete <name> <url>"
+
+msgid "git remote add [<options>] <name> <url>"
+msgstr "git remote add [<options>] <name> <url>"
+
+msgid "git remote set-branches <name> <branch>..."
+msgstr "git remote set-branches <name> <branch>..."
+
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr "git remote set-branches --add <name> <branch>..."
+
+msgid "git remote show [<options>] <name>"
+msgstr "git remote show [<options>] <name>"
+
+msgid "git remote prune [<options>] <name>"
+msgstr "git remote prune [<options>] <name>"
+
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr "git remote update [<options>] [<group> | <remote>]..."
+
+#, c-format
+msgid "Updating %s"
+msgstr "Atualizando %s"
+
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Não foi possível buscar %s"
+
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+"--mirror é perigoso e obsoleto; por favor\n"
+"\t use --mirror=fetch ou --mirror=push em vez disso"
+
+#, c-format
+msgid "unknown --mirror argument: %s"
+msgstr "argumento --mirror desconhecido: %s"
+
+#, c-format
+msgid "remote name '%s' is a subset of existing remote '%s'"
+msgstr "o nome do remoto '%s' é um subconjunto do remoto existente '%s'"
+
+#, c-format
+msgid "remote name '%s' is a superset of existing remote '%s'"
+msgstr "o nome do remoto '%s' é um superconjunto do remoto existente '%s'"
+
+msgid "fetch the remote branches"
+msgstr "fazer fetch dos branches do remoto"
+
+msgid ""
+"import all tags and associated objects when fetching\n"
+"or do not fetch any tag at all (--no-tags)"
+msgstr ""
+"importar todas as tags e objetos associados ao fazer fetch\n"
+"ou não fazer fetch de nenhuma tag (--no-tags)"
+
+msgid "branch(es) to track"
+msgstr "branch(es) para rastrear"
+
+msgid "master branch"
+msgstr "branch master"
+
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr "configurar o remoto como um espelho para fazer push ou fetch"
+
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr "especificar um branch master não faz sentido com --mirror"
+
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr ""
+"especificar branches para rastrear faz sentido apenas com espelhos de fetch"
+
+#, c-format
+msgid "remote %s already exists."
+msgstr "o remoto %s já existe."
+
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr "Não foi possível configurar o master '%s'"
+
+#, c-format
+msgid "more than one %s"
+msgstr "mais de um %s"
+
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "branch.%s.rebase=%s não tratado; assumindo 'true'"
+
+#, c-format
+msgid "Could not get fetch map for refspec %s"
+msgstr "Não foi possível obter o mapa de fetch para o refspec %s"
+
+msgid "(matching)"
+msgstr "(correspondente)"
+
+msgid "(delete)"
+msgstr "(excluir)"
+
+#, c-format
+msgid "could not set '%s'"
+msgstr "não foi possível definir '%s'"
+
+#, c-format
+msgid "could not unset '%s'"
+msgstr "não foi possível desdefinir '%s'"
+
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"A configuração %s remote.pushDefault em:\n"
+"\t%s:%d\n"
+"agora nomeia o remoto inexistente '%s'"
+
+msgid ""
+"The remote you are trying to rename has conflicting references in the\n"
+"new target refspec. This is most likely caused by you trying to nest\n"
+"a remote into itself, e.g. by renaming 'parent' into 'parent/child'\n"
+"or by unnesting a remote, e.g. the other way round.\n"
+"\n"
+"If that is the case, you can address this by first renaming the\n"
+"remote to a different name.\n"
+msgstr ""
+"O remoto que você está tentando renomear tem referências conflitantes no\n"
+"novo refspec de destino. Isso é mais provavelmente causado por você tentar "
+"aninhar\n"
+"um remoto dentro de si mesmo, por exemplo, renomeando 'parent' para 'parent/"
+"child'\n"
+"ou desaninhando um remoto, por exemplo, o caminho inverso.\n"
+"\n"
+"Se for esse o caso, você pode resolver isso renomeando primeiro o\n"
+"remoto para um nome diferente.\n"
+
+#, c-format
+msgid "No such remote: '%s'"
+msgstr "Remoto inexistente: '%s'"
+
+#, c-format
+msgid "Could not rename config section '%s' to '%s'"
+msgstr "Não foi possível renomear a seção de configuração '%s' para '%s'"
+
+msgid "Renaming remote references"
+msgstr "Renomeando referências do remoto"
+
+#, c-format
+msgid "queueing remote ref renames failed: %s"
+msgstr "falha ao enfileirar renomeações de ref do remoto: %s"
+
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+"Não atualizando refspec de fetch não padrão\n"
+"\t%s\n"
+"\tPor favor, atualize a configuração manualmente, se necessário."
+
+#, c-format
+msgid "renaming remote refs failed: %s"
+msgstr "falha ao renomear refs do remoto: %s"
+
+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] ""
+"Nota: Um branch fora da hierarquia refs/remotes/ não foi removido;\n"
+"para excluí-lo, use:"
+msgstr[1] ""
+"Nota: Alguns branches fora da hierarquia refs/remotes/ não foram removidos;\n"
+"para excluí-los, use:"
+
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr "Não foi possível remover a seção de configuração '%s'"
+
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr " novo (o próximo fetch armazenará em remotes/%s)"
+
+msgid " tracked"
+msgstr " rastreado"
+
+msgid " skipped"
+msgstr " ignorado"
+
+msgid " stale (use 'git remote prune' to remove)"
+msgstr " obsoleto (use 'git remote prune' para remover)"
+
+msgid " ???"
+msgstr " ???"
+
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgstr "branch.%s.merge inválido; não é possível fazer rebase sobre > 1 branch"
+
+#, c-format
+msgid "rebases interactively onto remote %s"
+msgstr "faz rebase interativamente sobre o remoto %s"
+
+#, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr "faz rebase interativamente (com merges) sobre o remoto %s"
+
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "faz rebase sobre o remoto %s"
+
+#, c-format
+msgid " merges with remote %s"
+msgstr " faz merge com o remote %s"
+
+#, c-format
+msgid "merges with remote %s"
+msgstr "faz merge com o remoto %s"
+
+#, c-format
+msgid "%-*s    and with remote %s\n"
+msgstr "%-*s    e com o remote %s\n"
+
+msgid "create"
+msgstr "criar"
+
+msgid "delete"
+msgstr "excluir"
+
+msgid "up to date"
+msgstr "atualizado"
+
+msgid "fast-forwardable"
+msgstr "passível de fast-forward"
+
+msgid "local out of date"
+msgstr "local desatualizado"
+
+#, c-format
+msgid "    %-*s forces to %-*s (%s)"
+msgstr "    %-*s força para %-*s (%s)"
+
+#, c-format
+msgid "    %-*s pushes to %-*s (%s)"
+msgstr "    %-*s faz push para %-*s (%s)"
+
+#, c-format
+msgid "    %-*s forces to %s"
+msgstr "    %-*s força para %s"
+
+#, c-format
+msgid "    %-*s pushes to %s"
+msgstr "    %-*s faz push para %s"
+
+msgid "do not query remotes"
+msgstr "não consultar remotos"
+
+#, c-format
+msgid "* remote %s"
+msgstr "* remoto %s"
+
+#, c-format
+msgid "  Fetch URL: %s"
+msgstr "  URL de Fetch: %s"
+
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#, c-format
+msgid "  Push  URL: %s"
+msgstr "  URL de Push: %s"
+
+msgid "(no URL)"
+msgstr "(nenhuma URL)"
+
+#, c-format
+msgid "  HEAD branch: %s"
+msgstr "  branch HEAD: %s"
+
+msgid "(not queried)"
+msgstr "(não consultado)"
+
+msgid "(unknown)"
+msgstr "(desconhecido)"
+
+#, c-format
+msgid ""
+"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr "  branch HEAD (HEAD do remote é ambíguo, pode ser um dos seguintes):\n"
+
+#, c-format
+msgid "  Remote branch:%s"
+msgid_plural "  Remote branches:%s"
+msgstr[0] "  Branch remoto:%s"
+msgstr[1] "  Branches remotos:%s"
+
+msgid " (status not queried)"
+msgstr " (status não consultado)"
+
+msgid "  Local branch configured for 'git pull':"
+msgid_plural "  Local branches configured for 'git pull':"
+msgstr[0] "  Branch local configurado para 'git pull':"
+msgstr[1] "  Branches locais configurados para 'git pull':"
+
+msgid "  Local refs will be mirrored by 'git push'"
+msgstr "  As refs locais serão espelhadas por 'git push'"
+
+#, c-format
+msgid "  Local ref configured for 'git push'%s:"
+msgid_plural "  Local refs configured for 'git push'%s:"
+msgstr[0] "  Ref local configurada para 'git push'%s:"
+msgstr[1] "  Refs locais configuradas para 'git push'%s:"
+
+#, c-format
+msgid "'%s/HEAD' is unchanged and points to '%s'\n"
+msgstr "'%s/HEAD' não foi modificado e aponta para '%s'\n"
+
+#, c-format
+msgid "'%s/HEAD' has changed from '%s' and now points to '%s'\n"
+msgstr "'%s/HEAD' mudou de '%s' e agora aponta para '%s'\n"
+
+#, c-format
+msgid "'%s/HEAD' is now created and points to '%s'\n"
+msgstr "'%s/HEAD' agora foi criado e aponta para '%s'\n"
+
+#, c-format
+msgid "'%s/HEAD' was detached at '%s' and now points to '%s'\n"
+msgstr "'%s/HEAD' foi desanexado em '%s' e agora aponta para '%s'\n"
+
+#, c-format
+msgid ""
+"'%s/HEAD' used to point to '%s' (which is not a remote branch), but now "
+"points to '%s'\n"
+msgstr ""
+"'%s/HEAD' apontava para '%s' (que não é um branch remoto), mas agora aponta "
+"para '%s'\n"
+
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr "definir refs/remotes/<name>/HEAD de acordo com o remoto"
+
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr "excluir refs/remotes/<name>/HEAD"
+
+msgid "Cannot determine remote HEAD"
+msgstr "Não é possível determinar o HEAD do remoto"
+
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr "Vários branches HEAD do remoto. Escolha um explicitamente com:"
+
+#, c-format
+msgid "Could not delete %s"
+msgstr "Não foi possível excluir %s"
+
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr "referência inválida: %s"
+
+#, c-format
+msgid "Could not set up %s"
+msgstr "Não foi possível configurar %s"
+
+#, c-format
+msgid "Pruning %s"
+msgstr "Removendo %s"
+
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#, c-format
+msgid " * [would prune] %s"
+msgstr " * [removeria] %s"
+
+#, c-format
+msgid " * [pruned] %s"
+msgstr " * [removido] %s"
+
+msgid "prune remotes after fetching"
+msgstr "podar remotos após o fetch"
+
+#, c-format
+msgid "No such remote '%s'"
+msgstr "Remoto '%s' inexistente"
+
+msgid "add branch"
+msgstr "adicionar branch"
+
+msgid "no remote specified"
+msgstr "nenhum remoto especificado"
+
+msgid "query push URLs rather than fetch URLs"
+msgstr "consultar URLs de push em vez de URLs de fetch"
+
+msgid "return all URLs"
+msgstr "retornar todas as URLs"
+
+msgid "manipulate push URLs"
+msgstr "manipular URLs de push"
+
+msgid "add URL"
+msgstr "adicionar URL"
+
+msgid "delete URLs"
+msgstr "excluir URLs"
+
+msgid "--add --delete doesn't make sense"
+msgstr "--add --delete não faz sentido"
+
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr "Padrão de URL antigo inválido: %s"
+
+#, c-format
+msgid "No such URL found: %s"
+msgstr "Nenhuma URL encontrada: %s"
+
+msgid "Will not delete all non-push URLs"
+msgstr "Não excluirei todas as URLs que não são de push"
+
+msgid "be verbose; must be placed before a subcommand"
+msgstr "ser verboso; deve ser colocado antes de um subcomando"
+
+msgid ""
+"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
+"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
+"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]\n"
+"[--filter=<filter-spec>] [--drop-filtered [--dry-run]]"
+msgstr ""
+"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
+"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
+"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]\n"
+"[--filter=<filter-spec>] [--drop-filtered [--dry-run]]"
+
+msgid ""
+"Incremental repacks are incompatible with bitmap indexes.  Use\n"
+"--no-write-bitmap-index or disable the pack.writeBitmaps configuration."
+msgstr ""
+"Repacks incrementais são incompatíveis com índices de bitmap. Use\n"
+"--no-write-bitmap-index ou desative a configuração pack.writeBitmaps."
+
+#, c-format
+msgid "unknown value for %s: %s"
+msgstr "valor desconhecido para %s: %s"
+
+msgid "pack everything in a single pack"
+msgstr "empacotar tudo em um único pack"
+
+msgid "same as -a, and turn unreachable objects loose"
+msgstr "o mesmo que -a, e torna soltos os objetos inacessíveis"
+
+msgid "same as -a, pack unreachable cruft objects separately"
+msgstr "o mesmo que -a, empacota objetos cruft inacessíveis separadamente"
+
+msgid "approxidate"
+msgstr "data aproximada"
+
+msgid "with --cruft, expire objects older than this"
+msgstr "com --cruft, expirar objetos mais antigos que este"
+
+msgid "with --cruft, only repack cruft packs smaller than this"
+msgstr "com --cruft, fazer repack apenas de packs cruft menores que este"
+
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "remover packs redundantes e executar git-prune-packed"
+
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "passar --no-reuse-delta para o git-pack-objects"
+
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "passar --no-reuse-object para o git-pack-objects"
+
+msgid ""
+"specify the name hash version to use for grouping similar objects by path"
+msgstr ""
+"especificar a versão de hash de nome a usar para agrupar objetos semelhantes "
+"por caminho"
+
+msgid "pass --path-walk to git-pack-objects"
+msgstr "passar --path-walk para o git-pack-objects"
+
+msgid "do not run git-update-server-info"
+msgstr "não executar git-update-server-info"
+
+msgid "pass --local to git-pack-objects"
+msgstr "passar --local para o git-pack-objects"
+
+msgid "write bitmap index"
+msgstr "escrever índice de bitmap"
+
+msgid "pass --delta-islands to git-pack-objects"
+msgstr "passar --delta-islands para o git-pack-objects"
+
+msgid "with -A, do not loosen objects older than this"
+msgstr "com -A, não soltar objetos mais antigos que este"
+
+msgid "with -a, repack unreachable objects"
+msgstr "com -a, fazer repack de objetos inacessíveis"
+
+msgid "size of the window used for delta compression"
+msgstr "tamanho da janela usada para compressão delta"
+
+msgid "bytes"
+msgstr "bytes"
+
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr ""
+"o mesmo que acima, mas limitar o tamanho da memória em vez da contagem de "
+"entradas"
+
+msgid "limits the maximum delta depth"
+msgstr "limita a profundidade máxima de delta"
+
+msgid "limits the maximum number of threads"
+msgstr "limita o número máximo de threads"
+
+msgid "maximum size of each packfile"
+msgstr "tamanho máximo de cada packfile"
+
+msgid "repack objects in packs marked with .keep"
+msgstr "fazer repack de objetos em packs marcados com .keep"
+
+msgid "do not repack this pack"
+msgstr "não fazer repack deste pack"
+
+msgid "find a geometric progression with factor <N>"
+msgstr "encontrar uma progressão geométrica com fator <N>"
+
+msgid "write a multi-pack index of the resulting packs"
+msgstr "escrever um multi-pack index dos packs resultantes"
+
+msgid "pack prefix to store a pack containing filtered out objects"
+msgstr "prefixo de pack para armazenar um pack contendo objetos filtrados"
+
+msgid "delete filtered out objects (requires --filter)"
+msgstr "excluir os objetos descartados pelo filtro (requer --filter)"
+
+msgid "only show which objects would be dropped"
+msgstr "apenas exibir quais objetos seriam descartados"
+
+msgid "--dry-run only takes effect with --drop-filtered"
+msgstr "--dry-run só tem efeito com --drop-filtered"
+
+msgid "--drop-filtered requires --filter"
+msgstr "--drop-filtered requer --filter"
+
+msgid "--drop-filtered requires -a"
+msgstr "--drop-filtered requer -a"
+
+msgid "--drop-filtered only supports --filter=blob:limit=<n> for now"
+msgstr "--drop-filtered só suporta --filter=blob:limit=<n> por enquanto"
+
+msgid "--drop-filtered requires a promisor remote"
+msgstr "--drop-filtered requer um remoto promisor"
+
+msgid ""
+"--drop-filtered cannot be used while another operation (merge, rebase, am, "
+"cherry-pick, revert, or bisect) is in progress"
+msgstr ""
+"--drop-filtered não pode ser usado enquanto outra operação (merge, rebase, "
+"am, cherry-pick, revert ou bisect) está em andamento"
+
+#, c-format
+msgid "cannot drop '%s' (%s): it is referenced by the current index"
+msgstr ""
+"não é possível descartar '%s' (%s): ele é referenciado pelo índice atual"
+
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "não é possível excluir packs em um repositório precious-objects"
+
+#, c-format
+msgid "invalid value for %s: %d"
+msgstr "valor inválido para %s: %d"
+
+#, c-format
+msgid "option '%s' can only be used along with '%s'"
+msgstr "a opção '%s' só pode ser usada junto com '%s'"
+
+msgid "Nothing new to pack."
+msgstr "Nada novo para empacotar."
+
+msgid "git replace [-f] <object> <replacement>"
+msgstr "git replace [-f] <object> <replacement>"
+
+msgid "git replace [-f] --edit <object>"
+msgstr "git replace [-f] --edit <object>"
+
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr "git replace [-f] --graft <commit> [<parent>...]"
+
+msgid "git replace -d <object>..."
+msgstr "git replace -d <object>..."
+
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr "git replace [--format=<format>] [-l [<pattern>]]"
+
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+"formato de substituição inválido '%s'\n"
+"os formatos válidos são 'short', 'medium' e 'long'"
+
+#, c-format
+msgid "replace ref '%s' not found"
+msgstr "ref de substituição '%s' não encontrada"
+
+#, c-format
+msgid "Deleted replace ref '%s'"
+msgstr "Ref de substituição '%s' excluída"
+
+#, c-format
+msgid "'%s' is not a valid ref name"
+msgstr "'%s' não é um nome de ref válido"
+
+#, c-format
+msgid "replace ref '%s' already exists"
+msgstr "a ref de substituição '%s' já existe"
+
+#, 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 ""
+"Os objetos devem ser do mesmo tipo.\n"
+"'%s' aponta para um objeto substituído do tipo '%s'\n"
+"enquanto '%s' aponta para um objeto de substituição do tipo '%s'."
+
+#, c-format
+msgid "unable to open %s for writing"
+msgstr "não foi possível abrir %s para escrita"
+
+msgid "cat-file reported failure"
+msgstr "cat-file relatou falha"
+
+#, c-format
+msgid "unable to open %s for reading"
+msgstr "não foi possível abrir %s para leitura"
+
+msgid "unable to spawn mktree"
+msgstr "não foi possível iniciar o mktree"
+
+msgid "unable to read from mktree"
+msgstr "não foi possível ler do mktree"
+
+msgid "mktree reported failure"
+msgstr "mktree relatou falha"
+
+msgid "mktree did not return an object name"
+msgstr "mktree não retornou um nome de objeto"
+
+#, c-format
+msgid "unable to fstat %s"
+msgstr "não foi possível executar fstat em %s"
+
+msgid "unable to write object to database"
+msgstr "não foi possível gravar o objeto no banco de dados"
+
+#, c-format
+msgid "unable to get object type for %s"
+msgstr "não foi possível obter o tipo do objeto de %s"
+
+msgid "editing object file failed"
+msgstr "falha ao editar o arquivo do objeto"
+
+#, c-format
+msgid "new object is the same as the old one: '%s'"
+msgstr "o novo objeto é o mesmo que o antigo: '%s'"
+
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr "não foi possível analisar %s como um commit"
+
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr "mergetag inválida no commit '%s'"
+
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr "mergetag malformada no commit '%s'"
+
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr ""
+"o commit original '%s' contém a mergetag '%s' que é descartada; use --edit "
+"em vez de --graft"
+
+#, c-format
+msgid "the original commit '%s' has a gpg signature"
+msgstr "o commit original '%s' possui uma assinatura gpg"
+
+msgid "the signature will be removed in the replacement commit!"
+msgstr "a assinatura será removida no commit de substituição!"
+
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr "não foi possível gravar o commit de substituição para: '%s'"
+
+#, c-format
+msgid "graft for '%s' unnecessary"
+msgstr "graft para '%s' desnecessário"
+
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
+msgstr "o novo commit é o mesmo que o antigo: '%s'"
+
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+"não foi possível converter o(s) seguinte(s) graft(s):\n"
+"%s"
+
+msgid "list replace refs"
+msgstr "listar as refs de substituição"
+
+msgid "delete replace refs"
+msgstr "excluir refs de substituição"
+
+msgid "edit existing object"
+msgstr "editar objeto existente"
+
+msgid "change a commit's parents"
+msgstr "alterar os pais de um commit"
+
+msgid "convert existing graft file"
+msgstr "converter o arquivo de graft existente"
+
+msgid "replace the ref if it exists"
+msgstr "substituir a ref se ela existir"
+
+msgid "do not pretty-print contents for --edit"
+msgstr "não formatar os conteúdos (pretty-print) para --edit"
+
+msgid "use this format"
+msgstr "usar este formato"
+
+msgid "--format cannot be used when not listing"
+msgstr "--format não pode ser usado quando não se está listando"
+
+msgid "-f only makes sense when writing a replacement"
+msgstr "-f só faz sentido ao escrever uma substituição"
+
+msgid "--raw only makes sense with --edit"
+msgstr "--raw só faz sentido com --edit"
+
+msgid "-d needs at least one argument"
+msgstr "-d precisa de pelo menos um argumento"
+
+msgid "bad number of arguments"
+msgstr "número incorreto de argumentos"
+
+msgid "-e needs exactly one argument"
+msgstr "-e precisa de exatamente um argumento"
+
+msgid "-g needs at least one argument"
+msgstr "-g precisa de pelo menos um argumento"
+
+msgid "--convert-graft-file takes no argument"
+msgstr "--convert-graft-file não aceita argumentos"
+
+msgid "only one pattern can be given with -l"
+msgstr "apenas um padrão pode ser dado com -l"
+
+#, c-format
+msgid "invalid %s value: '%s'"
+msgstr "valor %s inválido: '%s'"
+
+msgid ""
+"(EXPERIMENTAL!) git replay ([--contained] --onto=<newbase> | --"
+"advance=<branch> | --revert=<branch>)\n"
+"[--ref=<ref>] [--ref-action=<mode>] [--linearize] <revision-range>"
+msgstr ""
+"(EXPERIMENTAL!) git replay ([--contained] --onto=<newbase> | --"
+"advance=<branch> | --revert=<branch>)\n"
+"[--ref=<ref>] [--ref-action=<mode>] [--linearize] <revision-range>"
+
+msgid "update all branches that point at commits in <revision-range>"
+msgstr ""
+"atualizar todos os branches que apontam para commits em <revision-range>"
+
+msgid "replay onto given commit"
+msgstr "fazer o replay no commit fornecido"
+
+msgid "make replay advance given branch"
+msgstr "fazer o replay avançar o branch fornecido"
+
+msgid "revert commits onto given branch"
+msgstr "reverter commits no branch fornecido"
+
+msgid "reference to update with result"
+msgstr "referência a ser atualizada com o resultado"
+
+msgid "control ref update behavior (update|print)"
+msgstr "controlar o comportamento de atualização de ref (update|print)"
+
+msgid "drop merge commits, replaying only non-merge commits"
+msgstr ""
+"descartar os commits de merge, reproduzindo apenas os que não são de merge"
+
+msgid "exactly one of --onto, --advance, or --revert is required"
+msgstr "exatamente um entre --onto, --advance ou --revert é necessário"
+
+#, c-format
+msgid ""
+"some rev walking options will be overridden as '%s' bit in 'struct rev_info' "
+"will be forced"
+msgstr ""
+"algumas opções de navegação de revisões (rev walking) serão substituídas "
+"pois o bit '%s' em 'struct rev_info' será forçado"
+
+msgid "unable to get common directory"
+msgstr "não foi possível obter o diretório comum"
+
+msgid "unable to get git directory"
+msgstr "não foi possível obter o diretório git"
+
+#, c-format
+msgid "key '%s' not found"
+msgstr "chave '%s' não encontrada"
+
+msgid "--keys can only be used with --format=lines or --format=nul"
+msgstr "--keys só pode ser usado com --format=lines ou --format=nul"
+
+#, c-format
+msgid "invalid format '%s'"
+msgstr "formato inválido '%s'"
+
+msgid "output format"
+msgstr "formato de saída"
+
+msgid "synonym for --format=nul"
+msgstr "sinônimo de --format=nul"
+
+msgid "print all keys/values"
+msgstr "imprimir todas as chaves/valores"
+
+msgid "show keys"
+msgstr "mostrar as chaves"
+
+msgid "--keys cannot be used with a <key> or --all"
+msgstr "--keys não pode ser usado com uma <key> ou --all"
+
+msgid "unsupported output format"
+msgstr "formato de saída não suportado"
+
+msgid "--all and <key> cannot be used together"
+msgstr "--all e <key> não podem ser usados juntos"
+
+msgid "References"
+msgstr "Referências"
+
+msgid "Count"
+msgstr "Contagem"
+
+msgid "Branches"
+msgstr "Branches"
+
+msgid "Tags"
+msgstr "Tags"
+
+msgid "Remotes"
+msgstr "Remotes"
+
+msgid "Others"
+msgstr "Outros"
+
+msgid "Reachable objects"
+msgstr "Objetos alcançáveis"
+
+msgid "Commits"
+msgstr "Commits"
+
+msgid "Trees"
+msgstr "Trees"
+
+msgid "Blobs"
+msgstr "Blobs"
+
+msgid "Inflated size"
+msgstr "Tamanho inflado"
+
+msgid "Disk size"
+msgstr "Tamanho no disco"
+
+msgid "Largest objects"
+msgstr "Maiores objetos"
+
+msgid "Maximum size"
+msgstr "Tamanho máximo"
+
+msgid "Maximum parents"
+msgstr "Máximo de pais"
+
+msgid "Maximum entries"
+msgstr "Máximo de entradas"
+
+msgid "Repository structure"
+msgstr "Estrutura do repositório"
+
+msgid "Value"
+msgstr "Valor"
+
+msgid "Counting references"
+msgstr "Contando referências"
+
+msgid ""
+"git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]"
+msgstr ""
+"git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]"
+
+msgid "register clean resolutions in index"
+msgstr "registrar resoluções limpas no índice"
+
+msgid "'git rerere forget' without paths is deprecated"
+msgstr "'git rerere forget' sem caminhos é obsoleto"
+
+#, c-format
+msgid "unable to generate diff for '%s'"
+msgstr "não foi possível gerar o diff para '%s'"
+
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+
+msgid ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+msgstr ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+
+msgid "mixed"
+msgstr "mixed"
+
+msgid "soft"
+msgstr "soft"
+
+msgid "hard"
+msgstr "hard"
+
+msgid "merge"
+msgstr "merge"
+
+msgid "keep"
+msgstr "manter"
+
+msgid "You do not have a valid HEAD."
+msgstr "Você não tem um HEAD válido."
+
+msgid "Failed to find tree of HEAD."
+msgstr "Falha ao encontrar a árvore de HEAD."
+
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr "Falha ao encontrar a árvore de %s."
+
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD está agora em %s"
+
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
+msgstr "Não é possível redefinir %s no meio de um merge."
+
+msgid "be quiet, only report errors"
+msgstr "ser silencioso, apenas reportar erros"
+
+msgid "skip refreshing the index after reset"
+msgstr "pular a atualização do índice após o reset"
+
+msgid "reset HEAD and index"
+msgstr "redefinir HEAD e índice"
+
+msgid "reset only HEAD"
+msgstr "redefinir apenas HEAD"
+
+msgid "reset HEAD, index and working tree"
+msgstr "redefinir HEAD, índice e árvore de trabalho"
+
+msgid "reset HEAD but keep local changes"
+msgstr "redefinir HEAD, mas manter as alterações locais"
+
+msgid "record only the fact that removed paths will be added later"
+msgstr ""
+"registrar apenas o fato de que os caminhos removidos serão adicionados "
+"posteriormente"
+
+#, c-format
+msgid "Failed to resolve '%s' as a valid revision."
+msgstr "Falha ao resolver '%s' como uma revisão válida."
+
+#, c-format
+msgid "Failed to resolve '%s' as a valid tree."
+msgstr "Falha ao resolver '%s' como uma árvore válida."
+
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr ""
+"--mixed com caminhos está obsoleto; use 'git reset -- <paths>' em vez disso."
+
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr "Não é possível redefinir %s com caminhos."
+
+#, c-format
+msgid "%s reset is not allowed in a bare repository"
+msgstr "o reset %s não é permitido em um repositório bare"
+
+msgid "Unstaged changes after reset:"
+msgstr "Alterações não preparadas após o reset:"
+
+#, c-format
+msgid ""
+"It took %.2f seconds to refresh the index after reset.  You can use\n"
+"'--no-refresh' to avoid this."
+msgstr ""
+"Demorou %.2f segundos para atualizar o índice após a redefinição. Você pode "
+"usar\n"
+"'--no-refresh' para evitar isso."
+
+#, c-format
+msgid "Could not reset index file to revision '%s'."
+msgstr "Não foi possível redefinir o arquivo de índice para a revisão '%s'."
+
+msgid "Could not write new index file."
+msgstr "Não foi possível gravar o novo arquivo de índice."
+
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "não foi possível obter o uso de disco de %s"
+
+msgid "--missing-only requires --missing=print or --missing=print-info"
+msgstr "--missing-only requer --missing=print ou --missing=print-info"
+
+#, c-format
+msgid "invalid value for '%s': '%s', the only allowed format is '%s'"
+msgstr "valor inválido para '%s': '%s', o único formato permitido é '%s'"
+
+msgid "-z option used with unsupported option"
+msgstr "opção -z usada com opção não suportada"
+
+msgid "rev-list does not support display of notes"
+msgstr "rev-list não suporta a exibição de notas"
+
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "contagem marcada e '%s' não podem ser usados juntos"
+
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr "git rev-parse --parseopt [<options>] -- [<args>...]"
+
+msgid "keep the `--` passed as an arg"
+msgstr "manter o `--` passado como argumento"
+
+msgid "stop parsing after the first non-option argument"
+msgstr "parar a análise após o primeiro argumento que não é uma opção"
+
+msgid "output in stuck long form"
+msgstr "saída no formato longo anexado (stuck)"
+
+msgid "premature end of input"
+msgstr "fim prematuro da entrada"
+
+msgid "no usage string given before the `--' separator"
+msgstr "nenhuma string de uso fornecida antes do separador `--'"
+
+msgid "missing opt-spec before option flags"
+msgstr "opt-spec faltando antes dos sinalizadores (flags) de opção"
+
+msgid "Needed a single revision"
+msgstr "Era necessária uma única revisão"
+
+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 [<options>] -- [<args>...]\n"
+"   ou: git rev-parse --sq-quote [<arg>...]\n"
+"   ou: git rev-parse [<options>] [<arg>...]\n"
+"\n"
+"Execute \"git rev-parse --parseopt -h\" para mais informações sobre o "
+"primeiro uso."
+
+msgid "--resolve-git-dir requires an argument"
+msgstr "--resolve-git-dir requer um argumento"
+
+#, c-format
+msgid "not a gitdir '%s'"
+msgstr "não é um gitdir '%s'"
+
+msgid "--git-path requires an argument"
+msgstr "--git-path requer um argumento"
+
+msgid "-n requires an argument"
+msgstr "-n requer um argumento"
+
+msgid "--path-format requires an argument"
+msgstr "--path-format requer um argumento"
+
+#, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "argumento desconhecido para --path-format: %s"
+
+msgid "--default requires an argument"
+msgstr "--default requer um argumento"
+
+msgid "--prefix requires an argument"
+msgstr "--prefix requer um argumento"
+
+msgid "no object format specified"
+msgstr "nenhum formato de objeto especificado"
+
+#, c-format
+msgid "unsupported object format: %s"
+msgstr "formato de objeto não suportado: %s"
+
+#, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "modo desconhecido para --abbrev-ref: %s"
+
+msgid "this operation must be run in a work tree"
+msgstr "esta operação deve ser executada em uma árvore de trabalho"
+
+msgid "Could not read the index"
+msgstr "Não foi possível ler o índice"
+
+#, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr "modo desconhecido para --show-object-format: %s"
+
+msgid ""
+"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] "
+"<commit>..."
+msgstr ""
+"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] "
+"<commit>..."
+
+msgid "git revert (--continue | --skip | --abort | --quit)"
+msgstr "git revert (--continue | --skip | --abort | --quit)"
+
+msgid ""
+"git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n"
+"                [-S[<keyid>]] <commit>..."
+msgstr ""
+"git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n"
+"                [-S[<keyid>]] <commit>..."
+
+msgid "git cherry-pick (--continue | --skip | --abort | --quit)"
+msgstr "git cherry-pick (--continue | --skip | --abort | --quit)"
+
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr "a opção `%s' espera um número maior que zero"
+
+#, c-format
+msgid "%s: %s cannot be used with %s"
+msgstr "%s: %s não pode ser usado com %s"
+
+msgid "end revert or cherry-pick sequence"
+msgstr "encerrar a sequência de revert ou cherry-pick"
+
+msgid "resume revert or cherry-pick sequence"
+msgstr "retomar a sequência de revert ou cherry-pick"
+
+msgid "cancel revert or cherry-pick sequence"
+msgstr "cancelar a sequência de revert ou cherry-pick"
+
+msgid "skip current commit and continue"
+msgstr "pular o commit atual e continuar"
+
+msgid "don't automatically commit"
+msgstr "não fazer commit automaticamente"
+
+msgid "edit the commit message"
+msgstr "editar a mensagem do commit"
+
+msgid "parent-number"
+msgstr "parent-number"
+
+msgid "select mainline parent"
+msgstr "selecionar o pai da linha principal (mainline)"
+
+msgid "merge strategy"
+msgstr "estratégia de merge"
+
+msgid "option for merge strategy"
+msgstr "opção para a estratégia de merge"
+
+msgid "append commit name"
+msgstr "anexar o nome do commit"
+
+msgid "preserve initially empty commits"
+msgstr "preservar commits inicialmente vazios"
+
+msgid "allow commits with empty messages"
+msgstr "permitir commits com mensagens vazias"
+
+msgid "deprecated: use --empty=keep instead"
+msgstr "obsoleto: use --empty=keep no lugar"
+
+msgid "use the 'reference' format to refer to commits"
+msgstr "usar o formato 'reference' para referir-se aos commits"
+
+msgid "revert failed"
+msgstr "falha no revert"
+
+msgid "cherry-pick failed"
+msgstr "cherry-pick falhou"
+
+msgid ""
+"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"       [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"       [--] [<pathspec>...]"
+msgstr ""
+"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"       [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"       [--] [<pathspec>...]"
+
+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] ""
+"o seguinte arquivo tem conteúdo preparado diferente tanto do\n"
+"arquivo quanto do HEAD:"
+msgstr[1] ""
+"os seguintes arquivos têm conteúdo preparado diferente tanto do\n"
+"arquivo quanto do HEAD:"
+
+msgid ""
+"\n"
+"(use -f to force removal)"
+msgstr ""
+"\n"
+"(use -f para forçar a remoção)"
+
+msgid "the following file has changes staged in the index:"
+msgid_plural "the following files have changes staged in the index:"
+msgstr[0] "o seguinte arquivo tem alterações preparadas no índice:"
+msgstr[1] "os seguintes arquivos têm alterações preparadas no índice:"
+
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+"\n"
+"(use --cached para manter o arquivo, ou -f para forçar a remoção)"
+
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] "o seguinte arquivo tem modificações locais:"
+msgstr[1] "os seguintes arquivos têm modificações locais:"
+
+msgid "do not list removed files"
+msgstr "não listar arquivos removidos"
+
+msgid "only remove from the index"
+msgstr "remover apenas do índice"
+
+msgid "override the up-to-date check"
+msgstr "ignorar a verificação de atualização"
+
+msgid "allow recursive removal"
+msgstr "permitir remoção recursiva"
+
+msgid "exit with a zero status even if nothing matched"
+msgstr "sair com status zero mesmo que nada tenha correspondido"
+
+msgid "No pathspec was given. Which files should I remove?"
+msgstr "Nenhum pathspec foi fornecido. Quais arquivos devo remover?"
+
+msgid "please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+"por favor, prepare suas alterações no .gitmodules ou faça um stash delas "
+"para prosseguir"
+
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr "não removendo '%s' recursivamente sem -r"
+
+#, c-format
+msgid "git rm: unable to remove %s"
+msgstr "git rm: não foi possível remover %s"
+
+msgid ""
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+"              [--receive-pack=<git-receive-pack>]\n"
+"              [--verbose] [--thin] [--atomic]\n"
+"              [--[no-]signed | --signed=(true|false|if-asked)]\n"
+"              [<host>:]<directory> (--all | <ref>...)"
+msgstr ""
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+"              [--receive-pack=<git-receive-pack>]\n"
+"              [--verbose] [--thin] [--atomic]\n"
+"              [--[no-]signed | --signed=(true|false|if-asked)]\n"
+"              [<host>:]<directory> (--all | <ref>...)"
+
+msgid "remote name"
+msgstr "nome do remoto"
+
+msgid "push all refs"
+msgstr "fazer push de todas as refs"
+
+msgid "use stateless RPC protocol"
+msgstr "usar protocolo RPC sem estado"
+
+msgid "read refs from stdin"
+msgstr "ler refs do stdin"
+
+msgid "print status from remote helper"
+msgstr "imprimir status do auxiliar remoto"
+
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
+
+msgid "git log --pretty=short | git shortlog [<options>]"
+msgstr "git log --pretty=short | git shortlog [<options>]"
+
+msgid "using multiple --group options with stdin is not supported"
+msgstr "o uso de múltiplas opções --group com stdin não é suportado"
+
+#, c-format
+msgid "using %s with stdin is not supported"
+msgstr "o uso de %s com stdin não é suportado"
+
+#, c-format
+msgid "unknown group type: %s"
+msgstr "tipo de grupo desconhecido: %s"
+
+msgid "group by committer rather than author"
+msgstr "agrupar por committer em vez de autor"
+
+msgid "sort output according to the number of commits per author"
+msgstr "ordenar saída de acordo com o número de commits por autor"
+
+msgid "suppress commit descriptions, only provides commit count"
+msgstr "suprimir descrições de commit, fornecer apenas a contagem de commits"
+
+msgid "show the email address of each author"
+msgstr "mostrar o endereço de e-mail de cada autor"
+
+msgid "<w>[,<i1>[,<i2>]]"
+msgstr "<w>[,<i1>[,<i2>]]"
+
+msgid "linewrap output"
+msgstr "quebrar linhas na saída"
+
+msgid "field"
+msgstr "campo"
+
+msgid "group by field"
+msgstr "agrupar por campo"
+
+msgid "too many arguments given outside repository"
+msgstr "muitos argumentos fornecidos fora do repositório"
+
+msgid ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics]\n"
+"                [(<rev> | <glob>)...]"
+msgstr ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics]\n"
+"                [(<rev> | <glob>)...]"
+
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+
+#, c-format
+msgid "ignoring %s; cannot handle more than %d ref"
+msgid_plural "ignoring %s; cannot handle more than %d refs"
+msgstr[0] "ignorando %s; não é possível lidar com mais de %d ref"
+msgstr[1] "ignorando %s; não é possível lidar com mais de %d refs"
+
+#, c-format
+msgid "no matching refs with %s"
+msgstr "nenhuma ref correspondente com %s"
+
+msgid "show remote-tracking and local branches"
+msgstr "mostrar branches de rastreamento remoto e branches locais"
+
+msgid "show remote-tracking branches"
+msgstr "mostrar branches de rastreamento remoto"
+
+msgid "color '*!+-' corresponding to the branch"
+msgstr "colorir '*!+-' correspondendo ao branch"
+
+msgid "show <n> more commits after the common ancestor"
+msgstr "mostrar mais <n> commits após o ancestral comum"
+
+msgid "synonym to more=-1"
+msgstr "sinônimo para more=-1"
+
+msgid "suppress naming strings"
+msgstr "suprimir strings de nomeação"
+
+msgid "include the current branch"
+msgstr "incluir o branch atual"
+
+msgid "name commits with their object names"
+msgstr "nomear commits com seus nomes de objeto"
+
+msgid "show possible merge bases"
+msgstr "mostrar possíveis bases de merge"
+
+msgid "show refs unreachable from any other ref"
+msgstr "mostrar refs inalcançáveis a partir de qualquer outra ref"
+
+msgid "show commits in topological order"
+msgstr "mostrar commits em ordem topológica"
+
+msgid "show only commits not on the first branch"
+msgstr "mostrar apenas commits que não estão no primeiro branch"
+
+msgid "show merges reachable from only one tip"
+msgstr "mostrar merges alcançáveis a partir de apenas uma ponta"
+
+msgid "topologically sort, maintaining date order where possible"
+msgstr "ordenar topologicamente, mantendo a ordem de data onde possível"
+
+msgid "<n>[,<base>]"
+msgstr "<n>[,<base>]"
+
+msgid "show <n> most recent ref-log entries starting at base"
+msgstr "mostrar as <n> entradas mais recentes do ref-log começando na base"
+
+msgid "no branches given, and HEAD is not valid"
+msgstr "nenhum branch fornecido, e o HEAD não é válido"
+
+msgid "--reflog option needs one branch name"
+msgstr "a opção --reflog precisa de um nome de branch"
+
+#, 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] "apenas %d entrada pode ser exibida por vez."
+msgstr[1] "apenas %d entradas podem ser exibidas por vez."
+
+#, c-format
+msgid "no such ref %s"
+msgstr "não há ref %s"
+
+#, c-format
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
+msgstr[0] "não é possível lidar com mais de %d rev."
+msgstr[1] "não é possível lidar com mais de %d revs."
+
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "'%s' não é uma ref válida."
+
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "não é possível encontrar o commit %s (%s)"
+
+msgid "hash-algorithm"
+msgstr "hash-algorithm"
+
+msgid "Unknown hash algorithm"
+msgstr "Algoritmo de hash desconhecido"
+
+msgid "assuming SHA-1; use --object-format to override"
+msgstr "assumindo SHA-1; use --object-format para substituir"
+
+msgid "unable to read header"
+msgstr "não foi possível ler o cabeçalho"
+
+msgid "unknown index version"
+msgstr "versão de índice desconhecida"
+
+msgid "corrupt index file"
+msgstr "arquivo de índice corrompido"
+
+#, c-format
+msgid "unable to read entry %u/%u"
+msgstr "não foi possível ler a entrada %u/%u"
+
+#, c-format
+msgid "unable to read sha1 %u/%u"
+msgstr "não foi possível ler o sha1 %u/%u"
+
+#, c-format
+msgid "unable to read crc %u/%u"
+msgstr "não foi possível ler o crc %u/%u"
+
+#, c-format
+msgid "unable to read 32b offset %u/%u"
+msgstr "não foi possível ler o deslocamento de 32b %u/%u"
+
+msgid "inconsistent 64b offset index"
+msgstr "índice de deslocamento de 64b inconsistente"
+
+#, c-format
+msgid "unable to read 64b offset %u"
+msgstr "não foi possível ler o deslocamento de 64b %u"
+
+msgid ""
+"git show-ref [--head] [-d | --dereference]\n"
+"             [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n"
+"             [--] [<pattern>...]"
+msgstr ""
+"git show-ref [--head] [-d | --dereference]\n"
+"             [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n"
+"             [--] [<pattern>...]"
+
+msgid ""
+"git show-ref --verify [-q | --quiet] [-d | --dereference]\n"
+"             [-s | --hash[=<n>]] [--abbrev[=<n>]]\n"
+"             [--] [<ref>...]"
+msgstr ""
+"git show-ref --verify [-q | --quiet] [-d | --dereference]\n"
+"             [-s | --hash[=<n>]] [--abbrev[=<n>]]\n"
+"             [--] [<ref>...]"
+
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<pattern>]"
+
+msgid "git show-ref --exists <ref>"
+msgstr "git show-ref --exists <ref>"
+
+msgid "only show tags (can be combined with --branches)"
+msgstr "mostrar apenas tags (pode ser combinado com --branches)"
+
+msgid "only show branches (can be combined with --tags)"
+msgstr "mostrar apenas branches (pode ser combinado com --tags)"
+
+msgid "check for reference existence without resolving"
+msgstr "verificar a existência da referência sem resolver"
+
+msgid "stricter reference checking, requires exact ref path"
+msgstr "verificação de referência mais rigorosa, requer caminho de ref exato"
+
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr "mostrar a referência HEAD, mesmo se for filtrada"
+
+msgid "dereference tags into object IDs"
+msgstr "desreferenciar tags para IDs de objeto"
+
+msgid "only show SHA1 hash using <n> digits"
+msgstr "mostrar apenas o hash SHA1 usando <n> dígitos"
+
+msgid "do not print results to stdout (useful with --verify)"
+msgstr "não imprimir os resultados na saída padrão (útil com --verify)"
+
+msgid "show refs from stdin that aren't in local repository"
+msgstr "mostrar refs do stdin que não estão no repositório local"
+
+msgid ""
+"git sparse-checkout (init | list | set | add | reapply | disable | check-"
+"rules | clean) [<options>]"
+msgstr ""
+"git sparse-checkout (init | list | set | add | reapply | disable | check-"
+"rules | clean) [<options>]"
+
+msgid "this worktree is not sparse"
+msgstr "esta worktree não é esparsa"
+
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr ""
+"esta worktree não é esparsa (o arquivo sparse-checkout pode não existir)"
+
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"o diretório '%s' contém arquivos não rastreados, mas não está no cone de "
+"sparse-checkout"
+
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "falha ao remover o diretório '%s'"
+
+msgid "failed to create directory for sparse-checkout file"
+msgstr "falha ao criar o diretório para o arquivo de sparse-checkout"
+
+#, c-format
+msgid "unable to fdopen %s"
+msgstr "não foi possível executar fdopen em %s"
+
+msgid "failed to initialize worktree config"
+msgstr "falha ao inicializar a configuração da worktree"
+
+msgid "failed to modify sparse-index config"
+msgstr "falha ao modificar a configuração do sparse-index"
+
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "inicializar o sparse-checkout no modo cone"
+
+msgid "toggle the use of a sparse index"
+msgstr "alternar o uso de um índice esparso"
+
+#, c-format
+msgid "failed to open '%s'"
+msgstr "falha ao abrir '%s'"
+
+#, c-format
+msgid "could not normalize path %s"
+msgstr "não foi possível normalizar o caminho %s"
+
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "não foi possível remover as aspas da string estilo C '%s'"
+
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "não foi possível carregar os padrões de sparse-checkout existentes"
+
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr "os padrões de sparse-checkout existentes não usam modo cone"
+
+msgid "please run from the toplevel directory in non-cone mode"
+msgstr ""
+"por favor, execute a partir do diretório de nível superior em modo não cone"
+
+msgid "specify directories rather than patterns (no leading slash)"
+msgstr "especificar diretórios em vez de padrões (sem barra inicial)"
+
+msgid ""
+"specify directories rather than patterns.  If your directory starts with a "
+"'!', pass --skip-checks"
+msgstr ""
+"especificar diretórios em vez de padrões. Se o seu diretório começar com um "
+"'!', passe --skip-checks"
+
+msgid ""
+"specify directories rather than patterns.  If your directory really has any "
+"of '*?[]\\' in it, pass --skip-checks"
+msgstr ""
+"especificar diretórios em vez de padrões. Se o seu diretório realmente tiver "
+"qualquer um de '*?[]\\' nele, passe --skip-checks"
+
+#, c-format
+msgid ""
+"'%s' is not a directory; to treat it as a directory anyway, rerun with --"
+"skip-checks"
+msgstr ""
+"'%s' não é um diretório; para tratá-lo como um diretório de qualquer "
+"maneira, execute novamente com --skip-checks"
+
+#, c-format
+msgid ""
+"pass a leading slash before paths such as '%s' if you want a single file "
+"(see NON-CONE PROBLEMS in the git-sparse-checkout manual)."
+msgstr ""
+"passe uma barra inicial antes de caminhos como '%s' se você quiser um único "
+"arquivo (consulte NON-CONE PROBLEMS no manual do git-sparse-checkout)."
+
+msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
+msgstr "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
+
+msgid ""
+"skip some sanity checks on the given paths that might give false positives"
+msgstr ""
+"ignorar algumas verificações de sanidade nos caminhos fornecidos que podem "
+"dar falsos positivos"
+
+msgid "read patterns from standard in"
+msgstr "ler padrões da entrada padrão"
+
+msgid "no sparse-checkout to add to"
+msgstr "nenhum sparse-checkout para adicionar"
+
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patterns>)"
+
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr "deve estar em um sparse-checkout para reaplicar padrões de esparsidade"
+
+msgid "report each affected file, not just directories"
+msgstr "relatar cada arquivo afetado, não apenas diretórios"
+
+msgid "must be in a sparse-checkout to clean directories"
+msgstr "deve estar em um sparse-checkout para limpar diretórios"
+
+msgid "must be in a cone-mode sparse-checkout to clean directories"
+msgstr "deve estar em um sparse-checkout de modo cone para limpar diretórios"
+
+msgid "for safety, refusing to clean without one of --force or --dry-run"
+msgstr "por segurança, recusando-se a limpar sem um entre --force ou --dry-run"
+
+msgid "failed to read index"
+msgstr "falha ao ler o índice"
+
+msgid ""
+"failed to convert index to a sparse index; resolve merge conflicts and try "
+"again"
+msgstr ""
+"falha ao converter o índice em um índice esparso; resolva os conflitos de "
+"merge e tente novamente"
+
+#, c-format
+msgid "failed to remove '%s'"
+msgstr "falha ao remover '%s'"
+
+msgid "error while refreshing working directory"
+msgstr "erro ao atualizar o diretório de trabalho"
+
+msgid ""
+"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-"
+"file <file>]"
+msgstr ""
+"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-"
+"file <file>]"
+
+msgid "terminate input and output files by a NUL character"
+msgstr "terminar arquivos de entrada e saída com um caractere NUL"
+
+msgid "when used with --rules-file interpret patterns as cone mode patterns"
+msgstr ""
+"quando usado com --rules-file, interpretar os padrões como padrões de modo "
+"cone"
+
+msgid "use patterns in <file> instead of the current ones."
+msgstr "usar os padrões em <file> em vez dos atuais."
+
+msgid "git stash list [<log-options>]"
+msgstr "git stash list [<log-options>]"
+
+msgid ""
+"git stash show [-u | --include-untracked | --only-untracked] [<diff-"
+"options>] [<stash>]"
+msgstr ""
+"git stash show [-u | --include-untracked | --only-untracked] [<diff-"
+"options>] [<stash>]"
+
+msgid "git stash drop [-q | --quiet] [<stash>]"
+msgstr "git stash drop [-q | --quiet] [<stash>]"
+
+msgid "git stash pop [--index] [-q | --quiet] [<stash>]"
+msgstr "git stash pop [--index] [-q | --quiet] [<stash>]"
+
+msgid ""
+"git stash apply [--index] [-q | --quiet] [--label-ours=<label>] [--label-"
+"theirs=<label>] [--label-base=<label>] [<stash>]"
+msgstr ""
+"git stash apply [--index] [-q | --quiet] [--label-ours=<label>] [--label-"
+"theirs=<label>] [--label-base=<label>] [<stash>]"
+
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git stash branch <branchname> [<stash>]"
+
+msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>"
+msgstr "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>"
+
+msgid ""
+"git stash [push] [-p | --patch] [-S | --staged] [-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] [-S | --staged] [-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>...]"
+
+msgid ""
+"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | "
+"--quiet]\n"
+"          [-u | --include-untracked] [-a | --all] [<message>]"
+msgstr ""
+"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | "
+"--quiet]\n"
+"          [-u | --include-untracked] [-a | --all] [<message>]"
+
+msgid "git stash create [<message>]"
+msgstr "git stash create [<message>]"
+
+msgid "git stash export (--print | --to-ref <ref>) [<stash>...]"
+msgstr "git stash export (--print | --to-ref <ref>) [<stash>...]"
+
+msgid "git stash import <commit>"
+msgstr "git stash import <commit>"
+
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "'%s' não é um commit no formato de stash"
+
+msgid "No stash entries found."
+msgstr "Nenhuma entrada de stash encontrada."
+
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr "Muitas revisões especificadas:%s"
+
+#, c-format
+msgid "%s is not a valid reference"
+msgstr "%s não é uma referência válida"
+
+msgid "git stash clear with arguments is unimplemented"
+msgstr "git stash clear com argumentos não está implementado"
+
+#, c-format
+msgid ""
+"WARNING: Untracked file in way of tracked file!  Renaming\n"
+"            %s -> %s\n"
+"         to make room.\n"
+msgstr ""
+"AVISO: Arquivo não rastreado no caminho de arquivo rastreado! Renomeando\n"
+"            %s -> %s\n"
+"         para abrir espaço.\n"
+
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "não é possível aplicar um stash no meio de um merge"
+
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr "não foi possível gerar o diff %s^!."
+
+msgid "conflicts in index. Try without --index."
+msgstr "conflitos no índice. Tente sem --index."
+
+msgid "could not save index tree"
+msgstr "não foi possível salvar a tree do índice"
+
+#, c-format
+msgid "Merging %s with %s"
+msgstr "Fazendo merge de %s com %s"
+
+msgid "Index was not unstashed."
+msgstr "O índice não foi retirado do stash."
+
+msgid "could not restore untracked files from stash"
+msgstr "não foi possível restaurar os arquivos não rastreados do stash"
+
+msgid "attempt to recreate the index"
+msgstr "tentar recriar o índice"
+
+msgid "label"
+msgstr "rótulo"
+
+msgid "label for the upstream side in conflict markers"
+msgstr "rótulo para o lado upstream em marcadores de conflito"
+
+msgid "label for the stashed side in conflict markers"
+msgstr "rótulo para o lado no stash nos marcadores de conflito"
+
+msgid "label for the base in diff3 conflict markers"
+msgstr "rótulo para a base nos marcadores de conflito diff3"
+
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr "Descartado %s (%s)"
+
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "%s: Não foi possível descartar a entrada de stash"
+
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr "'%s' não é uma referência de stash"
+
+msgid "The stash entry is kept in case you need it again."
+msgstr "A entrada de stash é mantida caso você precise dela novamente."
+
+msgid "No branch name specified"
+msgstr "Nenhum nome de branch especificado"
+
+msgid "failed to parse tree"
+msgstr "falha ao analisar a tree"
+
+msgid "failed to unpack trees"
+msgstr "falha ao descompactar as trees"
+
+msgid "include untracked files in the stash"
+msgstr "incluir arquivos não rastreados no stash"
+
+msgid "only show untracked files in the stash"
+msgstr "mostrar apenas arquivos não rastreados no stash"
+
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr "Não é possível atualizar %s com %s"
+
+msgid "stash message"
+msgstr "mensagem de stash"
+
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "\"git stash store\" requer um argumento <commit>"
+
+msgid "No staged changes"
+msgstr "Nenhuma alteração no stage"
+
+msgid "No changes selected"
+msgstr "Nenhuma alteração selecionada"
+
+msgid "You do not have the initial commit yet"
+msgstr "Você ainda não tem o commit inicial"
+
+msgid "Cannot save the current index state"
+msgstr "Não é possível salvar o estado atual do índice"
+
+msgid "Cannot save the untracked files"
+msgstr "Não é possível salvar os arquivos não rastreados"
+
+msgid "Cannot save the current worktree state"
+msgstr "Não é possível salvar o estado atual da worktree"
+
+msgid "Cannot save the current staged state"
+msgstr "Não é possível salvar o estado atual do stage"
+
+msgid "Cannot record working tree state"
+msgstr "Não é possível registrar o estado da árvore de trabalho"
+
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr ""
+"Não é possível usar --patch e --include-untracked ou --all ao mesmo tempo"
+
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr ""
+"Não é possível usar --staged e --include-untracked ou --all ao mesmo tempo"
+
+msgid "Did you forget to 'git add'?"
+msgstr "Você esqueceu de usar 'git add'?"
+
+msgid "No local changes to save"
+msgstr "Nenhuma alteração local para salvar"
+
+msgid "Cannot initialize stash"
+msgstr "Não é possível inicializar o stash"
+
+msgid "Cannot save the current status"
+msgstr "Não é possível salvar o status atual"
+
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr "Estado do diretório de trabalho e do índice salvo %s"
+
+msgid "Cannot remove worktree changes"
+msgstr "Não é possível remover as alterações da worktree"
+
+msgid "keep index"
+msgstr "manter o índice"
+
+msgid "stash staged changes only"
+msgstr "fazer stash apenas de alterações preparadas"
+
+msgid "stash in patch mode"
+msgstr "fazer stash em modo patch"
+
+msgid "quiet mode"
+msgstr "modo silencioso"
+
+msgid "include untracked files in stash"
+msgstr "incluir arquivos não rastreados no stash"
+
+msgid "include ignore files"
+msgstr "incluir arquivos de ignore"
+
+#, c-format
+msgid "cannot parse commit %s"
+msgstr "não foi possível analisar o commit %s"
+
+#, c-format
+msgid "invalid author or committer for %s"
+msgstr "autor ou committer inválido para %s"
+
+msgid "could not write commit"
+msgstr "não foi possível gravar o commit"
+
+#, c-format
+msgid "not a valid revision: %s"
+msgstr "não é uma revisão válida: %s"
+
+#, c-format
+msgid "not a commit: %s"
+msgstr "não é um commit: %s"
+
+#, c-format
+msgid "%s is not a valid exported stash commit"
+msgstr "%s não é um commit de stash exportado válido"
+
+#, c-format
+msgid "found root commit %s with invalid data"
+msgstr "encontrado commit raiz %s com dados inválidos"
+
+#, c-format
+msgid "found stash commit %s without expected prefix"
+msgstr "encontrado commit de stash %s sem o prefixo esperado"
+
+#, c-format
+msgid "cannot parse parents of commit: %s"
+msgstr "não é possível analisar os pais do commit: %s"
+
+#, c-format
+msgid "%s does not look like a stash commit"
+msgstr "%s não parece ser um commit de stash"
+
+#, c-format
+msgid "cannot read commit buffer for %s"
+msgstr "não é possível ler o buffer do commit para %s"
+
+#, c-format
+msgid "cannot save the stash for %s"
+msgstr "não é possível salvar o stash para %s"
+
+msgid "unable to write base commit"
+msgstr "não foi possível gravar o commit base"
+
+#, c-format
+msgid "unable to find stash entry %s"
+msgstr "não foi possível encontrar a entrada de stash %s"
+
+msgid "print the object ID instead of writing it to a ref"
+msgstr "imprimir o ID do objeto em vez de gravá-lo em uma ref"
+
+msgid "save the data to the given ref"
+msgstr "salvar os dados na ref fornecida"
+
+msgid "exactly one of --print and --to-ref is required"
+msgstr "exatamente um entre --print e --to-ref é necessário"
+
+msgid "skip and remove all lines starting with comment character"
+msgstr ""
+"ignorar e remover todas as linhas que começam com caractere de comentário"
+
+msgid "prepend comment character and space to each line"
+msgstr "preceder cada linha com um caractere de comentário e espaço"
+
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"não foi possível procurar a configuração '%s'. Assumindo que este "
+"repositório é seu próprio upstream autoritário."
+
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr ""
+"não foi possível obter um identificador de repositório para o submódulo '%s'"
+
+msgid "git submodule--helper get-default-remote <path>"
+msgstr "git submodule--helper get-default-remote <path>"
+
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "Nenhuma URL encontrada para o caminho de submódulo '%s' em .gitmodules"
+
+#, c-format
+msgid "Entering '%s'\n"
+msgstr "Entrando em '%s'\n"
+
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+"run_command retornou status não-zero para %s\n"
+"."
+
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+"run_command retornou status não-zero durante recursão nos submódulos "
+"aninhados de %s\n"
+"."
+
+msgid "suppress output of entering each submodule command"
+msgstr "suprimir saída de entrada em cada comando de submódulo"
+
+msgid "recurse into nested submodules"
+msgstr "entrar recursivamente em submódulos aninhados"
+
+msgid "git submodule foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule foreach [--quiet] [--recursive] [--] <command>"
+
+#, c-format
+msgid ""
+"failed to set a valid default config for 'submodule.%s.gitdir'. Please "
+"ensure it is set, for example by running something like: 'git config "
+"submodule.%s.gitdir .git/modules/%s'"
+msgstr ""
+"falha ao definir uma configuração padrão válida para 'submodule.%s.gitdir'. "
+"Por favor, certifique-se de que esteja definida, por exemplo, executando "
+"algo como: 'git config submodule.%s.gitdir .git/modules/%s'"
+
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "Falha ao registrar a url para o caminho do submódulo '%s'"
+
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "Submódulo '%s' (%s) registrado para o caminho '%s'\n"
+
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr "aviso: modo de atualização de comando sugerido para o submódulo '%s'\n"
+
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr ""
+"Falha ao registrar o modo de atualização para o caminho do submódulo '%s'"
+
+msgid "suppress output for initializing a submodule"
+msgstr "suprimir saída para inicialização de um submódulo"
+
+msgid "git submodule init [<options>] [<path>]"
+msgstr "git submodule init [<options>] [<path>]"
+
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr ""
+"nenhum mapeamento de submódulo encontrado em .gitmodules para o caminho '%s'"
+
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr "não foi possível resolver a ref HEAD dentro do submódulo '%s'"
+
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "falha ao entrar recursivamente no submódulo '%s'"
+
+msgid "suppress submodule status output"
+msgstr "suprimir saída de status do submódulo"
+
+msgid ""
+"use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr ""
+"usar commit armazenado no índice em vez do armazenado no HEAD do submódulo"
+
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+
+#, c-format
+msgid "* %s %s(blob)->%s(submodule)"
+msgstr "* %s %s(blob)->%s(submódulo)"
+
+#, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr "* %s %s(submódulo)->%s(blob)"
+
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#, c-format
+msgid "couldn't hash object from '%s'"
+msgstr "não foi possível calcular o hash do objeto de '%s'"
+
+#, c-format
+msgid "unexpected mode %o"
+msgstr "modo inesperado %o"
+
+msgid "use the commit stored in the index instead of the submodule HEAD"
+msgstr "usar o commit armazenado no índice em vez do HEAD do submódulo"
+
+msgid "compare the commit in the index with that in the submodule HEAD"
+msgstr "comparar o commit no índice com o do HEAD do submódulo"
+
+msgid "skip submodules with 'ignore_config' value set to 'all'"
+msgstr "ignorar submódulos com o valor 'ignore_config' definido como 'all'"
+
+msgid "limit the summary size"
+msgstr "limitar o tamanho do resumo"
+
+msgid "git submodule summary [<options>] [<commit>] [--] [<path>]"
+msgstr "git submodule summary [<options>] [<commit>] [--] [<path>]"
+
+msgid "could not fetch a revision for HEAD"
+msgstr "não foi possível fazer fetch de uma revisão para o HEAD"
+
+msgid "git submodule--helper gitdir <name>"
+msgstr "git submodule--helper gitdir <name>"
+
+msgid ""
+"could not set core.repositoryformatversion to 1.\n"
+"Please set it for migration to work, for example:\n"
+"git config core.repositoryformatversion 1"
+msgstr ""
+"não foi possível definir core.repositoryformatversion como 1.\n"
+"Por favor, defina-o para que a migração funcione, por exemplo:\n"
+"git config core.repositoryformatversion 1"
+
+msgid ""
+"could not enable submodulePathConfig extension. It is required\n"
+"for migration to work. Please enable it in the root repo:\n"
+"git config extensions.submodulePathConfig true"
+msgstr ""
+"não foi possível habilitar a extensão submodulePathConfig. Ela é necessária\n"
+"para que a migração funcione. Por favor, habilite-a no repositório raiz:\n"
+"git config extensions.submodulePathConfig true"
+
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "Sincronizando URL do submódulo para '%s'\n"
+
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "falha ao registrar a url para o caminho do submódulo '%s'"
+
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr "falha ao atualizar o remoto do submódulo '%s'"
+
+msgid "suppress output of synchronizing submodule url"
+msgstr "suprimir saída da sincronização da URL do submódulo"
+
+msgid "git submodule sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule sync [--quiet] [--recursive] [<path>]"
+
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
+msgstr ""
+"A árvore de trabalho do submódulo '%s' contém um diretório .git. Ele será "
+"substituído por um arquivo .git usando absorbgitdirs."
+
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+"A árvore de trabalho do submódulo '%s' contém modificações locais; use '-f' "
+"para descartá-las"
+
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "Diretório '%s' limpo\n"
+
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "Não foi possível remover a árvore de trabalho do submódulo '%s'\n"
+
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "não foi possível criar o diretório vazio de submódulo %s"
+
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr "Registro do submódulo '%s' (%s) cancelado para o caminho '%s'\n"
+
+msgid "remove submodule working trees even if they contain local changes"
+msgstr ""
+"remover árvores de trabalho de submódulos mesmo se elas contiverem mudanças "
+"locais"
+
+msgid "unregister all submodules"
+msgstr "cancelar o registro de todos os submódulos"
+
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr ""
+"Use '--all' se você realmente deseja desinicializar todos os submódulos"
+
+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 ""
+"Um alternativo calculado a partir do alternativo de um superprojeto é "
+"inválido.\n"
+"Para permitir que o Git faça clone sem um alternativo nesse caso, defina\n"
+"submodule.alternateErrorStrategy como 'info' ou, equivalentemente, faça o "
+"clone com\n"
+"'--reference-if-able' em vez de '--reference'."
+
+#, c-format
+msgid "could not get a repository handle for gitdir '%s'"
+msgstr ""
+"não foi possível obter um identificador de repositório para o gitdir '%s'"
+
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "o submódulo '%s' não pode adicionar alternate: %s"
+
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr "O valor '%s' para submodule.alternateErrorStrategy não é reconhecido"
+
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr "O valor '%s' para submodule.alternateLocation não é reconhecido"
+
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "diretório não vazio: '%s'"
+
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "falha no clone de '%s' para o caminho do submódulo '%s'"
+
+#, c-format
+msgid ""
+"refusing to create/use '%s' in another submodule's git dir. Enabling "
+"extensions.submodulePathConfig should fix this."
+msgstr ""
+"recusando-se a criar/usar '%s' no diretório git de outro submódulo. "
+"Habilitar extensions.submodulePathConfig deve corrigir isso."
+
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "não foi possível obter o diretório de submódulo para '%s'"
+
+msgid "alternative anchor for relative paths"
+msgstr "âncora alternativa para caminhos relativos"
+
+msgid "where the new submodule will be cloned to"
+msgstr "para onde o novo submódulo será clonado"
+
+msgid "name of the new submodule"
+msgstr "nome do novo submódulo"
+
+msgid "url where to clone the submodule from"
+msgstr "URL de onde clonar o submódulo"
+
+msgid "depth for shallow clones"
+msgstr "profundidade para clones rasos"
+
+msgid "force cloning progress"
+msgstr "forçar relatório de progresso do clone"
+
+msgid "disallow cloning into non-empty directory"
+msgstr "não permitir clone em diretório não vazio"
+
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
+"<filter-spec>] --url <url> --path <path>"
+msgstr ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
+"<filter-spec>] --url <url> --path <path>"
+
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
+msgstr ""
+"Modo de atualização inválido '%s' configurado para o caminho de submódulo "
+"'%s'"
+
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Caminho do submódulo '%s' não inicializado"
+
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Talvez você queira usar 'update --init'?"
+
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "Ignorando submódulo sem merge %s"
+
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "Ignorando submódulo '%s'"
+
+#, c-format
+msgid "cannot clone submodule '%s' without a URL"
+msgstr "não é possível clonar o submódulo '%s' sem uma URL"
+
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "Falha ao fazer clone de '%s'. Nova tentativa agendada"
+
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr "Falha ao fazer clone de '%s' pela segunda vez, abortando"
+
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "Não foi possível fazer checkout de '%s' no caminho do submódulo '%s'"
+
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "Não foi possível fazer rebase de '%s' no caminho do submódulo '%s'"
+
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Não foi possível fazer merge de '%s' no caminho do submódulo '%s'"
+
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "Falha na execução de '%s %s' no caminho do submódulo '%s'"
+
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Caminho do submódulo '%s': feito checkout de '%s'\n"
+
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Caminho do submódulo '%s': feito rebase em '%s'\n"
+
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Caminho do submódulo '%s': feito merge em '%s'\n"
+
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Caminho do submódulo '%s': '%s %s'\n"
+
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr ""
+"Não foi possível fazer fetch no caminho do submódulo '%s'; tentando fazer "
+"fetch direto de %s:"
+
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Feito fetch no caminho do submódulo '%s', mas não continha %s. O fetch "
+"direto desse commit falhou."
+
+#, c-format
+msgid "could not initialize submodule at path '%s'"
+msgstr "não foi possível inicializar o submódulo no caminho '%s'"
+
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+"O branch do submódulo (%s) está configurado para herdar o branch do "
+"superprojeto, mas o superprojeto não está em nenhum branch"
+
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Esperando um nome completo de ref, obteve %s"
+
+#, c-format
+msgid "Unable to find current revision in submodule path '%s'"
+msgstr ""
+"Não foi possível encontrar a revisão atual no caminho do submódulo '%s'"
+
+#, c-format
+msgid "Unable to fetch in submodule path '%s'"
+msgstr "Não foi possível fazer fetch no caminho do submódulo '%s'"
+
+#, c-format
+msgid "Unable to find %s revision in submodule path '%s'"
+msgstr "Não foi possível encontrar a revisão %s no caminho do submódulo '%s'"
+
+#, c-format
+msgid "Failed to recurse into submodule path '%s'"
+msgstr "Falha ao entrar recursivamente no caminho do submódulo '%s'"
+
+msgid "force checkout updates"
+msgstr "forçar atualizações do checkout"
+
+msgid "initialize uninitialized submodules before update"
+msgstr "inicializar submódulos não inicializados antes da atualização"
+
+msgid "use SHA-1 of submodule's remote tracking branch"
+msgstr "usar o SHA-1 do branch de rastreamento remoto do submódulo"
+
+msgid "traverse submodules recursively"
+msgstr "percorrer submódulos recursivamente"
+
+msgid "don't fetch new objects from the remote site"
+msgstr "não fazer fetch de novos objetos do site remoto"
+
+msgid "use the 'checkout' update strategy (default)"
+msgstr "usar a estratégia de atualização 'checkout' (padrão)"
+
+msgid "use the 'merge' update strategy"
+msgstr "usar a estratégia de atualização 'merge'"
+
+msgid "use the 'rebase' update strategy"
+msgstr "usar a estratégia de atualização 'rebase'"
+
+msgid "create a shallow clone truncated to the specified number of revisions"
+msgstr "criar um clone raso truncado ao número especificado de revisões"
+
+msgid "parallel jobs"
+msgstr "trabalhos paralelos"
+
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "se o clone inicial deve seguir a recomendação rasa"
+
+msgid "don't print cloning progress"
+msgstr "não imprimir o progresso do clone"
+
+msgid "disallow cloning into non-empty directory, implies --init"
+msgstr "não permitir clone em diretório não vazio, implica em --init"
+
+msgid ""
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<path>...]"
+msgstr ""
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<path>...]"
+
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Falha ao resolver o HEAD como uma ref válida."
+
+msgid "git submodule absorbgitdirs [<options>] [<path>...]"
+msgstr "git submodule absorbgitdirs [<options>] [<path>...]"
+
+msgid "suppress output for setting url of a submodule"
+msgstr "suprimir saída da configuração da URL de um submódulo"
+
+msgid "git submodule set-url [--quiet] <path> <newurl>"
+msgstr "git submodule set-url [--quiet] <path> <newurl>"
+
+msgid "set the default tracking branch to master"
+msgstr "definir o branch de rastreamento padrão como master"
+
+msgid "set the default tracking branch"
+msgstr "definir o branch de rastreamento padrão"
+
+msgid "git submodule set-branch [-q|--quiet] (-d|--default) <path>"
+msgstr "git submodule set-branch [-q|--quiet] (-d|--default) <path>"
+
+msgid "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
+msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
+
+msgid "--branch or --default required"
+msgstr "--branch ou --default é necessário"
+
+msgid "print only error messages"
+msgstr "imprimir apenas mensagens de erro"
+
+msgid "force creation"
+msgstr "forçar criação"
+
+msgid "show whether the branch would be created"
+msgstr "mostrar se o branch seria criado"
+
+msgid ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
+msgstr ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
+
+#, c-format
+msgid "creating branch '%s'"
+msgstr "criando o branch '%s'"
+
+#, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr "Adicionando repositório existente em '%s' ao índice\n"
+
+#, c-format
+msgid "'%s' already exists and is not a valid git repo"
+msgstr "'%s' já existe e não é um repositório git válido"
+
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr "Um diretório git para '%s' foi encontrado localmente com remotes:\n"
+
+#, c-format
+msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+"  %s\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 ""
+"Se você deseja reutilizar este diretório git local em vez de fazer clone "
+"novamente de\n"
+"  %s\n"
+"use a opção '--force'. Se o diretório git local não for o repositório "
+"correto\n"
+"ou você não tem certeza do que isso significa, escolha outro nome com a "
+"opção '--name'."
+
+#, c-format
+msgid "Reactivating local git directory for submodule '%s'\n"
+msgstr "Reativando o diretório git local para o submódulo '%s'\n"
+
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "não foi possível fazer checkout do submódulo '%s'"
+
+msgid "please make sure that the .gitmodules file is in the working tree"
+msgstr ""
+"por favor, certifique-se de que o arquivo .gitmodules está na árvore de "
+"trabalho"
+
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Falha ao adicionar o submódulo '%s'"
+
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Falha ao registrar o submódulo '%s'"
+
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' já existe no índice"
+
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "'%s' já existe no índice e não é um submódulo"
+
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "'%s' não tem um commit em checkout"
+
+msgid "branch of repository to add as submodule"
+msgstr "branch do repositório para adicionar como submódulo"
+
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "permitir a adição de um caminho de submódulo de outra forma ignorado"
+
+msgid "borrow the objects from reference repositories"
+msgstr "emprestar os objetos de repositórios de referência"
+
+msgid ""
+"sets the submodule's name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"define o nome do submódulo para a string fornecida em vez de usar o caminho "
+"como padrão"
+
+msgid "git submodule add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule add [<options>] [--] <repository> [<path>]"
+
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+"Caminho relativo só pode ser usado a partir do nível superior da árvore de "
+"trabalho"
+
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "URL do repositório: '%s' deve ser absoluta ou começar com ./|../"
+
+#, c-format
+msgid "submodule name '%s' already used for path '%s'"
+msgstr "nome do submódulo '%s' já utilizado para o caminho '%s'"
+
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "'%s' não é um nome de submódulo válido"
+
+msgid "git submodule--helper <command>"
+msgstr "git submodule--helper <command>"
+
+msgid "git symbolic-ref [-m <reason>] <name> <ref>"
+msgstr "git symbolic-ref [-m <reason>] <name> <ref>"
+
+msgid "git symbolic-ref [-q] [--short] [--no-recurse] <name>"
+msgstr "git symbolic-ref [-q] [--short] [--no-recurse] <name>"
+
+msgid "git symbolic-ref --delete [-q] <name>"
+msgstr "git symbolic-ref --delete [-q] <name>"
+
+msgid "suppress error message for non-symbolic (detached) refs"
+msgstr "suprimir mensagem de erro para refs não simbólicos (desanexados)"
+
+msgid "delete symbolic ref"
+msgstr "excluir ref simbólica"
+
+msgid "shorten ref output"
+msgstr "encurtar a saída de ref"
+
+msgid "recursively dereference (default)"
+msgstr "desreferenciar recursivamente (padrão)"
+
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
+"        [(--trailer <token>[(=|:)<value>])...]\n"
+"        <tagname> [<commit> | <object>]"
+msgstr ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
+"        [(--trailer <token>[(=|:)<value>])...]\n"
+"        <tagname> [<commit> | <object>]"
+
+msgid "git tag -d <tagname>..."
+msgstr "git tag -d <tagname>..."
+
+msgid ""
+"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n"
+"        [--points-at <object>] [--column[=<options>] | --no-column]\n"
+"        [--create-reflog] [--sort=<key>] [--format=<format>]\n"
+"        [--merged <commit>] [--no-merged <commit>] [<pattern>...]"
+msgstr ""
+"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n"
+"        [--points-at <object>] [--column[=<options>] | --no-column]\n"
+"        [--create-reflog] [--sort=<key>] [--format=<format>]\n"
+"        [--merged <commit>] [--no-merged <commit>] [<pattern>...]"
+
+msgid "git tag -v [--format=<format>] <tagname>..."
+msgstr "git tag -v [--format=<format>] <tagname>..."
+
+#, c-format
+msgid "tag '%s' not found."
+msgstr "tag '%s' não encontrada."
+
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr "Tag '%s' excluída (era %s)\n"
+
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+"  %s\n"
+"Lines starting with '%s' will be ignored.\n"
+msgstr ""
+"\n"
+"Escreva uma mensagem para a tag:\n"
+"  %s\n"
+"Linhas começando com '%s' serão ignoradas.\n"
+
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+"  %s\n"
+"Lines starting with '%s' will be kept; you may remove them yourself if you "
+"want to.\n"
+msgstr ""
+"\n"
+"Escreva uma mensagem para a tag:\n"
+"  %s\n"
+"Linhas começando com '%s' serão mantidas; você mesmo pode removê-las se "
+"desejar.\n"
+
+msgid "unable to sign the tag"
+msgstr "não foi possível assinar a tag"
+
+#, 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 ""
+"Você criou uma tag aninhada. O objeto referido pela sua nova tag\n"
+"já é uma tag. Se você quisesse criar uma tag para o objeto para o qual ela "
+"aponta, use:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+
+msgid "bad object type."
+msgstr "tipo de objeto inválido."
+
+msgid "no tag message?"
+msgstr "nenhuma mensagem de tag?"
+
+#, c-format
+msgid "The tag message has been left in %s\n"
+msgstr "A mensagem da tag foi deixada em %s\n"
+
+msgid "list tag names"
+msgstr "listar nomes de tags"
+
+msgid "print <n> lines of each tag message"
+msgstr "exibir <n> linhas de cada mensagem de tag"
+
+msgid "delete tags"
+msgstr "excluir tags"
+
+msgid "verify tags"
+msgstr "verificar tags"
+
+msgid "Tag creation options"
+msgstr "Opções de criação de tag"
+
+msgid "annotated tag, needs a message"
+msgstr "tag anotada, precisa de uma mensagem"
+
+msgid "tag message"
+msgstr "mensagem da tag"
+
+msgid "force edit of tag message"
+msgstr "forçar edição da mensagem da tag"
+
+msgid "annotated and GPG-signed tag"
+msgstr "tag anotada e assinada com GPG"
+
+msgid "use another key to sign the tag"
+msgstr "usar outra chave para assinar a tag"
+
+msgid "replace the tag if exists"
+msgstr "substituir a tag se já existir"
+
+msgid "Tag listing options"
+msgstr "Opções de listagem de tag"
+
+msgid "show tag list in columns"
+msgstr "mostrar lista de tags em colunas"
+
+msgid "print only tags that contain the commit"
+msgstr "imprimir apenas tags que contêm o commit"
+
+msgid "print only tags that don't contain the commit"
+msgstr "exibir apenas tags que não contêm o commit"
+
+msgid "print only tags that are merged"
+msgstr "imprimir apenas tags que sofreram merge"
+
+msgid "print only tags that are not merged"
+msgstr "imprimir apenas tags que não sofreram merge"
+
+msgid "print only tags of the object"
+msgstr "imprimir apenas tags do objeto"
+
+msgid "could not start 'git column'"
+msgstr "não foi possível iniciar 'git column'"
+
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "a opção '%s' só é permitida no modo de lista"
+
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr "'%s' não é um nome de tag válido."
+
+#, c-format
+msgid "tag '%s' already exists"
+msgstr "a tag '%s' já existe"
+
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Modo de limpeza inválido %s"
+
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr "Tag '%s' atualizada (era %s)\n"
+
+msgid "pack exceeds maximum allowed size"
+msgstr "o pack excede o tamanho máximo permitido"
+
+msgid "failed to write object in stream"
+msgstr "falha ao gravar o objeto no fluxo"
+
+#, c-format
+msgid "inflate returned (%d)"
+msgstr "inflate retornou (%d)"
+
+msgid "invalid blob object from stream"
+msgstr "objeto blob inválido vindo do fluxo"
+
+msgid "Unpacking objects"
+msgstr "Desempacotando objetos"
+
+#, c-format
+msgid "failed to create directory %s"
+msgstr "falha ao criar o diretório %s"
+
+#, c-format
+msgid "failed to delete file %s"
+msgstr "falha ao excluir o arquivo %s"
+
+#, c-format
+msgid "failed to delete directory %s"
+msgstr "falha ao excluir o diretório %s"
+
+#, c-format
+msgid "Testing mtime in '%s' "
+msgstr "Testando mtime em '%s' "
+
+msgid "directory stat info does not change after adding a new file"
+msgstr ""
+"informações de stat do diretório não mudam após adicionar um novo arquivo"
+
+msgid "directory stat info does not change after adding a new directory"
+msgstr ""
+"informações de stat do diretório não mudam após adicionar um novo diretório"
+
+msgid "directory stat info changes after updating a file"
+msgstr "informações de stat do diretório mudam após atualizar um arquivo"
+
+msgid "directory stat info changes after adding a file inside subdirectory"
+msgstr ""
+"informações de stat do diretório mudam após adicionar um arquivo dentro de "
+"um subdiretório"
+
+msgid "directory stat info does not change after deleting a file"
+msgstr "informações de stat do diretório não mudam após excluir um arquivo"
+
+msgid "directory stat info does not change after deleting a directory"
+msgstr "informações de stat do diretório não mudam após excluir um diretório"
+
+msgid " OK"
+msgstr " OK"
+
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr "git update-index [<options>] [--] [<file>...]"
+
+msgid "continue refresh even when index needs update"
+msgstr "continuar a atualização mesmo quando o índice precisa de atualização"
+
+msgid "refresh: ignore submodules"
+msgstr "refresh: ignorar submódulos"
+
+msgid "do not ignore new files"
+msgstr "não ignorar arquivos novos"
+
+msgid "let files replace directories and vice-versa"
+msgstr "permitir que arquivos substituam diretórios e vice-versa"
+
+msgid "notice files missing from worktree"
+msgstr "notar arquivos ausentes da worktree"
+
+msgid "refresh even if index contains unmerged entries"
+msgstr "atualizar mesmo se o índice contiver entradas sem merge"
+
+msgid "refresh stat information"
+msgstr "atualizar informações de stat"
+
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr "como --refresh, mas ignorar a configuração assume-unchanged"
+
+msgid "<mode>,<object>,<path>"
+msgstr "<mode>,<object>,<path>"
+
+msgid "add the specified entry to the index"
+msgstr "adicionar a entrada especificada ao índice"
+
+msgid "mark files as \"not changing\""
+msgstr "marcar arquivos como \"não alterando\""
+
+msgid "clear assumed-unchanged bit"
+msgstr "limpar bit assumed-unchanged"
+
+msgid "mark files as \"index-only\""
+msgstr "marcar arquivos como \"apenas-índice\""
+
+msgid "clear skip-worktree bit"
+msgstr "limpar bit skip-worktree"
+
+msgid "do not touch index-only entries"
+msgstr "não tocar em entradas apenas-índice"
+
+msgid "add to index only; do not add content to object database"
+msgstr ""
+"adicionar apenas ao índice; não adicionar conteúdo ao banco de dados de "
+"objetos"
+
+msgid "remove named paths even if present in worktree"
+msgstr "remover caminhos nomeados mesmo se presentes na worktree"
+
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr "com --stdin: linhas de entrada são terminadas por bytes nulos"
+
+msgid "read list of paths to be updated from standard input"
+msgstr "ler lista de caminhos a serem atualizados da entrada padrão"
+
+msgid "add entries from standard input to the index"
+msgstr "adicionar entradas da entrada padrão ao índice"
+
+msgid "repopulate stages #2 and #3 for the listed paths"
+msgstr "repovoar os estágios #2 e #3 para os caminhos listados"
+
+msgid "only update entries that differ from HEAD"
+msgstr "atualizar apenas entradas que diferem do HEAD"
+
+msgid "ignore files missing from worktree"
+msgstr "ignorar arquivos ausentes da worktree"
+
+msgid "report actions to standard output"
+msgstr "relatar ações para a saída padrão"
+
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr "(para comandos porcelain) esquece os conflitos não resolvidos salvos"
+
+msgid "write index in this format"
+msgstr "escrever o índice neste formato"
+
+msgid "report on-disk index format version"
+msgstr "relatar versão do formato do índice em disco"
+
+msgid "enable or disable split index"
+msgstr "habilitar ou desabilitar índice dividido"
+
+msgid "enable/disable untracked cache"
+msgstr "habilitar/desabilitar o cache de não rastreados"
+
+msgid "test if the filesystem supports untracked cache"
+msgstr "testar se o sistema de arquivos suporta o cache de não rastreados"
+
+msgid "enable untracked cache without testing the filesystem"
+msgstr "habilitar o cache de não rastreados sem testar o sistema de arquivos"
+
+msgid "write out the index even if is not flagged as changed"
+msgstr "escrever o índice mesmo se não estiver marcado como modificado"
+
+msgid "enable or disable file system monitor"
+msgstr "habilitar ou desabilitar o monitor do sistema de arquivos"
+
+msgid "mark files as fsmonitor valid"
+msgstr "marcar arquivos como fsmonitor válido"
+
+msgid "clear fsmonitor valid bit"
+msgstr "limpar o bit de fsmonitor válido"
+
+#, c-format
+msgid "%d\n"
+msgstr "%d\n"
+
+#, c-format
+msgid "index-version: was %d, set to %d"
+msgstr "index-version: era %d, definido para %d"
+
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+msgstr ""
+"core.splitIndex está definido como false; remova ou altere, se você "
+"realmente deseja habilitar o split index"
+
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+msgstr ""
+"core.splitIndex está definido como true; remova ou altere, se você realmente "
+"deseja desabilitar o split index"
+
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr ""
+"core.untrackedCache está definido como true; remova ou altere, se você "
+"realmente deseja desabilitar o cache de não rastreados"
+
+msgid "Untracked cache disabled"
+msgstr "Cache de não rastreados desabilitado"
+
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+msgstr ""
+"core.untrackedCache está definido como false; remova ou altere, se você "
+"realmente deseja habilitar o cache de não rastreados"
+
+#, c-format
+msgid "Untracked cache enabled for '%s'"
+msgstr "Cache de não rastreados habilitado para '%s'"
+
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr ""
+"core.fsmonitor não está definido; defina-o se você realmente deseja "
+"habilitar o fsmonitor"
+
+msgid "fsmonitor enabled"
+msgstr "fsmonitor habilitado"
+
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr ""
+"core.fsmonitor está definido; remova-o se você realmente deseja desabilitar "
+"o fsmonitor"
+
+msgid "fsmonitor disabled"
+msgstr "fsmonitor desabilitado"
+
+msgid "git update-ref [<options>] -d <refname> [<old-oid>]"
+msgstr "git update-ref [<options>] -d <refname> [<old-oid>]"
+
+msgid "git update-ref [<options>]    <refname> <new-oid> [<old-oid>]"
+msgstr "git update-ref [<options>]    <refname> <new-oid> [<old-oid>]"
+
+msgid "git update-ref [<options>] --stdin [-z] [--batch-updates]"
+msgstr "git update-ref [<options>] --stdin [-z] [--batch-updates]"
+
+msgid "delete the reference"
+msgstr "excluir a referência"
+
+msgid "stdin has NUL-terminated arguments"
+msgstr "stdin tem argumentos terminados em NUL"
+
+msgid "read updates from stdin"
+msgstr "ler atualizações do stdin"
+
+msgid "batch reference updates"
+msgstr "atualizações de referência em lote"
+
+msgid "update the info files from scratch"
+msgstr "atualizar os arquivos de info do zero"
+
+msgid ""
+"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n"
+"                [--advertise-refs] <directory>"
+msgstr ""
+"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n"
+"                [--advertise-refs] <directory>"
+
+msgid "quit after a single request/response exchange"
+msgstr "sair após uma única troca de solicitação/resposta"
+
+msgid "serve up the info/refs for git-http-backend"
+msgstr "servir info/refs para o git-http-backend"
+
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "não tentar <directory>/.git/ se <directory> não for um diretório Git"
+
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "interromper a transferência após <n> segundos de inatividade"
+
+msgid "git url-parse [-c <component>] [--] <url>..."
+msgstr "git url-parse [-c <component>] [--] <url>..."
+
+msgid "component"
+msgstr "componente"
+
+msgid "which URL component to extract"
+msgstr "qual componente da URL extrair"
+
+msgid "git verify-commit [-v | --verbose] [--raw] <commit>..."
+msgstr "git verify-commit [-v | --verbose] [--raw] <commit>..."
+
+msgid "print commit contents"
+msgstr "imprimir conteúdo do commit"
+
+msgid "print raw gpg status output"
+msgstr "imprimir saída raw de status do gpg"
+
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..."
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..."
+
+msgid "verbose"
+msgstr "verboso"
+
+msgid "show statistics only"
+msgstr "mostrar apenas estatísticas"
+
+msgid "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..."
+msgstr "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..."
+
+msgid "print tag contents"
+msgstr "imprimir conteúdo da tag"
+
+msgid ""
+"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n"
+"                 [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]"
+msgstr ""
+"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n"
+"                 [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]"
+
+msgid "git worktree list [-v | --porcelain [-z]]"
+msgstr "git worktree list [-v | --porcelain [-z]]"
+
+msgid "git worktree lock [--reason <string>] <worktree>"
+msgstr "git worktree lock [--reason <string>] <worktree>"
+
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <worktree> <new-path>"
+
+msgid "git worktree prune [-n] [-v] [--expire <expire>]"
+msgstr "git worktree prune [-n] [-v] [--expire <expire>]"
+
+msgid "git worktree remove [-f] <worktree>"
+msgstr "git worktree remove [-f] <worktree>"
+
+msgid "git worktree repair [<path>...]"
+msgstr "git worktree repair [<path>...]"
+
+msgid "git worktree unlock <worktree>"
+msgstr "git worktree unlock <worktree>"
+
+msgid "No possible source branch, inferring '--orphan'"
+msgstr "Nenhum branch de origem possível, inferindo '--orphan'"
+
+#, c-format
+msgid ""
+"If you meant to create a worktree containing a new unborn branch\n"
+"(branch with no commits) for this repository, you can do so\n"
+"using the --orphan flag:\n"
+"\n"
+"    git worktree add --orphan -b %s %s\n"
+msgstr ""
+"Se você deseja criar uma worktree contendo um novo branch não nascido\n"
+"(branch sem commits) para este repositório, você pode fazê-lo\n"
+"usando a flag --orphan:\n"
+"\n"
+"    git worktree add --orphan -b %s %s\n"
+
+#, c-format
+msgid ""
+"If you meant to create a worktree containing a new unborn branch\n"
+"(branch with no commits) for this repository, you can do so\n"
+"using the --orphan flag:\n"
+"\n"
+"    git worktree add --orphan %s\n"
+msgstr ""
+"Se você deseja criar uma worktree contendo um novo branch não nascido\n"
+"(branch sem commits) para este repositório, você pode fazê-lo\n"
+"usando a flag --orphan:\n"
+"\n"
+"    git worktree add --orphan %s\n"
+
+#, c-format
+msgid "Removing %s/%s: %s"
+msgstr "Removendo %s/%s: %s"
+
+msgid "report pruned working trees"
+msgstr "relatar árvores de trabalho podadas"
+
+msgid "prune missing working trees older than <time>"
+msgstr "podar árvores de trabalho ausentes mais antigas que <time>"
+
+#, c-format
+msgid "'%s' already exists"
+msgstr "'%s' já existe"
+
+#, c-format
+msgid "unusable worktree destination '%s'"
+msgstr "destino de worktree inutilizável '%s'"
+
+#, 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' é uma worktree ausente, mas bloqueada;\n"
+"use '%s -f -f' para sobrescrever, ou 'unlock' e 'prune' ou 'remove' para "
+"limpar"
+
+#, 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' é uma worktree ausente, mas já registrada;\n"
+"use '%s -f' para sobrescrever, ou 'prune' ou 'remove' para limpar"
+
+#, c-format
+msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
+msgstr ""
+"falha ao copiar '%s' para '%s'; sparse-checkout pode não funcionar "
+"corretamente"
+
+#, c-format
+msgid "failed to copy worktree config from '%s' to '%s'"
+msgstr "falha ao copiar a configuração da worktree de '%s' para '%s'"
+
+#, c-format
+msgid "failed to unset '%s' in '%s'"
+msgstr "falha ao desdefinir '%s' em '%s'"
+
+#, c-format
+msgid "could not create directory of '%s'"
+msgstr "não foi possível criar o diretório de '%s'"
+
+msgid "initializing"
+msgstr "inicializando"
+
+#, c-format
+msgid "could not find created worktree '%s'"
+msgstr "não foi possível encontrar a worktree criada '%s'"
+
+#, c-format
+msgid "Preparing worktree (new branch '%s')"
+msgstr "Preparando worktree (novo branch '%s')"
+
+#, c-format
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
+msgstr "Preparando worktree (redefinindo branch '%s'; estava em %s)"
+
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
+msgstr "Preparando worktree (fazendo checkout de '%s')"
+
+#, c-format
+msgid "Preparing worktree (detached HEAD %s)"
+msgstr "Preparando worktree (HEAD desanexado %s)"
+
+msgid "HEAD points to an invalid (or orphaned) reference.\n"
+msgstr "HEAD aponta para uma referência inválida (ou órfã).\n"
+
+msgid ""
+"No local or remote refs exist despite at least one remote\n"
+"present, stopping; use 'add -f' to override or fetch a remote first"
+msgstr ""
+"Nenhuma ref local ou remota existe apesar de pelo menos um remoto\n"
+"estar presente, parando; use 'add -f' para sobrescrever ou faça fetch de um "
+"remoto primeiro"
+
+#, c-format
+msgid ""
+"If you meant to create a worktree from a remote tracking branch on\n"
+"<remote>, you can do so by:\n"
+"\n"
+"    git worktree add -b %s %s <remote>/%s\n"
+"\n"
+"If you'd like to always prefer some remote, e.g. 'origin',\n"
+"consider setting checkout.defaultRemote=origin in your config."
+msgstr ""
+"Se a intenção era criar uma worktree a partir de um branch de rastreamento\n"
+"remoto em <remote>, isso é possível assim:\n"
+"\n"
+"    git worktree add -b %s %s <remote>/%s\n"
+"\n"
+"Se você prefere sempre usar um remoto específico, por exemplo 'origin',\n"
+"considere definir checkout.defaultRemote=origin na sua configuração."
+
+msgid "checkout <branch> even if already checked out in other worktree"
+msgstr ""
+"fazer checkout do <branch> mesmo se já tiver sido feito checkout em outro "
+"worktree"
+
+msgid "create a new branch"
+msgstr "criar um novo branch"
+
+msgid "create or reset a branch"
+msgstr "criar ou redefinir um branch"
+
+msgid "create unborn branch"
+msgstr "criar branch não nascido"
+
+msgid "populate the new working tree"
+msgstr "popular a nova árvore de trabalho"
+
+msgid "keep the new working tree locked"
+msgstr "manter a nova árvore de trabalho bloqueada"
+
+msgid "reason for locking"
+msgstr "motivo do bloqueio"
+
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "configurar modo de rastreamento (veja git-branch(1))"
+
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr ""
+"tentar corresponder o novo nome de branch com um branch de rastreamento "
+"remoto"
+
+msgid "use relative paths for worktrees"
+msgstr "usar caminhos relativos para worktrees"
+
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "as opções '%s', '%s' e '%s' não podem ser usadas juntas"
+
+#, c-format
+msgid "option '%s' and commit-ish cannot be used together"
+msgstr "a opção '%s' e commit-ish não podem ser usados juntos"
+
+msgid "added with --lock"
+msgstr "adicionado com --lock"
+
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr "--[no-]track só pode ser usado se um novo branch for criado"
+
+msgid "show extended annotations and reasons, if available"
+msgstr "mostrar anotações estendidas e motivos, se disponíveis"
+
+msgid "add 'prunable' annotation to missing worktrees older than <time>"
+msgstr ""
+"adicionar anotação 'prunable' a worktrees ausentes mais antigos que <time>"
+
+msgid "terminate records with a NUL character"
+msgstr "terminar registros com um caractere NUL"
+
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr "'%s' não é uma árvore de trabalho"
+
+msgid "The main working tree cannot be locked or unlocked"
+msgstr "A árvore de trabalho principal não pode ser bloqueada ou desbloqueada"
+
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr "'%s' já está bloqueado, motivo: %s"
+
+#, c-format
+msgid "'%s' is already locked"
+msgstr "'%s' já está bloqueado"
+
+#, c-format
+msgid "'%s' is not locked"
+msgstr "'%s' não está bloqueado"
+
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr ""
+"árvores de trabalho contendo submódulos não podem ser movidas ou removidas"
+
+msgid "force move even if worktree is dirty or locked"
+msgstr "forçar movimento mesmo se a worktree estiver suja ou bloqueada"
+
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr "'%s' é uma árvore de trabalho principal"
+
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "não foi possível descobrir o nome de destino a partir de '%s'"
+
+#, c-format
+msgid ""
+"cannot move a locked working tree, lock reason: %s\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+"não é possível mover uma árvore de trabalho bloqueada, motivo do bloqueio: "
+"%s\n"
+"use 'move -f -f' para sobrescrever ou desbloqueie primeiro"
+
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+"não é possível mover uma árvore de trabalho bloqueada;\n"
+"use 'move -f -f' para sobrescrever ou desbloqueie primeiro"
+
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr "falha na validação, não é possível mover a árvore de trabalho: %s"
+
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "falha ao mover '%s' para '%s'"
+
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "falha ao executar 'git status' em '%s'"
+
+#, c-format
+msgid "'%s' contains modified or untracked files, use --force to delete it"
+msgstr ""
+"'%s' contém arquivos modificados ou não rastreados, use --force para excluí-"
+"lo"
+
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr "falha ao executar 'git status' em '%s', código %d"
+
+msgid "force removal even if worktree is dirty or locked"
+msgstr "forçar remoção mesmo se a worktree estiver suja ou bloqueada"
+
+#, c-format
+msgid ""
+"cannot remove a locked working tree, lock reason: %s\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+"não é possível remover uma árvore de trabalho bloqueada, motivo do bloqueio: "
+"%s\n"
+"use 'remove -f -f' para sobrescrever ou desbloqueie primeiro"
+
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+"não é possível remover uma árvore de trabalho bloqueada;\n"
+"use 'remove -f -f' para sobrescrever ou desbloqueie primeiro"
+
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr "falha na validação, não é possível remover a árvore de trabalho: %s"
+
+#, c-format
+msgid "repair: %s: %s"
+msgstr "reparar: %s: %s"
+
+#, c-format
+msgid "error: %s: %s"
+msgstr "erro: %s: %s"
+
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+
+msgid "<prefix>/"
+msgstr "<prefix>/"
+
+msgid "write tree object for a subdirectory <prefix>"
+msgstr "escrever objeto tree para um subdiretório <prefix>"
+
+msgid "only useful for debugging"
+msgstr "útil apenas para depuração"
+
+#, c-format
+msgid "could not parse bundle list key %s with value '%s'"
+msgstr ""
+"não foi possível analisar a chave da lista de bundle %s com o valor '%s'"
+
+#, c-format
+msgid "bundle list at '%s' has no mode"
+msgstr "a lista de bundle em '%s' não tem modo"
+
+#, c-format
+msgid "bundle list at '%s': bundle '%s' has no uri"
+msgstr "lista de bundle em '%s': bundle '%s' não tem uri"
+
+msgid "failed to create temporary file"
+msgstr "falha ao criar o arquivo temporário"
+
+msgid "insufficient capabilities"
+msgstr "capacidades insuficientes"
+
+#, c-format
+msgid "file downloaded from '%s' is not a bundle"
+msgstr "o arquivo baixado de '%s' não é um bundle"
+
+msgid "failed to store maximum creation token"
+msgstr "falha ao armazenar o token máximo de criação"
+
+#, c-format
+msgid "unrecognized bundle mode from URI '%s'"
+msgstr "modo de bundle não reconhecido a partir da URI '%s'"
+
+#, c-format
+msgid "exceeded bundle URI recursion limit (%d)"
+msgstr "excedido o limite de recursão da URI de bundle (%d)"
+
+#, c-format
+msgid "bundle '%s' has no uri"
+msgstr "bundle '%s' não tem uri"
+
+#, c-format
+msgid "failed to download bundle from URI '%s'"
+msgstr "falha ao baixar o bundle da URI '%s'"
+
+#, c-format
+msgid "file at URI '%s' is not a bundle or bundle list"
+msgstr "o arquivo na URI '%s' não é um bundle ou uma lista de bundle"
+
+#, c-format
+msgid "config '%s' has no value"
+msgstr "a configuração '%s' não tem valor"
+
+#, c-format
+msgid "bundle-uri: unexpected argument: '%s'"
+msgstr "bundle-uri: argumento inesperado: '%s'"
+
+msgid "bundle-uri: expected flush after arguments"
+msgstr "bundle-uri: flush esperado após os argumentos"
+
+msgid "bundle-uri: got an empty line"
+msgstr "bundle-uri: obteve uma linha vazia"
+
+msgid "bundle-uri: line is not of the form 'key=value'"
+msgstr "bundle-uri: a linha não está no formato 'chave=valor'"
+
+msgid "bundle-uri: line has empty key or value"
+msgstr "bundle-uri: a linha tem chave ou valor vazio"
+
+#, c-format
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "algoritmo de hash de bundle não reconhecido: %s"
+
+#, c-format
+msgid "unknown capability '%s'"
+msgstr "capacidade desconhecida '%s'"
+
+#, c-format
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr "'%s' não se parece com um arquivo de bundle v2 ou v3"
+
+#, c-format
+msgid "unrecognized header: %s%s (%d)"
+msgstr "cabeçalho não reconhecido: %s%s (%d)"
+
+msgid "Repository lacks these prerequisite commits:"
+msgstr "O repositório carece destes commits pré-requisitos:"
+
+msgid ""
+"some prerequisite commits exist in the object store, but are not connected "
+"to the repository's history"
+msgstr ""
+"alguns commits pré-requisitos existem no armazenamento de objetos, mas não "
+"estão conectados ao histórico do repositório"
+
+#, c-format
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "O bundle contém esta ref:"
+msgstr[1] "O bundle contém estas %<PRIuMAX> refs:"
+
+msgid "The bundle records a complete history."
+msgstr "O bundle registra um histórico completo."
+
+#, c-format
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "O bundle requer esta ref:"
+msgstr[1] "O bundle requer estas %<PRIuMAX> refs:"
+
+#, c-format
+msgid "The bundle uses this hash algorithm: %s"
+msgstr "O bundle usa este algoritmo de hash: %s"
+
+#, c-format
+msgid "The bundle uses this filter: %s"
+msgstr "O bundle usa este filtro: %s"
+
+msgid "unable to dup bundle descriptor"
+msgstr "não foi possível duplicar o descritor do bundle"
+
+msgid "Could not spawn pack-objects"
+msgstr "Não foi possível iniciar o pack-objects"
+
+msgid "pack-objects died"
+msgstr "pack-objects morreu"
+
+#, c-format
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "a ref '%s' é excluída pelas opções do rev-list"
+
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "versão de bundle %d não suportada"
+
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "não é possível escrever a versão do bundle %d com algoritmo %s"
+
+msgid "Refusing to create empty bundle."
+msgstr "Recusando-se a criar um bundle vazio."
+
+#, c-format
+msgid "cannot create '%s'"
+msgstr "não é possível criar '%s'"
+
+msgid "index-pack died"
+msgstr "index-pack morreu"
+
+#, c-format
+msgid "directory '%s' is present in index, but not sparse"
+msgstr "o diretório '%s' está presente no índice, mas não é esparso"
+
+msgid "corrupted cache-tree has entries not present in index"
+msgstr "a cache-tree corrompida tem entradas não presentes no índice"
+
+#, c-format
+msgid "%s with flags 0x%x should not be in cache-tree"
+msgstr "%s com flags 0x%x não deve estar na cache-tree"
+
+#, c-format
+msgid "bad subtree '%.*s'"
+msgstr "subárvore inválida '%.*s'"
+
+#, c-format
+msgid "cache-tree for path %.*s does not match. Expected %s got %s"
+msgstr ""
+"a cache-tree para o caminho %.*s não corresponde. Esperado %s, obtido %s"
+
+msgid "terminating chunk id appears earlier than expected"
+msgstr "o id do chunk de terminação aparece mais cedo do que o esperado"
+
+#, c-format
+msgid "chunk id %<PRIx32> not %d-byte aligned"
+msgstr "id do chunk %<PRIx32> não alinhado a %d bytes"
+
+#, c-format
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "deslocamento(s) de chunk impróprio(s) %<PRIx64> e %<PRIx64>"
+
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "ID de chunk %<PRIx32> duplicado encontrado"
+
+#, c-format
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "chunk final tem id %<PRIx32> diferente de zero"
+
+msgid "invalid hash version"
+msgstr "versão de hash inválida"
+
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr "valor de cor inválido: %.*s"
+
+msgid "Add file contents to the index"
+msgstr "Adicionar conteúdo do arquivo ao índice"
+
+msgid "Apply a series of patches from a mailbox"
+msgstr "Aplicar uma série de patches a partir de uma mailbox"
+
+msgid "Annotate file lines with commit information"
+msgstr "Anotar as linhas do arquivo com informações do commit"
+
+msgid "Apply a patch to files and/or to the index"
+msgstr "Aplicar um patch a arquivos e/ou ao índice"
+
+msgid "Import a GNU Arch repository into Git"
+msgstr "Importar um repositório GNU Arch para o Git"
+
+msgid "Create an archive of files from a named tree"
+msgstr "Criar um archive de arquivos a partir de uma tree nomeada"
+
+msgid "Download missing objects in a partial clone"
+msgstr "Baixar objetos ausentes em um clone parcial"
+
+msgid "Use binary search to find the commit that introduced a bug"
+msgstr "Usar busca binária para encontrar o commit que introduziu um bug"
+
+msgid "Show what revision and author last modified each line of a file"
+msgstr ""
+"Mostrar qual revisão e autor modificou pela última vez cada linha de um "
+"arquivo"
+
+msgid "List, create, or delete branches"
+msgstr "Listar, criar ou excluir branches"
+
+msgid "Collect information for user to file a bug report"
+msgstr "Coletar informações para o usuário relatar um bug"
+
+msgid "Move objects and refs by archive"
+msgstr "Mover objetos e refs por archive"
+
+msgid "Provide contents or details of repository objects"
+msgstr "Fornecer conteúdo ou detalhes dos objetos do repositório"
+
+msgid "Display gitattributes information"
+msgstr "Exibir informações do gitattributes"
+
+msgid "Debug gitignore / exclude files"
+msgstr "Depurar arquivos gitignore / exclude"
+
+msgid "Show canonical names and email addresses of contacts"
+msgstr "Mostrar nomes e endereços de e-mail canônicos dos contatos"
+
+msgid "Ensures that a reference name is well formed"
+msgstr "Garante que um nome de referência seja bem formado"
+
+msgid "Switch branches or restore working tree files"
+msgstr "Alterne entre branches ou restaure arquivos da árvore de trabalho"
+
+msgid "Copy files from the index to the working tree"
+msgstr "Copiar arquivos do índice para a árvore de trabalho"
+
+msgid "Find commits yet to be applied to upstream"
+msgstr "Encontrar commits ainda a serem aplicados no upstream"
+
+msgid "Apply the changes introduced by some existing commits"
+msgstr "Aplicar as alterações introduzidas por alguns commits existentes"
+
+msgid "Graphical alternative to git-commit"
+msgstr "Alternativa gráfica para o git-commit"
+
+msgid "Remove untracked files from the working tree"
+msgstr "Remova arquivos não rastreados da árvore de trabalho"
+
+msgid "Clone a repository into a new directory"
+msgstr "Clonar um repositório em um novo diretório"
+
+msgid "Display data in columns"
+msgstr "Exibir dados em colunas"
+
+msgid "Record changes to the repository"
+msgstr "Registre alterações no repositório"
+
+msgid "Write and verify Git commit-graph files"
+msgstr "Escrever e verificar arquivos commit-graph do Git"
+
+msgid "Create a new commit object"
+msgstr "Criar um novo objeto de commit"
+
+msgid "Get and set repository or global options"
+msgstr "Obter e definir opções do repositório ou globais"
+
+msgid "Count unpacked number of objects and their disk consumption"
+msgstr "Contar número de objetos descompactados e seu consumo de disco"
+
+msgid "Retrieve and store user credentials"
+msgstr "Recuperar e armazenar credenciais de usuário"
+
+msgid "Helper to temporarily store passwords in memory"
+msgstr "Auxiliar para armazenar temporariamente senhas na memória"
+
+msgid "Helper to store credentials on disk"
+msgstr "Auxiliar para armazenar credenciais no disco"
+
+msgid "Export a single commit to a CVS checkout"
+msgstr "Exportar um único commit para um checkout do CVS"
+
+msgid "Salvage your data out of another SCM people love to hate"
+msgstr "Salve seus dados de outro SCM que as pessoas amam odiar"
+
+msgid "A CVS server emulator for Git"
+msgstr "Um emulador de servidor CVS para Git"
+
+msgid "A really simple server for Git repositories"
+msgstr "Um servidor muito simples para repositórios Git"
+
+msgid "Give an object a human readable name based on an available ref"
+msgstr ""
+"Dê a um objeto um nome legível por humanos com base em um ref disponível"
+
+msgid "Generate a zip archive of diagnostic information"
+msgstr "Gere um arquivo zip de informações de diagnóstico"
+
+msgid "Show changes between commits, commit and working tree, etc"
+msgstr "Mostre alterações entre commits, commit e árvore de trabalho, etc"
+
+msgid "Compares files in the working tree and the index"
+msgstr "Compara arquivos na árvore de trabalho e no índice"
+
+msgid "Compare a tree to the working tree or index"
+msgstr "Comparar uma árvore com a árvore de trabalho ou o índice"
+
+msgid "Compare the content and mode of provided blob pairs"
+msgstr "Compare o conteúdo e o modo dos pares de blob fornecidos"
+
+msgid "Compares the content and mode of blobs found via two tree objects"
+msgstr ""
+"Compara o conteúdo e o modo de blobs encontrados através de dois objetos tree"
+
+msgid "Show changes using common diff tools"
+msgstr "Mostre as alterações usando ferramentas comuns de diff"
+
+msgid "Git data exporter"
+msgstr "Exportador de dados do Git"
+
+msgid "Backend for fast Git data importers"
+msgstr "Back-end para importadores rápidos de dados do Git"
+
+msgid "Download objects and refs from another repository"
+msgstr "Baixe objetos e refs de outro repositório"
+
+msgid "Receive missing objects from another repository"
+msgstr "Receba objetos ausentes de outro repositório"
+
+msgid "Rewrite branches"
+msgstr "Reescrever branches"
+
+msgid "Produce a merge commit message"
+msgstr "Produza uma mensagem de commit de merge"
+
+msgid "Output information on each ref"
+msgstr "Exiba informações sobre cada ref"
+
+msgid "Run a Git command on a list of repositories"
+msgstr "Execute um comando Git em uma lista de repositórios"
+
+msgid "Prepare patches for e-mail submission"
+msgstr "Prepare patches para envio por e-mail"
+
+msgid "EXPERIMENTAL: Pretty format revisions on demand"
+msgstr "EXPERIMENTAL: Formate as revisões amigavelmente sob demanda"
+
+msgid "Verifies the connectivity and validity of the objects in the database"
+msgstr "Verifica a conectividade e a validade dos objetos no banco de dados"
+
+msgid "Cleanup unnecessary files and optimize the local repository"
+msgstr "Limpe arquivos desnecessários e otimize o repositório local"
+
+msgid "Extract commit ID from an archive created using git-archive"
+msgstr "Extraia o ID do commit de um arquivo criado usando git-archive"
+
+msgid "Print lines matching a pattern"
+msgstr "Imprima linhas correspondentes a um padrão"
+
+msgid "A portable graphical interface to Git"
+msgstr "Uma interface gráfica portátil para o Git"
+
+msgid "Compute object ID and optionally create an object from a file"
+msgstr ""
+"Calcule o ID do objeto e, opcionalmente, crie um objeto a partir de um "
+"arquivo"
+
+msgid "Display help information about Git"
+msgstr "Exiba informações de ajuda sobre o Git"
+
+msgid "EXPERIMENTAL: Rewrite history"
+msgstr "EXPERIMENTAL: Reescreva o histórico"
+
+msgid "Run Git hooks"
+msgstr "Execute os hooks do Git"
+
+msgid "Server side implementation of Git over HTTP"
+msgstr "Implementação no lado do servidor do Git sobre HTTP"
+
+msgid "Download from a remote Git repository via HTTP"
+msgstr "Baixe de um repositório Git remoto via HTTP"
+
+msgid "Push objects over HTTP/DAV to another repository"
+msgstr "Faça push de objetos sobre HTTP/DAV para outro repositório"
+
+msgid "Send a collection of patches from stdin to an IMAP folder"
+msgstr "Envie uma coleção de patches do stdin para uma pasta IMAP"
+
+msgid "Build pack index file for an existing packed archive"
+msgstr ""
+"Construa o arquivo de índice de pack para um arquivo empacotado existente"
+
+msgid "Create an empty Git repository or reinitialize an existing one"
+msgstr "Crie um repositório Git vazio ou reinicialize um existente"
+
+msgid "Instantly browse your working repository in gitweb"
+msgstr "Navegue instantaneamente no seu repositório de trabalho no gitweb"
+
+msgid "Add or parse metadata in commit messages"
+msgstr "Adicione ou analise metadados em mensagens de commit"
+
+msgid "EXPERIMENTAL: Show when files were last modified"
+msgstr ""
+"EXPERIMENTAL: Mostre quando os arquivos foram modificados pela última vez"
+
+msgid "Show commit logs"
+msgstr "Mostre os logs de commit"
+
+msgid "Show information about files in the index and the working tree"
+msgstr "Mostre informações sobre os arquivos no índice e na árvore de trabalho"
+
+msgid "List references in a remote repository"
+msgstr "Listar referências em um repositório remoto"
+
+msgid "List the contents of a tree object"
+msgstr "Liste o conteúdo de um objeto tree"
+
+msgid "Extracts patch and authorship from a single e-mail message"
+msgstr "Extrai patch e autoria de uma única mensagem de e-mail"
+
+msgid "Simple UNIX mbox splitter program"
+msgstr "Programa divisor mbox UNIX simples"
+
+msgid "Run tasks to optimize Git repository data"
+msgstr "Execute tarefas para otimizar os dados do repositório Git"
+
+msgid "Join two or more development histories together"
+msgstr "Junte dois ou mais históricos de desenvolvimento"
+
+msgid "Find as good common ancestors as possible for a merge"
+msgstr "Encontre os melhores ancestrais comuns possíveis para um merge"
+
+msgid "Run a three-way file merge"
+msgstr "Execute um merge de arquivo de três vias"
+
+msgid "Run a merge for files needing merging"
+msgstr "Execute um merge para arquivos que precisam de merge"
+
+msgid "The standard helper program to use with git-merge-index"
+msgstr "O programa auxiliar padrão para usar com git-merge-index"
+
+msgid "Perform merge without touching index or working tree"
+msgstr "Execute o merge sem tocar no índice ou na árvore de trabalho"
+
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgstr ""
+"Execute ferramentas de resolução de conflitos de merge para resolver "
+"conflitos de merge"
+
+msgid "Creates a tag object with extra validation"
+msgstr "Cria um objeto tag com validação extra"
+
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr "Construa um objeto tree a partir de texto formatado pelo ls-tree"
+
+msgid "Write and verify multi-pack-indexes"
+msgstr "Escreva e verifique multi-pack-indexes"
+
+msgid "Move or rename a file, a directory, or a symlink"
+msgstr "Mova ou renomeie um arquivo, um diretório ou um link simbólico"
+
+msgid "Find symbolic names for given revs"
+msgstr "Encontre nomes simbólicos para as revisões fornecidas"
+
+msgid "Add or inspect object notes"
+msgstr "Adicione ou inspecione notas de objeto"
+
+msgid "Import from and submit to Perforce repositories"
+msgstr "Importe de e envie para repositórios Perforce"
+
+msgid "Create a packed archive of objects"
+msgstr "Crie um arquivo empacotado de objetos"
+
+msgid "Find redundant pack files"
+msgstr "Encontrar arquivos de pack redundantes"
+
+msgid "Pack heads and tags for efficient repository access"
+msgstr "Empacote heads e tags para acesso eficiente ao repositório"
+
+msgid "Compute unique IDs for patches"
+msgstr "Calcule IDs únicos para patches"
+
+msgid "Prune all unreachable objects from the object database"
+msgstr "Remova todos os objetos inacessíveis do banco de dados de objetos"
+
+msgid "Remove extra objects that are already in pack files"
+msgstr "Remova os objetos extras que já estão nos arquivos de pack"
+
+msgid "Fetch from and integrate with another repository or a local branch"
+msgstr "Faça fetch e integre com outro repositório ou um branch local"
+
+msgid "Update remote refs along with associated objects"
+msgstr "Atualize os refs remotos junto com os objetos associados"
+
+msgid "Applies a quilt patchset onto the current branch"
+msgstr "Aplica um conjunto de patches quilt no branch atual"
+
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgstr "Compare dois intervalos de commit (por ex., duas versões de um branch)"
+
+msgid "Reads tree information into the index"
+msgstr "Lê informações da tree para o índice"
+
+msgid "Reapply commits on top of another base tip"
+msgstr "Reaplique commits no topo de outra ponta base"
+
+msgid "Receive what is pushed into the repository"
+msgstr "Receba o que for feito push no repositório"
+
+msgid "Manage reflog information"
+msgstr "Gerencie informações do reflog"
+
+msgid "Low-level access to refs"
+msgstr "Acesso de baixo nível aos refs"
+
+msgid "Manage set of tracked repositories"
+msgstr "Gerenciar o conjunto de repositórios rastreados"
+
+msgid "Pack unpacked objects in a repository"
+msgstr "Empacote objetos desempacotados em um repositório"
+
+msgid "Create, list, delete refs to replace objects"
+msgstr "Crie, liste ou exclua refs para substituir objetos"
+
+msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too"
+msgstr ""
+"EXPERIMENTAL: Repita commits em uma nova base, funciona também com "
+"repositórios bare"
+
+msgid "Retrieve information about the repository"
+msgstr "Recupere informações sobre o repositório"
+
+msgid "Generates a summary of pending changes"
+msgstr "Gera um resumo das alterações pendentes"
+
+msgid "Reuse recorded resolution of conflicted merges"
+msgstr "Reutilize a resolução registrada de merges com conflito"
+
+msgid "Set `HEAD` or the index to a known state"
+msgstr "Defina o `HEAD` ou o índice para um estado conhecido"
+
+msgid "Restore working tree files"
+msgstr "Restaure arquivos da árvore de trabalho"
+
+msgid "Lists commit objects in reverse chronological order"
+msgstr "Lista os objetos de commit em ordem cronológica inversa"
+
+msgid "Pick out and massage parameters"
+msgstr "Escolha e processe parâmetros"
+
+msgid "Revert some existing commits"
+msgstr "Reverta alguns commits existentes"
+
+msgid "Remove files from the working tree and from the index"
+msgstr "Remova arquivos da árvore de trabalho e do índice"
+
+msgid "Send a collection of patches as emails"
+msgstr "Envie uma coleção de patches como e-mails"
+
+msgid "Push objects over Git protocol to another repository"
+msgstr "Faça push de objetos sobre o protocolo Git para outro repositório"
+
+msgid "Git's i18n setup code for shell scripts"
+msgstr "Código de configuração i18n do Git para scripts de shell"
+
+msgid "Common Git shell script setup code"
+msgstr "Código de configuração comum de script de shell do Git"
+
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "Shell de login restrito para acesso SSH apenas ao Git"
+
+msgid "Summarize `git log` output"
+msgstr "Resuma a saída do `git log`"
+
+msgid "Show various types of objects"
+msgstr "Mostre vários tipos de objetos"
+
+msgid "Show branches and their commits"
+msgstr "Mostre branches e seus commits"
+
+msgid "Show packed archive index"
+msgstr "Mostre o índice de arquivo empacotado"
+
+msgid "List references in a local repository"
+msgstr "Listar referências em um repositório local"
+
+msgid "Reduce your working tree to a subset of tracked files"
+msgstr "Reduza sua árvore de trabalho a um subconjunto dos arquivos rastreados"
+
+msgid "Add file contents to the staging area"
+msgstr "Adicione o conteúdo do arquivo à área de preparação"
+
+msgid "Stash the changes in a dirty working directory away"
+msgstr "Faça stash das alterações de um diretório de trabalho sujo"
+
+msgid "Show the working tree status"
+msgstr "Mostre o status da árvore de trabalho"
+
+msgid "Remove unnecessary whitespace"
+msgstr "Remova espaços em branco desnecessários"
+
+msgid "Initialize, update or inspect submodules"
+msgstr "Inicialize, atualize ou inspecione submódulos"
+
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr "Operação bidirecional entre um repositório Subversion e o Git"
+
+msgid "Switch branches"
+msgstr "Alternar entre branches"
+
+msgid "Read, modify and delete symbolic refs"
+msgstr "Leia, modifique e exclua refs simbólicos"
+
+msgid "Create, list, delete or verify tags"
+msgstr "Crie, liste, exclua ou verifique tags"
+
+msgid "Creates a temporary file with a blob's contents"
+msgstr "Cria um arquivo temporário com o conteúdo de um blob"
+
+msgid "Unpack objects from a packed archive"
+msgstr "Desempacote objetos de um arquivo empacotado"
+
+msgid "Register file contents in the working tree to the index"
+msgstr "Registre o conteúdo do arquivo na árvore de trabalho para o índice"
+
+msgid "Update the object name stored in a ref safely"
+msgstr "Atualize o nome do objeto armazenado em um ref com segurança"
+
+msgid "Update auxiliary info file to help dumb servers"
+msgstr ""
+"Atualize o arquivo de informações auxiliares para ajudar servidores burros"
+
+msgid "Send archive back to git-archive"
+msgstr "Envie o arquivo de volta para git-archive"
+
+msgid "Send objects packed back to git-fetch-pack"
+msgstr "Envie os objetos empacotados de volta para git-fetch-pack"
+
+msgid "Parse and extract git URL components"
+msgstr "Analise e extraia componentes da URL do git"
+
+msgid "Show a Git logical variable"
+msgstr "Mostre uma variável lógica do Git"
+
+msgid "Check the GPG signature of commits"
+msgstr "Verifique a assinatura GPG dos commits"
+
+msgid "Validate packed Git archive files"
+msgstr "Valide arquivos de pacote do Git"
+
+msgid "Check the GPG signature of tags"
+msgstr "Verifique a assinatura GPG das tags"
+
+msgid "Display version information about Git"
+msgstr "Exiba informações de versão do Git"
+
+msgid "Show logs with differences each commit introduces"
+msgstr "Mostre logs com as diferenças que cada commit introduz"
+
+msgid "Manage multiple working trees"
+msgstr "Gerenciar múltiplas árvores de trabalho"
+
+msgid "Create a tree object from the current index"
+msgstr "Crie um objeto tree a partir do índice atual"
+
+msgid "Defining attributes per path"
+msgstr "Definindo atributos por caminho"
+
+msgid "Git command-line interface and conventions"
+msgstr "Interface de linha de comando e convenções do Git"
+
+msgid "A Git core tutorial for developers"
+msgstr "Um tutorial do núcleo do Git para desenvolvedores"
+
+msgid "Providing usernames and passwords to Git"
+msgstr "Fornecendo nomes de usuário e senhas para o Git"
+
+msgid "Git for CVS users"
+msgstr "Git para usuários de CVS"
+
+msgid "Git's core data model"
+msgstr "O modelo de dados central do Git"
+
+msgid "Tweaking diff output"
+msgstr "Ajustando a saída do diff"
+
+msgid "A useful minimum set of commands for Everyday Git"
+msgstr "Um conjunto mínimo útil de comandos para o Git Diário"
+
+msgid "Frequently asked questions about using Git"
+msgstr "Perguntas frequentes sobre o uso do Git"
+
+msgid "The bundle file format"
+msgstr "O formato de arquivo do bundle"
+
+msgid "Chunk-based file formats"
+msgstr "Formatos de arquivo baseados em chunks"
+
+msgid "Git commit-graph format"
+msgstr "Formato do commit-graph do Git"
+
+msgid "Git index format"
+msgstr "Formato do índice do Git"
+
+msgid "Git pack format"
+msgstr "Formato de pack do Git"
+
+msgid "Git cryptographic signature formats"
+msgstr "Formatos de assinatura criptográfica do Git"
+
+msgid "A Git Glossary"
+msgstr "Um Glossário do Git"
+
+msgid "Hooks used by Git"
+msgstr "Hooks usados pelo Git"
+
+msgid "Specifies intentionally untracked files to ignore"
+msgstr "Especifica arquivos não rastreados intencionalmente para ignorar"
+
+msgid "The Git repository browser"
+msgstr "O navegador de repositório do Git"
+
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr "Mapeie os nomes de autor/committer e/ou endereços de e-mail"
+
+msgid "Defining submodule properties"
+msgstr "Definindo propriedades de submódulos"
+
+msgid "Git namespaces"
+msgstr "Namespaces do Git"
+
+msgid "Protocol v0 and v1 capabilities"
+msgstr "Capacidades do protocolo v0 e v1"
+
+msgid "Things common to various protocols"
+msgstr "Coisas comuns a vários protocolos"
+
+msgid "Git HTTP-based protocols"
+msgstr "Protocolos baseados em HTTP do Git"
+
+msgid "How packs are transferred over-the-wire"
+msgstr "Como packs são transferidos pela rede"
+
+msgid "Git Wire Protocol, Version 2"
+msgstr "Git Wire Protocol, Versão 2"
+
+msgid "Helper programs to interact with remote repositories"
+msgstr "Programas auxiliares para interagir com repositórios remotos"
+
+msgid "Git Repository Layout"
+msgstr "Layout do Repositório Git"
+
+msgid "Specifying revisions and ranges for Git"
+msgstr "Especificando revisões e intervalos para o Git"
+
+msgid "Mounting one repository inside another"
+msgstr "Montando um repositório dentro do outro"
+
+msgid "A tutorial introduction to Git"
+msgstr "Uma introdução tutorial ao Git"
+
+msgid "A tutorial introduction to Git: part two"
+msgstr "Uma introdução tutorial ao Git: parte dois"
+
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Interface web do Git (interface web para repositórios Git)"
+
+msgid "An overview of recommended workflows with Git"
+msgstr "Uma visão geral dos fluxos de trabalho recomendados com o Git"
+
+msgid "A tool for managing large Git repositories"
+msgstr "Uma ferramenta para gerenciar repositórios Git grandes"
+
+msgid "commit-graph file is too small"
+msgstr "arquivo commit-graph é muito pequeno"
+
+msgid "commit-graph oid fanout chunk is wrong size"
+msgstr "o chunk de fanout de oid do commit-graph tem o tamanho errado"
+
+msgid "commit-graph fanout values out of order"
+msgstr "valores de fanout do commit-graph fora de ordem"
+
+msgid "commit-graph OID lookup chunk is the wrong size"
+msgstr "o chunk de pesquisa de OID do commit-graph tem o tamanho errado"
+
+msgid "commit-graph commit data chunk is wrong size"
+msgstr "o chunk de dados de commit do commit-graph tem o tamanho errado"
+
+msgid "commit-graph generations chunk is wrong size"
+msgstr "o chunk de gerações do commit-graph tem o tamanho errado"
+
+msgid "commit-graph changed-path index chunk is too small"
+msgstr "o chunk de índice de changed-path do commit-graph é muito pequeno"
+
+#, c-format
+msgid ""
+"ignoring too-small changed-path chunk (%<PRIuMAX> < %<PRIuMAX>) in commit-"
+"graph file"
+msgstr ""
+"ignorando chunk changed-path muito pequeno (%<PRIuMAX> < %<PRIuMAX>) no "
+"arquivo commit-graph"
+
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "a assinatura do commit-graph %X não corresponde à assinatura %X"
+
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "a versão do commit-graph %X não corresponde à versão %X"
+
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "a versão de hash do commit-graph %X não corresponde à versão %X"
+
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "o arquivo commit-graph é pequeno demais para conter %u chunks"
+
+msgid "commit-graph required OID fanout chunk missing or corrupted"
+msgstr "chunk OID fanout obrigatório do commit-graph ausente ou corrompido"
+
+msgid "commit-graph required OID lookup chunk missing or corrupted"
+msgstr "chunk OID lookup obrigatório do commit-graph ausente ou corrompido"
+
+msgid "commit-graph required commit data chunk missing or corrupted"
+msgstr ""
+"chunk de dados de commit obrigatório do commit-graph ausente ou corrompido"
+
+#, c-format
+msgid ""
+"disabling Bloom filters for commit-graph layer '%s' due to incompatible "
+"settings"
+msgstr ""
+"desativando os filtros de Bloom para a camada commit-graph '%s' devido a "
+"configurações incompatíveis"
+
+msgid "commit-graph has no base graphs chunk"
+msgstr "o commit-graph não tem chunk base graphs"
+
+msgid "commit-graph base graphs chunk is too small"
+msgstr "o chunk base graphs do commit-graph é pequeno demais"
+
+msgid "commit-graph chain does not match"
+msgstr "a cadeia do commit-graph não corresponde"
+
+#, c-format
+msgid "commit count in base graph too high: %<PRIuMAX>"
+msgstr "a contagem de commits no base graph é muito alta: %<PRIuMAX>"
+
+msgid "commit-graph chain file too small"
+msgstr "o arquivo da cadeia do commit-graph é pequeno demais"
+
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "cadeia de commit-graph inválida: a linha '%s' não é um hash"
+
+msgid "unable to find all commit-graph files"
+msgstr "não foi possível encontrar todos os arquivos commit-graph"
+
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+"posição de commit inválida. o commit-graph provavelmente está corrompido"
+
+msgid "commit-graph requires overflow generation data but has none"
+msgstr "o commit-graph exige dados de overflow generation, mas não tem nenhum"
+
+msgid "commit-graph overflow generation data is too small"
+msgstr "os dados de overflow generation do commit-graph são pequenos demais"
+
+msgid "commit-graph extra-edges pointer out of bounds"
+msgstr "ponteiro de extra-edges do commit-graph fora dos limites"
+
+msgid "Loading known commits in commit graph"
+msgstr "Carregando commits conhecidos no commit graph"
+
+msgid "Expanding reachable commits in commit graph"
+msgstr "Expandindo commits alcançáveis no commit graph"
+
+msgid "Clearing commit marks in commit graph"
+msgstr "Limpando marcas de commit no commit graph"
+
+msgid "Computing commit graph topological levels"
+msgstr "Computando níveis topológicos do commit graph"
+
+msgid "Computing commit graph generation numbers"
+msgstr "Computando números de geração do commit graph"
+
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Computando filtros de Bloom para caminhos modificados de commit"
+
+msgid "Collecting referenced commits"
+msgstr "Coletando commits referenciados"
+
+#, c-format
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] "Encontrando commits para o commit graph em %<PRIuMAX> pack"
+msgstr[1] "Encontrando commits para o commit graph em %<PRIuMAX> packs"
+
+#, c-format
+msgid "error adding pack %s"
+msgstr "erro ao adicionar o pack %s"
+
+#, c-format
+msgid "error opening index for %s"
+msgstr "erro ao abrir o índice para %s"
+
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Encontrando commits para o commit graph entre os objetos empacotados"
+
+msgid "Finding extra edges in commit graph"
+msgstr "Encontrando bordas extras no commit graph"
+
+msgid "failed to write correct number of base graph ids"
+msgstr "falha ao escrever o número correto de IDs de base graph"
+
+msgid "unable to create temporary graph layer"
+msgstr "não foi possível criar a camada de grafo temporária"
+
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "não foi possível ajustar as permissões compartilhadas de '%s'"
+
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] "Escrevendo o commit graph em %d passagem"
+msgstr[1] "Escrevendo o commit graph em %d passagens"
+
+msgid "unable to open commit-graph chain file"
+msgstr "não foi possível abrir o arquivo de cadeia do commit-graph"
+
+msgid "failed to rename base commit-graph file"
+msgstr "falha ao renomear o arquivo commit-graph base"
+
+msgid "failed to rename temporary commit-graph file"
+msgstr "falha ao renomear o arquivo commit-graph temporário"
+
+#, c-format
+msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits"
+msgstr ""
+"não é possível fazer o merge de grafos com %<PRIuMAX>, %<PRIuMAX> commits"
+
+#, c-format
+msgid "cannot merge graph %s, too many commits: %<PRIuMAX>"
+msgstr "não é possível fazer o merge do grafo %s, muitos commits: %<PRIuMAX>"
+
+msgid "Scanning merged commits"
+msgstr "Examinando commits mesclados"
+
+msgid "Merging commit-graph"
+msgstr "Fazendo merge do commit-graph"
+
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+"tentando gravar um commit-graph, mas o 'core.commitGraph' está desativado"
+
+#, c-format
+msgid ""
+"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' "
+"(%d) is not supported"
+msgstr ""
+"tentando gravar um commit-graph, mas 'commitGraph.changedPathsVersion' (%d) "
+"não tem suporte"
+
+msgid "too many commits to write graph"
+msgstr "muitos commits para gravar o grafo"
+
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr ""
+"o arquivo commit-graph tem um checksum incorreto e provavelmente está "
+"corrompido"
+
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "o commit-graph tem uma ordem de OID incorreta: %s depois %s"
+
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr "o commit-graph tem um valor de fanout incorreto: fanout[%d] = %u != %u"
+
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "falha ao analisar o commit %s do commit-graph"
+
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+"falha ao analisar o commit %s do banco de dados de objetos para o commit-"
+"graph"
+
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr "o OID da tree raiz para o commit %s no commit-graph é %s != %s"
+
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "a lista de pais no commit-graph para o commit %s é longa demais"
+
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "o pai no commit-graph para %s é %s != %s"
+
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr ""
+"a lista de pais no commit-graph para o commit %s termina prematuramente"
+
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr "a geração do commit-graph para o commit %s é %<PRIuMAX> < %<PRIuMAX>"
+
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+"a data do commit para o commit %s no commit-graph é %<PRIuMAX> != %<PRIuMAX>"
+
+#, c-format
+msgid ""
+"commit-graph has both zero and non-zero generations (e.g., commits '%s' and "
+"'%s')"
+msgstr "o commit-graph tem gerações zero e não zero (ex., commits '%s' e '%s')"
+
+msgid "Verifying commits in commit graph"
+msgstr "Verificando commits no commit graph"
+
+#, c-format
+msgid "could not parse commit %s"
+msgstr "não foi possível analisar o commit %s"
+
+msgid "commit ancestry contains a cycle"
+msgstr "a ancestralidade do commit contém um ciclo"
+
+msgid "failed to check reachability"
+msgstr "falha ao verificar a alcançabilidade"
+
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "o objeto %s é um %s, não um %s"
+
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s não é um commit!"
+
+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 set advice.graftFileDeprecated false\""
+msgstr ""
+"O suporte para <GIT_DIR>/info/grafts foi descontinuado\n"
+"e será removido em uma versão futura do Git.\n"
+"\n"
+"Por favor, use \"git replace --convert-graft-file\"\n"
+"para converter os grafts em refs replace.\n"
+"\n"
+"Desative esta mensagem executando\n"
+"\"git config set advice.graftFileDeprecated false\""
+
+#, c-format
+msgid "commit %s exists in commit-graph but not in the object database"
+msgstr ""
+"o commit %s existe no commit-graph, mas não no banco de dados de objetos"
+
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr "O commit %s tem uma assinatura GPG não confiável, supostamente de %s."
+
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "O commit %s tem uma assinatura GPG ruim, supostamente de %s."
+
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "O commit %s não tem uma assinatura GPG."
+
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "O commit %s tem uma boa assinatura GPG de %s\n"
+
+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 ""
+"Aviso: a mensagem do commit não estava em conformidade com UTF-8.\n"
+"Você pode querer alterá-la após corrigir a mensagem, ou definir a\n"
+"variável de configuração i18n.commitEncoding para a codificação que seu "
+"projeto usa.\n"
+
+msgid "no compiler information available\n"
+msgstr "nenhuma informação de compilador disponível\n"
+
+msgid "no libc information available\n"
+msgstr "nenhuma informação de libc disponível\n"
+
+#, c-format
+msgid "could not determine free disk size for '%s'"
+msgstr "não foi possível determinar o espaço livre em disco para '%s'"
+
+#, c-format
+msgid "could not get info for '%s'"
+msgstr "não foi possível obter informações de '%s'"
+
+#, c-format
+msgid "[GLE %ld] health thread could not open '%ls'"
+msgstr "[GLE %ld] a thread de integridade não conseguiu abrir '%ls'"
+
+#, c-format
+msgid "[GLE %ld] health thread getting BHFI for '%ls'"
+msgstr "[GLE %ld] a thread de integridade está obtendo BHFI para '%ls'"
+
+#, c-format
+msgid "could not convert to wide characters: '%s'"
+msgstr "não foi possível converter para caracteres largos: '%s'"
+
+#, c-format
+msgid "BHFI changed '%ls'"
+msgstr "BHFI mudou '%ls'"
+
+#, c-format
+msgid "unhandled case in 'has_worktree_moved': %d"
+msgstr "caso não tratado em 'has_worktree_moved': %d"
+
+#, c-format
+msgid "health thread wait failed [GLE %ld]"
+msgstr "falha na espera da thread de integridade [GLE %ld]"
+
+#, c-format
+msgid "Invalid path: %s"
+msgstr "Caminho inválido: %s"
+
+msgid "Unable to create FSEventStream."
+msgstr "Não foi possível criar o FSEventStream."
+
+msgid "Failed to start the FSEventStream"
+msgstr "Falha ao iniciar o FSEventStream"
+
+msgid "inotify watch limit reached; increase fs.inotify.max_user_watches"
+msgstr ""
+"limite de watch do inotify atingido; aumente fs.inotify.max_user_watches"
+
+#, c-format
+msgid "inotify_add_watch('%s') failed"
+msgstr "inotify_add_watch('%s') falhou"
+
+msgid "inotify_rm_watch() failed"
+msgstr "inotify_rm_watch() falhou"
+
+#, c-format
+msgid "opendir('%s') failed"
+msgstr "opendir('%s') falhou"
+
+#, c-format
+msgid "lstat('%s') failed"
+msgstr "lstat('%s') falhou"
+
+#, c-format
+msgid "closedir('%s') failed"
+msgstr "closedir('%s') falhou"
+
+msgid "inotify_init1() failed"
+msgstr "inotify_init1() falhou"
+
+msgid "closing inotify file descriptor failed"
+msgstr "falha ao fechar o descritor de arquivo inotify"
+
+msgid "reading inotify message stream failed"
+msgstr "falha ao ler o stream de mensagens inotify"
+
+msgid "polling inotify message stream failed"
+msgstr "falha ao consultar o stream de mensagens inotify"
+
+#, c-format
+msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'"
+msgstr "[GLE %ld] não foi possível converter o caminho para UTF-8: '%.*ls'"
+
+#, c-format
+msgid "[GLE %ld] could not watch '%s'"
+msgstr "[GLE %ld] não foi possível observar '%s'"
+
+#, c-format
+msgid "[GLE %ld] could not get longname of '%s'"
+msgstr "[GLE %ld] não foi possível obter o longname de '%s'"
+
+#, c-format
+msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]"
+msgstr "ReadDirectoryChangedW falhou em '%s' [GLE %ld]"
+
+#, c-format
+msgid "GetOverlappedResult failed on '%s' [GLE %ld]"
+msgstr "GetOverlappedResult falhou em '%s' [GLE %ld]"
+
+#, c-format
+msgid "could not read directory changes [GLE %ld]"
+msgstr "não foi possível ler as alterações do diretório [GLE %ld]"
+
+#, c-format
+msgid "strbuf_readlink('%s') failed"
+msgstr "strbuf_readlink('%s') falhou"
+
+#, c-format
+msgid "[GLE %ld] unable to open for read '%ls'"
+msgstr "[GLE %ld] não foi possível abrir para leitura '%ls'"
+
+#, c-format
+msgid "[GLE %ld] unable to get protocol information for '%ls'"
+msgstr ""
+"[GLE %ld] não foi possível obter as informações de protocolo para '%ls'"
+
+#, c-format
+msgid "failed to copy SID (%ld)"
+msgstr "falha ao copiar o SID (%ld)"
+
+#, c-format
+msgid "failed to get owner for '%s' (%ld)"
+msgstr "falha ao obter o proprietário de '%s' (%ld)"
+
+msgid "memory exhausted"
+msgstr "memória esgotada"
+
+msgid "Success"
+msgstr "Sucesso"
+
+msgid "No match"
+msgstr "Sem correspondência"
+
+msgid "Invalid regular expression"
+msgstr "Expressão regular inválida"
+
+msgid "Invalid collation character"
+msgstr "Caractere de agrupamento inválido"
+
+msgid "Invalid character class name"
+msgstr "Nome de classe de caractere inválido"
+
+msgid "Trailing backslash"
+msgstr "Barra invertida final"
+
+msgid "Invalid back reference"
+msgstr "Referência retroativa inválida"
+
+msgid "Unmatched [ or [^"
+msgstr "[ ou [^ sem correspondência"
+
+msgid "Unmatched ( or \\("
+msgstr "( ou \\( sem correspondência"
+
+msgid "Unmatched \\{"
+msgstr "\\{ sem correspondência"
+
+msgid "Invalid content of \\{\\}"
+msgstr "Conteúdo inválido de \\{\\}"
+
+msgid "Invalid range end"
+msgstr "Fim de intervalo inválido"
+
+msgid "Memory exhausted"
+msgstr "Memória esgotada"
+
+msgid "Invalid preceding regular expression"
+msgstr "Expressão regular precedente inválida"
+
+msgid "Premature end of regular expression"
+msgstr "Fim prematuro da expressão regular"
+
+msgid "Regular expression too big"
+msgstr "Expressão regular grande demais"
+
+msgid "Unmatched ) or \\)"
+msgstr ") ou \\) sem correspondência"
+
+msgid "No previous regular expression"
+msgstr "Nenhuma expressão regular anterior"
+
+msgid "could not send IPC command"
+msgstr "não foi possível enviar o comando IPC"
+
+msgid "could not read IPC response"
+msgstr "não foi possível ler a resposta IPC"
+
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "não foi possível iniciar accept_thread '%s'"
+
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr "não foi possível iniciar worker[0] para '%s'"
+
+#, c-format
+msgid "ConnectNamedPipe failed for '%s' (%lu)"
+msgstr "ConnectNamedPipe falhou para '%s' (%lu)"
+
+#, c-format
+msgid "could not create fd from pipe for '%s'"
+msgstr "não foi possível criar o fd a partir do pipe para '%s'"
+
+#, c-format
+msgid "could not start thread[0] for '%s'"
+msgstr "não foi possível iniciar thread[0] para '%s'"
+
+#, c-format
+msgid "wait for hEvent failed for '%s'"
+msgstr "falha ao aguardar hEvent para '%s'"
+
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr ""
+"não é possível retomar em segundo plano, por favor, use 'fg' para retomar"
+
+msgid "cannot restore terminal settings"
+msgstr "não é possível restaurar as configurações do terminal"
+
+#, 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 ""
+"profundidade máxima de inclusão (%d) excedida ao incluir\n"
+"\t%s\n"
+"de\n"
+"\t%s\n"
+"Isso pode ser devido a inclusões circulares."
+
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "não foi possível expandir o caminho de include '%s'"
+
+msgid "relative config includes must come from files"
+msgstr "as inclusões de configuração relativas devem vir de arquivos"
+
+msgid "relative config include conditionals must come from files"
+msgstr ""
+"as condicionais de inclusão de configuração relativas devem vir de arquivos"
+
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"as URLs do remoto não podem ser configuradas em arquivo direta ou "
+"indiretamente incluído por includeIf.hasconfig:remote.*.url"
+
+#, c-format
+msgid "invalid config format: %s"
+msgstr "formato de configuração inválido: %s"
+
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "nome da variável de ambiente ausente para a configuração '%.*s'"
+
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "variável de ambiente '%s' ausente para a configuração '%.*s'"
+
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "a chave não contém uma seção: %s"
+
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "a chave não contém o nome da variável: %s"
+
+#, c-format
+msgid "invalid key: %s"
+msgstr "chave inválida: %s"
+
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "chave inválida (nova linha): %s"
+
+msgid "empty config key"
+msgstr "chave de configuração vazia"
+
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "parâmetro de configuração falso: %s"
+
+#, c-format
+msgid "bogus format in %s"
+msgstr "formato falso em %s"
+
+#, c-format
+msgid "bogus count in %s"
+msgstr "contagem falsa em %s"
+
+#, c-format
+msgid "too many entries in %s"
+msgstr "muitas entradas em %s"
+
+#, c-format
+msgid "missing config key %s"
+msgstr "chave de configuração %s ausente"
+
+#, c-format
+msgid "missing config value %s"
+msgstr "valor de configuração %s ausente"
+
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "linha de configuração inválida %d no blob %s"
+
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "linha de configuração inválida %d no arquivo %s"
+
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "linha de configuração inválida %d na entrada padrão"
+
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "linha de configuração inválida %d no submodule-blob %s"
+
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "linha de configuração inválida %d na linha de comando %s"
+
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "linha de configuração inválida %d em %s"
+
+msgid "out of range"
+msgstr "fora do intervalo"
+
+msgid "invalid unit"
+msgstr "unidade inválida"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "valor numérico de configuração inválido '%s' para '%s': %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "valor numérico de configuração inválido '%s' para '%s' no blob %s: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr ""
+"valor numérico de configuração inválido '%s' para '%s' no arquivo %s: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr ""
+"valor numérico de configuração inválido '%s' para '%s' na entrada padrão: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr ""
+"valor numérico de configuração inválido '%s' para '%s' no submodule-blob %s: "
+"%s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr ""
+"valor numérico de configuração inválido '%s' para '%s' na linha de comando "
+"%s: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "valor numérico de configuração inválido '%s' para '%s' em %s: %s"
+
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "falha ao expandir o diretório do usuário em: '%s'"
+
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%s' para '%s' não é um timestamp válido"
+
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "não foi possível carregar o objeto blob de configuração '%s'"
+
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "a referência '%s' não aponta para um blob"
+
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "não foi possível resolver o blob de configuração '%s'"
+
+msgid "unable to parse command-line config"
+msgstr "não foi possível analisar a configuração da linha de comando"
+
+#, c-format
+msgid ""
+"\n"
+"To use the default comment string (#) please run\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"Para usar a string de comentário padrão (#) por favor, execute\n"
+"\n"
+"%s"
+
+msgid "<comment string>"
+msgstr "<comment string>"
+
+#, c-format
+msgid ""
+"\n"
+"To set a custom comment string please run\n"
+"\n"
+"%s\n"
+"where '%s' is the string you wish to use.\n"
+msgstr ""
+"\n"
+"Para definir uma string de comentário personalizada, por favor, execute\n"
+"\n"
+"%s\n"
+"onde '%s' é a string que você deseja usar.\n"
+
+#, c-format
+msgid "Support for '%s=auto' has been removed in Git 3.0"
+msgstr "O suporte para '%s=auto' foi removido no Git 3.0"
+
+#, c-format
+msgid "Support for '%s=auto' is deprecated and will be removed in Git 3.0"
+msgstr "O suporte para '%s=auto' foi descontinuado e será removido no Git 3.0"
+
+msgid "unknown error occurred while reading the configuration files"
+msgstr "ocorreu um erro desconhecido ao ler os arquivos de configuração"
+
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "%s inválido: '%s'"
+
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr "o valor de splitIndex.maxPercentChange '%d' deve estar entre 0 e 100"
+
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "não foi possível analisar '%s' da configuração da linha de comando"
+
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "variável de configuração inválida '%s' no arquivo '%s' na linha %d"
+
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "nome de seção inválido '%s'"
+
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s tem múltiplos valores"
+
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "falha ao gravar o novo arquivo de configuração %s"
+
+#, c-format
+msgid "no multi-line comment allowed: '%s'"
+msgstr "nenhum comentário de múltiplas linhas permitido: '%s'"
+
+#, c-format
+msgid "could not lock config file %s"
+msgstr "não foi possível bloquear o arquivo de configuração %s"
+
+#, c-format
+msgid "opening %s"
+msgstr "abrindo %s"
+
+#, c-format
+msgid "invalid config file %s"
+msgstr "arquivo de configuração inválido %s"
+
+#, c-format
+msgid "fstat on %s failed"
+msgstr "fstat em %s falhou"
+
+#, c-format
+msgid "unable to mmap '%s'%s"
+msgstr "não foi possível executar mmap em '%s'%s"
+
+#, c-format
+msgid "chmod on %s failed"
+msgstr "chmod em %s falhou"
+
+#, c-format
+msgid "could not write config file %s"
+msgstr "não foi possível gravar o arquivo de configuração %s"
+
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "não foi possível definir '%s' como '%s'"
+
+#, c-format
+msgid "invalid section name: %s"
+msgstr "nome de seção inválido: %s"
+
+#, c-format
+msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>"
+msgstr ""
+"recusando-se a trabalhar com linha excessivamente longa em '%s' na linha "
+"%<PRIuMAX>"
+
+#, c-format
+msgid "missing value for '%s'"
+msgstr "valor ausente para '%s'"
+
+msgid "the remote end hung up upon initial contact"
+msgstr "o remoto encerrou a conexão no contato inicial"
+
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"Não foi possível ler do repositório remoto.\n"
+"\n"
+"Por favor, certifique-se de que você tem os direitos de acesso corretos\n"
+"e que o repositório existe."
+
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "o servidor não suporta '%s'"
+
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "servidor não suporta a funcionalidade '%s'"
+
+msgid "expected flush after capabilities"
+msgstr "flush esperado após capacidades"
+
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "ignorando capacidades após a primeira linha '%s'"
+
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "erro de protocolo: capabilities^{} inesperado"
+
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr "erro de protocolo: shallow sha-1 esperado, obtido '%s'"
+
+msgid "repository on the other end cannot be shallow"
+msgstr "repositório na outra ponta não pode ser shallow"
+
+msgid "invalid packet"
+msgstr "pacote inválido"
+
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "erro de protocolo: '%s' inesperado"
+
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "formato de objeto '%s' desconhecido especificado pelo servidor"
+
+#, c-format
+msgid "error on bundle-uri response line %d: %s"
+msgstr "erro na linha de resposta de bundle-uri %d: %s"
+
+msgid "expected flush after bundle-uri listing"
+msgstr "flush esperado após listagem de bundle-uri"
+
+msgid "expected response end packet after ref listing"
+msgstr "pacote de fim de resposta esperado após listagem de ref"
+
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "resposta ls-refs inválida: %s"
+
+msgid "expected flush after ref listing"
+msgstr "flush esperado após listagem de ref"
+
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "algoritmos incompatíveis: cliente %s; servidor %s"
+
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "o servidor não suporta o algoritmo '%s'"
+
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "não foi possível definir SO_KEEPALIVE no soquete"
+
+#, c-format
+msgid "Looking up %s ... "
+msgstr "Procurando %s ... "
+
+#, c-format
+msgid "unable to look up %s (port %s) (%s)"
+msgstr "não foi possível localizar %s (porta %s) (%s)"
+
+#. TRANSLATORS: this is the end of "Looking up %s ... "
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"concluído.\n"
+"Conectando a %s (porta %s) ... "
+
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"não foi possível conectar a %s:\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+msgid "done."
+msgstr "concluído."
+
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "não foi possível localizar %s (%s)"
+
+#, c-format
+msgid "unknown port %s"
+msgstr "porta desconhecida %s"
+
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "hostname estranho '%s' bloqueado"
+
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "porta estranha '%s' bloqueada"
+
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "não é possível iniciar o proxy %s"
+
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "o protocolo '%s' não é suportado"
+
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr ""
+"nenhum caminho especificado; consulte 'git help pull' para a sintaxe de URL "
+"válida"
+
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "nova linha é proibida em hosts git:// e caminhos de repositório"
+
+msgid "ssh variant 'simple' does not support -4"
+msgstr "variante ssh 'simple' não suporta -4"
+
+msgid "ssh variant 'simple' does not support -6"
+msgstr "variante ssh 'simple' não suporta -6"
+
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "variante ssh 'simple' não suporta a definição de porta"
+
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "nome de caminho estranho '%s' bloqueado"
+
+msgid "unable to fork"
+msgstr "não foi possível fazer fork"
+
+msgid "Could not run 'git rev-list'"
+msgstr "Não foi possível executar 'git rev-list'"
+
+msgid "failed write to rev-list"
+msgstr "falha ao gravar no rev-list"
+
+msgid "failed to close rev-list's stdin"
+msgstr "falha ao fechar a stdin do rev-list"
+
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr "crlf_action %d ilegal"
+
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "CRLF seria substituído por LF em %s"
+
+#, c-format
+msgid ""
+"in the working copy of '%s', CRLF will be replaced by LF the next time Git "
+"touches it"
+msgstr ""
+"na cópia de trabalho de '%s', CRLF será substituído por LF da próxima vez "
+"que o Git tocá-lo"
+
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF seria substituído por CRLF em %s"
+
+#, c-format
+msgid ""
+"in the working copy of '%s', LF will be replaced by CRLF the next time Git "
+"touches it"
+msgstr ""
+"na cópia de trabalho de '%s', LF será substituído por CRLF da próxima vez "
+"que o Git tocá-lo"
+
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "BOM é proibido em '%s' se codificado como %s"
+
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr ""
+"O arquivo '%s' contém uma marca de ordem de byte (BOM). Por favor, use UTF-"
+"%.*s como working-tree-encoding."
+
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "BOM é obrigatório em '%s' se codificado como %s"
+
+#, 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 ""
+"O arquivo '%s' está sem uma marca de ordem de byte (BOM). Por favor, use UTF-"
+"%sBE ou UTF-%sLE (dependendo da ordem dos bytes) como working-tree-encoding."
+
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "falha ao codificar '%s' de %s para %s"
+
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr "codificação '%s' de %s para %s e vice-versa não é a mesma"
+
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "não é possível fazer fork para executar o filtro externo '%s'"
+
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr "não é possível alimentar a entrada para o filtro externo '%s'"
+
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "filtro externo '%s' falhou %d"
+
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr "leitura do filtro externo '%s' falhou"
+
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "filtro externo '%s' falhou"
+
+msgid "unexpected filter type"
+msgstr "tipo de filtro inesperado"
+
+msgid "path name too long for external filter"
+msgstr "nome de caminho muito longo para o filtro externo"
+
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+"o filtro externo '%s' não está mais disponível, embora nem todos os caminhos "
+"tenham sido filtrados"
+
+msgid "true/false are no valid working-tree-encodings"
+msgstr "true/false não são working-tree-encodings válidos"
+
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr "%s: filtro clean '%s' falhou"
+
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s: filtro smudge %s falhou"
+
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "ignorando busca de credencial para a chave: credential.%s"
+
+msgid "refusing to work with credential missing host field"
+msgstr "recusando-se a trabalhar com credencial sem o campo host"
+
+msgid "refusing to work with credential missing protocol field"
+msgstr "recusando-se a trabalhar com credencial sem o campo protocol"
+
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "URL contém uma nova linha em seu componente %s: %s"
+
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "URL não possui esquema: %s"
+
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "URL da credencial não pode ser analisada: %s"
+
+#, c-format
+msgid "invalid timeout '%s', expecting a non-negative integer"
+msgstr "tempo limite '%s' inválido, esperando um inteiro não negativo"
+
+#, c-format
+msgid "invalid init-timeout '%s', expecting a non-negative integer"
+msgstr "init-timeout '%s' inválido, esperando um inteiro não negativo"
+
+#, c-format
+msgid "invalid max-connections '%s', expecting an integer"
+msgstr "max-connections '%s' inválido, esperando um inteiro"
+
+msgid "in the future"
+msgstr "no futuro"
+
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> segundo atrás"
+msgstr[1] "%<PRIuMAX> segundos atrás"
+
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> minuto atrás"
+msgstr[1] "%<PRIuMAX> minutos atrás"
+
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> hora atrás"
+msgstr[1] "%<PRIuMAX> horas atrás"
+
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> dia atrás"
+msgstr[1] "%<PRIuMAX> dias atrás"
+
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> semana atrás"
+msgstr[1] "%<PRIuMAX> semanas atrás"
+
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX> mês atrás"
+msgstr[1] "%<PRIuMAX> meses atrás"
+
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> ano"
+msgstr[1] "%<PRIuMAX> anos"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s, %<PRIuMAX> mês atrás"
+msgstr[1] "%s, %<PRIuMAX> meses atrás"
+
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> ano atrás"
+msgstr[1] "%<PRIuMAX> anos atrás"
+
+msgid "Propagating island marks"
+msgstr "Propagando marcas de island"
+
+#, c-format
+msgid "bad tree object %s"
+msgstr "objeto tree inválido %s"
+
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr "falha ao carregar a regex de island para '%s': %s"
+
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+"a regex de island da configuração tem muitos grupos de captura (máx=%d)"
+
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr "%d islands marcados, concluído.\n"
+
+#, c-format
+msgid "invalid --%s value '%s'"
+msgstr "valor inválido para --%s: '%s'"
+
+#, c-format
+msgid "could not archive missing directory '%s'"
+msgstr "não foi possível arquivar o diretório ausente '%s'"
+
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "não foi possível abrir o diretório '%s'"
+
+#, c-format
+msgid "skipping '%s', which is neither file nor directory"
+msgstr "ignorando '%s', que não é um arquivo nem diretório"
+
+#, c-format
+msgid "could not add directory '%s' to archiver"
+msgstr "não foi possível adicionar o diretório '%s' ao arquivador"
+
+msgid "failed to write archive"
+msgstr "falha ao gravar o arquivo compactado"
+
+msgid "max-depth is not supported for worktree diffs"
+msgstr "max-depth não é suportado para diffs de worktree"
+
+msgid "max-depth is not supported for index diffs"
+msgstr "max-depth não é suportado para diffs de índice"
+
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base não funciona com intervalos"
+
+msgid "unable to get HEAD"
+msgstr "não foi possível obter o HEAD"
+
+msgid "no merge base found"
+msgstr "nenhuma base de merge encontrada"
+
+msgid "multiple merge bases found"
+msgstr "múltiplas bases de merge encontradas"
+
+msgid "cannot compare stdin to a directory"
+msgstr "não é possível comparar stdin com um diretório"
+
+msgid "cannot compare a named pipe to a directory"
+msgstr "não é possível comparar um pipe nomeado a um diretório"
+
+msgid "git diff --no-index [<options>] <path> <path> [<pathspec>...]"
+msgstr "git diff --no-index [<options>] <path> <path> [<pathspec>...]"
+
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"Não é um repositório git. Use --no-index para comparar dois caminhos fora de "
+"uma árvore de trabalho"
+
+msgid ""
+"Limiting comparison with pathspecs is only supported if both paths are "
+"directories."
+msgstr ""
+"A limitação da comparação com pathspecs só é suportada se ambos os caminhos "
+"forem diretórios."
+
+#, c-format
+msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr "  Falha ao analisar a porcentagem de corte do dirstat '%s'\n"
+
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  Parâmetro dirstat desconhecido '%s'\n"
+
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"a configuração color moved deve ser uma de 'no', 'default', 'blocks', "
+"'zebra', 'dimmed-zebra', 'plain'"
+
+#, 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 ""
+"modo color-moved-ws '%s' desconhecido, os valores possíveis são 'ignore-"
+"space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
+"change'"
+
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr ""
+"color-moved-ws: allow-indentation-change não pode ser combinado com outros "
+"modos de espaço em branco"
+
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr ""
+"Valor desconhecido para a variável de configuração 'diff.submodule': '%s'"
+
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"Erros encontrados na variável de configuração 'diff.dirstat':\n"
+"%s"
+
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "diff externo morreu, parando em %s"
+
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow requer exatamente um pathspec"
+
+#, c-format
+msgid "pathspec magic not supported by --follow: %s"
+msgstr "mágica de pathspec não suportada por --follow: %s"
+
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "as opções '%s', '%s', '%s' e '%s' não podem ser usadas juntas"
+
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "as opções '%s' e '%s' não podem ser usadas juntas, use '%s' com '%s'"
+
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr ""
+"as opções '%s' e '%s' não podem ser usadas juntas, use '%s' com '%s' e '%s'"
+
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "valor inválido para --stat: %s"
+
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s espera um valor numérico"
+
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"Falha ao analisar o parâmetro da opção --dirstat/-X:\n"
+"%s"
+
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "classe de alteração '%c' desconhecida em --diff-filter=%s"
+
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "valor desconhecido após ws-error-highlight=%.*s"
+
+msgid "--find-object requires a git repository"
+msgstr "--find-object requer um repositório git"
+
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "não foi possível resolver '%s'"
+
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s espera o formato <n>/<m>"
+
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s espera um caractere, obteve '%s'"
+
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "argumento --color-moved inválido: %s"
+
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "modo '%s' inválido em --color-moved-ws"
+
+#, c-format
+msgid "invalid argument to %s"
+msgstr "argumento inválido para %s"
+
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "regex inválida fornecida a -I: '%s'"
+
+msgid "-G requires a non-empty argument"
+msgstr "-G requer um argumento não vazio"
+
+msgid "-S requires a non-empty argument"
+msgstr "-S requer um argumento não vazio"
+
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "falha ao analisar o parâmetro da opção --submodule: '%s'"
+
+#, c-format
+msgid "%s expects a non-negative integer"
+msgstr "%s espera um inteiro não negativo"
+
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "argumento --word-diff inválido: %s"
+
+msgid "Diff output format options"
+msgstr "Opções de formato de saída do diff"
+
+msgid "generate patch"
+msgstr "gerar patch"
+
+msgid "<n>"
+msgstr "<n>"
+
+msgid "generate diffs with <n> lines context"
+msgstr "gerar diffs com contexto de <n> linhas"
+
+msgid "generate the diff in raw format"
+msgstr "gerar o diff em formato bruto"
+
+msgid "synonym for '-p --raw'"
+msgstr "sinônimo para '-p --raw'"
+
+msgid "synonym for '-p --stat'"
+msgstr "sinônimo para '-p --stat'"
+
+msgid "machine friendly --stat"
+msgstr "--stat legível por máquina"
+
+msgid "output only the last line of --stat"
+msgstr "exibir apenas a última linha de --stat"
+
+msgid "<param1>,<param2>..."
+msgstr "<param1>,<param2>..."
+
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr ""
+"exibir a distribuição da quantidade relativa de alterações para cada "
+"subdiretório"
+
+msgid "synonym for --dirstat=cumulative"
+msgstr "sinônimo para --dirstat=cumulative"
+
+msgid "synonym for --dirstat=files,<param1>,<param2>..."
+msgstr "sinônimo para --dirstat=files,<param1>,<param2>..."
+
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+"avisar se as alterações introduzirem marcadores de conflito ou erros de "
+"espaço em branco"
+
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr "resumo condensado como criações, renomeações e alterações de modo"
+
+msgid "show only names of changed files"
+msgstr "exibir apenas os nomes dos arquivos alterados"
+
+msgid "show only names and status of changed files"
+msgstr "exibir apenas os nomes e o status dos arquivos alterados"
+
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<width>[,<name-width>[,<count>]]"
+
+msgid "generate diffstat"
+msgstr "gerar diffstat"
+
+msgid "<width>"
+msgstr "<width>"
+
+msgid "generate diffstat with a given width"
+msgstr "gerar diffstat com uma largura fornecida"
+
+msgid "generate diffstat with a given name width"
+msgstr "gerar diffstat com uma largura de nome fornecida"
+
+msgid "generate diffstat with a given graph width"
+msgstr "gerar diffstat com uma largura de gráfico fornecida"
+
+msgid "<count>"
+msgstr "<count>"
+
+msgid "generate diffstat with limited lines"
+msgstr "gerar diffstat com linhas limitadas"
+
+msgid "generate compact summary in diffstat"
+msgstr "gerar resumo compacto no diffstat"
+
+msgid "output a binary diff that can be applied"
+msgstr "exibir um diff binário que pode ser aplicado"
+
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr ""
+"exibir nomes completos de objetos da pré e pós-imagem nas linhas \"index\""
+
+msgid "show colored diff"
+msgstr "exibir diff colorido"
+
+msgid "<kind>"
+msgstr "<kind>"
+
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+"destacar erros de espaço em branco nas linhas de 'context', 'old' ou 'new' "
+"no diff"
+
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"não modificar nomes de caminho e usar NULs como terminadores de campo de "
+"saída em --raw ou --numstat"
+
+msgid "<prefix>"
+msgstr "<prefix>"
+
+msgid "show the given source prefix instead of \"a/\""
+msgstr "exibir o prefixo de origem fornecido em vez de \"a/\""
+
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "exibir o prefixo de destino fornecido em vez de \"b/\""
+
+msgid "prepend an additional prefix to every line of output"
+msgstr "anexar um prefixo adicional ao início de cada linha de saída"
+
+msgid "do not show any source or destination prefix"
+msgstr "não exibir nenhum prefixo de origem ou destino"
+
+msgid "use default prefixes a/ and b/"
+msgstr "usar os prefixos padrão a/ e b/"
+
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr ""
+"exibir contexto entre os hunks do diff até o número de linhas especificado"
+
+msgid "<char>"
+msgstr "<char>"
+
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "especificar o caractere para indicar uma nova linha em vez de '+'"
+
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "especificar o caractere para indicar uma linha antiga em vez de '-'"
+
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "especificar o caractere para indicar um contexto em vez de ' '"
+
+msgid "Diff rename options"
+msgstr "Opções de renomeação do diff"
+
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr ""
+"quebrar alterações de reescrita completas em pares de exclusão e criação"
+
+msgid "detect renames"
+msgstr "detectar renomeações"
+
+msgid "omit the preimage for deletes"
+msgstr "omitir a pré-imagem para exclusões"
+
+msgid "detect copies"
+msgstr "detectar cópias"
+
+msgid "use unmodified files as source to find copies"
+msgstr "usar arquivos não modificados como origem para encontrar cópias"
+
+msgid "disable rename detection"
+msgstr "desativar detecção de renomeação"
+
+msgid "use empty blobs as rename source"
+msgstr "usar blobs vazios como origem de renomeação"
+
+msgid "continue listing the history of a file beyond renames"
+msgstr "continuar listando o histórico de um arquivo além das renomeações"
+
+msgid ""
+"limit to cheap rename/copy detection if the number of rename/copy targets "
+"exceeds this value"
+msgstr ""
+"limita à detecção barata de renomeação/cópia se o número de destinos de "
+"renomeação/cópia exceder este valor"
+
+msgid "Diff algorithm options"
+msgstr "Opções de algoritmo do diff"
+
+msgid "produce the smallest possible diff"
+msgstr "produzir o menor diff possível"
+
+msgid "ignore whitespace when comparing lines"
+msgstr "ignorar espaços em branco ao comparar linhas"
+
+msgid "ignore changes in amount of whitespace"
+msgstr "ignorar alterações na quantidade de espaços em branco"
+
+msgid "ignore changes in whitespace at EOL"
+msgstr "ignorar alterações de espaço em branco no EOL"
+
+msgid "ignore carrier-return at the end of line"
+msgstr "ignorar retorno de carro no final da linha"
+
+msgid "ignore changes whose lines are all blank"
+msgstr "ignorar alterações cujas linhas estão todas em branco"
+
+msgid "<regex>"
+msgstr "<regex>"
+
+msgid "ignore changes whose all lines match <regex>"
+msgstr "ignorar alterações cujas linhas correspondam todas a <regex>"
+
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr ""
+"heurística para deslocar limites de pedaço do diff para facilitar a leitura"
+
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "gerar diff usando o algoritmo \"patience diff\""
+
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "gerar diff usando o algoritmo \"histogram diff\""
+
+msgid "<text>"
+msgstr "<text>"
+
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "gerar diff usando o algoritmo \"anchored diff\""
+
+msgid "<mode>"
+msgstr "<mode>"
+
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr "mostrar word diff, usando <mode> para delimitar as palavras alteradas"
+
+msgid "use <regex> to decide what a word is"
+msgstr "usar <regex> para decidir o que é uma palavra"
+
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>"
+
+msgid "moved lines of code are colored differently"
+msgstr "linhas de código movidas são coloridas de forma diferente"
+
+msgid "how white spaces are ignored in --color-moved"
+msgstr "como espaços em branco são ignorados em --color-moved"
+
+msgid "Other diff options"
+msgstr "Outras opções de diff"
+
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+"quando executado a partir de um subdiretório, excluir alterações externas e "
+"exibir caminhos relativos"
+
+msgid "treat all files as text"
+msgstr "tratar todos os arquivos como texto"
+
+msgid "swap two inputs, reverse the diff"
+msgstr "trocar duas entradas, inverter o diff"
+
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "sair com 1 se houver diferenças, 0 caso contrário"
+
+msgid "disable all output of the program"
+msgstr "desativar toda a saída do programa"
+
+msgid "allow an external diff helper to be executed"
+msgstr "permitir a execução de um auxiliar de diff externo"
+
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+"executar filtros externos de conversão de texto ao comparar arquivos binários"
+
+msgid "<when>"
+msgstr "<when>"
+
+msgid "ignore changes to submodules in the diff generation"
+msgstr "ignorar alterações em submódulos na geração do diff"
+
+msgid "<format>"
+msgstr "<format>"
+
+msgid "specify how differences in submodules are shown"
+msgstr "especificar como as diferenças em submódulos são exibidas"
+
+msgid "hide 'git add -N' entries from the index"
+msgstr "ocultar entradas 'git add -N' do índice"
+
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "tratar entradas 'git add -N' como reais no índice"
+
+msgid "<string>"
+msgstr "<string>"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+"procurar por diferenças que alteram o número de ocorrências da string "
+"especificada"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+"procurar por diferenças que alteram o número de ocorrências da regex "
+"especificada"
+
+msgid "show all changes in the changeset with -S or -G"
+msgstr "exibir todas as alterações no changeset com -S ou -G"
+
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "tratar <string> em -S como expressão regular POSIX estendida"
+
+msgid "control the order in which files appear in the output"
+msgstr "controlar a ordem em que os arquivos aparecem na saída"
+
+msgid "<path>"
+msgstr "<path>"
+
+msgid "show the change in the specified path first"
+msgstr "exibir a alteração no caminho especificado primeiro"
+
+msgid "skip the output to the specified path"
+msgstr "ignorar a saída para o caminho especificado"
+
+msgid "<object-id>"
+msgstr "<object-id>"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+"procurar por diferenças que alteram o número de ocorrências do objeto "
+"especificado"
+
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+msgid "select files by diff type"
+msgstr "selecionar arquivos por tipo de diff"
+
+msgid "<depth>"
+msgstr "<depth>"
+
+msgid "<file>"
+msgstr "<file>"
+
+msgid "output to a specific file"
+msgstr "saída para um arquivo específico"
+
+msgid "exhaustive rename detection was skipped due to too many files."
+msgstr ""
+"a detecção exaustiva de renomeação foi ignorada devido a muitos arquivos."
+
+msgid "only found copies from modified paths due to too many files."
+msgstr ""
+"apenas encontrou cópias de caminhos modificados devido a muitos arquivos."
+
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"talvez você queira definir sua variável %s para pelo menos %d e tentar o "
+"comando novamente."
+
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "falha ao ler o orderfile '%s'"
+
+msgid "Performing inexact rename detection"
+msgstr "Realizando detecção inexata de renomeação"
+
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "Nenhum caminho '%s' no diff"
+
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr "pathspec '%s' não correspondeu a nenhum arquivo conhecido pelo git"
+
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "padrão não reconhecido: '%s'"
+
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "padrão negativo não reconhecido: '%s'"
+
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+"seu arquivo de sparse-checkout pode ter problemas: o padrão '%s' está "
+"repetido"
+
+msgid "disabling cone pattern matching"
+msgstr "desativando correspondência de padrão de cone"
+
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "não é possível usar %s como arquivo de exclusão"
+
+msgid "failed to get kernel name and information"
+msgstr "falha ao obter nome e informações do kernel"
+
+msgid "untracked cache is disabled on this system or location"
+msgstr "o cache de não rastreados está desativado neste sistema ou local"
+
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Nenhum nome de diretório pôde ser adivinhado.\n"
+"Por favor, especifique um diretório na linha de comando"
+
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr "arquivo de índice corrompido no repositório %s"
+
+#, c-format
+msgid "could not create directories for %s"
+msgstr "não foi possível criar diretórios para %s"
+
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "não foi possível migrar o diretório git de '%s' para '%s'"
+
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "hint: Aguardando que seu editor feche o arquivo...%c"
+
+#, c-format
+msgid "could not edit '%s'"
+msgstr "não foi possível editar '%s'"
+
+msgid "Filtering content"
+msgstr "Filtrando conteúdo"
+
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "não foi possível executar stat no arquivo '%s'"
+
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr "caminho de namespace do git inválido \"%s\""
+
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "valor inválido para a variável %s"
+
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "ignorando componente core.fsync desconhecido '%s'"
+
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "comprimento da abreviação fora do intervalo: %d"
+
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "nível de compressão zlib inválido %d"
+
+#, c-format
+msgid "%s cannot contain newline"
+msgstr "%s não pode conter quebra de linha"
+
+#, c-format
+msgid "%s must have at least one character"
+msgstr "%s deve ter pelo menos um caractere"
+
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "ignorando valor core.fsyncMethod desconhecido '%s'"
+
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles está obsoleto; use core.fsync em vez disso"
+
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "modo inválido para criação de objeto: %s"
+
+#, c-format
+msgid "malformed value for %s"
+msgstr "valor malformado para %s"
+
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "valor malformado para %s: %s"
+
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "deve ser um de nothing, matching, simple, upstream ou current"
+
+#, c-format
+msgid "too many args to run %s"
+msgstr "argumentos demais para executar %s"
+
+msgid "unable to write request to remote"
+msgstr "não foi possível gravar a requisição no remoto"
+
+msgid "object-info capability is not enabled on the server"
+msgstr "a capacidade object-info não está ativada no servidor"
+
+msgid "object-info requires protocol v2"
+msgstr "object-info requer o protocolo v2"
+
+#, c-format
+msgid "object-info: expected %<PRIuMAX> attributes, got %<PRIuMAX>"
+msgstr "object-info: esperados %<PRIuMAX> atributos, obtidos %<PRIuMAX>"
+
+msgid "object-info: unrequested 'size' attribute"
+msgstr "object-info: atributo 'size' não solicitado"
+
+msgid "object-info: duplicate 'size' attribute"
+msgstr "object-info: atributo 'size' duplicado"
+
+msgid "object-info: unrequested 'type' attribute"
+msgstr "object-info: atributo 'type' não solicitado"
+
+msgid "object-info: duplicate 'type' attribute"
+msgstr "object-info: atributo 'type' duplicado"
+
+#, c-format
+msgid "object-info: unknown attribute '%s'"
+msgstr "object-info: atributo desconhecido '%s'"
+
+#, c-format
+msgid "object-info: expected %<PRIuMAX> objects, got %<PRIuMAX>"
+msgstr "object-info: esperados %<PRIuMAX> objetos, obtidos %<PRIuMAX>"
+
+#, c-format
+msgid "object-info: expected OID: %s, got %s"
+msgstr "object-info: OID esperado: %s, obtido %s"
+
+#, c-format
+msgid "object-info: object %s has invalid type '%s'"
+msgstr "object-info: o objeto %s tem o tipo inválido '%s'"
+
+#, c-format
+msgid "object-info: expected flush after %<PRIuMAX> objects"
+msgstr "object-info: esperado flush após %<PRIuMAX> objetos"
+
+#, c-format
+msgid ""
+"You are attempting to fetch %s, which is in the commit graph file but not in "
+"the object database.\n"
+"This is probably due to repo corruption.\n"
+"If you are attempting to repair this repo corruption by refetching the "
+"missing object, use 'git fetch --refetch' with the missing object."
+msgstr ""
+"Você está tentando fazer fetch de %s, que está no arquivo commit-graph mas "
+"não no banco de dados de objetos.\n"
+"Isso provavelmente se deve à corrupção do repositório.\n"
+"Se você estiver tentando reparar essa corrupção do repositório refazendo o "
+"fetch do objeto ausente, use 'git fetch --refetch' com o objeto ausente."
+
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: lista shallow esperada"
+
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack: esperava-se um pacote flush após a lista shallow"
+
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: esperava-se ACK/NAK, obteve um pacote flush"
+
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: esperado ACK/NAK, obtido '%s'"
+
+msgid "unable to write to remote"
+msgstr "não foi possível gravar no remoto"
+
+msgid "Server supports filter"
+msgstr "O servidor suporta filtro"
+
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "linha shallow inválida: %s"
+
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "linha unshallow inválida: %s"
+
+#, c-format
+msgid "error in object: %s"
+msgstr "erro no objeto: %s"
+
+#, c-format
+msgid "no shallow found: %s"
+msgstr "nenhum shallow encontrado: %s"
+
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "esperava-se shallow/unshallow, obteve %s"
+
+#, c-format
+msgid "got %s %d %s"
+msgstr "obteve %s %d %s"
+
+#, c-format
+msgid "invalid commit %s"
+msgstr "commit inválido %s"
+
+msgid "giving up"
+msgstr "desistindo"
+
+msgid "done"
+msgstr "concluído"
+
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "obteve %s (%d) %s"
+
+#, c-format
+msgid "Marking %s as complete"
+msgstr "Marcando %s como completo"
+
+#, c-format
+msgid "already have %s (%s)"
+msgstr "já tem %s (%s)"
+
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr ""
+"fetch-pack: não foi possível fazer fork do demultiplexador de banda lateral"
+
+msgid "protocol error: bad pack header"
+msgstr "erro de protocolo: cabeçalho de pack inválido"
+
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: não foi possível fazer fork de %s"
+
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: saída do index-pack inválida"
+
+#, c-format
+msgid "%s failed"
+msgstr "falha em %s"
+
+msgid "error in sideband demultiplexer"
+msgstr "erro no demultiplexador de banda lateral"
+
+#, c-format
+msgid "Server version is %.*s"
+msgstr "A versão do servidor é %.*s"
+
+#, c-format
+msgid "Server supports %s"
+msgstr "O servidor suporta %s"
+
+msgid "Server does not support shallow clients"
+msgstr "O servidor não suporta clientes shallow"
+
+msgid "Server does not support --shallow-since"
+msgstr "O servidor não suporta --shallow-since"
+
+msgid "Server does not support --shallow-exclude"
+msgstr "O servidor não suporta --shallow-exclude"
+
+msgid "Server does not support --deepen"
+msgstr "O servidor não suporta --deepen"
+
+msgid "Server does not support this repository's object format"
+msgstr "O servidor não suporta o formato de objeto deste repositório"
+
+msgid "no common commits"
+msgstr "nenhum commit em comum"
+
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: falha no fetch."
+
+msgid "Server does not support shallow requests"
+msgstr "O servidor não suporta solicitações shallow"
+
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "esperado '%s', recebido '%s'"
+
+#, c-format
+msgid "expected '%s'"
+msgstr "esperado '%s'"
+
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "linha de reconhecimento inesperada: '%s'"
+
+#, c-format
+msgid "error processing acks: %d"
+msgstr "erro ao processar reconhecimentos: %d"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "esperava-se que o packfile fosse enviado após '%s'"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr "esperava-se que nenhuma outra seção fosse enviada após nenhum '%s'"
+
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "erro ao processar informações shallow: %d"
+
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "esperado wanted-ref, obtido '%s'"
+
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "wanted-ref inesperada: '%s'"
+
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "erro ao processar refs desejadas: %d"
+
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: pacote de fim de resposta esperado"
+
+#, c-format
+msgid "couldn't resolve 'auto' filter '%s': %s"
+msgstr "não foi possível resolver o filtro 'auto' '%s': %s"
+
+msgid "no matching remote head"
+msgstr "nenhum head remoto correspondente"
+
+msgid "unexpected 'ready' from remote"
+msgstr "'ready' inesperado do remoto"
+
+#, c-format
+msgid "no such remote ref %s"
+msgstr "não há ref remota %s"
+
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "O servidor não permite solicitação de objeto não anunciado %s"
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr "fsmonitor_ipc__send_query: caminho inválido '%s'"
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr "fsmonitor_ipc__send_query: erro não especificado em '%s'"
+
+msgid "fsmonitor--daemon is not running"
+msgstr "fsmonitor--daemon não está em execução"
+
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "não foi possível enviar o comando '%s' para o fsmonitor--daemon"
+
+#, c-format
+msgid "bare repository '%s' is incompatible with fsmonitor"
+msgstr "o repositório bare '%s' é incompatível com o fsmonitor"
+
+#, c-format
+msgid "repository '%s' is incompatible with fsmonitor due to errors"
+msgstr "o repositório '%s' é incompatível com o fsmonitor devido a erros"
+
+#, c-format
+msgid "remote repository '%s' is incompatible with fsmonitor"
+msgstr "o repositório remoto '%s' é incompatível com o fsmonitor"
+
+#, c-format
+msgid "virtual repository '%s' is incompatible with fsmonitor"
+msgstr "o repositório virtual '%s' é incompatível com o fsmonitor"
+
+#, c-format
+msgid ""
+"socket directory '%s' is incompatible with fsmonitor due to lack of Unix "
+"sockets support"
+msgstr ""
+"o diretório de soquete '%s' é incompatível com o fsmonitor devido à falta de "
+"suporte a soquetes Unix"
+
+msgid ""
+"git [-v | --version] [-h | --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] [--no-"
+"lazy-fetch]\n"
+"           [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n"
+"           [--work-tree=<path>] [--namespace=<name>] [--config-"
+"env=<name>=<envvar>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [-v | --version] [-h | --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] [--no-"
+"lazy-fetch]\n"
+"           [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n"
+"           [--work-tree=<path>] [--namespace=<name>] [--config-"
+"env=<name>=<envvar>]\n"
+"           <command> [<args>]"
+
+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' e 'git help -g' listam os subcomandos disponíveis e alguns\n"
+"guias de conceito. Consulte 'git help <command>' ou 'git help <concept>'\n"
+"para ler sobre um subcomando ou conceito específico.\n"
+"Consulte 'git help git' para uma visão geral do sistema."
+
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "tipo de listagem de comando não suportado '%s'"
+
+#, c-format
+msgid "no directory given for '%s' option\n"
+msgstr "nenhum diretório fornecido para a opção '%s'\n"
+
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "nenhum namespace fornecido para --namespace\n"
+
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c espera uma string de configuração\n"
+
+#, c-format
+msgid "no config key given for --config-env\n"
+msgstr "nenhuma chave de configuração fornecida para --config-env\n"
+
+#, c-format
+msgid "no file given for '%s' option\n"
+msgstr "nenhum arquivo fornecido para a opção '%s'\n"
+
+#, c-format
+msgid "no attribute source given for --attr-source\n"
+msgstr "nenhuma fonte de atributo fornecida para --attr-source\n"
+
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "opção desconhecida: %s\n"
+
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "ao expandir o alias '%s': '%s'"
+
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"o alias '%s' altera variáveis de ambiente.\n"
+"Você pode usar '!git' no alias para fazer isso"
+
+#, c-format
+msgid "empty alias for %s"
+msgstr "alias vazio para %s"
+
+#, c-format
+msgid "recursive alias: %s"
+msgstr "alias recursivo: %s"
+
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr "loop de alias detectado: a expansão de '%s' não termina:%s"
+
+msgid "write failure on standard output"
+msgstr "falha de gravação na saída padrão"
+
+msgid "unknown write failure on standard output"
+msgstr "falha de gravação desconhecida na saída padrão"
+
+msgid "close failed on standard output"
+msgstr "falha ao fechar na saída padrão"
+
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "não é possível lidar com %s como um builtin"
+
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"uso: %s\n"
+"\n"
+
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr "falha na expansão do alias '%s'; '%s' não é um comando do git\n"
+
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "falha ao executar o comando '%s': %s\n"
+
+msgid "could not create temporary file"
+msgstr "não foi possível criar o arquivo temporário"
+
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "falha ao gravar a assinatura destacada em '%s'"
+
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile precisa estar configurado e existir para a "
+"verificação de assinatura ssh"
+
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh-keygen -Y find-principals/verify é necessário para a verificação de "
+"assinatura ssh (disponível na versão 8.2p1+ do openssh)"
+
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr ""
+"arquivo de revogação de assinatura ssh configurado, mas não encontrado: %s"
+
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "assinatura inválida/incompatível '%s'"
+
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "falha ao obter a impressão digital ssh da chave '%s'"
+
+#, c-format
+msgid "failed to get the ssh fingerprint for key %s"
+msgstr "falha ao obter a impressão digital ssh da chave %s"
+
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr "user.signingkey ou gpg.ssh.defaultKeyCommand precisa ser configurado"
+
+#, c-format
+msgid "malformed build-time gpg.ssh.defaultKeyCommand: %s"
+msgstr "gpg.ssh.defaultKeyCommand de tempo de compilação malformado: %s"
+
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+"gpg.ssh.defaultKeyCommand foi bem-sucedido, mas não retornou nenhuma chave: "
+"%s %s"
+
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "falha em gpg.ssh.defaultKeyCommand: %s %s"
+
+#, c-format
+msgid ""
+"gpg failed to sign the data:\n"
+"%s"
+msgstr ""
+"o gpg falhou ao assinar os dados:\n"
+"%s"
+
+msgid "user.signingKey needs to be set for ssh signing"
+msgstr "user.signingKey precisa ser definido para assinatura ssh"
+
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "falha ao gravar a chave de assinatura ssh em '%s'"
+
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "falha ao gravar o buffer da chave de assinatura ssh em '%s'"
+
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"ssh-keygen -Y sign é necessário para assinatura ssh (disponível na versão "
+"8.2p1+ do openssh)"
+
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "falha ao ler buffer de dados de assinatura ssh de '%s'"
+
+#, c-format
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "ignorada cor inválida '%.*s' em log.graphColors"
+
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"o padrão fornecido contém um byte NULL (via -f <file>). Isso só é suportado "
+"com -P sob PCRE v2"
+
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "'%s': não foi possível ler %s"
+
+#, c-format
+msgid "'%s': short read"
+msgstr "'%s': leitura curta"
+
+msgid "start a working area (see also: git help tutorial)"
+msgstr "iniciar uma área de trabalho (veja também: git help tutorial)"
+
+msgid "work on the current change (see also: git help everyday)"
+msgstr "trabalhar na alteração atual (veja também: git help everyday)"
+
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "examinar o histórico e estado (veja também: git help revisions)"
+
+msgid "grow, mark and tweak your common history"
+msgstr "aumentar, marcar e ajustar seu histórico comum"
+
+msgid "collaborate (see also: git help workflows)"
+msgstr "colaborar (veja também: git help workflows)"
+
+msgid "Main Porcelain Commands"
+msgstr "Comandos Porcelain Principais"
+
+msgid "Ancillary Commands / Manipulators"
+msgstr "Comandos Auxiliares / Manipuladores"
+
+msgid "Ancillary Commands / Interrogators"
+msgstr "Comandos Auxiliares / Interrogadores"
+
+msgid "Interacting with Others"
+msgstr "Interagindo com Outros"
+
+msgid "Low-level Commands / Manipulators"
+msgstr "Comandos de Baixo Nível / Manipuladores"
+
+msgid "Low-level Commands / Interrogators"
+msgstr "Comandos de Baixo Nível / Interrogadores"
+
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "Comandos de Baixo Nível / Sincronizando Repositórios"
+
+msgid "Low-level Commands / Internal Helpers"
+msgstr "Comandos de Baixo Nível / Auxiliares Internos"
+
+msgid "User-facing repository, command and file interfaces"
+msgstr "Interfaces de usuário para repositório, comandos e arquivos"
+
+msgid "Developer-facing file formats, protocols and other interfaces"
+msgstr ""
+"Formatos de arquivo, protocolos e outras interfaces para desenvolvedores"
+
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "comandos git disponíveis em '%s'"
+
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "comandos git disponíveis em outros lugares no seu $PATH"
+
+msgid "These are common Git commands used in various situations:"
+msgstr "Estes são os comandos comuns do Git usados em várias situações:"
+
+msgid "The Git concept guides are:"
+msgstr "Os guias de conceito do Git são:"
+
+msgid "User-facing repository, command and file interfaces:"
+msgstr "Interfaces de usuário para repositório, comandos e arquivos:"
+
+msgid "File formats, protocols and other developer interfaces:"
+msgstr ""
+"Formatos de arquivo, protocolos e outras interfaces para desenvolvedores:"
+
+msgid "External commands"
+msgstr "Comandos externos"
+
+msgid "Command aliases"
+msgstr "Aliases de comandos"
+
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "Veja 'git help <command>' para ler sobre um subcomando específico"
+
+#, 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' parece ser um comando git, mas não fomos\n"
+"capazes de executá-lo. Talvez git-%s esteja quebrado?"
+
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: '%s' não é um comando git. Veja 'git --help'."
+
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Oh não. Seu sistema reporta não ter comandos Git."
+
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "AVISO: Você chamou um comando Git chamado '%s', que não existe."
+
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Continuando sob a suposição de que você quis dizer '%s'."
+
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Executar '%s' em vez disso [y/N]? "
+
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "Continuando em %0.1f segundos, assumindo que você quis dizer '%s'."
+
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"O comando mais parecido é"
+msgstr[1] ""
+"\n"
+"Os comandos mais parecidos são"
+
+msgid "git version [--build-options]"
+msgstr "git version [--build-options]"
+
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Você quis dizer isto?"
+msgstr[1] ""
+"\n"
+"Você quis dizer um destes?"
+
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config set advice.ignoredHook false`."
+msgstr ""
+"O hook '%s' foi ignorado porque não está definido como executável.\n"
+"Você pode desativar este aviso com `git config set advice.ignoredHook false`."
+
+#, c-format
+msgid "hook.jobs must be an integer, ignoring: '%s'"
+msgstr "hook.jobs deve ser um número inteiro, ignorando: '%s'"
+
+#, c-format
+msgid "hook.jobs must be a positive integer or -1, ignoring: '%s'"
+msgstr "hook.jobs deve ser um número inteiro positivo ou -1, ignorando: '%s'"
+
+#, c-format
+msgid ""
+"hook friendly-name '%s' collides with a known event name; please choose a "
+"different friendly-name"
+msgstr ""
+"o nome amigável do hook '%s' colide com um nome de evento conhecido; por "
+"favor, escolha um nome amigável diferente"
+
+#, c-format
+msgid ""
+"hook friendly-name '%s' is the same as its event; this may cause ambiguity "
+"with hook.%s.enabled"
+msgstr ""
+"o nome amigável do hook '%s' é o mesmo que seu evento; isso pode causar "
+"ambiguidade com hook.%s.enabled"
+
+#, c-format
+msgid "hook.%s.parallel must be a boolean, ignoring: '%s'"
+msgstr "hook.%s.parallel deve ser um booleano, ignorando: '%s'"
+
+#, c-format
+msgid "hook.%s.jobs must be an integer, ignoring: '%s'"
+msgstr "hook.%s.jobs deve ser um número inteiro, ignorando: '%s'"
+
+#, c-format
+msgid "hook.%s.jobs must be a positive integer or -1, ignoring: '%s'"
+msgstr ""
+"hook.%s.jobs deve ser um número inteiro positivo ou -1, ignorando: '%s'"
+
+#, c-format
+msgid ""
+"hook.%s.jobs is set but '%s' looks like a hook friendly-name, not an event "
+"name; hook.<event>.jobs uses the event name (e.g. hook.post-receive.jobs), "
+"so this setting will be ignored"
+msgstr ""
+"hook.%s.jobs está definido, mas '%s' parece ser um nome amigável de hook, e "
+"não um nome de evento; hook.<event>.jobs usa o nome do evento (por exemplo, "
+"hook.post-receive.jobs), então esta configuração será ignorada"
+
+#, c-format
+msgid "disabled hook '%s' has no command configured"
+msgstr "o hook desativado '%s' não possui comando configurado"
+
+#, c-format
+msgid ""
+"'hook.%s.command' must be configured or 'hook.%s.event' must be removed; "
+"aborting."
+msgstr ""
+"'hook.%s.command' deve ser configurado ou 'hook.%s.event' deve ser removido; "
+"abortando."
+
+#, c-format
+msgid ""
+"hook '%s' is not marked as parallel=true, running in parallel anyway due to "
+"-j%u"
+msgstr ""
+"o hook '%s' não está marcado como parallel=true, executando em paralelo de "
+"qualquer maneira devido a -j%u"
+
+#, c-format
+msgid "%s must be a positive integer or -1, ignoring: %d"
+msgstr "%s deve ser um número inteiro positivo ou -1, ignorando: %d"
+
+msgid "not a git repository"
+msgstr "não é um repositório git"
+
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "o argumento para --packfile deve ser um hash válido (obtido '%s')"
+
+#, c-format
+msgid "negative value for http.postBuffer; defaulting to %d"
+msgstr "valor negativo para http.postBuffer; assumindo o padrão %d"
+
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "Controle de delegação não é suportado com cURL < 7.22.0"
+
+msgid "Unknown value for http.proactiveauth"
+msgstr "Valor desconhecido para http.proactiveauth"
+
+#, c-format
+msgid "failed to parse %s"
+msgstr "falha ao analisar %s"
+
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr "Backend SSL não suportado '%s'. Backends SSL suportados:"
+
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr ""
+"Não foi possível definir o backend SSL para '%s': o cURL foi compilado sem "
+"backends SSL"
+
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr "Não foi possível definir o backend SSL para '%s': já definido"
+
+msgid "refusing to read cookies from http.cookiefile '-'"
+msgstr "recusando-se a ler cookies do http.cookiefile '-'"
+
+msgid "ignoring http.savecookies for empty http.cookiefile"
+msgstr "ignorando http.savecookies para um http.cookiefile vazio"
+
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
+msgstr ""
+"não foi possível atualizar a base da URL a partir do redirecionamento:\n"
+"  solicitado: %s\n"
+"   redirecionamento: %s"
+
+#, c-format
+msgid ""
+"response requested a delay greater than http.maxRetryTime (%ld > %ld seconds)"
+msgstr ""
+"a resposta solicitou um atraso maior que http.maxRetryTime (%ld > %ld "
+"segundos)"
+
+#, c-format
+msgid ""
+"configured http.retryAfter exceeds http.maxRetryTime (%ld > %ld seconds)"
+msgstr ""
+"o http.retryAfter configurado excede http.maxRetryTime (%ld > %ld segundos)"
+
+#, c-format
+msgid "rate limited, waiting %ld seconds before retry"
+msgstr ""
+"limite de taxa excedido, aguardando %ld segundos antes de tentar novamente"
+
+#, c-format
+msgid ""
+"number too large to represent as curl_off_t on this platform: %<PRIuMAX>"
+msgstr ""
+"número grande demais para representar como curl_off_t nesta plataforma: "
+"%<PRIuMAX>"
+
+msgid "Author identity unknown\n"
+msgstr "Identidade do autor desconhecida\n"
+
+msgid "Committer identity unknown\n"
+msgstr "Identidade do committer desconhecida\n"
+
+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"
+"*** Por favor me diga quem você é.\n"
+"\n"
+"Execute\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"para definir a identidade padrão da sua conta.\n"
+"Omita --global para definir a identidade apenas neste repositório.\n"
+"\n"
+
+msgid "no email was given and auto-detection is disabled"
+msgstr "nenhum e-mail foi fornecido e a detecção automática está desativada"
+
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "não foi possível autodetectar o endereço de e-mail (obtido '%s')"
+
+msgid "no name was given and auto-detection is disabled"
+msgstr "nenhum nome foi fornecido e a detecção automática está desativada"
+
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "não foi possível autodetectar o nome (obtido '%s')"
+
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "nome de ident vazio (para <%s>) não é permitido"
+
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "o nome consiste apenas de caracteres não permitidos: %s"
+
+msgid ""
+"git imap-send [-v] [-q] [--[no-]curl] [--[no-]draft] [(--folder|-f) "
+"<folder>] < <mbox>"
+msgstr ""
+"git imap-send [-v] [-q] [--[no-]curl] [--[no-]draft] [(--folder|-f) "
+"<folder>] < <mbox>"
+
+msgid "no IMAP host specified"
+msgstr "nenhum host IMAP especificado"
+
+msgid ""
+"set the IMAP host with 'git config imap.host <host>'.\n"
+"(e.g., 'git config imap.host imaps://imap.example.com')"
+msgstr ""
+"defina o host IMAP com 'git config imap.host <host>'.\n"
+"(ex., 'git config imap.host imaps://imap.example.com')"
+
+msgid "no IMAP folder specified"
+msgstr "nenhuma pasta IMAP especificada"
+
+msgid ""
+"set the target folder with 'git config imap.folder <folder>'.\n"
+"(e.g., 'git config imap.folder Drafts')"
+msgstr ""
+"defina a pasta de destino com 'git config imap.folder <folder>'.\n"
+"(ex., 'git config imap.folder Drafts')"
+
+msgid "'auto' filter not supported by this command"
+msgstr "filtro 'auto' não suportado por este comando"
+
+msgid "expected 'tree:<depth>'"
+msgstr "esperado 'tree:<depth>'"
+
+msgid "sparse:path filters support has been dropped"
+msgstr "o suporte a filtros sparse:path foi descartado"
+
+#, c-format
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
+msgstr "'%s' para 'object:type=<type>' não é um tipo de objeto válido"
+
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "filter-spec inválido '%s'"
+
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "é necessário escapar o caractere em sub-filter-spec: '%c'"
+
+msgid "an 'auto' filter cannot be combined"
+msgstr "um filtro 'auto' não pode ser combinado"
+
+msgid "expected something after combine:"
+msgstr "esperado algo após combine:"
+
+msgid "multiple filter-specs cannot be combined"
+msgstr "múltiplos filter-specs não podem ser combinados"
+
+msgid "an 'auto' filter is incompatible with any other filter"
+msgstr "um filtro 'auto' é incompatível com qualquer outro filtro"
+
+msgid "unable to upgrade repository format to support partial clone"
+msgstr ""
+"não foi possível atualizar o formato do repositório para suportar clone "
+"parcial"
+
+msgid "args"
+msgstr "args"
+
+msgid "object filtering"
+msgstr "filtragem de objetos"
+
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "não foi possível acessar o blob esparso em '%s'"
+
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "não foi possível analisar os dados do filtro sparse em %s"
+
+msgid "filter_oidset: only blob:limit filters are supported"
+msgstr "filter_oidset: apenas filtros blob:limit são suportados"
+
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "a entrada '%s' na tree %s tem modo tree, mas não é uma tree"
+
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "a entrada '%s' na tree %s tem modo blob, mas não é um blob"
+
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "não foi possível carregar a tree raiz do commit %s"
+
+#, c-format
+msgid "could not write lock pid file '%s'"
+msgstr "não foi possível gravar o arquivo de pid do lock '%s'"
+
+#, c-format
+msgid "malformed lock pid file '%s'"
+msgstr "arquivo de pid do lock malformado '%s'"
+
+#, c-format
+msgid ""
+"Unable to create '%s': %s.\n"
+"\n"
+msgstr ""
+"Não foi possível criar '%s': %s.\n"
+"\n"
+
+#, c-format
+msgid ""
+"Lock may be held by process %<PRIuMAX>; if no git process is running, the "
+"lock file may be stale (PIDs can be reused)"
+msgstr ""
+"O lock pode estar sendo mantido pelo processo %<PRIuMAX>; se nenhum processo "
+"git estiver em execução, o arquivo de lock pode estar obsoleto (PIDs podem "
+"ser reutilizados)"
+
+#, c-format
+msgid ""
+"Lock was held by process %<PRIuMAX>, which is no longer running; the lock "
+"file appears to be stale"
+msgstr ""
+"O lock era mantido pelo processo %<PRIuMAX>, que não está mais em execução; "
+"o arquivo de lock parece estar obsoleto"
+
+msgid ""
+"Another git process seems to be running in this repository, or the lock file "
+"may be stale"
+msgstr ""
+"Outro processo git parece estar em execução neste repositório, ou o arquivo "
+"de lock pode estar obsoleto"
+
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "Não foi possível criar '%s.lock': %s"
+
+msgid "unable to create temporary object directory"
+msgstr "não foi possível criar o diretório de objetos temporário"
+
+#, c-format
+msgid "could not write loose object index %s"
+msgstr "não foi possível gravar o índice de objetos soltos %s"
+
+#, c-format
+msgid "failed to write loose object index %s"
+msgstr "falha ao gravar o índice de objetos soltos %s"
+
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "linha inesperada: '%s'"
+
+msgid "expected flush after ls-refs arguments"
+msgstr "esperado flush após os argumentos de ls-refs"
+
+msgid "quoted CRLF detected"
+msgstr "CRLF entre aspas detectado"
+
+#, c-format
+msgid "unable to format message: %s"
+msgstr "não foi possível formatar a mensagem: %s"
+
+#, c-format
+msgid "invalid marker-size '%s', expecting an integer"
+msgstr "marker-size inválido '%s', esperando um número inteiro"
+
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "Não foi possível analisar o objeto '%s'"
+
+#, c-format
+msgid "tree has duplicate entries for '%s'"
+msgstr "a tree tem entradas duplicadas para '%s'"
+
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "Falha ao fazer merge do submódulo %s (não foi feito checkout)"
+
+#, c-format
+msgid "Failed to merge submodule %s (no merge base)"
+msgstr "Falha ao fazer merge do submódulo %s (sem base de merge)"
+
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "Falha ao fazer merge do submódulo %s (commits não presentes)"
+
+#, c-format
+msgid "error: failed to merge submodule %s (repository corrupt)"
+msgstr "erro: falha ao fazer merge do submódulo %s (repositório corrompido)"
+
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr ""
+"Falha ao fazer merge do submódulo %s (os commits não seguem a base de merge)"
+
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Nota: Avanço rápido (fast-forward) do submódulo %s para %s"
+
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Falha ao fazer merge do submódulo %s"
+
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists: %s"
+msgstr ""
+"Falha ao fazer merge do submódulo %s, mas existe uma possível resolução de "
+"merge: %s"
+
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"Falha ao fazer merge do submódulo %s, mas existem múltiplos merges "
+"possíveis:\n"
+"%s"
+
+#, c-format
+msgid "error: failed to execute internal merge for %s"
+msgstr "erro: falha ao executar o merge interno para %s"
+
+#, c-format
+msgid "error: unable to add %s to database"
+msgstr "erro: não foi possível adicionar %s ao banco de dados"
+
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Merge automático de %s"
+
+#, 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 ""
+"CONFLITO (renomeação implícita de diretório): Arquivo/diretório existente em "
+"%s no caminho da(s) renomeação(ões) implícita(s) de diretório colocando o(s) "
+"seguinte(s) caminho(s) lá: %s."
+
+#, 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 ""
+"CONFLITO (renomeação implícita de diretório): Não é possível mapear mais de "
+"um caminho para %s; as renomeações implícitas de diretório tentaram colocar "
+"esses caminhos lá: %s"
+
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+"CONFLITO (renomeação de diretório dividida): Não está claro para onde "
+"renomear %s; ele foi renomeado para vários outros diretórios, com nenhum "
+"destino recebendo a maioria dos arquivos."
+
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"AVISO: Evitando aplicar a renomeação de %s -> %s para %s, porque %s também "
+"foi renomeado."
+
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"Caminho atualizado: %s adicionado em %s dentro de um diretório que foi "
+"renomeado em %s; movendo-o para %s."
+
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"Caminho atualizado: %s renomeado para %s em %s, dentro de um diretório que "
+"foi renomeado em %s; movendo-o para %s."
+
+#, 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 ""
+"CONFLITO (local do arquivo): %s adicionado em %s dentro de um diretório que "
+"foi renomeado em %s, sugerindo que talvez deva ser movido para %s."
+
+#, 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 ""
+"CONFLITO (local do arquivo): %s renomeado para %s em %s, dentro de um "
+"diretório que foi renomeado em %s, sugerindo que talvez deva ser movido para "
+"%s."
+
+#, c-format
+msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
+msgstr ""
+"CONFLITO (renomeação/renomeação): %s renomeado para %s em %s e para %s em %s."
+
+#, c-format
+msgid ""
+"CONFLICT (rename involved in collision): rename of %s -> %s has content "
+"conflicts AND collides with another path; this may result in nested conflict "
+"markers."
+msgstr ""
+"CONFLITO (renomeação envolvida em colisão): a renomeação de %s -> %s possui "
+"conflitos de conteúdo E colide com outro caminho; isso pode resultar em "
+"marcadores de conflito aninhados."
+
+#, c-format
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
+msgstr ""
+"CONFLITO (renomear/excluir): %s renomeado para %s em %s, mas excluído em %s."
+
+#, c-format
+msgid "error: cannot read object %s"
+msgstr "erro: não é possível ler o objeto %s"
+
+#, c-format
+msgid "error: object %s is not a blob"
+msgstr "erro: o objeto %s não é um blob"
+
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"CONFLITO (arquivo/diretório): diretório no caminho de %s vindo de %s; "
+"movendo-o para %s em vez disso."
+
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed both "
+"of them so each can be recorded somewhere."
+msgstr ""
+"CONFLITO (tipos distintos): %s tinha tipos diferentes em cada lado; ambos "
+"foram renomeados para que cada um possa ser registrado em algum lugar."
+
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed one "
+"of them so each can be recorded somewhere."
+msgstr ""
+"CONFLITO (tipos distintos): %s tinha tipos diferentes em cada lado; um deles "
+"foi renomeado para que cada um possa ser registrado em algum lugar."
+
+msgid "content"
+msgstr "conteúdo"
+
+msgid "add/add"
+msgstr "adicionar/adicionar"
+
+msgid "submodule"
+msgstr "submodule"
+
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "CONFLITO (%s): Conflito de merge em %s"
+
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
+"of %s left in tree."
+msgstr ""
+"CONFLITO (modificar/excluir): %s excluído em %s e modificado em %s. A versão "
+"%s de %s foi deixada na árvore."
+
+#. TRANSLATORS: This is a line of advice to resolve a merge
+#. conflict in a submodule. The first argument is the submodule
+#. name, and the second argument is the abbreviated id of the
+#. commit that needs to be merged.  For example:
+#.  - go to submodule (mysubmodule), and either merge commit abc1234"
+#.
+#, c-format
+msgid ""
+" - go to submodule (%s), and either merge commit %s\n"
+"   or update to an existing commit which has merged those changes\n"
+msgstr ""
+" - vá para o submódulo (%s) e faça merge do commit %s\n"
+"   ou atualize para um commit existente que já fez o merge dessas mudanças\n"
+
+#, c-format
+msgid ""
+"Recursive merging with submodules currently only supports trivial cases.\n"
+"Please manually handle the merging of each conflicted submodule.\n"
+"This can be accomplished with the following steps:\n"
+"%s - come back to superproject and run:\n"
+"\n"
+"      git add %s\n"
+"\n"
+"   to record the above merge or update\n"
+" - resolve any other conflicts in the superproject\n"
+" - commit the resulting index in the superproject\n"
+msgstr ""
+"O merge recursivo com submódulos atualmente suporta apenas casos triviais.\n"
+"Por favor, lide manualmente com o merge de cada submódulo com conflito.\n"
+"Isso pode ser realizado com os seguintes passos:\n"
+"%s - volte para o superprojeto e execute:\n"
+"\n"
+"      git add %s\n"
+"\n"
+"   para registrar o merge ou a atualização acima\n"
+" - resolva quaisquer outros conflitos no superprojeto\n"
+" - faça commit do índice resultante no superprojeto\n"
+
+#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
+#. base, and 2-3) the trees for the two trees we're merging.
+#.
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr "falha ao coletar informações de merge para as trees %s, %s, %s"
+
+msgid "failed to read the cache"
+msgstr "falha ao ler o cache"
+
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr "falha ao adicionar o packfile '%s'"
+
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "falha ao abrir o pack-index '%s'"
+
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "falha ao localizar o objeto %d no packfile"
+
+msgid "cannot store reverse index file"
+msgstr "não é possível armazenar o arquivo de índice reverso"
+
+#, c-format
+msgid "could not parse line: %s"
+msgstr "não foi possível analisar a linha: %s"
+
+#, c-format
+msgid "malformed line: %s"
+msgstr "linha malformada: %s"
+
+#, c-format
+msgid "could not load pack %d"
+msgstr "não foi possível carregar o pack %d"
+
+msgid "too many packs, unable to compact"
+msgstr "packs demais, não foi possível compactar"
+
+msgid "could not determine preferred pack"
+msgstr "não foi possível determinar o pack preferido"
+
+#, c-format
+msgid "unable to link '%s' to '%s'"
+msgstr "não foi possível vincular '%s' a '%s'"
+
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr "falha ao limpar o multi-pack-index em %s"
+
+#, c-format
+msgid "unknown MIDX version: %d"
+msgstr "versão MIDX desconhecida: %d"
+
+msgid "cannot perform MIDX compaction with v1 format"
+msgstr "não é possível realizar a compactação MIDX com o formato v1"
+
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "ignorando o multi-pack-index existente; incompatibilidade de checksum"
+
+#, c-format
+msgid "could not find base MIDX '%s'"
+msgstr "não foi possível encontrar o MIDX base '%s'"
+
+#, c-format
+msgid "could not load reverse index for MIDX %s"
+msgstr "não foi possível carregar o índice reverso para o MIDX %s"
+
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Adicionando packfiles ao multi-pack-index"
+
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "pack preferido desconhecido: '%s'"
+
+#, c-format
+msgid "failed to open preferred pack %s"
+msgstr "falha ao abrir o pack preferido %s"
+
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "não é possível selecionar o pack preferencial %s sem objetos"
+
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "não vi o pack-file %s para descartar"
+
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "o pack preferido '%s' expirou"
+
+msgid "no pack files to index."
+msgstr "nenhum arquivo pack para indexar."
+
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "recusando-se a gravar o .bitmap multi-pack sem nenhum objeto"
+
+msgid "unable to create temporary MIDX layer"
+msgstr "não foi possível criar a camada MIDX temporária"
+
+msgid "could not write multi-pack bitmap"
+msgstr "não foi possível gravar o bitmap multi-pack"
+
+msgid "too many multi-pack-indexes"
+msgstr "muitos multi-pack-indexes"
+
+msgid "unable to open multi-pack-index chain file"
+msgstr "não foi possível abrir o arquivo de cadeia do multi-pack-index"
+
+msgid "unable to rename new multi-pack-index layer"
+msgstr "não foi possível renomear a nova camada do multi-pack-index"
+
+msgid "could not write multi-pack-index"
+msgstr "não foi possível gravar o multi-pack-index"
+
+msgid "cannot expire packs from an incremental multi-pack-index"
+msgstr "não é possível expirar packs de um multi-pack-index incremental"
+
+msgid "Counting referenced objects"
+msgstr "Contando objetos referenciados"
+
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Encontrando e excluindo packfiles não referenciados"
+
+msgid "cannot repack an incremental multi-pack-index"
+msgstr "não é possível fazer repack de um multi-pack-index incremental"
+
+msgid "could not start pack-objects"
+msgstr "não foi possível iniciar o pack-objects"
+
+msgid "could not finish pack-objects"
+msgstr "não foi possível finalizar o pack-objects"
+
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "o fanout de OID do multi-pack-index tem o tamanho errado"
+
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr ""
+"fanout de oid fora de ordem: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+
+msgid "multi-pack-index OID lookup chunk is the wrong size"
+msgstr "o chunk de pesquisa de OID do multi-pack-index tem o tamanho errado"
+
+msgid "multi-pack-index object offset chunk is the wrong size"
+msgstr ""
+"o chunk de deslocamento de objeto do multi-pack-index tem o tamanho errado"
+
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "o arquivo multi-pack-index %s é pequeno demais"
+
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
+msgstr ""
+"a assinatura 0x%08x do multi-pack-index não corresponde à assinatura 0x%08x"
+
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr "a versão %d do multi-pack-index não foi reconhecida"
+
+#, c-format
+msgid "multi-pack-index hash version %u does not match version %u"
+msgstr "a versão %u do hash do multi-pack-index não corresponde à versão %u"
+
+msgid "multi-pack-index required pack-name chunk missing or corrupted"
+msgstr ""
+"o chunk obrigatório pack-name do multi-pack-index está ausente ou corrompido"
+
+msgid "multi-pack-index required OID fanout chunk missing or corrupted"
+msgstr ""
+"o chunk obrigatório de fanout de OID do multi-pack-index está ausente ou "
+"corrompido"
+
+msgid "multi-pack-index required OID lookup chunk missing or corrupted"
+msgstr ""
+"o chunk obrigatório de pesquisa de OID do multi-pack-index está ausente ou "
+"corrompido"
+
+msgid "multi-pack-index required object offsets chunk missing or corrupted"
+msgstr ""
+"o chunk obrigatório de deslocamentos de objeto do multi-pack-index está "
+"ausente ou corrompido"
+
+msgid "multi-pack-index pack-name chunk is too short"
+msgstr "o chunk pack-name do multi-pack-index é muito curto"
+
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr "nomes de pack do multi-pack-index fora de ordem: '%s' antes de '%s'"
+
+msgid "multi-pack-index chain file too small"
+msgstr "o arquivo de cadeia do multi-pack-index é pequeno demais"
+
+#, c-format
+msgid "pack count in base MIDX too high: %<PRIuMAX>"
+msgstr "a contagem de packs no MIDX base é alta demais: %<PRIuMAX>"
+
+#, c-format
+msgid "object count in base MIDX too high: %<PRIuMAX>"
+msgstr "a contagem de objetos no MIDX base é alta demais: %<PRIuMAX>"
+
+#, c-format
+msgid "invalid multi-pack-index chain: line '%s' not a hash"
+msgstr "cadeia do multi-pack-index inválida: a linha '%s' não é um hash"
+
+msgid "unable to find all multi-pack index files"
+msgstr "não foi possível encontrar todos os arquivos multi-pack index"
+
+msgid "invalid MIDX object position, MIDX is likely corrupt"
+msgstr ""
+"posição de objeto do MIDX inválida, o MIDX provavelmente está corrompido"
+
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr "pack-int-id inválido: %u (%u packs no total)"
+
+msgid "MIDX does not contain the BTMP chunk"
+msgstr "MIDX não contém o chunk BTMP"
+
+#, c-format
+msgid "could not load bitmapped pack %<PRIu32>"
+msgstr "não foi possível carregar o pack com bitmap %<PRIu32>"
+
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr ""
+"o multi-pack-index armazena um deslocamento de 64 bits, mas off_t é pequeno "
+"demais"
+
+msgid "multi-pack-index large offset out of bounds"
+msgstr "deslocamento grande do multi-pack-index fora dos limites"
+
+#, c-format
+msgid "failed to clear multi-pack-index chain at %s"
+msgstr "falha ao limpar a cadeia de multi-pack-index em %s"
+
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "o arquivo multi-pack-index existe, mas falhou ao analisar"
+
+msgid "incorrect checksum"
+msgstr "checksum incorreto"
+
+msgid "Looking for referenced packfiles"
+msgstr "Procurando packfiles referenciados"
+
+msgid "the midx contains no oid"
+msgstr "o midx não contém oid"
+
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Verificando a ordem do OID no multi-pack-index"
+
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr "pesquisa de oid fora de ordem: oid[%d] = %s >= %s = oid[%d]"
+
+msgid "Sorting objects by packfile"
+msgstr "Classificando objetos por packfile"
+
+msgid "Verifying object offsets"
+msgstr "Verificando os offsets dos objetos"
+
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr "falha ao carregar entrada de pack para oid[%d] = %s"
+
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr "falha ao carregar pack-index para packfile %s"
+
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr ""
+"deslocamento de objeto incorreto para oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr "não foi possível criar a thread lazy_dir: %s"
+
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr "não foi possível criar a thread lazy_name: %s"
+
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr "não foi possível fazer join na thread lazy_name: %s"
+
+#, 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 ""
+"Você não concluiu o seu merge de notas anterior (%s existe).\n"
+"Por favor, use 'git notes merge --commit' ou 'git notes merge --abort' para "
+"fazer o commit/abortar o merge anterior antes de iniciar um novo merge de "
+"notas."
+
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Você não concluiu o seu merge de notas (%s existe)."
+
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr ""
+"Não é possível fazer commit de uma notes tree não inicializada/não "
+"referenciada"
+
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Valor notes.rewriteMode inválido: '%s'"
+
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "Recusando-se a reescrever as notas em %s (fora de refs/notes/)"
+
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "Valor %s inválido: '%s'"
+
+msgid "failed to decode tree entry"
+msgstr "falha ao decodificar a entrada de tree"
+
+#, c-format
+msgid "failed to map tree entry for %s"
+msgstr "falha ao mapear a entrada de tree para %s"
+
+#, c-format
+msgid "bad %s in commit"
+msgstr "%s inválido no commit"
+
+#, c-format
+msgid "unable to map %s %s in commit object"
+msgstr "não foi possível mapear %s %s no objeto de commit"
+
+#, c-format
+msgid "Failed to convert object from %s to %s"
+msgstr "Falha ao converter o objeto de %s para %s"
+
+#, c-format
+msgid "object file %s is empty"
+msgstr "o arquivo de objeto %s está vazio"
+
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "objeto solto corrompido '%s'"
+
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "lixo no final do objeto solto '%s'"
+
+#, c-format
+msgid "unable to open %s"
+msgstr "não foi possível abrir %s"
+
+#, c-format
+msgid "files '%s' and '%s' differ in contents"
+msgstr "os arquivos '%s' e '%s' diferem no conteúdo"
+
+#, c-format
+msgid "unable to write repeatedly vanishing file %s"
+msgstr "não foi possível gravar o arquivo %s que desaparece repetidamente"
+
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "não foi possível definir a permissão de '%s'"
+
+msgid "core.fsyncMethod = batch is unsupported on this platform"
+msgstr "core.fsyncMethod = batch não é suportado nesta plataforma"
+
+#, c-format
+msgid "object fails fsck: %s"
+msgstr "o objeto falhou no fsck: %s"
+
+msgid "refusing to create malformed object"
+msgstr "recusando-se a criar um objeto malformado"
+
+#, c-format
+msgid "read error while indexing %s"
+msgstr "erro de leitura ao indexar %s"
+
+#, c-format
+msgid "short read while indexing %s"
+msgstr "leitura curta ao indexar %s"
+
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: falha ao inserir no banco de dados"
+
+msgid "cannot add a submodule of a different hash algorithm"
+msgstr ""
+"não é possível adicionar um submódulo de um algoritmo de hash diferente"
+
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: tipo de arquivo não suportado"
+
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "incompatibilidade de hash para %s (esperado %s)"
+
+#, c-format
+msgid "unable to mmap %s"
+msgstr "não foi possível executar mmap em %s"
+
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "não foi possível desempacotar o cabeçalho de %s"
+
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "não foi possível analisar o cabeçalho de %s"
+
+#, c-format
+msgid "unable to parse type from header '%s' of %s"
+msgstr "não foi possível analisar o tipo do cabeçalho '%s' de %s"
+
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "não foi possível desempacotar o conteúdo de %s"
+
+msgid "unable to migrate temporary objects"
+msgstr "não foi possível migrar objetos temporários"
+
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [objeto inválido]"
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#.    "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "%s commit %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#.    "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "%s tag %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#.    "deadbeef [bad tag, could not parse it]"
+#.
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s [tag inválida, não foi possível analisá-la]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#, c-format
+msgid "%s tree"
+msgstr "%s tree"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#, c-format
+msgid "%s blob"
+msgstr "%s blob"
+
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "ID de objeto curto %s é ambíguo"
+
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"Os candidatos são:\n"
+"%s"
+
+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 set advice.objectNameWarning false\""
+msgstr ""
+"O Git normalmente nunca cria um ref que termina com 40 caracteres "
+"hexadecimais\n"
+"porque ele será ignorado quando você simplesmente especificar 40-hex. Esses "
+"refs\n"
+"podem ser criados por engano. Por exemplo,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"onde \"$br\" está vazio de alguma forma e um ref de 40-hex é criado. Por "
+"favor\n"
+"examine esses refs e talvez os exclua. Desative esta mensagem\n"
+"executando \"git config set advice.objectNameWarning false\""
+
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "o log para '%.*s' só volta até %s"
+
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "o log para '%.*s' tem apenas %d entradas"
+
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "o caminho '%s' existe no disco, mas não em '%.*s'"
+
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"o caminho '%s' existe, mas não '%s'\n"
+"hint: Você quis dizer '%.*s:%s' ou '%.*s:./%s'?"
+
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "o caminho '%s' não existe em '%.*s'"
+
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"o caminho '%s' está no índice, mas não no estágio %d\n"
+"hint: Você quis dizer ':%d:%s'?"
+
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"o caminho '%s' está no índice, mas não '%s'\n"
+"hint: Você quis dizer ':%d:%s' ou ':%d:./%s'?"
+
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "o caminho '%s' existe no disco, mas não no índice"
+
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "o caminho '%s' não existe (nem no disco nem no índice)"
+
+msgid "relative path syntax can't be used outside working tree"
+msgstr ""
+"a sintaxe de caminho relativo não pode ser usada fora da árvore de trabalho"
+
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "<object>:<path> é necessário, apenas <object> '%s' foi fornecido"
+
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "nome de objeto inválido '%.*s'."
+
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "tipo de objeto inválido \"%s\""
+
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "o objeto %s tem ID de tipo %d desconhecido"
+
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "não foi possível analisar o objeto: %s"
+
+#, c-format
+msgid "unable to open object stream for %s"
+msgstr "não foi possível abrir o fluxo de objeto para %s"
+
+#, c-format
+msgid "hash mismatch %s"
+msgstr "incompatibilidade de hash %s"
+
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr ""
+"o diretório de objetos %s não existe; verifique .git/objects/info/alternates"
+
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "não foi possível normalizar o caminho de objeto alternate: %s"
+
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr ""
+"%s: ignorando armazenamentos de objetos alternativos, aninhamento muito "
+"profundo"
+
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "o caminho '%s' não existe"
+
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+"o repositório de referência '%s' como um checkout vinculado ainda não é "
+"suportado."
+
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "o repositório de referência '%s' não é um repositório local."
+
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "o repositório de referência '%s' é shallow"
+
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "o repositório de referência '%s' está com graft"
+
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "não foi possível encontrar o diretório de objetos correspondente a %s"
+
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "linha inválida ao analisar refs alternativos: %s"
+
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "substituição %s não encontrada para %s"
+
+#, c-format
+msgid "object %s is corrupt"
+msgstr "o objeto %s está corrompido"
+
+#, c-format
+msgid "missing mapping of %s to %s"
+msgstr "falta o mapeamento de %s para %s"
+
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s não é um objeto válido"
+
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s não é um objeto '%s' válido"
+
+msgid "primary object source does not support generating packfiles"
+msgstr "a fonte primária de objetos não suporta a geração de arquivos de pack"
+
+msgid "unable to fdopen alternates lockfile"
+msgstr "não foi possível executar fdopen no lockfile de alternates"
+
+msgid "unable to read alternates file"
+msgstr "não foi possível ler o arquivo de alternates"
+
+msgid "unable to move new alternates file into place"
+msgstr "não foi possível colocar o novo arquivo de alternates no lugar"
+
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+"Existem muitos loose objects inacessíveis; execute 'git prune' para removê-"
+"los."
+
+#, c-format
+msgid "pack-objects died of signal %d"
+msgstr "pack-objects terminou com o sinal %d"
+
+msgid "could not spawn pack-objects"
+msgstr "não foi possível iniciar o pack-objects"
+
+msgid "error writing to pack-objects"
+msgstr "erro ao escrever no pack-objects"
+
+#, c-format
+msgid "unable to open loose object %s"
+msgstr "não foi possível abrir o objeto solto %s"
+
+#, c-format
+msgid "unable to parse %s header"
+msgstr "não foi possível analisar o cabeçalho %s"
+
+msgid "invalid object type"
+msgstr "tipo de objeto inválido"
+
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "não foi possível desempacotar o cabeçalho %s"
+
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "o cabeçalho para %s é muito longo, excede %d bytes"
+
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "o objeto solto %s (armazenado em %s) está corrompido"
+
+msgid "error when closing loose object file"
+msgstr "erro ao fechar o arquivo de objeto solto"
+
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
+"permissão insuficiente para adicionar um objeto ao banco de dados do "
+"repositório %s"
+
+msgid "unable to create temporary file"
+msgstr "não foi possível criar o arquivo temporário"
+
+msgid "unable to write loose object file"
+msgstr "não foi possível gravar o arquivo de objeto solto"
+
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "não foi possível fazer deflate do novo objeto %s (%d)"
+
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "deflateEnd no objeto %s falhou (%d)"
+
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "confuso devido a dados de origem de objeto instáveis para %s"
+
+#, c-format
+msgid "write stream object %<PRIuMAX> != %<PRIuMAX>"
+msgstr "gravar objeto de fluxo %<PRIuMAX> != %<PRIuMAX>"
+
+#, c-format
+msgid "unable to stream deflate new object (%d)"
+msgstr "não foi possível fazer deflate em fluxo do novo objeto (%d)"
+
+#, c-format
+msgid "deflateEnd on stream object failed (%d)"
+msgstr "deflateEnd no objeto de fluxo falhou (%d)"
+
+#, c-format
+msgid "unable to create directory %s"
+msgstr "não foi possível criar o diretório %s"
+
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: incompatibilidade de hash-path, encontrado em: %s"
+
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s: objeto corrompido ou ausente: %s"
+
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "arquivo sha1 inválido: %s"
+
+msgid "Checking object directory"
+msgstr "Verificando diretório de objetos"
+
+msgid "Checking object directories"
+msgstr "Verificando diretórios de objetos"
+
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "o objeto empacotado %s (armazenado em %s) está corrompido"
+
+#, c-format
+msgid "unable to load rev-index for pack '%s'"
+msgstr "não foi possível carregar o rev-index para o pack '%s'"
+
+#, c-format
+msgid "invalid rev-index for pack '%s'"
+msgstr "rev-index inválido para o pack '%s'"
+
+msgid "object database transaction already pending"
+msgstr "transação do banco de dados de objetos já pendente"
+
+msgid "failed to start ODB transaction"
+msgstr "falha ao iniciar a transação da ODB"
+
+msgid "failed to commit ODB transaction"
+msgstr "falha ao efetivar a transação da ODB"
+
+msgid "failed to finalize ODB transaction"
+msgstr "falha ao finalizar a transação da ODB"
+
+#, c-format
+msgid "duplicate entry when writing bitmap index: %s"
+msgstr "entrada duplicada ao gravar o bitmap index: %s"
+
+#, c-format
+msgid "attempted to store non-selected commit: '%s'"
+msgstr "tentativa de armazenar commit não selecionado: '%s'"
+
+msgid "too many pseudo-merges"
+msgstr "muitos pseudo-merges"
+
+msgid "failed to load bitmap index (corrupted?)"
+msgstr "falha ao carregar o bitmap index (corrompido?)"
+
+msgid "corrupted bitmap index (too small)"
+msgstr "bitmap index corrompido (muito pequeno)"
+
+msgid "corrupted bitmap index file (wrong header)"
+msgstr "arquivo de bitmap index corrompido (cabeçalho errado)"
+
+#, c-format
+msgid "unsupported version '%d' for bitmap index file"
+msgstr "versão '%d' não suportada para o arquivo de bitmap index"
+
+msgid "corrupted bitmap index file (too short to fit hash cache)"
+msgstr ""
+"arquivo de bitmap index corrompido (muito curto para caber o cache de hash)"
+
+msgid "corrupted bitmap index file (too short to fit lookup table)"
+msgstr ""
+"arquivo de bitmap index corrompido (muito curto para caber a tabela de "
+"pesquisa)"
+
+msgid ""
+"corrupted bitmap index file (too short to fit pseudo-merge table header)"
+msgstr ""
+"arquivo de bitmap index corrompido (muito curto para caber o cabeçalho da "
+"tabela de pseudo-merge)"
+
+msgid "corrupted bitmap index file (too short to fit pseudo-merge table)"
+msgstr ""
+"arquivo de bitmap index corrompido (muito curto para caber a tabela de "
+"pseudo-merge)"
+
+msgid "corrupted bitmap index file, pseudo-merge table too short"
+msgstr "arquivo de bitmap index corrompido, tabela de pseudo-merge muito curta"
+
+#, c-format
+msgid "duplicate entry in bitmap index: '%s'"
+msgstr "entrada duplicada no bitmap index: '%s'"
+
+#, c-format
+msgid "corrupt ewah bitmap: truncated header for entry %d"
+msgstr "bitmap ewah corrompido: cabeçalho truncado para a entrada %d"
+
+#, c-format
+msgid "corrupt ewah bitmap: commit index %u out of range"
+msgstr "bitmap ewah corrompido: commit index %u fora do intervalo"
+
+msgid "corrupted bitmap pack index"
+msgstr "bitmap pack index corrompido"
+
+msgid "invalid XOR offset in bitmap pack index"
+msgstr "deslocamento XOR inválido no bitmap pack index"
+
+msgid "cannot fstat bitmap file"
+msgstr "não é possível executar fstat no arquivo de bitmap"
+
+msgid "checksum doesn't match in MIDX and bitmap"
+msgstr "o checksum não corresponde no MIDX e no bitmap"
+
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "o multi-pack bitmap está sem o reverse index necessário"
+
+#, c-format
+msgid "could not open pack %s"
+msgstr "não foi possível abrir o pack %s"
+
+msgid "could not open bitmap for base MIDX"
+msgstr "não foi possível abrir o bitmap para o MIDX base"
+
+msgid "corrupt bitmap lookup table: triplet position out of index"
+msgstr ""
+"tabela de pesquisa de bitmap corrompida: posição do triplete fora do índice"
+
+msgid "corrupt bitmap lookup table: xor chain exceeds entry count"
+msgstr ""
+"tabela de pesquisa de bitmap corrompida: cadeia xor excede a contagem de "
+"entradas"
+
+#, c-format
+msgid "corrupt bitmap lookup table: commit index %u out of range"
+msgstr ""
+"tabela de pesquisa de bitmap corrompida: commit index %u fora do intervalo"
+
+#, c-format
+msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\""
+msgstr ""
+"bitmap ewah corrompido: cabeçalho truncado para bitmap do commit \"%s\""
+
+#, c-format
+msgid "unable to load pack: '%s', disabling pack-reuse"
+msgstr ""
+"não foi possível carregar o pack: '%s', desativando a reutilização de pack"
+
+msgid "unable to compute preferred pack, disabling pack-reuse"
+msgstr ""
+"não foi possível calcular o pack preferido, desativando a reutilização de "
+"pack"
+
+#, c-format
+msgid "object '%s' not found in type bitmaps"
+msgstr "objeto '%s' não encontrado nos bitmaps de tipo"
+
+#, c-format
+msgid "object '%s' does not have a unique type"
+msgstr "o objeto '%s' não tem um tipo único"
+
+#, c-format
+msgid "object '%s': real type '%s', expected: '%s'"
+msgstr "objeto '%s': tipo real '%s', esperado: '%s'"
+
+#, c-format
+msgid "object not in bitmap: '%s'"
+msgstr "o objeto não está no bitmap: '%s'"
+
+msgid "failed to load bitmap indexes"
+msgstr "falha ao carregar os índices de bitmap"
+
+msgid "you must specify exactly one commit to test"
+msgstr "você deve especificar exatamente um commit para testar"
+
+#, c-format
+msgid "commit '%s' doesn't have an indexed bitmap"
+msgstr "o commit '%s' não tem um bitmap indexado"
+
+msgid "mismatch in bitmap results"
+msgstr "incompatibilidade nos resultados do bitmap"
+
+#, c-format
+msgid "pseudo-merge index out of range (%<PRIu32> >= %<PRIuMAX>)"
+msgstr "pseudo-merge index fora do intervalo (%<PRIu32> >= %<PRIuMAX>)"
+
+#, c-format
+msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>"
+msgstr ""
+"não foi possível encontrar '%s' no pack '%s' no deslocamento %<PRIuMAX>"
+
+#, c-format
+msgid "unable to get disk usage of '%s'"
+msgstr "não foi possível obter o uso de disco de '%s'"
+
+#, c-format
+msgid "bitmap file '%s' has invalid checksum"
+msgstr "o arquivo de bitmap '%s' possui checksum inválido"
+
+#, c-format
+msgid "mtimes file %s is too small"
+msgstr "o arquivo mtimes %s é muito pequeno"
+
+#, c-format
+msgid "mtimes file %s has unknown signature"
+msgstr "o arquivo mtimes %s tem uma assinatura desconhecida"
+
+#, c-format
+msgid "mtimes file %s has unsupported version %<PRIu32>"
+msgstr "o arquivo mtimes %s tem a versão não suportada %<PRIu32>"
+
+#, c-format
+msgid "mtimes file %s has unsupported hash id %<PRIu32>"
+msgstr "o arquivo mtimes %s tem o hash id não suportado %<PRIu32>"
+
+#, c-format
+msgid "mtimes file %s is corrupt"
+msgstr "o arquivo mtimes %s está corrompido"
+
+msgid "pack everything"
+msgstr "empacotar tudo"
+
+msgid "prune loose refs (default)"
+msgstr "podar refs soltas (padrão)"
+
+msgid "auto-pack refs as needed"
+msgstr "auto-empacotar refs conforme necessário"
+
+msgid "references to include"
+msgstr "referências para incluir"
+
+msgid "references to exclude"
+msgstr "referências a excluir"
+
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "o arquivo reverse-index %s é muito pequeno"
+
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "o arquivo reverse-index %s está corrompido"
+
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "o arquivo reverse-index %s tem uma assinatura desconhecida"
+
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "o arquivo reverse-index %s tem a versão não suportada %<PRIu32>"
+
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr "o arquivo reverse-index %s tem o hash id não suportado %<PRIu32>"
+
+msgid "invalid checksum"
+msgstr "checksum inválido"
+
+#, c-format
+msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>"
+msgstr "posição rev-index inválida em %<PRIu64>: %<PRIu32> != %<PRIu32>"
+
+msgid "multi-pack-index reverse-index chunk is the wrong size"
+msgstr "o chunk reverse-index do multi-pack-index tem o tamanho errado"
+
+msgid "cannot both write and verify reverse index"
+msgstr "não é possível gravar e verificar o reverse index simultaneamente"
+
+#, c-format
+msgid "could not stat: %s"
+msgstr "não foi possível executar stat: %s"
+
+#, c-format
+msgid "failed to make %s readable"
+msgstr "falha ao tornar %s legível"
+
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "não foi possível gravar o arquivo promisor '%s'"
+
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "deslocamento antes do fim do packfile (.idx quebrado?)"
+
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "o packfile %s não pode ser mapeado%s"
+
+#, c-format
+msgid "could not load .mtimes for cruft pack '%s'"
+msgstr "não foi possível carregar o .mtimes para o pack cruft '%s'"
+
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr ""
+"deslocamento antes do início do índice de pack para %s (índice corrompido?)"
+
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "deslocamento além do fim do índice de pack para %s (índice truncado?)"
+
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "data de expiração malformada '%s'"
+
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "a opção `%s' espera \"always\", \"auto\" ou \"never\""
+
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nome de objeto malformado '%s'"
+
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "a opção `%s' espera \"%s\" ou \"%s\""
+
+#, c-format
+msgid "%s requires a value"
+msgstr "%s requer um valor"
+
+#, c-format
+msgid "%s takes no value"
+msgstr "%s não aceita nenhum valor"
+
+#, c-format
+msgid "%s isn't available"
+msgstr "%s não está disponível"
+
+#, c-format
+msgid "value for %s exceeds %<PRIdMAX>"
+msgstr "o valor para %s excede %<PRIdMAX>"
+
+#, c-format
+msgid "value %s for %s not in range [%<PRIdMAX>,%<PRIdMAX>]"
+msgstr "o valor %s para %s não está no intervalo [%<PRIdMAX>,%<PRIdMAX>]"
+
+#, c-format
+msgid "%s expects an integer value with an optional k/m/g suffix"
+msgstr "%s espera um valor inteiro com um sufixo opcional k/m/g"
+
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr "%s espera um valor inteiro não negativo com um sufixo opcional k/m/g"
+
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "opção ambígua: %s (pode ser --%s%s ou --%s%s)"
+
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "você quis dizer `--%s` (com dois traços)?"
+
+#, c-format
+msgid "alias of --%s"
+msgstr "alias de --%s"
+
+msgid "need a subcommand"
+msgstr "é necessário um subcomando"
+
+#, c-format
+msgid "unknown option `%s'"
+msgstr "opção desconhecida `%s'"
+
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "opção `%c' desconhecida"
+
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "opção não-ascii desconhecida na string: `%s'"
+
+#. TRANSLATORS: The "<%s>" part of this string
+#. stands for an optional value given to a command
+#. line option in the long form, and "<>" is there
+#. as a convention to signal that it is a
+#. placeholder (i.e. the user should substitute it
+#. with the real value).  If your language uses a
+#. different convention, you can change "<%s>" part
+#. to match yours, e.g. it might use "|%s|" instead,
+#. or if the alphabet is different enough it may use
+#. "%s" without any placeholder signal.  Most
+#. translations leave this message as is.
+#.
+#, c-format
+msgid "[=<%s>]"
+msgstr "[=<%s>]"
+
+#. TRANSLATORS: The "<%s>" part of this string
+#. stands for an optional value given to a command
+#. line option in the short form, and "<>" is there
+#. as a convention to signal that it is a
+#. placeholder (i.e. the user should substitute it
+#. with the real value).  If your language uses a
+#. different convention, you can change "<%s>" part
+#. to match yours, e.g. it might use "|%s|" instead,
+#. or if the alphabet is different enough it may use
+#. "%s" without any placeholder signal.  Most
+#. translations leave this message as is.
+#.
+#, c-format
+msgid "[<%s>]"
+msgstr "[<%s>]"
+
+#. TRANSLATORS: The "<%s>" part of this string stands for a
+#. value given to a command line option, and "<>" is there
+#. as a convention to signal that it is a placeholder
+#. (i.e. the user should substitute it with the real value).
+#. If your language uses a different convention, you can
+#. change "<%s>" part to match yours, e.g. it might use
+#. "|%s|" instead, or if the alphabet is different enough it
+#. may use "%s" without any placeholder signal.  Most
+#. translations leave this message as is.
+#.
+#, c-format
+msgid " <%s>"
+msgstr " <%s>"
+
+msgid "..."
+msgstr "..."
+
+#, c-format
+msgid "usage: %s"
+msgstr "uso: %s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#, c-format
+msgid "   or: %s"
+msgstr "   ou: %s"
+
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#, c-format
+msgid "    %s"
+msgstr "    %s"
+
+msgid "-NUM"
+msgstr "-NUM"
+
+#, c-format
+msgid "opposite of --no-%s"
+msgstr "o oposto de --no-%s"
+
+msgid "expiry-date"
+msgstr "data-de-expiração"
+
+msgid "no-op (backward compatibility)"
+msgstr "no-op (compatibilidade com versões anteriores)"
+
+msgid "be more verbose"
+msgstr "ser mais verboso"
+
+msgid "be more quiet"
+msgstr "ser mais silencioso"
+
+msgid "use <n> digits to display object names"
+msgstr "usar <n> dígitos para exibir nomes de objeto"
+
+msgid "prefixed path to initial superproject"
+msgstr "caminho prefixado para o superprojeto inicial"
+
+msgid "how to strip spaces and #comments from message"
+msgstr "como remover espaços e #comentários da mensagem"
+
+msgid "read pathspec from file"
+msgstr "ler pathspec do arquivo"
+
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr ""
+"com --pathspec-from-file, os elementos do pathspec são separados por "
+"caractere NUL"
+
+#, c-format
+msgid "bad boolean environment value '%s' for '%s'"
+msgstr "valor de ambiente booleano inválido '%s' para '%s'"
+
+#, c-format
+msgid "failed to walk children of tree %s: not found"
+msgstr "falha ao percorrer os filhos da tree %s: não encontrado"
+
+#, c-format
+msgid "failed to find object %s"
+msgstr "falha ao encontrar o objeto %s"
+
+#, c-format
+msgid "failed to find tag %s"
+msgstr "falha ao encontrar a tag %s"
+
+#, c-format
+msgid "tree:%lu filter not supported by the path-walk API"
+msgstr "filtro tree:%lu não suportado pela API path-walk"
+
+msgid "sparse filter cannot be combined with existing sparse patterns"
+msgstr "o filtro sparse não pode ser combinado com padrões sparse existentes"
+
+#, c-format
+msgid "unable to parse sparse filter data in '%s'"
+msgstr "não foi possível analisar os dados do filtro sparse em '%s'"
+
+msgid "sparse filter is not cone-mode compatible"
+msgstr "o filtro sparse não é compatível com cone-mode"
+
+#, c-format
+msgid "object filter '%s' not supported by the path-walk API"
+msgstr "filtro de objetos '%s' não suportado pela API path-walk"
+
+msgid "failed to setup revision walk"
+msgstr "falha ao configurar a caminhada de revisões"
+
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Não foi possível tornar %s gravável pelo grupo"
+
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr ""
+"Caractere de escape '\\' não é permitido como último caractere no valor do "
+"atributo"
+
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Apenas uma especificação 'attr:' é permitida."
+
+msgid "attr spec must not be empty"
+msgstr "a especificação attr não deve estar vazia"
+
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "nome de atributo inválido %s"
+
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr ""
+"as configurações globais de pathspec 'glob' e 'noglob' são incompatíveis"
+
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"a configuração global de pathspec 'literal' é incompatível com todas as "
+"outras configurações globais de pathspec"
+
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "parâmetro inválido para o magic pathspec 'prefix'"
+
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "Mágica de pathspec inválida '%.*s' em '%s'"
+
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "Faltando ')' no final da mágica de pathspec em '%s'"
+
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Mágica de pathspec '%c' não implementada em '%s'"
+
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: 'literal' e 'glob' são incompatíveis"
+
+#, c-format
+msgid "'%s' is outside the directory tree"
+msgstr "'%s' está fora da árvore de diretórios"
+
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: '%s' está fora do repositório em '%s'"
+
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "'%s' (mnemônico: '%c')"
+
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s: mágica de pathspec não suportada por este comando: %s"
+
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "pathspec '%s' está além de um link simbólico"
+
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "a linha está citada incorretamente: %s"
+
+msgid "unable to write flush packet"
+msgstr "não foi possível gravar o pacote flush"
+
+msgid "unable to write delim packet"
+msgstr "não foi possível gravar o pacote delim"
+
+msgid "unable to write response end packet"
+msgstr "não foi possível gravar o pacote de fim de resposta"
+
+msgid "flush packet write failed"
+msgstr "falha ao escrever o pacote de flush"
+
+msgid "protocol error: impossibly long line"
+msgstr "erro de protocolo: linha impossivelmente longa"
+
+msgid "packet write with format failed"
+msgstr "falha ao escrever pacote com formato"
+
+msgid "packet write failed - data exceeds max packet size"
+msgstr "falha ao escrever pacote - os dados excedem o tamanho máximo do pacote"
+
+#, c-format
+msgid "packet write failed: %s"
+msgstr "falha ao escrever o pacote: %s"
+
+msgid "read error"
+msgstr "erro de leitura"
+
+msgid "the remote end hung up unexpectedly"
+msgstr "a extremidade remota desligou inesperadamente"
+
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
+msgstr "erro de protocolo: caractere de comprimento de linha inválido: %.4s"
+
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr "erro de protocolo: comprimento de linha inválido %d"
+
+#, c-format
+msgid "remote error: %s"
+msgstr "erro do remoto: %s"
+
+msgid "Refreshing index"
+msgstr "Atualizando o índice"
+
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr "não foi possível criar o lstat com threads: %s"
+
+msgid "unable to parse --pretty format"
+msgstr "não foi possível analisar o formato de --pretty"
+
+#, c-format
+msgid "%s is not supported by this command"
+msgstr "%s não é suportado por este comando"
+
+msgid "lazy fetching disabled; some objects may not be available"
+msgstr "lazy fetching desabilitado; alguns objetos podem não estar disponíveis"
+
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "promisor-remote: não foi possível fazer o fork do subprocesso de fetch"
+
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr "promisor-remote: não foi possível escrever no subprocesso de fetch"
+
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr ""
+"promisor-remote: não foi possível fechar o stdin para o subprocesso de fetch"
+
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "o nome de remoto promisor não pode começar com '/': %s"
+
+#, c-format
+msgid "could not fetch %s from promisor remote"
+msgstr "não foi possível fazer o fetch de %s do remoto promisor"
+
+#, c-format
+msgid "unsupported field '%s' in '%s' config"
+msgstr "campo não suportado '%s' na configuração '%s'"
+
+#, c-format
+msgid ""
+"invalid remote name '%s' before '=' sign in '%s' from "
+"promisor.acceptFromServerUrl config"
+msgstr ""
+"nome de remoto inválido '%s' antes do sinal de '=' em '%s' da configuração "
+"promisor.acceptFromServerUrl"
+
+#, c-format
+msgid ""
+"invalid url pattern '%s' in '%s' from promisor.acceptFromServerUrl config"
+msgstr ""
+"padrão de URL inválido '%s' em '%s' da configuração "
+"promisor.acceptFromServerUrl"
+
+#, c-format
+msgid ""
+"couldn't generate a valid remote name from advertised url '%s', ignoring "
+"this remote"
+msgstr ""
+"não foi possível gerar um nome de remoto válido a partir da URL anunciada "
+"'%s', ignorando este remoto"
+
+#, c-format
+msgid ""
+"generated remote name '%s' from advertised url '%s' is invalid, ignoring "
+"this remote"
+msgstr ""
+"o nome de remoto gerado '%s' a partir da URL anunciada '%s' é inválido, "
+"ignorando este remoto"
+
+#, c-format
+msgid "couldn't normalize advertised url '%s', ignoring this remote"
+msgstr ""
+"não foi possível normalizar a URL anunciada '%s', ignorando este remoto"
+
+#, c-format
+msgid "Auto-creating promisor remote '%s' for URL '%s'\n"
+msgstr "Criando automaticamente o remoto promisor '%s' para a URL '%s'\n"
+
+#, c-format
+msgid "too many remotes accepted with name like '%s-X', ignoring this remote"
+msgstr "muitos remotos aceitos com um nome como '%s-X', ignorando este remoto"
+
+#, c-format
+msgid ""
+"known remote named '%s' but with URL '%s' instead of '%s', ignoring this "
+"remote"
+msgstr ""
+"remoto conhecido chamado '%s', mas com a URL '%s' em vez de '%s', ignorando "
+"este remoto"
+
+#, c-format
+msgid "invalid element '%s' from remote info"
+msgstr "elemento inválido '%s' das informações do remoto"
+
+#, c-format
+msgid ""
+"server advertised a promisor remote without a name or URL: '%s', ignoring "
+"this remote"
+msgstr ""
+"o servidor anunciou um remoto promisor sem um nome ou URL: '%s', ignorando "
+"este remoto"
+
+#, c-format
+msgid ""
+"Storing new %s from server for remote '%s'.\n"
+"    '%s' -> '%s'\n"
+msgstr ""
+"Armazenando novo %s do servidor para o remoto '%s'.\n"
+"    '%s' -> '%s'\n"
+
+#, c-format
+msgid "invalid filter '%s' for remote '%s' will not be stored: %s"
+msgstr "o filtro inválido '%s' para o remoto '%s' não será armazenado: %s"
+
+#, c-format
+msgid "invalid token '%s' for remote '%s' will not be stored"
+msgstr "o token inválido '%s' para o remoto '%s' não será armazenado"
+
+#, c-format
+msgid "unknown '%s' value for '%s' config option"
+msgstr "valor desconhecido '%s' para a opção de configuração '%s'"
+
+#, c-format
+msgid "accepted promisor remote '%s' not found"
+msgstr "remoto promisor aceito '%s' não encontrado"
+
+#, c-format
+msgid "promisor remote '%s' advertised invalid filter '%s': %s"
+msgstr "o remoto promisor '%s' anunciou um filtro inválido '%s': %s"
+
+msgid "object-info: expected flush after arguments"
+msgstr "object-info: esperado flush após os argumentos"
+
+msgid "Removing duplicate objects"
+msgstr "Removendo objetos duplicados"
+
+#, c-format
+msgid "failed to load pseudo-merge regex for %s: '%s'"
+msgstr "falha ao carregar a regex de pseudo-merge para %s: '%s'"
+
+#, c-format
+msgid "%s must be non-negative, using default"
+msgstr "%s deve ser não negativo, usando o padrão"
+
+#, c-format
+msgid "%s must be between 0 (exclusive) and 1, using default"
+msgstr "%s deve estar entre 0 (exclusivo) e 1, usando o padrão"
+
+#, c-format
+msgid "%s must be positive, using default"
+msgstr "%s deve ser positivo, usando o padrão"
+
+#, c-format
+msgid "pseudo-merge group '%s' missing required pattern"
+msgstr "o grupo de pseudo-merge '%s' não possui o padrão obrigatório"
+
+#, c-format
+msgid "pseudo-merge group '%s' has unstable threshold before stable one"
+msgstr "o grupo de pseudo-merge '%s' possui limite instável antes do estável"
+
+#, c-format
+msgid ""
+"pseudo-merge regex from config has too many capture groups (max=%<PRIuMAX>)"
+msgstr ""
+"a expressão regular de pseudo-merge da configuração tem muitos grupos de "
+"captura (máx=%<PRIuMAX>)"
+
+#, c-format
+msgid "extended pseudo-merge read out-of-bounds (%<PRIuMAX> >= %<PRIuMAX>)"
+msgstr ""
+"a leitura estendida de pseudo-merge está fora dos limites (%<PRIuMAX> >= "
+"%<PRIuMAX>)"
+
+#, c-format
+msgid "extended pseudo-merge entry is too short (%<PRIuMAX> >= %<PRIuMAX>)"
+msgstr ""
+"a entrada estendida de pseudo-merge é muito curta (%<PRIuMAX> >= %<PRIuMAX>)"
+
+#, c-format
+msgid "could not find pseudo-merge for commit %s at offset %<PRIuMAX>"
+msgstr ""
+"não foi possível encontrar o pseudo-merge para o commit %s no deslocamento "
+"%<PRIuMAX>"
+
+#, c-format
+msgid "extended pseudo-merge lookup out-of-bounds (%<PRIu32> >= %<PRIu32>)"
+msgstr ""
+"a pesquisa estendida de pseudo-merge está fora dos limites (%<PRIu32> >= "
+"%<PRIu32>)"
+
+#, c-format
+msgid "out-of-bounds read: (%<PRIuMAX> >= %<PRIuMAX>)"
+msgstr "leitura fora dos limites: (%<PRIuMAX> >= %<PRIuMAX>)"
+
+#, c-format
+msgid "could not read extended pseudo-merge table for commit %s"
+msgstr ""
+"não foi possível ler a tabela estendida de pseudo-merge para o commit %s"
+
+msgid "could not start `log`"
+msgstr "não foi possível iniciar o `log`"
+
+msgid "could not read `log` output"
+msgstr "não foi possível ler a saída do `log`"
+
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "não foi possível analisar o commit '%s'"
+
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+"não foi possível fazer o parse da primeira linha da saída do `log`: não "
+"começava com 'commit ': '%s'"
+
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "não foi possível analisar o cabeçalho git '%.*s'"
+
+msgid "failed to generate diff"
+msgstr "falha ao gerar o diff"
+
+#, c-format
+msgid ""
+"range-diff: unable to compute the range-diff, since it exceeds the maximum "
+"memory for the cost matrix: %s (%<PRIuMAX> bytes) needed, limited to %s "
+"(%<PRIuMAX> bytes)"
+msgstr ""
+"range-diff: não foi possível computar o range-diff, pois excede a memória "
+"máxima para a matriz de custo: %s (%<PRIuMAX> bytes) necessários, limitado a "
+"%s (%<PRIuMAX> bytes)"
+
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr "não foi possível analisar o log de '%s'"
+
+#, c-format
+msgid "invalid extra cruft tip: '%s'"
+msgstr "ponta cruft extra inválida: '%s'"
+
+msgid "unable to enumerate additional recent objects"
+msgstr "não foi possível enumerar objetos recentes adicionais"
+
+#, c-format
+msgid "remove '%s'\n"
+msgstr "remover '%s'\n"
+
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "não adicionará o alias de arquivo '%s' ('%s' já existe no índice)"
+
+msgid "cannot create an empty blob in the object database"
+msgstr "não é possível criar um blob vazio no banco de dados de objetos"
+
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+"%s: só é possível adicionar arquivos regulares, links simbólicos ou "
+"diretórios git"
+
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "não foi possível indexar o arquivo '%s'"
+
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "não foi possível adicionar '%s' ao índice"
+
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "'%s' aparece tanto como arquivo quanto como diretório"
+
+msgid "Refresh index"
+msgstr "Atualizar o índice"
+
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"index.version definido, mas o valor é inválido.\n"
+"Usando a versão %i"
+
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"GIT_INDEX_VERSION definido, mas o valor é inválido.\n"
+"Usando a versão %i"
+
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "assinatura inválida 0x%08x"
+
+#, c-format
+msgid "bad index version %d"
+msgstr "versão de índice inválida %d"
+
+msgid "bad index file sha1 signature"
+msgstr "assinatura sha1 inválida do arquivo de índice"
+
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "o índice usa a extensão %.4s, que não entendemos"
+
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "ignorando a extensão %.4s"
+
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "formato de entrada de índice desconhecido 0x%08x"
+
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr "campo de nome malformado no índice, perto do caminho '%s'"
+
+msgid "unordered stage entries in index"
+msgstr "entradas de stage não ordenadas no índice"
+
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "múltiplas entradas de stage para o arquivo mesclado '%s'"
+
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "entradas de stage não ordenadas para '%s'"
+
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr "não foi possível criar a thread load_cache_entries: %s"
+
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr "não foi possível fazer join na thread load_cache_entries: %s"
+
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: falha ao abrir o arquivo de índice"
+
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: não é possível fazer stat no índice aberto"
+
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: arquivo de índice menor que o esperado"
+
+#, c-format
+msgid "%s: unable to map index file%s"
+msgstr "%s: não foi possível mapear o arquivo de índice%s"
+
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr "não foi possível criar a thread load_index_extensions: %s"
+
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr "não foi possível fazer join na thread load_index_extensions: %s"
+
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "não foi possível atualizar o índice compartilhado '%s'"
+
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "índice quebrado, esperava %s em %s, obteve %s"
+
+msgid "cannot write split index for a sparse index"
+msgstr "não é possível escrever o índice dividido para um índice esparso"
+
+msgid "failed to convert to a sparse-index"
+msgstr "falha ao converter para um sparse-index"
+
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "não foi possível abrir o diretório git: %s"
+
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "não foi possível desvincular: %s"
+
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "não é possível corrigir os bits de permissão em '%s'"
+
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s: não é possível descartar para o stage #0"
+
+#, c-format
+msgid ""
+"Skipping submodule due to ignore=all: %s\n"
+"Use --force if you really want to add the submodule."
+msgstr ""
+"Ignorando o submódulo devido a ignore=all: %s\n"
+"Use --force se você realmente deseja adicionar o submódulo."
+
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "status de diff inesperado %c"
+
+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 ""
+"Você pode corrigir isso com 'git rebase --edit-todo' e, em seguida, executar "
+"'git rebase --continue'.\n"
+"Ou você pode abortar o rebase com 'git rebase --abort'.\n"
+
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"configuração não reconhecida %s para a opção rebase.missingCommitsCheck. "
+"Ignorando."
+
+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 [-C | -c] <commit> = like \"squash\" but keep only the previous\n"
+"                   commit's log message, unless -C is used, in which case\n"
+"                   keep only this commit's message; -c is same as -C but\n"
+"                   opens the editor\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"
+"u, update-ref <ref> = track a placeholder for the <ref> to be updated\n"
+"                      to this position in the new commits. The <ref> is\n"
+"                      updated at the end of the rebase\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+"\n"
+"Comandos:\n"
+"p, pick <commit> = usar o commit\n"
+"r, reword <commit> = usar o commit, mas editar a mensagem do commit\n"
+"e, edit <commit> = usar o commit, mas parar para alteração (amend)\n"
+"s, squash <commit> = usar o commit, mas mesclar com o commit anterior\n"
+"f, fixup [-C | -c] <commit> = como \"squash\", mas manter apenas a mensagem "
+"de log\n"
+"                   do commit anterior, a menos que -C seja usado, caso em "
+"que\n"
+"                   mantém apenas a mensagem deste commit; -c é o mesmo que "
+"-C, mas\n"
+"                   abre o editor\n"
+"x, exec <command> = executar o comando (o resto da linha) usando o shell\n"
+"b, break = parar aqui (continuar o rebase mais tarde com 'git rebase --"
+"continue')\n"
+"d, drop <commit> = remover o commit\n"
+"l, label <label> = rotular o HEAD atual com um nome\n"
+"t, reset <label> = redefinir o HEAD para um rótulo\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+"        criar um merge commit usando a mensagem original do merge commit\n"
+"        (ou o oneline, se nenhum merge commit original tiver sido\n"
+"        especificado); use -c <commit> para alterar a mensagem do commit\n"
+"u, update-ref <ref> = rastrear um placeholder para o <ref> a ser atualizado\n"
+"                      para esta posição nos novos commits. O <ref> é\n"
+"                      atualizado no final do rebase\n"
+"\n"
+"Estas linhas podem ser reordenadas; elas são executadas de cima para baixo.\n"
+
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "Rebase de %s sobre %s (%d comando)"
+msgstr[1] "Rebase de %s sobre %s (%d comandos)"
+
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"Não remova nenhuma linha. Use 'drop' explicitamente para remover um commit.\n"
+
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Se você remover uma linha aqui ESSE COMMIT SERÁ PERDIDO.\n"
+
+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"
+"Você está editando o arquivo de tarefas (todo file) de um rebase interativo "
+"em andamento.\n"
+"Para continuar o rebase após a edição, execute:\n"
+"    git rebase --continue\n"
+"\n"
+
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"No entanto, se você remover tudo, o rebase será abortado.\n"
+"\n"
+
+#, c-format
+msgid "could not write '%s'."
+msgstr "não foi possível gravar '%s'."
+
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Aviso: alguns commits podem ter sido descartados acidentalmente.\n"
+"Commits descartados (do mais recente para o mais antigo):\n"
+
+#, 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 ""
+"Para evitar esta mensagem, use \"drop\" para remover explicitamente um "
+"commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' para alterar o nível de avisos.\n"
+"Os comportamentos possíveis são: ignore, warn, error.\n"
+"\n"
+
+#, c-format
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: 'preserve' substituído por 'merges'"
+
+msgid "gone"
+msgstr "gone"
+
+#, c-format
+msgid "ahead %d"
+msgstr "à frente %d"
+
+#, c-format
+msgid "behind %d"
+msgstr "atrás %d"
+
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "à frente %d, atrás %d"
+
+#, c-format
+msgid "%%(%.*s) does not take arguments"
+msgstr "%%(%.*s) não aceita argumentos"
+
+#, c-format
+msgid "unrecognized %%(%.*s) argument: %s"
+msgstr "argumento não reconhecido de %%(%.*s): %s"
+
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "formato esperado: %%(color:<color>)"
+
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "cor não reconhecida: %%(color:%s)"
+
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Valor inteiro esperado em refname:lstrip=%s"
+
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Valor inteiro esperado em refname:rstrip=%s"
+
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "esperado %%(trailers:key=<value>)"
+
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "argumento de %%(trailers) desconhecido: %s"
+
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "valor positivo esperado em contents:lines=%s"
+
+#, c-format
+msgid "argument expected for %s"
+msgstr "argumento esperado para %s"
+
+#, c-format
+msgid "positive value expected %s=%s"
+msgstr "valor positivo esperado em %s=%s"
+
+#, c-format
+msgid "cannot fully parse %s=%s"
+msgstr "não é possível fazer o parse completo de %s=%s"
+
+#, c-format
+msgid "value expected %s="
+msgstr "valor esperado em %s="
+
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "valor positivo esperado para '%s' em %%(%s)"
+
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "formato esperado: %%(align:<width>,<position>)"
+
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "posição não reconhecida:%s"
+
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "largura não reconhecida:%s"
+
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "argumento não reconhecido de %%(%s): %s"
+
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "largura positiva esperada com o átomo %%(align)"
+
+#, c-format
+msgid "expected format: %%(ahead-behind:<committish>)"
+msgstr "formato esperado: %%(ahead-behind:<committish>)"
+
+#, c-format
+msgid "expected format: %%(is-base:<committish>)"
+msgstr "formato esperado: %%(is-base:<committish>)"
+
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "nome do campo malformado: %.*s"
+
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "nome do campo desconhecido: %.*s"
+
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr ""
+"não é um repositório git, mas o campo '%.*s' requer acesso aos dados do "
+"objeto"
+
+#, c-format
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "formato: átomo %%(%s) usado sem um átomo %%(%s)"
+
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "formato: átomo %%(then) usado mais de uma vez"
+
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "formato: átomo %%(then) usado depois de %%(else)"
+
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "formato: átomo %%(else) usado mais de uma vez"
+
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "formato: átomo %%(end) usado sem o átomo correspondente"
+
+#, c-format
+msgid "malformed format string %s"
+msgstr "string de formato malformada %s"
+
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "este comando rejeita o átomo %%(%.*s)"
+
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s não pode ser usado com --python, --shell, --tcl"
+
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "falha no parse_object_buffer em %s para %s"
+
+msgid "failed to run 'describe'"
+msgstr "falha ao executar o 'describe'"
+
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(sem branch, fazendo rebase de %s)"
+
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(sem branch, fazendo rebase do HEAD desanexado %s)"
+
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "(sem branch, bisect iniciado em %s)"
+
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD desanexado em %s)"
+
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD desanexado de %s)"
+
+msgid "(no branch)"
+msgstr "(sem branch)"
+
+#, c-format
+msgid "missing object %s for %s"
+msgstr "objeto %s ausente para %s"
+
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "objeto malformado em '%s'"
+
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "ignorando o ref com nome quebrado %s"
+
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "ignorando o ref quebrado %s"
+
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "formato: átomo %%(end) ausente"
+
+#, c-format
+msgid "malformed object name %s"
+msgstr "nome de objeto malformado %s"
+
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "a opção `%s' deve apontar para um commit"
+
+msgid "key"
+msgstr "chave"
+
+msgid "field name to sort on"
+msgstr "nome do campo para ordenar"
+
+msgid "exclude refs which match pattern"
+msgstr "excluir refs que correspondam ao padrão"
+
+#, c-format
+msgid "not a reflog: %s"
+msgstr "não é um reflog: %s"
+
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "nenhum reflog para '%s'"
+
+#, c-format
+msgid "in '%s' phase, update aborted by the reference-transaction hook"
+msgstr ""
+"na fase '%s', a atualização foi abortada pelo hook reference-transaction"
+
+msgid "Checking references consistency"
+msgstr "Verificando a consistência das referências"
+
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s não aponta para um objeto válido!"
+
+#, c-format
+msgid "%s%s will become dangling after %s is deleted\n"
+msgstr "%s%s se tornará pendente após %s ser excluído\n"
+
+#, c-format
+msgid "%s%s has become dangling after %s was deleted\n"
+msgstr "%s%s ficou pendente após %s ser excluído\n"
+
+#, c-format
+msgid ""
+"Using '%s' as the name for the initial branch. This default branch name\n"
+"will change to \"main\" in Git 3.0. To configure the initial branch name\n"
+"to use in all of your new repositories, which will suppress this warning,\n"
+"call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"Usando '%s' como o nome do branch inicial. Este nome de branch padrão\n"
+"mudará para \"main\" no Git 3.0. Para configurar o nome do branch inicial\n"
+"a ser usado em todos os seus novos repositórios, o que suprimirá este "
+"aviso,\n"
+"execute:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Nomes comumente escolhidos no lugar de 'master' são 'main', 'trunk' e\n"
+"'development'. O branch recém-criado pode ser renomeado com este comando:\n"
+"\n"
+"\tgit branch -m <name>\n"
+
+#, c-format
+msgid ""
+"Using '%s' as the name for the initial branch since Git 3.0.\n"
+"If you expected Git to create 'master', the just-created\n"
+"branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m master\n"
+msgstr ""
+"Usando '%s' como o nome para o branch inicial desde o Git 3.0.\n"
+"Se você esperava que o Git criasse 'master', o branch recém-criado\n"
+"pode ser renomeado através deste comando:\n"
+"\n"
+"\tgit branch -m master\n"
+
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "não foi possível recuperar `%s`"
+
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "nome de branch inválido: %s = %s"
+
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "ignorando symref pendente %s"
+
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "o log para o ref %s tem uma lacuna após %s"
+
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "o log para o ref %s terminou inesperadamente em %s"
+
+#, c-format
+msgid "log for %s is empty"
+msgstr "o log para %s está vazio"
+
+#, c-format
+msgid "refusing to update reflog for pseudoref '%s'"
+msgstr "recusando-se a atualizar o reflog do pseudoref '%s'"
+
+#, c-format
+msgid "refusing to update pseudoref '%s'"
+msgstr "recusando-se a atualizar o pseudoref '%s'"
+
+#, c-format
+msgid "refusing to update reflog with bad name '%s'"
+msgstr "recusando-se a atualizar o reflog com nome inválido '%s'"
+
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "recusando-se a atualizar o ref com nome inválido '%s'"
+
+msgid "refusing to force and skip creation of reflog"
+msgstr "recusando-se a forçar e pular a criação do reflog"
+
+#, c-format
+msgid "trying to write ref '%s' with nonexistent object %s"
+msgstr "tentando escrever o ref '%s' com objeto inexistente %s"
+
+#, c-format
+msgid "trying to write non-commit object %s to branch '%s'"
+msgstr "tentando escrever o objeto não-commit %s no branch '%s'"
+
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "falha no update_ref para o ref '%s': %s"
+
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "múltiplas atualizações para o ref '%s' não permitidas"
+
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "atualizações de ref proibidas dentro do ambiente de quarentena"
+
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' existe; não é possível criar '%s'"
+
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "não é possível processar '%s' e '%s' ao mesmo tempo"
+
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "não foi possível excluir a referência %s: %s"
+
+#, c-format
+msgid "could not delete references: %s"
+msgstr "não foi possível excluir as referências: %s"
+
+#, c-format
+msgid "Finished dry-run migration of refs, the result can be found at '%s'\n"
+msgstr ""
+"Concluída a migração dry-run dos refs, o resultado pode ser encontrado em "
+"'%s'\n"
+
+#, c-format
+msgid "could not remove temporary migration directory '%s'"
+msgstr "não foi possível remover o diretório temporário de migração '%s'"
+
+#, c-format
+msgid "migrated refs can be found at '%s'"
+msgstr "refs migrados podem ser encontrados em '%s'"
+
+msgid ""
+"'core.preferSymlinkRefs=true' is nominated for removal.\n"
+"hint: The use of symbolic links for symbolic refs is deprecated\n"
+"hint: and will be removed in Git 3.0. The configuration that\n"
+"hint: tells Git to use them is thus going away. You can unset\n"
+"hint: it with:\n"
+"hint:\n"
+"hint:\tgit config unset core.preferSymlinkRefs\n"
+"hint:\n"
+"hint: Git will then use the textual symref format instead."
+msgstr ""
+"'core.preferSymlinkRefs=true' está indicado para remoção.\n"
+"hint: O uso de links simbólicos para refs simbólicas foi descontinuado\n"
+"hint: e será removido no Git 3.0. A configuração que\n"
+"hint: diz ao Git para usá-los será, portanto, removida. Você pode\n"
+"hint: desdefini-la com:\n"
+"hint:\n"
+"hint:\tgit config unset core.preferSymlinkRefs\n"
+"hint:\n"
+"hint: O Git então usará o formato textual de symref em seu lugar."
+
+#, c-format
+msgid ""
+"cannot lock ref '%s': expected symref with target '%s': but is a regular ref"
+msgstr ""
+"não é possível bloquear o ref '%s': esperado symref com alvo '%s': mas é um "
+"ref regular"
+
+#, c-format
+msgid "trying to write reflog for '%s' with incomplete values"
+msgstr "tentando escrever o reflog para '%s' com valores incompletos"
+
+#, c-format
+msgid "cannot read ref file '%s'"
+msgstr "não é possível ler o arquivo de ref '%s'"
+
+#, c-format
+msgid "cannot open directory %s"
+msgstr "não é possível abrir o diretório %s"
+
+#, c-format
+msgid "unable to open '%s'"
+msgstr "não foi possível abrir '%s'"
+
+#, c-format
+msgid "refname is dangerous: %s"
+msgstr "refname é perigoso: %s"
+
+#, c-format
+msgid ""
+"multiple updates for 'HEAD' (including one via its referent '%s') are not "
+"allowed"
+msgstr ""
+"múltiplas atualizações para 'HEAD' (incluindo uma por meio de sua referência "
+"'%s') não são permitidas"
+
+#, c-format
+msgid "cannot lock ref '%s': unable to resolve reference '%s'"
+msgstr ""
+"não foi possível bloquear o ref '%s': não é possível resolver a referência "
+"'%s'"
+
+#, c-format
+msgid "cannot lock ref '%s': error reading reference"
+msgstr "não foi possível bloquear o ref '%s': erro ao ler a referência"
+
+#, c-format
+msgid ""
+"multiple updates for '%s' (including one via symref '%s') are not allowed"
+msgstr ""
+"múltiplas atualizações para '%s' (incluindo uma por meio de symref '%s') não "
+"são permitidas"
+
+#, c-format
+msgid "cannot lock ref '%s': dangling symref already exists"
+msgstr "não foi possível bloquear o ref '%s': já existe um symref pendente"
+
+#, c-format
+msgid "cannot lock ref '%s': reference already exists"
+msgstr "não é possível bloquear o ref '%s': a referência já existe"
+
+#, c-format
+msgid "cannot lock ref '%s': reference is missing but expected %s"
+msgstr ""
+"não foi possível bloquear o ref '%s': a referência está ausente, mas era "
+"esperado %s"
+
+#, c-format
+msgid "cannot lock ref '%s': is at %s but expected %s"
+msgstr "não foi possível bloquear o ref '%s': está em %s, mas era esperado %s"
+
+#, c-format
+msgid "reftable: transaction prepare: %s"
+msgstr "reftable: preparação de transação: %s"
+
+#, c-format
+msgid "reftable: transaction failure: %s"
+msgstr "reftable: falha na transação: %s"
+
+#, c-format
+msgid "unable to compact stack: %s"
+msgstr "não foi possível compactar a pilha: %s"
+
+#, c-format
+msgid "refname %s not found"
+msgstr "nome de ref %s não encontrado"
+
+#, c-format
+msgid "refname %s is a symbolic ref, copying it is not supported"
+msgstr "nome de ref %s é um ref simbólico, não é suportado copiá-lo"
+
+#, c-format
+msgid "reftable stack for worktree '%s' is broken"
+msgstr "a pilha reftable para a worktree '%s' está corrompida"
+
+#, c-format
+msgid "could not create iterator for worktree '%s'"
+msgstr "não foi possível criar o iterador para a worktree '%s'"
+
+#, c-format
+msgid "could not read record for worktree '%s'"
+msgstr "não foi possível ler o registro da worktree '%s'"
+
+#, c-format
+msgid "pattern '%s' has no '*'"
+msgstr "o padrão '%s' não tem '*'"
+
+#, c-format
+msgid "replacement '%s' has no '*'"
+msgstr "a substituição '%s' não tem '*'"
+
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "aspas inválidas no valor de push-option: '%s'"
+
+#, c-format
+msgid "unknown value for object-format: %s"
+msgstr "valor desconhecido para object-format: %s"
+
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs inválido: isto é um repositório git?"
+
+msgid "invalid server response; expected service, got flush packet"
+msgstr ""
+"resposta do servidor inválida; esperava-se serviço, obteve-se pacote flush"
+
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "resposta do servidor inválida; obteve '%s'"
+
+#, c-format
+msgid "repository '%s' not found"
+msgstr "repositório '%s' não encontrado"
+
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "Falha de autenticação para '%s'"
+
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "não foi possível acessar '%s' com a configuração http.pinnedPubkey: %s"
+
+#, c-format
+msgid "rate limited by '%s', please try again in %ld seconds"
+msgstr ""
+"limite de taxa excedido por '%s', por favor tente novamente em %ld segundos"
+
+#, c-format
+msgid "rate limited by '%s', please try again later"
+msgstr "limite de taxa excedido por '%s', por favor tente novamente mais tarde"
+
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "não foi possível acessar '%s': %s"
+
+#, c-format
+msgid "redirecting to %s"
+msgstr "redirecionando para %s"
+
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "não deveria haver EOF quando não for gentil com EOF"
+
+msgid "remote server sent unexpected response end packet"
+msgstr "o servidor remoto enviou um pacote de fim de resposta inesperado"
+
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+"não foi possível retroceder os dados de post rpc - tente aumentar "
+"http.postBuffer"
+
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: caractere de comprimento de linha incorreto: %.4s"
+
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: pacote de fim de resposta inesperado"
+
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC falhou; %s"
+
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "não é possível fazer deflate da requisição; erro deflate do zlib %d"
+
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "não é possível fazer deflate da requisição; erro end do zlib %d"
+
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "%d bytes do cabeçalho de comprimento foram recebidos"
+
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "%d bytes do corpo ainda são esperados"
+
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "o transporte dumb http não suporta capacidades shallow"
+
+msgid "fetch failed."
+msgstr "fetch falhou."
+
+msgid "cannot fetch by sha1 over smart http"
+msgstr "não é possível fazer fetch por sha1 via smart http"
+
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "erro de protocolo: esperado sha/ref, obtido '%s'"
+
+#, c-format
+msgid "http transport does not support %s"
+msgstr "o transporte http não suporta %s"
+
+msgid "protocol error: expected '<url> <path>', missing space"
+msgstr "erro de protocolo: esperado '<url> <path>', faltando espaço"
+
+#, c-format
+msgid "failed to download file at URL '%s'"
+msgstr "falha ao baixar o arquivo na URL '%s'"
+
+msgid "git-http-push failed"
+msgstr "git-http-push falhou"
+
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: uso: git remote-curl <remote> [<url>]"
+
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl: erro ao ler fluxo de comandos do git"
+
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl: fetch tentado sem um repositório local"
+
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl: comando desconhecido '%s' do git"
+
+#, c-format
+msgid ""
+"reading remote from \"%s/%s\", which is nominated for removal.\n"
+"\n"
+"If you still use the \"remotes/\" directory it is recommended to\n"
+"migrate to config-based remotes:\n"
+"\n"
+"\tgit remote rename %s %s\n"
+"\n"
+"If you cannot, please let us know why you still need to use it by\n"
+"sending an e-mail to <git@vger.kernel.org>."
+msgstr ""
+"lendo o remoto de \"%s/%s\", que está indicado para remoção.\n"
+"\n"
+"Se você ainda usa o diretório \"remotes/\" é recomendado\n"
+"migrar para remotos baseados em configuração:\n"
+"\n"
+"\tgit remote rename %s %s\n"
+"\n"
+"Se não puder, por favor nos diga por que ainda precisa usá-lo\n"
+"enviando um e-mail para <git@vger.kernel.org>."
+
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "a abreviação de remoto na configuração não pode começar com '/': %s"
+
+msgid "more than one receivepack given, using the first"
+msgstr "mais de um receivepack fornecido, usando o primeiro"
+
+msgid "more than one uploadpack given, using the first"
+msgstr "mais de um uploadpack fornecido, usando o primeiro"
+
+#, c-format
+msgid "unrecognized followRemoteHEAD value '%s' ignored"
+msgstr "valor followRemoteHEAD não reconhecido '%s' ignorado"
+
+#, c-format
+msgid "unrecognized value transfer.credentialsInUrl: '%s'"
+msgstr "valor não reconhecido para transfer.credentialsInUrl: '%s'"
+
+#, c-format
+msgid "URL '%s' uses plaintext credentials"
+msgstr "URL '%s' usa credenciais de texto simples"
+
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "Não foi possível buscar %s e %s para %s"
+
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s normalmente rastreia %s, não %s"
+
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s rastreia %s e %s"
+
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "src refspec %s não corresponde a nenhum"
+
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "src refspec %s corresponde a mais de um"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#, 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 ""
+"O destino fornecido não é um nome de referência completo (ou seja,\n"
+"começando com \"refs/\"). Tentamos adivinhar o que você quis dizer:\n"
+"\n"
+"- Procurando por uma referência que corresponda a '%s' no lado remoto.\n"
+"- Verificando se o <src> sendo enviado ('%s')\n"
+"  é uma referência em \"refs/{heads,tags}/\". Se sim, adicionamos o prefixo\n"
+"  refs/{heads,tags}/ correspondente no lado remoto.\n"
+"\n"
+"Nenhum dos dois funcionou, então desistimos. Você deve qualificar totalmente "
+"a referência."
+
+#, 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 ""
+"A parte <src> do refspec é um objeto commit.\n"
+"Você pretendia criar um novo branch fazendo push para\n"
+"'%s:refs/heads/%s'?"
+
+#, 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 ""
+"A parte <src> do refspec é um objeto tag.\n"
+"Você pretendia criar uma nova tag fazendo push para\n"
+"'%s:refs/tags/%s'?"
+
+#, 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 ""
+"A parte <src> do refspec é um objeto tree.\n"
+"Você pretendia marcar uma nova tree fazendo push para\n"
+"'%s:refs/tags/%s'?"
+
+#, 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 ""
+"A parte <src> do refspec é um objeto blob.\n"
+"Você pretendia marcar um novo blob fazendo push para\n"
+"'%s:refs/tags/%s'?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec ('%s') is an object ID that doesn't exist.\n"
+msgstr "A parte <src> do refspec ('%s') é um ID de objeto que não existe.\n"
+
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s não pode ser resolvido para um branch"
+
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "não foi possível excluir '%s': a referência remota não existe"
+
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "dst refspec %s corresponde a mais de um"
+
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "dst ref %s recebe de mais de um src"
+
+msgid "HEAD does not point to a branch"
+msgstr "HEAD não aponta para um branch"
+
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "não há branch: '%s'"
+
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "nenhum upstream configurado para o branch '%s'"
+
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "branch upstream '%s' não armazenado como branch de rastreamento remoto"
+
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr ""
+"o destino de push '%s' no remoto '%s' não tem branch de rastreamento local"
+
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "o branch '%s' não tem remoto para push"
+
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "os refspecs de push para '%s' não incluem '%s'"
+
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "push não tem destino (push.default é 'nothing')"
+
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "não é possível resolver o push 'simple' para um único destino"
+
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "não foi possível encontrar a referência remota %s"
+
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Ignorando ref estranha '%s' localmente"
+
+#, c-format
+msgid ""
+"ignoring value '%s' for status.compareBranches, only @{upstream} and @{push} "
+"are supported"
+msgstr ""
+"ignorando o valor '%s' para status.compareBranches, apenas @{upstream} e "
+"@{push} são suportados"
+
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Seu branch está atualizado com '%s'.\n"
+
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Seu branch e '%s' referem-se a commits diferentes.\n"
+
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (use \"%s\" para detalhes)\n"
+
+#, 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] "Seu branch está à frente de '%s' por %d commit.\n"
+msgstr[1] "Seu branch está à frente de '%s' por %d commits.\n"
+
+msgid "  (use \"git push\" to publish your local commits)\n"
+msgstr "  (use \"git push\" para publicar seus commits locais)\n"
+
+#, 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] ""
+"Seu branch está atrás de '%s' por %d commit, e pode receber fast-forward.\n"
+msgstr[1] ""
+"Seu branch está atrás de '%s' por %d commits, e pode receber fast-forward.\n"
+
+#, c-format
+msgid "  (use \"git pull %s %s\" to update your local branch)\n"
+msgstr "  (use \"git pull %s %s\" para atualizar seu branch local)\n"
+
+msgid "  (use \"git pull\" to update your local branch)\n"
+msgstr "  (use \"git pull\" para atualizar seu branch local)\n"
+
+#, 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] ""
+"Seu branch e '%s' divergiram,\n"
+"e têm %d e %d commit diferente cada, respectivamente.\n"
+msgstr[1] ""
+"Seu branch e '%s' divergiram,\n"
+"e têm %d e %d commits diferentes cada, respectivamente.\n"
+
+#, c-format
+msgid ""
+"  (use \"git pull %s %s\" if you want to integrate the remote branch with "
+"yours)\n"
+msgstr "  (use \"git pull %s %s\" se quiser integrar o branch remoto ao seu)\n"
+
+msgid ""
+"  (use \"git pull\" if you want to integrate the remote branch with yours)\n"
+msgstr "  (use \"git pull\" se quiser integrar o branch remoto ao seu)\n"
+
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "Seu branch é baseado em '%s', mas o upstream desapareceu.\n"
+
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "  (use \"git branch --unset-upstream\" para consertar)\n"
+
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "não é possível analisar o nome do objeto esperado '%s'"
+
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "não é possível remover um componente do URL '%s'"
+
+#, c-format
+msgid "cannot open index for %s"
+msgstr "não é possível abrir o índice para %s"
+
+#, c-format
+msgid "pack %s too large to consider in geometric progression"
+msgstr "pack %s grande demais para considerar na progressão geométrica"
+
+#, c-format
+msgid "pack %s too large to roll up"
+msgstr "pack %s grande demais para acumular"
+
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "não foi possível abrir o arquivo temporário %s para gravação"
+
+msgid "could not close refs snapshot tempfile"
+msgstr "não foi possível fechar o arquivo temporário de snapshot de refs"
+
+#, c-format
+msgid "could not remove stale bitmap: %s"
+msgstr "não foi possível remover o bitmap obsoleto: %s"
+
+msgid "no packs to write MIDX during compaction"
+msgstr "nenhum pack para gravar MIDX durante a compactação"
+
+#, c-format
+msgid "expected exactly one line during MIDX write, got: %<PRIuMAX>"
+msgstr ""
+"esperava-se exatamente uma linha durante a gravação de MIDX, obteve-se: "
+"%<PRIuMAX>"
+
+#, c-format
+msgid "unexpected MIDX output: '%s'"
+msgstr "saída MIDX inesperada: '%s'"
+
+#, c-format
+msgid "could not load pack %<PRIu32> from MIDX"
+msgstr "não foi possível carregar o pack %<PRIu32> do MIDX"
+
+msgid "too many objects in MIDX compaction step"
+msgstr "muitos objetos na etapa de compactação do MIDX"
+
+#, c-format
+msgid "could not find preferred pack for MIDX %s"
+msgstr "não foi possível encontrar o pack preferido para o MIDX %s"
+
+msgid "unable to generate compaction plan"
+msgstr "não foi possível gerar o plano de compactação"
+
+#, c-format
+msgid "unable to execute compaction step %<PRIuMAX>"
+msgstr "não foi possível executar a etapa de compactação %<PRIuMAX>"
+
+msgid "could not start pack-objects to repack promisor objects"
+msgstr ""
+"não foi possível iniciar o pack-objects para fazer repack dos objetos "
+"promisor"
+
+msgid "failed to feed promisor objects to pack-objects"
+msgstr "falha ao alimentar os objetos promisor para o pack-objects"
+
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+"repack: Esperando linhas de ID de objeto hexadecimal completas apenas de "
+"pack-objects."
+
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
+"não foi possível finalizar o pack-objects para fazer repack dos objetos "
+"promisor"
+
+msgid "could not start pack-objects to repack promisor packs"
+msgstr ""
+"não foi possível iniciar o pack-objects para fazer repack dos packs promisor"
+
+#, c-format
+msgid "pack prefix %s does not begin with objdir %s"
+msgstr "o prefixo de pack %s não começa com o objdir %s"
+
+#, c-format
+msgid "renaming pack to '%s' failed"
+msgstr "a renomeação do pack para '%s' falhou"
+
+#, c-format
+msgid "pack-objects did not write a '%s' file for pack %s-%s"
+msgstr "pack-objects não gravou um arquivo '%s' para o pack %s-%s"
+
+#, c-format
+msgid "could not unlink: %s"
+msgstr "não foi possível desvincular: %s"
+
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr "nome inválido de ref de substituição: %s"
+
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "ref de replace duplicado: %s"
+
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "profundidade de replace muito alta para o objeto %s"
+
+#, c-format
+msgid "'%s' is not a valid commit-ish for %s"
+msgstr "'%s' não é um commit-ish válido para %s"
+
+#, c-format
+msgid "'%s' does not point to a commit for %s"
+msgstr "'%s' não aponta para um commit para %s"
+
+#, c-format
+msgid "argument to %s must be a reference"
+msgstr "o argumento para %s deve ser uma referência"
+
+#, c-format
+msgid ""
+"'%s' cannot be used with multiple revision ranges because the ordering would "
+"be ill-defined"
+msgstr ""
+"'%s' não pode ser usado com múltiplos intervalos de revisão porque a ordem "
+"ficaria mal definida"
+
+msgid "need some commits to replay"
+msgstr "são necessários alguns commits para executar o replay"
+
+msgid "all positive revisions given must be references"
+msgstr "todas as revisões positivas dadas devem ser referências"
+
+#, c-format
+msgid "merge of %s onto %s failed"
+msgstr "o merge de %s sobre %s falhou"
+
+#, c-format
+msgid "commit %s became empty after replay"
+msgstr "commit %s ficou vazio após o replay"
+
+msgid "'--linearize' cannot be used with multiple branches"
+msgstr "'--linearize' não pode ser usado com vários branches"
+
+msgid "'--ref' cannot be used with multiple revision ranges"
+msgstr "'--ref' não pode ser usado com múltiplos intervalos de revisão"
+
+#, c-format
+msgid "'%s' is not a valid refname"
+msgstr "'%s' não é um nome de ref válido"
+
+msgid "compatibility hash algorithm support requires Rust"
+msgstr "o suporte de compatibilidade a algoritmos de hash requer Rust"
+
+msgid "corrupt MERGE_RR"
+msgstr "MERGE_RR corrompido"
+
+msgid "unable to write rerere record"
+msgstr "não foi possível gravar o registro do rerere"
+
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "ocorreram erros ao gravar '%s' (%s)"
+
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "não foi possível analisar os pedaços de conflito em '%s'"
+
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr "falha em utime() em '%s'"
+
+#, c-format
+msgid "writing '%s' failed"
+msgstr "a gravação de '%s' falhou"
+
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr "'%s' preparado (staged) usando a resolução anterior."
+
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr "Resolução registrada para '%s'."
+
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr "Resolvido '%s' usando resolução anterior."
+
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "não é possível desvincular o '%s' perdido"
+
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr "Preimage registrada para '%s'"
+
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "falha ao atualizar o estado de conflito em '%s'"
+
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "nenhuma resolução lembrada para '%s'"
+
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "Preimage atualizada para '%s'"
+
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "Resolução esquecida para '%s'\n"
+
+msgid "unable to open rr-cache directory"
+msgstr "não foi possível abrir o diretório rr-cache"
+
+msgid "update the index with reused conflict resolution if possible"
+msgstr "atualizar o índice com resolução de conflito reutilizada, se possível"
+
+msgid "could not determine HEAD revision"
+msgstr "não foi possível determinar a revisão do HEAD"
+
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "falha ao encontrar a tree de %s"
+
+#, c-format
+msgid "unsupported section for hidden refs: %s"
+msgstr "seção não suportada para refs ocultos: %s"
+
+msgid "--exclude-hidden= passed more than once"
+msgstr "--exclude-hidden= passado mais de uma vez"
+
+#, c-format
+msgid "resolve-undo records `%s` which is missing"
+msgstr "registros de resolve-undo indicam `%s`, que está ausente"
+
+#, c-format
+msgid "%s exists but is a symbolic ref"
+msgstr "%s existe, mas é uma ref simbólica"
+
+msgid ""
+"--merge requires one of the pseudorefs MERGE_HEAD, CHERRY_PICK_HEAD, "
+"REVERT_HEAD or REBASE_HEAD"
+msgstr ""
+"--merge requer um dos pseudorefs MERGE_HEAD, CHERRY_PICK_HEAD, REVERT_HEAD "
+"ou REBASE_HEAD"
+
+#, c-format
+msgid "could not get commit for --ancestry-path argument %s"
+msgstr "não foi possível obter o commit para o argumento --ancestry-path %s"
+
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<packfile> não é mais suportado"
+
+#, c-format
+msgid "invalid option '%s' in --stdin mode"
+msgstr "opção inválida '%s' no modo --stdin"
+
+msgid "your current branch appears to be broken"
+msgstr "seu branch atual parece estar quebrado"
+
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "seu branch atual '%s' ainda não tem nenhum commit"
+
+msgid "object filtering requires --objects"
+msgstr "a filtragem de objetos requer --objects"
+
+msgid "-L does not yet support the requested diff format"
+msgstr "-L ainda não suporta o formato diff solicitado"
+
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr "não é possível criar a thread assíncrona: %s"
+
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' não existe"
+
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "não foi possível mudar para '%s'"
+
+msgid "need a working directory"
+msgstr "é necessário um diretório de trabalho"
+
+msgid "Scalar enlistments require a worktree"
+msgstr "Enlistments do Scalar requerem uma worktree"
+
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "não foi possível configurar %s=%s"
+
+msgid "could not configure log.excludeDecoration"
+msgstr "não foi possível configurar log.excludeDecoration"
+
+msgid "could not add enlistment"
+msgstr "não foi possível adicionar o enlistment"
+
+msgid "could not set recommended config"
+msgstr "não foi possível definir a configuração recomendada"
+
+msgid "could not toggle maintenance"
+msgstr "não foi possível alternar a manutenção"
+
+msgid "could not start the FSMonitor daemon"
+msgstr "não foi possível iniciar o daemon do FSMonitor"
+
+msgid "could not turn off maintenance"
+msgstr "não foi possível desativar a manutenção"
+
+msgid "could not remove enlistment"
+msgstr "não foi possível remover o enlistment"
+
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "o HEAD do remoto não é um branch: '%.*s'"
+
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"falha ao obter o nome do branch padrão do remoto; usando o padrão local"
+
+msgid "failed to get default branch name"
+msgstr "falha ao obter o nome do branch padrão"
+
+msgid "failed to unregister repository"
+msgstr "falha ao cancelar o registro do repositório"
+
+msgid "failed to stop the FSMonitor daemon"
+msgstr "falha ao parar o daemon do FSMonitor"
+
+msgid "failed to delete enlistment directory"
+msgstr "falha ao excluir o diretório do enlistment"
+
+msgid "branch to checkout after clone"
+msgstr "branch para fazer checkout após o clone"
+
+msgid "when cloning, create full working directory"
+msgstr "ao fazer clone, criar um diretório de trabalho completo"
+
+msgid "only download metadata for the branch that will be checked out"
+msgstr "baixar apenas os metadados do branch do qual será feito o checkout"
+
+msgid "create repository within 'src' directory"
+msgstr "criar repositório dentro do diretório 'src'"
+
+msgid "specify if tags should be fetched during clone"
+msgstr "especificar se as tags devem ser obtidas por fetch durante o clone"
+
+msgid "specify if background maintenance should be enabled"
+msgstr "especificar se a manutenção em segundo plano deve ser habilitada"
+
+msgid ""
+"scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
+"\t[--[no-]src] [--[no-]tags] [--[no-]maintenance] <url> [<enlistment>]"
+msgstr ""
+"scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
+"\t[--[no-]src] [--[no-]tags] [--[no-]maintenance] <url> [<enlistment>]"
+
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "não é possível deduzir o nome da worktree a partir de '%s'"
+
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "o diretório '%s' já existe"
+
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "falha ao obter o branch padrão de '%s'"
+
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "não foi possível configurar o remoto em '%s'"
+
+#, c-format
+msgid "could not disable tags in '%s'"
+msgstr "não foi possível desabilitar tags em '%s'"
+
+#, c-format
+msgid "could not configure '%s'"
+msgstr "não foi possível configurar '%s'"
+
+msgid "partial clone failed; attempting full clone"
+msgstr "falha no clone parcial; tentando clone completo"
+
+msgid "could not configure for full clone"
+msgstr "não foi possível configurar para um clone completo"
+
+msgid "scalar diagnose [<enlistment>]"
+msgstr "scalar diagnose [<enlistment>]"
+
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` não aceita argumentos"
+
+msgid "scalar register [--[no-]maintenance] [<enlistment>]"
+msgstr "scalar register [--[no-]maintenance] [<enlistment>]"
+
+msgid "reconfigure all registered enlistments"
+msgstr "reconfigurar todos os enlistments registrados"
+
+msgid "(enable|disable|keep)"
+msgstr "(enable|disable|keep)"
+
+msgid "signal how to adjust background maintenance"
+msgstr "sinalizar como ajustar a manutenção em segundo plano"
+
+msgid ""
+"scalar reconfigure [--maintenance=(enable|disable|keep)] [--all | "
+"<enlistment>]"
+msgstr ""
+"scalar reconfigure [--maintenance=(enable|disable|keep)] [--all | "
+"<enlistment>]"
+
+msgid "--all or <enlistment>, but not both"
+msgstr "--all ou <enlistment>, mas não ambos"
+
+#, c-format
+msgid "unknown mode for --maintenance option: %s"
+msgstr "modo desconhecido para a opção --maintenance: %s"
+
+#, c-format
+msgid "could not remove stale scalar.repo '%s'"
+msgstr "não foi possível remover o scalar.repo obsoleto '%s'"
+
+#, c-format
+msgid "removed stale scalar.repo '%s'"
+msgstr "scalar.repo obsoleto '%s' removido"
+
+#, c-format
+msgid "repository at '%s' has different owner"
+msgstr "o repositório em '%s' tem um proprietário diferente"
+
+#, c-format
+msgid "repository at '%s' has a format issue"
+msgstr "o repositório em '%s' tem um problema de formato"
+
+#, c-format
+msgid "repository not found in '%s'"
+msgstr "repositório não encontrado em '%s'"
+
+#, c-format
+msgid ""
+"to unregister this repository from Scalar, run\n"
+"\tgit config --global --unset --fixed-value scalar.repo \"%s\""
+msgstr ""
+"para desregistrar este repositório do Scalar, execute\n"
+"\tgit config --global --unset --fixed-value scalar.repo \"%s\""
+
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <task> [<enlistment>]\n"
+"Tarefas:\n"
+
+#, c-format
+msgid "no such task: '%s'"
+msgstr "não há tarefa: '%s'"
+
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enlistment>]"
+
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <enlistment>"
+
+msgid "refusing to delete current working directory"
+msgstr "recusando-se a excluir o diretório de trabalho atual"
+
+msgid "include Git version"
+msgstr "incluir a versão do Git"
+
+msgid "include Git's build options"
+msgstr "incluir as opções de compilação do Git"
+
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+msgid "-C requires a <directory>"
+msgstr "-C requer um <diretório>"
+
+#, c-format
+msgid "could not change to '%s'"
+msgstr "não foi possível mudar para '%s'"
+
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c requer um argumento <key>=<value>"
+
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Comandos:\n"
+
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "pacote flush inesperado ao ler o status de desempacotamento do remoto"
+
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "não foi possível analisar o status de desempacotamento do remoto: %s"
+
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "o desempacotamento do remoto falhou: %s"
+
+msgid "failed to sign the push certificate"
+msgstr "falha ao assinar o certificado de push"
+
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack: não foi possível iniciar o subprocesso de fetch"
+
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr "a negociação de push falhou; prosseguindo com o push mesmo assim"
+
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr "o lado receptor não suporta o algoritmo de hash deste repositório"
+
+msgid "the receiving end does not support --signed push"
+msgstr "o lado receptor não suporta push --signed"
+
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"nenhum certificado de push será enviado porque o lado receptor não suporta "
+"push --signed"
+
+msgid "the receiving end does not support --atomic push"
+msgstr "o lado receptor não suporta push --atomic"
+
+msgid "the receiving end does not support push options"
+msgstr "o lado receptor não suporta as opções de push"
+
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "modo de limpeza de mensagem de commit '%s' inválido"
+
+#, c-format
+msgid "could not delete '%s'"
+msgstr "não foi possível excluir '%s'"
+
+msgid "revert"
+msgstr "revert"
+
+msgid "cherry-pick"
+msgstr "cherry-pick"
+
+msgid "rebase"
+msgstr "rebase"
+
+#, c-format
+msgid "unknown action: %d"
+msgstr "ação desconhecida: %d"
+
+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 ""
+"Resolva todos os conflitos manualmente, marque-os como resolvidos com\n"
+"\"git add/rm <conflicted_files>\" e então execute \"git rebase --"
+"continue\".\n"
+"Você pode, em vez disso, pular este commit: execute \"git rebase --skip\".\n"
+"Para abortar e voltar ao estado anterior a \"git rebase\", execute \"git "
+"rebase --abort\"."
+
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"após resolver os conflitos, marque os caminhos corrigidos\n"
+"com 'git add <paths>' ou 'git rm <paths>'"
+
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
+msgstr ""
+"Após resolver os conflitos, marque-os com\n"
+"\"git add/rm <pathspec>\" e, em seguida, execute\n"
+"\"git cherry-pick --continue\".\n"
+"Você pode, em vez disso, pular este commit com \"git cherry-pick --skip\".\n"
+"Para abortar e voltar ao estado antes de \"git cherry-pick\",\n"
+"execute \"git cherry-pick --abort\"."
+
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Após resolver os conflitos, marque-os com\n"
+"\"git add/rm <pathspec>\" e, em seguida, execute\n"
+"\"git revert --continue\".\n"
+"Você pode, em vez disso, pular este commit com \"git revert --skip\".\n"
+"Para abortar e voltar ao estado antes de \"git revert\",\n"
+"execute \"git revert --abort\"."
+
+#, c-format
+msgid "could not lock '%s'"
+msgstr "não foi possível bloquear '%s'"
+
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "não foi possível gravar o eol em '%s'"
+
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "falha ao finalizar '%s'"
+
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "suas alterações locais seriam sobrescritas por %s."
+
+msgid "commit your changes or stash them to proceed."
+msgstr "faça commit de suas alterações ou faça um stash delas para prosseguir."
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: não foi possível escrever o novo arquivo de índice"
+
+msgid "unable to update cache tree"
+msgstr "não foi possível atualizar a cache tree"
+
+msgid "could not resolve HEAD commit"
+msgstr "não foi possível resolver o commit do HEAD"
+
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr "nenhuma chave presente em '%.*s'"
+
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr "não foi possível remover as aspas do valor de '%s'"
+
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "'GIT_AUTHOR_NAME' já fornecido"
+
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "'GIT_AUTHOR_EMAIL' já fornecido"
+
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "'GIT_AUTHOR_DATE' já fornecido"
+
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "variável desconhecida '%s'"
+
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "faltando 'GIT_AUTHOR_NAME'"
+
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "faltando 'GIT_AUTHOR_EMAIL'"
+
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "faltando 'GIT_AUTHOR_DATE'"
+
+#, 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 ""
+"você tem alterações preparadas na sua árvore de trabalho\n"
+"Se essas alterações devem sofrer squash no commit anterior, execute:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Se elas devem ir para um novo commit, execute:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"Em ambos os casos, ao terminar, continue com:\n"
+"\n"
+"  git rebase --continue\n"
+
+msgid "'prepare-commit-msg' hook failed"
+msgstr "o hook 'prepare-commit-msg' falhou"
+
+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 ""
+"O seu nome e endereço de e-mail foram configurados automaticamente com base\n"
+"no seu nome de usuário e nome da máquina. Por favor, verifique se estão "
+"corretos.\n"
+"Você pode omitir esta mensagem configurando-os explicitamente. Execute o\n"
+"seguinte comando e siga as instruções em seu editor para editar\n"
+"o seu arquivo de configuração:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"Após fazer isso, você pode corrigir a identidade usada para este commit "
+"com:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+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 ""
+"O seu nome e endereço de e-mail foram configurados automaticamente com base\n"
+"no seu nome de usuário e nome da máquina. Por favor, verifique se estão "
+"corretos.\n"
+"Você pode omitir esta mensagem configurando-os explicitamente:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"Após fazer isso, você pode corrigir a identidade usada para este commit "
+"com:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+msgid "couldn't look up newly created commit"
+msgstr "não foi possível procurar o commit recém-criado"
+
+msgid "could not parse newly created commit"
+msgstr "não foi possível analisar o commit recém-criado"
+
+msgid "unable to resolve HEAD after creating commit"
+msgstr "não foi possível resolver o HEAD após a criação do commit"
+
+msgid "detached HEAD"
+msgstr "HEAD desanexado"
+
+msgid " (root-commit)"
+msgstr " (commit raiz)"
+
+msgid "could not parse HEAD"
+msgstr "não foi possível analisar o HEAD"
+
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s não é um commit!"
+
+msgid "unable to parse commit author"
+msgstr "não foi possível analisar o autor do commit"
+
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "não foi possível ler a mensagem de commit de '%s'"
+
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "identidade de autor inválida '%s'"
+
+msgid "corrupt author: missing date information"
+msgstr "autor corrompido: faltando informação de data"
+
+#, c-format
+msgid "could not update %s"
+msgstr "não foi possível atualizar %s"
+
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "não foi possível analisar o commit pai %s"
+
+#, c-format
+msgid "unknown command: %d"
+msgstr "comando desconhecido: %d"
+
+msgid "This is the 1st commit message:"
+msgstr "Esta é a 1ª mensagem de commit:"
+
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Esta é a mensagem de commit #%d:"
+
+msgid "The 1st commit message will be skipped:"
+msgstr "A 1ª mensagem de commit será ignorada:"
+
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "A mensagem de commit #%d será ignorada:"
+
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Esta é uma combinação de %d commits."
+
+#, c-format
+msgid "cannot write '%s'"
+msgstr "não é possível gravar '%s'"
+
+msgid "need a HEAD to fixup"
+msgstr "é necessário um HEAD para fixup"
+
+msgid "could not read HEAD"
+msgstr "não foi possível ler o HEAD"
+
+msgid "could not read HEAD's commit message"
+msgstr "não foi possível ler a mensagem de commit do HEAD"
+
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "não foi possível ler a mensagem de commit de %s"
+
+msgid "your index file is unmerged."
+msgstr "o seu arquivo de índice não está mesclado."
+
+msgid "cannot fixup root commit"
+msgstr "não é possível fazer fixup do commit raiz"
+
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
+msgstr "o commit %s é um merge, mas nenhuma opção -m foi fornecida."
+
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "o commit %s não tem o pai %d"
+
+#, c-format
+msgid "cannot get commit message for %s"
+msgstr "não é possível obter a mensagem de commit para %s"
+
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: não é possível analisar o commit pai %s"
+
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "não foi possível reverter %s... %s"
+
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "não foi possível aplicar %s... %s"
+
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "descartando %s %s -- o conteúdo do patch já está no upstream\n"
+
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: falha ao ler o índice"
+
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: falha ao atualizar o índice"
+
+#, c-format
+msgid "'%s' is not a valid label"
+msgstr "'%s' não é um rótulo válido"
+
+#, c-format
+msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s"
+msgstr ""
+"update-ref requer um nome de ref totalmente qualificado, ex. refs/heads/%s"
+
+#, c-format
+msgid "'%s' does not accept merge commits"
+msgstr "'%s' não aceita commits de merge"
+
+#. TRANSLATORS: 'pick' and 'merge -C' should not be
+#. translated.
+#.
+msgid ""
+"'pick' does not take a merge commit. If you wanted to\n"
+"replay the merge, use 'merge -C' on the commit."
+msgstr ""
+"'pick' não aceita um commit de merge. Se você queria\n"
+"reproduzir o merge, use 'merge -C' no commit."
+
+#. TRANSLATORS: 'reword' and 'merge -c' should not be
+#. translated.
+#.
+msgid ""
+"'reword' does not take a merge commit. If you wanted to\n"
+"replay the merge and reword the commit message, use\n"
+"'merge -c' on the commit"
+msgstr ""
+"'reword' não aceita um commit de merge. Se você queria\n"
+"reproduzir o merge e reescrever a mensagem de commit, use\n"
+"'merge -c' no commit"
+
+#. TRANSLATORS: 'edit', 'merge -C' and 'break' should
+#. not be translated.
+#.
+msgid ""
+"'edit' does not take a merge commit. If you wanted to\n"
+"replay the merge, use 'merge -C' on the commit, and then\n"
+"'break' to give the control back to you so that you can\n"
+"do 'git commit --amend && git rebase --continue'."
+msgstr ""
+"'edit' não aceita um commit de merge. Se você queria\n"
+"reproduzir o merge, use 'merge -C' no commit, e então\n"
+"'break' para devolver o controle a você para que possa\n"
+"fazer 'git commit --amend && git rebase --continue'."
+
+msgid "cannot squash merge commit into another commit"
+msgstr "não é possível fazer squash de commit de merge em outro commit"
+
+#, c-format
+msgid "invalid command '%.*s'"
+msgstr "comando inválido '%.*s'"
+
+#, c-format
+msgid "missing arguments for %s"
+msgstr "faltando argumentos para %s"
+
+#, c-format
+msgid "could not parse '%s'"
+msgstr "não foi possível analisar '%s'"
+
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "linha inválida %d: %.*s"
+
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "não é possível fazer '%s' sem um commit anterior"
+
+msgid "cancelling a cherry picking in progress"
+msgstr "cancelando um cherry-pick em andamento"
+
+msgid "cancelling a revert in progress"
+msgstr "cancelando um revert em andamento"
+
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "por favor, corrija isso usando 'git rebase --edit-todo'."
+
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "folha de instruções inutilizável: '%s'"
+
+msgid "no commits parsed."
+msgstr "nenhum commit analisado."
+
+msgid "cannot cherry-pick during a revert."
+msgstr "não é possível fazer cherry-pick durante um revert."
+
+msgid "cannot revert during a cherry-pick."
+msgstr "não é possível reverter durante um cherry-pick."
+
+msgid "trailers file contains empty line"
+msgstr "o arquivo de trailers contém linha vazia"
+
+msgid "trailers file is empty"
+msgstr "o arquivo de trailers está vazio"
+
+msgid "cannot read trailers files"
+msgstr "não é possível ler os arquivos de trailers"
+
+msgid "unusable squash-onto"
+msgstr "squash-onto inutilizável"
+
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "planilha de opções malformada: '%s'"
+
+msgid "empty commit set passed"
+msgstr "conjunto de commits vazio passado"
+
+msgid "revert is already in progress"
+msgstr "um revert já está em andamento"
+
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "tente \"git revert (--continue | %s--abort | --quit)\""
+
+msgid "cherry-pick is already in progress"
+msgstr "um cherry-pick já está em andamento"
+
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "tente \"git cherry-pick (--continue | %s--abort | --quit)\""
+
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "não foi possível criar o diretório do sequencer '%s'"
+
+msgid "no cherry-pick or revert in progress"
+msgstr "nenhum cherry-pick ou revert em andamento"
+
+msgid "cannot resolve HEAD"
+msgstr "não é possível resolver o HEAD"
+
+msgid "cannot abort from a branch yet to be born"
+msgstr "não é possível abortar a partir de um branch ainda não criado"
+
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "não é possível ler '%s': %s"
+
+msgid "unexpected end of file"
+msgstr "fim de arquivo inesperado"
+
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "o arquivo pre-cherry-pick HEAD armazenado '%s' está corrompido"
+
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr "Parece que você moveu o HEAD. Não retrocedendo, verifique seu HEAD!"
+
+msgid "no revert in progress"
+msgstr "nenhum revert em andamento"
+
+msgid "no cherry-pick in progress"
+msgstr "nenhum cherry-pick em andamento"
+
+msgid "failed to skip the commit"
+msgstr "falha ao pular o commit"
+
+msgid "there is nothing to skip"
+msgstr "não há nada para pular"
+
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"você já fez o commit?\n"
+"tente \"git %s --continue\""
+
+msgid "cannot read HEAD"
+msgstr "não é possível ler o HEAD"
+
+msgid "could not write commit message file"
+msgstr "não foi possível gravar o arquivo da mensagem de commit"
+
+#, 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 ""
+"Você pode alterar o commit agora, com\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Assim que estiver satisfeito com as suas alterações, execute\n"
+"\n"
+"  git rebase --continue\n"
+
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "Não foi possível aplicar %s... %.*s"
+
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "Não foi possível fazer merge de %.*s"
+
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Executando: %s\n"
+
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"a execução falhou: %s\n"
+"%sVocê pode corrigir o problema e então executar\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+msgid "and made changes to the index and/or the working tree.\n"
+msgstr "e fez alterações no índice e/ou na árvore de trabalho.\n"
+
+#, 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 ""
+"a execução foi bem-sucedida: %s\n"
+"mas deixou alterações no índice e/ou na árvore de trabalho.\n"
+"Faça commit ou stash de suas alterações e, em seguida, execute\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "nome de rótulo ilegal: '%.*s'"
+
+msgid "writing fake root commit"
+msgstr "escrevendo commit raiz falso"
+
+msgid "writing squash-onto"
+msgstr "escrevendo squash-onto"
+
+msgid "cannot merge without a current revision"
+msgstr "não é possível fazer merge sem uma revisão atual"
+
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "não foi possível analisar '%.*s'"
+
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "nada para fazer merge: '%.*s'"
+
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr "octopus merge não pode ser executado sobre um [new root]"
+
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "não foi possível obter a mensagem de commit de '%s'"
+
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "não foi possível sequer tentar fazer merge de '%.*s'"
+
+msgid "merge: Unable to write new index file"
+msgstr "merge: não foi possível escrever o novo arquivo de índice"
+
+#, c-format
+msgid ""
+"another 'rebase' process appears to be running; '%s.lock' already exists"
+msgstr ""
+"outro processo de 'rebase' parece estar em execução; '%s.lock' já existe"
+
+#, c-format
+msgid ""
+"Updated the following refs with %s:\n"
+"%s"
+msgstr ""
+"As seguintes refs foram atualizadas com %s:\n"
+"%s"
+
+#, c-format
+msgid ""
+"Failed to update the following refs with %s:\n"
+"%s"
+msgstr ""
+"Falha ao atualizar as seguintes refs com %s:\n"
+"%s"
+
+msgid "Cannot autostash"
+msgstr "Não é possível fazer autostash"
+
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Resposta inesperada do stash: '%s'"
+
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Não foi possível criar o diretório para '%s'"
+
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Autostash criado: %s\n"
+
+msgid "could not reset --hard"
+msgstr "não foi possível fazer reset --hard"
+
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "Autostash aplicado.\n"
+
+#, c-format
+msgid "cannot store %s"
+msgstr "não é possível armazenar %s"
+
+#, c-format
+msgid ""
+"Your local changes are stashed, however applying them\n"
+"resulted in conflicts.  You can either resolve the conflicts\n"
+"and then discard the stash with \"git stash drop\", or, if you\n"
+"do not want to resolve them now, run \"git reset --hard\" and\n"
+"apply the local changes later by running \"git stash pop\".\n"
+msgstr ""
+"As suas alterações locais estão em stash, no entanto a aplicação delas\n"
+"resultou em conflitos. Você pode resolver os conflitos\n"
+"e então descartar o stash com \"git stash drop\", ou, se você\n"
+"não quiser resolvê-los agora, execute \"git reset --hard\" e\n"
+"aplique as alterações locais mais tarde executando \"git stash pop\".\n"
+
+msgid "could not apply autostash; your changes are safe in the stash"
+msgstr ""
+"não foi possível aplicar o autostash; suas alterações estão seguras no stash"
+
+#, c-format
+msgid ""
+"Autostash exists; creating a new stash entry.\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+"O autostash existe; criando uma nova entrada de stash.\n"
+"As suas alterações estão seguras no stash.\n"
+"Você pode executar \"git stash pop\" ou \"git stash drop\" a qualquer "
+"momento.\n"
+
+msgid "autostash reference is a symref"
+msgstr "a referência de autostash é um symref"
+
+msgid "could not detach HEAD"
+msgstr "não foi possível desanexar o HEAD"
+
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "Parado no HEAD\n"
+
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "Parado em %s\n"
+
+#, 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 ""
+"Não foi possível executar o comando todo\n"
+"\n"
+"    %.*s\n"
+"Ele foi reagendado; Para editar o comando antes de continuar, por favor\n"
+"edite a lista de tarefas (todo list) primeiro:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
+msgstr "Parado em %s...  %.*s\n"
+
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Fazendo rebase (%d/%d)%s"
+
+#, c-format
+msgid "unknown command %d"
+msgstr "comando desconhecido %d"
+
+msgid "could not read orig-head"
+msgstr "não foi possível ler orig-head"
+
+msgid "could not read 'onto'"
+msgstr "não foi possível ler 'onto'"
+
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "não foi possível atualizar o HEAD para %s"
+
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Rebase e atualização de %s realizados com sucesso.\n"
+
+msgid "cannot rebase: You have unstaged changes."
+msgstr "não é possível fazer rebase: Você tem alterações não preparadas."
+
+msgid "cannot amend non-existing commit"
+msgstr "não é possível fazer amend de um commit inexistente"
+
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "arquivo inválido: '%s'"
+
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "conteúdo inválido: '%s'"
+
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"Você tem alterações não commitadas na sua árvore de trabalho. Por favor, "
+"faça commit delas\n"
+"primeiro e então execute 'git rebase --continue' novamente."
+
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "não foi possível gravar o arquivo: '%s'"
+
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "não foi possível remover CHERRY_PICK_HEAD"
+
+msgid "could not commit staged changes."
+msgstr "não foi possível fazer commit das alterações no stage."
+
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: não é possível fazer cherry-pick de um %s"
+
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s: revisão inválida"
+
+msgid "can't revert as initial commit"
+msgstr "não é possível reverter como commit inicial"
+
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "ignorado o commit previamente aplicado %s"
+
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "use --reapply-cherry-picks para incluir commits ignorados"
+
+msgid "make_script: unhandled options"
+msgstr "make_script: opções não tratadas"
+
+msgid "make_script: error preparing revisions"
+msgstr "make_script: erro ao preparar revisões"
+
+msgid "nothing to do"
+msgstr "nada a fazer"
+
+msgid "could not skip unnecessary pick commands"
+msgstr "não foi possível pular comandos pick desnecessários"
+
+msgid "the script was already rearranged."
+msgstr "o script já foi reorganizado."
+
+#, c-format
+msgid "update-refs file at '%s' is invalid"
+msgstr "o arquivo update-refs em '%s' é inválido"
+
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' está fora do repositório em '%s'"
+
+#, 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: não existe esse caminho na árvore de trabalho.\n"
+"Use 'git <command> -- <path>...' para especificar caminhos que não existem "
+"localmente."
+
+#, 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 ""
+"argumento ambíguo '%s': revisão desconhecida ou caminho fora da árvore de "
+"trabalho.\n"
+"Use '--' para separar caminhos de revisões, assim:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "a opção '%s' deve vir antes dos argumentos que não são opções"
+
+#, 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 ""
+"argumento ambíguo '%s': é tanto uma revisão quanto um nome de arquivo\n"
+"Use '--' para separar caminhos de revisões, assim:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+
+msgid "unable to set up work tree using invalid config"
+msgstr ""
+"não foi possível configurar a árvore de trabalho usando configuração inválida"
+
+#, c-format
+msgid "'%s' already specified as '%s'"
+msgstr "'%s' já especificado como '%s'"
+
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Esperada versão do repositório git <= %d, encontrado %d"
+
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "extensão de repositório desconhecida encontrada:"
+msgstr[1] "extensões de repositório desconhecidas encontradas:"
+
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] ""
+"a versão do repositório é 0, mas foi encontrada uma extensão exclusiva de v1:"
+msgstr[1] ""
+"a versão do repositório é 0, mas foram encontradas extensões exclusivas de "
+"v1:"
+
+#, c-format
+msgid "error opening '%s'"
+msgstr "erro ao abrir '%s'"
+
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "grande demais para ser um arquivo .git: '%s'"
+
+#, c-format
+msgid "error reading %s"
+msgstr "erro ao ler %s"
+
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "formato de gitfile inválido: %s"
+
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "nenhum caminho no gitfile: %s"
+
+#, c-format
+msgid "gitfile does not point to a valid repository: %s"
+msgstr "gitfile não aponta para um repositório válido: %s"
+
+#, c-format
+msgid "'$%s' too big"
+msgstr "'$%s' grande demais"
+
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "não é um repositório git: '%s'"
+
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "não é possível mudar para o diretório '%s'"
+
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "falha ao executar stat em '%*s%s%s'"
+
+#, c-format
+msgid "safe.directory '%s' not absolute"
+msgstr "safe.directory '%s' não é absoluto"
+
+#, c-format
+msgid ""
+"detected dubious ownership in repository at '%s'\n"
+"%sTo add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"detectada propriedade duvidosa no repositório em '%s'\n"
+"%sPara adicionar uma exceção para este diretório, chame:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+
+#, c-format
+msgid "error reading '%s'"
+msgstr "erro ao ler '%s'"
+
+#, c-format
+msgid "not a regular file: '%s'"
+msgstr "não é um arquivo regular: '%s'"
+
+msgid "Unable to read current working directory"
+msgstr "Não foi possível ler o diretório de trabalho atual"
+
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "não é possível mudar para '%s'"
+
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "não é um repositório git (ou qualquer um dos diretórios pais): %s"
+
+#, 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 ""
+"não é um repositório git (ou qualquer pai até o ponto de montagem %s)\n"
+"Parando no limite do sistema de arquivos (GIT_DISCOVERY_ACROSS_FILESYSTEM "
+"não definido)."
+
+#, c-format
+msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')"
+msgstr ""
+"não é possível usar o repositório bare '%s' (safe.bareRepository é '%s')"
+
+#, c-format
+msgid "unknown ref storage format: '%s'"
+msgstr "formato de armazenamento de referência desconhecido '%s'"
+
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"problema com o valor de modo de arquivo de core.sharedRepository (0%.3o).\n"
+"O proprietário dos arquivos deve sempre ter permissões de leitura e gravação."
+
+msgid "fork failed"
+msgstr "falha no fork"
+
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr "não é possível executar stat no template '%s'"
+
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "não é possível executar opendir em '%s'"
+
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "não é possível executar readlink em '%s'"
+
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr "não é possível criar o link simbólico '%s' '%s'"
+
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr "não é possível copiar '%s' para '%s'"
+
+#, c-format
+msgid "ignoring template %s"
+msgstr "ignorando modelo %s"
+
+#, c-format
+msgid "templates not found in %s"
+msgstr "templates não encontrados em %s"
+
+#, c-format
+msgid "not copying templates from '%s': %s"
+msgstr "não copiando templates de '%s': %s"
+
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "nome de branch inicial inválido: '%s'"
+
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "re-init: ignorado --initial-branch=%s"
+
+msgid "failed creating object database"
+msgstr "falha ao criar o banco de dados de objetos"
+
+#, c-format
+msgid "unable to handle file type %d"
+msgstr "não foi possível lidar com o tipo de arquivo %d"
+
+#, c-format
+msgid "unable to move %s to %s"
+msgstr "não foi possível mover %s para %s"
+
+msgid "attempt to reinitialize repository with different hash"
+msgstr "tentativa de reinicializar repositório com hash diferente"
+
+msgid ""
+"attempt to reinitialize repository with different reference storage format"
+msgstr ""
+"tentativa de reinicializar repositório com formato de armazenamento de "
+"referências diferente"
+
+#, c-format
+msgid "%s already exists"
+msgstr "%s já existe"
+
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "Repositório Git compartilhado existente reinicializado em %s%s\n"
+
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "Repositório Git existente reinicializado em %s%s\n"
+
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "Repositório Git compartilhado vazio inicializado em %s%s\n"
+
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "Repositório Git vazio inicializado em %s%s\n"
+
+#, c-format
+msgid "unrecognized value for '%s': '%s'"
+msgstr "valor não reconhecido para '%s': '%s'"
+
+#, c-format
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "a entrada do índice é um diretório, mas não é esparso (%08x)"
+
+msgid "cannot use split index with a sparse index"
+msgstr "não é possível usar índice dividido com um índice esparso"
+
+#. TRANSLATORS: The first %s is a command like "ls-tree".
+#, c-format
+msgid "bad %s format: element '%s' does not start with '('"
+msgstr "formato %s inválido: o elemento '%s' não começa com '('"
+
+#. TRANSLATORS: The first %s is a command like "ls-tree".
+#, c-format
+msgid "bad %s format: element '%s' does not end in ')'"
+msgstr "formato %s inválido: o elemento '%s' não termina em ')'"
+
+#. TRANSLATORS: %s is a command like "ls-tree".
+#, c-format
+msgid "bad %s format: %%%.*s"
+msgstr "formato %s inválido: %%%.*s"
+
+#, c-format
+msgid "%u.%2.2u"
+msgstr "%u.%2.2u"
+
+#. TRANSLATORS: SI decimal prefix symbol for 10^9
+msgid "G"
+msgstr "G"
+
+#. TRANSLATORS: SI decimal prefix symbol for 10^6
+msgid "M"
+msgstr "M"
+
+#. TRANSLATORS: SI decimal prefix symbol for 10^3
+msgid "k"
+msgstr "k"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second and gibibyte
+msgid "GiB/s"
+msgstr "GiB/s"
+
+msgid "GiB"
+msgstr "GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second and mebibyte
+msgid "MiB/s"
+msgstr "MiB/s"
+
+msgid "MiB"
+msgstr "MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second and kibibyte
+msgid "KiB/s"
+msgstr "KiB/s"
+
+msgid "KiB"
+msgstr "KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second and byte
+msgid "B/s"
+msgstr "B/s"
+
+msgid "B"
+msgstr "B"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+msgid "byte/s"
+msgid_plural "bytes/s"
+msgstr[0] "byte/s"
+msgstr[1] "bytes/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "byte"
+msgstr[1] "bytes"
+
+#. TRANSLATORS: The first argument is the number string. The second
+#. argument is the unit string (i.e. "12.34 MiB/s").
+#.
+#, c-format
+msgid "%s %s"
+msgstr "%s %s"
+
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "ignorando nome de submódulo suspeito: %s"
+
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "valores negativos não são permitidos para submodule.fetchJobs"
+
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+"ignorando '%s' que pode ser interpretado como uma opção de linha de comando: "
+"%s"
+
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Não foi possível atualizar a entrada %s de .gitmodules"
+
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"Não é possível alterar .gitmodules não mesclado, resolva os conflitos de "
+"merge primeiro"
+
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "Não foi possível encontrar a seção em .gitmodules onde path=%s"
+
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Não foi possível remover a entrada de .gitmodules para %s"
+
+msgid "staging updated .gitmodules failed"
+msgstr "falha ao preparar o .gitmodules atualizado"
+
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "no submódulo não populado '%s'"
+
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "O pathspec '%s' está no submódulo '%.*s'"
+
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "argumento inválido para --ignore-submodules: %s"
+
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"O submódulo no commit %s no caminho: '%s' colide com um submódulo de mesmo "
+"nome. Ignorando-o."
+
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "a entrada do submódulo '%s' (%s) é um %s, não um commit"
+
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"Não foi possível executar o comando 'git rev-list <commits> --not --remotes "
+"-n 1' no submódulo %s"
+
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "o processo para o submódulo '%s' falhou"
+
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Fazendo push do submódulo '%s'\n"
+
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "Não foi possível fazer push do submódulo '%s'\n"
+
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Fazendo fetch do submódulo %s%s\n"
+
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Não foi possível acessar o submódulo '%s'\n"
+
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "Não foi possível acessar o submódulo '%s' no commit %s\n"
+
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "Fazendo fetch do submódulo %s%s no commit %s\n"
+
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Erros durante o fetch do submódulo:\n"
+"%s"
+
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "'%s' não é reconhecido como um repositório git"
+
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr "Não foi possível executar 'git status --porcelain=2' no submódulo %s"
+
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "'git status --porcelain=2' falhou no submódulo %s"
+
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "não foi possível iniciar 'git status' no submódulo '%s'"
+
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "não foi possível executar 'git status' no submódulo '%s'"
+
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr ""
+"Não foi possível desativar a configuração core.worktree no submódulo '%s'"
+
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "não foi possível entrar recursivamente no submódulo '%s'"
+
+msgid "could not reset submodule index"
+msgstr "não foi possível redefinir o índice do submódulo"
+
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "o submódulo '%s' tem o índice sujo"
+
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "Não foi possível atualizar o submódulo '%s'."
+
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "o diretório git do submódulo '%s' está dentro do diretório git '%.*s'"
+
+#, c-format
+msgid "expected '%.*s' in submodule path '%s' not to be a symbolic link"
+msgstr ""
+"esperado que '%.*s' no caminho do submódulo '%s' não seja um link simbólico"
+
+#, c-format
+msgid "expected submodule path '%s' not to be a symbolic link"
+msgstr "esperado que o caminho do submódulo '%s' não seja um link simbólico"
+
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+"relocate_gitdir para o submódulo '%s' com mais de uma worktree não é "
+"suportado"
+
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "não foi possível buscar o nome do submódulo '%s'"
+
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"Migrando o diretório git de '%s%s' de\n"
+"'%s' para\n"
+"'%s'\n"
+
+msgid "could not start ls-files in .."
+msgstr "não foi possível iniciar ls-files em .."
+
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree retornou o código de retorno inesperado %d"
+
+#, c-format
+msgid ""
+"the 'submodule.%s.gitdir' config does not exist for module '%s'. Please "
+"ensure it is set, for example by running something like: 'git config "
+"submodule.%s.gitdir .git/modules/%s'. For details see the "
+"extensions.submodulePathConfig documentation."
+msgstr ""
+"a configuração 'submodule.%s.gitdir' não existe para o módulo '%s'. Por "
+"favor, certifique-se de que está definida, por exemplo executando algo como: "
+"'git config submodule.%s.gitdir .git/modules/%s'. Para obter detalhes, veja "
+"a documentação de extensions.submodulePathConfig."
+
+msgid ""
+"enabling extensions.submodulePathConfig might fix the following error, if "
+"it's not already enabled."
+msgstr ""
+"habilitar extensions.submodulePathConfig pode corrigir o erro seguinte, se "
+"já não estiver habilitado."
+
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's  git dir."
+msgstr "recusando-se a criar/usar '%s' no diretório git de outro submódulo."
+
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr "falha ao executar lstat em '%s'"
+
+msgid "no remote configured to get bundle URIs from"
+msgstr "nenhum remoto configurado para obter URIs de bundle"
+
+msgid "could not get the bundle-uri list"
+msgstr "não foi possível obter a lista de bundle-uri"
+
+msgid "test-tool cache-tree <options> (control|prime|update)"
+msgstr "test-tool cache-tree <options> (control|prime|update)"
+
+msgid "clear the cache tree before each iteration"
+msgstr "limpar a cache tree antes de cada iteração"
+
+msgid "number of entries in the cache tree to invalidate (default 0)"
+msgstr "número de entradas na cache tree para invalidar (padrão 0)"
+
+msgid "the number of objects to write"
+msgstr "o número de objetos para escrever"
+
+msgid "test-tool path-walk <options> -- <revision-options>"
+msgstr "test-tool path-walk <options> -- <revision-options>"
+
+msgid "toggle inclusion of blob objects"
+msgstr "alternar a inclusão de objetos blob"
+
+msgid "toggle inclusion of commit objects"
+msgstr "alternar a inclusão de objetos de commit"
+
+msgid "toggle inclusion of tag objects"
+msgstr "alternar a inclusão de objetos de tag"
+
+msgid "toggle inclusion of tree objects"
+msgstr "alternar a inclusão de objetos de tree"
+
+msgid "toggle pruning of uninteresting paths"
+msgstr "alternar a poda de caminhos desinteressantes"
+
+msgid "toggle aggressive edge walk"
+msgstr "alternar a caminhada de borda agressiva"
+
+msgid "read a pattern list over stdin"
+msgstr "ler uma lista de padrões através da stdin"
+
+msgid "toggle pruning of trees by sparse patterns"
+msgstr "alternar a poda de trees por padrões esparsos"
+
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "o commit %s não está marcado como alcançável"
+
+msgid "too many commits marked reachable"
+msgstr "muitos commits marcados como alcançáveis"
+
+#, c-format
+msgid "could not find MIDX with checksum %s"
+msgstr "não foi possível encontrar o MIDX com checksum %s"
+
+msgid "could not determine MIDX preferred pack"
+msgstr "não foi possível determinar o pack preferido do MIDX"
+
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<options>]"
+
+msgid "exit immediately after advertising capabilities"
+msgstr "sair imediatamente após anunciar as capacidades"
+
+msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
+msgstr "test-helper simple-ipc is-active    [<name>] [<options>]"
+
+msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
+msgstr "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
+
+msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
+msgstr "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
+
+msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
+msgstr "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
+
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<name>] [<token>]"
+
+msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+msgstr "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+
+msgid "name or pathname of unix domain socket"
+msgstr "nome ou caminho do soquete de domínio unix"
+
+msgid "named-pipe name"
+msgstr "nome do pipe nomeado"
+
+msgid "number of threads in server thread pool"
+msgstr "número de threads no pool de threads do servidor"
+
+msgid "seconds to wait for daemon to start or stop"
+msgstr "segundos para esperar o daemon iniciar ou parar"
+
+msgid "number of bytes"
+msgstr "número de bytes"
+
+msgid "number of requests per thread"
+msgstr "número de requisições por thread"
+
+msgid "ballast character"
+msgstr "caractere de lastro"
+
+msgid "token"
+msgstr "token"
+
+msgid "command token to send to the server"
+msgstr "token de comando para enviar ao servidor"
+
+msgid "write a pack with a single reachable large blob"
+msgstr "escrever um pack com um único blob grande alcançável"
+
+#, c-format
+msgid "'%s' is not a valid blob size"
+msgstr "'%s' não é um tamanho de blob válido"
+
+msgid "unit-test [<options>]"
+msgstr "unit-test [<options>]"
+
+msgid "immediately exit upon the first failed test"
+msgstr "sair imediatamente no primeiro teste que falhar"
+
+msgid "suite[::test]"
+msgstr "suíte[::teste]"
+
+msgid "run only test suite or individual test <suite[::test]>"
+msgstr ""
+"executar apenas a suíte de testes ou o teste individual <suite[::test]>"
+
+msgid "suite"
+msgstr "suíte"
+
+msgid "exclude test suite <suite>"
+msgstr "excluir a suíte de testes <suite>"
+
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "falha ao executar o comando de trailer '%s'"
+
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "valor desconhecido '%s' para a chave '%s'"
+
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "token de trailer vazio no trailer '%.*s'"
+
+msgid "empty --trailer argument"
+msgstr "argumento --trailer vazio"
+
+#, c-format
+msgid "invalid trailer '%s': missing key before separator"
+msgstr "trailer '%s' inválido: faltando chave antes do separador"
+
+#, c-format
+msgid "could not stat %s"
+msgstr "não foi possível executar stat em %s"
+
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "o arquivo %s não é um arquivo regular"
+
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "o arquivo %s não é gravável pelo usuário"
+
+msgid "could not write to temporary file"
+msgstr "não foi possível gravar no arquivo temporário"
+
+msgid "full write to remote helper failed"
+msgstr "falha na escrita completa para o auxiliar do remoto"
+
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "não foi possível encontrar o remote helper para '%s'"
+
+msgid "can't dup helper output fd"
+msgstr "não é possível duplicar o fd de saída do auxiliar"
+
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"capacidade obrigatória %s desconhecida; este remote helper provavelmente "
+"precisa de uma versão mais nova do Git"
+
+msgid "this remote helper should implement refspec capability"
+msgstr "este remote helper deve implementar a capacidade refspec"
+
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s disse inesperadamente: '%s'"
+
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s também bloqueou %s"
+
+msgid "could not dup helper output fd"
+msgstr "não foi possível duplicar o fd de saída do auxiliar"
+
+msgid "couldn't run fast-import"
+msgstr "não foi possível executar o fast-import"
+
+msgid "error while running fast-import"
+msgstr "erro ao executar o fast-import"
+
+#, c-format
+msgid "could not read ref %s"
+msgstr "não foi possível ler o ref %s"
+
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "resposta desconhecida ao connect: %s"
+
+msgid "setting remote service path not supported by protocol"
+msgstr ""
+"a definição do caminho do serviço remoto não é suportada pelo protocolo"
+
+msgid "invalid remote service path"
+msgstr "caminho de serviço remoto inválido"
+
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "não é possível conectar ao sub-serviço %s"
+
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only requer o protocolo v2"
+
+#, c-format
+msgid "ignoring %s because the protocol does not support it."
+msgstr "ignorando %s porque o protocolo não o suporta."
+
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "'option' sem uma diretiva 'ok/error' correspondente"
+
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "esperado ok/error, o helper disse '%s'"
+
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "o helper relatou status inesperado de %s"
+
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "o helper %s não suporta dry-run"
+
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "o helper %s não suporta --signed"
+
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "o helper %s não suporta --signed=if-asked"
+
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "o helper %s não suporta --atomic"
+
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "o helper %s não suporta --%s"
+
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "o helper %s não suporta 'push-option'"
+
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "o remote-helper não suporta push; refspec necessária"
+
+#, c-format
+msgid "helper %s does not support '--force'"
+msgstr "o helper %s não suporta '--force'"
+
+msgid "couldn't run fast-export"
+msgstr "não foi possível executar o fast-export"
+
+msgid "error while running fast-export"
+msgstr "erro ao executar o fast-export"
+
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "não foi possível renomear '%s' para '%s'"
+
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+"Nenhuma ref em comum e nenhuma especificada; não fazendo nada.\n"
+"Talvez você deva especificar um branch.\n"
+
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "formato de objeto não suportado '%s'"
+
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "resposta malformada na lista de ref: %s"
+
+#, c-format
+msgid "read(%s) failed"
+msgstr "falha em read(%s)"
+
+#, c-format
+msgid "write(%s) failed"
+msgstr "falha em write(%s)"
+
+#, c-format
+msgid "%s thread failed"
+msgstr "falha na thread %s"
+
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "a thread %s falhou ao fazer join: %s"
+
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "não é possível iniciar a thread para copiar dados: %s"
+
+#, c-format
+msgid "%s process failed to wait"
+msgstr "processo %s falhou ao esperar"
+
+#, c-format
+msgid "%s process failed"
+msgstr "falha no processo %s"
+
+msgid "can't start thread for copying data"
+msgstr "não é possível iniciar a thread para copiar dados"
+
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Definiria o upstream de '%s' para '%s' de '%s'\n"
+
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "não foi possível ler o bundle '%s'"
+
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transporte: opção de profundidade inválida '%s'"
+
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "veja protocol.version em 'git help config' para mais detalhes"
+
+msgid "server options require protocol version 2 or later"
+msgstr "opções de servidor requerem a versão 2 do protocolo ou posterior"
+
+msgid "remote does not support object-info"
+msgstr "o remoto não suporta object-info"
+
+msgid "server does not support wait-for-done"
+msgstr "o servidor não suporta wait-for-done"
+
+msgid "could not parse transport.color.* config"
+msgstr "não foi possível analisar a configuração transport.color.*"
+
+msgid "support for protocol v2 not implemented yet"
+msgstr "suporte para o protocolo v2 ainda não implementado"
+
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "transporte '%s' não permitido"
+
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync não é mais suportado"
+
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Os seguintes caminhos de submódulo contêm alterações que\n"
+"não podem ser encontradas em nenhum remoto:\n"
+
+#, 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"
+"Por favor, tente\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"ou faça cd para o caminho e use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"para fazer o push para um remoto.\n"
+"\n"
+
+msgid "Aborting."
+msgstr "Abortando."
+
+msgid "failed to push all needed submodules"
+msgstr "falha ao fazer push de todos os submódulos necessários"
+
+msgid "bundle-uri operation not supported by protocol"
+msgstr "a operação bundle-uri não é suportada pelo protocolo"
+
+msgid "could not retrieve server-advertised bundle-uri list"
+msgstr ""
+"não foi possível recuperar a lista de bundle-uri anunciada pelo servidor"
+
+msgid "operation not supported by protocol"
+msgstr "operação não suportada pelo protocolo"
+
+msgid "too-short tree object"
+msgstr "objeto de tree muito curto"
+
+msgid "malformed mode in tree entry"
+msgstr "modo malformado na entrada de tree"
+
+msgid "empty filename in tree entry"
+msgstr "nome de arquivo vazio na entrada de tree"
+
+msgid "too-short tree file"
+msgstr "arquivo de tree muito curto"
+
+#, 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 ""
+"Suas alterações locais nos seguintes arquivos seriam substituídas pelo "
+"checkout:\n"
+"%%sPor favor, faça commit de suas alterações ou faça o stash antes de mudar "
+"de branch."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Suas alterações locais nos seguintes arquivos seriam substituídas pelo "
+"checkout:\n"
+"%%s"
+
+#, 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 ""
+"Suas alterações locais nos seguintes arquivos seriam substituídas pelo "
+"merge:\n"
+"%%sPor favor, faça commit de suas alterações ou faça o stash antes de fazer "
+"o merge."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Suas alterações locais nos seguintes arquivos seriam substituídas pelo "
+"merge:\n"
+"%%s"
+
+#, 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 ""
+"Suas alterações locais nos seguintes arquivos seriam substituídas por %s:\n"
+"%%sPor favor, faça commit de suas alterações ou faça o stash antes de %s."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Suas alterações locais nos seguintes arquivos seriam substituídas por %s:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"Atualizar os seguintes diretórios perderia os arquivos não rastreados "
+"neles:\n"
+"%s"
+
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Recusando-se a remover o diretório de trabalho atual:\n"
+"%s"
+
+#, 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 ""
+"Os seguintes arquivos não rastreados da árvore de trabalho seriam removidos "
+"pelo checkout:\n"
+"%%sPor favor, mova-os ou remova-os antes de mudar de branch."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Os seguintes arquivos não rastreados da árvore de trabalho seriam removidos "
+"pelo checkout:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Os seguintes arquivos não rastreados da árvore de trabalho seriam removidos "
+"pelo merge:\n"
+"%%sPor favor, mova-os ou remova-os antes de fazer o merge."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Os seguintes arquivos não rastreados da árvore de trabalho seriam removidos "
+"pelo merge:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Os seguintes arquivos não rastreados da árvore de trabalho seriam removidos "
+"por %s:\n"
+"%%sPor favor, mova-os ou remova-os antes de %s."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Os seguintes arquivos não rastreados da árvore de trabalho seriam removidos "
+"por %s:\n"
+"%%s"
+
+#, 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 ""
+"Os seguintes arquivos não rastreados da árvore de trabalho seriam "
+"substituídos pelo checkout:\n"
+"%%sPor favor, mova-os ou remova-os antes de mudar de branch."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Os seguintes arquivos não rastreados da árvore de trabalho seriam "
+"substituídos pelo checkout:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Os seguintes arquivos não rastreados da árvore de trabalho seriam "
+"substituídos pelo merge:\n"
+"%%sPor favor, mova-os ou remova-os antes de fazer o merge."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Os seguintes arquivos não rastreados da árvore de trabalho seriam "
+"substituídos pelo merge:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Os seguintes arquivos não rastreados da árvore de trabalho seriam "
+"substituídos por %s:\n"
+"%%sPor favor, mova-os ou remova-os antes de %s."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Os seguintes arquivos não rastreados da árvore de trabalho seriam "
+"substituídos por %s:\n"
+"%%s"
+
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "A entrada '%s' se sobrepõe a '%s'. Não é possível vincular."
+
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Não é possível atualizar o submódulo:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Os seguintes caminhos não estão atualizados e foram deixados apesar dos "
+"padrões esparsos:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"Os seguintes caminhos não estão mesclados e foram deixados apesar dos "
+"padrões esparsos:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Os seguintes caminhos já estavam presentes e, portanto, não foram "
+"atualizados apesar dos padrões esparsos:\n"
+"%s"
+
+#, c-format
+msgid "Aborting\n"
+msgstr "Abortando\n"
+
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"Após corrigir os caminhos acima, você pode querer executar `git sparse-"
+"checkout reapply`.\n"
+
+msgid "Updating files"
+msgstr "Atualizando arquivos"
+
+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 ""
+"os seguintes caminhos colidiram (ex.: caminhos com distinção de maiúsculas/"
+"minúsculas\n"
+"em um sistema de arquivos sem distinção) e apenas um do mesmo\n"
+"grupo em colisão está na árvore de trabalho:\n"
+
+msgid "Updating index flags"
+msgstr "Atualizando as flags do índice"
+
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr "a worktree e o commit não rastreado têm entradas duplicadas: %s"
+
+msgid "expected flush after fetch arguments"
+msgstr "esperado flush após os argumentos do fetch"
+
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "nome do esquema da URL inválido ou faltando o sufixo '://'"
+
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "sequência de escape %XX inválida"
+
+msgid "missing host and scheme is not 'file:'"
+msgstr "host ausente e o esquema não é 'file:'"
+
+msgid "a 'file:' URL may not have a port number"
+msgstr "uma URL 'file:' não pode ter um número de porta"
+
+msgid "invalid characters in host name"
+msgstr "caracteres inválidos no nome do host"
+
+msgid "invalid port number"
+msgstr "número de porta inválido"
+
+msgid "invalid '..' path segment"
+msgstr "segmento de caminho '..' inválido"
+
+#, c-format
+msgid "error: unable to format message: %s\n"
+msgstr "erro: não foi possível formatar a mensagem: %s\n"
+
+msgid "usage: "
+msgstr "uso: "
+
+msgid "fatal: "
+msgstr "fatal: "
+
+msgid "error: "
+msgstr "erro: "
+
+msgid "warning: "
+msgstr "aviso: "
+
+#, c-format
+msgid "'%s' will be removed soon.\n"
+msgstr "'%s' será removido em breve.\n"
+
+#, c-format
+msgid ""
+"If you need a replacement:\n"
+"\n"
+"- Read https://git-scm.com/docs/BreakingChanges.html.\n"
+"\n"
+"- Check what others on the mailing list suggest as a replacement:\n"
+"  https://lore.kernel.org/git/?q=%s\n"
+"\n"
+"- Send an email to <git@vger.kernel.org> asking for help, only if\n"
+"  suggestions by others do not work for you.\n"
+"\n"
+msgstr ""
+"Se você precisa de um substituto:\n"
+"\n"
+"- Leia https://git-scm.com/docs/BreakingChanges.html.\n"
+"\n"
+"- Veja o que outras pessoas na lista de discussão sugerem como substituto:\n"
+"  https://lore.kernel.org/git/?q=%s\n"
+"\n"
+"- Envie um e-mail para <git@vger.kernel.org> pedindo ajuda, somente se\n"
+"  as sugestões de outras pessoas não funcionarem para você.\n"
+"\n"
+
+msgid "refusing to run without --i-still-use-this"
+msgstr "recusando-se a executar sem --i-still-use-this"
+
+#, c-format
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() falhou com o erro '%s' (%d)\n"
+
+msgid "Fetching objects"
+msgstr "Buscando objetos"
+
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "'%s' na árvore de trabalho principal não é o diretório do repositório"
+
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr ""
+"o arquivo '%s' não contém o caminho absoluto para o local da árvore de "
+"trabalho"
+
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' não é um arquivo .git, código de erro %d"
+
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' não aponta de volta para '%s'"
+
+msgid "not a directory"
+msgstr "não é um diretório"
+
+msgid ".git is not a file"
+msgstr ".git não é um arquivo"
+
+msgid ".git file broken"
+msgstr "arquivo .git quebrado"
+
+msgid ".git file incorrect"
+msgstr "arquivo .git incorreto"
+
+msgid ".git file absolute/relative path mismatch"
+msgstr "incompatibilidade de caminho absoluto/relativo do arquivo .git"
+
+msgid "not a valid path"
+msgstr "não é um caminho válido"
+
+msgid "unable to locate repository; .git is not a file"
+msgstr "não foi possível localizar o repositório; .git não é um arquivo"
+
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr ""
+"não foi possível localizar o repositório; o arquivo .git não referencia um "
+"repositório"
+
+msgid "unable to locate repository; .git file broken"
+msgstr "não foi possível localizar o repositório; arquivo .git quebrado"
+
+msgid "gitdir unreadable"
+msgstr "gitdir ilegível"
+
+msgid "gitdir absolute/relative path mismatch"
+msgstr "incompatibilidade de caminho absoluto/relativo de gitdir"
+
+msgid "gitdir incorrect"
+msgstr "gitdir incorreto"
+
+msgid "not a valid directory"
+msgstr "não é um diretório válido"
+
+msgid "gitdir file does not exist"
+msgstr "o arquivo gitdir não existe"
+
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "não foi possível ler o arquivo gitdir (%s)"
+
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "leitura curta (esperado %<PRIuMAX> bytes, lido %<PRIuMAX>)"
+
+msgid "invalid gitdir file"
+msgstr "arquivo gitdir inválido"
+
+msgid "gitdir file points to non-existent location"
+msgstr "arquivo gitdir aponta para local inexistente"
+
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "não foi possível definir %s em '%s'"
+
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "não foi possível desdefinir %s em '%s'"
+
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "falha ao definir a configuração extensions.worktreeConfig"
+
+msgid "unable to upgrade repository format to support relative worktrees"
+msgstr ""
+"não foi possível atualizar o formato do repositório para suportar worktrees "
+"relativas"
+
+msgid "unable to set extensions.relativeWorktrees setting"
+msgstr "não foi possível definir a configuração extensions.relativeWorktrees"
+
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "não foi possível executar setenv '%s'"
+
+#, c-format
+msgid "unable to create '%s'"
+msgstr "não foi possível criar '%s'"
+
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "não foi possível abrir '%s' para leitura e escrita"
+
+#, c-format
+msgid "unable to access '%s'"
+msgstr "não foi possível acessar '%s'"
+
+msgid "unable to get current working directory"
+msgstr "não foi possível obter o diretório de trabalho atual"
+
+msgid "unable to get random bytes"
+msgstr "não foi possível obter bytes aleatórios"
+
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "tentativa de fazer mmap de %<PRIuMAX> acima do limite %<PRIuMAX>"
+
+#, c-format
+msgid "mmap failed%s"
+msgstr "falha no mmap%s"
+
+msgid "Unmerged paths:"
+msgstr "Caminhos não mesclados:"
+
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr "  (use \"git restore --staged <file>...\" para remover do stage)"
+
+#, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+"  (use \"git restore --source=%s --staged <file>...\" para remover do stage)"
+
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr "  (use \"git rm --cached <file>...\" para remover do stage)"
+
+msgid "  (use \"git add <file>...\" to mark resolution)"
+msgstr "  (use \"git add <file>...\" para marcar a resolução)"
+
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+"  (use \"git add/rm <file>...\" conforme apropriado para marcar a resolução)"
+
+msgid "  (use \"git rm <file>...\" to mark resolution)"
+msgstr "  (use \"git rm <file>...\" para marcar a resolução)"
+
+msgid "Changes to be committed:"
+msgstr "Mudanças a serem commitadas:"
+
+msgid "Changes not staged for commit:"
+msgstr "Mudanças não preparadas para commit:"
+
+msgid "  (use \"git add <file>...\" to update what will be committed)"
+msgstr "  (use \"git add <file>...\" para atualizar o que será commitado)"
+
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr "  (use \"git add/rm <file>...\" para atualizar o que será commitado)"
+
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr ""
+"  (use \"git restore <file>...\" para descartar alterações no diretório de "
+"trabalho)"
+
+msgid "  (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+"  (faça commit ou descarte o conteúdo não rastreado ou modificado nos "
+"submódulos)"
+
+#, c-format
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgstr "  (use \"git %s <file>...\" para incluir no que será commitado)"
+
+msgid "both deleted:"
+msgstr "ambos excluídos:"
+
+msgid "added by us:"
+msgstr "adicionado por nós:"
+
+msgid "deleted by them:"
+msgstr "excluído por eles:"
+
+msgid "added by them:"
+msgstr "adicionado por eles:"
+
+msgid "deleted by us:"
+msgstr "excluído por nós:"
+
+msgid "both added:"
+msgstr "ambos adicionados:"
+
+msgid "both modified:"
+msgstr "ambos modificados:"
+
+msgid "new file:"
+msgstr "novo arquivo:"
+
+msgid "copied:"
+msgstr "copiado:"
+
+msgid "deleted:"
+msgstr "excluído:"
+
+msgid "modified:"
+msgstr "modificado:"
+
+msgid "renamed:"
+msgstr "renomeado:"
+
+msgid "typechange:"
+msgstr "mudança de tipo:"
+
+msgid "unknown:"
+msgstr "desconhecido:"
+
+msgid "unmerged:"
+msgstr "não mesclado:"
+
+msgid "new commits, "
+msgstr "novos commits, "
+
+msgid "modified content, "
+msgstr "conteúdo modificado, "
+
+msgid "untracked content, "
+msgstr "conteúdo não rastreado, "
+
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Seu stash tem atualmente %d entrada"
+msgstr[1] "Seu stash tem atualmente %d entradas"
+
+msgid "Submodules changed but not updated:"
+msgstr "Submódulos alterados, mas não atualizados:"
+
+msgid "Submodule changes to be committed:"
+msgstr "Mudanças no submódulo a serem commitadas:"
+
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"Não modifique ou remova a linha acima.\n"
+"Tudo abaixo dela será ignorado."
+
+#, 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"
+"Demorou %.2f segundos para calcular os valores de avanço/atrás do branch.\n"
+"Você pode usar '--no-ahead-behind' para evitar isso.\n"
+
+msgid "You have unmerged paths."
+msgstr "Você tem caminhos não mesclados."
+
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  (corrija conflitos e execute \"git commit\")"
+
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  (use \"git merge --abort\" para abortar o merge)"
+
+msgid "All conflicts fixed but you are still merging."
+msgstr "Todos os conflitos foram corrigidos, mas você ainda está em um merge."
+
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  (use \"git commit\" para concluir o merge)"
+
+msgid "You are in the middle of an am session."
+msgstr "Você está no meio de uma sessão de am."
+
+msgid "The current patch is empty."
+msgstr "O patch atual está vazio."
+
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr "  (corrija conflitos e execute \"git am --continue\")"
+
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  (use \"git am --skip\" para pular este patch)"
+
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+"  (use \"git am --allow-empty\" para registrar este patch como um commit "
+"vazio)"
+
+msgid "  (use \"git am --abort\" to restore the original branch)"
+msgstr "  (use \"git am --abort\" para restaurar o branch original)"
+
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo está faltando."
+
+msgid "No commands done."
+msgstr "Nenhum comando feito."
+
+#, c-format
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "Último comando executado (%<PRIuMAX> comando executado):"
+msgstr[1] "Últimos comandos executados (%<PRIuMAX> comandos executados):"
+
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  (veja mais no arquivo %s)"
+
+msgid "No commands remaining."
+msgstr "Nenhum comando restante."
+
+#, c-format
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "Próximo comando a fazer (%<PRIuMAX> comando restante):"
+msgstr[1] "Próximos comandos a fazer (%<PRIuMAX> comandos restantes):"
+
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
+msgstr "  (use \"git rebase --edit-todo\" para visualizar e editar)"
+
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Você está atualmente fazendo rebase do branch '%s' em '%s'."
+
+msgid "You are currently rebasing."
+msgstr "Você está atualmente fazendo rebase."
+
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr "  (corrija conflitos e execute \"git rebase --continue\")"
+
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  (use \"git rebase --skip\" para pular este patch)"
+
+msgid "  (use \"git rebase --abort\" to check out the original branch)"
+msgstr "  (use \"git rebase --abort\" para fazer checkout do branch original)"
+
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr "  (todos os conflitos corrigidos: execute \"git rebase --continue\")"
+
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Você está atualmente dividindo um commit enquanto faz o rebase do branch "
+"'%s' em '%s'."
+
+msgid "You are currently splitting a commit during a rebase."
+msgstr "No momento, você está dividindo um commit durante um rebase."
+
+msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr ""
+"  (Quando seu diretório de trabalho estiver limpo, execute \"git rebase --"
+"continue\")"
+
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Você está atualmente editando um commit enquanto faz o rebase do branch '%s' "
+"em '%s'."
+
+msgid "You are currently editing a commit during a rebase."
+msgstr "Você está editando um commit durante um rebase."
+
+msgid "  (use \"git commit --amend\" to amend the current commit)"
+msgstr "  (use \"git commit --amend\" para alterar o commit atual)"
+
+msgid ""
+"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+"  (use \"git rebase --continue\" quando estiver satisfeito com suas "
+"alterações)"
+
+msgid "Cherry-pick currently in progress."
+msgstr "Cherry-pick atualmente em andamento."
+
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Você está atualmente fazendo cherry-pick do commit %s."
+
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr "  (corrija conflitos e execute \"git cherry-pick --continue\")"
+
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr "  (execute \"git cherry-pick --continue\" para continuar)"
+
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+"  (todos os conflitos corrigidos: execute \"git cherry-pick --continue\")"
+
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (use \"git cherry-pick --skip\" para pular este patch)"
+
+msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr ""
+"  (use \"git cherry-pick --abort\" para cancelar a operação de cherry-pick)"
+
+msgid "Revert currently in progress."
+msgstr "Revert atualmente em andamento."
+
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Você está atualmente revertendo o commit %s."
+
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr "  (corrija conflitos e execute \"git revert --continue\")"
+
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr "  (execute \"git revert --continue\" para continuar)"
+
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr "  (todos os conflitos corrigidos: execute \"git revert --continue\")"
+
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (use \"git revert --skip\" para pular este patch)"
+
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+msgstr "  (use \"git revert --abort\" para cancelar a operação de revert)"
+
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Você está atualmente fazendo bisect, iniciado no branch '%s'."
+
+msgid "You are currently bisecting."
+msgstr "Você está atualmente fazendo bisect."
+
+msgid "  (use \"git bisect reset\" to get back to the original branch)"
+msgstr "  (use \"git bisect reset\" para voltar ao branch original)"
+
+msgid "You are in a sparse checkout."
+msgstr "Você está em um sparse checkout."
+
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr ""
+"Você está em um sparse checkout com %d%% dos arquivos rastreados presentes."
+
+msgid "On branch "
+msgstr "No branch "
+
+msgid "interactive rebase in progress; onto "
+msgstr "rebase interativo em andamento; sobre "
+
+msgid "rebase in progress; onto "
+msgstr "rebase em andamento; sobre "
+
+msgid "HEAD detached at "
+msgstr "HEAD desanexado em "
+
+msgid "HEAD detached from "
+msgstr "HEAD desanexado de "
+
+msgid "Not currently on any branch."
+msgstr "Atualmente não está em nenhum branch."
+
+msgid "Initial commit"
+msgstr "Commit inicial"
+
+msgid "No commits yet"
+msgstr "Ainda não há commits"
+
+msgid "Untracked files"
+msgstr "Arquivos não rastreados"
+
+msgid "Ignored files"
+msgstr "Arquivos ignorados"
+
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files,\n"
+"but the results were cached, and subsequent runs may be faster."
+msgstr ""
+"Demorou %.2f segundos para enumerar arquivos não rastreados,\n"
+"mas os resultados foram armazenados em cache e as execuções subsequentes "
+"podem ser mais rápidas."
+
+#, c-format
+msgid "It took %.2f seconds to enumerate untracked files."
+msgstr "Demorou %.2f segundos para enumerar arquivos não rastreados."
+
+msgid "See 'git help status' for information on how to improve this."
+msgstr ""
+"Consulte 'git help status' para obter informações sobre como melhorar isso."
+
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Arquivos não rastreados não listados%s"
+
+msgid " (use -u option to show untracked files)"
+msgstr " (use a opção -u para mostrar os arquivos não rastreados)"
+
+msgid "No changes"
+msgstr "Sem alterações"
+
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+"nenhuma alteração adicionada ao commit (use \"git add\" e/ou \"git commit "
+"-a\")\n"
+
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "nenhuma alteração adicionada ao commit\n"
+
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"nada adicionado ao commit, mas arquivos não rastreados presentes (use \"git "
+"add\" para rastrear)\n"
+
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "nada adicionado ao commit, mas arquivos não rastreados presentes\n"
+
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr ""
+"nada para fazer commit (crie/copie arquivos e use \"git add\" para "
+"rastrear)\n"
+
+#, c-format
+msgid "nothing to commit\n"
+msgstr "nada para fazer commit\n"
+
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr "nada para fazer commit (use -u para mostrar arquivos não rastreados)\n"
+
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "nada para fazer commit, árvore de trabalho limpa\n"
+
+msgid "No commits yet on "
+msgstr "Ainda não há commits em "
+
+msgid "HEAD (no branch)"
+msgstr "HEAD (sem branch)"
+
+msgid "different"
+msgstr "diferente"
+
+msgid "behind "
+msgstr "atrás "
+
+msgid "ahead "
+msgstr "à frente "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "não é possível %s: você tem alterações não preparadas."
+
+msgid "additionally, your index contains uncommitted changes."
+msgstr "além disso, seu índice contém alterações não commitadas."
+
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "não é possível %s: Seu índice contém alterações não commitadas."
+
+#, c-format
+msgid "unknown style '%s' given for '%s'"
+msgstr "estilo '%s' desconhecido fornecido para '%s'"
+
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr ""
+"Erro: Suas alterações locais nos seguintes arquivos seriam substituídas pelo "
+"merge"
+
+msgid "Automated merge did not work."
+msgstr "O merge automatizado não funcionou."
+
+msgid "Should not be doing an octopus."
+msgstr "Não deveria estar fazendo um octopus."
+
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "Não foi possível encontrar um commit comum com $pretty_name"
+
+#, sh-format
+msgid "Already up to date with $pretty_name"
+msgstr "Já atualizado com $pretty_name"
+
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "Fazendo fast-forward para: $pretty_name"
+
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "Tentando merge simples com $pretty_name"
+
+msgid "Simple merge did not work, trying automatic merge."
+msgstr "O merge simples não funcionou, tentando merge automático."
+
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "uso: $dashless $USAGE"
+
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr ""
+"Não é possível mudar para o diretório $cdup, o nível superior da árvore de "
+"trabalho"
+
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr "fatal: $program_name não pode ser usado sem uma árvore de trabalho."
+
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr ""
+"Não é possível reescrever branches: Você tem alterações não preparadas."
+
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr "Não é possível $action: Você tem alterações não preparadas."
+
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr "Não é possível $action: Seu índice contém alterações não commitadas."
+
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "Além disso, seu índice contém alterações não commitadas."
+
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr ""
+"Você precisa executar este comando a partir do nível superior da árvore de "
+"trabalho."
+
+msgid "Unable to determine absolute path of git directory"
+msgstr "Não foi possível determinar o caminho absoluto do diretório do git"
+
+msgid "local zone differs from GMT by a non-minute interval\n"
+msgstr "o fuso local difere do GMT por um intervalo não em minutos\n"
+
+msgid "local time offset greater than or equal to 24 hours\n"
+msgstr "deslocamento de tempo local maior ou igual a 24 horas\n"
+
+#, perl-format
+msgid "fatal: command '%s' died with exit code %d"
+msgstr "fatal: comando '%s' morreu com código de saída %d"
+
+msgid "the editor exited uncleanly, aborting everything"
+msgstr "o editor não foi encerrado corretamente, abortando tudo"
+
+#, perl-format
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
+msgstr ""
+"'%s' contém uma versão intermediária do e-mail que você estava redigindo.\n"
+
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
+msgstr "'%s.final' contém o e-mail redigido.\n"
+
+msgid "--dump-aliases incompatible with other options\n"
+msgstr "--dump-aliases incompatível com outras opções\n"
+
+msgid "--dump-aliases and --translate-aliases are mutually exclusive\n"
+msgstr "--dump-aliases e --translate-aliases são mutuamente exclusivos\n"
+
+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: encontradas opções de configuração para 'sendmail'\n"
+"git-send-email é configurado com as opções sendemail.* - note o 'e'.\n"
+"Defina sendemail.forbidSendmailVariables como false para desabilitar esta "
+"verificação.\n"
+
+msgid "Cannot run git format-patch from outside a repository\n"
+msgstr "Não é possível executar git format-patch de fora de um repositório\n"
+
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr ""
+"`batch-size` e `relogin` devem ser especificados juntos (via linha de "
+"comando ou opção de configuração)\n"
+
+#, perl-format
+msgid "Unknown --suppress-cc field: '%s'\n"
+msgstr "Campo --suppress-cc desconhecido: '%s'\n"
+
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
+msgstr "Configuração --confirm desconhecida: '%s'\n"
+
+#, perl-format
+msgid "warning: sendmail alias with quotes is not supported: %s\n"
+msgstr "aviso: alias do sendmail com aspas não é suportado: %s\n"
+
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
+msgstr "aviso: `:include:` não é suportado: %s\n"
+
+#, perl-format
+msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
+msgstr "aviso: redirecionamento `/file` ou `|pipe` não é suportado: %s\n"
+
+#, perl-format
+msgid "warning: sendmail line is not recognized: %s\n"
+msgstr "aviso: linha do sendmail não é reconhecida: %s\n"
+
+#, 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 ""
+"O arquivo '%s' existe, mas também pode ser o intervalo de commits\n"
+"para produzir patches.  Por favor, elimine a ambiguidade...\n"
+"\n"
+"    * Dizendo \"./%s\" se você quer dizer um arquivo; ou\n"
+"    * Fornecendo a opção --format-patch se você quer dizer um intervalo.\n"
+
+#, perl-format
+msgid "Failed to opendir %s: %s"
+msgstr "Falha ao executar opendir em %s: %s"
+
+msgid ""
+"\n"
+"No patch files specified!\n"
+"\n"
+msgstr ""
+"\n"
+"Nenhum arquivo de patch especificado!\n"
+"\n"
+
+#, perl-format
+msgid "No 'Subject:' line in '%s'\n"
+msgstr "Nenhuma linha 'Subject:' em '%s'\n"
+
+#, perl-format
+msgid "Failed to open for writing %s: %s"
+msgstr "Falha ao abrir %s para escrita: %s"
+
+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 ""
+"Linhas começando com \"GIT:\" serão removidas.\n"
+"Considere incluir um diffstat geral ou um índice\n"
+"para o patch que você está escrevendo.\n"
+"\n"
+"Limpe o conteúdo do corpo se não desejar enviar um resumo.\n"
+
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "Falha ao abrir %s.final: %s"
+
+#, perl-format
+msgid "Failed to open %s: %s"
+msgstr "Falha ao abrir %s: %s"
+
+msgid "Summary email is empty, skipping it\n"
+msgstr "E-mail de resumo está vazio, ignorando-o\n"
+
+#. TRANSLATORS: please keep [y/N] as is.
+#, perl-format
+msgid "Are you sure you want to use <%s> [y/N]? "
+msgstr "Tem certeza de que deseja usar <%s> [y/N]? "
+
+msgid ""
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
+msgstr ""
+"Os seguintes arquivos são 8bit, mas não declaram um Content-Transfer-"
+"Encoding.\n"
+
+msgid "Declare which 8bit encoding to use [default: UTF-8]? "
+msgstr "Declarar qual codificação 8bit usar [padrão: UTF-8]? "
+
+#, perl-format
+msgid "'%s' does not appear to be a valid charset name. Use it anyway [y/N]? "
+msgstr ""
+"'%s' não parece ser um nome de charset válido. Usar assim mesmo [y/N]? "
+
+#, 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 ""
+"Recusando-se a enviar porque o patch\n"
+"\t%s\n"
+"tem o assunto de modelo '*** SUBJECT HERE ***'. Passe --force se você "
+"realmente deseja enviar.\n"
+
+msgid "To whom should the emails be sent (if anyone)?"
+msgstr "Para quem os e-mails devem ser enviados (se houver alguém)?"
+
+#, perl-format
+msgid "fatal: alias '%s' expands to itself\n"
+msgstr "fatal: o alias '%s' se expande para si mesmo\n"
+
+msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
+msgstr ""
+"Message-ID a ser usado como In-Reply-To para o primeiro e-mail (se houver)? "
+
+#, perl-format
+msgid "error: unable to extract a valid address from: %s\n"
+msgstr "erro: não foi possível extrair um endereço válido de: %s\n"
+
+#. TRANSLATORS: Make sure to include [q] [d] [e] in your
+#. translation. The program will only accept English input
+#. at this point.
+msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
+msgstr "O que fazer com este endereço? ([q]uit|[d]rop|[e]dit): "
+
+#, perl-format
+msgid "CA path \"%s\" does not exist"
+msgstr "o caminho da CA \"%s\" não existe"
+
+#, perl-format
+msgid "Only client key \"%s\" specified"
+msgstr "Apenas a chave de cliente \"%s\" especificada"
+
+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 ""
+"    A lista Cc acima foi expandida por endereços adicionais\n"
+"    encontrados na mensagem de commit do patch. Por padrão\n"
+"    send-email pergunta antes de enviar sempre que isso ocorre.\n"
+"    Este comportamento é controlado pela configuração\n"
+"    sendemail.confirm.\n"
+"\n"
+"    Para obter informações adicionais, execute 'git send-email --help'.\n"
+"    Para manter o comportamento atual, mas suprimir esta mensagem,\n"
+"    execute 'git config --global sendemail.confirm auto'.\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.
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
+msgstr "Enviar este e-mail? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
+
+msgid "Send this email reply required"
+msgstr "Enviar este e-mail (resposta exigida)"
+
+msgid "The destination IMAP folder is not properly defined."
+msgstr "A pasta IMAP de destino não está definida corretamente."
+
+msgid "The required SMTP server is not properly defined."
+msgstr "O servidor SMTP obrigatório não está definido corretamente."
+
+#, perl-format
+msgid "Server does not support STARTTLS! %s"
+msgstr "O servidor não suporta STARTTLS! %s"
+
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "STARTTLS falhou! %s"
+
+msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
+msgstr ""
+"Não foi possível inicializar o SMTP corretamente. Verifique a configuração e "
+"use --smtp-debug."
+
+#, perl-format
+msgid "Outlook reassigned Message-ID to: %s\n"
+msgstr "O Outlook reatribuiu o Message-ID para: %s\n"
+
+msgid "Warning: Could not retrieve Message-ID from server response.\n"
+msgstr ""
+"Aviso: Não foi possível recuperar o Message-ID da resposta do servidor.\n"
+
+#, perl-format
+msgid "Failed to send %s\n"
+msgstr "Falha ao enviar %s\n"
+
+#, perl-format
+msgid "Dry-Sent %s"
+msgstr "Enviado de forma simulada %s"
+
+#, perl-format
+msgid "Sent %s"
+msgstr "Enviado %s"
+
+msgid "Dry-OK. Log says:"
+msgstr "Simulação OK. O log diz:"
+
+msgid "OK. Log says:"
+msgstr "OK. O log diz:"
+
+msgid "Result: "
+msgstr "Resultado: "
+
+msgid "Result: OK"
+msgstr "Resultado: OK"
+
+#, perl-format
+msgid "can't open file %s"
+msgstr "não é possível abrir o arquivo %s"
+
+#, perl-format
+msgid "(mbox) Adding cc: %s from line '%s'\n"
+msgstr "(mbox) Adicionando cc: %s da linha '%s'\n"
+
+#, perl-format
+msgid "(mbox) Adding to: %s from line '%s'\n"
+msgstr "(mbox) Adicionando para: %s da linha '%s'\n"
+
+#, perl-format
+msgid "(non-mbox) Adding cc: %s from line '%s'\n"
+msgstr "(non-mbox) Adicionando cc: %s da linha '%s'\n"
+
+#, perl-format
+msgid "(body) Adding cc: %s from line '%s'\n"
+msgstr "(body) Adicionando cc: %s da linha '%s'\n"
+
+#, perl-format
+msgid "error: invalid SMTP port '%s'\n"
+msgstr "erro: porta SMTP inválida '%s'\n"
+
+#, perl-format
+msgid "(%s) Could not execute '%s'"
+msgstr "(%s) Não foi possível executar '%s'"
+
+#, perl-format
+msgid "(%s) Malformed output from '%s'"
+msgstr "(%s) Saída malformada de '%s'"
+
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
+msgstr "(%s) falha ao fechar o pipe para '%s'"
+
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
+msgstr "(%s) Adicionando %s: %s de: '%s'\n"
+
+msgid "cannot send message as 7bit"
+msgstr "não é possível enviar mensagem como 7bit"
+
+msgid "invalid transfer encoding"
+msgstr "codificação de transferência inválida"
+
+#, perl-format
+msgid ""
+"fatal: %s: rejected by %s hook\n"
+"%s\n"
+"warning: no patches were sent\n"
+msgstr ""
+"fatal: %s: rejeitado pelo hook %s\n"
+"%s\n"
+"aviso: nenhum patch foi enviado\n"
+
+#, perl-format
+msgid "unable to open %s: %s\n"
+msgstr "não foi possível abrir %s: %s\n"
+
+#, perl-format
+msgid ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
+msgstr ""
+"fatal: %s:%d tem mais de 998 caracteres\n"
+"aviso: nenhum patch foi enviado\n"
+
+#, perl-format
+msgid "Skipping %s with backup suffix '%s'.\n"
+msgstr "Ignorando %s com sufixo de backup '%s'.\n"
+
+#. TRANSLATORS: please keep "[y|N]" as is.
+#, perl-format
+msgid "Do you really want to send %s? [y|N]: "
+msgstr "Você realmente deseja enviar %s? [y|N]: "
+
+#~ msgid "The now-empty commit has been dropped -- cannot amend."
+#~ msgstr ""
+#~ "O commit, agora vazio, foi descartado -- não é possível fazer amend."
+
+#~ msgid "You are in the middle of an am session -- cannot amend."
+#~ msgstr ""
+#~ "Você está no meio de uma sessão de am -- não é possível fazer amend."
+
+#~ msgid "You are resolving conflicts during a rebase -- cannot amend."
+#~ msgstr ""
+#~ "Você está resolvendo conflitos durante um rebase -- não é possível fazer "
+#~ "amend."
+
+#~ msgid "cannot do a partial commit during an am session."
+#~ msgstr "não é possível fazer um commit parcial durante uma sessão de am."
+
+#~ msgid ""
+#~ "cannot do a partial commit while resolving conflicts during a rebase."
+#~ msgstr ""
+#~ "não é possível fazer um commit parcial ao resolver conflitos durante um "
+#~ "rebase."

From 0ce24c2cb223528ad84dc518f0069ba8dc17b282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9fan=20Driaan=20Turvey?= <stefanturvey1912@gmail.com>
Date: Wed, 23 Sep 2026 13:36:09 +0200
Subject: [PATCH 018/247] l10n: af: add Afrikaans translation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add a full Afrikaans translation of Git (6476 messages) and
register the Afrikaans team in po/TEAMS.

Signed-off-by: Stéfan Driaan Turvey <stefanturvey1912@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
 po/TEAMS |     4 +
 po/af.po | 26374 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 26378 insertions(+)
 create mode 100644 po/af.po

diff --git a/po/TEAMS b/po/TEAMS
index 880ee6cf0526bb..c84c3139f1afe7 100644
--- a/po/TEAMS
+++ b/po/TEAMS
@@ -1,6 +1,10 @@
 Core Git translation language teams
 (please keep the list sorted alphabetically on language field)
 
+Language:	af (Afrikaans)
+Repository:	https://github.com/Topsy2003Turvey/git-po
+Leader:		Stéfan Driaan Turvey <stefanturvey1912@gmail.com>
+
 Language:	bg (Bulgarian)
 Repository:	https://github.com/git-l10n/git-po
 Leader:		Alexander Shopov <ash@kambanaria.org>
diff --git a/po/af.po b/po/af.po
new file mode 100644
index 00000000000000..82e7b804b61922
--- /dev/null
+++ b/po/af.po
@@ -0,0 +1,26374 @@
+# Afrikaans translations for Git package.
+# Copyright (C) 2026 THE Git'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the Git package.
+# Automatically generated, 2026.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Git\n"
+"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
+"POT-Creation-Date: 2026-09-27 15:58+0800\n"
+"PO-Revision-Date: 2026-07-29 10:15+0200\n"
+"Last-Translator: Stéfan Driaan Turvey <stefanturvey1912@gmail.com>\n"
+"Language-Team: Stéfan Driaan Turvey <stefanturvey1912@gmail.com>\n"
+"Language: af\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"
+"X-Generator: Poedit 3.9\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#, c-format
+msgid "Huh (%s)?"
+msgstr "Hè (%s)?"
+
+msgid "could not read index"
+msgstr "kon nie indeks lees nie"
+
+msgid "binary"
+msgstr "binêr"
+
+msgid "nothing"
+msgstr "niks"
+
+msgid "unchanged"
+msgstr "onveranderd"
+
+msgid "Update"
+msgstr "Bywerk"
+
+#, c-format
+msgid "could not stage '%s'"
+msgstr "kon nie '%s' plaas nie"
+
+msgid "could not write index"
+msgstr "kon nie indeks skryf nie"
+
+#, c-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "%d pad bygewerk\n"
+msgstr[1] "%d paaie bygewerk\n"
+
+#, c-format
+msgid "note: %s is untracked now.\n"
+msgstr "let wel: %s is nou onnaspoorbaar.\n"
+
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry het misluk vir pad '%s'"
+
+msgid "Revert"
+msgstr "Omkeer"
+
+msgid "Could not parse HEAD^{tree}"
+msgstr "Kon nie HEAD^{tree} ontleed nie"
+
+#, c-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "%d pad omgekeer\n"
+msgstr[1] "%d paaie omgekeer\n"
+
+#, c-format
+msgid "No untracked files.\n"
+msgstr "Geen onnaspoorbare lêers nie.\n"
+
+msgid "Add untracked"
+msgstr "Voeg onnaspoorbares by"
+
+#, c-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "%d pad bygevoeg\n"
+msgstr[1] "%d paaie bygevoeg\n"
+
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "ignoreer nie saamgesmelt nie: %s"
+
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Slegs binêre lêers het verander.\n"
+
+#, c-format
+msgid "No changes.\n"
+msgstr "Geen veranderinge nie.\n"
+
+msgid "Patch update"
+msgstr "Lapbywerking"
+
+msgid "Review diff"
+msgstr "Hersien verskil"
+
+msgid "show paths with changes"
+msgstr "wys paaie met veranderinge"
+
+msgid "add working tree state to the staged set of changes"
+msgstr "voeg werkboomtoestand by die geplaasde stel veranderinge"
+
+msgid "revert staged set of changes back to the HEAD version"
+msgstr "keer geplaasde stel veranderinge terug na die HEAD-weergawe"
+
+msgid "pick hunks and update selectively"
+msgstr "kies brokke en werk selektief by"
+
+msgid "view diff between HEAD and index"
+msgstr "bekyk verskil tussen HEAD en indeks"
+
+msgid "add contents of untracked files to the staged set of changes"
+msgstr "voeg inhoud van onnaspoorbare lêers by die geplaasde stel veranderinge"
+
+msgid "Prompt help:"
+msgstr "Hulp by die invoer:"
+
+msgid "select a single item"
+msgstr "kies 'n enkele item"
+
+msgid "select a range of items"
+msgstr "kies 'n reeks items"
+
+msgid "select multiple ranges"
+msgstr "kies veelvuldige reekse"
+
+msgid "select item based on unique prefix"
+msgstr "kies item op grond van unieke voorvoegsel"
+
+msgid "unselect specified items"
+msgstr "ontkies gespesifiseerde items"
+
+msgid "choose all items"
+msgstr "kies alle items"
+
+msgid "(empty) finish selecting"
+msgstr "(leeg) voltooi keuse"
+
+msgid "select a numbered item"
+msgstr "kies 'n genommerde item"
+
+msgid "(empty) select nothing"
+msgstr "(leeg) kies niks"
+
+msgid "*** Commands ***"
+msgstr "*** Opdragte ***"
+
+msgid "What now"
+msgstr "Wat nou"
+
+msgid "staged"
+msgstr "geplaas"
+
+msgid "unstaged"
+msgstr "ongeplaas"
+
+msgid "path"
+msgstr "pad"
+
+msgid "could not refresh index"
+msgstr "kon nie indeks verfris nie"
+
+#, c-format
+msgid "Bye.\n"
+msgstr "Totsiens.\n"
+
+#, c-format
+msgid "Stage mode change%s [y,n,q,a,d%s,?]? "
+msgstr "Plaas modusverandering%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Stage deletion%s [y,n,q,a,d%s,?]? "
+msgstr "Plaas skrapping%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Stage addition%s [y,n,q,a,d%s,?]? "
+msgstr "Plaas toevoeging%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Stage this hunk%s [y,n,q,a,d%s,?]? "
+msgstr "Plaas hierdie brok%s [y,n,q,a,d%s,?]? "
+
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"staging."
+msgstr ""
+"As die lap skoon toegepas word, sal die geredigeerde brok onmiddellik vir "
+"plasing gemerk word."
+
+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 - plaas hierdie brok\n"
+"n - moenie hierdie brok plaas nie\n"
+"q - verlaat; moenie hierdie brok of enige van die oorblywendes plaas nie\n"
+"a - plaas hierdie brok en alle latere brokke in die lêer\n"
+"d - moenie hierdie brok of enige van die latere brokke in die lêer plaas "
+"nie\n"
+
+#, c-format
+msgid "Stash mode change%s [y,n,q,a,d%s,?]? "
+msgstr "Bêre modusverandering weg%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Stash deletion%s [y,n,q,a,d%s,?]? "
+msgstr "Bêre skrapping weg%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Stash addition%s [y,n,q,a,d%s,?]? "
+msgstr "Bêre toevoeging weg%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Stash this hunk%s [y,n,q,a,d%s,?]? "
+msgstr "Bêre hierdie brok weg%s [y,n,q,a,d%s,?]? "
+
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"stashing."
+msgstr ""
+"As die lap skoon toegepas word, sal die geredigeerde brok onmiddellik vir "
+"wegbêre gemerk word."
+
+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 - bêre hierdie brok weg\n"
+"n - moenie hierdie brok wegbêre nie\n"
+"q - verlaat; moenie hierdie brok of enige van die oorblywendes wegbêre nie\n"
+"a - bêre hierdie brok en alle latere brokke in die lêer weg\n"
+"d - moenie hierdie brok of enige van die latere brokke in die lêer wegbêre "
+"nie\n"
+
+#, c-format
+msgid "Unstage mode change%s [y,n,q,a,d%s,?]? "
+msgstr "Ontplaas modusverandering%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Unstage deletion%s [y,n,q,a,d%s,?]? "
+msgstr "Ontplaas skrapping%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Unstage addition%s [y,n,q,a,d%s,?]? "
+msgstr "Ontplaas toevoeging%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Unstage this hunk%s [y,n,q,a,d%s,?]? "
+msgstr "Ontplaas hierdie brok%s [y,n,q,a,d%s,?]? "
+
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr ""
+"As die lap skoon toegepas word, sal die geredigeerde brok onmiddellik vir "
+"ontplasing gemerk word."
+
+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 - ontplaas hierdie brok\n"
+"n - moenie hierdie brok ontplaas nie\n"
+"q - verlaat; moenie hierdie brok of enige van die oorblywendes ontplaas nie\n"
+"a - ontplaas hierdie brok en alle latere brokke in die lêer\n"
+"d - moenie hierdie brok of enige van die latere brokke in die lêer ontplaas "
+"nie\n"
+
+#, c-format
+msgid "Apply mode change to index%s [y,n,q,a,d%s,?]? "
+msgstr "Pas modusverandering op indeks toe%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Apply deletion to index%s [y,n,q,a,d%s,?]? "
+msgstr "Pas skrapping op indeks toe%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Apply addition to index%s [y,n,q,a,d%s,?]? "
+msgstr "Pas toevoeging op indeks toe%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Apply this hunk to index%s [y,n,q,a,d%s,?]? "
+msgstr "Pas hierdie brok op indeks toe%s [y,n,q,a,d%s,?]? "
+
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"applying."
+msgstr ""
+"As die lap skoon toegepas word, sal die geredigeerde brok onmiddellik vir "
+"toepassing gemerk word."
+
+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 - pas hierdie brok op indeks toe\n"
+"n - moenie hierdie brok op indeks toepas nie\n"
+"q - verlaat; moenie hierdie brok of enige van die oorblywendes toepas nie\n"
+"a - pas hierdie brok en alle latere brokke in die lêer toe\n"
+"d - moenie hierdie brok of enige van die latere brokke in die lêer toepas "
+"nie\n"
+
+#, c-format
+msgid "Discard mode change from worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Verwerp modusverandering uit werkboom%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Discard deletion from worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Verwerp skrapping uit werkboom%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Discard addition from worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Verwerp toevoeging uit werkboom%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Discard this hunk from worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Verwerp hierdie brok uit werkboom%s [y,n,q,a,d%s,?]? "
+
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"discarding."
+msgstr ""
+"As die lap skoon toegepas word, sal die geredigeerde brok onmiddellik vir "
+"verwerping gemerk word."
+
+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 - verwerp hierdie brok uit werkboom\n"
+"n - moenie hierdie brok uit werkboom verwerp nie\n"
+"q - verlaat; moenie hierdie brok of enige van die oorblywendes verwerp nie\n"
+"a - verwerp hierdie brok en alle latere brokke in die lêer\n"
+"d - moenie hierdie brok of enige van die latere brokke in die lêer verwerp "
+"nie\n"
+
+#, c-format
+msgid "Discard mode change from index and worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Verwerp modusverandering uit indeks en werkboom%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Discard deletion from index and worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Verwerp skrapping uit indeks en werkboom%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Discard addition from index and worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Verwerp toevoeging uit indeks en werkboom%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Discard this hunk from index and worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Verwerp hierdie brok uit indeks en werkboom%s [y,n,q,a,d%s,?]? "
+
+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 - verwerp hierdie brok uit indeks en werkboom\n"
+"n - moenie hierdie brok uit indeks en werkboom verwerp nie\n"
+"q - verlaat; moenie hierdie brok of enige van die oorblywendes verwerp nie\n"
+"a - verwerp hierdie brok en alle latere brokke in die lêer\n"
+"d - moenie hierdie brok of enige van die latere brokke in die lêer verwerp "
+"nie\n"
+
+#, c-format
+msgid "Apply mode change to index and worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Pas modusverandering op indeks en werkboom toe%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Apply deletion to index and worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Pas skrapping op indeks en werkboom toe%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Apply addition to index and worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Pas toevoeging op indeks en werkboom toe%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Apply this hunk to index and worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Pas hierdie brok op indeks en werkboom toe%s [y,n,q,a,d%s,?]? "
+
+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 - pas hierdie brok op indeks en werkboom toe\n"
+"n - moenie hierdie brok op indeks en werkboom toepas nie\n"
+"q - verlaat; moenie hierdie brok of enige van die oorblywendes toepas nie\n"
+"a - pas hierdie brok en alle latere brokke in die lêer toe\n"
+"d - moenie hierdie brok of enige van die latere brokke in die lêer toepas "
+"nie\n"
+
+#, c-format
+msgid "Apply mode change to worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Pas modusverandering op werkboom toe%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Apply deletion to worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Pas skrapping op werkboom toe%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Apply addition to worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Pas toevoeging op werkboom toe%s [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Apply this hunk to worktree%s [y,n,q,a,d%s,?]? "
+msgstr "Pas hierdie brok op werkboom toe%s [y,n,q,a,d%s,?]? "
+
+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 - pas hierdie brok op werkboom toe\n"
+"n - moenie hierdie brok op werkboom toepas nie\n"
+"q - verlaat; moenie hierdie brok of enige van die oorblywendes toepas nie\n"
+"a - pas hierdie brok en alle latere brokke in die lêer toe\n"
+"d - moenie hierdie brok of enige van die latere brokke in die lêer toepas "
+"nie\n"
+
+#, c-format
+msgid "%s cannot be negative"
+msgstr "%s kan nie negatief wees nie"
+
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "kon nie brokkopstuk '%.*s' ontleed nie"
+
+msgid "could not parse diff"
+msgstr "kon nie verskil ontleed nie"
+
+msgid "could not parse colored diff"
+msgstr "kon nie gekleurde verskil ontleed nie"
+
+#, c-format
+msgid "failed to run '%s'"
+msgstr "kon nie '%s' uitvoer nie"
+
+msgid "mismatched output from interactive.diffFilter"
+msgstr "afvoer van interactive.diffFilter stem nie ooreen nie"
+
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"Jou filter moet 'n een-tot-een-ooreenkoms tussen sy\n"
+"invoer- en afvoerreëls handhaaf."
+
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"het konteksreël #%d verwag in\n"
+"%.*s"
+
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"brokke oorvleuel nie:\n"
+"%.*s\n"
+"\teindig nie met:\n"
+"%.*s"
+
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr "Handmatige brokredigeermodus -- sien onderaan vir 'n vinnige gids.\n"
+
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %s will be removed.\n"
+msgstr ""
+"---\n"
+"Om '%c'-reëls te verwyder, maak hulle ' '-reëls (konteks).\n"
+"Om '%c'-reëls te verwyder, skrap hulle.\n"
+"Reëls wat met %s begin, sal verwyder word.\n"
+
+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 ""
+"As dit nie skoon toegepas word nie, sal jy 'n geleentheid kry om\n"
+"weer te redigeer.  As alle reëls van die brok verwyder word, word die\n"
+"redigering gestaak en bly die brok onveranderd.\n"
+
+msgid "could not parse hunk header"
+msgstr "kon nie brokkopstuk ontleed nie"
+
+msgid "'git apply --cached' failed"
+msgstr "'git apply --cached' het misluk"
+
+#. 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.
+#.
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"Jou geredigeerde brok is nie van toepassing nie. Redigeer weer (\"n\" vir "
+"\"nee\" verwerp!) [y/n]? "
+
+msgid "The selected hunks do not apply to the index!"
+msgstr "Die gekose brokke is nie op die indeks van toepassing nie!"
+
+msgid "Apply them to the worktree anyway? "
+msgstr "Pas hulle in elk geval op die werkboom toe? "
+
+msgid "Nothing was applied.\n"
+msgstr "Niks is toegepas nie.\n"
+
+#, c-format
+msgid ""
+"j - go to the next undecided hunk, roll over at the bottom\n"
+"J - go to the next hunk, roll over at the bottom\n"
+"k - go to the previous undecided hunk, roll over at the top\n"
+"K - go to the previous hunk, roll over at the top\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"
+"p - print the current hunk\n"
+"P - print the current hunk using the pager\n"
+"> - go to the next file, roll over at the bottom\n"
+"< - go to the previous file, roll over at the top\n"
+"? - print help\n"
+"HUNKS SUMMARY - Hunks: %d, USE: %d, SKIP: %d\n"
+msgstr ""
+"j - gaan na die volgende onbesliste brok, begin weer bo aan die einde\n"
+"J - gaan na die volgende brok, begin weer bo aan die einde\n"
+"k - gaan na die vorige onbesliste brok, begin weer onder aan die begin\n"
+"K - gaan na die vorige brok, begin weer onder aan die begin\n"
+"g - kies 'n brok om na toe te gaan\n"
+"/ - soek vir 'n brok wat by die gegewe regex pas\n"
+"s - verdeel die huidige brok in kleiner brokke\n"
+"e - redigeer die huidige brok handmatig\n"
+"p - druk die huidige brok\n"
+"P - druk die huidige brok met die bladsyblaaier\n"
+"> - gaan na die volgende lêer, begin weer bo aan die einde\n"
+"< - gaan na die vorige lêer, begin weer onder aan die begin\n"
+"? - druk hulp\n"
+"BROKOPSOMMING - Brokke: %d, GEBRUIK: %d, OORSLAAN: %d\n"
+
+msgid "'git apply' failed"
+msgstr "'git apply' het misluk"
+
+msgid " (was: y)"
+msgstr " (was: y)"
+
+msgid " (was: n)"
+msgstr " (was: n)"
+
+#, c-format
+msgid "Only one letter is expected, got '%s'"
+msgstr "Slegs een letter word verwag, het '%s' gekry"
+
+msgid "No next file"
+msgstr "Geen volgende lêer nie"
+
+msgid "No previous file"
+msgstr "Geen vorige lêer nie"
+
+msgid "No other hunk"
+msgstr "Geen ander brok nie"
+
+msgid "No other undecided hunk"
+msgstr "Geen ander onbesliste brok nie"
+
+msgid "No other hunks to goto"
+msgstr "Geen ander brokke om na toe te gaan nie"
+
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "gaan na watter brok (<ret> om meer te sien)? "
+
+msgid "go to which hunk? "
+msgstr "gaan na watter brok? "
+
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Ongeldige nommer: '%s'"
+
+#, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+msgstr[0] "Jammer, slegs %d brok beskikbaar."
+msgstr[1] "Jammer, slegs %d brokke beskikbaar."
+
+msgid "No other hunks to search"
+msgstr "Geen ander brokke om te deursoek nie"
+
+msgid "search for regex? "
+msgstr "soek vir regex? "
+
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "Misvormde soek-regexp %s: %s"
+
+msgid "No hunk matches the given pattern"
+msgstr "Geen brok pas by die gegewe patroon nie"
+
+msgid "Sorry, cannot split this hunk"
+msgstr "Jammer, kan nie hierdie brok verdeel nie"
+
+#, c-format
+msgid "Split into %d hunks."
+msgstr "In %d brokke verdeel."
+
+msgid "Sorry, cannot edit this hunk"
+msgstr "Jammer, kan nie hierdie brok redigeer nie"
+
+#, c-format
+msgid "Unknown command '%s' (use '?' for help)"
+msgstr "Onbekende opdrag '%s' (gebruik '?' vir hulp)"
+
+msgid "No changes."
+msgstr "Geen veranderinge nie."
+
+msgid "Only binary files changed."
+msgstr "Slegs binêre lêers het verander."
+
+#, c-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Plaas modusverandering [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Plaas skrapping [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Stage addition [y,n,q,a,d%s,?]? "
+msgstr "Plaas toevoeging [y,n,q,a,d%s,?]? "
+
+#, c-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Plaas hierdie brok [y,n,q,a,d%s,?]? "
+
+msgid "Revision does not refer to a commit"
+msgstr "Hersiening verwys nie na 'n vaslegging nie"
+
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config set advice.%s false\""
+msgstr ""
+"\n"
+"Deaktiveer hierdie boodskap met \"git config set advice.%s false\""
+
+#, c-format
+msgid "%shint:%s%.*s%s\n"
+msgstr "%swenk:%s%.*s%s\n"
+
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr ""
+"Kersiepluk is nie moontlik nie, omdat jy lêers het wat nie saamgesmelt is "
+"nie."
+
+msgid "Committing is not possible because you have unmerged files."
+msgstr ""
+"Vaslê is nie moontlik nie, omdat jy lêers het wat nie saamgesmelt is nie."
+
+msgid "Merging is not possible because you have unmerged files."
+msgstr ""
+"Saamsmelt is nie moontlik nie, omdat jy lêers het wat nie saamgesmelt is nie."
+
+msgid "Pulling is not possible because you have unmerged files."
+msgstr ""
+"Trek is nie moontlik nie, omdat jy lêers het wat nie saamgesmelt is nie."
+
+msgid "Reverting is not possible because you have unmerged files."
+msgstr ""
+"Omkeer is nie moontlik nie, omdat jy lêers het wat nie saamgesmelt is nie."
+
+msgid "Rebasing is not possible because you have unmerged files."
+msgstr ""
+"Herbaseer is nie moontlik nie, omdat jy lêers het wat nie saamgesmelt is nie."
+
+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 ""
+"Herstel hulle in die werkboom, en gebruik dan 'git add/rm <lêer>'\n"
+"soos toepaslik om die oplossing te merk en 'n vaslegging te maak."
+
+msgid "Exiting because of an unresolved conflict."
+msgstr "Verlaat weens 'n onopgeloste konflik."
+
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr "Jy het nie jou saamsmelting voltooi nie (MERGE_HEAD bestaan)."
+
+msgid "Please, commit your changes before merging."
+msgstr "Lê asseblief jou veranderinge vas voordat jy saamsmelt."
+
+msgid "Exiting because of unfinished merge."
+msgstr "Verlaat weens onvoltooide saamsmelting."
+
+msgid ""
+"Diverging branches can't be fast-forwarded, you need to either:\n"
+"\n"
+"\tgit merge --no-ff\n"
+"\n"
+"or:\n"
+"\n"
+"\tgit rebase\n"
+msgstr ""
+"Uiteenlopende takke kan nie vooruitgespoel word nie, jy moet óf:\n"
+"\n"
+"\tgit merge --no-ff\n"
+"\n"
+"óf:\n"
+"\n"
+"\tgit rebase\n"
+
+msgid "Not possible to fast-forward, aborting."
+msgstr "Vooruitspoel is nie moontlik nie, staak."
+
+#, c-format
+msgid ""
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
+msgstr ""
+"Die volgende paaie en/of padspesifikasies pas by paaie wat buite\n"
+"jou yl-uitcheck-definisie bestaan, en sal dus nie in die indeks\n"
+"bygewerk word nie:\n"
+
+msgid ""
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
+msgstr ""
+"As jy van plan is om sulke inskrywings by te werk, probeer een van die "
+"volgende:\n"
+"* Gebruik die opsie --sparse.\n"
+"* Deaktiveer of wysig die yl-reëls."
+
+#, 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 ""
+"Let wel: skakel oor na '%s'.\n"
+"\n"
+"Jy is in 'ontkoppelde HEAD'-toestand. Jy kan rondkyk, eksperimentele\n"
+"veranderinge maak en hulle vaslê, en jy kan enige vasleggings wat jy in\n"
+"hierdie toestand maak verwerp sonder om enige takke te beïnvloed, deur\n"
+"terug te skakel na 'n tak.\n"
+"\n"
+"As jy 'n nuwe tak wil skep om vasleggings wat jy maak te behou, kan jy\n"
+"dit (nou of later) doen deur -c met die switch-opdrag te gebruik. "
+"Voorbeeld:\n"
+"\n"
+"  git switch -c <nuwe-taknaam>\n"
+"\n"
+"Of ontdoen hierdie bewerking met:\n"
+"\n"
+"  git switch -\n"
+"\n"
+"Skakel hierdie advies af deur die konfigurasieveranderlike "
+"advice.detachedHead op false te stel\n"
+"\n"
+
+#, c-format
+msgid ""
+"The following paths have been moved outside the\n"
+"sparse-checkout definition but are not sparse due to local\n"
+"modifications.\n"
+msgstr ""
+"Die volgende paaie is buite die yl-uitcheck-definisie\n"
+"geskuif, maar is nie yl nie weens plaaslike\n"
+"wysigings.\n"
+
+msgid ""
+"To correct the sparsity of these paths, do the following:\n"
+"* Use \"git add --sparse <paths>\" to update the index\n"
+"* Use \"git sparse-checkout reapply\" to apply the sparsity rules"
+msgstr ""
+"Om die ylheid van hierdie paaie reg te stel, doen die volgende:\n"
+"* Gebruik \"git add --sparse <paaie>\" om die indeks by te werk\n"
+"* Gebruik \"git sparse-checkout reapply\" om die yl-reëls toe te pas"
+
+msgid "cmdline ends with \\"
+msgstr "opdragreël eindig met \\"
+
+msgid "unclosed quote"
+msgstr "ongeslote aanhalingsteken"
+
+msgid "too many arguments"
+msgstr "te veel argumente"
+
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "onherkende witspasie-opsie '%s'"
+
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "onherkende witspasie-ignoreeropsie '%s'"
+
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "opsies '%s' en '%s' kan nie saam gebruik word nie"
+
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' buite 'n bewaarplek"
+
+msgid "failed to read patch"
+msgstr "kon nie lap lees nie"
+
+msgid "patch too large"
+msgstr "lap te groot"
+
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "Kan nie tydstempel-regexp %s voorberei nie"
+
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec het %d teruggegee vir invoer: %s"
+
+#, c-format
+msgid "unable to find filename in patch at %s:%d"
+msgstr "kan nie lêernaam in lap by %s:%d vind nie"
+
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s at %s:%d"
+msgstr ""
+"git apply: slegte git-diff - het /dev/null verwag, het %s gekry by %s:%d"
+
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr ""
+"git apply: slegte git-diff - het /dev/null verwag, het %s gekry op reël %d"
+
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename at %s:%d"
+msgstr "git apply: slegte git-diff - inkonsekwente nuwe lêernaam by %s:%d"
+
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename at %s:%d"
+msgstr "git apply: slegte git-diff - inkonsekwente ou lêernaam by %s:%d"
+
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr "git apply: slegte git-diff - inkonsekwente nuwe lêernaam op reël %d"
+
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr "git apply: slegte git-diff - inkonsekwente ou lêernaam op reël %d"
+
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null at %s:%d"
+msgstr "git apply: slegte git-diff - het /dev/null verwag by %s:%d"
+
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply: slegte git-diff - het /dev/null verwag op reël %d"
+
+#, c-format
+msgid "invalid mode at %s:%d: %s"
+msgstr "ongeldige modus by %s:%d: %s"
+
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "ongeldige modus op reël %d: %s"
+
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr "inkonsekwente kopstukreëls %d en %d"
+
+#, c-format
+msgid ""
+"git diff header lacks filename information when removing %d leading pathname "
+"component at %s:%d"
+msgid_plural ""
+"git diff header lacks filename information when removing %d leading pathname "
+"components at %s:%d"
+msgstr[0] ""
+"kopstuk van git diff kort lêernaaminligting wanneer %d voorste "
+"padnaamkomponent verwyder word by %s:%d"
+msgstr[1] ""
+"kopstuk van git diff kort lêernaaminligting wanneer %d voorste "
+"padnaamkomponente verwyder word by %s:%d"
+
+#, 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] ""
+"kopstuk van git diff kort lêernaaminligting wanneer %d voorste "
+"padnaamkomponent verwyder word (reël %d)"
+msgstr[1] ""
+"kopstuk van git diff kort lêernaaminligting wanneer %d voorste "
+"padnaamkomponente verwyder word (reël %d)"
+
+#, c-format
+msgid "git diff header lacks filename information at %s:%d"
+msgstr "kopstuk van git diff kort lêernaaminligting by %s:%d"
+
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr "kopstuk van git diff kort lêernaaminligting (reël %d)"
+
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "hertel: onverwagte reël: %.*s"
+
+#, c-format
+msgid "patch fragment without header at %s:%d: %.*s"
+msgstr "lapfragment sonder kopstuk by %s:%d: %.*s"
+
+msgid "new file depends on old contents"
+msgstr "nuwe lêer hang van ou inhoud af"
+
+msgid "deleted file still has contents"
+msgstr "geskrapte lêer het steeds inhoud"
+
+#, c-format
+msgid "corrupt patch at %s:%d"
+msgstr "korrupte lap by %s:%d"
+
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "nuwe lêer %s hang van ou inhoud af"
+
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "geskrapte lêer %s het steeds inhoud"
+
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** waarskuwing: lêer %s word leeg, maar is nie geskrap nie"
+
+#, c-format
+msgid "corrupt binary patch at %s:%d: %.*s"
+msgstr "korrupte binêre lap by %s:%d: %.*s"
+
+#, c-format
+msgid "unrecognized binary patch at %s:%d"
+msgstr "onherkende binêre lap by %s:%d"
+
+#, c-format
+msgid "patch with only garbage at %s:%d"
+msgstr "lap met slegs rommel by %s:%d"
+
+#, c-format
+msgid "unable to read symlink %s"
+msgstr "kan nie simboliese skakel %s lees nie"
+
+#, c-format
+msgid "unable to open or read %s"
+msgstr "kan nie %s oopmaak of lees nie"
+
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "ongeldige begin van reël: '%c'"
+
+#, c-format
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgstr[0] "Brok #%d het geslaag by %d (verskuiwing %d reël)."
+msgstr[1] "Brok #%d het geslaag by %d (verskuiwing %d reëls)."
+
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "Konteks verminder tot (%ld/%ld) om fragment by %d toe te pas"
+
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+"terwyl gesoek is na:\n"
+"%.*s"
+
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr "ontbrekende binêre lapdata vir '%s'"
+
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
+msgstr ""
+"kan nie 'n binêre lap omgekeerd toepas sonder die omgekeerde brok op '%s' nie"
+
+#, c-format
+msgid "cannot apply binary patch to '%s' without full index line"
+msgstr "kan nie binêre lap op '%s' toepas sonder volledige indeksreël nie"
+
+#, c-format
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr ""
+"die lap is van toepassing op '%s' (%s), wat nie met die huidige inhoud "
+"ooreenstem nie."
+
+#, c-format
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr "die lap is van toepassing op 'n leë '%s', maar dit is nie leeg nie"
+
+#, c-format
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "die nodige na-beeld %s vir '%s' kan nie gelees word nie"
+
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr "binêre lap is nie op '%s' van toepassing nie"
+
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr ""
+"binêre lap op '%s' lewer verkeerde resultaat (het %s verwag, het %s gekry)"
+
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "lap het misluk: %s:%ld"
+
+#, c-format
+msgid "cannot checkout %s"
+msgstr "kan nie %s uitcheck nie"
+
+#, c-format
+msgid "failed to read %s"
+msgstr "kon nie %s lees nie"
+
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "lees vanaf '%s' agter 'n simboliese skakel"
+
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr "pad %s is hernoem/geskrap"
+
+#, c-format
+msgid "%s: does not exist in index"
+msgstr "%s: bestaan nie in indeks nie"
+
+#, c-format
+msgid "%s: does not match index"
+msgstr "%s: stem nie met indeks ooreen nie"
+
+msgid "repository lacks the necessary blob to perform 3-way merge."
+msgstr ""
+"bewaarplek kort die nodige blob om 'n 3-rigting-saamsmelting uit te voer."
+
+#, c-format
+msgid "Performing three-way merge...\n"
+msgstr "Voer drierigting-saamsmelting uit...\n"
+
+#, c-format
+msgid "cannot read the current contents of '%s'"
+msgstr "kan nie die huidige inhoud van '%s' lees nie"
+
+#, c-format
+msgid "Failed to perform three-way merge...\n"
+msgstr "Kon nie drierigting-saamsmelting uitvoer nie...\n"
+
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "Lap op '%s' toegepas met konflikte.\n"
+
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "Lap skoon op '%s' toegepas.\n"
+
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr "Val terug op direkte toepassing...\n"
+
+msgid "removal patch leaves file contents"
+msgstr "verwyderingslap laat lêerinhoud agter"
+
+#, c-format
+msgid "%s: wrong type"
+msgstr "%s: verkeerde tipe"
+
+#, c-format
+msgid "%s has type %o, expected %o"
+msgstr "%s het tipe %o, %o verwag"
+
+#, c-format
+msgid "invalid path '%s'"
+msgstr "ongeldige pad '%s'"
+
+#, c-format
+msgid "%s: already exists in index"
+msgstr "%s: bestaan reeds in indeks"
+
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr "%s: bestaan reeds in werkgids"
+
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr "nuwe modus (%o) van %s stem nie ooreen met ou modus (%o) nie"
+
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+msgstr "nuwe modus (%o) van %s stem nie ooreen met ou modus (%o) van %s nie"
+
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "geaffekteerde lêer '%s' is agter 'n simboliese skakel"
+
+#, c-format
+msgid "%s: patch does not apply"
+msgstr "%s: lap is nie van toepassing nie"
+
+#, c-format
+msgid "Checking patch %s..."
+msgstr "Kontroleer lap %s..."
+
+#, c-format
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "sha1-inligting ontbreek of is nutteloos vir submodule %s"
+
+#, c-format
+msgid "mode change for %s, which is not in current HEAD"
+msgstr "modusverandering vir %s, wat nie in huidige HEAD is nie"
+
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "sha1-inligting ontbreek of is nutteloos (%s)."
+
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr "kon nie %s by tydelike indeks voeg nie"
+
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr "kon nie tydelike indeks na %s skryf nie"
+
+#, c-format
+msgid "unable to remove %s from index"
+msgstr "kan nie %s uit indeks verwyder nie"
+
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr "korrupte lap vir submodule %s"
+
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "kan nie stat op nuutgeskepte lêer '%s' uitvoer nie"
+
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr "kan nie rugsteunberging vir nuutgeskepte lêer %s skep nie"
+
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr "kan nie kasinskrywing vir %s byvoeg nie"
+
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "kon nie na '%s' skryf nie"
+
+#, c-format
+msgid "closing file '%s'"
+msgstr "maak lêer '%s' toe"
+
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "kan nie lêer '%s' met modus %o skryf nie"
+
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "Lap %s skoon toegepas."
+
+msgid "internal error"
+msgstr "interne fout"
+
+#, c-format
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] "Pas lap %%s toe met %d verwerping..."
+msgstr[1] "Pas lap %%s toe met %d verwerpings..."
+
+#, c-format
+msgid "cannot open %s"
+msgstr "kan nie %s oopmaak nie"
+
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "kan nie '%s' ontkoppel nie"
+
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "Brok #%d skoon toegepas."
+
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr "Brok #%d verwerp."
+
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "Lap '%s' oorgeslaan."
+
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "Geen geldige lappe in invoer nie (laat toe met \"--allow-empty\")"
+
+msgid "unable to read index file"
+msgstr "kan nie indekslêer lees nie"
+
+#, c-format
+msgid "option -p expects a non-negative integer, got '%s'"
+msgstr "opsie -p verwag 'n nie-negatiewe heelgetal, het '%s' gekry"
+
+#, c-format
+msgid "unable to normalize directory: '%s'"
+msgstr "kan nie gids normaliseer nie: '%s'"
+
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr "kan nie lap '%s' oopmaak nie: %s"
+
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "%d witspasiefout onderdruk"
+msgstr[1] "%d witspasiefoute onderdruk"
+
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d reël voeg witspasiefoute by."
+msgstr[1] "%d reëls voeg witspasiefoute by."
+
+#, c-format
+msgid "%d line applied after fixing whitespace errors."
+msgid_plural "%d lines applied after fixing whitespace errors."
+msgstr[0] "%d reël toegepas nadat witspasiefoute reggestel is."
+msgstr[1] "%d reëls toegepas nadat witspasiefoute reggestel is."
+
+msgid "Unable to write new index file"
+msgstr "Kan nie nuwe indekslêer skryf nie"
+
+msgid "don't apply changes matching the given path"
+msgstr "moenie veranderinge toepas wat by die gegewe pad pas nie"
+
+msgid "apply changes matching the given path"
+msgstr "pas veranderinge toe wat by die gegewe pad pas"
+
+msgid "num"
+msgstr "getal"
+
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "verwyder <getal> voorste skuinsstrepe van tradisionele diff-paaie"
+
+msgid "ignore additions made by the patch"
+msgstr "ignoreer toevoegings wat deur die lap gemaak is"
+
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr ""
+"in plaas daarvan om die lap toe te pas, voer diffstat vir die invoer af"
+
+msgid "show number of added and deleted lines in decimal notation"
+msgstr "wys aantal bygevoegde en geskrapte reëls in desimale notasie"
+
+msgid "instead of applying the patch, output a summary for the input"
+msgstr ""
+"in plaas daarvan om die lap toe te pas, voer 'n opsomming vir die invoer af"
+
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr ""
+"in plaas daarvan om die lap toe te pas, kyk of die lap van toepassing is"
+
+msgid "make sure the patch is applicable to the current index"
+msgstr "maak seker dat die lap op die huidige indeks van toepassing is"
+
+msgid "mark new files with `git add --intent-to-add`"
+msgstr "merk nuwe lêers met `git add --intent-to-add`"
+
+msgid "apply a patch without touching the working tree"
+msgstr "pas 'n lap toe sonder om die werkboom aan te raak"
+
+msgid "accept a patch that touches outside the working area"
+msgstr "aanvaar 'n lap wat buite die werkarea raak"
+
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "pas ook die lap toe (gebruik met --stat/--summary/--check)"
+
+msgid "attempt three-way merge, fall back on normal patch if that fails"
+msgstr ""
+"probeer drierigting-saamsmelting, val terug op normale lap as dit misluk"
+
+msgid "for conflicts, use our version"
+msgstr "gebruik ons weergawe vir konflikte"
+
+msgid "for conflicts, use their version"
+msgstr "gebruik hulle weergawe vir konflikte"
+
+msgid "for conflicts, use a union version"
+msgstr "gebruik 'n verenigde weergawe vir konflikte"
+
+msgid "build a temporary index based on embedded index information"
+msgstr "bou 'n tydelike indeks gebaseer op ingebedde indeksinligting"
+
+msgid "paths are separated with NUL character"
+msgstr "paaie word met NUL-karakter geskei"
+
+msgid "ensure at least <n> lines of context match"
+msgstr "verseker dat ten minste <n> konteksreëls ooreenstem"
+
+msgid "action"
+msgstr "aksie"
+
+msgid "detect new or modified lines that have whitespace errors"
+msgstr "bespeur nuwe of gewysigde reëls wat witspasiefoute het"
+
+msgid "ignore changes in whitespace when finding context"
+msgstr "ignoreer veranderinge in witspasie wanneer konteks gesoek word"
+
+msgid "apply the patch in reverse"
+msgstr "pas die lap omgekeerd toe"
+
+msgid "don't expect at least one line of context"
+msgstr "moenie ten minste een konteksreël verwag nie"
+
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "laat die verwerpte brokke in ooreenstemmende *.rej-lêers"
+
+msgid "allow overlapping hunks"
+msgstr "laat oorvleuelende brokke toe"
+
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr ""
+"verdra verkeerdelik bespeurde ontbrekende nuwe reël aan die einde van lêer"
+
+msgid "do not trust the line counts in the hunk headers"
+msgstr "moenie die reëltellings in die brokkopstukke vertrou nie"
+
+msgid "root"
+msgstr "wortel"
+
+msgid "prepend <root> to all filenames"
+msgstr "voeg <wortel> voor alle lêername"
+
+msgid "don't return error for empty patches"
+msgstr "moenie fout teruggee vir leë lappe nie"
+
+msgid "--ours, --theirs, and --union require --3way"
+msgstr "--ours, --theirs en --union vereis --3way"
+
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "kan nie blob %s stroom nie"
+
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "nie-ondersteunde lêermodus: 0%o (SHA1: %s)"
+
+#, c-format
+msgid "deflate error (%d)"
+msgstr "deflate-fout (%d)"
+
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "kan nie '%s'-filter begin nie"
+
+msgid "unable to redirect descriptor"
+msgstr "kan nie beskrywer herlei nie"
+
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "'%s'-filter het fout gerapporteer"
+
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "pad is nie geldige UTF-8 nie: %s"
+
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr "pad te lank (%d karakters, SHA1: %s): %s"
+
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "tydstempel te groot vir hierdie stelsel: %<PRIuMAX>"
+
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<opsies>] <boomagtige> [<pad>...]"
+
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote <bewaarplek> [--exec <opdrag>] [<opsies>] <boomagtige> "
+"[<pad>...]"
+
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <bewaarplek> [--exec <opdrag>] --list"
+
+#, c-format
+msgid "cannot read '%s'"
+msgstr "kan nie '%s' lees nie"
+
+#, c-format
+msgid "pathspec '%s' matches files outside the current directory"
+msgstr "padspesifikasie '%s' pas by lêers buite die huidige gids"
+
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "padspesifikasie '%s' het nie by enige lêers gepas nie"
+
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "geen sodanige verwysing nie: %.*s"
+
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "nie 'n geldige objeknaam nie: %s"
+
+#, c-format
+msgid "not a tree object: %s"
+msgstr "nie 'n boomobjek nie: %s"
+
+#, c-format
+msgid "failed to unpack tree object %s"
+msgstr "kon nie boomobjek %s uitpak nie"
+
+#, c-format
+msgid "File not found: %s"
+msgstr "Lêer nie gevind nie: %s"
+
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "Nie 'n gewone lêer nie: %s"
+
+#, c-format
+msgid "unclosed quote: '%s'"
+msgstr "ongeslote aanhalingsteken: '%s'"
+
+#, c-format
+msgid "missing colon: '%s'"
+msgstr "ontbrekende dubbelpunt: '%s'"
+
+#, c-format
+msgid "empty file name: '%s'"
+msgstr "leë lêernaam: '%s'"
+
+msgid "fmt"
+msgstr "formaat"
+
+msgid "archive format"
+msgstr "argiefformaat"
+
+msgid "prefix"
+msgstr "voorvoegsel"
+
+msgid "prepend prefix to each pathname in the archive"
+msgstr "voeg voorvoegsel voor elke padnaam in die argief"
+
+msgid "file"
+msgstr "lêer"
+
+msgid "add untracked file to archive"
+msgstr "voeg onnaspoorbare lêer by argief"
+
+msgid "path:content"
+msgstr "pad:inhoud"
+
+msgid "write the archive to this file"
+msgstr "skryf die argief na hierdie lêer"
+
+msgid "read .gitattributes in working directory"
+msgstr "lees .gitattributes in werkgids"
+
+msgid "report archived files on stderr"
+msgstr "rapporteer geargiveerde lêers op stderr"
+
+msgid "time"
+msgstr "tyd"
+
+msgid "set modification time of archive entries"
+msgstr "stel wysigingstyd van argiefinskrywings"
+
+msgid "set compression level"
+msgstr "stel kompressievlak"
+
+msgid "list supported archive formats"
+msgstr "lys ondersteunde argiefformate"
+
+msgid "repo"
+msgstr "bewaarplek"
+
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "haal die argief van afgeleë bewaarplek <bewaarplek>"
+
+msgid "command"
+msgstr "opdrag"
+
+msgid "path to the remote git-upload-archive command"
+msgstr "pad na die afgeleë opdrag git-upload-archive"
+
+msgid "Unexpected option --remote"
+msgstr "Onverwagte opsie --remote"
+
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "die opsie '%s' vereis '%s'"
+
+msgid "Unexpected option --output"
+msgstr "Onverwagte opsie --output"
+
+#, c-format
+msgid "extra command line parameter '%s'"
+msgstr "ekstra opdragreëlparameter '%s'"
+
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Onbekende argiefformaat '%s'"
+
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argument nie ondersteun vir formaat '%s' nie: -%d"
+
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%.*s is nie 'n geldige attribuutnaam nie"
+
+msgid "unable to add additional attribute"
+msgstr "kan nie bykomende attribuut byvoeg nie"
+
+#, c-format
+msgid "ignoring overly long attributes line %d"
+msgstr "ignoreer oormatig lang attribuutreël %d"
+
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "%s nie toegelaat nie: %s:%d"
+
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+"Negatiewe patrone word in Git-attribute geïgnoreer\n"
+"Gebruik '\\!' vir 'n letterlike voorste uitroepteken."
+
+#, c-format
+msgid "cannot fstat gitattributes file '%s'"
+msgstr "kan nie fstat op gitattributes-lêer '%s' uitvoer nie"
+
+#, c-format
+msgid "ignoring overly large gitattributes file '%s'"
+msgstr "ignoreer oormatig groot gitattributes-lêer '%s'"
+
+#, c-format
+msgid "ignoring overly large gitattributes blob '%s'"
+msgstr "ignoreer oormatig groot gitattributes-blob '%s'"
+
+msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo"
+msgstr "kan nie --attr-source of GIT_ATTR_SOURCE sonder bewaarplek gebruik nie"
+
+msgid "bad --attr-source or GIT_ATTR_SOURCE"
+msgstr "slegte --attr-source of GIT_ATTR_SOURCE"
+
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "kan nie stat op '%s' uitvoer nie"
+
+#, c-format
+msgid "unable to read %s"
+msgstr "kan nie %s lees nie"
+
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "Sleg aangehaalde inhoud in lêer '%s': %s"
+
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "Ons kan nie verder halveer nie!\n"
+
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "Nie 'n geldige vasleggingnaam nie: %s"
+
+#, c-format
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+"Die saamsmeltbasis %s is sleg.\n"
+"Dit beteken die fout is tussen %s en [%s] reggestel.\n"
+
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"Die saamsmeltbasis %s is nuut.\n"
+"Die eienskap het tussen %s en [%s] verander.\n"
+
+#, c-format
+msgid ""
+"The merge base %s is '%s'.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"Die saamsmeltbasis %s is '%s'.\n"
+"Dit beteken die eerste '%s'-vaslegging is tussen %s en [%s].\n"
+
+#, 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 ""
+"Sommige '%s'-hersienings is nie voorsate van die '%s'-hersiening nie.\n"
+"git bisect kan nie in hierdie geval behoorlik werk nie.\n"
+"Het jy dalk '%s'- en '%s'-hersienings verwar?\n"
+
+#, 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 saamsmeltbasis tussen %s en [%s] moet oorgeslaan word.\n"
+"Ons kan dus nie seker wees dat die eerste '%s'-vaslegging tussen %s en %s is "
+"nie.\n"
+"Ons gaan in elk geval voort."
+
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "Halveer: 'n saamsmeltbasis moet getoets word\n"
+
+#, c-format
+msgid "a '%s' revision is needed"
+msgstr "'n '%s'-hersiening is nodig"
+
+#, c-format
+msgid "could not create file '%s'"
+msgstr "kon nie lêer '%s' skep nie"
+
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr "kan nie 'show' vir objek '%s' begin nie"
+
+#, c-format
+msgid "could not read file '%s'"
+msgstr "kon nie lêer '%s' lees nie"
+
+#, c-format
+msgid "could not read bad term from file '%s'"
+msgstr "kon nie slegte term uit lêer '%s' lees nie"
+
+#, c-format
+msgid "could not read good term from file '%s'"
+msgstr "kon nie goeie term uit lêer '%s' lees nie"
+
+msgid "reading bisect refs failed"
+msgstr "kon nie halveringsverwysings lees nie"
+
+#, c-format
+msgid "%s was both '%s' and '%s'\n"
+msgstr "%s was beide '%s' en '%s'\n"
+
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path arguments?\n"
+msgstr ""
+"Geen toetsbare vaslegging gevind nie.\n"
+"Het jy dalk met slegte padargumente begin?\n"
+
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(ongeveer %d stap)"
+msgstr[1] "(ongeveer %d stappe)"
+
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
+#, 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] "Halvering: %d hersiening oor om te toets ná hierdie een %s\n"
+msgstr[1] "Halvering: %d hersienings oor om te toets ná hierdie een %s\n"
+
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents en --reverse werk nie goed saam nie."
+
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"--reverse en --first-parent saam vereis 'n gespesifiseerde jongste vaslegging"
+
+msgid "revision walk setup failed"
+msgstr "hersieningswandeling-opstelling het misluk"
+
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+"--reverse --first-parent saam vereis 'n reeks langs die eerste-ouer-ketting"
+
+#, c-format
+msgid "no such path %s in %s"
+msgstr "geen pad %s in %s nie"
+
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "kan nie blob %s vir pad %s lees nie"
+
+msgid ""
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
+msgstr ""
+"kan nie stroomop-volgkonfigurasie van veelvuldige verwysings erf wanneer "
+"herbasering versoek word nie"
+
+#, c-format
+msgid "not setting branch '%s' as its own upstream"
+msgstr "tak '%s' word nie as sy eie stroomop gestel nie"
+
+#, c-format
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "tak '%s' is opgestel om '%s' deur herbasering te volg."
+
+#, c-format
+msgid "branch '%s' set up to track '%s'."
+msgstr "tak '%s' is opgestel om '%s' te volg."
+
+#, c-format
+msgid "branch '%s' set up to track:"
+msgstr "tak '%s' is opgestel om te volg:"
+
+msgid "unable to write upstream branch configuration"
+msgstr "kan nie stroomop-takkonfigurasie skryf nie"
+
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
+msgstr ""
+"\n"
+"Nadat jy die oorsaak van die fout reggestel het, kan jy probeer\n"
+"om die afgeleë volginligting reg te stel deur die volgende uit te voer:"
+
+#, c-format
+msgid "asked to inherit tracking from '%s', but no remote is set"
+msgstr "gevra om volging van '%s' te erf, maar geen afgeleë is gestel nie"
+
+#, c-format
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
+msgstr ""
+"gevra om volging van '%s' te erf, maar geen saamsmeltkonfigurasie is gestel "
+"nie"
+
+#, c-format
+msgid "not tracking: ambiguous information for ref '%s'"
+msgstr "volg nie: dubbelsinnige inligting vir verwysing '%s'"
+
+#. #-#-#-#-#  branch.c.po  #-#-#-#-#
+#. TRANSLATORS: This is a line listing a remote with duplicate
+#. refspecs in the advice message below. For RTL languages you'll
+#. probably want to swap the "%s" and leading "  " space around.
+#.
+#. #-#-#-#-#  object-name.c.po  #-#-#-#-#
+#. TRANSLATORS: This is line item of ambiguous object output
+#. from describe_ambiguous_object() above. For RTL languages
+#. you'll probably want to swap the "%s" and leading " " space
+#. around.
+#.
+#, c-format
+msgid "  %s\n"
+msgstr "  %s\n"
+
+#. TRANSLATORS: The second argument is a \n-delimited list of
+#. duplicate refspecs, composed above.
+#.
+#, c-format
+msgid ""
+"There are multiple remotes whose fetch refspecs map to the remote\n"
+"tracking ref '%s':\n"
+"%s\n"
+"This is typically a configuration error.\n"
+"\n"
+"To support setting up tracking branches, ensure that\n"
+"different remotes' fetch refspecs map into different\n"
+"tracking namespaces."
+msgstr ""
+"Daar is veelvuldige afgeleës waarvan die haal-verwysingspesifikasies na die\n"
+"afgeleë volgverwysing '%s' karteer:\n"
+"%s\n"
+"Dit is gewoonlik 'n konfigurasiefout.\n"
+"\n"
+"Om die opstel van volgtakke te ondersteun, maak seker dat\n"
+"verskillende afgeleës se haal-verwysingspesifikasies na verskillende\n"
+"volg-naamruimtes karteer."
+
+#, c-format
+msgid "'%s' is not a valid branch name"
+msgstr "'%s' is nie 'n geldige taknaam nie"
+
+msgid "See 'git help check-ref-format'"
+msgstr "Sien 'git help check-ref-format'"
+
+#, c-format
+msgid "a branch named '%s' already exists"
+msgstr "'n tak genaamd '%s' bestaan reeds"
+
+#, c-format
+msgid "cannot force update the branch '%s' used by worktree at '%s'"
+msgstr ""
+"kan nie tak '%s' wat deur die werkboom by '%s' gebruik word, geforseerd "
+"bywerk nie"
+
+#, c-format
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr "kan nie volginligting opstel nie; beginpunt '%s' is nie 'n tak nie"
+
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "die versoekte stroomop-tak '%s' bestaan nie"
+
+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"
+"As jy beplan om jou werk op 'n stroomop-tak te baseer wat\n"
+"reeds by die afgeleë bestaan, moet jy dalk \"git fetch\"\n"
+"uitvoer om dit te haal.\n"
+"\n"
+"As jy beplan om 'n nuwe plaaslike tak uit te stoot wat sy\n"
+"afgeleë eweknie sal volg, wil jy dalk \"git push -u\" gebruik\n"
+"om die stroomop-konfigurasie te stel terwyl jy stoot."
+
+#, c-format
+msgid "not a valid object name: '%s'"
+msgstr "nie 'n geldige objeknaam nie: '%s'"
+
+#, c-format
+msgid "ambiguous object name: '%s'"
+msgstr "dubbelsinnige objeknaam: '%s'"
+
+#, c-format
+msgid "not a valid branch point: '%s'"
+msgstr "nie 'n geldige vertakkingspunt nie: '%s'"
+
+#, c-format
+msgid "submodule '%s': unable to find submodule"
+msgstr "submodule '%s': kan nie submodule vind nie"
+
+#, c-format
+msgid ""
+"You may try updating the submodules using 'git checkout --no-recurse-"
+"submodules %s && git submodule update --init'"
+msgstr ""
+"Jy kan probeer om die submodules by te werk met 'git checkout --no-recurse-"
+"submodules %s && git submodule update --init'"
+
+#, c-format
+msgid "submodule '%s': cannot create branch '%s'"
+msgstr "submodule '%s': kan nie tak '%s' skep nie"
+
+#, c-format
+msgid "'%s' is already used by worktree at '%s'"
+msgstr "'%s' word reeds deur die werkboom by '%s' gebruik"
+
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<opsies>] [--] <padspesifikasie>..."
+
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "kan nie chmod %cx '%s' uitvoer nie"
+
+msgid "Unstaged changes after refreshing the index:"
+msgstr "Ongeplaasde veranderinge ná die verfrissing van die indeks:"
+
+msgid "could not read the index"
+msgstr "kon nie die indeks lees nie"
+
+msgid "editing patch failed"
+msgstr "kon nie lap wysig nie"
+
+#, c-format
+msgid "could not stat '%s'"
+msgstr "kon nie stat op '%s' uitvoer nie"
+
+msgid "empty patch. aborted"
+msgstr "leë lap. gestaak"
+
+msgid "could not initialize apply state"
+msgstr "kon nie toepassingstoestand inisialiseer nie"
+
+msgid "could not check apply state"
+msgstr "kon nie toepassingstoestand nagaan nie"
+
+#, c-format
+msgid "could not apply '%s'"
+msgstr "kon nie '%s' toepas nie"
+
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr ""
+"Die volgende paaie word deur een van jou .gitignore-lêers geïgnoreer:\n"
+
+msgid "dry run"
+msgstr "proeflopie"
+
+msgid "be verbose"
+msgstr "wees breedsprakig"
+
+msgid "interactive picking"
+msgstr "interaktiewe uitsoek"
+
+msgid "select hunks interactively"
+msgstr "kies brokke interaktief"
+
+msgid "auto advance to the next file when selecting hunks interactively"
+msgstr ""
+"skuif outomaties aan na die volgende lêer wanneer brokke interaktief gekies "
+"word"
+
+msgid "edit current diff and apply"
+msgstr "wysig huidige verskil en pas toe"
+
+msgid "allow adding otherwise ignored files"
+msgstr "laat toe dat andersins geïgnoreerde lêers bygevoeg word"
+
+msgid "update tracked files"
+msgstr "werk nagespoorde lêers by"
+
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr "hernormaliseer reëleindes van nagespoorde lêers (impliseer -u)"
+
+msgid "add conflict-resolved tracked files"
+msgstr "voeg nagespoorde lêers met opgeloste konflikte by"
+
+msgid "record only the fact that the path will be added later"
+msgstr "teken slegs aan dat die pad later bygevoeg sal word"
+
+msgid "add changes from all tracked and untracked files"
+msgstr "voeg veranderinge van alle nagespoorde en onnaspoorbare lêers by"
+
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr "ignoreer paaie wat in die werkboom verwyder is (dieselfde as --no-all)"
+
+msgid "don't add, only refresh the index"
+msgstr "moenie byvoeg nie, verfris slegs die indeks"
+
+msgid "just skip files which cannot be added because of errors"
+msgstr "slaan net lêers oor wat weens foute nie bygevoeg kan word nie"
+
+msgid "check if - even missing - files are ignored in dry run"
+msgstr ""
+"kontroleer in 'n droë lopie of lêers - selfs ontbrekende - geïgnoreer word"
+
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "laat bywerking van inskrywings buite die yl-uitcheck-keël toe"
+
+msgid "override the executable bit of the listed files"
+msgstr "oorskryf die uitvoerbare bis van die gelyste lêers"
+
+msgid "warn when adding an embedded repository"
+msgstr "waarsku wanneer 'n ingebedde bewaarplek bygevoeg word"
+
+#, 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 ""
+"Jy het 'n ander Git-bewaarplek binne jou huidige bewaarplek bygevoeg.\n"
+"Klone van die buitenste bewaarplek sal nie die inhoud van die\n"
+"ingebedde bewaarplek bevat nie en sal nie weet hoe om dit te verkry nie.\n"
+"As jy bedoel het om 'n submodule by te voeg, gebruik:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"As jy hierdie pad per ongeluk bygevoeg het, kan jy dit uit die\n"
+"indeks verwyder met:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"Sien \"git help submodule\" vir meer inligting."
+
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr "voeg ingebedde Git-bewaarplek by: %s"
+
+msgid "Use -f if you really want to add them."
+msgstr "Gebruik -f as jy hulle regtig wil byvoeg."
+
+msgid "adding files failed"
+msgstr "kon nie lêers byvoeg nie"
+
+#, c-format
+msgid "updating file '%s' failed"
+msgstr "bywerk van lêer '%s' het misluk"
+
+#, c-format
+msgid ""
+"the following paths still have conflict markers:\n"
+"%s"
+msgstr ""
+"die volgende paaie het steeds konflikmerkers:\n"
+"%s"
+
+#, c-format
+msgid "cannot lstat: '%s'"
+msgstr "kan nie lstat doen nie: '%s'"
+
+#, c-format
+msgid "'%s' cannot be negative"
+msgstr "'%s' kan nie negatief wees nie"
+
+#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "parameter --chmod '%s' moet óf -x óf +x wees"
+
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "'%s' en padspesifikasie-argumente kan nie saam gebruik word nie"
+
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr "Niks gespesifiseer nie, niks bygevoeg nie.\n"
+
+msgid "Maybe you wanted to say 'git add .'?"
+msgstr "Wou jy dalk 'git add .' sê?"
+
+msgid "index file corrupt"
+msgstr "indekslêer is korrup"
+
+msgid "unable to write new index file"
+msgstr "kan nie nuwe indekslêer skryf nie"
+
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "slegte aksie '%s' vir '%s'"
+
+#, c-format
+msgid "invalid value for '%s': '%s'"
+msgstr "ongeldige waarde vir '%s': '%s'"
+
+#, c-format
+msgid "could not read '%s'"
+msgstr "kon nie '%s' lees nie"
+
+msgid "could not parse author script"
+msgstr "kon nie outeurskrip ontleed nie"
+
+#, c-format
+msgid "could not parse %s"
+msgstr "kon nie %s ontleed nie"
+
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "'%s' is deur die applypatch-msg-haak geskrap"
+
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr "Misvormde invoerreël: '%s'."
+
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "Kon nie notas van '%s' na '%s' kopieer nie"
+
+msgid "fseek failed"
+msgstr "fseek het misluk"
+
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "kon nie '%s' oopmaak om te lees nie"
+
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "kon nie '%s' oopmaak om te skryf nie"
+
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr "kon nie lap '%s' ontleed nie"
+
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "Slegs een StGIT-lapreeks kan op 'n slag toegepas word"
+
+msgid "invalid timestamp"
+msgstr "ongeldige tydstempel"
+
+msgid "invalid Date line"
+msgstr "ongeldige Date-reël"
+
+msgid "invalid timezone offset"
+msgstr "ongeldige tydsone-afwyking"
+
+msgid "Patch format detection failed."
+msgstr "Kon nie lapformaat bespeur nie."
+
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr "kon nie gids '%s' skep nie"
+
+msgid "Failed to split patches."
+msgstr "Kon nie lappe verdeel nie."
+
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\".\n"
+msgstr "Wanneer jy hierdie probleem opgelos het, voer \"%s --continue\" uit.\n"
+
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead.\n"
+msgstr ""
+"As jy verkies om hierdie lap oor te slaan, voer eerder \"%s --skip\" uit.\n"
+
+#, c-format
+msgid ""
+"To record the empty patch as an empty commit, run \"%s --allow-empty\".\n"
+msgstr ""
+"Om die leë lap as 'n leë vaslegging aan te teken, voer \"%s --allow-empty\" "
+"uit.\n"
+
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr ""
+"Om die oorspronklike tak te herstel en op te hou lap, voer \"%s --abort\" "
+"uit."
+
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+msgstr ""
+"Lap is met format=flowed gestuur; spasies aan die einde van reëls kan "
+"verlore gaan."
+
+#, c-format
+msgid "missing author line in commit %s"
+msgstr "outeurreël ontbreek in vaslegging %s"
+
+#, c-format
+msgid "invalid ident line: %.*s"
+msgstr "ongeldige identiteitsreël: %.*s"
+
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "kan nie vaslegging %s ontleed nie"
+
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr ""
+"Bewaarplek het nie die nodige blobs om op 'n 3-rigting-saamsmelting terug te "
+"val nie."
+
+msgid "Using index info to reconstruct a base tree..."
+msgstr "Gebruik indeksinligting om 'n basisboom te herbou..."
+
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"Het jy jou lap met die hand gewysig?\n"
+"Dit pas nie op die blobs wat in sy indeks aangeteken is nie."
+
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "Val terug op die lap van die basis en 3-rigting-saamsmelting..."
+
+msgid "Failed to merge in the changes."
+msgstr "Kon nie die veranderinge saamsmelt nie."
+
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree kon nie 'n boom skryf nie"
+
+msgid "applying to an empty history"
+msgstr "pas toe op 'n leë geskiedenis"
+
+msgid "failed to write commit object"
+msgstr "kon nie vasleggingsobjek skryf nie"
+
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr "kan nie hervat nie: %s bestaan nie."
+
+msgid "Commit Body is:"
+msgstr "Vasleggingsinhoud is:"
+
+#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
+#. in your translation. The program will only accept English
+#. input at this point.
+#.
+#, c-format
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr "Pas toe? ja [y]/nee [n]/wysig [e]/bekyk lap [v]/aanvaar alles [a]: "
+
+msgid "unable to write index file"
+msgstr "kan nie indekslêer skryf nie"
+
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "Vuil indeks: kan nie lappe toepas nie (vuil: %s)"
+
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Slaan oor: %.*s"
+
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "Skep 'n leë vaslegging: %.*s"
+
+msgid "Patch is empty."
+msgstr "Lap is leeg."
+
+#, c-format
+msgid "Applying: %.*s"
+msgstr "Pas toe: %.*s"
+
+msgid "No changes -- Patch already applied."
+msgstr "Geen veranderinge nie -- lap is reeds toegepas."
+
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr "Lap het misluk by %s %.*s"
+
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
+msgstr "Gebruik 'git am --show-current-patch=diff' om die mislukte lap te sien"
+
+msgid "No changes - recorded it as an empty commit."
+msgstr "Geen veranderinge nie - as 'n leë vaslegging aangeteken."
+
+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 ""
+"Geen veranderinge nie - het jy vergeet om 'git add' te gebruik?\n"
+"As daar niks oor is om te plaas nie, is die kans goed dat iets anders\n"
+"reeds dieselfde veranderinge ingevoer het; jy wil dalk hierdie lap oorslaan."
+
+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 ""
+"Jy het steeds paaie in jou indeks wat nie saamgesmelt is nie.\n"
+"Jy moet 'git add' op elke lêer met opgeloste konflikte uitvoer om hulle as "
+"sodanig te merk.\n"
+"Jy kan `git rm` op 'n lêer uitvoer om \"deur hulle geskrap\" daarvoor te "
+"aanvaar."
+
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr "Kon nie objek '%s' ontleed nie."
+
+msgid "failed to clean index"
+msgstr "kon nie indeks skoonmaak nie"
+
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+"Dit lyk of jy HEAD sedert die laaste 'am'-mislukking geskuif het.\n"
+"Spoel nie terug na ORIG_HEAD nie"
+
+#, c-format
+msgid "failed to read '%s'"
+msgstr "kon nie '%s' lees nie"
+
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<opsies>] [(<mbox> | <Maildir>)...]"
+
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<opsies>] (--continue | --skip | --abort)"
+
+msgid "run interactively"
+msgstr "voer interaktief uit"
+
+msgid "bypass pre-applypatch and applypatch-msg hooks"
+msgstr "omseil die pre-applypatch- en applypatch-msg-hake"
+
+msgid "historical option -- no-op"
+msgstr "historiese opsie -- doen niks"
+
+msgid "allow fall back on 3way merging if needed"
+msgstr "laat terugval op 3-rigting-saamsmelting toe indien nodig"
+
+msgid "be quiet"
+msgstr "wees stil"
+
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr "voeg 'n Signed-off-by-sleepreël by die vasleggingsboodskap"
+
+msgid "recode into utf8 (default)"
+msgstr "herkodeer na utf8 (verstek)"
+
+msgid "pass -k flag to git-mailinfo"
+msgstr "gee die -k-vlag aan git-mailinfo deur"
+
+msgid "pass -b flag to git-mailinfo"
+msgstr "gee die -b-vlag aan git-mailinfo deur"
+
+msgid "pass -m flag to git-mailinfo"
+msgstr "gee die -m-vlag aan git-mailinfo deur"
+
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr "gee die vlag --keep-cr aan git-mailsplit deur vir mbox-formaat"
+
+msgid "strip everything before a scissors line"
+msgstr "stroop alles voor 'n skêrreël af"
+
+msgid "pass it through git-mailinfo"
+msgstr "gee dit deur aan git-mailinfo"
+
+msgid "pass it through git-apply"
+msgstr "gee dit deur aan git-apply"
+
+msgid "n"
+msgstr "n"
+
+msgid "format"
+msgstr "formaat"
+
+msgid "format the patch(es) are in"
+msgstr "formaat waarin die lap(pe) is"
+
+msgid "override error message when patch failure occurs"
+msgstr "oorskryf die foutboodskap wanneer 'n lap misluk"
+
+msgid "continue applying patches after resolving a conflict"
+msgstr "gaan voort om lappe toe te pas nadat 'n konflik opgelos is"
+
+msgid "synonyms for --continue"
+msgstr "sinonieme vir --continue"
+
+msgid "skip the current patch"
+msgstr "slaan die huidige lap oor"
+
+msgid "restore the original branch and abort the patching operation"
+msgstr "herstel die oorspronklike tak en staak die lapbewerking"
+
+msgid "abort the patching operation but keep HEAD where it is"
+msgstr "staak die lapbewerking, maar hou HEAD waar dit is"
+
+msgid "show the patch being applied"
+msgstr "wys die lap wat toegepas word"
+
+msgid "try to apply current patch again"
+msgstr "probeer die huidige lap weer toepas"
+
+msgid "record the empty patch as an empty commit"
+msgstr "teken die leë lap as 'n leë vaslegging aan"
+
+msgid "lie about committer date"
+msgstr "lieg oor die vasleggerdatum"
+
+msgid "use current timestamp for author date"
+msgstr "gebruik huidige tydstempel vir outeurdatum"
+
+msgid "key-id"
+msgstr "sleutel-id"
+
+msgid "GPG-sign commits"
+msgstr "onderteken vasleggings met GPG"
+
+msgid "how to handle empty patches"
+msgstr "hoe om leë lappe te hanteer"
+
+msgid "(internal use for git-rebase)"
+msgstr "(interne gebruik vir git-rebase)"
+
+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/opsie --binary doen al lank niks nie, en\n"
+"dit sal verwyder word. Moet dit asseblief nie meer gebruik nie."
+
+msgid "failed to read the index"
+msgstr "kon nie die indeks lees nie"
+
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr "vorige herbaseringsgids %s bestaan steeds, maar mbox is gegee."
+
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"Verdwaalde %s-gids gevind.\n"
+"Gebruik \"git am --abort\" om dit te verwyder."
+
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "Geen oplossingsbewerking is aan die gang nie, ons hervat nie."
+
+msgid "interactive mode requires patches on the command line"
+msgstr "interaktiewe modus vereis lappe op die opdragreël"
+
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<opsies>] [<lap>...]"
+
+msgid "could not redirect output"
+msgstr "kon nie afvoer herlei nie"
+
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive: het ACK/NAK verwag, maar 'n spoelpakkie ontvang"
+
+#, c-format
+msgid "git archive: NACK %s"
+msgstr "git archive: NACK %s"
+
+msgid "git archive: protocol error"
+msgstr "git archive: protokolfout"
+
+msgid "git archive: expected a flush"
+msgstr "git archive: het 'n spoeling verwag"
+
+msgid ""
+"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] "
+"[<revision-range>]"
+msgstr ""
+"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] "
+"[<hersieningsreeks>]"
+
+#, c-format
+msgid "'%s' cannot be used with 'git backfill'"
+msgstr "'%s' kan nie saam met 'git backfill' gebruik word nie"
+
+msgid "cannot backfill with these filter options"
+msgstr "kan nie met hierdie filteropsies terugvul nie"
+
+msgid "cannot backfill with blob size limits"
+msgstr "kan nie met blob-groottelimiete terugvul nie"
+
+msgid "problem loading sparse-checkout"
+msgstr "probleem met die laai van yl-uitcheck"
+
+msgid "Minimum number of objects to request at a time"
+msgstr "Minimum aantal objekte om op 'n slag aan te vra"
+
+msgid "Restrict the missing objects to the current sparse-checkout"
+msgstr "Beperk die ontbrekende objekte tot die huidige yl-uitcheck"
+
+msgid "Include blobs from boundary commits in the backfill"
+msgstr "Sluit blobs van grensvasleggings by die terugvulling in"
+
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "onherkende argument: %s"
+
+msgid ""
+"git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n"
+"                 [--no-checkout] [--first-parent] [--reset-when-"
+"found[=<where>]] [<bad> [<good>...]] [--] [<pathspec>...]"
+msgstr ""
+"git bisect start [--term-(bad|new)=<term-nuut> --term-(good|old)=<term-"
+"oud>]\n"
+"                 [--no-checkout] [--first-parent] [--reset-when-"
+"found[=<waar>]] [<sleg> [<goed>...]] [--] [<padspesifikasie>...]"
+
+msgid "git bisect (bad|new|<term-new>) [<rev>]"
+msgstr "git bisect (bad|new|<term-nuut>) [<hersiening>]"
+
+msgid "git bisect (good|old|<term-old>) [<rev>...]"
+msgstr "git bisect (good|old|<term-oud>) [<hersiening>...]"
+
+msgid "git bisect skip [(<rev>|<range>)...]"
+msgstr "git bisect skip [(<hersiening>|<reeks>)...]"
+
+msgid "git bisect reset [<commit>]"
+msgstr "git bisect reset [<vaslegging>]"
+
+msgid "git bisect replay <logfile>"
+msgstr "git bisect replay <loglêer>"
+
+msgid "git bisect run [--reset-when-found[=<where>]] <cmd> [<arg>...]"
+msgstr "git bisect run [--reset-when-found[=<waar>]] <opdrag> [<arg>...]"
+
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "kan nie lêer '%s' in modus '%s' oopmaak nie"
+
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "kon nie na lêer '%s' skryf nie"
+
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "kan nie lêer '%s' oopmaak om te lees nie"
+
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr "'%s' is nie 'n geldige term nie"
+
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
+msgstr "kan nie die ingeboude opdrag '%s' as 'n term gebruik nie"
+
+#, c-format
+msgid "can't change the meaning of the term '%s'"
+msgstr "kan nie die betekenis van die term '%s' verander nie"
+
+msgid "please use two different terms"
+msgstr "gebruik asseblief twee verskillende terme"
+
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr "Ons is nie besig om te halveer nie.\n"
+
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr "'%s' is nie 'n geldige vaslegging nie"
+
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
+"kon nie oorspronklike HEAD '%s' uitcheck nie. Probeer 'git bisect reset "
+"<vaslegging>'."
+
+#, c-format
+msgid "invalid value for '--reset-when-found': '%s'"
+msgstr "ongeldige waarde vir '--reset-when-found': '%s'"
+
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "Slegte bisect_write-argument: %s"
+
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "kon nie die oid van hersiening '%s' kry nie"
+
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr "kon nie die lêer '%s' oopmaak nie"
+
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr "Ongeldige opdrag: jy is tans in 'n %s/%s-halvering"
+
+#, 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 ""
+"Jy moet my ten minste een %s- en %s-hersiening gee.\n"
+"Jy kan \"git bisect %s\" en \"git bisect %s\" daarvoor gebruik."
+
+#, 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 ""
+"Jy moet begin met \"git bisect start\".\n"
+"Daarna moet jy my ten minste een %s- en %s-hersiening gee.\n"
+"Jy kan \"git bisect %s\" en \"git bisect %s\" daarvoor gebruik."
+
+#, c-format
+msgid "bisecting only with a %s commit"
+msgstr "halveer slegs met 'n %s-vaslegging"
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+msgid "Are you sure [Y/n]? "
+msgstr "Is jy seker [Y/n]? "
+
+#, c-format
+msgid "status: waiting for both '%s' and '%s' commits\n"
+msgstr "status: wag vir beide '%s'- en '%s'-vasleggings\n"
+
+#, c-format
+msgid "status: waiting for '%s' commit, %d '%s' commit known\n"
+msgid_plural "status: waiting for '%s' commit, %d '%s' commits known\n"
+msgstr[0] "status: wag vir '%s'-vaslegging, %d '%s'-vaslegging bekend\n"
+msgstr[1] "status: wag vir '%s'-vaslegging, %d '%s'-vasleggings bekend\n"
+
+#, c-format
+msgid "status: waiting for '%s' commit(s), '%s' commit known\n"
+msgstr "status: wag vir '%s'-vaslegging(s), '%s'-vaslegging bekend\n"
+
+msgid "no terms defined"
+msgstr "geen terme gedefinieer nie"
+
+#, c-format
+msgid ""
+"Your current terms are '%s' for the old state\n"
+"and '%s' for the new state.\n"
+msgstr ""
+"Jou huidige terme is '%s' vir die ou toestand\n"
+"en '%s' vir die nuwe toestand.\n"
+
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"ongeldige argument %s vir 'git bisect terms'.\n"
+"Ondersteunde opsies is: --term-good|--term-old en --term-bad|--term-new."
+
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "kon nie '%s' oopmaak om by te voeg nie"
+
+#, c-format
+msgid "could not find commit for '%s'"
+msgstr "kon nie vaslegging vir '%s' vind nie"
+
+msgid "'' is not a valid term"
+msgstr "'' is nie 'n geldige term nie"
+
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr "onherkende opsie: '%s'"
+
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr "'%s' blyk nie 'n geldige hersiening te wees nie"
+
+msgid "bad HEAD - I need a HEAD"
+msgstr "slegte HEAD - ek het 'n HEAD nodig"
+
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr "kon nie '%s' uitcheck nie. Probeer 'git bisect start <geldige-tak>'."
+
+msgid "bad HEAD - strange symbolic ref"
+msgstr "slegte HEAD - vreemde simboliese verwysing"
+
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "ongeldige verwysing: '%s'"
+
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Jy moet begin met \"git bisect start\"\n"
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr "Wil jy hê ek moet dit vir jou doen [Y/n]? "
+
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "Roep asseblief `--bisect-state` met ten minste een argument aan"
+
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "'git bisect %s' kan slegs een argument neem."
+
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "Slegte hersieningsinvoer: %s"
+
+#, c-format
+msgid "Bad rev input (not a commit): %s"
+msgstr "Slegte hersieningsinvoer (nie 'n vaslegging nie): %s"
+
+msgid "We are not bisecting."
+msgstr "Ons is nie besig om te halveer nie."
+
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "'%s'?? waarvan praat jy?"
+
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "kan nie lêer '%s' lees om oor te speel nie"
+
+#, c-format
+msgid "running %s\n"
+msgstr "voer %s uit\n"
+
+msgid "bisect run failed: no command provided."
+msgstr "halveringslopie het misluk: geen opdrag verskaf nie."
+
+#, c-format
+msgid "unable to verify %s on '%s' revision"
+msgstr "kan nie %s op '%s'-hersiening verifieer nie"
+
+#, c-format
+msgid "bogus exit code %d for '%s' revision"
+msgstr "vals uittreekode %d vir '%s'-hersiening"
+
+#, c-format
+msgid "bisect run failed: exit code %d from %s is < 0 or >= 128"
+msgstr "halveringslopie het misluk: uittreekode %d van %s is < 0 of >= 128"
+
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "kan nie lêer '%s' oopmaak om te skryf nie"
+
+msgid "could not duplicate stdout"
+msgstr "kon nie stdout dupliseer nie"
+
+msgid "bisect run cannot continue any more"
+msgstr "halveringslopie kan nie meer voortgaan nie"
+
+msgid "bisect run success"
+msgstr "halveringslopie suksesvol"
+
+#, c-format
+msgid "bisect found first '%s' commit\n"
+msgstr "halvering het eerste '%s'-vaslegging gevind\n"
+
+#, c-format
+msgid "bisect run failed: 'git bisect %s' exited with error code %d"
+msgstr ""
+"halveringslopie het misluk: 'git bisect %s' het met foutkode %d afgesluit"
+
+#, c-format
+msgid "'%s' requires either no argument or a commit"
+msgstr "'%s' vereis óf geen argument nie óf 'n vaslegging"
+
+#, c-format
+msgid "'%s' requires 0 or 1 argument"
+msgstr "'%s' vereis 0 of 1 argument"
+
+#, c-format
+msgid "'%s' requires 0 arguments"
+msgstr "'%s' vereis 0 argumente"
+
+msgid "no logfile given"
+msgstr "geen loglêer gegee nie"
+
+#, c-format
+msgid "'%s' failed: no command provided."
+msgstr "'%s' het misluk: geen opdrag verskaf nie."
+
+msgid "need a command"
+msgstr "het 'n opdrag nodig"
+
+#, c-format
+msgid "unknown command: '%s'"
+msgstr "onbekende opdrag: '%s'"
+
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr "git blame [<opsies>] [<hersiening-opsies>] [<hersiening>] [--] <lêer>"
+
+msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr ""
+"git annotate [<opsies>] [<hersiening-opsies>] [<hersiening>] [--] <lêer>"
+
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr "<hersiening-opsies> word in git-rev-list(1) gedokumenteer"
+
+#, c-format
+msgid "expecting a color: %s"
+msgstr "verwag 'n kleur: %s"
+
+msgid "must end with a color"
+msgstr "moet met 'n kleur eindig"
+
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "onbekende waarde vir konfigurasie '%s': %s"
+
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"opsie diff-algorithm aanvaar \"myers\", \"minimal\", \"patience\" en "
+"\"histogram\""
+
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "kan nie hersiening %s vind om te ignoreer nie"
+
+msgid "show blame entries as we find them, incrementally"
+msgstr "wys blaam-inskrywings inkrementeel soos ons hulle vind"
+
+msgid "do not show object names of boundary commits (Default: off)"
+msgstr "moenie objekname van grensvasleggings wys nie (Verstek: af)"
+
+msgid "do not treat root commits as boundaries (Default: off)"
+msgstr "moenie wortelvasleggings as grense behandel nie (Verstek: af)"
+
+msgid "show work cost statistics"
+msgstr "wys werkkoste-statistieke"
+
+msgid "force progress reporting"
+msgstr "dwing vorderingsverslaggewing af"
+
+msgid "show output score for blame entries"
+msgstr "wys afvoertelling vir blaam-inskrywings"
+
+msgid "show original filename (Default: auto)"
+msgstr "wys oorspronklike lêernaam (Verstek: outomaties)"
+
+msgid "show original linenumber (Default: off)"
+msgstr "wys oorspronklike reëlnommer (Verstek: af)"
+
+msgid "show in a format designed for machine consumption"
+msgstr "wys in 'n formaat wat vir masjienverbruik ontwerp is"
+
+msgid "show porcelain format with per-line commit information"
+msgstr "wys porselein-formaat met vasleggingsinligting per reël"
+
+msgid "use the same output mode as git-annotate (Default: off)"
+msgstr "gebruik dieselfde afvoermodus as git-annotate (Verstek: af)"
+
+msgid "show raw timestamp (Default: off)"
+msgstr "wys rou tydstempel (Verstek: af)"
+
+msgid "show long commit SHA1 (Default: off)"
+msgstr "wys lang vaslegging-SHA1 (Verstek: af)"
+
+msgid "suppress author name and timestamp (Default: off)"
+msgstr "onderdruk outeurnaam en tydstempel (Verstek: af)"
+
+msgid "show author email instead of name (Default: off)"
+msgstr "wys outeur se e-pos in plaas van naam (Verstek: af)"
+
+msgid "ignore whitespace differences"
+msgstr "ignoreer witspasieverskille"
+
+msgid "<algorithm>"
+msgstr "<algoritme>"
+
+msgid "choose a diff algorithm"
+msgstr "kies 'n verskil-algoritme"
+
+msgid "rev"
+msgstr "hersiening"
+
+msgid "ignore <rev> when blaming"
+msgstr "ignoreer <hersiening> wanneer blaam toegeken word"
+
+msgid "ignore revisions from <file>"
+msgstr "ignoreer hersienings uit <lêer>"
+
+msgid "color redundant metadata from previous line differently"
+msgstr "kleur oortollige metadata van die vorige reël anders"
+
+msgid "color lines by age"
+msgstr "kleur reëls volgens ouderdom"
+
+msgid "spend extra cycles to find a better match"
+msgstr "spandeer ekstra siklusse om 'n beter passing te vind"
+
+msgid "use revisions from <file> instead of calling git-rev-list"
+msgstr ""
+"gebruik hersienings uit <lêer> in plaas daarvan om git-rev-list te roep"
+
+msgid "use <file>'s contents as the final image"
+msgstr "gebruik die inhoud van <lêer> as die finale beeld"
+
+msgid "score"
+msgstr "telling"
+
+msgid "find line copies within and across files"
+msgstr "vind reëlkopieë binne en oor lêers heen"
+
+msgid "find line movements within and across files"
+msgstr "vind reëlverskuiwings binne en oor lêers heen"
+
+msgid "range"
+msgstr "reeks"
+
+msgid "process only line range <start>,<end> or function :<funcname>"
+msgstr "verwerk slegs reëlreeks <begin>,<einde> of funksie :<funksienaam>"
+
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr ""
+"--progress kan nie saam met --incremental of porselein-formate gebruik word "
+"nie"
+
+#. 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.
+#.
+msgid "4 years, 11 months ago"
+msgstr "4 jaar, 11 maande gelede"
+
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] "lêer %s het slegs %lu reël"
+msgstr[1] "lêer %s het slegs %lu reëls"
+
+msgid "Blaming lines"
+msgstr "Ken blaam aan reëls toe"
+
+msgid ""
+"git branch [<options>] [-r | -a] [--merged] [--no-merged] [(--forked "
+"<branch>)...]"
+msgstr ""
+"git branch [<opsies>] [-r | -a] [--merged] [--no-merged] [(--forked "
+"<tak>)...]"
+
+msgid ""
+"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
+"point>]"
+msgstr ""
+"git branch [<opsies>] [-f] [--recurse-submodules] <taknaam> [<beginpunt>]"
+
+msgid "git branch [<options>] [-l] [<pattern>...]"
+msgstr "git branch [<opsies>] [-l] [<patroon>...]"
+
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr "git branch [<opsies>] [-r] (-d | -D) <taknaam>..."
+
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr "git branch [<opsies>] (-m | -M) [<ou-tak>] <nuwe-tak>"
+
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<opsies>] (-c | -C) [<ou-tak>] <nuwe-tak>"
+
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<opsies>] [-r | -a] [--points-at]"
+
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<opsies>] [-r | -a] [--format]"
+
+msgid ""
+"git branch [<options>] (--delete-merged <pattern>)... [<branch-pattern>...]"
+msgstr "git branch [<opsies>] (--delete-merged <patroon>)... [<takpatroon>...]"
+
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+"         '%s', but not yet merged to HEAD"
+msgstr ""
+"skrap tak '%s' wat saamgesmelt is met\n"
+"         '%s', maar nog nie met HEAD saamgesmelt is nie"
+
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+"         '%s', even though it is merged to HEAD"
+msgstr ""
+"skrap nie tak '%s' wat nog nie saamgesmelt is met\n"
+"         '%s' nie, al is dit met HEAD saamgesmelt"
+
+#, c-format
+msgid "couldn't look up commit object for '%s'"
+msgstr "kon nie vasleggingsobjek vir '%s' opsoek nie"
+
+#, c-format
+msgid "the branch '%s' is not fully merged"
+msgstr "die tak '%s' is nie volledig saamgesmelt nie"
+
+#, c-format
+msgid "If you are sure you want to delete it, run 'git branch -D %s'"
+msgstr "As jy seker is dat jy dit wil skrap, voer 'git branch -D %s' uit"
+
+msgid "update of config-file failed"
+msgstr "kon nie konfigurasielêer bywerk nie"
+
+msgid "cannot use -a with -d"
+msgstr "kan nie -a saam met -d gebruik nie"
+
+#, c-format
+msgid "cannot delete branch '%s' used by worktree at '%s' for bisect"
+msgstr ""
+"kan nie tak '%s' skrap wat deur die werkboom by '%s' vir halvering gebruik "
+"word nie"
+
+#, c-format
+msgid "cannot delete branch '%s' used by worktree at '%s'"
+msgstr "kan nie tak '%s' skrap wat deur die werkboom by '%s' gebruik word nie"
+
+#, c-format
+msgid "remote-tracking branch '%s' not found"
+msgstr "afgeleë volgtak '%s' nie gevind nie"
+
+#, c-format
+msgid ""
+"branch '%s' not found.\n"
+"Did you forget --remote?"
+msgstr ""
+"tak '%s' nie gevind nie.\n"
+"Het jy --remote vergeet?"
+
+#, c-format
+msgid "branch '%s' not found"
+msgstr "tak '%s' nie gevind nie"
+
+#, c-format
+msgid "Would delete remote-tracking branch %s (was %s).\n"
+msgstr "Sou afgeleë volgtak %s skrap (was %s).\n"
+
+#, c-format
+msgid "Would delete branch %s (was %s).\n"
+msgstr "Sou tak %s skrap (was %s).\n"
+
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr "Afgeleë volgtak %s geskrap (was %s).\n"
+
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr "Tak %s geskrap (was %s).\n"
+
+msgid "unable to parse format string"
+msgstr "kan nie formaatstring ontleed nie"
+
+msgid "could not resolve HEAD"
+msgstr "kon nie HEAD oplos nie"
+
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "HEAD (%s) wys na buite refs/heads/"
+
+#, c-format
+msgid "branch %s is being rebased at %s"
+msgstr "tak %s word by %s herbaseer"
+
+#, c-format
+msgid "branch %s is being bisected at %s"
+msgstr "tak %s word by %s gehalveer"
+
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "HEAD van werkboom %s is nie bygewerk nie"
+
+#, c-format
+msgid "invalid branch name: '%s'"
+msgstr "ongeldige taknaam: '%s'"
+
+#, c-format
+msgid "no commit on branch '%s' yet"
+msgstr "nog geen vaslegging op tak '%s' nie"
+
+#, c-format
+msgid "no branch named '%s'"
+msgstr "geen tak genaamd '%s' nie"
+
+msgid "branch rename failed"
+msgstr "kon nie tak hernoem nie"
+
+msgid "branch copy failed"
+msgstr "kon nie tak kopieer nie"
+
+#, c-format
+msgid "created a copy of a misnamed branch '%s'"
+msgstr "'n kopie van 'n verkeerd benoemde tak '%s' is geskep"
+
+#, c-format
+msgid "renamed a misnamed branch '%s' away"
+msgstr "'n verkeerd benoemde tak '%s' is weg hernoem"
+
+#, c-format
+msgid "branch renamed to %s, but HEAD is not updated"
+msgstr "tak is na %s hernoem, maar HEAD is nie bygewerk nie"
+
+msgid "branch is renamed, but update of config-file failed"
+msgstr "tak is hernoem, maar kon nie konfigurasielêer bywerk nie"
+
+msgid "branch is copied, but update of config-file failed"
+msgstr "tak is gekopieer, maar kon nie konfigurasielêer bywerk nie"
+
+#, c-format
+msgid "'%s' is not a valid branch or pattern"
+msgstr "'%s' is nie 'n geldige tak of patroon nie"
+
+#, c-format
+msgid "Skipping '%s' (branch.%s.deleteMerged is false)\n"
+msgstr "Slaan '%s' oor (branch.%s.deleteMerged is false)\n"
+
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+"  %s\n"
+"Lines starting with '%s' will be stripped.\n"
+msgstr ""
+"Wysig asseblief die beskrywing vir die tak\n"
+"  %s\n"
+"Reëls wat met '%s' begin, sal verwyder word.\n"
+
+msgid "--set-upstream-to takes a single <remote>/<branch> argument"
+msgstr "--set-upstream-to neem 'n enkele argument <afgeleë>/<tak>"
+
+#, c-format
+msgid "Did you mean to use: git branch --set-upstream-to=%s/%s?"
+msgstr "Het jy bedoel om dit te gebruik: git branch --set-upstream-to=%s/%s?"
+
+msgid "Generic options"
+msgstr "Algemene opsies"
+
+msgid "show hash and subject, give twice for upstream branch"
+msgstr "wys hash en onderwerp, gee twee keer vir stroomop-tak"
+
+msgid "suppress informational messages"
+msgstr "onderdruk inligtingsboodskappe"
+
+msgid "set branch tracking configuration"
+msgstr "stel takvolgkonfigurasie op"
+
+msgid "do not use"
+msgstr "moenie gebruik nie"
+
+msgid "upstream"
+msgstr "stroomop"
+
+msgid "change the upstream info"
+msgstr "verander die stroomop-inligting"
+
+msgid "unset the upstream info"
+msgstr "verwyder die stroomop-inligting"
+
+msgid "use colored output"
+msgstr "gebruik gekleurde afvoer"
+
+msgid "act on remote-tracking branches"
+msgstr "tree op afgeleë volgtakke in"
+
+msgid "print only branches that contain the commit"
+msgstr "druk slegs takke wat die vaslegging bevat"
+
+msgid "print only branches that don't contain the commit"
+msgstr "druk slegs takke wat nie die vaslegging bevat nie"
+
+msgid "Specific git-branch actions:"
+msgstr "Spesifieke aksies vir git-branch:"
+
+msgid "list both remote-tracking and local branches"
+msgstr "lys beide afgeleë volgtakke en plaaslike takke"
+
+msgid "delete fully merged branch"
+msgstr "skrap volledig saamgesmelte tak"
+
+msgid "delete branch (even if not merged)"
+msgstr "skrap tak (selfs al is dit nie saamgesmelt nie)"
+
+msgid "move/rename a branch and its reflog"
+msgstr "skuif/hernoem 'n tak en sy reflog"
+
+msgid "move/rename a branch, even if target exists"
+msgstr "skuif/hernoem 'n tak, selfs al bestaan die teiken"
+
+msgid "do not output a newline after empty formatted refs"
+msgstr "moenie 'n nuwe reël ná leë geformateerde verwysings afvoer nie"
+
+msgid "copy a branch and its reflog"
+msgstr "kopieer 'n tak en sy reflog"
+
+msgid "copy a branch, even if target exists"
+msgstr "kopieer 'n tak, selfs al bestaan die teiken"
+
+msgid "list branch names"
+msgstr "lys taknames"
+
+msgid "show current branch name"
+msgstr "wys huidige taknaam"
+
+msgid "create the branch's reflog"
+msgstr "skep die tak se reflog"
+
+msgid "edit the description for the branch"
+msgstr "wysig die beskrywing vir die tak"
+
+msgid "pattern"
+msgstr "patroon"
+
+msgid "delete merged branches whose upstream matches <pattern> (repeatable)"
+msgstr ""
+"skrap saamgesmelte takke waarvan die stroomop by <patroon> pas (herhaalbaar)"
+
+msgid "with --delete-merged, only print which branches would be deleted"
+msgstr "met --delete-merged, druk slegs watter takke geskrap sou word"
+
+msgid "force creation, move/rename, deletion"
+msgstr "forseer skepping, skuif/hernoeming, skrapping"
+
+msgid "print only branches that are merged"
+msgstr "druk slegs takke wat saamgesmelt is"
+
+msgid "print only branches that are not merged"
+msgstr "druk slegs takke wat nie saamgesmelt is nie"
+
+msgid "branch"
+msgstr "tak"
+
+msgid "print only branches whose upstream matches <branch> (repeatable)"
+msgstr "druk slegs takke waarvan die stroomop by <tak> pas (herhaalbaar)"
+
+msgid "list branches in columns"
+msgstr "lys takke in kolomme"
+
+msgid "object"
+msgstr "objek"
+
+msgid "print only branches of the object"
+msgstr "druk slegs takke van die objek"
+
+msgid "sorting and filtering are case insensitive"
+msgstr "sortering en filtrering is hoofletter-onsensitief"
+
+msgid "recurse through submodules"
+msgstr "gaan rekursief deur submodules"
+
+msgid "format to use for the output"
+msgstr "formaat om vir die afvoer te gebruik"
+
+msgid "failed to resolve HEAD as a valid ref"
+msgstr "kon nie HEAD as 'n geldige verwysing oplos nie"
+
+msgid "HEAD not found below refs/heads!"
+msgstr "HEAD nie onder refs/heads gevind nie!"
+
+msgid "--dry-run requires --delete-merged"
+msgstr "--dry-run vereis --delete-merged"
+
+msgid ""
+"branch with --recurse-submodules can only be used if "
+"submodule.propagateBranches is enabled"
+msgstr ""
+"branch met --recurse-submodules kan slegs gebruik word as "
+"submodule.propagateBranches geaktiveer is"
+
+msgid "--recurse-submodules can only be used to create branches"
+msgstr "--recurse-submodules kan slegs gebruik word om takke te skep"
+
+msgid "branch name required"
+msgstr "taknaam word vereis"
+
+msgid "cannot give description to detached HEAD"
+msgstr "kan nie 'n beskrywing aan 'n ontkoppelde HEAD gee nie"
+
+msgid "cannot edit description of more than one branch"
+msgstr "kan nie die beskrywing van meer as een tak wysig nie"
+
+msgid "cannot copy the current branch while not on any"
+msgstr "kan nie die huidige tak kopieer terwyl jy op geen tak is nie"
+
+msgid "cannot rename the current branch while not on any"
+msgstr "kan nie die huidige tak hernoem terwyl jy op geen tak is nie"
+
+msgid "too many branches for a copy operation"
+msgstr "te veel takke vir 'n kopieerbewerking"
+
+msgid "too many arguments for a rename operation"
+msgstr "te veel argumente vir 'n hernoembewerking"
+
+msgid "too many arguments to set new upstream"
+msgstr "te veel argumente om nuwe stroomop te stel"
+
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch"
+msgstr ""
+"kon nie stroomop van HEAD na %s stel nie, aangesien dit na geen tak wys nie"
+
+#, c-format
+msgid "no such branch '%s'"
+msgstr "geen tak '%s' nie"
+
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr "tak '%s' bestaan nie"
+
+msgid "too many arguments to unset upstream"
+msgstr "te veel argumente om stroomop te ontstel"
+
+msgid "could not unset upstream of HEAD when it does not point to any branch"
+msgstr "kon nie stroomop van HEAD ontstel nie wanneer dit na geen tak wys nie"
+
+#, c-format
+msgid "branch '%s' has no upstream information"
+msgstr "tak '%s' het geen stroomop-inligting nie"
+
+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 -a- en -r-opsies van 'git branch' neem nie 'n taknaam nie.\n"
+"Het jy bedoel om dit te gebruik: -a|-r --list <patroon>?"
+
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead"
+msgstr ""
+"die '--set-upstream'-opsie word nie meer ondersteun nie. Gebruik eerder '--"
+"track' of '--set-upstream-to'"
+
+msgid "git version:\n"
+msgstr "Git-weergawe:\n"
+
+msgid "compiler info: "
+msgstr "samesteller-inligting: "
+
+msgid "libc info: "
+msgstr "libc-inligting: "
+
+msgid "not run from a git repository - no hooks to show\n"
+msgstr "nie vanuit 'n Git-bewaarplek uitgevoer nie - geen hake om te wys nie\n"
+
+msgid ""
+"git bugreport [(-o | --output-directory) <path>]\n"
+"              [(-s | --suffix) <format> | --no-suffix]\n"
+"              [--diagnose[=<mode>]]"
+msgstr ""
+"git bugreport [(-o | --output-directory) <pad>]\n"
+"              [(-s | --suffix) <formaat> | --no-suffix]\n"
+"              [--diagnose[=<modus>]]"
+
+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 ""
+"Dankie dat jy 'n Git-foutverslag invul!\n"
+"Beantwoord asseblief die volgende vrae om ons te help om jou probleem te "
+"verstaan.\n"
+"\n"
+"Wat het jy gedoen voordat die fout voorgekom het? (Stappe om jou probleem te "
+"herhaal)\n"
+"\n"
+"Wat het jy verwag moes gebeur? (Verwagte gedrag)\n"
+"\n"
+"Wat het eerder gebeur? (Werklike gedrag)\n"
+"\n"
+"Wat is die verskil tussen wat jy verwag het en wat werklik gebeur het?\n"
+"\n"
+"Enigiets anders wat jy wil byvoeg:\n"
+"\n"
+"Hersien asseblief die res van die foutverslag hieronder.\n"
+"Jy kan enige reëls uitvee wat jy nie wil deel nie.\n"
+
+msgid "mode"
+msgstr "modus"
+
+msgid ""
+"create an additional zip archive of detailed diagnostics (default 'stats')"
+msgstr ""
+"skep 'n bykomende zip-argief met gedetailleerde diagnostiek (verstek 'stats')"
+
+msgid "specify a destination for the bugreport file(s)"
+msgstr "spesifiseer 'n bestemming vir die foutverslaglêer(s)"
+
+msgid "specify a strftime format suffix for the filename(s)"
+msgstr "spesifiseer 'n strftime-formaatagtervoegsel vir die lêernaam(name)"
+
+#, c-format
+msgid "unknown argument `%s'"
+msgstr "onbekende argument `%s'"
+
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "kon nie voorafgaande gidse vir '%s' skep nie"
+
+#, c-format
+msgid "unable to create diagnostics archive %s"
+msgstr "kan nie diagnostiekargief %s skep nie"
+
+msgid "System Info"
+msgstr "Stelselinligting"
+
+msgid "Enabled Hooks"
+msgstr "Geaktiveerde hake"
+
+#, c-format
+msgid "unable to write to %s"
+msgstr "kan nie na %s skryf nie"
+
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "Nuwe verslag geskep by '%s'.\n"
+
+msgid ""
+"git bundle create [-q | --quiet | --progress]\n"
+"                  [--version=<version>] <file> <git-rev-list-args>"
+msgstr ""
+"git bundle create [-q | --quiet | --progress]\n"
+"                  [--version=<weergawe>] <lêer> <argumente vir git-rev-list>"
+
+msgid "git bundle verify [-q | --quiet] <file>"
+msgstr "git bundle verify [-q | --quiet] <lêer>"
+
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <lêer> [<verwysingsnaam>...]"
+
+msgid "git bundle unbundle [--progress] <file> [<refname>...]"
+msgstr "git bundle unbundle [--progress] <lêer> [<verwysingsnaam>...]"
+
+msgid "need a <file> argument"
+msgstr "benodig 'n <lêer>-argument"
+
+msgid "do not show progress meter"
+msgstr "moenie vorderingsmeter wys nie"
+
+msgid "show progress meter"
+msgstr "wys vorderingsmeter"
+
+msgid "historical; same as --progress"
+msgstr "histories; dieselfde as --progress"
+
+msgid "specify bundle format version"
+msgstr "spesifiseer bondelformaatweergawe"
+
+msgid "Need a repository to create a bundle."
+msgstr "Benodig 'n bewaarplek om 'n bondel te skep."
+
+msgid "do not show bundle details"
+msgstr "moenie bondelbesonderhede wys nie"
+
+msgid "need a repository to verify a bundle"
+msgstr "benodig 'n bewaarplek om 'n bondel te verifieer"
+
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s is in orde\n"
+
+msgid "Need a repository to unbundle."
+msgstr "Benodig 'n bewaarplek om te ontbondel."
+
+msgid "Unbundling objects"
+msgstr "Ontbondel objekte"
+
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "kan nie objek %s '%s' lees nie"
+
+msgid "must supply valid remote when using remote-object-info"
+msgstr ""
+"moet 'n geldige afgeleë verskaf wanneer remote-object-info gebruik word"
+
+#, c-format
+msgid "remote-object-info does not support short oids, %d characters required"
+msgstr ""
+"remote-object-info ondersteun nie kort objek-ID's nie, %d karakters word "
+"vereis"
+
+#, c-format
+msgid "not a valid object name '%s'"
+msgstr "nie 'n geldige objeknaam '%s' nie"
+
+msgid "remote-object-info requires objects"
+msgstr "remote-object-info vereis objekte"
+
+#, c-format
+msgid "mailmap: invalid boolean '%s'"
+msgstr "mailmap: ongeldige Booleaanse waarde '%s'"
+
+msgid "remote-object-info command too long"
+msgstr "opdrag vir remote-object-info is te lank"
+
+#, c-format
+msgid "remote-object-info: failed to parse command line: %s"
+msgstr "remote-object-info: kon nie opdragreël ontleed nie: %s"
+
+#, c-format
+msgid "remote-object-info supports at most %d objects"
+msgstr "remote-object-info ondersteun hoogstens %d objekte"
+
+#, c-format
+msgid "failed to get object info from the remote: %s"
+msgstr "kon nie objekinligting van die afgeleë kry nie: %s"
+
+msgid "flush is only for --buffer mode"
+msgstr "flush is slegs vir modus --buffer"
+
+msgid "empty command in input"
+msgstr "leë opdrag in invoer"
+
+#, c-format
+msgid "whitespace before command: '%s'"
+msgstr "witspasie voor opdrag: '%s'"
+
+#, c-format
+msgid "%s requires arguments"
+msgstr "%s vereis argumente"
+
+#, c-format
+msgid "%s takes no arguments"
+msgstr "%s neem geen argumente nie"
+
+msgid "only one batch option may be specified"
+msgstr "slegs een bondelverwerkingsopsie mag gespesifiseer word"
+
+msgid "git cat-file <type> <object>"
+msgstr "git cat-file <tipe> <objek>"
+
+msgid "git cat-file (-e | -p | -t | -s) <object>"
+msgstr "git cat-file (-e | -p | -t | -s) <objek>"
+
+msgid ""
+"git cat-file (--textconv | --filters)\n"
+"             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
+msgstr ""
+"git cat-file (--textconv | --filters)\n"
+"             [<revisie>:<pad|boomagtige> | --path=<pad|boomagtige> <revisie>]"
+
+msgid ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+"             [--buffer] [--follow-symlinks] [--unordered]\n"
+"             [--textconv | --filters] [-Z]"
+msgstr ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+"             [--buffer] [--follow-symlinks] [--unordered]\n"
+"             [--textconv | --filters] [-Z]"
+
+msgid "Check object existence or emit object contents"
+msgstr "Kontroleer of objek bestaan of gee objekinhoud uit"
+
+msgid "check if <object> exists"
+msgstr "kontroleer of <objek> bestaan"
+
+msgid "pretty-print <object> content"
+msgstr "druk <objek>-inhoud netjies uit"
+
+msgid "Emit [broken] object attributes"
+msgstr "Gee [gebreekte] objekeienskappe uit"
+
+msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
+msgstr "wys objektipe (een van 'blob', 'tree', 'commit', 'tag', ...)"
+
+msgid "show object size"
+msgstr "wys objekgrootte"
+
+msgid "use mail map file"
+msgstr "gebruik e-poskaartlêer (mailmap)"
+
+msgid "Batch objects requested on stdin (or --batch-all-objects)"
+msgstr ""
+"Bondelverwerk objekte wat op stdin aangevra word (of --batch-all-objects)"
+
+msgid "show full <object> or <rev> contents"
+msgstr "wys volledige <objek>- of <revisie>-inhoud"
+
+msgid "like --batch, but don't emit <contents>"
+msgstr "soos --batch, maar moenie <inhoud> uitgee nie"
+
+msgid "stdin is NUL-terminated"
+msgstr "stdin is NUL-beëindig"
+
+msgid "stdin and stdout is NUL-terminated"
+msgstr "stdin en stdout is NUL-beëindig"
+
+msgid "read commands from stdin"
+msgstr "lees opdragte vanaf stdin"
+
+msgid "with --batch[-check]: ignores stdin, batches all known objects"
+msgstr ""
+"met --batch[-check]: ignoreer stdin, bondelverwerk alle bekende objekte"
+
+msgid "Change or optimize batch output"
+msgstr "Verander of optimaliseer bondeluitvoer"
+
+msgid "buffer --batch output"
+msgstr "buffer uitvoer --batch"
+
+msgid "follow in-tree symlinks"
+msgstr "volg simboliese skakels binne die boom"
+
+msgid "do not order objects before emitting them"
+msgstr "moenie objekte orden voordat hulle uitgegee word nie"
+
+msgid ""
+"Emit object (blob or tree) with conversion or filter (stand-alone, or with "
+"batch)"
+msgstr ""
+"Gee objek (blob of boom) uit met omskakeling of filter (alleenstaande, of "
+"met bondel)"
+
+msgid "run textconv on object's content"
+msgstr "voer textconv op objek se inhoud uit"
+
+msgid "run filters on object's content"
+msgstr "voer filters op objek se inhoud uit"
+
+msgid "blob|tree"
+msgstr "blob|boom"
+
+msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
+msgstr "gebruik 'n <pad> vir (--textconv | --filters); Nie met 'batch' nie"
+
+msgid "objects filter only supported in batch mode"
+msgstr "objekfilter word slegs in bondelmodus ondersteun"
+
+#, c-format
+msgid "objects filter not supported: '%s'"
+msgstr "objekfilter word nie ondersteun nie: '%s'"
+
+#, c-format
+msgid "'%s=<%s>' needs '%s' or '%s'"
+msgstr "'%s=<%s>' benodig '%s' of '%s'"
+
+msgid "path|tree-ish"
+msgstr "pad|boomagtige"
+
+#, c-format
+msgid "'%s' requires a batch mode"
+msgstr "'%s' vereis 'n bondelmodus"
+
+#, c-format
+msgid "'-%c' is incompatible with batch mode"
+msgstr "'-%c' is onversoenbaar met bondelmodus"
+
+msgid "batch modes take no arguments"
+msgstr "bondelmodusse neem geen argumente nie"
+
+#, c-format
+msgid "<rev> required with '%s'"
+msgstr "<revisie> word vereis met '%s'"
+
+#, c-format
+msgid "<object> required with '-%c'"
+msgstr "<objek> word vereis met '-%c'"
+
+#, c-format
+msgid "only two arguments allowed in <type> <object> mode, not %d"
+msgstr "slegs twee argumente toegelaat in <tipe> <objek>-modus, nie %d nie"
+
+msgid ""
+"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] "
+"<pathname>..."
+msgstr ""
+"git check-attr [--source <boomagtige>] [-a | --all | <eienskap>...] [--] "
+"<padnaam>..."
+
+msgid ""
+"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]"
+msgstr ""
+"git check-attr --stdin [-z] [--source <boomagtige>] [-a | --all | "
+"<eienskap>...]"
+
+msgid "report all attributes set on file"
+msgstr "rapporteer alle eienskappe wat op lêer gestel is"
+
+msgid "use .gitattributes only from the index"
+msgstr "gebruik .gitattributes slegs vanaf die indeks"
+
+msgid "read file names from stdin"
+msgstr "lees lêername vanaf stdin"
+
+msgid "terminate input and output records by a NUL character"
+msgstr "beëindig invoer- en uitvoerrekords met 'n NUL-karakter"
+
+msgid "<tree-ish>"
+msgstr "<boomagtige>"
+
+msgid "which tree-ish to check attributes at"
+msgstr "by watter boomagtige eienskappe gekontroleer moet word"
+
+msgid "suppress progress reporting"
+msgstr "onderdruk vorderingsverslaggewing"
+
+msgid "show non-matching input paths"
+msgstr "wys invoerpaaie wat nie ooreenstem nie"
+
+msgid "ignore index when checking"
+msgstr "ignoreer indeks tydens kontrolering"
+
+msgid "cannot specify pathnames with --stdin"
+msgstr "kan nie padname met --stdin spesifiseer nie"
+
+msgid "-z only makes sense with --stdin"
+msgstr "-z maak slegs sin met --stdin"
+
+msgid "no path specified"
+msgstr "geen pad gespesifiseer nie"
+
+msgid "--quiet is only valid with a single pathname"
+msgstr "--quiet is slegs geldig met 'n enkele padnaam"
+
+msgid "cannot have both --quiet and --verbose"
+msgstr "kan nie beide --quiet en --verbose hê nie"
+
+msgid "--non-matching is only valid with --verbose"
+msgstr "--non-matching is slegs geldig met --verbose"
+
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr "git check-mailmap [<opsies>] <kontak>..."
+
+msgid "also read contacts from stdin"
+msgstr "lees ook kontakte vanaf stdin"
+
+msgid "read additional mailmap entries from file"
+msgstr "lees bykomende mailmap-inskrywings vanaf lêer"
+
+msgid "blob"
+msgstr "blob"
+
+msgid "read additional mailmap entries from blob"
+msgstr "lees bykomende mailmap-inskrywings vanaf blob"
+
+msgid "no contacts specified"
+msgstr "geen kontakte gespesifiseer nie"
+
+msgid "git checkout--worker [<options>]"
+msgstr "git checkout--worker [<opsies>]"
+
+msgid "string"
+msgstr "string"
+
+msgid "when creating files, prepend <string>"
+msgstr "voeg <string> vooraan by wanneer lêers geskep word"
+
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr "git checkout-index [<opsies>] [--] [<lêer>...]"
+
+msgid "stage should be between 1 and 3 or all"
+msgstr "stadium moet tussen 1 en 3 of all wees"
+
+msgid "check out all files in the index"
+msgstr "check alle lêers in die indeks uit"
+
+msgid "do not skip files with skip-worktree set"
+msgstr "moenie lêers met skip-worktree gestel oorslaan nie"
+
+msgid "force overwrite of existing files"
+msgstr "dwing oorskrywing van bestaande lêers af"
+
+msgid "no warning for existing files and files not in index"
+msgstr ""
+"geen waarskuwing vir bestaande lêers en lêers wat nie in die indeks is nie"
+
+msgid "don't checkout new files"
+msgstr "moenie nuwe lêers uitcheck nie"
+
+msgid "update stat information in the index file"
+msgstr "werk stat-inligting in die indekslêer by"
+
+msgid "read list of paths from the standard input"
+msgstr "lees lys van paaie vanaf die standaardinvoer"
+
+msgid "write the content to temporary files"
+msgstr "skryf die inhoud na tydelike lêers"
+
+msgid "copy out the files from named stage"
+msgstr "kopieer die lêers uit die genoemde stadium"
+
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr "pad '%s' het nie ons weergawe nie"
+
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr "pad '%s' het nie hulle weergawe nie"
+
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr "pad '%s' het nie al die nodige weergawes nie"
+
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr "pad '%s' het nie nodige weergawes nie"
+
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr "pad '%s': kan nie saamsmelt nie"
+
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr "Kan nie saamsmeltresultaat vir '%s' byvoeg nie"
+
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "%d saamsmeltkonflik herskep"
+msgstr[1] "%d saamsmeltkonflikte herskep"
+
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "%d pad opgedateer vanaf %s"
+msgstr[1] "%d paaie opgedateer vanaf %s"
+
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "%d pad opgedateer vanaf die indeks"
+msgstr[1] "%d paaie opgedateer vanaf die indeks"
+
+#, c-format
+msgid "'%s' cannot be used with updating paths"
+msgstr "'%s' kan nie saam met die opdatering van paaie gebruik word nie"
+
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr "Kan nie tegelykertyd paaie opdateer en na tak '%s' oorskakel nie."
+
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr "nóg '%s' nóg '%s' is gespesifiseer"
+
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "'%s' moet gebruik word wanneer '%s' nie gespesifiseer is nie"
+
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' of '%s' kan nie saam met %s gebruik word nie"
+
+#, c-format
+msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree"
+msgstr ""
+"'%s', '%s' of '%s' kan nie gebruik word wanneer daar uit 'n boom uitgecheck "
+"word nie"
+
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "pad '%s' is nie saamgesmelt nie"
+
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr "kan nie boom lees nie (%s)"
+
+msgid "you need to resolve your current index first"
+msgstr "jy moet eers jou huidige indeks oplos"
+
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
+msgstr "Kan nie reflog vir '%s' doen nie: %s\n"
+
+msgid "HEAD is now at"
+msgstr "HEAD is nou by"
+
+msgid "unable to update HEAD"
+msgstr "kan nie HEAD opdateer nie"
+
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr "Tak '%s' teruggestel\n"
+
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "Reeds op '%s'\n"
+
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr "Oorgeskakel na tak '%s' en dit teruggestel\n"
+
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "Oorgeskakel na 'n nuwe tak '%s'\n"
+
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "Oorgeskakel na tak '%s'\n"
+
+#, c-format
+msgid " ... and %d more.\n"
+msgstr " ... en %d meer.\n"
+
+#, 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] ""
+"Waarskuwing: jy laat %d vaslegging agter wat nie aan\n"
+"enige van jou takke gekoppel is nie:\n"
+"\n"
+"%s\n"
+msgstr[1] ""
+"Waarskuwing: jy laat %d vasleggings agter wat nie aan\n"
+"enige van jou takke gekoppel is nie:\n"
+"\n"
+"%s\n"
+
+#, 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] ""
+"As jy dit wil behou deur 'n nuwe tak te skep, is dit dalk 'n goeie tyd\n"
+"om dit te doen met:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgstr[1] ""
+"As jy hulle wil behou deur 'n nuwe tak te skep, is dit dalk 'n goeie tyd\n"
+"om dit te doen met:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+
+msgid "internal error in revision walk"
+msgstr "interne fout in hersieningswandeling"
+
+msgid "Previous HEAD position was"
+msgstr "Vorige HEAD-posisie was"
+
+msgid "You are on a branch yet to be born"
+msgstr "Jy is op 'n tak wat nog gebore moet word"
+
+#, c-format
+msgid "The following paths have local changes:\n"
+msgstr "Die volgende paaie het plaaslike wysigings:\n"
+
+#, c-format
+msgid "Branch name '%s' appears in multiple remotes:"
+msgstr "Taknaam '%s' kom in veelvuldige afgeleë bewaarplekke voor:"
+
+#, c-format
+msgid "  %s"
+msgstr "  %s"
+
+#, c-format
+msgid ""
+"If you meant to check out a remote tracking branch on <remote>,\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+"    git %s --track <remote>/%s\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 ""
+"As jy bedoel het om 'n afgeleë volgtak op <remote> uit te check,\n"
+"kan jy dit doen deur die naam ten volle te kwalifiseer met die opsie --"
+"track:\n"
+"\n"
+"    git %s --track <remote>/%s\n"
+"\n"
+"As jy wil hê dat uitchecks van 'n dubbelsinnige naam altyd een afgeleë\n"
+"verkies, bv. die afgeleë 'origin', oorweeg dit om\n"
+"checkout.defaultRemote=origin in jou konfigurasie in te stel."
+
+#, 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' kan beide 'n plaaslike lêer en 'n volgtak wees.\n"
+"Gebruik asseblief -- (en opsioneel --no-guess) om te onderskei"
+
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "'%s' het by veelvuldige (%d) afgeleë volgtakke gepas"
+
+msgid "only one reference expected"
+msgstr "slegs een verwysing verwag"
+
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "slegs een verwysing verwag, %d gegee."
+
+#, c-format
+msgid "invalid reference: %s"
+msgstr "ongeldige verwysing: %s"
+
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "verwysing is nie 'n boom nie: %s"
+
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "'n tak word verwag, etiket '%s' gekry"
+
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "'n tak word verwag, afgeleë tak '%s' gekry"
+
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "'n tak word verwag, '%s' gekry"
+
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "'n tak word verwag, vaslegging '%s' gekry"
+
+msgid ""
+"If you want to detach HEAD at the commit, try again with the --detach option."
+msgstr ""
+"As jy HEAD by die vaslegging wil ontkoppel, probeer weer met die --detach "
+"opsie."
+
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"kan nie tak wissel tydens saamsmelting nie\n"
+"Oorweeg \"git merge --quit\" of \"git worktree add\"."
+
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"kan nie tak wissel in die middel van 'n am-sessie nie\n"
+"Oorweeg \"git am --quit\" of \"git worktree add\"."
+
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"kan nie tak wissel terwyl daar herbaseer word nie\n"
+"Oorweeg \"git rebase --quit\" of \"git worktree add\"."
+
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"kan nie tak wissel terwyl daar kersiepluk word nie\n"
+"Oorweeg \"git cherry-pick --quit\" of \"git worktree add\"."
+
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"kan nie tak wissel tydens 'n omkering nie\n"
+"Oorweeg \"git revert --quit\" of \"git worktree add\"."
+
+msgid "you are switching branch while bisecting"
+msgstr "jy is besig om takke te wissel tydens 'n halvering"
+
+msgid "paths cannot be used with switching branches"
+msgstr "paaie kan nie gebruik word terwyl takke gewissel word nie"
+
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr "'%s' kan nie saam met die wissel van takke gebruik word nie"
+
+#, c-format
+msgid "'%s' needs the paths to check out"
+msgstr "'%s' benodig die paaie om uit te check"
+
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr "'%s' kan nie saam met '%s' gebruik word nie"
+
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "'%s' kan nie 'n <begin-punt> neem nie"
+
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr "Kan nie tak wissel na 'n nie-vaslegging '%s' nie"
+
+msgid "missing branch or commit argument"
+msgstr "tak of vaslegging-argument ontbreek"
+
+#, c-format
+msgid "unknown conflict style '%s'"
+msgstr "onbekende konflikstyl '%s'"
+
+msgid "perform a 3-way merge with the new branch"
+msgstr "voer 'n 3-rigting-saamsmelting met die nuwe tak uit"
+
+msgid "style"
+msgstr "styl"
+
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "konflikstyl (merge, diff3, of zdiff3)"
+
+msgid "detach HEAD at named commit"
+msgstr "ontkoppel HEAD by benoemde vaslegging"
+
+msgid "force checkout (throw away local modifications)"
+msgstr "dwing uitcheck af (gooi plaaslike wysigings weg)"
+
+msgid "new-branch"
+msgstr "nuwe-tak"
+
+msgid "new unborn branch"
+msgstr "nuwe ongebore tak"
+
+msgid "update ignored files (default)"
+msgstr "dateer geïgnoreerde lêers op (verstek)"
+
+msgid "do not check if another worktree is using this branch"
+msgstr "moenie nagaan of 'n ander werkboom hierdie tak gebruik nie"
+
+msgid "checkout our version for unmerged files"
+msgstr "check ons weergawe uit vir lêers wat nie saamgesmelt is nie"
+
+msgid "checkout their version for unmerged files"
+msgstr "check hulle weergawe uit vir lêers wat nie saamgesmelt is nie"
+
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "moenie padspesifikasies tot slegs yl inskrywings beperk nie"
+
+msgid "git checkout [<options>] <branch>"
+msgstr "git checkout [<opsies>] <tak>"
+
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr "git checkout [<opsies>] [<tak>] -- <lêer>..."
+
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<opsies>] [<tak>]"
+
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<opsies>] [--source=<tak>] <lêer>..."
+
+#, c-format
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "opsies '-%c', '-%c' en '%s' kan nie saam gebruik word nie"
+
+msgid "--track needs a branch name"
+msgstr "--track benodig 'n taknaam"
+
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "taknaam ontbreek; probeer -%c"
+
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "kon '%s' nie oplos nie"
+
+msgid "invalid path specification"
+msgstr "ongeldige padspesifikasie"
+
+#, c-format
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgstr ""
+"'%s' is nie 'n vaslegging nie en 'n tak '%s' kan nie daaruit geskep word nie"
+
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr "git checkout: --detach aanvaar nie 'n padargument '%s' nie"
+
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+"git checkout: --ours/--theirs, --force en --merge is onversoenbaar wanneer\n"
+"daar uit die indeks uitgecheck word."
+
+msgid "you must specify path(s) to restore"
+msgstr "jy moet pad(de) spesifiseer om te herstel"
+
+msgid "create and checkout a new branch"
+msgstr "skep en check 'n nuwe tak uit"
+
+msgid "create/reset and checkout a branch"
+msgstr "skep/stel terug en check 'n tak uit"
+
+msgid "create reflog for new branch"
+msgstr "skep reflog vir nuwe tak"
+
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "tweede raaiskoot 'git checkout <geen-sulke-tak>' (verstek)"
+
+msgid "use overlay mode (default)"
+msgstr "gebruik oorlegmodus (verstek)"
+
+msgid "create and switch to a new branch"
+msgstr "skep en wissel na 'n nuwe tak"
+
+msgid "create/reset and switch to a branch"
+msgstr "skep/stel terug en wissel na 'n tak"
+
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "tweede raaiskoot 'git switch <geen-sulke-tak>'"
+
+msgid "throw away local modifications"
+msgstr "gooi plaaslike wysigings weg"
+
+msgid "which tree-ish to checkout from"
+msgstr "watter boomagtige om vanaf uit te check"
+
+msgid "restore the index"
+msgstr "herstel die indeks"
+
+msgid "restore the working tree (default)"
+msgstr "herstel die werkboom (verstek)"
+
+msgid "ignore unmerged entries"
+msgstr "ignoreer inskrywings wat nie saamgesmelt is nie"
+
+msgid "use overlay mode"
+msgstr "gebruik oorlegmodus"
+
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "
+"[<pathspec>...]"
+msgstr ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <patroon>] [-x | -X] [--] "
+"[<padspesifikasie>...]"
+
+#, c-format
+msgid "Removing %s\n"
+msgstr "Verwyder %s\n"
+
+#, c-format
+msgid "Would remove %s\n"
+msgstr "Sou %s verwyder\n"
+
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr "Slaan bewaarplek %s oor\n"
+
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr "Sou bewaarplek %s oorslaan\n"
+
+#, c-format
+msgid "failed to remove %s"
+msgstr "kon nie %s verwyder nie"
+
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "kon nie lstat op %s uitvoer nie\n"
+
+msgid "Refusing to remove current working directory\n"
+msgstr "Weier om huidige werkgids te verwyder\n"
+
+msgid "Would refuse to remove current working directory\n"
+msgstr "Sou weier om huidige werkgids te verwyder\n"
+
+#, 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 ""
+"Hulp by opdragprompt:\n"
+"1          - kies 'n genommerde item\n"
+"foo        - kies item op grond van unieke voorvoegsel\n"
+"           - (leeg) kies niks\n"
+
+#, 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 ""
+"Hulp by opdragprompt:\n"
+"1          - kies 'n enkele item\n"
+"3-5        - kies 'n reeks items\n"
+"2-3,6-9    - kies veelvuldige reekse\n"
+"foo        - kies item op grond van unieke voorvoegsel\n"
+"-...       - ontkies gespesifiseerde items\n"
+"*          - kies alle items\n"
+"           - (leeg) voltooi keuse\n"
+
+#, c-format
+msgid "Huh (%s)?\n"
+msgstr "Hè (%s)?\n"
+
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr "Voer ignoreerpatrone in>> "
+
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr "WAARSKUWING: Kan nie items vind wat ooreenstem met nie: %s"
+
+msgid "Select items to delete"
+msgstr "Kies items om uit te vee"
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr "Verwyder %s [y/N]? "
+
+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               - begin skoonmaak\n"
+"filter by pattern   - sluit items van uitvee uit\n"
+"select by numbers   - kies items om uit te vee volgens nommers\n"
+"ask each            - bevestig elke uitvee (soos \"rm -i\")\n"
+"quit                - stop skoonmaak\n"
+"help                - hierdie skerm\n"
+"?                   - hulp vir promptkeuse"
+
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] "Sou die volgende item verwyder:"
+msgstr[1] "Sou die volgende items verwyder:"
+
+msgid "No more files to clean, exiting."
+msgstr "Geen verdere lêers om skoon te maak nie, verlaat."
+
+msgid "do not print names of files removed"
+msgstr "moenie name van verwyderde lêers druk nie"
+
+msgid "force"
+msgstr "dwing"
+
+msgid "interactive cleaning"
+msgstr "interaktiewe skoonmaak"
+
+msgid "remove whole directories"
+msgstr "verwyder hele gidse"
+
+msgid "add <pattern> to ignore rules"
+msgstr "voeg <patroon> by ignoreerreëls"
+
+msgid "remove ignored files, too"
+msgstr "verwyder ook geïgnoreerde lêers"
+
+msgid "remove only ignored files"
+msgstr "verwyder slegs geïgnoreerde lêers"
+
+msgid "clean.requireForce is true and -f not given: refusing to clean"
+msgstr ""
+"clean.requireForce is true en -f is nie gegee nie: weier om skoon te maak"
+
+#, c-format
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr "inligting: Kon nie alternatief vir '%s' byvoeg nie: %s\n"
+
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "kon nie '%s' lees nie"
+
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "%s bestaan en is nie 'n gids nie"
+
+#, c-format
+msgid "'%s' is a symlink, refusing to clone with --local"
+msgstr "'%s' is 'n simskakel, weier om met --local te kloon"
+
+#, c-format
+msgid "failed to start iterator over '%s'"
+msgstr "kon nie iterator oor '%s' begin nie"
+
+#, c-format
+msgid "symlink '%s' exists, refusing to clone with --local"
+msgstr "simskakel '%s' bestaan, weier om met --local te kloon"
+
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "kon nie '%s' ontkoppel nie"
+
+#, c-format
+msgid "hardlink cannot be checked at '%s'"
+msgstr "hardeskakel kan nie by '%s' nagegaan word nie"
+
+#, c-format
+msgid "hardlink different from source at '%s'"
+msgstr "hardeskakel verskil van die bron by '%s'"
+
+#, c-format
+msgid "failed to create link '%s'"
+msgstr "kon nie skakel '%s' skep nie"
+
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr "kon nie lêer na '%s' kopieer nie"
+
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "kon nie oor '%s' itereer nie"
+
+#, c-format
+msgid "done.\n"
+msgstr "klaar.\n"
+
+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 ""
+"Kloon het geslaag, maar uitcheck het misluk.\n"
+"Jy kan inspekteer wat uitgecheck is met 'git status'\n"
+"en weer probeer met 'git restore --source=HEAD :/'\n"
+
+msgid "remote did not send all necessary objects"
+msgstr "afgeleë het nie al die nodige objekte gestuur nie"
+
+#, c-format
+msgid "unable to update %s"
+msgstr "kan nie %s opdateer nie"
+
+msgid "failed to initialize sparse-checkout"
+msgstr "kon nie yl-uitcheck inisialiseer nie"
+
+msgid "remote HEAD refers to nonexistent ref, unable to checkout"
+msgstr ""
+"afgeleë HEAD verwys na 'n nie-bestaande verwysing, kan nie uitcheck nie"
+
+msgid "unable to checkout working tree"
+msgstr "kan nie werkboom uitcheck nie"
+
+msgid "unable to write parameters to config file"
+msgstr "kan nie parameters na konfigurasielêer skryf nie"
+
+msgid "cannot repack to clean up"
+msgstr "kan nie herpak om op te ruim nie"
+
+msgid "cannot unlink temporary alternates file"
+msgstr "kan nie tydelike alternatiewe-lêer ontkoppel nie"
+
+msgid "don't clone shallow repository"
+msgstr "moenie 'n vlak bewaarplek kloon nie"
+
+msgid "don't create a checkout"
+msgstr "moenie 'n uitcheck skep nie"
+
+msgid "create a bare repository"
+msgstr "skep 'n kaal bewaarplek"
+
+msgid "create a mirror repository (implies --bare)"
+msgstr "skep 'n spieël-bewaarplek (impliseer --bare)"
+
+msgid "to clone from a local repository"
+msgstr "om vanaf 'n plaaslike bewaarplek te kloon"
+
+msgid "don't use local hardlinks, always copy"
+msgstr "moenie plaaslike hardeskakels gebruik nie, kopieer altyd"
+
+msgid "setup as shared repository"
+msgstr "stel op as gedeelde bewaarplek"
+
+msgid "pathspec"
+msgstr "padspesifikasie"
+
+msgid "initialize submodules in the clone"
+msgstr "inisialiseer submodules in die kloon"
+
+msgid "number of submodules cloned in parallel"
+msgstr "aantal submodules wat parallel gekloon word"
+
+msgid "template-directory"
+msgstr "sjabloon-gids"
+
+msgid "directory from which templates will be used"
+msgstr "gids waarvandaan sjablone gebruik sal word"
+
+msgid "reference repository"
+msgstr "verwysingsbewaarplek"
+
+msgid "use --reference only while cloning"
+msgstr "gebruik --reference slegs tydens kloning"
+
+msgid "name"
+msgstr "naam"
+
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr "gebruik <naam> in plaas van 'origin' om stroomop te volg"
+
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr "check <tak> uit in plaas van die afgeleë HEAD"
+
+msgid "clone single revision <rev> and check out"
+msgstr "kloon enkele hersiening <hersiening> en check uit"
+
+msgid "path to git-upload-pack on the remote"
+msgstr "pad na git-upload-pack op die afgeleë"
+
+msgid "depth"
+msgstr "diepte"
+
+msgid "create a shallow clone of that depth"
+msgstr "skep 'n vlak kloon van daardie diepte"
+
+msgid "create a shallow clone since a specific time"
+msgstr "skep 'n vlak kloon sedert 'n bepaalde tyd"
+
+msgid "ref"
+msgstr "verwysing"
+
+msgid "deepen history of shallow clone, excluding ref"
+msgstr "verdiep geskiedenis van vlak kloon, sluit verwysing uit"
+
+msgid "clone only one branch, HEAD or --branch"
+msgstr "kloon slegs een tak, HEAD of --branch"
+
+msgid "clone tags, and make later fetches not to follow them"
+msgstr "kloon etikette, en laat latere hale hulle nie volg nie"
+
+msgid "any cloned submodules will be shallow"
+msgstr "enige gekloonde submodules sal vlak wees"
+
+msgid "gitdir"
+msgstr "gitgids"
+
+msgid "separate git dir from working tree"
+msgstr "skei Git-gids van werkboom"
+
+msgid "specify the reference format to use"
+msgstr "spesifiseer die verwysingsformaat om te gebruik"
+
+msgid "key=value"
+msgstr "sleutel=waarde"
+
+msgid "set config inside the new repository"
+msgstr "stel konfigurasie binne die nuwe bewaarplek"
+
+msgid "server-specific"
+msgstr "bediener-spesifiek"
+
+msgid "option to transmit"
+msgstr "opsie om oor te dra"
+
+msgid "apply partial clone filters to submodules"
+msgstr "pas gedeeltelike-kloonfilters op submodules toe"
+
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "enige gekloonde submodules sal hulle afgeleë volgtak gebruik"
+
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr "inisialiseer yl-uitcheck-lêer om slegs lêers by die wortel in te sluit"
+
+msgid "uri"
+msgstr "uri"
+
+msgid "a URI for downloading bundles before fetching from origin remote"
+msgstr ""
+"'n URI om bondels af te laai voordat daar vanaf die origin-afgeleë gehaal "
+"word"
+
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [<opsies>] [--] <bewaarplek> [<gids>]"
+
+msgid "Too many arguments."
+msgstr "Te veel argumente."
+
+msgid "You must specify a repository to clone."
+msgstr "Jy moet 'n bewaarplek spesifiseer om te kloon."
+
+#, c-format
+msgid "unknown ref storage format '%s'"
+msgstr "onbekende verwysingstoorformaat '%s'"
+
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr "bewaarplek '%s' bestaan nie"
+
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr "diepte %s is nie 'n positiewe getal nie"
+
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr "bestemmingspad '%s' bestaan reeds en is nie 'n leë gids nie."
+
+#, c-format
+msgid "repository path '%s' already exists and is not an empty directory."
+msgstr "bewaarplekpad '%s' bestaan reeds en is nie 'n leë gids nie."
+
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr "werkboom '%s' bestaan reeds."
+
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "kon nie voorafgaande gidse van '%s' skep nie"
+
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr "kon nie werkboomgids '%s' skep nie"
+
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr "Kloon tans in kaal bewaarplek '%s'...\n"
+
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr "Kloon tans in '%s'...\n"
+
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+"clone --recursive is nie versoenbaar met beide --reference en --reference-if-"
+"able nie"
+
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' is nie 'n geldige afgeleë naam nie"
+
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr "--depth word in plaaslike klone geïgnoreer; gebruik liewer file://."
+
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr ""
+"--shallow-since word in plaaslike klone geïgnoreer; gebruik liewer file://."
+
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr ""
+"--shallow-exclude word in plaaslike klone geïgnoreer; gebruik liewer file://."
+
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr "--filter word in plaaslike klone geïgnoreer; gebruik liewer file://."
+
+msgid "source repository is shallow, reject to clone."
+msgstr "bronbewaarplek is vlak, weier om te kloon."
+
+msgid "source repository is shallow, ignoring --local"
+msgstr "bronbewaarplek is vlak, ignoreer --local"
+
+msgid "--local is ignored"
+msgstr "--local word geïgnoreer"
+
+msgid "cannot clone from filtered bundle"
+msgstr "kan nie vanaf 'n gefilterde bondel kloon nie"
+
+msgid "failed to initialize the repo, skipping bundle URI"
+msgstr "kon nie die bewaarplek inisialiseer nie, slaan bondel-URI oor"
+
+#, c-format
+msgid "failed to fetch objects from bundle URI '%s'"
+msgstr "kon nie objekte vanaf bondel-URI '%s' haal nie"
+
+msgid "failed to fetch advertised bundles"
+msgstr "kon nie geadverteerde bondels haal nie"
+
+msgid "remote transport reported error"
+msgstr "afgeleë vervoer het 'n fout gerapporteer"
+
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr "Afgeleë tak %s nie in stroomop %s gevind nie"
+
+#, c-format
+msgid "Remote revision %s not found in upstream %s"
+msgstr "Afgeleë hersiening %s nie in stroomop %s gevind nie"
+
+msgid "You appear to have cloned an empty repository."
+msgstr "Dit lyk of jy 'n leë bewaarplek gekloon het."
+
+msgid "git column [<options>]"
+msgstr "git column [<opsies>]"
+
+msgid "lookup config vars"
+msgstr "soek konfigurasieveranderlikes op"
+
+msgid "layout to use"
+msgstr "uitleg om te gebruik"
+
+msgid "maximum width"
+msgstr "maksimum wydte"
+
+msgid "padding space on left border"
+msgstr "opvulspasie by linkerrand"
+
+msgid "padding space on right border"
+msgstr "opvulspasie by regterrand"
+
+msgid "padding space between columns"
+msgstr "opvulspasie tussen kolomme"
+
+#, c-format
+msgid "%s must be non-negative"
+msgstr "%s moet nie-negatief wees"
+
+msgid "--command must be the first argument"
+msgstr "--command moet die eerste argument wees"
+
+msgid ""
+"git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]"
+msgstr ""
+"git commit-graph verify [--object-dir <gids>] [--shallow] [--[no-]progress]"
+
+msgid ""
+"git commit-graph write [--object-dir <dir>] [--append]\n"
+"                       [--split[=<strategy>]] [--reachable | --stdin-packs | "
+"--stdin-commits]\n"
+"                       [--changed-paths] [--[no-]max-new-filters <n>] [--"
+"[no-]progress]\n"
+"                       <split-options>"
+msgstr ""
+"git commit-graph write [--object-dir <gids>] [--append]\n"
+"                       [--split[=<strategie>]] [--reachable | --stdin-packs "
+"| --stdin-commits]\n"
+"                       [--changed-paths] [--[no-]max-new-filters <n>] [--"
+"[no-]progress]\n"
+"                       <verdeel-opsies>"
+
+msgid "dir"
+msgstr "gids"
+
+msgid "the object directory to store the graph"
+msgstr "die objekgids om die grafiek te stoor"
+
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr "indien die commit-graph verdeel is, verifieer slegs die puntlêer"
+
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Kon nie commit-graph '%s' oopmaak nie"
+
+#, c-format
+msgid "could not open commit-graph chain '%s'"
+msgstr "kon nie commit-graph-ketting '%s' oopmaak nie"
+
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "onherkende argument --split, %s"
+
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "onverwagte nie-heksadesimale objek-ID: %s"
+
+#, c-format
+msgid "invalid object: %s"
+msgstr "ongeldige objek: %s"
+
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "opsie `%s' verwag 'n numeriese waarde"
+
+msgid "start walk at all refs"
+msgstr "begin deurloop by alle verwysings"
+
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "deursoek pakindekse wat deur stdin gelys word vir vasleggings"
+
+msgid "start walk at commits listed by stdin"
+msgstr "begin deurloop by vasleggings wat deur stdin gelys word"
+
+msgid "include all commits already in the commit-graph file"
+msgstr "sluit alle vasleggings in wat reeds in die commit-graph-lêer is"
+
+msgid "enable computation for changed paths"
+msgstr "aktiveer berekening vir veranderde paaie"
+
+msgid "allow writing an incremental commit-graph file"
+msgstr "laat die skryf van 'n inkrementele commit-graph-lêer toe"
+
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr "maksimum aantal vasleggings in 'n verdeelde nie-basis-commit-graph"
+
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "maksimum verhouding tussen twee vlakke van 'n verdeelde commit-graph"
+
+msgid "only expire files older than a given date-time"
+msgstr "laat slegs lêers verval wat ouer as 'n gegewe datum-tyd is"
+
+msgid "maximum number of changed-path Bloom filters to compute"
+msgstr "maksimum aantal veranderde-pad-Bloom-filters om te bereken"
+
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr ""
+"gebruik hoogstens een van --reachable, --stdin-commits of --stdin-packs"
+
+msgid "Collecting commits from input"
+msgstr "Versamel vasleggings uit invoer"
+
+msgid "git commit-tree <tree> [(-p <parent>)...]"
+msgstr "git commit-tree <boom> [(-p <ouer>)...]"
+
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n"
+"                [(-F <file>)...] <tree>"
+msgstr ""
+"git commit-tree [(-p <ouer>)...] [-S[<sleutel-id>]] [(-m <boodskap>)...]\n"
+"                [(-F <lêer>)...] <boom>"
+
+#, c-format
+msgid "duplicate parent %s ignored"
+msgstr "duplikaat-ouer %s geïgnoreer"
+
+#, c-format
+msgid "not a valid object name %s"
+msgstr "nie 'n geldige objeknaam %s nie"
+
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git commit-tree: kon nie '%s' lees nie"
+
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr "git commit-tree: kon nie '%s' sluit nie"
+
+msgid "parent"
+msgstr "ouer"
+
+msgid "id of a parent commit object"
+msgstr "id van 'n ouer-vasleggingsobjek"
+
+msgid "message"
+msgstr "boodskap"
+
+msgid "commit message"
+msgstr "vasleggingsboodskap"
+
+msgid "read commit log message from file"
+msgstr "lees vasleggingslogboodskap vanaf lêer"
+
+msgid "GPG sign commit"
+msgstr "onderteken vaslegging met GPG"
+
+msgid "must give exactly one tree"
+msgstr "moet presies een boom gee"
+
+msgid "git commit-tree: failed to read"
+msgstr "git commit-tree: kon nie lees nie"
+
+msgid ""
+"git commit [-a | --interactive | --patch] [-s] [-v] [-u[<mode>]] [--amend]\n"
+"           [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|"
+"reword):]<commit>]\n"
+"           [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n"
+"           [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n"
+"           [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n"
+"           [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"           [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n"
+"           [--] [<pathspec>...]"
+msgstr ""
+"git commit [-a | --interactive | --patch] [-s] [-v] [-u[<modus>]] [--amend]\n"
+"           [--dry-run] [(-c | -C | --squash) <vaslegging> | --fixup [(amend|"
+"reword):]<vaslegging>]\n"
+"           [-F <lêer> | -m <boodskap>] [--reset-author] [--allow-empty]\n"
+"           [--allow-empty-message] [--no-verify] [-e] [--author=<outeur>]\n"
+"           [--date=<datum>] [--cleanup=<modus>] [--[no-]status]\n"
+"           [-i | -o] [--pathspec-from-file=<lêer> [--pathspec-file-nul]]\n"
+"           [(--trailer <teken>[(=|:)<waarde>])...] [-S[<sleutel-id>]]\n"
+"           [--] [<padspesifikasie>...]"
+
+msgid "git status [<options>] [--] [<pathspec>...]"
+msgstr "git status [<opsies>] [--] [<padspesifikasie>...]"
+
+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 ""
+"Jy het gevra om die mees onlangse vaslegging te wysig, maar dit sou dit\n"
+"leeg maak. Jy kan jou opdrag herhaal met --allow-empty, of jy kan die\n"
+"vaslegging heeltemal verwyder met \"git reset HEAD^\".\n"
+
+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 ""
+"Die vorige kersiepluk is nou leeg, moontlik weens konflikoplossing.\n"
+"As jy dit in elk geval wil vaslê, gebruik:\n"
+"\n"
+"    git commit --allow-empty\n"
+"\n"
+
+msgid "Otherwise, please use 'git rebase --skip'\n"
+msgstr "Gebruik andersins asseblief 'git rebase --skip'\n"
+
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "Gebruik andersins asseblief 'git cherry-pick --skip'\n"
+
+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 ""
+"en gebruik dan:\n"
+"\n"
+"    git cherry-pick --continue\n"
+"\n"
+"om voort te gaan met die kersiepluk van die oorblywende vasleggings.\n"
+"As jy hierdie vaslegging wil oorslaan, gebruik:\n"
+"\n"
+"    git cherry-pick --skip\n"
+"\n"
+
+msgid "updating files failed"
+msgstr "bywerk van lêers het misluk"
+
+msgid "failed to unpack HEAD tree object"
+msgstr "kon nie HEAD-boomobjek uitpak nie"
+
+msgid "No paths with --include/--only does not make sense."
+msgstr "Geen paaie met --include/--only maak nie sin nie."
+
+msgid "unable to create temporary index"
+msgstr "kan nie tydelike indeks skep nie"
+
+msgid "interactive add failed"
+msgstr "interaktiewe byvoeging het misluk"
+
+msgid "unable to update temporary index"
+msgstr "kan nie tydelike indeks bywerk nie"
+
+msgid "Failed to update main cache tree"
+msgstr "Kon nie hoofkasboom bywerk nie"
+
+msgid "cannot do a partial commit during a merge."
+msgstr "kan nie 'n gedeeltelike vaslegging tydens 'n saamsmelting doen nie."
+
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr "kan nie 'n gedeeltelike vaslegging tydens 'n kersiepluk doen nie."
+
+#, fuzzy
+msgid "cannot do a partial commit during a rebase."
+msgstr "kan nie 'n gedeeltelike vaslegging tydens 'n omkering doen nie."
+
+msgid "cannot read the index"
+msgstr "kan nie die indeks lees nie"
+
+msgid "unable to write temporary index file"
+msgstr "kan nie tydelike indekslêer skryf nie"
+
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr "vaslegging '%s' het nie 'n outeurkop nie"
+
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr "vaslegging '%s' het 'n misvormde outeurreël"
+
+msgid "malformed --author parameter"
+msgstr "misvormde parameter --author"
+
+#, c-format
+msgid "invalid date format: %s"
+msgstr "ongeldige datumformaat: %s"
+
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr ""
+"kan nie 'n kommentaarkarakter kies wat nie in die huidige\n"
+"vasleggingsboodskap gebruik word nie"
+
+#, c-format
+msgid "could not lookup commit '%s'"
+msgstr "kon nie vaslegging '%s' opsoek nie"
+
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr "(lees logboodskap vanaf standaardinvoer)\n"
+
+msgid "could not read log from standard input"
+msgstr "kon nie log vanaf standaardinvoer lees nie"
+
+#, c-format
+msgid "could not read log file '%s'"
+msgstr "kon nie loglêer '%s' lees nie"
+
+#, c-format
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "opsies '%s' en '%s:%s' kan nie saam gebruik word nie"
+
+msgid "could not read SQUASH_MSG"
+msgstr "kon nie SQUASH_MSG lees nie"
+
+msgid "could not read MERGE_MSG"
+msgstr "kon nie MERGE_MSG lees nie"
+
+#, c-format
+msgid "could not open '%s'"
+msgstr "kon nie '%s' oopmaak nie"
+
+msgid "could not write commit template"
+msgstr "kon nie vasleggingsjabloon skryf nie"
+
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%s' will be ignored.\n"
+msgstr ""
+"Voer asseblief die vasleggingsboodskap vir jou veranderinge in. Reëls wat\n"
+"met '%s' begin, sal geïgnoreer word.\n"
+
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%s' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"Voer asseblief die vasleggingsboodskap vir jou veranderinge in. Reëls wat\n"
+"met '%s' begin, sal geïgnoreer word, en 'n leë boodskap staak die "
+"vaslegging.\n"
+
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%s' will be kept; you may remove them yourself if you want to.\n"
+msgstr ""
+"Voer asseblief die vasleggingsboodskap vir jou veranderinge in. Reëls wat\n"
+"met '%s' begin, sal behou word; jy kan dit self verwyder as jy wil.\n"
+
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%s' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"Voer asseblief die vasleggingsboodskap vir jou veranderinge in. Reëls wat\n"
+"met '%s' begin, sal behou word; jy kan dit self verwyder as jy wil.\n"
+"'n Leë boodskap staak die vaslegging.\n"
+
+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"
+"Dit lyk asof jy dalk 'n saamsmelting vaslê.\n"
+"As dit nie korrek is nie, voer asseblief\n"
+"\tgit update-ref -d MERGE_HEAD\n"
+"uit en probeer weer.\n"
+
+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"
+"Dit lyk asof jy dalk 'n kersiepluk vaslê.\n"
+"As dit nie korrek is nie, voer asseblief\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
+"uit en probeer weer.\n"
+
+#, c-format
+msgid "%sAuthor:    %.*s <%.*s>"
+msgstr "%sOuteur:    %.*s <%.*s>"
+
+#, c-format
+msgid "%sDate:      %s"
+msgstr "%sDatum:     %s"
+
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr "%sVaslegger: %.*s <%.*s>"
+
+msgid "Cannot read index"
+msgstr "Kan nie indeks lees nie"
+
+msgid "unable to pass trailers to --trailers"
+msgstr "kan nie aanhangsels aan --trailers deurgee nie"
+
+msgid "Error building trees"
+msgstr "Fout met die bou van bome"
+
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr "Verskaf asseblief die boodskap met die -m- of -F-opsie.\n"
+
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgstr ""
+"--author '%s' is nie 'Naam <e-pos>' nie en stem met geen bestaande outeur "
+"ooreen nie"
+
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "Ongeldige geïgnoreerde-modus '%s'"
+
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr "Ongeldige modus vir onnaspoorbare lêers '%s'"
+
+msgid "You are in the middle of a merge -- cannot reword."
+msgstr "Jy is in die middel van 'n saamsmelting -- kan nie herbewoord nie."
+
+msgid "You are in the middle of a cherry-pick -- cannot reword."
+msgstr "Jy is in die middel van 'n kersiepluk -- kan nie herbewoord nie."
+
+#, c-format
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr "herbewoordopsie van '%s' en pad '%s' kan nie saam gebruik word nie"
+
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "herbewoordopsie van '%s' en '%s' kan nie saam gebruik word nie"
+
+msgid "You have nothing to amend."
+msgstr "Jy het niks om te wysig nie."
+
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr "Jy is in die middel van 'n saamsmelting -- kan nie wysig nie."
+
+msgid "You are in the middle of a cherry-pick -- cannot amend."
+msgstr "Jy is in die middel van 'n kersiepluk -- kan nie wysig nie."
+
+#, fuzzy
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "Jy is in die middel van 'n omkering -- kan nie wysig nie."
+
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr "--reset-author kan slegs met -C, -c of --amend gebruik word."
+
+#, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr "onbekende opsie: --fixup=%s:%s"
+
+#, c-format
+msgid "paths '%s ...' with -a does not make sense"
+msgstr "paaie '%s ...' met -a maak nie sin nie"
+
+msgid "show status concisely"
+msgstr "wys status beknop"
+
+msgid "show branch information"
+msgstr "wys takinligting"
+
+msgid "show stash information"
+msgstr "wys wegbêre-inligting"
+
+msgid "compute full ahead/behind values"
+msgstr "bereken volledige voor/agter-waardes"
+
+msgid "version"
+msgstr "weergawe"
+
+msgid "machine-readable output"
+msgstr "masjienleesbare uitvoer"
+
+msgid "show status in long format (default)"
+msgstr "wys status in lang formaat (verstek)"
+
+msgid "terminate entries with NUL"
+msgstr "beëindig inskrywings met NUL"
+
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+msgstr ""
+"wys onnaspoorbare lêers, opsionele modusse: all, normal, no. (Verstek: all)"
+
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+"wys geïgnoreerde lêers, opsionele modusse: traditional, matching, no. "
+"(Verstek: traditional)"
+
+msgid "when"
+msgstr "wanneer"
+
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+"ignoreer veranderinge aan submodules, opsioneel wanneer: all, dirty, "
+"untracked. (Verstek: all)"
+
+msgid "list untracked files in columns"
+msgstr "lys onnaspoorbare lêers in kolomme"
+
+msgid "do not detect renames"
+msgstr "moenie hernoemings bespeur nie"
+
+msgid "detect renames, optionally set similarity index"
+msgstr "bespeur hernoemings, stel opsioneel ooreenkomsindeks"
+
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr "Nie-ondersteunde kombinasie van ignored- en untracked-files-argumente"
+
+msgid "suppress summary after successful commit"
+msgstr "onderdruk opsomming na suksesvolle vaslegging"
+
+msgid "show diff in commit message template"
+msgstr "wys verskil in vasleggingsboodskapjabloon"
+
+msgid "Commit message options"
+msgstr "Vasleggingsboodskapopsies"
+
+msgid "read message from file"
+msgstr "lees boodskap vanaf lêer"
+
+msgid "author"
+msgstr "outeur"
+
+msgid "override author for commit"
+msgstr "oorskryf outeur vir vaslegging"
+
+msgid "date"
+msgstr "datum"
+
+msgid "override date for commit"
+msgstr "oorskryf datum vir vaslegging"
+
+msgid "commit"
+msgstr "vaslegging"
+
+msgid "reuse and edit message from specified commit"
+msgstr "hergebruik en redigeer boodskap van gespesifiseerde vaslegging"
+
+msgid "reuse message from specified commit"
+msgstr "hergebruik boodskap van gespesifiseerde vaslegging"
+
+#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
+#. and only translate <commit>.
+#.
+msgid "[(amend|reword):]commit"
+msgstr "[(amend|reword):]vaslegging"
+
+msgid ""
+"use autosquash formatted message to fixup or amend/reword specified commit"
+msgstr ""
+"gebruik autosquash-geformateerde boodskap om gespesifiseerde vaslegging reg "
+"te maak of te wysig/herbewoord"
+
+msgid "use autosquash formatted message to squash specified commit"
+msgstr ""
+"gebruik autosquash-geformateerde boodskap om gespesifiseerde vaslegging saam "
+"te pers"
+
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
+msgstr "ek is nou die outeur van die vaslegging (gebruik met -C/-c/--amend)"
+
+msgid "trailer"
+msgstr "aanhangsel"
+
+msgid "add custom trailer(s)"
+msgstr "voeg pasgemaakte aanhangsel(s) by"
+
+msgid "add a Signed-off-by trailer"
+msgstr "voeg 'n Signed-off-by-aanhangsel by"
+
+msgid "use specified template file"
+msgstr "gebruik gespesifiseerde jabloonlêer"
+
+msgid "force edit of commit"
+msgstr "dwing redigering van vaslegging af"
+
+msgid "include status in commit message template"
+msgstr "sluit status in vasleggingsboodskapjabloon in"
+
+msgid "Commit contents options"
+msgstr "Vasleggingsinhoudopsies"
+
+msgid "commit all changed files"
+msgstr "lê alle veranderde lêers vas"
+
+msgid "add specified files to index for commit"
+msgstr "voeg gespesifiseerde lêers by indeks vir vaslegging"
+
+msgid "interactively add files"
+msgstr "voeg lêers interaktief by"
+
+msgid "interactively add changes"
+msgstr "voeg veranderinge interaktief by"
+
+msgid "commit only specified files"
+msgstr "lê slegs gespesifiseerde lêers vas"
+
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "omseil pre-commit- en commit-msg-hake"
+
+msgid "show what would be committed"
+msgstr "wys wat vasgelê sou word"
+
+msgid "amend previous commit"
+msgstr "wysig vorige vaslegging"
+
+msgid "bypass post-rewrite hook"
+msgstr "omseil post-rewrite-haak"
+
+msgid "ok to record an empty change"
+msgstr "dit is in orde om 'n leë verandering op te teken"
+
+msgid "ok to record a change with an empty message"
+msgstr "dit is in orde om 'n verandering met 'n leë boodskap op te teken"
+
+msgid "could not parse HEAD commit"
+msgstr "kon nie HEAD-vaslegging ontleed nie"
+
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr "Korrupte MERGE_HEAD-lêer (%s)"
+
+msgid "could not read MERGE_MODE"
+msgstr "kon nie MERGE_MODE lees nie"
+
+#, c-format
+msgid "could not read commit message: %s"
+msgstr "kon nie vasleggingsboodskap lees nie: %s"
+
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr "Staak vaslegging weens leë vasleggingsboodskap.\n"
+
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "Staak vaslegging; jy het nie die boodskap geredigeer nie.\n"
+
+#, c-format
+msgid "Aborting commit due to empty commit message body.\n"
+msgstr "Staak vaslegging weens leë vasleggingsboodskapliggaam.\n"
+
+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 ""
+"bewaarplek is bygewerk, maar kan nie nuwe indekslêer\n"
+"skryf nie. Kontroleer dat die skyf nie vol is nie en dat die kwota\n"
+"nie oorskry is nie, en voer dan \"git restore --staged :/\" uit om te "
+"herstel."
+
+msgid "git config list [<file-option>] [<display-option>] [--includes]"
+msgstr "git config list [<lêeropsie>] [<vertoonopsie>] [--includes]"
+
+msgid ""
+"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
+"regexp] [--value=<pattern>] [--fixed-value] [--default=<default>] [--"
+"url=<url>] <name>"
+msgstr ""
+"git config get [<lêeropsie>] [<vertoonopsie>] [--includes] [--all] [--"
+"regexp] [--value=<patroon>] [--fixed-value] [--default=<verstek>] [--"
+"url=<url>] <naam>"
+
+msgid ""
+"git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] "
+"[--fixed-value] <name> <value>"
+msgstr ""
+"git config set [<lêeropsie>] [--type=<tipe>] [--all] [--value=<patroon>] [--"
+"fixed-value] <naam> <waarde>"
+
+msgid ""
+"git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "
+"<name>"
+msgstr ""
+"git config unset [<lêeropsie>] [--all] [--value=<patroon>] [--fixed-value] "
+"<naam>"
+
+msgid "git config rename-section [<file-option>] <old-name> <new-name>"
+msgstr "git config rename-section [<lêeropsie>] <ou-naam> <nuwe-naam>"
+
+msgid "git config remove-section [<file-option>] <name>"
+msgstr "git config remove-section [<lêeropsie>] <naam>"
+
+msgid "git config edit [<file-option>]"
+msgstr "git config edit [<lêeropsie>]"
+
+msgid "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]"
+msgstr "git config [<lêeropsie>] --get-colorbool <naam> [<stdout-is-tty>]"
+
+msgid ""
+"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
+"regexp=<regexp>] [--value=<pattern>] [--fixed-value] [--default=<default>] "
+"<name>"
+msgstr ""
+"git config get [<lêeropsie>] [<vertoonopsie>] [--includes] [--all] [--"
+"regexp=<regex>] [--value=<patroon>] [--fixed-value] [--default=<verstek>] "
+"<naam>"
+
+msgid ""
+"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "
+"[--value=<pattern>] [--fixed-value] <name> <value>"
+msgstr ""
+"git config set [<lêeropsie>] [--type=<tipe>] [--comment=<boodskap>] [--all] "
+"[--value=<patroon>] [--fixed-value] <naam> <waarde>"
+
+msgid "Config file location"
+msgstr "Ligging van konfigurasielêer"
+
+msgid "use global config file"
+msgstr "gebruik globale konfigurasielêer"
+
+msgid "use system config file"
+msgstr "gebruik stelselkonfigurasielêer"
+
+msgid "use repository config file"
+msgstr "gebruik bewaarplek-konfigurasielêer"
+
+msgid "use per-worktree config file"
+msgstr "gebruik konfigurasielêer per werkboom"
+
+msgid "use given config file"
+msgstr "gebruik gegewe konfigurasielêer"
+
+msgid "blob-id"
+msgstr "blob-id"
+
+msgid "read config from given blob object"
+msgstr "lees konfigurasie vanaf gegewe blob-objek"
+
+msgid "Type"
+msgstr "Tipe"
+
+msgid "type"
+msgstr "tipe"
+
+msgid "value is given this type"
+msgstr "waarde kry hierdie tipe"
+
+msgid "value is \"true\" or \"false\""
+msgstr "waarde is \"true\" of \"false\""
+
+msgid "value is decimal number"
+msgstr "waarde is 'n desimale getal"
+
+msgid "value is --bool or --int"
+msgstr "waarde is --bool of --int"
+
+msgid "value is --bool or string"
+msgstr "waarde is --bool of 'n string"
+
+msgid "value is a path (file or directory name)"
+msgstr "waarde is 'n pad (lêer- of gidsnaam)"
+
+msgid "value is an expiry date"
+msgstr "waarde is 'n vervaldatum"
+
+msgid "Display options"
+msgstr "Vertoonopsies"
+
+msgid "terminate values with NUL byte"
+msgstr "beëindig waardes met NUL-greep"
+
+msgid "show variable names only"
+msgstr "wys slegs veranderlikename"
+
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr ""
+"wys oorsprong van konfigurasie (lêer, standaardinvoer, blob, opdragreël)"
+
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"wys omvang van konfigurasie (werkboom, plaaslik, globaal, stelsel, opdrag)"
+
+msgid "show config keys in addition to their values"
+msgstr "wys konfigurasiesleutels benewens hul waardes"
+
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr "onherkende argument --type, %s"
+
+msgid "only one type at a time"
+msgstr "slegs een tipe op 'n slag"
+
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr "verkeerde aantal argumente, moet %d wees"
+
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr "verkeerde aantal argumente, moet van %d tot %d wees"
+
+#, c-format
+msgid "missing value to set to the variable '%s'"
+msgstr "ontbrekende waarde om aan die veranderlike '%s' toe te ken"
+
+#, c-format
+msgid "did you mean \"git config set %s %s\"?"
+msgstr "het jy \"git config set %s %s\" bedoel?"
+
+#, c-format
+msgid "missing value to set to a variable with an invalid name '%s'"
+msgstr ""
+"ontbrekende waarde om aan 'n veranderlike met 'n ongeldige naam '%s' toe te "
+"ken"
+
+#, c-format
+msgid "invalid key pattern: %s"
+msgstr "ongeldige sleutelpatroon: %s"
+
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "ongeldige patroon: %s"
+
+#, c-format
+msgid "failed to format default config value: %s"
+msgstr "kon nie verstek-konfigurasiewaarde formateer nie: %s"
+
+#, c-format
+msgid "cannot parse color '%s'"
+msgstr "kan nie kleur '%s' ontleed nie"
+
+msgid "unable to parse default color value"
+msgstr "kan nie verstek-kleurwaarde ontleed nie"
+
+msgid "not in a git directory"
+msgstr "nie in 'n Git-gids nie"
+
+msgid "writing to stdin is not supported"
+msgstr "skryf na stdin word nie ondersteun nie"
+
+msgid "writing config blobs is not supported"
+msgstr "skryf van konfigurasie-blobs word nie ondersteun nie"
+
+#, 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 ""
+"# Dit is Git se konfigurasielêer per gebruiker.\n"
+"[user]\n"
+"# Pas asseblief die volgende reëls aan en ontkommentarieer hulle:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+
+msgid "only one config file at a time"
+msgstr "slegs een konfigurasielêer op 'n slag"
+
+msgid "--local can only be used inside a git repository"
+msgstr "--local kan slegs binne 'n Git-bewaarplek gebruik word"
+
+msgid "--blob can only be used inside a git repository"
+msgstr "--blob kan slegs binne 'n Git-bewaarplek gebruik word"
+
+msgid "--worktree can only be used inside a git repository"
+msgstr "--worktree kan slegs binne 'n Git-bewaarplek gebruik word"
+
+msgid "$HOME not set"
+msgstr "$HOME is nie gestel nie"
+
+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 kan nie met veelvuldige werkbome gebruik word nie, tensy die\n"
+"konfigurasie-uitbreiding worktreeConfig geaktiveer is. Lees asseblief die\n"
+"afdeling \"CONFIGURATION FILE\" in \"git help worktree\" vir besonderhede"
+
+msgid "Other"
+msgstr "Ander"
+
+msgid "respect include directives on lookup"
+msgstr "respekteer insluitdirektiewe tydens opsoek"
+
+#, c-format
+msgid "unable to read config file '%s'"
+msgstr "kan nie konfigurasielêer '%s' lees nie"
+
+msgid "error processing config file(s)"
+msgstr "fout met verwerking van konfigurasielêer(s)"
+
+msgid "Filter options"
+msgstr "Filteropsies"
+
+msgid "return all values for multi-valued config options"
+msgstr "gee alle waardes terug vir meerwaardige konfigurasie-opsies"
+
+msgid "interpret the name as a regular expression"
+msgstr "interpreteer die naam as 'n gereelde uitdrukking"
+
+msgid "show config with values matching the pattern"
+msgstr "wys konfigurasie met waardes wat by die patroon pas"
+
+msgid "use string equality when comparing values to value pattern"
+msgstr ""
+"gebruik stringgelykheid wanneer waardes met die waardepatroon vergelyk word"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "show config matching the given URL"
+msgstr "wys konfigurasie wat by die gegewe URL pas"
+
+msgid "value"
+msgstr "waarde"
+
+msgid "use default value when missing entry"
+msgstr "gebruik verstekwaarde wanneer inskrywing ontbreek"
+
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value is slegs van toepassing saam met 'value-pattern'"
+
+msgid "--default= cannot be used with --all or --url="
+msgstr "--default= kan nie met --all of --url= gebruik word nie"
+
+msgid "--url= cannot be used with --all, --regexp or --value"
+msgstr "--url= kan nie met --all, --regexp of --value gebruik word nie"
+
+msgid "Filter"
+msgstr "Filter"
+
+msgid "replace multi-valued config option with new value"
+msgstr "vervang meerwaardige konfigurasie-opsie met nuwe waarde"
+
+msgid "human-readable comment string (# will be prepended as needed)"
+msgstr "mensleesbare kommentaarstring (# sal vooraan gevoeg word soos nodig)"
+
+msgid "add a new line without altering any existing values"
+msgstr "voeg 'n nuwe reël by sonder om enige bestaande waardes te verander"
+
+msgid "--fixed-value only applies with --value=<pattern>"
+msgstr "--fixed-value is slegs van toepassing saam met --value=<patroon>"
+
+msgid "--append cannot be used with --value=<pattern>"
+msgstr "--append kan nie met --value=<patroon> gebruik word nie"
+
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+"       Use --value=<pattern>, --append or --all to change %s."
+msgstr ""
+"kan nie veelvuldige waardes met 'n enkele waarde oorskryf nie\n"
+"       Gebruik --value=<patroon>, --append of --all om %s te verander."
+
+msgid "unset all multi-valued config options"
+msgstr "ontstel alle meerwaardige konfigurasie-opsies"
+
+msgid "unset multi-valued config options with matching values"
+msgstr "ontstel meerwaardige konfigurasie-opsies met passende waardes"
+
+#, c-format
+msgid "no such section: %s"
+msgstr "geen sodanige afdeling nie: %s"
+
+msgid "editing stdin is not supported"
+msgstr "wysiging van stdin word nie ondersteun nie"
+
+msgid "editing blobs is not supported"
+msgstr "wysiging van blobs word nie ondersteun nie"
+
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr "kan nie konfigurasielêer %s skep nie"
+
+msgid "Action"
+msgstr "Aksie"
+
+msgid "get value: name [<value-pattern>]"
+msgstr "kry waarde: naam [<waardepatroon>]"
+
+msgid "get all values: key [<value-pattern>]"
+msgstr "kry alle waardes: sleutel [<waardepatroon>]"
+
+msgid "get values for regexp: name-regex [<value-pattern>]"
+msgstr "kry waardes vir gereelde uitdrukking: naam-regex [<waardepatroon>]"
+
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "kry waarde spesifiek vir die URL: afdeling[.var] URL"
+
+msgid "replace all matching variables: name value [<value-pattern>]"
+msgstr "vervang alle passende veranderlikes: naam waarde [<waardepatroon>]"
+
+msgid "add a new variable: name value"
+msgstr "voeg 'n nuwe veranderlike by: naam waarde"
+
+msgid "remove a variable: name [<value-pattern>]"
+msgstr "verwyder 'n veranderlike: naam [<waardepatroon>]"
+
+msgid "remove all matches: name [<value-pattern>]"
+msgstr "verwyder alle passings: naam [<waardepatroon>]"
+
+msgid "rename section: old-name new-name"
+msgstr "hernoem afdeling: ou-naam nuwe-naam"
+
+msgid "remove a section: name"
+msgstr "verwyder 'n afdeling: naam"
+
+msgid "list all"
+msgstr "lys alles"
+
+msgid "open an editor"
+msgstr "open 'n redigeerder"
+
+msgid "find the color configured: slot [<default>]"
+msgstr "vind die gekonfigureerde kleur: gleuf [<verstek>]"
+
+msgid "find the color setting: slot [<stdout-is-tty>]"
+msgstr "vind die kleurinstelling: gleuf [<stdout-is-tty>]"
+
+msgid "with --get, use default value when missing entry"
+msgstr "met --get, gebruik verstekwaarde wanneer inskrywing ontbreek"
+
+msgid "--get-color and variable type are incoherent"
+msgstr "--get-color en veranderlike tipe is onsamehangend"
+
+msgid "no action specified"
+msgstr "geen aksie gespesifiseer nie"
+
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr "--name-only is slegs van toepassing op --list of --get-regexp"
+
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr ""
+"--show-origin is slegs van toepassing op --get, --get-all, --get-regexp en --"
+"list"
+
+msgid "--default is only applicable to --get"
+msgstr "--default is slegs van toepassing op --get"
+
+msgid "--comment is only applicable to add/set/replace operations"
+msgstr "--comment is slegs van toepassing op add/set/replace-bewerkings"
+
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+"       Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+"kan nie veelvuldige waardes met 'n enkele waarde oorskryf nie\n"
+"       Gebruik 'n gereelde uitdrukking, --add of --replace-all om %s te "
+"verander."
+
+msgid "print sizes in human readable format"
+msgstr "druk groottes in mensleesbare formaat"
+
+#, 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 toestemmings op u sokgids is te los; ander gebruikers\n"
+"kan dalk u gekaste geloofsbriewe lees. Oorweeg om die volgende uit te voer:\n"
+"\n"
+"\tchmod 0700 %s"
+
+msgid "print debugging messages to stderr"
+msgstr "druk ontfoutingsboodskappe na stderr"
+
+msgid "credential-cache--daemon unavailable; no unix socket support"
+msgstr ""
+"credential-cache--daemon nie beskikbaar nie; geen unix-sokondersteuning nie"
+
+msgid "credential-cache unavailable; no unix socket support"
+msgstr "credential-cache nie beskikbaar nie; geen unix-sokondersteuning nie"
+
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "kan nie binne %d ms 'n slot op die geloofsbriefberging kry nie"
+
+msgid ""
+"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]"
+msgstr ""
+"git describe [--all] [--tags] [--contains] [--abbrev=<n>] "
+"[<vasleggingagtige>...]"
+
+msgid ""
+"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]"
+msgstr ""
+"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<merk>]"
+
+msgid "git describe <blob>"
+msgstr "git describe <blob>"
+
+msgid "head"
+msgstr "kop"
+
+msgid "lightweight"
+msgstr "liggewig"
+
+msgid "annotated"
+msgstr "geannoteer"
+
+#, c-format
+msgid "annotated tag %s not available"
+msgstr "geannoteerde etiket %s is nie beskikbaar nie"
+
+#, c-format
+msgid "tag '%s' is externally known as '%s'"
+msgstr "etiket '%s' is ekstern bekend as '%s'"
+
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr "geen etiket pas presies by '%s' nie"
+
+#, c-format
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr ""
+"Geen presiese passing op verwysings of etikette nie, soek om te beskryf\n"
+
+#, c-format
+msgid "finished search at %s\n"
+msgstr "soektog voltooi by %s\n"
+
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
+msgstr ""
+"Geen geannoteerde etikette kan '%s' beskryf nie.\n"
+"Daar was egter ongeannoteerde etikette: probeer --tags."
+
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr ""
+"Geen etikette kan '%s' beskryf nie.\n"
+"Probeer --always, of skep 'n paar etikette."
+
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr "%lu vasleggings deurloop\n"
+
+#, c-format
+msgid "found %i tags; gave up search at %s\n"
+msgstr "%i etikette gevind; soektog by %s gestaak\n"
+
+#, c-format
+msgid "cannot search for blob '%s' on an unborn branch"
+msgstr "kan nie na blob '%s' op 'n ongebore tak soek nie"
+
+#, c-format
+msgid "blob '%s' not reachable from HEAD"
+msgstr "blob '%s' is nie vanaf HEAD bereikbaar nie"
+
+#, c-format
+msgid "describe %s\n"
+msgstr "beskryf %s\n"
+
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "Nie 'n geldige objeknaam nie: %s"
+
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s is nóg 'n vaslegging nóg 'n blob"
+
+msgid "find the tag that comes after the commit"
+msgstr "vind die etiket wat ná die vaslegging kom"
+
+msgid "debug search strategy on stderr"
+msgstr "ontfout soekstrategie op stderr"
+
+msgid "use any ref"
+msgstr "gebruik enige verwysing"
+
+msgid "use any tag, even unannotated"
+msgstr "gebruik enige etiket, selfs ongeannoteerde"
+
+msgid "always use long format"
+msgstr "gebruik altyd lang formaat"
+
+msgid "only follow first parent"
+msgstr "volg slegs eerste ouer"
+
+msgid "only output exact matches"
+msgstr "voer slegs presiese passings uit"
+
+msgid "consider <n> most recent tags (default: 10)"
+msgstr "oorweeg <n> mees onlangse etikette (verstek: 10)"
+
+msgid "only consider tags matching <pattern>"
+msgstr "oorweeg slegs etikette wat by <patroon> pas"
+
+msgid "do not consider tags matching <pattern>"
+msgstr "moenie etikette oorweeg wat by <patroon> pas nie"
+
+msgid "show abbreviated commit object as fallback"
+msgstr "wys verkorte vasleggingsobjek as terugvaloplossing"
+
+msgid "mark"
+msgstr "merk"
+
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr "voeg <merk> by op vuil werkboom (verstek: \"-dirty\")"
+
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr "voeg <merk> by op stukkende werkboom (verstek: \"-broken\")"
+
+msgid "No names found, cannot describe anything."
+msgstr "Geen name gevind nie, kan niks beskryf nie."
+
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "opsie '%s' en vasleggingagtiges kan nie saam gebruik word nie"
+
+msgid ""
+"git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n"
+"             [--mode=<mode>]"
+msgstr ""
+"git diagnose [(-o | --output-directory) <pad>] [(-s | --suffix) <formaat>]\n"
+"             [--mode=<modus>]"
+
+msgid "specify a destination for the diagnostics archive"
+msgstr "spesifiseer 'n bestemming vir die diagnostiese argief"
+
+msgid "specify a strftime format suffix for the filename"
+msgstr "spesifiseer 'n strftime-formaatagtervoegsel vir die lêernaam"
+
+msgid "specify the content of the diagnostic archive"
+msgstr "spesifiseer die inhoud van die diagnostiese argief"
+
+#, c-format
+msgid "unable to parse mode: %s"
+msgstr "kan nie modus ontleed nie: %s"
+
+#, c-format
+msgid "unable to parse object id: %s"
+msgstr "kan nie objek-id ontleed nie: %s"
+
+msgid "git diff-pairs -z [<diff-options>]"
+msgstr "git diff-pairs -z [<diff-opsies>]"
+
+msgid "working without -z is not supported"
+msgstr "werk sonder -z word nie ondersteun nie"
+
+msgid "pathspec arguments not supported"
+msgstr "padspesifikasie-argumente word nie ondersteun nie"
+
+msgid "revision arguments not allowed"
+msgstr "hersieningsargumente word nie toegelaat nie"
+
+msgid "invalid raw diff input"
+msgstr "ongeldige rou diff-invoer"
+
+msgid "tree objects not supported"
+msgstr "boomobjekte word nie ondersteun nie"
+
+msgid "got EOF while reading path"
+msgstr "EOF teëgekom tydens lees van pad"
+
+msgid "got EOF while reading destination path"
+msgstr "EOF teëgekom tydens lees van bestemmingspad"
+
+#, c-format
+msgid "unable to parse rename/copy score: %s"
+msgstr "kan nie hernoem-/kopieertelling ontleed nie: %s"
+
+#, c-format
+msgid "unknown diff status: %c"
+msgstr "onbekende diff-status: %c"
+
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base werk slegs met twee vasleggings"
+
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr "'%s': nie 'n gewone lêer of simboliese skakel nie"
+
+msgid "no merge given, only parents."
+msgstr "geen saamsmelting gegee nie, slegs ouers."
+
+#, c-format
+msgid "invalid option: %s"
+msgstr "ongeldige opsie: %s"
+
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s: geen saamsmeltbasis nie"
+
+msgid "cannot come back to cwd"
+msgstr "kan nie na huidige werkgids terugkeer nie"
+
+msgid "Not a git repository"
+msgstr "Nie 'n Git-bewaarplek nie"
+
+#, c-format
+msgid "invalid object '%s' given."
+msgstr "ongeldige objek '%s' gegee."
+
+#, c-format
+msgid "unable to read tree object for commit '%s'"
+msgstr "kan nie boomobjek vir vaslegging '%s' lees nie"
+
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr "meer as twee blobs gegee: '%s'"
+
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr "onhanteerde objek '%s' gegee."
+
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr "%s...%s: veelvuldige saamsmeltbasisse, gebruik %s"
+
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+msgstr "git difftool [<opsies>] [<vaslegging> [<vaslegging>]] [--] [<pad>...]"
+
+#, c-format
+msgid "could not read symlink %s"
+msgstr "kon nie simboliese skakel %s lees nie"
+
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "kon nie simboliese skakellêer %s lees nie"
+
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr "kon nie objek %s vir simboliese skakel %s lees nie"
+
+msgid ""
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
+msgstr ""
+"gekombineerde diff-formate ('-c' en '--cc') word nie ondersteun in\n"
+"gids-diff-modus ('-d' en '--dir-diff') nie."
+
+#, c-format
+msgid "both files modified: '%s' and '%s'."
+msgstr "albei lêers gewysig: '%s' en '%s'."
+
+msgid "working tree file has been left."
+msgstr "werkboomlêer is agtergelaat."
+
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "kon nie '%s' na '%s' kopieer nie"
+
+#, c-format
+msgid "temporary files exist in '%s'."
+msgstr "tydelike lêers bestaan in '%s'."
+
+msgid "you may want to cleanup or recover these."
+msgstr "u wil dit dalk opruim of herstel."
+
+#, c-format
+msgid "failed: %d"
+msgstr "misluk: %d"
+
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr "gebruik `diff.guitool` in plaas van `diff.tool`"
+
+msgid "perform a full-directory diff"
+msgstr "voer 'n volledige gids-diff uit"
+
+msgid "do not prompt before launching a diff tool"
+msgstr "moenie vra voordat 'n diff-hulpmiddel gelanseer word nie"
+
+msgid "use symlinks in dir-diff mode"
+msgstr "gebruik simboliese skakels in dir-diff-modus"
+
+msgid "tool"
+msgstr "hulpmiddel"
+
+msgid "use the specified diff tool"
+msgstr "gebruik die gespesifiseerde diff-hulpmiddel"
+
+msgid "print a list of diff tools that may be used with `--tool`"
+msgstr "druk 'n lys van diff-hulpmiddels wat met `--tool` gebruik kan word"
+
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
+"code"
+msgstr ""
+"laat 'git-difftool' afsluit wanneer 'n opgeroepte diff-hulpmiddel 'n "
+"afsluitkode anders as nul teruggee"
+
+msgid "specify a custom command for viewing diffs"
+msgstr "spesifiseer 'n pasgemaakte opdrag om verskille te bekyk"
+
+msgid "passed to `diff`"
+msgstr "aan `diff` deurgegee"
+
+msgid "difftool requires worktree or --no-index"
+msgstr "difftool vereis 'n werkboom of --no-index"
+
+msgid "no <tool> given for --tool=<tool>"
+msgstr "geen <hulpmiddel> vir --tool=<hulpmiddel> gegee nie"
+
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr "geen <opdrag> vir --extcmd=<opdrag> gegee nie"
+
+msgid "git fast-export [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git fast-export [<opsies>] [<hersieningsreeks>] [[--] <pad>...]"
+
+#, c-format
+msgid "unknown %s mode: %s"
+msgstr "onbekende %s-modus: %s"
+
+#, c-format
+msgid "unknown tag-of-filtered mode: %s"
+msgstr "onbekende tag-of-filtered-modus: %s"
+
+#, c-format
+msgid "unknown reencoding mode: %s"
+msgstr "onbekende herkoderingsmodus: %s"
+
+#, c-format
+msgid "could not read blob %s"
+msgstr "kon nie blob %s lees nie"
+
+#, c-format
+msgid "oid mismatch in blob %s"
+msgstr "oid stem nie ooreen in blob %s nie"
+
+#, c-format
+msgid "could not write blob '%s'"
+msgstr "kon nie blob '%s' skryf nie"
+
+#, c-format
+msgid "unexpected comparison status '%c' for %s, %s"
+msgstr "onverwagte vergelykingstatus '%c' vir %s, %s"
+
+msgid "none"
+msgstr "geen"
+
+#, c-format
+msgid "could not find author in commit %s"
+msgstr "kon nie outeur in vaslegging %s vind nie"
+
+#, c-format
+msgid "could not find committer in commit %s"
+msgstr "kon nie vaslegger in vaslegging %s vind nie"
+
+#, c-format
+msgid ""
+"encountered commit-specific encoding %.*s in commit %s; use --reencode=[yes|"
+"no] to handle it"
+msgstr ""
+"vaslegging-spesifieke kodering %.*s in vaslegging %s teëgekom; gebruik --"
+"reencode=[yes|no] om dit te hanteer"
+
+#, c-format
+msgid "exporting %<PRIuMAX> signature(s) for commit %s"
+msgstr "voer %<PRIuMAX> handtekening(e) vir vaslegging %s uit"
+
+#, c-format
+msgid "stripping signature(s) from commit %s"
+msgstr "stroop handtekening(e) van vaslegging %s af"
+
+#, c-format
+msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it"
+msgstr ""
+"ondertekende vaslegging %s teëgekom; gebruik --signed-commits=<modus> om dit "
+"te hanteer"
+
+#, c-format
+msgid ""
+"omitting tag %s,\n"
+"since tags of trees (or tags of tags of trees, etc.) are not supported."
+msgstr ""
+"laat etiket %s weg,\n"
+"aangesien etikette van bome (of etikette van etikette van bome, ens.) nie "
+"ondersteun word nie."
+
+#, c-format
+msgid "could not read tag %s"
+msgstr "kon nie etiket %s lees nie"
+
+#, c-format
+msgid "exporting signed tag %s"
+msgstr "voer ondertekende etiket %s uit"
+
+#, c-format
+msgid "stripping signature from tag %s"
+msgstr "stroop handtekening van etiket %s af"
+
+#, c-format
+msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it"
+msgstr ""
+"ondertekende etiket %s teëgekom; gebruik --signed-tags=<modus> om dit te "
+"hanteer"
+
+#, c-format
+msgid ""
+"tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle "
+"it"
+msgstr ""
+"etiket %s etiketteer 'n onuitgevoerde objek; gebruik --tag-of-filtered-"
+"object=<modus> om dit te hanteer"
+
+msgid "cannot export nested tags unless --mark-tags is specified."
+msgstr ""
+"kan nie geneste etikette uitvoer nie, tensy --mark-tags gespesifiseer is."
+
+#, c-format
+msgid "tag %s points nowhere?"
+msgstr "etiket %s wys nêrens heen nie?"
+
+#, c-format
+msgid "%s: unexpected object of type %s, skipping."
+msgstr "%s: onverwagte objek van tipe %s, word oorgeslaan."
+
+#, c-format
+msgid "tag points to object of unexpected type %s, skipping."
+msgstr "etiket wys na objek van onverwagte tipe %s, word oorgeslaan."
+
+#, c-format
+msgid "unable to open marks file %s for writing."
+msgstr "kan nie merkelêer %s vir skryf oopmaak nie."
+
+#, c-format
+msgid "unable to write marks file %s."
+msgstr "kan nie merkelêer %s skryf nie."
+
+#, c-format
+msgid "corrupt mark line: %s"
+msgstr "korrupte merkreël: %s"
+
+#, c-format
+msgid "object not found: %s"
+msgstr "objek nie gevind nie: %s"
+
+#, c-format
+msgid "not a commit? can't happen: %s"
+msgstr "nie 'n vaslegging nie? kan nie gebeur nie: %s"
+
+#, c-format
+msgid "object %s already has a mark"
+msgstr "objek %s het reeds 'n merk"
+
+msgid "--anonymize-map token cannot be empty"
+msgstr "teken --anonymize-map kan nie leeg wees nie"
+
+msgid "show progress after <n> objects"
+msgstr "wys vordering ná <n> objekte"
+
+msgid "select handling of signed tags"
+msgstr "kies hantering van ondertekende etikette"
+
+msgid "select handling of signed commits"
+msgstr "kies hantering van ondertekende vasleggings"
+
+msgid "select handling of tags that tag filtered objects"
+msgstr "kies hantering van etikette wat gefiltreerde objekte etiketteer"
+
+msgid "select handling of commit messages in an alternate encoding"
+msgstr "kies hantering van vasleggingsboodskappe in 'n alternatiewe kodering"
+
+msgid "dump marks to this file"
+msgstr "stort merke na hierdie lêer"
+
+msgid "import marks from this file"
+msgstr "voer merke vanaf hierdie lêer in"
+
+msgid "import marks from this file if it exists"
+msgstr "voer merke vanaf hierdie lêer in indien dit bestaan"
+
+msgid "fake a tagger when tags lack one"
+msgstr "vervals 'n etiketteerder wanneer etikette een kortkom"
+
+msgid "output full tree for each commit"
+msgstr "voer die volledige boom vir elke vaslegging uit"
+
+msgid "use the done feature to terminate the stream"
+msgstr "gebruik die done-funksie om die stroom te beëindig"
+
+msgid "skip output of blob data"
+msgstr "slaan uitvoer van blobdata oor"
+
+msgid "refspec"
+msgstr "verwysingspesifikasie"
+
+msgid "apply refspec to exported refs"
+msgstr "pas verwysingspesifikasie toe op uitgevoerde verwysings"
+
+msgid "anonymize output"
+msgstr "anonimiseer uitvoer"
+
+msgid "from:to"
+msgstr "van:na"
+
+msgid "convert <from> to <to> in anonymized output"
+msgstr "skakel <van> om na <na> in geanonimiseerde uitvoer"
+
+msgid "reference parents which are not in fast-export stream by object id"
+msgstr ""
+"verwys na ouers wat nie in die fast-export-stroom is nie volgens objek-id"
+
+msgid "show original object ids of blobs/commits"
+msgstr "wys oorspronklike objek-id's van blobs/vasleggings"
+
+msgid "label tags with mark ids"
+msgstr "benoem etikette met merk-id's"
+
+#, c-format
+msgid "can't write crash report %s"
+msgstr "kan nie omvalverslag %s skryf nie"
+
+#, c-format
+msgid "fast-import: dumping crash report to %s\n"
+msgstr "fast-import: stort omvalverslag na %s\n"
+
+#, c-format
+msgid "mark :%<PRIuMAX> not declared"
+msgstr "merk :%<PRIuMAX> is nie verklaar nie"
+
+#, c-format
+msgid "invalid attempt to create duplicate branch: %s"
+msgstr "ongeldige poging om duplikaattak te skep: %s"
+
+#, c-format
+msgid "branch name doesn't conform to Git standards: %s"
+msgstr "taknaam voldoen nie aan Git-standaarde nie: %s"
+
+msgid "internal consistency error creating the index"
+msgstr "interne konsekwentheidsfout tydens skep van die indeks"
+
+msgid "cannot create keep file"
+msgstr "kan nie keep-lêer skep nie"
+
+msgid "failed to write keep file"
+msgstr "kon nie keep-lêer skryf nie"
+
+msgid "cannot store pack file"
+msgstr "kan nie paklêer stoor nie"
+
+msgid "cannot store index file"
+msgstr "kan nie indekslêer stoor nie"
+
+#, c-format
+msgid "failed seeking to start of '%s'"
+msgstr "kon nie na die begin van '%s' soek nie"
+
+#, c-format
+msgid "core Git rejected index %s"
+msgstr "kern-Git het indeks %s verwerp"
+
+msgid "cannot truncate pack to skip duplicate"
+msgstr "kan nie pak afknip om duplikaat oor te slaan nie"
+
+#, c-format
+msgid "EOF in data (%<PRIuMAX> bytes remaining)"
+msgstr "EOF in data (%<PRIuMAX> grepe oor)"
+
+#, c-format
+msgid "unexpected deflate failure: %d"
+msgstr "onverwagte deflate-mislukking: %d"
+
+#, c-format
+msgid "not a tree: %s"
+msgstr "nie 'n boom nie: %s"
+
+#, c-format
+msgid "can't load tree %s"
+msgstr "kan nie boom %s laai nie"
+
+#, c-format
+msgid "corrupt mode in %s"
+msgstr "korrupte modus in %s"
+
+msgid "root cannot be a non-directory"
+msgstr "wortel kan nie 'n nie-gids wees nie"
+
+msgid "empty path component found in input"
+msgstr "leë padkomponent in invoer gevind"
+
+msgid "non-directories cannot have subtrees"
+msgstr "nie-gidse kan nie subbome hê nie"
+
+#, c-format
+msgid "dropping %s since it would point to itself (i.e. to %s)"
+msgstr "laat %s val aangesien dit na homself sou wys (d.w.s. na %s)"
+
+#, c-format
+msgid "branch %s is missing commits."
+msgstr "tak %s kort vasleggings."
+
+#, c-format
+msgid "not updating %s (new tip %s does not contain %s)"
+msgstr "%s word nie bygewerk nie (nuwe punt %s bevat nie %s nie)"
+
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "kan nie voorafgaande gidse van %s skep nie"
+
+#, c-format
+msgid "unable to write marks file %s"
+msgstr "kan nie merkelêer %s skryf nie"
+
+#, c-format
+msgid "unable to write marks file %s: %s"
+msgstr "kan nie merkelêer %s skryf nie: %s"
+
+#, c-format
+msgid "unable to write file %s"
+msgstr "kan nie lêer %s skryf nie"
+
+#, c-format
+msgid "expected 'data n' command, found: %s"
+msgstr "het 'data n'-opdrag verwag, gevind: %s"
+
+#, c-format
+msgid "EOF in data (terminator '%s' not found)"
+msgstr "EOF in data (afsluiter '%s' nie gevind nie)"
+
+msgid "data is too large to use in this context"
+msgstr "data is te groot om in hierdie konteks te gebruik"
+
+#, c-format
+msgid "EOF in data (%lu bytes remaining)"
+msgstr "EOF in data (%lu grepe oor)"
+
+#, c-format
+msgid "missing < in ident string: %s"
+msgstr "ontbrekende < in identiteitstring: %s"
+
+#, c-format
+msgid "missing space before < in ident string: %s"
+msgstr "ontbrekende spasie voor < in identiteitstring: %s"
+
+#, c-format
+msgid "missing > in ident string: %s"
+msgstr "ontbrekende > in identiteitstring: %s"
+
+#, c-format
+msgid "missing space after > in ident string: %s"
+msgstr "ontbrekende spasie ná > in identiteitstring: %s"
+
+#, c-format
+msgid "invalid raw date \"%s\" in ident: %s"
+msgstr "ongeldige rou datum \"%s\" in identiteit: %s"
+
+#, c-format
+msgid "invalid rfc2822 date \"%s\" in ident: %s"
+msgstr "ongeldige rfc2822-datum \"%s\" in identiteit: %s"
+
+#, c-format
+msgid "date in ident must be 'now': %s"
+msgstr "datum in identiteit moet 'now' wees: %s"
+
+#, c-format
+msgid "too large fanout (%u)"
+msgstr "te groot waaier (%u)"
+
+#, c-format
+msgid "failed to remove path %s"
+msgstr "kon nie pad %s verwyder nie"
+
+#, c-format
+msgid "no value after ':' in mark: %s"
+msgstr "geen waarde ná ':' in merk nie: %s"
+
+#, c-format
+msgid "garbage after mark: %s"
+msgstr "gemors ná merk: %s"
+
+#, c-format
+msgid "missing space after mark: %s"
+msgstr "ontbrekende spasie ná merk: %s"
+
+#, c-format
+msgid "invalid %s: %s"
+msgstr "ongeldige %s: %s"
+
+#, c-format
+msgid "NUL in %s: %s"
+msgstr "NUL in %s: %s"
+
+#, c-format
+msgid "garbage after %s: %s"
+msgstr "gemors ná %s: %s"
+
+#, c-format
+msgid "missing space after %s: %s"
+msgstr "ontbrekende spasie ná %s: %s"
+
+#, c-format
+msgid "corrupt mode: %s"
+msgstr "korrupte modus: %s"
+
+#, c-format
+msgid "invalid dataref: %s"
+msgstr "ongeldige dataverwysing: %s"
+
+#, c-format
+msgid "missing space after SHA1: %s"
+msgstr "ontbrekende spasie ná SHA1: %s"
+
+#, c-format
+msgid "Git links cannot be specified 'inline': %s"
+msgstr "Git-skakels kan nie 'inline' gespesifiseer word nie: %s"
+
+#, c-format
+msgid "not a commit (actually a %s): %s"
+msgstr "nie 'n vaslegging nie (eintlik 'n %s): %s"
+
+#, c-format
+msgid "directories cannot be specified 'inline': %s"
+msgstr "gidse kan nie 'inline' gespesifiseer word nie: %s"
+
+#, c-format
+msgid "%s not found: %s"
+msgstr "%s nie gevind nie: %s"
+
+msgid "tree"
+msgstr "boom"
+
+#, c-format
+msgid "not a %s (actually a %s): %s"
+msgstr "nie 'n %s nie (eintlik 'n %s): %s"
+
+#, c-format
+msgid "path %s not in branch"
+msgstr "pad %s is nie in tak nie"
+
+msgid "can't add a note on empty branch."
+msgstr "kan nie 'n nota op 'n leë tak byvoeg nie."
+
+#, c-format
+msgid "mark :%<PRIuMAX> not a commit"
+msgstr "merk :%<PRIuMAX> is nie 'n vaslegging nie"
+
+#, c-format
+msgid "not a valid commit: %s"
+msgstr "nie 'n geldige vaslegging nie: %s"
+
+#, c-format
+msgid "invalid ref name or SHA1 expression: %s"
+msgstr "ongeldige verwysingsnaam of SHA1-uitdrukking: %s"
+
+#, c-format
+msgid "not a blob (actually a %s): %s"
+msgstr "nie 'n blob nie (eintlik 'n %s): %s"
+
+#, c-format
+msgid "blob not found: %s"
+msgstr "blob nie gevind nie: %s"
+
+#, c-format
+msgid "the commit %s is corrupt"
+msgstr "die vaslegging %s is korrup"
+
+#, c-format
+msgid "can't create a branch from itself: %s"
+msgstr "kan nie 'n tak van homself skep nie: %s"
+
+#, c-format
+msgid ""
+"expected gpgsig format: 'gpgsig <hash-algo> <signature-format>', got 'gpgsig "
+"%s'"
+msgstr ""
+"verwagte gpgsig-formaat: 'gpgsig <hash-algo> <signature-format>', het "
+"'gpgsig %s' gekry"
+
+#, c-format
+msgid "unknown git hash algorithm in gpgsig: '%s'"
+msgstr "onbekende Git-hutsalgoritme in gpgsig: '%s'"
+
+#, c-format
+msgid "invalid signature format in gpgsig: '%s'"
+msgstr "ongeldige handtekeningformaat in gpgsig: '%s'"
+
+msgid "'unknown' signature format in gpgsig"
+msgstr "'unknown' handtekeningformaat in gpgsig"
+
+#, c-format
+msgid "multiple %s signatures found, ignoring additional signature"
+msgstr "veelvuldige %s-handtekeninge gevind, ignoreer bykomende handtekening"
+
+msgid "parse_one_signature() returned unknown hash algo"
+msgstr "parse_one_signature() het 'n onbekende hutsalgoritme teruggegee"
+
+msgid "unknown"
+msgstr "onbekend"
+
+#, c-format
+msgid ""
+"stripping invalid signature for commit '%.100s...'\n"
+"  allegedly by %s"
+msgstr ""
+"stroop ongeldige handtekening vir vaslegging '%.100s...' af\n"
+"  kwansuis deur %s"
+
+#, c-format
+msgid ""
+"stripping invalid signature for commit '%.*s'\n"
+"  allegedly by %s"
+msgstr ""
+"stroop ongeldige handtekening vir vaslegging '%.*s' af\n"
+"  kwansuis deur %s"
+
+#, c-format
+msgid ""
+"stripping invalid signature for commit\n"
+"  allegedly by %s"
+msgstr ""
+"stroop ongeldige handtekening vir vaslegging af\n"
+"  kwansuis deur %s"
+
+#, c-format
+msgid ""
+"replacing invalid signature for commit '%.100s...'\n"
+"  allegedly by %s"
+msgstr ""
+"vervang ongeldige handtekening vir vaslegging '%.100s...'\n"
+"  kwansuis deur %s"
+
+#, c-format
+msgid ""
+"replacing invalid signature for commit '%.*s'\n"
+"  allegedly by %s"
+msgstr ""
+"vervang ongeldige handtekening vir vaslegging '%.*s'\n"
+"  kwansuis deur %s"
+
+#, c-format
+msgid ""
+"replacing invalid signature for commit\n"
+"  allegedly by %s"
+msgstr ""
+"vervang ongeldige handtekening vir vaslegging\n"
+"  kwansuis deur %s"
+
+msgid "aborting due to invalid signature"
+msgstr "staak weens ongeldige handtekening"
+
+msgid "signing commits in interoperability mode is unsupported"
+msgstr ""
+"ondertekening van vasleggings in interoperabiliteitsmodus word nie "
+"ondersteun nie"
+
+msgid "failed to sign commit object"
+msgstr "kon nie vasleggingsobjek onderteken nie"
+
+msgid "expected committer but didn't get one"
+msgstr "het 'n vaslegger verwag, maar nie een gekry nie"
+
+msgid "encountered signed commit; use --signed-commits=<mode> to handle it"
+msgstr ""
+"ondertekende vaslegging teëgekom; gebruik --signed-commits=<modus> om dit te "
+"hanteer"
+
+msgid "stripping a commit signature"
+msgstr "stroop 'n vasleggingshandtekening af"
+
+msgid "importing a commit signature verbatim"
+msgstr "voer 'n vasleggingshandtekening woordeliks in"
+
+msgid "failed to sign tag object"
+msgstr "kon nie etiketobjek onderteken nie"
+
+#, c-format
+msgid "importing a tag signature verbatim for tag '%s'"
+msgstr "voer 'n etikethandtekening woordeliks in vir etiket '%s'"
+
+#, c-format
+msgid "stripping a tag signature for tag '%s'"
+msgstr "stroop 'n etikethandtekening af vir etiket '%s'"
+
+msgid "encountered signed tag; use --signed-tags=<mode> to handle it"
+msgstr ""
+"ondertekende etiket teëgekom; gebruik --signed-tags=<modus> om dit te hanteer"
+
+#, c-format
+msgid "expected 'from' command, got '%s'"
+msgstr "het 'from'-opdrag verwag, het '%s' gekry"
+
+msgid "can't tag an empty branch."
+msgstr "kan nie 'n leë tak etiketteer nie."
+
+#, c-format
+msgid "not a valid object: %s"
+msgstr "nie 'n geldige objek nie: %s"
+
+msgid "write to frontend failed"
+msgstr "skryf na voorkant het misluk"
+
+#, c-format
+msgid "can't read object %s"
+msgstr "kan nie objek %s lees nie"
+
+#, c-format
+msgid "object %s is a %s but a blob was expected."
+msgstr "objek %s is 'n %s, maar 'n blob is verwag."
+
+#, c-format
+msgid "not a mark: %s"
+msgstr "nie 'n merk nie: %s"
+
+#, c-format
+msgid "unknown mark: %s"
+msgstr "onbekende merk: %s"
+
+#, c-format
+msgid "garbage after SHA1: %s"
+msgstr "gemors ná SHA1: %s"
+
+#, c-format
+msgid "not a tree-ish: %s"
+msgstr "nie 'n boomagtige nie: %s"
+
+#, c-format
+msgid "can't load object %s"
+msgstr "kan nie objek %s laai nie"
+
+#, c-format
+msgid "invalid SHA1 in tag: %s"
+msgstr "ongeldige SHA1 in etiket: %s"
+
+#, c-format
+msgid "invalid SHA1 in commit: %s"
+msgstr "ongeldige SHA1 in vaslegging: %s"
+
+#, c-format
+msgid "missing from marks for submodule '%s'"
+msgstr "ontbrekende van-merke vir submodule '%s'"
+
+#, c-format
+msgid "missing to marks for submodule '%s'"
+msgstr "ontbrekende na-merke vir submodule '%s'"
+
+#, c-format
+msgid "missing space after tree-ish: %s"
+msgstr "ontbrekende spasie ná boomagtige: %s"
+
+#, c-format
+msgid "not in a commit: %s"
+msgstr "nie in 'n vaslegging nie: %s"
+
+#, c-format
+msgid "expected 'mark' command, got %s"
+msgstr "het 'mark'-opdrag verwag, het %s gekry"
+
+#, c-format
+msgid "expected 'to' command, got %s"
+msgstr "het 'to'-opdrag verwag, het %s gekry"
+
+msgid "only one import-marks command allowed per stream"
+msgstr "slegs een import-marks-opdrag word per stroom toegelaat"
+
+#, c-format
+msgid "unknown --date-format argument %s"
+msgstr "onbekende argument --date-format %s"
+
+#, c-format
+msgid "%s: argument must be a non-negative integer"
+msgstr "%s: argument moet 'n nie-negatiewe heelgetal wees"
+
+#, c-format
+msgid "--depth cannot exceed %u"
+msgstr "--depth kan nie %u oorskry nie"
+
+#, c-format
+msgid "--cat-blob-fd cannot exceed %d"
+msgstr "--cat-blob-fd kan nie %d oorskry nie"
+
+msgid "expected format name:filename for submodule rewrite option"
+msgstr "verwagte formaat naam:lêernaam vir submodule-herskryfopsie"
+
+msgid "--max-pack-size: argument must be a non-negative integer"
+msgstr "--max-pack-size: argument moet 'n nie-negatiewe heelgetal wees"
+
+#, c-format
+msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum"
+msgstr "max-pack-size is nou in grepe, neem --max-pack-size=%lum aan"
+
+msgid "minimum max-pack-size is 1 MiB"
+msgstr "minimum max-pack-size is 1 MiB"
+
+msgid "--big-file-threshold: argument must be a non-negative integer"
+msgstr "--big-file-threshold: argument moet 'n nie-negatiewe heelgetal wees"
+
+#, c-format
+msgid "unknown --signed-commits mode '%s'"
+msgstr "onbekende modus --signed-commits '%s'"
+
+#, c-format
+msgid "unknown --signed-tags mode '%s'"
+msgstr "onbekende modus --signed-tags '%s'"
+
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "funksie '%s' is verbode in invoer sonder --allow-unsafe-features"
+
+#, c-format
+msgid "got feature command '%s' after data command"
+msgstr "funksie-opdrag '%s' ná data-opdrag ontvang"
+
+#, c-format
+msgid "this version of fast-import does not support feature %s."
+msgstr "hierdie weergawe van fast-import ondersteun nie funksie %s nie."
+
+#, c-format
+msgid "got option command '%s' after data command"
+msgstr "opsie-opdrag '%s' ná data-opdrag ontvang"
+
+#, c-format
+msgid "this version of fast-import does not support option: %s"
+msgstr "hierdie weergawe van fast-import ondersteun nie opsie nie: %s"
+
+msgid "git fast-import [<options>]"
+msgstr "git fast-import [<opsies>]"
+
+msgid "Common"
+msgstr "Algemeen"
+
+msgid "format of the commit/tag dates"
+msgstr "formaat van die vaslegging-/etiketdatums"
+
+msgid "display some basic statistics (objects, packfiles and memory)"
+msgstr "vertoon 'n paar basiese statistieke (objekte, paklêers en geheue)"
+
+msgid "disable the output shown by --stats"
+msgstr "deaktiveer die afvoer wat deur --stats gewys word"
+
+msgid "force updating modified existing branches"
+msgstr "dwing die bywerking van gewysigde bestaande takke af"
+
+msgid "require a terminating 'done' command"
+msgstr "vereis 'n afsluitende opdrag 'done'"
+
+msgid "maximum size of each output pack file"
+msgstr "maksimum grootte van elke uitvoerpaklêer"
+
+msgid "maximum size of a blob that will be deltified"
+msgstr "maksimum grootte van 'n blob wat as delta gestoor sal word"
+
+msgid "maximum delta depth"
+msgstr "maksimum delta-diepte"
+
+msgid "maximum number of branches to maintain active"
+msgstr "maksimum aantal takke om aktief te hou"
+
+msgid "Marks"
+msgstr "Merke"
+
+msgid "import marks from <file>"
+msgstr "voer merke vanaf <lêer> in"
+
+msgid "import marks from <file> if it exists"
+msgstr "voer merke vanaf <lêer> in indien dit bestaan"
+
+msgid "dump marks to <file>"
+msgstr "stort merke na <lêer>"
+
+msgid "are --(import|export)-marks= paths relative to '.git/info/fast-import'?"
+msgstr ""
+"is paaie van --(import|export)-marks= relatief tot '.git/info/fast-import'?"
+
+msgid "Submodule rewrite"
+msgstr "Herskrywing van submodules"
+
+msgid "name:filename"
+msgstr "naam:lêernaam"
+
+msgid "rewrite object IDs for submodule <name> from <filename>"
+msgstr "herskryf objek-ID's vir submodule <naam> vanaf <lêernaam>"
+
+msgid "rewrite object IDs for submodule <name> to <filename>"
+msgstr "herskryf objek-ID's vir submodule <naam> na <lêernaam>"
+
+msgid "Signing"
+msgstr "Ondertekening"
+
+msgid "how to handle signed commits"
+msgstr "hoe om ondertekende vasleggings te hanteer"
+
+msgid "how to handle signed tags"
+msgstr "hoe om ondertekende etikette te hanteer"
+
+msgid "Advanced"
+msgstr "Gevorderd"
+
+msgid "allow unsafe mark commands from the stream"
+msgstr "laat onveilige merkopdragte vanaf die stroom toe"
+
+msgid "dump edge commits to <file>"
+msgstr "stort randvasleggings na <lêer>"
+
+msgid "fd"
+msgstr "lb"
+
+msgid "write some responses to <fd> instead of stdout"
+msgstr "skryf sommige antwoorde na <lb> in plaas van stdout"
+
+#, c-format
+msgid "unsupported command: %s"
+msgstr "nie-ondersteunde opdrag: %s"
+
+msgid "stream ends early"
+msgstr "stroom eindig vroeg"
+
+#, c-format
+msgid "Lockfile created but not reported: %s"
+msgstr "Sluitlêer geskep maar nie gerapporteer nie: %s"
+
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<opsies>] [<bewaarplek> [<verwysingspesifikasie>...]]"
+
+msgid "git fetch [<options>] <group>"
+msgstr "git fetch [<opsies>] <groep>"
+
+msgid "git fetch --multiple [<options>] [(<repository>|<group>)...]"
+msgstr "git fetch --multiple [<opsies>] [(<bewaarplek>|<groep>)...]"
+
+msgid "git fetch --all [<options>]"
+msgstr "git fetch --all [<opsies>]"
+
+msgid "fetch.parallel cannot be negative"
+msgstr "fetch.parallel kan nie negatief wees nie"
+
+#, c-format
+msgid "unrecognized fetch.followRemoteHEAD value '%s' ignored"
+msgstr "onherkende waarde '%s' vir fetch.followRemoteHEAD geïgnoreer"
+
+msgid "couldn't find remote ref HEAD"
+msgstr "kon nie afgeleë verwysing HEAD vind nie"
+
+#, c-format
+msgid "From %.*s\n"
+msgstr "Vanaf %.*s\n"
+
+#, c-format
+msgid "object %s not found"
+msgstr "objek %s nie gevind nie"
+
+msgid "[up to date]"
+msgstr "[op datum]"
+
+msgid "[rejected]"
+msgstr "[verwerp]"
+
+msgid "can't fetch into checked-out branch"
+msgstr "kan nie in 'n uitgecheckte tak haal nie"
+
+msgid "[tag update]"
+msgstr "[etiketbywerking]"
+
+msgid "unable to update local ref"
+msgstr "kan nie plaaslike verwysing bywerk nie"
+
+msgid "would clobber existing tag"
+msgstr "sou bestaande etiket oorskryf"
+
+msgid "[new tag]"
+msgstr "[nuwe etiket]"
+
+msgid "[new branch]"
+msgstr "[nuwe tak]"
+
+msgid "[new ref]"
+msgstr "[nuwe verwysing]"
+
+msgid "forced update"
+msgstr "geforseerde bywerking"
+
+msgid "non-fast-forward"
+msgstr "nie-vooruitspoel"
+
+#, c-format
+msgid "cannot open '%s'"
+msgstr "kan nie '%s' oopmaak nie"
+
+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 ""
+"haal dui gewoonlik aan watter takke 'n geforseerde bywerking gehad het,\n"
+"maar daardie kontrole is gedeaktiveer; om dit weer te aktiveer, gebruik die\n"
+"'--show-forced-updates'-vlag of voer 'git config fetch.showForcedUpdates "
+"true' uit"
+
+#, 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 ""
+"dit het %.2f sekondes geneem om geforseerde bywerkings na te gaan; u kan\n"
+"'--no-show-forced-updates' gebruik of 'git config fetch.showForcedUpdates "
+"false'\n"
+"uitvoer om hierdie kontrole te vermy\n"
+
+#, c-format
+msgid "%s did not send all necessary objects"
+msgstr "%s het nie alle nodige objekte gestuur nie"
+
+#, c-format
+msgid "rejected %s because shallow roots are not allowed to be updated"
+msgstr "%s verwerp omdat vlak wortels nie bygewerk mag word nie"
+
+msgid "[deleted]"
+msgstr "[geskrap]"
+
+msgid "(none)"
+msgstr "(geen)"
+
+#, c-format
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "weier om te haal in tak '%s' wat by '%s' uitgecheck is"
+
+#, c-format
+msgid "option \"%s\" value \"%s\" is not valid for %s"
+msgstr "opsie \"%s\" se waarde \"%s\" is nie geldig vir %s nie"
+
+#, c-format
+msgid "option \"%s\" is ignored for %s"
+msgstr "opsie \"%s\" word vir %s geïgnoreer"
+
+#, c-format
+msgid "the object %s does not exist"
+msgstr "die objek %s bestaan nie"
+
+#, c-format
+msgid "ignoring %s=%s because it does not match any refs"
+msgstr "ignoreer %s=%s omdat dit nie by enige verwysings pas nie"
+
+#, c-format
+msgid "ignoring %s because the protocol does not support it"
+msgstr "ignoreer %s omdat die protokol dit nie ondersteun nie"
+
+#, c-format
+msgid ""
+"Run 'git remote set-head %s %s' to follow the change, or modify\n"
+"either of the 'remote.%s.followRemoteHEAD' or 'fetch.followRemoteHEAD'\n"
+"configuration variables to handle the situation differently.\n"
+"\n"
+"Using this specific setting\n"
+"\n"
+"    git config set remote.%s.followRemoteHEAD warn-if-not-%s\n"
+"\n"
+"will suppress the warning until the remote changes HEAD to something else."
+msgstr ""
+"Voer 'git remote set-head %s %s' uit om die verandering te volg, of wysig\n"
+"een van die konfigurasieveranderlikes 'remote.%s.followRemoteHEAD' of\n"
+"'fetch.followRemoteHEAD' om die situasie anders te hanteer.\n"
+"\n"
+"Die gebruik van hierdie spesifieke instelling\n"
+"\n"
+"    git config set remote.%s.followRemoteHEAD warn-if-not-%s\n"
+"\n"
+"sal die waarskuwing onderdruk totdat die afgeleë HEAD na iets anders "
+"verander."
+
+msgid ""
+"You're on a case-insensitive filesystem, and the remote you are\n"
+"trying to fetch from has references that only differ in casing. It\n"
+"is impossible to store such references with the 'files' backend. You\n"
+"can either accept this as-is, in which case you won't be able to\n"
+"store all remote references on disk. Or you can alternatively\n"
+"migrate your repository to use the 'reftable' backend with the\n"
+"following command:\n"
+"\n"
+"    git refs migrate --ref-format=reftable\n"
+"\n"
+"Please keep in mind that not all implementations of Git support this\n"
+"new format yet. So if you use tools other than Git to access this\n"
+"repository it may not be an option to migrate to reftables.\n"
+msgstr ""
+"U is op 'n hoofletter-onsensitiewe lêerstelsel, en die afgeleë waarvandaan\n"
+"u probeer haal, het verwysings wat slegs in hoofletters verskil. Dit is\n"
+"onmoontlik om sulke verwysings met die 'files'-agterkant te stoor. U kan\n"
+"dit óf aanvaar soos dit is, in welke geval u nie alle afgeleë verwysings\n"
+"op skyf sal kan stoor nie. Of u kan alternatiewelik u bewaarplek migreer\n"
+"om die 'reftable'-agterkant te gebruik met die volgende opdrag:\n"
+"\n"
+"    git refs migrate --ref-format=reftable\n"
+"\n"
+"Hou asseblief in gedagte dat nog nie alle implementerings van Git hierdie\n"
+"nuwe formaat ondersteun nie. As u dus ander hulpmiddels as Git gebruik om\n"
+"toegang tot hierdie bewaarplek te kry, is migrasie na reftables dalk nie 'n "
+"opsie nie.\n"
+
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"sommige plaaslike verwysings kon nie bygewerk word nie; probeer\n"
+" 'git remote prune %s' uitvoer om enige ou, botsende takke te verwyder"
+
+#, c-format
+msgid "fetching ref %s failed: %s"
+msgstr "haal van verwysing %s het misluk: %s"
+
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr "veelvuldige takke bespeur, onversoenbaar met --set-upstream"
+
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"kon nie stroomop van HEAD na '%s' vanaf '%s' stel nie wanneer dit nie na "
+"enige tak wys nie."
+
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr "stel nie stroomop vir 'n afgeleë afgeleë volgtak nie"
+
+msgid "not setting upstream for a remote tag"
+msgstr "stel nie stroomop vir 'n afgeleë etiket nie"
+
+msgid "unknown branch type"
+msgstr "onbekende taksoort"
+
+msgid ""
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
+msgstr ""
+"geen brontak gevind nie;\n"
+"jy moet presies een tak met die opsie --set-upstream spesifiseer"
+
+#, c-format
+msgid "Fetching %s\n"
+msgstr "Haal %s\n"
+
+#, c-format
+msgid "could not fetch %s"
+msgstr "kon nie %s haal nie"
+
+#, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
+msgstr "kon nie '%s' haal nie (uittreekode: %d)\n"
+
+msgid ""
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
+msgstr ""
+"geen afgeleë bewaarplek gespesifiseer nie; spesifiseer asseblief 'n URL of\n"
+"'n afgeleë naam waarvandaan nuwe revisies gehaal moet word"
+
+msgid "you need to specify a tag name"
+msgstr "jy moet 'n etiketnaam spesifiseer"
+
+msgid "fetch from all remotes"
+msgstr "haal van alle afgeleës"
+
+msgid "set upstream for git pull/fetch"
+msgstr "stel stroomop vir git pull/fetch"
+
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr "voeg by .git/FETCH_HEAD by in plaas daarvan om te oorskryf"
+
+msgid "use atomic transaction to update references"
+msgstr "gebruik 'n atomiese transaksie om verwysings by te werk"
+
+msgid "path to upload pack on remote end"
+msgstr "pad na upload-pack aan die afgeleë kant"
+
+msgid "force overwrite of local reference"
+msgstr "dwing oorskrywing van plaaslike verwysing af"
+
+msgid "fetch from multiple remotes"
+msgstr "haal van veelvuldige afgeleës"
+
+msgid "fetch all tags and associated objects"
+msgstr "haal alle etikette en geassosieerde objekte"
+
+msgid "do not fetch all tags (--no-tags)"
+msgstr "moenie alle etikette haal nie (--no-tags)"
+
+msgid "number of submodules fetched in parallel"
+msgstr "aantal submodules wat parallel gehaal word"
+
+msgid "modify the refspec to place all refs within refs/prefetch/"
+msgstr ""
+"wysig die verwysingspesifikasie om alle verwysings binne refs/prefetch/ te "
+"plaas"
+
+msgid "prune remote-tracking branches no longer on remote"
+msgstr "snoei afgeleë volgtakke wat nie meer op die afgeleë is nie"
+
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr ""
+"snoei plaaslike etikette wat nie meer op die afgeleë is nie en oorskryf "
+"veranderde etikette"
+
+msgid "on-demand"
+msgstr "op-aanvraag"
+
+msgid "control recursive fetching of submodules"
+msgstr "beheer rekursiewe haal van submodules"
+
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr "skryf gehaalde verwysings na die FETCH_HEAD-lêer"
+
+msgid "keep downloaded pack"
+msgstr "hou afgelaaide pak"
+
+msgid "allow updating of HEAD ref"
+msgstr "laat bywerking van HEAD-verwysing toe"
+
+msgid "deepen history of shallow clone"
+msgstr "verdiep geskiedenis van vlak kloon"
+
+msgid "deepen history of shallow repository based on time"
+msgstr "verdiep geskiedenis van vlak bewaarplek gebaseer op tyd"
+
+msgid "convert to a complete repository"
+msgstr "skakel om na 'n volledige bewaarplek"
+
+msgid "re-fetch without negotiating common commits"
+msgstr "haal weer sonder om gemeenskaplike vasleggings te onderhandel"
+
+msgid "prepend this to submodule path output"
+msgstr "voeg dit voor submodule-paduitvoer by"
+
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
+"verstek vir rekursiewe haal van submodules (laer prioriteit as "
+"konfigurasielêers)"
+
+msgid "accept refs that update .git/shallow"
+msgstr "aanvaar verwysings wat .git/shallow bywerk"
+
+msgid "refmap"
+msgstr "verwysingskaart"
+
+msgid "specify fetch refmap"
+msgstr "spesifiseer haal-verwysingskaart"
+
+msgid "revision"
+msgstr "revisie"
+
+msgid "report that we have only objects reachable from this object"
+msgstr ""
+"rapporteer dat ons slegs objekte het wat vanaf hierdie objek bereikbaar is"
+
+msgid "ensure this ref is always sent as a negotiation have"
+msgstr ""
+"verseker dat hierdie verwysing altyd as 'n onderhandelings-\"have\" gestuur "
+"word"
+
+msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
+msgstr ""
+"moenie 'n paklêer haal nie; druk eerder voorouers van onderhandelingspunte"
+
+msgid "run 'maintenance --auto' after fetching"
+msgstr "voer 'maintenance --auto' uit na haal"
+
+msgid "check for forced-updates on all updated branches"
+msgstr "kontroleer vir geforseerde bywerkings op alle bygewerkte takke"
+
+msgid "write the commit-graph after fetching"
+msgstr "skryf die vasleggingsgrafiek na haal"
+
+msgid "accept refspecs from stdin"
+msgstr "aanvaar verwysingspesifikasies vanaf stdin"
+
+msgid "negative depth in --deepen is not supported"
+msgstr "negatiewe diepte in --deepen word nie ondersteun nie"
+
+msgid "--unshallow on a complete repository does not make sense"
+msgstr "--unshallow op 'n volledige bewaarplek maak nie sin nie"
+
+#, c-format
+msgid "failed to fetch bundles from '%s'"
+msgstr "kon nie bundels vanaf '%s' haal nie"
+
+msgid "fetch --all does not take a repository argument"
+msgstr "fetch --all neem nie 'n bewaarplek-argument nie"
+
+msgid "fetch --all does not make sense with refspecs"
+msgstr "fetch --all maak nie sin met verwysingspesifikasies nie"
+
+#, c-format
+msgid "no such remote or remote group: %s"
+msgstr "geen sulke afgeleë of afgeleë groep nie: %s"
+
+msgid "fetching a group and specifying refspecs does not make sense"
+msgstr ""
+"om 'n groep te haal en verwysingspesifikasies te spesifiseer maak nie sin nie"
+
+msgid "must supply remote when using --negotiate-only"
+msgstr "moet 'n afgeleë verskaf wanneer --negotiate-only gebruik word"
+
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "protokol ondersteun nie --negotiate-only nie, verlaat"
+
+#, c-format
+msgid "%s needs one or more %s"
+msgstr "%s benodig een of meer %s"
+
+msgid ""
+"--filter can only be used with the remote configured in "
+"extensions.partialclone"
+msgstr ""
+"--filter kan slegs gebruik word met die afgeleë wat in "
+"extensions.partialclone gekonfigureer is"
+
+msgid "--atomic can only be used when fetching from one remote"
+msgstr "--atomic kan slegs gebruik word wanneer van een afgeleë gehaal word"
+
+msgid "--stdin can only be used when fetching from one remote"
+msgstr "--stdin kan slegs gebruik word wanneer van een afgeleë gehaal word"
+
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+msgstr ""
+"git fmt-merge-msg [-m <boodskap>] [--log[=<n>] | --no-log] [--file <lêer>]"
+
+msgid "populate log with at most <n> entries from shortlog"
+msgstr "vul log met hoogstens <n> inskrywings vanaf shortlog"
+
+msgid "alias for --log (deprecated)"
+msgstr "alias vir --log (verouderd)"
+
+msgid "text"
+msgstr "teks"
+
+msgid "use <text> as start of message"
+msgstr "gebruik <teks> as begin van boodskap"
+
+msgid "use <name> instead of the real target branch"
+msgstr "gebruik <naam> in plaas van die werklike teikentak"
+
+msgid "file to read from"
+msgstr "lêer om van te lees"
+
+msgid "quote placeholders suitably for shells"
+msgstr "haal plekhouers geskik vir doppe aan"
+
+msgid "quote placeholders suitably for perl"
+msgstr "haal plekhouers geskik vir perl aan"
+
+msgid "quote placeholders suitably for python"
+msgstr "haal plekhouers geskik vir python aan"
+
+msgid "quote placeholders suitably for Tcl"
+msgstr "haal plekhouers geskik vir Tcl aan"
+
+msgid "show only <n> matched refs"
+msgstr "wys slegs <n> ooreenstemmende verwysings"
+
+msgid "marker"
+msgstr "merker"
+
+msgid "start iteration after the provided marker"
+msgstr "begin iterasie na die verskafde merker"
+
+msgid "respect format colors"
+msgstr "respekteer formaatkleure"
+
+msgid "print only refs which points at the given object"
+msgstr "druk slegs verwysings wat na die gegewe objek wys"
+
+msgid "print only refs that are merged"
+msgstr "druk slegs verwysings wat saamgesmelt is"
+
+msgid "print only refs that are not merged"
+msgstr "druk slegs verwysings wat nie saamgesmelt is nie"
+
+msgid "print only refs which contain the commit"
+msgstr "druk slegs verwysings wat die vaslegging bevat"
+
+msgid "print only refs which don't contain the commit"
+msgstr "druk slegs verwysings wat nie die vaslegging bevat nie"
+
+msgid "read reference patterns from stdin"
+msgstr "lees verwysingspatrone vanaf stdin"
+
+msgid "also include HEAD ref and pseudorefs"
+msgstr "sluit ook HEAD-verwysing en pseudo-verwysings in"
+
+msgid "cannot use --start-after with custom sort options"
+msgstr "kan nie --start-after met pasgemaakte sorteeropsies gebruik nie"
+
+msgid "unknown arguments supplied with --stdin"
+msgstr "onbekende argumente met --stdin verskaf"
+
+msgid "cannot use --start-after with patterns"
+msgstr "kan nie --start-after met patrone gebruik nie"
+
+msgid "git for-each-ref "
+msgstr "git for-each-ref "
+
+msgid "git for-each-repo --config=<config> [--] <arguments>"
+msgstr "git for-each-repo --config=<konfigurasie> [--] <argumente>"
+
+msgid "config"
+msgstr "konfigurasie"
+
+msgid "config key storing a list of repository paths"
+msgstr "konfigurasiesleutel wat 'n lys bewaarplekpaaie stoor"
+
+msgid "keep going even if command fails in a repository"
+msgstr "gaan voort selfs as opdrag in 'n bewaarplek misluk"
+
+msgid "missing --config=<config>"
+msgstr "--config=<konfigurasie> ontbreek"
+
+#, c-format
+msgid "got bad config --config=%s"
+msgstr "het slegte konfigurasie --config=%s gekry"
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#, c-format
+msgid "error in %s %s: %s"
+msgstr "fout in %s %s: %s"
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr "waarskuwing in %s %s: %s"
+
+#, c-format
+msgid "broken link from %7s %s"
+msgstr "gebroke skakel vanaf %7s %s"
+
+msgid "wrong object type in link"
+msgstr "verkeerde objeksoort in skakel"
+
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+"              to %7s %s"
+msgstr ""
+"gebroke skakel vanaf %7s %s\n"
+"                na %7s %s"
+
+msgid "Checking connectivity"
+msgstr "Kontroleer konnektiwiteit"
+
+#, c-format
+msgid "missing %s %s"
+msgstr "ontbrekende %s %s"
+
+#, c-format
+msgid "unreachable %s %s"
+msgstr "onbereikbare %s %s"
+
+#, c-format
+msgid "dangling %s %s"
+msgstr "hangende %s %s"
+
+msgid "could not create lost-found"
+msgstr "kon nie lost-found skep nie"
+
+#, c-format
+msgid "could not write '%s'"
+msgstr "kon nie '%s' skryf nie"
+
+#, c-format
+msgid "could not finish '%s'"
+msgstr "kon nie '%s' voltooi nie"
+
+#, c-format
+msgid "Checking %s"
+msgstr "Kontroleer %s"
+
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr "Kontroleer konnektiwiteit (%d objekte)"
+
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s: objek korrup of ontbreek"
+
+#, c-format
+msgid "Checking %s %s"
+msgstr "Kontroleer %s %s"
+
+msgid "broken links"
+msgstr "gebroke skakels"
+
+#, c-format
+msgid "root %s"
+msgstr "wortel %s"
+
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr "%s %s (%s) geëtiketteer in %s"
+
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr "%s: ongeldige reflog-inskrywing %s"
+
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr "Kontroleer reflog %s->%s"
+
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr "%s: ongeldige sha1-wyser %s"
+
+#, c-format
+msgid "%s: not a commit"
+msgstr "%s: nie 'n vaslegging nie"
+
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "ongeldige parameter: sha1 verwag, '%s' gekry"
+
+msgid "notice: No default references"
+msgstr "kennisgewing: Geen verstekverwysings nie"
+
+#, c-format
+msgid "Checking cache tree of %s"
+msgstr "Kontroleer kasboom van %s"
+
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree of %s"
+msgstr "%s: ongeldige sha1-wyser in kasboom van %s"
+
+msgid "non-tree in cache-tree"
+msgstr "nie-boom in kasboom"
+
+#, c-format
+msgid "%s: invalid sha1 pointer in resolve-undo of %s"
+msgstr "%s: ongeldige sha1-wyser in resolve-undo van %s"
+
+msgid "Checking ref database"
+msgstr "Kontroleer verwysingsdatabasis"
+
+msgid ""
+"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
+"         [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
+"         [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n"
+"         [--[no-]name-objects] [--[no-]references] [<object>...]"
+msgstr ""
+"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
+"         [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
+"         [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n"
+"         [--[no-]name-objects] [--[no-]references] [<objek>...]"
+
+msgid "show unreachable objects"
+msgstr "wys onbereikbare objekte"
+
+msgid "show dangling objects"
+msgstr "wys hangende objekte"
+
+msgid "report tags"
+msgstr "rapporteer etikette"
+
+msgid "report root nodes"
+msgstr "rapporteer wortelnodusse"
+
+msgid "make index objects head nodes"
+msgstr "maak indeksobjekte hoofnodusse"
+
+msgid "make reflogs head nodes (default)"
+msgstr "maak reflogs hoofnodusse (verstek)"
+
+msgid "also consider packs and alternate objects"
+msgstr "oorweeg ook pakke en alternatiewe objekte"
+
+msgid "check only connectivity"
+msgstr "kontroleer slegs konnektiwiteit"
+
+msgid "enable more strict checking"
+msgstr "aktiveer strenger kontrolering"
+
+msgid "write dangling objects in .git/lost-found"
+msgstr "skryf hangende objekte in .git/lost-found"
+
+msgid "show progress"
+msgstr "wys vordering"
+
+msgid "show verbose names for reachable objects"
+msgstr "wys uitvoerige name vir bereikbare objekte"
+
+msgid "check reference database consistency"
+msgstr "kontroleer konsekwentheid van verwysingsdatabasis"
+
+msgid "git fsmonitor--daemon start [<options>]"
+msgstr "git fsmonitor--daemon start [<opsies>]"
+
+msgid "git fsmonitor--daemon run [<options>]"
+msgstr "git fsmonitor--daemon run [<opsies>]"
+
+#, c-format
+msgid "value of '%s' out of range: %d"
+msgstr "waarde van '%s' buite bereik: %d"
+
+#, c-format
+msgid "value of '%s' not bool or int: %d"
+msgstr "waarde van '%s' is nie bool of int nie: %d"
+
+#, c-format
+msgid "daemon did not stop within %d seconds"
+msgstr "daemon het nie binne %d sekondes gestop nie"
+
+#, c-format
+msgid "fsmonitor-daemon is watching '%s'\n"
+msgstr "fsmonitor-daemon hou '%s' dop\n"
+
+#, c-format
+msgid "fsmonitor-daemon is not watching '%s'\n"
+msgstr "fsmonitor-daemon hou nie '%s' dop nie\n"
+
+#, c-format
+msgid "could not create fsmonitor cookie '%s'"
+msgstr "kon nie fsmonitor-koekie '%s' skep nie"
+
+#, c-format
+msgid "fsmonitor: cookie_result '%d' != SEEN"
+msgstr "fsmonitor: cookie_result '%d' != SEEN"
+
+#, c-format
+msgid "could not start IPC thread pool on '%s'"
+msgstr "kon nie IPC-draadpoel op '%s' begin nie"
+
+msgid "could not start fsmonitor listener thread"
+msgstr "kon nie fsmonitor-luisterdraad begin nie"
+
+msgid "could not start fsmonitor health thread"
+msgstr "kon nie fsmonitor-gesondheidsdraad begin nie"
+
+msgid "could not initialize listener thread"
+msgstr "kon nie luisterdraad inisialiseer nie"
+
+msgid "could not initialize health thread"
+msgstr "kon nie gesondheidsdraad inisialiseer nie"
+
+#, c-format
+msgid "could not cd home '%s'"
+msgstr "kon nie cd na tuis '%s' doen nie"
+
+#, c-format
+msgid "fsmonitor--daemon is already running '%s'"
+msgstr "fsmonitor--daemon loop reeds '%s'"
+
+#, c-format
+msgid "running fsmonitor-daemon in '%s'\n"
+msgstr "voer fsmonitor-daemon uit in '%s'\n"
+
+msgid "setsid failed"
+msgstr "setsid het misluk"
+
+#, c-format
+msgid "starting fsmonitor-daemon in '%s'\n"
+msgstr "begin fsmonitor-daemon in '%s'\n"
+
+msgid "daemon failed to start"
+msgstr "daemon kon nie begin nie"
+
+msgid "daemon not online yet"
+msgstr "daemon nog nie aanlyn nie"
+
+msgid "daemon terminated"
+msgstr "daemon beëindig"
+
+msgid "detach from console"
+msgstr "ontkoppel van konsole"
+
+msgid "use <n> ipc worker threads"
+msgstr "gebruik <n> ipc-werkerdrade"
+
+msgid "max seconds to wait for background daemon startup"
+msgstr "maksimum sekondes om te wag vir agtergrond-daemon se opstart"
+
+#, c-format
+msgid "invalid 'ipc-threads' value (%d)"
+msgstr "ongeldige 'ipc-threads'-waarde (%d)"
+
+#, c-format
+msgid "Unhandled subcommand '%s'"
+msgstr "Onhanteerde subopdrag '%s'"
+
+msgid "fsmonitor--daemon not supported on this platform"
+msgstr "fsmonitor--daemon word nie op hierdie platform ondersteun nie"
+
+msgid "git gc [<options>]"
+msgstr "git gc [<opsies>]"
+
+#, c-format
+msgid "Failed to fstat %s: %s"
+msgstr "Kon nie fstat op %s doen nie: %s"
+
+#, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr "kon nie '%s'-waarde '%s' ontleed nie"
+
+#, c-format
+msgid "cannot stat '%s'"
+msgstr "kan nie stat op '%s' doen nie"
+
+#, 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 laaste gc-lopie het die volgende gerapporteer. Korrigeer asseblief die\n"
+"grondoorsaak en verwyder %s\n"
+"Outomatiese opruiming sal nie uitgevoer word totdat die lêer verwyder is "
+"nie.\n"
+"\n"
+"%s"
+
+msgid "prune unreferenced objects"
+msgstr "snoei onverwysde objekte"
+
+msgid "pack unreferenced objects separately"
+msgstr "pak onverwysde objekte afsonderlik"
+
+msgid "with --cruft, limit the size of new cruft packs"
+msgstr "met --cruft, beperk die grootte van nuwe afvalpakke"
+
+msgid "be more thorough (increased runtime)"
+msgstr "wees meer deeglik (verhoogde looptyd)"
+
+msgid "enable auto-gc mode"
+msgstr "aktiveer auto-gc-modus"
+
+msgid "perform garbage collection in the background"
+msgstr "voer vullisversameling in die agtergrond uit"
+
+msgid "force running gc even if there may be another gc running"
+msgstr "dwing gc om te loop selfs al loop 'n ander gc dalk reeds"
+
+msgid "repack all other packs except the largest pack"
+msgstr "herpak alle ander pakke behalwe die grootste pak"
+
+msgid "pack prefix to store a pack containing pruned objects"
+msgstr "pakvoorvoegsel om 'n pak met gesnoeide objekte te stoor"
+
+msgid "skip maintenance tasks typically done in the foreground"
+msgstr "slaan onderhoudstake oor wat gewoonlik in die voorgrond gedoen word"
+
+#, c-format
+msgid "failed to parse gc.logExpiry value %s"
+msgstr "kon nie gc.logExpiry-waarde %s ontleed nie"
+
+#, c-format
+msgid "failed to parse prune expiry value %s"
+msgstr "kon nie snoei-vervalwaarde %s ontleed nie"
+
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr ""
+"Pak die bewaarplek outomaties in die agtergrond vir optimale "
+"werkverrigting.\n"
+
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr "Pak die bewaarplek outomaties vir optimale werkverrigting.\n"
+
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr "Sien \"git help gc\" vir handmatige huishouding.\n"
+
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+"gc loop reeds op masjien '%s' pid %<PRIuMAX> (gebruik --force indien nie)"
+
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<taak>] [--schedule]"
+
+msgid "--no-schedule is not allowed"
+msgstr "--no-schedule word nie toegelaat nie"
+
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "onherkende argument --schedule '%s'"
+
+msgid "failed to write commit-graph"
+msgstr "kon nie vasleggingsgrafiek skryf nie"
+
+msgid "failed to prefetch remotes"
+msgstr "kon nie afgeleës vooraf haal nie"
+
+msgid "failed to start 'git pack-objects' process"
+msgstr "kon nie 'git pack-objects'-proses begin nie"
+
+msgid "failed to finish 'git pack-objects' process"
+msgstr "kon nie 'git pack-objects'-proses voltooi nie"
+
+msgid "failed to write multi-pack-index"
+msgstr "kon nie multi-pack-index skryf nie"
+
+msgid "'git multi-pack-index expire' failed"
+msgstr "'git multi-pack-index expire' het misluk"
+
+msgid "'git multi-pack-index repack' failed"
+msgstr "'git multi-pack-index repack' het misluk"
+
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr ""
+"slaan incremental-repack-taak oor omdat core.multiPackIndex gedeaktiveer is"
+
+#, c-format
+msgid "task '%s' failed"
+msgstr "taak '%s' het misluk"
+
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "slotlêer '%s' bestaan, slaan onderhoud oor"
+
+#, c-format
+msgid "unknown maintenance strategy: '%s'"
+msgstr "onbekende onderhoudstrategie: '%s'"
+
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "'%s' is nie 'n geldige taak nie"
+
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "taak '%s' kan nie meer as een keer gekies word nie"
+
+msgid "run tasks based on the state of the repository"
+msgstr "voer take uit gebaseer op die toestand van die bewaarplek"
+
+msgid "perform maintenance in the background"
+msgstr "voer onderhoud in die agtergrond uit"
+
+msgid "frequency"
+msgstr "frekwensie"
+
+msgid "run tasks based on frequency"
+msgstr "voer take uit gebaseer op frekwensie"
+
+msgid "do not report progress or other information over stderr"
+msgstr "moenie vordering of ander inligting oor stderr rapporteer nie"
+
+msgid "task"
+msgstr "taak"
+
+msgid "run a specific task"
+msgstr "voer 'n spesifieke taak uit"
+
+#, c-format
+msgid "unable to add '%s' value of '%s'"
+msgstr "kan nie '%s'-waarde van '%s' byvoeg nie"
+
+msgid "return success even if repository was not registered"
+msgstr "gee sukses terug selfs as bewaarplek nie geregistreer was nie"
+
+#, c-format
+msgid "unable to unset '%s' value of '%s'"
+msgstr "kan nie '%s'-waarde van '%s' ontstel nie"
+
+#, c-format
+msgid "repository '%s' is not registered"
+msgstr "bewaarplek '%s' is nie geregistreer nie"
+
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "kon nie pad '%s' uitbrei nie"
+
+msgid "failed to start launchctl"
+msgstr "kon nie launchctl begin nie"
+
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "kon nie gidse vir '%s' skep nie"
+
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "kon nie diens %s selflaai nie"
+
+msgid "failed to create temp xml file"
+msgstr "kon nie tydelike xml-lêer skep nie"
+
+msgid "failed to start schtasks"
+msgstr "kon nie schtasks begin nie"
+
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr ""
+"kon nie 'crontab -l' uitvoer nie; u stelsel ondersteun dalk nie 'cron' nie"
+
+msgid "failed to create crontab temporary file"
+msgstr "kon nie tydelike crontab-lêer skep nie"
+
+msgid "failed to open temporary file"
+msgstr "kon nie tydelike lêer oopmaak nie"
+
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr ""
+"kon nie 'crontab' uitvoer nie; u stelsel ondersteun dalk nie 'cron' nie"
+
+msgid "'crontab' died"
+msgstr "'crontab' het gesterf"
+
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "kon nie '%s' uitvee nie"
+
+#, c-format
+msgid "failed to flush '%s'"
+msgstr "kon nie '%s' spoel nie"
+
+msgid "failed to start systemctl"
+msgstr "kon nie systemctl begin nie"
+
+msgid "failed to run systemctl"
+msgstr "kon nie systemctl uitvoer nie"
+
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "onherkende argument --scheduler '%s'"
+
+msgid "neither systemd timers nor crontab are available"
+msgstr "nóg systemd-tydhouers nóg crontab is beskikbaar"
+
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "%s-skeduleerder is nie beskikbaar nie"
+
+#, c-format
+msgid ""
+"unable to create '%s.lock': %s.\n"
+"\n"
+"Another scheduled git-maintenance(1) process seems to be running in this\n"
+"repository. Please make sure no other maintenance processes are running and\n"
+"then try again. If it still fails, a git-maintenance(1) process may have\n"
+"crashed in this repository earlier: remove the file manually to continue."
+msgstr ""
+"kan nie '%s.lock' skep nie: %s.\n"
+"\n"
+"Dit lyk of 'n ander geskeduleerde git-maintenance(1)-proses in hierdie\n"
+"bewaarplek loop. Maak asseblief seker dat geen ander onderhoudsprosesse "
+"loop\n"
+"nie en probeer dan weer. As dit steeds misluk, het 'n git-maintenance(1)-\n"
+"proses dalk vroeër in hierdie bewaarplek ineengestort: verwyder die lêer\n"
+"handmatig om voort te gaan."
+
+msgid "cannot acquire lock for scheduled background maintenance"
+msgstr "kan nie slot vir geskeduleerde agtergrondonderhoud verkry nie"
+
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<skeduleerder>]"
+
+msgid "scheduler"
+msgstr "skeduleerder"
+
+msgid "scheduler to trigger git maintenance run"
+msgstr "skeduleerder om git maintenance run te aktiveer"
+
+msgid "failed to set up maintenance schedule"
+msgstr "kon nie onderhoudskedule opstel nie"
+
+msgid "failed to add repo to global config"
+msgstr "kon nie bewaarplek by globale konfigurasie voeg nie"
+
+msgid "check a specific task"
+msgstr "kontroleer 'n spesifieke taak"
+
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <subopdrag> [<opsies>]"
+
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr "git grep [<opsies>] [-e] <patroon> [<rev>...] [[--] <pad>...]"
+
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr "grep: kon nie draad skep nie: %s"
+
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
+msgstr "ongeldige aantal drade gespesifiseer (%d) vir %s"
+
+#. #-#-#-#-#  grep.c.po  #-#-#-#-#
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "geen draadondersteuning nie, ignoreer %s"
+
+#, c-format
+msgid "unable to read tree %s"
+msgstr "kan nie boom %s lees nie"
+
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr "kan nie grep op objek van soort %s doen nie"
+
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr "skakelaar `%c' verwag 'n numeriese waarde"
+
+msgid "search in index instead of in the work tree"
+msgstr "soek in indeks in plaas van in die werkboom"
+
+msgid "find in contents not managed by git"
+msgstr "soek in inhoud wat nie deur git bestuur word nie"
+
+msgid "search in both tracked and untracked files"
+msgstr "soek in beide nagespoorde en onnaspoorbare lêers"
+
+msgid "ignore files specified via '.gitignore'"
+msgstr "ignoreer lêers gespesifiseer via '.gitignore'"
+
+msgid "recursively search in each submodule"
+msgstr "soek rekursief in elke submodule"
+
+msgid "show non-matching lines"
+msgstr "wys reëls wat nie ooreenstem nie"
+
+msgid "case insensitive matching"
+msgstr "hoofletter-onsensitiewe passing"
+
+msgid "match patterns only at word boundaries"
+msgstr "pas patrone slegs by woordgrense"
+
+msgid "process binary files as text"
+msgstr "verwerk binêre lêers as teks"
+
+msgid "don't match patterns in binary files"
+msgstr "moenie patrone in binêre lêers pas nie"
+
+msgid "process binary files with textconv filters"
+msgstr "verwerk binêre lêers met textconv-filters"
+
+msgid "search in subdirectories (default)"
+msgstr "soek in subgidse (verstek)"
+
+msgid "descend at most <n> levels"
+msgstr "daal hoogstens <n> vlakke af"
+
+msgid "use extended POSIX regular expressions"
+msgstr "gebruik uitgebreide POSIX-gereelde uitdrukkings"
+
+msgid "use basic POSIX regular expressions (default)"
+msgstr "gebruik basiese POSIX-gereelde uitdrukkings (verstek)"
+
+msgid "interpret patterns as fixed strings"
+msgstr "interpreteer patrone as vaste stringe"
+
+msgid "use Perl-compatible regular expressions"
+msgstr "gebruik Perl-versoenbare gereelde uitdrukkings"
+
+msgid "show line numbers"
+msgstr "wys reëlnommers"
+
+msgid "show column number of first match"
+msgstr "wys kolomnommer van eerste passing"
+
+msgid "don't show filenames"
+msgstr "moenie lêername wys nie"
+
+msgid "show filenames"
+msgstr "wys lêername"
+
+msgid "show filenames relative to top directory"
+msgstr "wys lêername relatief tot boonste gids"
+
+msgid "show only filenames instead of matching lines"
+msgstr "wys slegs lêername in plaas van ooreenstemmende reëls"
+
+msgid "synonym for --files-with-matches"
+msgstr "sinoniem vir --files-with-matches"
+
+msgid "show only the names of files without match"
+msgstr "wys slegs die name van lêers sonder passing"
+
+msgid "print NUL after filenames"
+msgstr "druk NUL na lêername"
+
+msgid "show only matching parts of a line"
+msgstr "wys slegs ooreenstemmende dele van 'n reël"
+
+msgid "show the number of matches instead of matching lines"
+msgstr "wys die aantal passings in plaas van ooreenstemmende reëls"
+
+msgid "highlight matches"
+msgstr "beklemtoon passings"
+
+msgid "print empty line between matches from different files"
+msgstr "druk leë reël tussen passings uit verskillende lêers"
+
+msgid "show filename only once above matches from same file"
+msgstr "wys lêernaam slegs een keer bo passings uit dieselfde lêer"
+
+msgid "show <n> context lines before and after matches"
+msgstr "wys <n> konteksreëls voor en na passings"
+
+msgid "show <n> context lines before matches"
+msgstr "wys <n> konteksreëls voor passings"
+
+msgid "show <n> context lines after matches"
+msgstr "wys <n> konteksreëls na passings"
+
+msgid "use <n> worker threads"
+msgstr "gebruik <n> werkerdrade"
+
+msgid "shortcut for -C NUM"
+msgstr "kortpad vir -C NUM"
+
+msgid "show a line with the function name before matches"
+msgstr "wys 'n reël met die funksienaam voor passings"
+
+msgid "show the surrounding function"
+msgstr "wys die omliggende funksie"
+
+msgid "read patterns from file"
+msgstr "lees patrone uit lêer"
+
+msgid "match <pattern>"
+msgstr "pas <patroon>"
+
+msgid "combine patterns specified with -e"
+msgstr "kombineer patrone gespesifiseer met -e"
+
+msgid "indicate hit with exit status without output"
+msgstr "dui treffer aan met uittreestatus sonder uitvoer"
+
+msgid "show only matches from files that match all patterns"
+msgstr "wys slegs passings uit lêers wat by alle patrone pas"
+
+msgid "pager"
+msgstr "bladsyblaaier"
+
+msgid "show matching files in the pager"
+msgstr "wys ooreenstemmende lêers in die bladsyblaaier"
+
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr "laat aanroep van grep(1) toe (geïgnoreer deur hierdie bouweergawe)"
+
+msgid "maximum number of results per file"
+msgstr "maksimum aantal resultate per lêer"
+
+msgid "no pattern given"
+msgstr "geen patroon gegee nie"
+
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index of --untracked kan nie met revisies gebruik word nie"
+
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "kan nie revisie oplos nie: %s"
+
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked word nie met --recurse-submodules ondersteun nie"
+
+msgid "invalid option combination, ignoring --threads"
+msgstr "ongeldige opsiekombinasie, ignoreer --threads"
+
+msgid "no threads support, ignoring --threads"
+msgstr "geen drade-ondersteuning nie, ignoreer --threads"
+
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "ongeldige aantal drade gespesifiseer (%d)"
+
+msgid "--open-files-in-pager only works on the worktree"
+msgstr "--open-files-in-pager werk slegs op die werkboom"
+
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
+msgstr ""
+"--[no-]exclude-standard kan nie vir nagespoorde inhoud gebruik word nie"
+
+msgid "both --cached and trees are given"
+msgstr "beide --cached en bome is gegee"
+
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n"
+"                [--stdin [--literally]] [--] <file>..."
+msgstr ""
+"git hash-object [-t <soort>] [-w] [--path=<lêer> | --no-filters]\n"
+"                [--stdin [--literally]] [--] <lêer>..."
+
+msgid "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]"
+msgstr "git hash-object [-t <soort>] [-w] --stdin-paths [--no-filters]"
+
+msgid "object type"
+msgstr "objeksoort"
+
+msgid "write the object into the object database"
+msgstr "skryf die objek in die objekdatabasis"
+
+msgid "read the object from stdin"
+msgstr "lees die objek vanaf stdin"
+
+msgid "store file as is without filters"
+msgstr "stoor lêer soos dit is sonder filters"
+
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr ""
+"hash sommer enige ewekansige gemors om korrupte objekte te skep vir die "
+"ontfouting van Git"
+
+msgid "process file as it were from this path"
+msgstr "verwerk lêer asof dit van hierdie pad af kom"
+
+msgid "print all available commands"
+msgstr "druk alle beskikbare opdragte"
+
+msgid "show external commands in --all"
+msgstr "wys eksterne opdragte in --all"
+
+msgid "show aliases in --all"
+msgstr "wys aliasse in --all"
+
+msgid "exclude guides"
+msgstr "sluit gidse uit"
+
+msgid "show man page"
+msgstr "wys man-bladsy"
+
+msgid "show manual in web browser"
+msgstr "wys handleiding in webblaaier"
+
+msgid "show info page"
+msgstr "wys info-bladsy"
+
+msgid "print command description"
+msgstr "druk opdragbeskrywing"
+
+msgid "print list of useful guides"
+msgstr "druk lys van nuttige gidse"
+
+msgid "print list of user-facing repository, command and file interfaces"
+msgstr ""
+"druk lys van gebruikersgerigte bewaarplek-, opdrag- en lêerkoppelvlakke"
+
+msgid "print list of file formats, protocols and other developer interfaces"
+msgstr "druk lys van lêerformate, protokolle en ander ontwikkelaarkoppelvlakke"
+
+msgid "print all configuration variable names"
+msgstr "druk alle konfigurasieveranderlike-name"
+
+msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]"
+msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<opdrag>|<dok>]"
+
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr "onherkende hulpformaat '%s'"
+
+msgid "Failed to start emacsclient."
+msgstr "Kon nie emacsclient begin nie."
+
+msgid "Failed to parse emacsclient version."
+msgstr "Kon nie emacsclient-weergawe ontleed nie."
+
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
+msgstr "emacsclient-weergawe '%d' te oud (< 22)."
+
+#, c-format
+msgid "failed to exec '%s'"
+msgstr "kon nie '%s' uitvoer nie"
+
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+"'%s': pad vir nie-ondersteunde man-kyker.\n"
+"Oorweeg asseblief om eerder 'man.<tool>.cmd' te gebruik."
+
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+"'%s': cmd vir ondersteunde man-kyker.\n"
+"Oorweeg asseblief om eerder 'man.<tool>.path' te gebruik."
+
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr "'%s': onbekende man-kyker."
+
+msgid "no man viewer handled the request"
+msgstr "geen man-kyker het die versoek hanteer nie"
+
+msgid "no info viewer handled the request"
+msgstr "geen info-kyker het die versoek hanteer nie"
+
+#, c-format
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s' is 'n alias vir '%s'"
+
+#, c-format
+msgid "bad alias.%s string: %s"
+msgstr "slegte alias.%s-string: %s"
+
+#, c-format
+msgid "the '%s' option doesn't take any non-option arguments"
+msgstr "die '%s'-opsie neem geen nie-opsie-argumente nie"
+
+msgid ""
+"the '--no-[external-commands|aliases]' options can only be used with '--all'"
+msgstr ""
+"die '--no-[external-commands|aliases]'-opsies kan slegs met '--all' gebruik "
+"word"
+
+#, c-format
+msgid "usage: %s%s"
+msgstr "gebruik: %s%s"
+
+msgid "'git help config' for more information"
+msgstr "'git help config' vir meer inligting"
+
+msgid ""
+"git history drop <commit> [--dry-run] [--update-refs=(branches|head)] [--"
+"empty=(drop|keep|abort)]"
+msgstr ""
+"git history drop <vaslegging> [--dry-run] [--update-refs=(branches|head)] [--"
+"empty=(drop|keep|abort)]"
+
+msgid ""
+"git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--"
+"reedit-message] [--empty=(drop|keep|abort)]"
+msgstr ""
+"git history fixup <vaslegging> [--dry-run] [--update-refs=(branches|head)] "
+"[--reedit-message] [--empty=(drop|keep|abort)]"
+
+msgid "git history reword <commit> [--dry-run] [--update-refs=(branches|head)]"
+msgstr ""
+"git history reword <vaslegging> [--dry-run] [--update-refs=(branches|head)]"
+
+msgid ""
+"git history split <commit> [--dry-run] [--update-refs=(branches|head)] [--] "
+"[<pathspec>...]"
+msgstr ""
+"git history split <vaslegging> [--dry-run] [--update-refs=(branches|head)] "
+"[--] [<padspesifikasie>...]"
+
+#, c-format
+msgid ""
+"Please enter the commit message for the %s changes. Lines starting\n"
+"with '%s' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"Voer asseblief die vasleggingsboodskap vir die %s-veranderinge in. Reëls "
+"wat\n"
+"met '%s' begin sal geïgnoreer word, en 'n leë boodskap staak die "
+"vaslegging.\n"
+
+#, c-format
+msgid "could not write to '%s'"
+msgstr "kon nie na '%s' skryf nie"
+
+#, c-format
+msgid "Aborting commit as launching the editor failed.\n"
+msgstr "Staak vaslegging aangesien die redigeerder nie begin kon word nie.\n"
+
+#, c-format
+msgid "unable to parse parent commit %s"
+msgstr "kan nie ouervaslegging %s ontleed nie"
+
+#, c-format
+msgid "%s expects one of 'branches' or 'head'"
+msgstr "%s verwag een van 'branches' of 'head'"
+
+msgid "error preparing revisions"
+msgstr "fout met voorbereiding van revisies"
+
+msgid "replaying merge commits is not supported yet!"
+msgstr "herspeel van saamsmeltvasleggings word nog nie ondersteun nie!"
+
+msgid "cannot look up HEAD"
+msgstr "kan nie HEAD opsoek nie"
+
+msgid "cannot determine descendance"
+msgstr "kan nie afstamming bepaal nie"
+
+msgid ""
+"rewritten commit must be an ancestor of HEAD when using --update-refs=head"
+msgstr ""
+"herskryfde vaslegging moet 'n voorouer van HEAD wees wanneer --update-"
+"refs=head gebruik word"
+
+#, c-format
+msgid "failed to begin ref transaction: %s"
+msgstr "kon nie verwysingstransaksie begin nie: %s"
+
+#, c-format
+msgid "failed to update ref '%s': %s"
+msgstr "kon nie verwysing '%s' bywerk nie: %s"
+
+#, c-format
+msgid "failed to commit ref transaction: %s"
+msgstr "kon nie verwysingstransaksie vaslê nie: %s"
+
+#, c-format
+msgid "unable to parse parent of %s"
+msgstr "kan nie ouer van %s ontleed nie"
+
+#, c-format
+msgid ""
+"unrecognized '--empty=' action '%s'; valid values are \"drop\", \"keep\", "
+"and \"abort\"."
+msgstr ""
+"onbekende '--empty='-aksie '%s'; geldige waardes is \"drop\", \"keep\" en "
+"\"abort\"."
+
+msgid "control which refs should be updated"
+msgstr "beheer watter verwysings bygewerk moet word"
+
+msgid "perform a dry-run without updating any refs"
+msgstr "voer 'n proeflopie uit sonder om enige verwysings by te werk"
+
+msgid "open an editor to modify the commit message"
+msgstr "open 'n redigeerder om die vasleggingsboodskap te wysig"
+
+msgid "how to handle commits that become empty"
+msgstr "hoe om vasleggings te hanteer wat leeg word"
+
+msgid "command expects a single revision"
+msgstr "opdrag verwag 'n enkele hersiening"
+
+msgid "cannot run fixup in a bare repository"
+msgstr "kan nie 'fixup' in 'n kaal bewaarplek uitvoer nie"
+
+#, c-format
+msgid "commit cannot be found: %s"
+msgstr "vaslegging kan nie gevind word nie: %s"
+
+msgid "cannot get tree for HEAD"
+msgstr "kan nie boom vir HEAD kry nie"
+
+msgid "unable to read index"
+msgstr "kan nie indeks lees nie"
+
+msgid "nothing to fixup: no staged changes"
+msgstr "niks om reg te stel nie: geen geplaasde veranderinge nie"
+
+msgid "unable to write index as a tree"
+msgstr "kan nie indeks as 'n boom skryf nie"
+
+#, c-format
+msgid "cannot get tree for commit %s"
+msgstr "kan nie boom vir vaslegging %s kry nie"
+
+msgid "merge failed while applying fixup"
+msgstr "saamsmelting het misluk tydens toepassing van regstelling"
+
+msgid "fixup would produce conflicts; aborting"
+msgstr "regstelling sou konflikte veroorsaak; staak"
+
+#, c-format
+msgid "cannot drop root commit %s: it has no parent to replay onto"
+msgstr ""
+"kan nie wortelvaslegging %s laat val nie: dit het geen ouer om op oor te "
+"speel nie"
+
+#, c-format
+msgid "fixup makes commit %s empty"
+msgstr "regstelling maak vaslegging %s leeg"
+
+msgid "failed writing fixed-up commit"
+msgstr "kon nie reggestelde vaslegging skryf nie"
+
+msgid "failed replaying descendants"
+msgstr "kon nie afstammelinge oorspeel nie"
+
+msgid "failed writing reworded commit"
+msgstr "kon nie herbewoorde vaslegging skryf nie"
+
+#, c-format
+msgid "unable to parse tree %s"
+msgstr "kan nie boom %s ontleed nie"
+
+msgid "unable to populate index with tree"
+msgstr "kan nie indeks met boom vul nie"
+
+msgid "unable to acquire index lock"
+msgstr "kan nie indeksslot verkry nie"
+
+msgid "failed reading temporary index"
+msgstr "kon nie tydelike indeks lees nie"
+
+msgid "failed split tree"
+msgstr "kon nie boom verdeel nie"
+
+msgid "split commit is empty"
+msgstr "verdeelde vaslegging is leeg"
+
+msgid "split commit tree matches original commit"
+msgstr "boom van verdeelde vaslegging stem ooreen met oorspronklike vaslegging"
+
+msgid "failed writing first commit"
+msgstr "kon nie eerste vaslegging skryf nie"
+
+msgid "failed writing second commit"
+msgstr "kon nie tweede vaslegging skryf nie"
+
+msgid "control ref update behavior"
+msgstr "beheer gedrag van verwysingsbywerking"
+
+msgid "command expects a committish"
+msgstr "opdrag verwag 'n vasleggingagtige"
+
+msgid "cannot split up merge commit"
+msgstr "kan nie saamsmeltvaslegging verdeel nie"
+
+msgid "cannot resolve HEAD commit"
+msgstr "kan nie HEAD-vaslegging oplos nie"
+
+msgid "cannot resolve tree for HEAD"
+msgstr "kan nie boom vir HEAD oplos nie"
+
+msgid "how to handle descendants that become empty"
+msgstr "hoe om afstammelinge te hanteer wat leeg word"
+
+#, c-format
+msgid "cannot drop merge commit: %s"
+msgstr "kan nie saamsmeltvaslegging weglaat nie: %s"
+
+msgid "dropping this commit would overwrite local changes; aborting"
+msgstr ""
+"om hierdie vaslegging te laat val sou plaaslike veranderinge oorskryf; staak"
+
+msgid "failed to update references"
+msgstr "kon nie verwysings bywerk nie"
+
+#, c-format
+msgid "could not update working tree to new commit %s"
+msgstr "kon nie werkboom na nuwe vaslegging %s bywerk nie"
+
+msgid ""
+"git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-"
+"stdin=<path>] [(-j|--jobs) <n>]\n"
+"<hook-name> [-- <hook-args>]"
+msgstr ""
+"git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-"
+"stdin=<pad>] [(-j|--jobs) <n>]\n"
+"<haaknaam> [-- <haakargumente>]"
+
+msgid ""
+"git hook list [--allow-unknown-hook-name] [-z] [--show-scope] <hook-name>"
+msgstr ""
+"git hook list [--allow-unknown-hook-name] [-z] [--show-scope] <haaknaam>"
+
+msgid "use NUL as line terminator"
+msgstr "gebruik NUL as reëlafsluiter"
+
+msgid "show the config scope that defined each hook"
+msgstr "wys die konfigurasiebestek wat elke haak gedefinieer het"
+
+msgid "allow running a hook with a non-native hook name"
+msgstr "laat toe dat 'n haak met 'n nie-inheemse haaknaam uitgevoer word"
+
+msgid "you must specify a hook event name to list"
+msgstr "jy moet 'n haakgebeurtenisnaam spesifiseer om te lys"
+
+#, c-format
+msgid ""
+"unknown hook event '%s';\n"
+"use --allow-unknown-hook-name to allow non-native hook names"
+msgstr ""
+"onbekende haakgebeurtenis '%s';\n"
+"gebruik --allow-unknown-hook-name om nie-inheemse haakname toe te laat"
+
+#, c-format
+msgid "no hooks found for event '%s'"
+msgstr "geen hake vir gebeurtenis '%s' gevind nie"
+
+msgid "hook from hookdir"
+msgstr "haak uit haakgids"
+
+msgid "silently ignore missing requested <hook-name>"
+msgstr "ignoreer ontbrekende versoekte <haaknaam> stilweg"
+
+msgid "file to read into hooks' stdin"
+msgstr "lêer om in hake se standaardinvoer in te lees"
+
+msgid "run up to <n> hooks simultaneously (-1 for CPU count)"
+msgstr "voer tot <n> hake gelyktydig uit (-1 vir aantal SVE's)"
+
+#, c-format
+msgid "invalid value for -j: %d (use -1 for CPU count or a positive integer)"
+msgstr ""
+"ongeldige waarde vir -j: %d (gebruik -1 vir aantal SVE's of 'n positiewe "
+"heelgetal)"
+
+#, c-format
+msgid "object type mismatch at %s"
+msgstr "objektipe stem nie ooreen by %s nie"
+
+#, c-format
+msgid "did not receive expected object %s"
+msgstr "het nie die verwagte objek %s ontvang nie"
+
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr "objek %s: tipe %s verwag, %s gevind"
+
+msgid "Checking objects"
+msgstr "Gaan objekte na"
+
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] "kan nie %d greep vul nie"
+msgstr[1] "kan nie %d grepe vul nie"
+
+msgid "early EOF"
+msgstr "vroeë EOF"
+
+msgid "read error on input"
+msgstr "leesfout op invoer"
+
+msgid "used more bytes than were available"
+msgstr "het meer grepe gebruik as wat beskikbaar was"
+
+msgid "pack too large for current definition of off_t"
+msgstr "pak is te groot vir die huidige definisie van off_t"
+
+#, c-format
+msgid "pack exceeds maximum allowed size (%s)"
+msgstr "pak oorskry die maksimum toegelate grootte (%s)"
+
+msgid "pack signature mismatch"
+msgstr "pakhandtekening stem nie ooreen nie"
+
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr "pakweergawe %<PRIu32> word nie ondersteun nie"
+
+#, c-format
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "pak het 'n slegte objek by verskuiwing %<PRIuMAX>: %s"
+
+#, c-format
+msgid "inflate returned %d"
+msgstr "inflate het %d teruggegee"
+
+msgid "object size too large for this platform"
+msgstr "objekgrootte is te groot vir hierdie platform"
+
+msgid "offset value overflow for delta base object"
+msgstr "verskuiwingswaarde-oorloop vir delta-basisobjek"
+
+msgid "delta base offset is out of bound"
+msgstr "delta-basisverskuiwing is buite perke"
+
+#, c-format
+msgid "unknown object type %d"
+msgstr "onbekende objektipe %d"
+
+msgid "cannot pread pack file"
+msgstr "kan nie paklêer met pread lees nie"
+
+#, c-format
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
+msgstr[0] "voortydige einde van paklêer, %<PRIuMAX> greep ontbreek"
+msgstr[1] "voortydige einde van paklêer, %<PRIuMAX> grepe ontbreek"
+
+msgid "serious inflate inconsistency"
+msgstr "ernstige inflate-teenstrydigheid"
+
+#, c-format
+msgid "SHA1 COLLISION FOUND WITH %s !"
+msgstr "SHA1-BOTSING GEVIND MET %s !"
+
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "kan nie bestaande objekinligting %s lees nie"
+
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "kan nie bestaande objek %s lees nie"
+
+#, c-format
+msgid "invalid blob object %s"
+msgstr "ongeldige blob-objek %s"
+
+msgid "fsck error in packed object"
+msgstr "fsck-fout in gepakte objek"
+
+#, c-format
+msgid "invalid %s"
+msgstr "ongeldige %s"
+
+#, c-format
+msgid "Not all child objects of %s are reachable"
+msgstr "Nie alle kindobjekte van %s is bereikbaar nie"
+
+msgid "failed to apply delta"
+msgstr "kon nie delta toepas nie"
+
+msgid "Receiving objects"
+msgstr "Ontvang objekte"
+
+msgid "Indexing objects"
+msgstr "Indekseer objekte"
+
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr "pak is korrup (SHA1 stem nie ooreen nie)"
+
+msgid "cannot fstat packfile"
+msgstr "kan nie fstat op paklêer doen nie"
+
+msgid "pack has junk at the end"
+msgstr "pak het rommel aan die einde"
+
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "verwarring buite alle rede in parse_pack_objects()"
+
+msgid "Resolving deltas"
+msgstr "Los deltas op"
+
+#, c-format
+msgid "unable to create thread: %s"
+msgstr "kan nie draad skep nie: %s"
+
+msgid "confusion beyond insanity"
+msgstr "verwarring buite alle rede"
+
+#, c-format
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "voltooi met %d plaaslike objek"
+msgstr[1] "voltooi met %d plaaslike objekte"
+
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr "Onverwagte stert-kontrolesom vir %s (skyfkorrupsie?)"
+
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] "pak het %d onopgeloste delta"
+msgstr[1] "pak het %d onopgeloste deltas"
+
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr "kan nie aangehegte objek ontspan nie (%d)"
+
+#, c-format
+msgid "local object %s is corrupt"
+msgstr "plaaslike objek %s is korrup"
+
+#, c-format
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "paklêernaam '%s' eindig nie met '.%s' nie"
+
+#, c-format
+msgid "cannot write %s file '%s'"
+msgstr "kan nie %s-lêer '%s' skryf nie"
+
+#, c-format
+msgid "cannot close written %s file '%s'"
+msgstr "kan nie geskrewe %s-lêer '%s' toemaak nie"
+
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "kan nie tydelike '*.%s'-lêer na '%s' hernoem nie"
+
+msgid "error while closing pack file"
+msgstr "fout terwyl paklêer toegemaak word"
+
+#, c-format
+msgid "bad pack.indexVersion=%<PRIu32>"
+msgstr "slegte pack.indexVersion=%<PRIu32>"
+
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr "Kan nie bestaande paklêer '%s' oopmaak nie"
+
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr "Kan nie bestaande pak-idx-lêer vir '%s' oopmaak nie"
+
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] "nie-delta: %d objek"
+msgstr[1] "nie-delta: %d objekte"
+
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] "kettinglengte = %d: %lu objek"
+msgstr[1] "kettinglengte = %d: %lu objekte"
+
+msgid "could not start pack-objects to repack local links"
+msgstr "kon nie pack-objects begin om plaaslike skakels te herpak nie"
+
+msgid "failed to feed local object to pack-objects"
+msgstr "kon nie plaaslike objek aan pack-objects voer nie"
+
+msgid "index-pack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+"index-pack: Verwag slegs volledige heksadesimale objek-ID-reëls van pack-"
+"objects."
+
+msgid "could not finish pack-objects to repack local links"
+msgstr "kon nie pack-objects voltooi om plaaslike skakels te herpak nie"
+
+msgid "Cannot come back to cwd"
+msgstr "Kan nie na die huidige werkgids terugkeer nie"
+
+#, c-format
+msgid "bad --pack_header: %s"
+msgstr "slegte --pack_header: %s"
+
+#, c-format
+msgid "bad %s"
+msgstr "slegte %s"
+
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "onbekende hash-algoritme '%s'"
+
+msgid "--promisor cannot be used with a pack name"
+msgstr "--promisor kan nie saam met 'n paknaam gebruik word nie"
+
+msgid "--stdin requires a git repository"
+msgstr "--stdin vereis 'n Git-bewaarplek"
+
+msgid "--verify with no packfile name given"
+msgstr "--verify sonder 'n paklêernaam gegee"
+
+msgid "cannot perform queued object checks outside of a repository"
+msgstr ""
+"kan nie in die tou geplaasde objekkontroles buite 'n bewaarplek doen nie"
+
+msgid "fsck error in pack objects"
+msgstr "fsck-fout in pakobjekte"
+
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n"
+"         [--separate-git-dir <git-dir>] [--object-format=<format>]\n"
+"         [--ref-format=<format>]\n"
+"         [-b <branch-name> | --initial-branch=<branch-name>]\n"
+"         [--shared[=<permissions>]] [<directory>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<sjabloongids>]\n"
+"         [--separate-git-dir <Git-gids>] [--object-format=<formaat>]\n"
+"         [--ref-format=<formaat>]\n"
+"         [-b <taknaam> | --initial-branch=<taknaam>]\n"
+"         [--shared[=<toestemmings>]] [<gids>]"
+
+msgid "permissions"
+msgstr "toestemmings"
+
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr ""
+"spesifiseer dat die Git-bewaarplek tussen verskeie gebruikers gedeel word"
+
+msgid "override the name of the initial branch"
+msgstr "oorskryf die naam van die aanvanklike tak"
+
+msgid "hash"
+msgstr "hutsing"
+
+msgid "specify the hash algorithm to use"
+msgstr "spesifiseer die hutsalgoritme om te gebruik"
+
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "kan nie gids %s skep nie"
+
+#, c-format
+msgid "cannot chdir to %s"
+msgstr "kan nie na %s verander nie"
+
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+"%s (of --work-tree=<gids>) word nie toegelaat sonder om %s (of --git-"
+"dir=<gids>) te spesifiseer nie"
+
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr "Kan nie werkboom '%s' bereik nie"
+
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr "--separate-git-dir is onversoenbaar met kaal bewaarplek"
+
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty]\n"
+"                       [(--trailer (<key>|<key-alias>)[(=|:)<value>])...]\n"
+"                       [--parse] [<file>...]"
+msgstr ""
+"git interpret-trailers [--in-place] [--trim-empty]\n"
+"                       [(--trailer (<sleutel>|<sleutelalias>)"
+"[(=|:)<waarde>])...]\n"
+"                       [--parse] [<lêer>...]"
+
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "kon nie invoerlêer '%s' lees nie"
+
+msgid "could not read from stdin"
+msgstr "kon nie van standaardinvoer lees nie"
+
+#, c-format
+msgid "could not write to temporary file '%s'"
+msgstr "kon nie na tydelike lêer '%s' skryf nie"
+
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "kon nie tydelike lêer na %s hernoem nie"
+
+msgid "edit files in place"
+msgstr "wysig lêers ter plaatse"
+
+msgid "trim empty trailers"
+msgstr "snoei leë aanhangsels"
+
+msgid "placement"
+msgstr "plasing"
+
+msgid "where to place the new trailer"
+msgstr "waar om die nuwe aanhangsel te plaas"
+
+msgid "action if trailer already exists"
+msgstr "aksie as aanhangsel reeds bestaan"
+
+msgid "action if trailer is missing"
+msgstr "aksie as aanhangsel ontbreek"
+
+msgid "output only the trailers"
+msgstr "voer slegs die aanhangsels uit"
+
+msgid "do not apply trailer.<key-alias> configuration variables"
+msgstr "moenie trailer.<key-alias>-konfigurasieveranderlikes toepas nie"
+
+msgid "reformat multiline trailer values as single-line values"
+msgstr "herformateer meerreël-aanhangselwaardes as enkelreëlwaardes"
+
+msgid "alias for --only-trailers --only-input --unfold"
+msgstr "alias vir --only-trailers --only-input --unfold"
+
+msgid "do not treat \"---\" as the end of input"
+msgstr "moenie \"---\" as die einde van invoer beskou nie"
+
+msgid "trailer(s) to add"
+msgstr "aanhangsel(s) om by te voeg"
+
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer met --only-input maak nie sin nie"
+
+msgid "no input file given for in-place editing"
+msgstr "geen invoerlêer vir ter plaatse-redigering gegee nie"
+
+msgid "last-modified can only operate on one commit at a time"
+msgstr "last-modified kan slegs op een vaslegging op 'n slag werk"
+
+#, c-format
+msgid "revision argument '%s' is a %s, not a commit-ish"
+msgstr "hersieningsargument '%s' is 'n %s, nie 'n vasleggingagtige nie"
+
+#, c-format
+msgid "unknown last-modified argument: %s"
+msgstr "onbekende last-modified-argument: %s"
+
+msgid ""
+"git last-modified [--recursive] [--show-trees] [--max-depth=<depth>] [-z]\n"
+"                  [<revision-range>] [[--] <pathspec>...]"
+msgstr ""
+"git last-modified [--recursive] [--show-trees] [--max-depth=<diepte>] [-z]\n"
+"                  [<hersieningsreeks>] [[--] <padspesifikasie>...]"
+
+msgid "recurse into subtrees"
+msgstr "gaan rekursief in subbome in"
+
+msgid "show tree entries when recursing into subtrees"
+msgstr "wys boominskrywings wanneer rekursief in subbome ingegaan word"
+
+msgid "maximum tree depth to recurse"
+msgstr "maksimum boomdiepte vir rekursie"
+
+msgid "lines are separated with NUL character"
+msgstr "reëls word met NUL-karakter geskei"
+
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git log [<opsies>] [<hersieningsreeks>] [[--] <pad>...]"
+
+msgid "git show [<options>] <object>..."
+msgstr "git show [<opsies>] <objek>..."
+
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr "ongeldige opsie --decorate: %s"
+
+msgid "suppress diff output"
+msgstr "onderdruk verskilafvoer"
+
+msgid "show source"
+msgstr "wys bron"
+
+msgid "clear all previously-defined decoration filters"
+msgstr "verwyder alle voorheen gedefinieerde versieringsfilters"
+
+msgid "only decorate refs that match <pattern>"
+msgstr "versier slegs verwysings wat by <patroon> pas"
+
+msgid "do not decorate refs that match <pattern>"
+msgstr "moenie verwysings versier wat by <patroon> pas nie"
+
+msgid "decorate options"
+msgstr "versieringsopsies"
+
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
+"volg die ontwikkeling van reëlreeks <begin>,<einde> of funksie :"
+"<funksienaam> in <lêer>"
+
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "-L<reeks>:<lêer> kan nie met padspesifikasie gebruik word nie"
+
+msgid ""
+"\n"
+"hint: You can replace 'git whatchanged <opts>' with:\n"
+"hint:\tgit log <opts> --raw --no-merges\n"
+"hint: Or make an alias:\n"
+"hint:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n"
+"\n"
+msgstr ""
+"\n"
+"wenk: Jy kan 'git whatchanged <opsies>' vervang met:\n"
+"wenk:\tgit log <opsies> --raw --no-merges\n"
+"wenk: Of maak 'n alias:\n"
+"wenk:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n"
+"\n"
+
+#, c-format
+msgid "git show %s: bad file"
+msgstr "git show %s: slegte lêer"
+
+#, c-format
+msgid "could not read object %s"
+msgstr "kon nie objek %s lees nie"
+
+#, c-format
+msgid "unknown type: %d"
+msgstr "onbekende tipe: %d"
+
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s: ongeldige modus vir dekbrief uit beskrywing"
+
+msgid "format.headers without value"
+msgstr "format.headers sonder waarde"
+
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "slegte Boolese konfigurasiewaarde '%s' vir '%s'"
+
+#, c-format
+msgid ""
+"'%s' used to accept any value and treat that as 'true'.\n"
+"Now it only accepts boolean values, like what '%s' does.\n"
+msgstr ""
+"'%s' het vroeër enige waarde aanvaar en dit as 'true' behandel.\n"
+"Nou aanvaar dit slegs Boolese waardes, net soos '%s'.\n"
+
+#, c-format
+msgid "cannot open patch file %s"
+msgstr "kan nie laplêer %s oopmaak nie"
+
+msgid "need exactly one range"
+msgstr "benodig presies een reeks"
+
+msgid "not a range"
+msgstr "nie 'n reeks nie"
+
+#, c-format
+msgid "unable to read branch description file '%s'"
+msgstr "kan nie takbeskrywingslêer '%s' lees nie"
+
+msgid "cover letter needs email format"
+msgstr "dekbrief benodig e-posformaat"
+
+msgid "failed to create cover-letter file"
+msgstr "kon nie dekbrieflêer skep nie"
+
+#, c-format
+msgid "'%s' is not a valid format string"
+msgstr "'%s' is nie 'n geldige formaatstring nie"
+
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr "onsinnige in-reply-to: %s"
+
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr "git format-patch [<opsies>] [<sedert> | <hersieningsreeks>]"
+
+msgid "two output directories?"
+msgstr "twee afvoergidse?"
+
+#, c-format
+msgid "unknown commit %s"
+msgstr "onbekende vaslegging %s"
+
+#, c-format
+msgid "failed to resolve '%s' as a valid ref"
+msgstr "kon nie '%s' as 'n geldige verwysing oplos nie"
+
+msgid "could not find exact merge base"
+msgstr "kon nie presiese saamsmeltbasis vind nie"
+
+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 ""
+"kon nie stroomop kry nie; as jy die basisvaslegging outomaties wil opteken,\n"
+"gebruik asseblief git branch --set-upstream-to om 'n afgeleë tak te volg.\n"
+"Of jy kan die basisvaslegging handmatig met --base=<basisvaslegging-id> "
+"spesifiseer"
+
+msgid "failed to find exact merge base"
+msgstr "kon nie presiese saamsmeltbasis vind nie"
+
+msgid "base commit should be the ancestor of revision list"
+msgstr "basisvaslegging moet die voorouer van die hersieningslys wees"
+
+msgid "base commit shouldn't be in revision list"
+msgstr "basisvaslegging behoort nie in die hersieningslys te wees nie"
+
+msgid "cannot get patch id"
+msgstr "kan nie lap-id kry nie"
+
+msgid "failed to infer range-diff origin of current series"
+msgstr "kon nie range-diff-oorsprong van huidige reeks aflei nie"
+
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr "gebruik '%s' as range-diff-oorsprong van huidige reeks"
+
+msgid "use [PATCH n/m] even with a single patch"
+msgstr "gebruik [PATCH n/m] selfs met 'n enkele lap"
+
+msgid "use [PATCH] even with multiple patches"
+msgstr "gebruik [PATCH] selfs met veelvuldige lappe"
+
+msgid "print patches to standard out"
+msgstr "druk lappe na standaardafvoer"
+
+msgid "generate a cover letter"
+msgstr "genereer 'n dekbrief"
+
+msgid "format-spec"
+msgstr "formaatspesifikasie"
+
+msgid "format spec used for the commit list in the cover letter"
+msgstr "formaatspesifikasie gebruik vir die vasleggingslys in die dekbrief"
+
+msgid "use simple number sequence for output file names"
+msgstr "gebruik eenvoudige nommerreeks vir afvoerlêername"
+
+msgid "sfx"
+msgstr "agtervoegsel"
+
+msgid "use <sfx> instead of '.patch'"
+msgstr "gebruik <agtervoegsel> in plaas van '.patch'"
+
+msgid "start numbering patches at <n> instead of 1"
+msgstr "begin lappe by <n> nommer in plaas van 1"
+
+msgid "reroll-count"
+msgstr "herrol-telling"
+
+msgid "mark the series as Nth re-roll"
+msgstr "merk die reeks as die N-de herrol"
+
+msgid "max length of output filename"
+msgstr "maksimum lengte van afvoerlêernaam"
+
+msgid "rfc"
+msgstr "rfc"
+
+msgid "add <rfc> (default 'RFC') before 'PATCH'"
+msgstr "voeg <rfc> (verstek 'RFC') voor 'PATCH' by"
+
+msgid "cover-from-description-mode"
+msgstr "dekbrief-uit-beskrywing-modus"
+
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr "genereer dele van 'n dekbrief gebaseer op 'n tak se beskrywing"
+
+msgid "use branch description from file"
+msgstr "gebruik takbeskrywing uit lêer"
+
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr "gebruik [<voorvoegsel>] in plaas van [PATCH]"
+
+msgid "store resulting files in <dir>"
+msgstr "stoor resulterende lêers in <gids>"
+
+msgid "don't strip/add [PATCH]"
+msgstr "moenie [PATCH] verwyder/byvoeg nie"
+
+msgid "don't output binary diffs"
+msgstr "moenie binêre verskille uitvoer nie"
+
+msgid "output all-zero hash in From header"
+msgstr "voer 'n hutswaarde van slegs nulle in die From-kopreël uit"
+
+msgid "don't include a patch matching a commit upstream"
+msgstr "moenie 'n lap insluit wat by 'n vaslegging stroomop pas nie"
+
+msgid "show patch format instead of default (patch + stat)"
+msgstr "wys lapformaat in plaas van verstek (lap + statistiek)"
+
+msgid "Messaging"
+msgstr "Boodskappe"
+
+msgid "header"
+msgstr "kopreël"
+
+msgid "add email header"
+msgstr "voeg e-poskopreël by"
+
+msgid "email"
+msgstr "e-pos"
+
+msgid "add To: header"
+msgstr "voeg To:-kopreël by"
+
+msgid "add Cc: header"
+msgstr "voeg Cc:-kopreël by"
+
+msgid "ident"
+msgstr "identiteit"
+
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr ""
+"stel From-adres op <identiteit> (of vaslegger-identiteit indien afwesig)"
+
+msgid "message-id"
+msgstr "boodskap-id"
+
+msgid "make first mail a reply to <message-id>"
+msgstr "maak eerste e-pos 'n antwoord op <boodskap-id>"
+
+msgid "boundary"
+msgstr "grens"
+
+msgid "attach the patch"
+msgstr "heg die lap aan"
+
+msgid "inline the patch"
+msgstr "sluit die lap in die teks in"
+
+msgid "enable message threading, styles: shallow, deep"
+msgstr "aktiveer boodskapdrade, style: shallow, deep"
+
+msgid "signature"
+msgstr "handtekening"
+
+msgid "add a signature"
+msgstr "voeg 'n handtekening by"
+
+msgid "base-commit"
+msgstr "basisvaslegging"
+
+msgid "add prerequisite tree info to the patch series"
+msgstr "voeg voorvereiste boominligting by die lapreeks"
+
+msgid "add a signature from a file"
+msgstr "voeg 'n handtekening uit 'n lêer by"
+
+msgid "don't print the patch filenames"
+msgstr "moenie die laplêername druk nie"
+
+msgid "show progress while generating patches"
+msgstr "wys vordering terwyl lappe gegenereer word"
+
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr "wys veranderinge teenoor <hersiening> in dekbrief of enkele lap"
+
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr ""
+"wys veranderinge teenoor <verwysingspesifikasie> in dekbrief of enkele lap"
+
+msgid "percentage by which creation is weighted"
+msgstr "persentasie waarmee skepping geweeg word"
+
+msgid "show in-body From: even if identical to the e-mail header"
+msgstr "wys From: in die liggaam selfs as dit identies aan die e-poskopreël is"
+
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "ongeldige identiteitsreël: %s"
+
+msgid "--name-only does not make sense"
+msgstr "--name-only maak nie sin nie"
+
+msgid "--name-status does not make sense"
+msgstr "--name-status maak nie sin nie"
+
+msgid "--check does not make sense"
+msgstr "--check maak nie sin nie"
+
+msgid "--remerge-diff does not make sense"
+msgstr "--remerge-diff maak nie sin nie"
+
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "kon nie gids '%s' skep nie"
+
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr "--interdiff vereis --cover-letter of enkele lap"
+
+msgid "Interdiff:"
+msgstr "Tussenverskil:"
+
+#, c-format
+msgid "Interdiff against v%d:"
+msgstr "Tussenverskil teenoor v%d:"
+
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr "--range-diff vereis --cover-letter of enkele lap"
+
+msgid "Range-diff:"
+msgstr "Reeksverskil:"
+
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr "Reeksverskil teenoor v%d:"
+
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr "kan nie handtekeninglêer '%s' lees nie"
+
+msgid "Generating patches"
+msgstr "Genereer lappe"
+
+msgid "failed to create output files"
+msgstr "kon nie afvoerlêers skep nie"
+
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr "git cherry [-v] [<stroomop> [<kop> [<limiet>]]]"
+
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+"Kon nie 'n nagespoorde afgeleë tak vind nie; spesifiseer asseblief "
+"<stroomop> handmatig.\n"
+
+#, c-format
+msgid "could not get object info about '%s'"
+msgstr "kon nie objekinligting oor '%s' kry nie"
+
+msgid "git ls-files [<options>] [<file>...]"
+msgstr "git ls-files [<opsies>] [<lêer>...]"
+
+msgid "separate paths with the NUL character"
+msgstr "skei paaie met die NUL-karakter"
+
+msgid "identify the file status with tags"
+msgstr "identifiseer die lêerstatus met merkers"
+
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr "gebruik kleinletters vir 'assume unchanged'-lêers"
+
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "gebruik kleinletters vir 'fsmonitor clean'-lêers"
+
+msgid "show cached files in the output (default)"
+msgstr "wys gekasde lêers in die afvoer (verstek)"
+
+msgid "show deleted files in the output"
+msgstr "wys geskrapte lêers in die afvoer"
+
+msgid "show modified files in the output"
+msgstr "wys gewysigde lêers in die afvoer"
+
+msgid "show other files in the output"
+msgstr "wys ander lêers in die afvoer"
+
+msgid "show ignored files in the output"
+msgstr "wys geïgnoreerde lêers in die afvoer"
+
+msgid "show staged contents' object name in the output"
+msgstr "wys die objeknaam van geplaasde inhoud in die afvoer"
+
+msgid "show files on the filesystem that need to be removed"
+msgstr "wys lêers op die lêerstelsel wat verwyder moet word"
+
+msgid "show 'other' directories' names only"
+msgstr "wys slegs die name van 'ander' gidse"
+
+msgid "show line endings of files"
+msgstr "wys reëleindes van lêers"
+
+msgid "don't show empty directories"
+msgstr "moenie leë gidse wys nie"
+
+msgid "show unmerged files in the output"
+msgstr "wys lêers wat nie saamgesmelt is nie in die afvoer"
+
+msgid "show resolve-undo information"
+msgstr "wys resolve-undo-inligting"
+
+msgid "skip files matching pattern"
+msgstr "slaan lêers oor wat by patroon pas"
+
+msgid "read exclude patterns from <file>"
+msgstr "lees uitsluitingspatrone uit <lêer>"
+
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr "lees bykomende per-gids-uitsluitingspatrone in <lêer>"
+
+msgid "add the standard git exclusions"
+msgstr "voeg die standaard Git-uitsluitings by"
+
+msgid "make the output relative to the project top directory"
+msgstr "maak die afvoer relatief tot die projek se topgids"
+
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr "as enige <lêer> nie in die indeks is nie, behandel dit as 'n fout"
+
+msgid "tree-ish"
+msgstr "boomagtige"
+
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr ""
+"maak asof paaie wat sedert <boomagtige> verwyder is, steeds teenwoordig is"
+
+msgid "show debugging data"
+msgstr "wys ontfoutingsdata"
+
+msgid "suppress duplicate entries"
+msgstr "onderdruk duplikaatinskrywings"
+
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "wys yl gidse wanneer 'n yl indeks teenwoordig is"
+
+msgid ""
+"--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, "
+"--eol"
+msgstr ""
+"--format kan nie saam met -s, -o, -k, -t, --resolve-undo, --deduplicate, --"
+"eol gebruik word nie"
+
+msgid ""
+"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n"
+"              [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"
+"              [--symref] [<repository> [<patterns>...]]"
+msgstr ""
+"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<uitvoerbare>]\n"
+"              [-q | --quiet] [--exit-code] [--get-url] [--sort=<sleutel>]\n"
+"              [--symref] [<bewaarplek> [<patrone>...]]"
+
+msgid "do not print remote URL"
+msgstr "moenie afgeleë URL druk nie"
+
+msgid "exec"
+msgstr "uitvoerbare"
+
+msgid "path of git-upload-pack on the remote host"
+msgstr "pad van git-upload-pack op die afgeleë gasheer"
+
+msgid "limit to tags"
+msgstr "beperk tot etikette"
+
+msgid "limit to branches"
+msgstr "beperk tot takke"
+
+msgid "deprecated synonym for --branches"
+msgstr "verouderde sinoniem vir --branches"
+
+msgid "do not show peeled tags"
+msgstr "moenie afgeskilde etikette wys nie"
+
+msgid "take url.<base>.insteadOf into account"
+msgstr "neem url.<base>.insteadOf in ag"
+
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr "verlaat met uittreekode 2 as geen passende verwysings gevind word nie"
+
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr "wys onderliggende verwysing benewens die objek waarna dit wys"
+
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr "git ls-tree [<opsies>] <boomagtige> [<pad>...]"
+
+msgid "only show trees"
+msgstr "wys slegs bome"
+
+msgid "show trees when recursing"
+msgstr "wys bome tydens rekursie"
+
+msgid "terminate entries with NUL byte"
+msgstr "sluit inskrywings met NUL-greep af"
+
+msgid "include object size"
+msgstr "sluit objekgrootte in"
+
+msgid "list only filenames"
+msgstr "lys slegs lêername"
+
+msgid "list only objects"
+msgstr "lys slegs objekte"
+
+msgid "use full path names"
+msgstr "gebruik volledige padname"
+
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr "lys hele boom; nie net huidige gids nie (impliseer --full-name)"
+
+msgid "--format can't be combined with other format-altering options"
+msgstr ""
+"--format kan nie met ander formaatveranderende opsies gekombineer word nie"
+
+#. TRANSLATORS: keep <> in "<" mail ">" info.
+msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
+msgstr "git mailinfo [<opsies>] <boodskap> <lap> < mail >info"
+
+msgid "keep subject"
+msgstr "behou onderwerp"
+
+msgid "keep non patch brackets in subject"
+msgstr "behou nie-lap-hakies in onderwerp"
+
+msgid "copy Message-ID to the end of commit message"
+msgstr "kopieer Message-ID na die einde van die vasleggingsboodskap"
+
+msgid "re-code metadata to i18n.commitEncoding"
+msgstr "herkodeer metadata na i18n.commitEncoding"
+
+msgid "disable charset re-coding of metadata"
+msgstr "deaktiveer karakterstel-herkodering van metadata"
+
+msgid "encoding"
+msgstr "kodering"
+
+msgid "re-code metadata to this encoding"
+msgstr "herkodeer metadata na hierdie kodering"
+
+msgid "use scissors"
+msgstr "gebruik skêr"
+
+msgid "<action>"
+msgstr "<aksie>"
+
+msgid "action when quoted CR is found"
+msgstr "aksie wanneer aangehaalde CR gevind word"
+
+msgid "use headers in message's body"
+msgstr "gebruik kopreëls in die boodskap se liggaam"
+
+msgid "reading patches from stdin/tty..."
+msgstr "lees lappe van stdin/tty..."
+
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr "leë mbox: '%s'"
+
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <vaslegging> <vaslegging>..."
+
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <vaslegging>..."
+
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <vaslegging> <vaslegging>"
+
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <vaslegging>..."
+
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <verwysing> [<vaslegging>]"
+
+msgid "output all common ancestors"
+msgstr "voer alle gemeenskaplike voorouers uit"
+
+msgid "find ancestors for a single n-way merge"
+msgstr "vind voorouers vir 'n enkele n-rigting-saamsmelting"
+
+msgid "list revs not reachable from others"
+msgstr "lys hersienings wat nie vanaf ander bereikbaar is nie"
+
+msgid "is the first one ancestor of the other?"
+msgstr "is die eerste een 'n voorouer van die ander?"
+
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "vind waar <vaslegging> van die reflog van <verwysing> afgetak het"
+
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<opsies>] [-L <naam1> [-L <oorspr> [-L <naam2>]]] <lêer1> "
+"<oorspr-lêer> <lêer2>"
+
+msgid "send results to standard output"
+msgstr "stuur resultate na standaardafvoer"
+
+msgid "use object IDs instead of filenames"
+msgstr "gebruik objek-ID's in plaas van lêername"
+
+msgid "use a diff3 based merge"
+msgstr "gebruik 'n diff3-gebaseerde saamsmelting"
+
+msgid "use a zealous diff3 based merge"
+msgstr "gebruik 'n ywerige diff3-gebaseerde saamsmelting"
+
+msgid "for conflicts, use this marker size"
+msgstr "gebruik hierdie merkergrootte vir konflikte"
+
+msgid "do not warn about conflicts"
+msgstr "moenie oor konflikte waarsku nie"
+
+msgid "set labels for file1/orig-file/file2"
+msgstr "stel etiketname vir lêer1/oorspr-lêer/lêer2"
+
+#, c-format
+msgid "object '%s' does not exist"
+msgstr "objek '%s' bestaan nie"
+
+msgid "Could not write object file"
+msgstr "Kon nie objeklêer skryf nie"
+
+#, c-format
+msgid "unknown option %s"
+msgstr "onbekende opsie %s"
+
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "kon nie objek '%s' ontleed nie"
+
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] "kan nie meer as %d basis hanteer nie. %s word geïgnoreer."
+msgstr[1] "kan nie meer as %d basisse hanteer nie. %s word geïgnoreer."
+
+msgid "not handling anything other than two heads merge."
+msgstr "hanteer niks anders as 'n saamsmelting van twee koppe nie."
+
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "kon nie verwysing '%s' oplos nie"
+
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Smelt %s met %s saam\n"
+
+#, c-format
+msgid "could not parse as tree '%s'"
+msgstr "kon nie '%s' as boom ontleed nie"
+
+msgid "not something we can merge"
+msgstr "nie iets wat ons kan saamsmelt nie"
+
+msgid "refusing to merge unrelated histories"
+msgstr "weier om onverwante geskiedenisse saam te smelt"
+
+msgid "failure to merge"
+msgstr "saamsmelting het misluk"
+
+msgid "git merge-tree [--write-tree] [<options>] <branch1> <branch2>"
+msgstr "git merge-tree [--write-tree] [<opsies>] <tak1> <tak2>"
+
+msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>"
+msgstr "git merge-tree [--trivial-merge] <basisboom> <tak1> <tak2>"
+
+msgid "do a real merge instead of a trivial merge"
+msgstr "doen 'n regte saamsmelting in plaas van 'n triviale saamsmelting"
+
+msgid "do a trivial merge only"
+msgstr "doen slegs 'n triviale saamsmelting"
+
+msgid "also show informational/conflict messages"
+msgstr "wys ook inligting-/konflikboodskappe"
+
+msgid "suppress all output; only exit status wanted"
+msgstr "onderdruk alle afvoer; slegs uittreestatus word verlang"
+
+msgid "list filenames without modes/oids/stages"
+msgstr "lys lêername sonder modusse/oid's/stadiums"
+
+msgid "allow merging unrelated histories"
+msgstr "laat saamsmelting van onverwante geskiedenisse toe"
+
+msgid "perform multiple merges, one per line of input"
+msgstr "voer veelvuldige saamsmeltings uit, een per invoerreël"
+
+msgid "specify a merge-base for the merge"
+msgstr "spesifiseer 'n saamsmeltbasis vir die saamsmelting"
+
+msgid "option=value"
+msgstr "opsie=waarde"
+
+msgid "option for selected merge strategy"
+msgstr "opsie vir gekose saamsmeltstrategie"
+
+msgid "--trivial-merge is incompatible with all other options"
+msgstr "--trivial-merge is onversoenbaar met alle ander opsies"
+
+#, c-format
+msgid "unknown strategy option: -X%s"
+msgstr "onbekende strategie-opsie: -X%s"
+
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "misvormde invoerreël: '%s'."
+
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<opsies>] [<vaslegging>...]"
+
+msgid "switch `m' requires a value"
+msgstr "skakelaar `m' vereis 'n waarde"
+
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "opsie `%s' vereis 'n waarde"
+
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Kon nie saamsmeltstrategie '%s' vind nie.\n"
+
+#, c-format
+msgid "Available strategies are:"
+msgstr "Beskikbare strategieë is:"
+
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Beskikbare pasgemaakte strategieë is:"
+
+msgid "do not show a diffstat at the end of the merge"
+msgstr "moenie 'n verskilstatistiek aan die einde van die saamsmelting wys nie"
+
+msgid "show a diffstat at the end of the merge"
+msgstr "wys 'n verskilstatistiek aan die einde van die saamsmelting"
+
+msgid "(synonym to --stat)"
+msgstr "(sinoniem vir --stat)"
+
+msgid "show a compact-summary at the end of the merge"
+msgstr "wys 'n kompakte opsomming aan die einde van die saamsmelting"
+
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr ""
+"voeg (hoogstens <n>) inskrywings uit shortlog by die "
+"saamsmeltvasleggingsboodskap"
+
+msgid "create a single commit instead of doing a merge"
+msgstr "skep 'n enkele vaslegging in plaas daarvan om saam te smelt"
+
+msgid "perform a commit if the merge succeeds (default)"
+msgstr "lê vas as die saamsmelting slaag (verstek)"
+
+msgid "edit message before committing"
+msgstr "wysig boodskap voor vaslegging"
+
+msgid "allow fast-forward (default)"
+msgstr "laat vooruitspoel toe (verstek)"
+
+msgid "abort if fast-forward is not possible"
+msgstr "staak as vooruitspoel nie moontlik is nie"
+
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "verifieer dat die genoemde vaslegging 'n geldige GPG-handtekening het"
+
+msgid "strategy"
+msgstr "strategie"
+
+msgid "merge strategy to use"
+msgstr "saamsmeltstrategie om te gebruik"
+
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr "saamsmeltvasleggingsboodskap (vir 'n nie-vooruitspoel-saamsmelting)"
+
+msgid "use <name> instead of the real target"
+msgstr "gebruik <naam> in plaas van die werklike teiken"
+
+msgid "abort the current in-progress merge"
+msgstr "staak die huidige saamsmelting wat aan die gang is"
+
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort, maar laat indeks en werkboom onaangeraak"
+
+msgid "continue the current in-progress merge"
+msgstr "gaan voort met die huidige saamsmelting wat aan die gang is"
+
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "omseil pre-merge-commit- en commit-msg-hake"
+
+msgid "could not run stash."
+msgstr "kon nie wegbêre uitvoer nie."
+
+msgid "stash failed"
+msgstr "wegbêre het misluk"
+
+msgid "read-tree failed"
+msgstr "read-tree het misluk"
+
+msgid "Already up to date. (nothing to squash)"
+msgstr "Reeds op datum. (niks om saam te pers nie)"
+
+msgid "Already up to date."
+msgstr "Reeds op datum."
+
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Saamgeperste vaslegging -- HEAD word nie bygewerk nie\n"
+
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "Geen saamsmeltboodskap nie -- HEAD word nie bygewerk nie\n"
+
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' wys nie na 'n vaslegging nie"
+
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Slegte branch.%s.mergeoptions-string: %s"
+
+msgid "Unable to write index."
+msgstr "Kan nie indeks skryf nie."
+
+msgid "Not handling anything other than two heads merge."
+msgstr "Hanteer niks anders as 'n saamsmelting van twee koppe nie."
+
+#, c-format
+msgid "unable to write %s"
+msgstr "kan nie %s skryf nie"
+
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "Kon nie van '%s' lees nie"
+
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr ""
+"Saamsmelting word nie vasgelê nie; gebruik 'git commit' om die saamsmelting "
+"te voltooi.\n"
+
+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 ""
+"Voer asseblief 'n vasleggingsboodskap in om te verduidelik waarom hierdie\n"
+"saamsmelting nodig is, veral as dit 'n bygewerkte stroomop in 'n "
+"onderwerptak\n"
+"saamsmelt.\n"
+"\n"
+
+msgid "An empty message aborts the commit.\n"
+msgstr "'n Leë boodskap staak die vaslegging.\n"
+
+#, c-format
+msgid ""
+"Lines starting with '%s' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"Reëls wat met '%s' begin, sal geïgnoreer word, en 'n leë boodskap staak\n"
+"die vaslegging.\n"
+
+msgid "Empty commit message."
+msgstr "Leë vasleggingsboodskap."
+
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Wonderlik.\n"
+
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+"Outomatiese saamsmelting het misluk; los konflikte op en lê dan die "
+"resultaat vas.\n"
+
+msgid "No current branch."
+msgstr "Geen huidige tak nie."
+
+msgid "No remote for the current branch."
+msgstr "Geen afgeleë vir die huidige tak nie."
+
+msgid "No default upstream defined for the current branch."
+msgstr "Geen verstek-stroomop vir die huidige tak gedefinieer nie."
+
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "Geen afgeleë volgtak vir %s vanaf %s nie"
+
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Slegte waarde '%s' in omgewing '%s'"
+
+#, c-format
+msgid "could not close '%s'"
+msgstr "kon nie '%s' sluit nie"
+
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "nie iets wat ons in %s kan saamsmelt nie: %s"
+
+msgid "--abort expects no arguments"
+msgstr "--abort verwag geen argumente nie"
+
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "Daar is geen saamsmelting om te staak nie (MERGE_HEAD ontbreek)."
+
+msgid "--quit expects no arguments"
+msgstr "--quit verwag geen argumente nie"
+
+msgid "--continue expects no arguments"
+msgstr "--continue verwag geen argumente nie"
+
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "Daar is geen saamsmelting aan die gang nie (MERGE_HEAD ontbreek)."
+
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"Jy het nie jou saamsmelting voltooi nie (MERGE_HEAD bestaan).\n"
+"Lê asseblief jou veranderinge vas voordat jy saamsmelt."
+
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"Jy het nie jou kersiepluk voltooi nie (CHERRY_PICK_HEAD bestaan).\n"
+"Lê asseblief jou veranderinge vas voordat jy saamsmelt."
+
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr "Jy het nie jou kersiepluk voltooi nie (CHERRY_PICK_HEAD bestaan)."
+
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+"Geen vaslegging gespesifiseer nie en merge.defaultToUpstream is nie gestel "
+"nie."
+
+msgid "Squash commit into empty head not supported yet"
+msgstr "Saampers van vaslegging in leë kop word nog nie ondersteun nie"
+
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr "Nie-vooruitspoel-vaslegging in 'n leë kop maak nie sin nie"
+
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - nie iets wat ons kan saamsmelt nie"
+
+msgid "Can merge only exactly one commit into empty head"
+msgstr "Kan slegs presies een vaslegging in 'n leë kop saamsmelt"
+
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Werk %s..%s by\n"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Jou plaaslike veranderinge aan die volgende lêers sou deur saamsmelting "
+"oorskryf word:\n"
+"  %s"
+
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Probeer 'n baie eenvoudige saamsmelting binne die indeks...\n"
+
+#, c-format
+msgid "Nope.\n"
+msgstr "Nee.\n"
+
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Spoel die boom terug na die oorspronklike toestand...\n"
+
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Probeer saamsmeltstrategie %s...\n"
+
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Geen saamsmeltstrategie het die saamsmelting hanteer nie.\n"
+
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "Saamsmelting met strategie %s het misluk.\n"
+
+#, c-format
+msgid "Using the %s strategy to prepare resolving by hand.\n"
+msgstr "Gebruik die %s-strategie om oplossing met die hand voor te berei.\n"
+
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+"Outomatiese saamsmelting het goed verloop; gestop voor vaslegging soos "
+"versoek\n"
+
+#, c-format
+msgid "When finished, apply stashed changes with `git stash pop`\n"
+msgstr "Wanneer klaar, pas weggebêrde veranderinge toe met `git stash pop`\n"
+
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "waarskuwing: etiketinvoer slaag nie vir fsck nie: %s"
+
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "fout: etiketinvoer slaag nie vir fsck nie: %s"
+
+#, c-format
+msgid "could not read tagged object '%s'"
+msgstr "kon nie geëtiketteerde objek '%s' lees nie"
+
+#, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "objek '%s' is as '%s' geëtiketteer, maar is van tipe '%s'"
+
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr "etiket op stdin het nie ons streng fsck-toets geslaag nie"
+
+msgid "tag on stdin did not refer to a valid object"
+msgstr "etiket op stdin het nie na 'n geldige objek verwys nie"
+
+msgid "unable to write tag file"
+msgstr "kan nie etiketlêer skryf nie"
+
+msgid "input is NUL terminated"
+msgstr "invoer is NUL-beëindig"
+
+msgid "allow missing objects"
+msgstr "laat ontbrekende objekte toe"
+
+msgid "allow creation of more than one tree"
+msgstr "laat die skep van meer as een boom toe"
+
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n"
+"  [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n"
+"  [--refs-snapshot=<path>] [--[no-]write-chain-file]\n"
+"  [--base=<checksum>]"
+msgstr ""
+"git multi-pack-index [<opsies>] write [--preferred-pack=<pak>]\n"
+"  [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n"
+"  [--refs-snapshot=<pad>] [--[no-]write-chain-file]\n"
+"  [--base=<kontrolesom>]"
+
+msgid ""
+"git multi-pack-index [<options>] compact [--[no-]incremental]\n"
+"  [--[no-]bitmap] [--base=<checksum>] [--[no-]write-chain-file]\n"
+"  <from> <to>"
+msgstr ""
+"git multi-pack-index [<opsies>] compact [--[no-]incremental]\n"
+"  [--[no-]bitmap] [--base=<kontrolesom>] [--[no-]write-chain-file]\n"
+"  <van> <na>"
+
+msgid "git multi-pack-index [<options>] verify"
+msgstr "git multi-pack-index [<opsies>] verify"
+
+msgid "git multi-pack-index [<options>] expire"
+msgstr "git multi-pack-index [<opsies>] expire"
+
+msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
+msgstr "git multi-pack-index [<opsies>] repack [--batch-size=<grootte>]"
+
+#, c-format
+msgid "object directory is not an alternate of the current repository: '%s'"
+msgstr "objekgids is nie 'n alternatief van die huidige bewaarplek nie: '%s'"
+
+msgid "directory"
+msgstr "gids"
+
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr "objekgids wat 'n stel paklêer- en pakindekspare bevat"
+
+msgid "preferred-pack"
+msgstr "voorkeurpak"
+
+msgid "pack for reuse when computing a multi-pack bitmap"
+msgstr "pak vir hergebruik wanneer 'n multipak-bitmap bereken word"
+
+msgid "write multi-pack bitmap"
+msgstr "skryf multipak-bitmap"
+
+msgid "checksum"
+msgstr "kontrolesom"
+
+msgid "base MIDX for incremental writes"
+msgstr "basis-MIDX vir inkrementele skryfbewerkings"
+
+msgid "write a new incremental MIDX"
+msgstr "skryf 'n nuwe inkrementele MIDX"
+
+msgid "write the multi-pack-index chain file"
+msgstr "skryf die multi-pack-index-kettinglêer"
+
+msgid "write multi-pack index containing only given indexes"
+msgstr "skryf 'n multipak-indeks wat slegs die gegewe indekse bevat"
+
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "verwysingsmomentopname vir die keuse van bitmap-vasleggings"
+
+#, c-format
+msgid "cannot use %s without %s"
+msgstr "kan nie %s sonder %s gebruik nie"
+
+msgid "cannot use --base without --no-write-chain-file"
+msgstr "kan nie --base sonder --no-write-chain-file gebruik nie"
+
+#, c-format
+msgid "could not find MIDX: %s"
+msgstr "kon nie MIDX vind nie: %s"
+
+msgid "MIDX compaction endpoints must be unique"
+msgstr "MIDX-kompakteringseindpunte moet uniek wees"
+
+#, c-format
+msgid "MIDX %s must be an ancestor of %s"
+msgstr "MIDX %s moet 'n voorouer van %s wees"
+
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+"versamel tydens herverpakking kleiner paklêers in 'n bondel wat groter as "
+"hierdie grootte is"
+
+msgid "git mv [-v] [-f] [-n] [-k] <source> <destination>"
+msgstr "git mv [-v] [-f] [-n] [-k] <bron> <bestemming>"
+
+msgid "git mv [-v] [-f] [-n] [-k] <source>... <destination-directory>"
+msgstr "git mv [-v] [-f] [-n] [-k] <bron>... <bestemmingsgids>"
+
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr "Gids %s is in die indeks en is nie 'n submodule nie?"
+
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+"Plaas asseblief jou veranderinge aan .gitmodules of bêre hulle weg om voort "
+"te gaan"
+
+#, c-format
+msgid "%.*s is in index"
+msgstr "%.*s is in die indeks"
+
+msgid "force move/rename even if target exists"
+msgstr "dwing skuif/hernoem af selfs al bestaan die teiken"
+
+msgid "skip move/rename errors"
+msgstr "slaan skuif-/hernoemfoute oor"
+
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr "bestemming '%s' is nie 'n gids nie"
+
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr "Kontroleer hernoeming van '%s' na '%s'\n"
+
+msgid "bad source"
+msgstr "slegte bron"
+
+msgid "destination exists"
+msgstr "bestemming bestaan"
+
+msgid "can not move directory into itself"
+msgstr "kan nie gids na homself skuif nie"
+
+msgid "destination already exists"
+msgstr "bestemming bestaan reeds"
+
+msgid "source directory is empty"
+msgstr "brongids is leeg"
+
+msgid "not under version control"
+msgstr "nie onder weergawebeheer nie"
+
+msgid "conflicted"
+msgstr "in konflik"
+
+#, c-format
+msgid "overwriting '%s'"
+msgstr "oorskryf '%s'"
+
+msgid "Cannot overwrite"
+msgstr "Kan nie oorskryf nie"
+
+msgid "multiple sources for the same target"
+msgstr "veelvuldige bronne vir dieselfde teiken"
+
+msgid "destination directory does not exist"
+msgstr "bestemmingsgids bestaan nie"
+
+msgid "destination is beyond a symbolic link"
+msgstr "bestemming is agter 'n simboliese skakel"
+
+msgid "destination is not a directory"
+msgstr "bestemming is nie 'n gids nie"
+
+msgid "destination exists in the index"
+msgstr "bestemming bestaan in die indeks"
+
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr "%s, bron=%s, bestemming=%s"
+
+#, c-format
+msgid "cannot move both '%s' and its parent directory '%s'"
+msgstr "kan nie beide '%s' en sy ouergids '%s' skuif nie"
+
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr "Hernoem %s na %s\n"
+
+#, c-format
+msgid "renaming '%s' to '%s' failed"
+msgstr "hernoeming van '%s' na '%s' het misluk"
+
+msgid "git name-rev [<options>] <commit>..."
+msgstr "git name-rev [<opsies>] <vaslegging>..."
+
+msgid "git name-rev [<options>] --all"
+msgstr "git name-rev [<opsies>] --all"
+
+msgid "git name-rev [<options>] --annotate-stdin"
+msgstr "git name-rev [<opsies>] --annotate-stdin"
+
+msgid "print only ref-based names (no object names)"
+msgstr "druk slegs verwysingsgebaseerde name (geen objekname nie)"
+
+msgid "only use tags to name the commits"
+msgstr "gebruik slegs etikette om die vasleggings te benoem"
+
+msgid "only use refs matching <pattern>"
+msgstr "gebruik slegs verwysings wat by <patroon> pas"
+
+msgid "ignore refs matching <pattern>"
+msgstr "ignoreer verwysings wat by <patroon> pas"
+
+msgid "list all commits reachable from all refs"
+msgstr "lys alle vasleggings wat vanaf alle verwysings bereikbaar is"
+
+msgid "deprecated: use --annotate-stdin instead"
+msgstr "verouderd: gebruik eerder --annotate-stdin"
+
+msgid "annotate text from stdin"
+msgstr "annoteer teks vanaf stdin"
+
+msgid "allow to print `undefined` names (default)"
+msgstr "laat toe dat `undefined`-name gedruk word (verstek)"
+
+msgid "dereference tags in the input (internal use)"
+msgstr "derefereer etikette in die invoer (interne gebruik)"
+
+#, c-format
+msgid "'%s' needs to be either text, revs, or rev"
+msgstr "'%s' moet een van text, revs of rev wees"
+
+msgid ""
+"(EXPERIMENTAL!) git format-rev --stdin-mode=<mode> --format=<pretty> [--"
+"[no-]notes=<ref>] [-z] [--[no-]null-output] [--[no-]null-input]"
+msgstr ""
+"(EKSPERIMENTEEL!) git format-rev --stdin-mode=<modus> --format=<formaat> [--"
+"[no-]notes=<verwysing>] [-z] [--[no-]null-output] [--[no-]null-input]"
+
+msgid "pretty format to use"
+msgstr "mooi-formaat om te gebruik"
+
+msgid "stdin-mode"
+msgstr "stdin-modus"
+
+msgid "how revs are processed"
+msgstr "hoe revisies verwerk word"
+
+msgid "notes"
+msgstr "notas"
+
+msgid "display notes for pretty format"
+msgstr "vertoon notas vir mooi-formaat"
+
+msgid "z"
+msgstr "z"
+
+msgid "Use NUL for input and output termination"
+msgstr "Gebruik NUL vir invoer- en uitvoerbeëindiging"
+
+msgid "Use NUL for input termination"
+msgstr "Gebruik NUL vir invoerbeëindiging"
+
+msgid "Use NUL for output termination"
+msgstr "Gebruik NUL vir uitvoerbeëindiging"
+
+#, c-format
+msgid "'%s' is required"
+msgstr "'%s' is verpligtend"
+
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr "git notes [--ref <notasverwysing>] [list [<objek>]]"
+
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--"
+"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
+"| -C) <object>] [<object>] [-e]"
+msgstr ""
+"git notes [--ref <notasverwysing>] add [-f] [--allow-empty] [--"
+"[no-]separator|--separator=<paragraafbreuk>] [--[no-]stripspace] [-m "
+"<boodskap> | -F <lêer> | (-c | -C) <objek>] [<objek>] [-e]"
+
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr "git notes [--ref <notasverwysing>] copy [-f] <van-objek> <na-objek>"
+
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--"
+"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
+"| -C) <object>] [<object>] [-e]"
+msgstr ""
+"git notes [--ref <notasverwysing>] append [--allow-empty] [--"
+"[no-]separator|--separator=<paragraafbreuk>] [--[no-]stripspace] [-m "
+"<boodskap> | -F <lêer> | (-c | -C) <objek>] [<objek>] [-e]"
+
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr "git notes [--ref <notasverwysing>] edit [--allow-empty] [<objek>]"
+
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr "git notes [--ref <notasverwysing>] show [<objek>]"
+
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr ""
+"git notes [--ref <notasverwysing>] merge [-v | -q] [-s <strategie>] "
+"<notasverwysing>"
+
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr "git notes [--ref <notasverwysing>] remove [<objek>...]"
+
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref <notasverwysing>] prune [-n] [-v]"
+
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr "git notes [--ref <notasverwysing>] get-ref"
+
+msgid "git notes [list [<object>]]"
+msgstr "git notes [list [<objek>]]"
+
+msgid "git notes add [<options>] [<object>]"
+msgstr "git notes add [<opsies>] [<objek>]"
+
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr "git notes copy [<opsies>] <van-objek> <na-objek>"
+
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr "git notes copy --stdin [<van-objek> <na-objek>]..."
+
+msgid "git notes append [<options>] [<object>]"
+msgstr "git notes append [<opsies>] [<objek>]"
+
+msgid "git notes edit [<object>]"
+msgstr "git notes edit [<objek>]"
+
+msgid "git notes show [<object>]"
+msgstr "git notes show [<objek>]"
+
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr "git notes merge [<opsies>] <notasverwysing>"
+
+msgid "git notes merge --commit [<options>]"
+msgstr "git notes merge --commit [<opsies>]"
+
+msgid "git notes merge --abort [<options>]"
+msgstr "git notes merge --abort [<opsies>]"
+
+msgid "git notes remove [<object>]"
+msgstr "git notes remove [<objek>]"
+
+msgid "git notes prune [<options>]"
+msgstr "git notes prune [<opsies>]"
+
+msgid "Write/edit the notes for the following object:"
+msgstr "Skryf/redigeer die notas vir die volgende objek:"
+
+msgid "could not read 'show' output"
+msgstr "kon nie 'show'-uitvoer lees nie"
+
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr "kon nie 'show' vir objek '%s' voltooi nie"
+
+msgid "please supply the note contents using either -m or -F option"
+msgstr "verskaf asseblief die notainhoud met óf die -m- óf die -F-opsie"
+
+msgid "unable to write note object"
+msgstr "kan nie nota-objek skryf nie"
+
+#, c-format
+msgid "the note contents have been left in %s"
+msgstr "die notainhoud is in %s gelaat"
+
+#, c-format
+msgid "could not open or read '%s'"
+msgstr "kon nie '%s' oopmaak of lees nie"
+
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "kon nie '%s' as 'n geldige verwysing oplos nie."
+
+#, c-format
+msgid "failed to read object '%s'."
+msgstr "kon nie objek '%s' lees nie."
+
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
+msgstr "kan nie notadata van nie-blob-objek '%s' lees nie."
+
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr "kon nie notas van '%s' na '%s' kopieer nie"
+
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#, c-format
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
+msgstr "weier om %s op notas in %s uit te voer (buite refs/notes/)"
+
+#, c-format
+msgid "no note found for object %s."
+msgstr "geen nota vir objek %s gevind nie."
+
+msgid "note contents as a string"
+msgstr "notainhoud as 'n string"
+
+msgid "note contents in a file"
+msgstr "notainhoud in 'n lêer"
+
+msgid "reuse and edit specified note object"
+msgstr "hergebruik en redigeer die gespesifiseerde nota-objek"
+
+msgid "edit note message in editor"
+msgstr "redigeer notaboodskap in die redigeerder"
+
+msgid "reuse specified note object"
+msgstr "hergebruik die gespesifiseerde nota-objek"
+
+msgid "allow storing empty note"
+msgstr "laat die stoor van 'n leë nota toe"
+
+msgid "replace existing notes"
+msgstr "vervang bestaande notas"
+
+msgid "<paragraph-break>"
+msgstr "<paragraafbreuk>"
+
+msgid "insert <paragraph-break> between paragraphs"
+msgstr "voeg <paragraafbreuk> tussen paragrawe in"
+
+msgid "remove unnecessary whitespace"
+msgstr "verwyder onnodige witspasie"
+
+#, c-format
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+"Kan nie notas byvoeg nie. Bestaande notas vir objek %s gevind. Gebruik '-f' "
+"om bestaande notas te oorskryf"
+
+#, c-format
+msgid "Overwriting existing notes for object %s\n"
+msgstr "Oorskryf bestaande notas vir objek %s\n"
+
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr "Verwyder nota vir objek %s\n"
+
+msgid "read objects from stdin"
+msgstr "lees objekte vanaf stdin"
+
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr "laai herskryfkonfigurasie vir <opdrag> (impliseer --stdin)"
+
+msgid "too few arguments"
+msgstr "te min argumente"
+
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+"Kan nie notas kopieer nie. Bestaande notas vir objek %s gevind. Gebruik '-f' "
+"om bestaande notas te oorskryf"
+
+#, c-format
+msgid "missing notes on source object %s. Cannot copy."
+msgstr "notas ontbreek op bronobjek %s. Kan nie kopieer nie."
+
+#, 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 -m/-F/-c/-C-opsies is verouderd vir die 'edit'-subopdrag.\n"
+"Gebruik asseblief eerder 'git notes add -f -m/-F/-c/-C'.\n"
+
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "kon nie verwysing NOTES_MERGE_PARTIAL skrap nie"
+
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "kon nie verwysing NOTES_MERGE_REF skrap nie"
+
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "kon nie die 'git notes merge'-werkboom verwyder nie"
+
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "kon nie verwysing NOTES_MERGE_PARTIAL lees nie"
+
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "kon nie vaslegging vanaf NOTES_MERGE_PARTIAL vind nie."
+
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "kon nie vaslegging vanaf NOTES_MERGE_PARTIAL ontleed nie."
+
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "kon nie NOTES_MERGE_REF oplos nie"
+
+msgid "failed to finalize notes merge"
+msgstr "kon nie notasaamsmelting afhandel nie"
+
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "onbekende notasaamsmeltstrategie %s"
+
+msgid "General options"
+msgstr "Algemene opsies"
+
+msgid "Merge options"
+msgstr "Saamsmeltopsies"
+
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+"los notakonflikte op met die gegewe strategie (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+
+msgid "Committing unmerged notes"
+msgstr "Lê notas wat nie saamgesmelt is nie vas"
+
+msgid "finalize notes merge by committing unmerged notes"
+msgstr ""
+"handel notasaamsmelting af deur notas wat nie saamgesmelt is nie vas te lê"
+
+msgid "Aborting notes merge resolution"
+msgstr "Staak oplossing van notasaamsmelting"
+
+msgid "abort notes merge"
+msgstr "staak notasaamsmelting"
+
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "kan nie --commit, --abort of -s/--strategy meng nie"
+
+msgid "must specify a notes ref to merge"
+msgstr "moet 'n notasverwysing spesifiseer om saam te smelt"
+
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr "onbekende -s/--strategy: %s"
+
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr "'n notasaamsmelting na %s is reeds aan die gang by %s"
+
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr "kon nie skakel na huidige notasverwysing (%s) stoor nie"
+
+#, 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 ""
+"Outomatiese notasaamsmelting het misluk. Herstel konflikte in %s en lê die "
+"resultaat vas met 'git notes merge --commit', of staak die saamsmelting met "
+"'git notes merge --abort'.\n"
+
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Kon nie '%s' as 'n geldige verwysing oplos nie."
+
+#, c-format
+msgid "Object %s has no note\n"
+msgstr "Objek %s het geen nota nie\n"
+
+msgid "attempt to remove non-existent note is not an error"
+msgstr "'n poging om 'n nie-bestaande nota te verwyder is nie 'n fout nie"
+
+msgid "read object names from the standard input"
+msgstr "lees objekname vanaf die standaardinvoer"
+
+msgid "do not remove, show only"
+msgstr "moenie verwyder nie, wys slegs"
+
+msgid "report pruned notes"
+msgstr "rapporteer gesnoeide notas"
+
+msgid "notes-ref"
+msgstr "notasverwysing"
+
+msgid "use notes from <notes-ref>"
+msgstr "gebruik notas vanaf <notasverwysing>"
+
+#, c-format
+msgid "unknown subcommand: `%s'"
+msgstr "onbekende subopdrag: `%s'"
+
+msgid ""
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+"                 [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+"                 [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+"                 [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
+"                 [--cruft] [--cruft-expiration=<time>]\n"
+"                 [--stdout [--filter=<filter-spec>] | <base-name>]\n"
+"                 [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+"                 [--name-hash-version=<n>] [--path-walk] < <object-list>"
+msgstr ""
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+"                 [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+"                 [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+"                 [--revs [--unpacked | --all]] [--keep-pack=<paknaam>]\n"
+"                 [--cruft] [--cruft-expiration=<tyd>]\n"
+"                 [--stdout [--filter=<filterspesifikasie>] | <basisnaam>]\n"
+"                 [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+"                 [--name-hash-version=<n>] [--path-walk] < <objeklys>"
+
+#, c-format
+msgid "invalid --name-hash-version option: %d"
+msgstr "ongeldige opsie --name-hash-version: %d"
+
+msgid "currently, --write-bitmap-index requires --name-hash-version=1"
+msgstr "tans vereis --write-bitmap-index --name-hash-version=1"
+
+#, c-format
+msgid "write_reuse_object: unable to parse object header of %s"
+msgstr "write_reuse_object: kan nie objekkopskrif van %s ontleed nie"
+
+#, c-format
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr ""
+"write_reuse_object: kon nie %s vind nie, verwag by afset %<PRIuMAX> in pak %s"
+
+#, c-format
+msgid "bad packed object CRC for %s"
+msgstr "slegte CRC van gepakte objek vir %s"
+
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr "korrupte gepakte objek vir %s"
+
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr "rekursiewe delta bespeur vir objek %s"
+
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr "%u objekte georden, %<PRIu32> verwag"
+
+#, c-format
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "objek verwag by afset %<PRIuMAX> in pak %s"
+
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr "skakel bitmapskryf af, pakke word weens pack.packSizeLimit verdeel"
+
+msgid "Writing objects"
+msgstr "Skryf objekte"
+
+#, c-format
+msgid "failed to stat %s"
+msgstr "kon nie stat op %s uitvoer nie"
+
+#, c-format
+msgid "failed utime() on %s"
+msgstr "utime() op %s het misluk"
+
+msgid "failed to write bitmap index"
+msgstr "kon nie bitmapindeks skryf nie"
+
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr "het %<PRIu32> objekte geskryf terwyl %<PRIu32> verwag is"
+
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr "skakel bitmapskryf af, aangesien sommige objekte nie gepak word nie"
+
+#, c-format
+msgid "delta base offset overflow in pack for %s"
+msgstr "delta-basisafset loop oor in pak vir %s"
+
+#, c-format
+msgid "delta base offset out of bound for %s"
+msgstr "delta-basisafset buite grense vir %s"
+
+msgid "Counting objects"
+msgstr "Tel objekte"
+
+#, c-format
+msgid "unable to get size of %s"
+msgstr "kan nie grootte van %s kry nie"
+
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr "kan nie objekkopskrif van %s ontleed nie"
+
+#, c-format
+msgid "object %s cannot be read"
+msgstr "objek %s kan nie gelees word nie"
+
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
+msgstr "objek %s het inkonsekwente objeklengte (%<PRIuMAX> teenoor %<PRIuMAX>)"
+
+msgid "suboptimal pack - out of memory"
+msgstr "suboptimale pak - geheue op"
+
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr "Delta-kompressie gebruik tot %d drade"
+
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr "kan nie objekte wat vanaf etiket %s bereikbaar is pak nie"
+
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "kan nie tipe van objek %s kry nie"
+
+msgid "Compressing objects by path"
+msgstr "Komprimeer objekte volgens pad"
+
+#, c-format
+msgid "Path-based delta compression using up to %d thread"
+msgid_plural "Path-based delta compression using up to %d threads"
+msgstr[0] "Padgebaseerde delta-kompressie gebruik tot %d draad"
+msgstr[1] "Padgebaseerde delta-kompressie gebruik tot %d drade"
+
+msgid "Compressing objects"
+msgstr "Komprimeer objekte"
+
+msgid "inconsistency with delta count"
+msgstr "inkonsekwentheid met delta-telling"
+
+#, c-format
+msgid "invalid pack.allowPackReuse value: '%s'"
+msgstr "ongeldige pack.allowPackReuse-waarde: '%s'"
+
+#, c-format
+msgid ""
+"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
+"hash> <uri>' (got '%s')"
+msgstr ""
+"waarde van uploadpack.blobpackfileuri moet van die vorm '<object-hash> <pack-"
+"hash> <uri>' wees (het '%s' gekry)"
+
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
+"objek is reeds in 'n ander uploadpack.blobpackfileuri gekonfigureer (het "
+"'%s' gekry)"
+
+#, c-format
+msgid "could not get type of object %s in pack %s"
+msgstr "kon nie tipe van objek %s in pak %s kry nie"
+
+#, c-format
+msgid "could not find pack '%s'"
+msgstr "kon nie pak '%s' vind nie"
+
+#, c-format
+msgid "packfile %s is a promisor but --exclude-promisor-objects was given"
+msgstr ""
+"paklêer %s is 'n beloftegewer, maar --exclude-promisor-objects is gegee"
+
+#, c-format
+msgid "packfile %s cannot be accessed"
+msgstr "paklêer %s is nie toeganklik nie"
+
+msgid "Enumerating cruft objects"
+msgstr "Som afvalobjekte op"
+
+msgid "unable to add cruft objects"
+msgstr "kan nie afvalobjekte byvoeg nie"
+
+msgid "Traversing cruft objects"
+msgstr "Deurloop afvalobjekte"
+
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+"het rand-objek-ID verwag, maar gemors gekry:\n"
+" %s"
+
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+"het objek-ID verwag, maar gemors gekry:\n"
+" %s"
+
+msgid "cannot open pack index"
+msgstr "kan nie pakindeks oopmaak nie"
+
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr "los objek by %s kon nie ondersoek word nie"
+
+#, c-format
+msgid "cannot read object for %s"
+msgstr "kan nie objek vir %s lees nie"
+
+#, c-format
+msgid "cannot map object %s to %s"
+msgstr "kan nie objek %s na %s karteer nie"
+
+msgid "unable to force loose object"
+msgstr "kan nie los objek afdwing nie"
+
+#, c-format
+msgid "could not find commit %s"
+msgstr "kon nie vaslegging %s vind nie"
+
+#, c-format
+msgid "not a rev '%s'"
+msgstr "nie 'n revisie nie: '%s'"
+
+#, c-format
+msgid "bad revision '%s'"
+msgstr "slegte revisie '%s'"
+
+msgid "failed to pack objects via path-walk"
+msgstr "kon nie objekte via path-walk pak nie"
+
+msgid "unable to add recent objects"
+msgstr "kan nie onlangse objekte byvoeg nie"
+
+#, c-format
+msgid "unsupported index version %s"
+msgstr "nie-ondersteunde indeksweergawe %s"
+
+#, c-format
+msgid "bad index version '%s'"
+msgstr "slegte indeksweergawe '%s'"
+
+msgid "show progress meter during object writing phase"
+msgstr "wys vorderingsmeter tydens die objekskryffase"
+
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "soortgelyk aan --all-progress wanneer die vorderingsmeter gewys word"
+
+msgid "<version>[,<offset>]"
+msgstr "<weergawe>[,<afset>]"
+
+msgid "write the pack index file in the specified idx format version"
+msgstr "skryf die pakindekslêer in die gespesifiseerde idx-formaatweergawe"
+
+msgid "ignore borrowed objects from alternate object store"
+msgstr "ignoreer geleende objekte van 'n alternatiewe objekstoor"
+
+msgid "ignore packed objects"
+msgstr "ignoreer gepakte objekte"
+
+msgid "limit pack window by objects"
+msgstr "beperk pakvenster volgens objekte"
+
+msgid "limit pack window by memory in addition to object limit"
+msgstr "beperk pakvenster volgens geheue benewens die objeklimiet"
+
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr "maksimum lengte van deltaketting toegelaat in die resulterende pak"
+
+msgid "reuse existing deltas"
+msgstr "hergebruik bestaande deltas"
+
+msgid "reuse existing objects"
+msgstr "hergebruik bestaande objekte"
+
+msgid "use OFS_DELTA objects"
+msgstr "gebruik OFS_DELTA-objekte"
+
+msgid "use threads when searching for best delta matches"
+msgstr "gebruik drade wanneer na die beste delta-passings gesoek word"
+
+msgid "do not create an empty pack output"
+msgstr "moenie 'n leë pakuitvoer skep nie"
+
+msgid "read revision arguments from standard input"
+msgstr "lees revisie-argumente vanaf standaardinvoer"
+
+msgid "limit the objects to those that are not yet packed"
+msgstr "beperk die objekte tot dié wat nog nie gepak is nie"
+
+msgid "include objects reachable from any reference"
+msgstr "sluit objekte in wat vanaf enige verwysing bereikbaar is"
+
+msgid "include objects referred by reflog entries"
+msgstr "sluit objekte in waarna reflog-inskrywings verwys"
+
+msgid "include objects referred to by the index"
+msgstr "sluit objekte in waarna die indeks verwys"
+
+msgid "read packs from stdin"
+msgstr "lees pakke vanaf stdin"
+
+msgid "output pack to stdout"
+msgstr "voer pak uit na stdout"
+
+msgid "include tag objects that refer to objects to be packed"
+msgstr "sluit etiketobjekte in wat verwys na objekte wat gepak gaan word"
+
+msgid "keep unreachable objects"
+msgstr "behou onbereikbare objekte"
+
+msgid "pack loose unreachable objects"
+msgstr "pak los onbereikbare objekte"
+
+msgid "unpack unreachable objects newer than <time>"
+msgstr "pak onbereikbare objekte nuwer as <tyd> uit"
+
+msgid "create a cruft pack"
+msgstr "skep 'n afvalpak"
+
+msgid "expire cruft objects older than <time>"
+msgstr "laat afvalobjekte ouer as <tyd> verval"
+
+msgid "use the sparse reachability algorithm"
+msgstr "gebruik die yl bereikbaarheidsalgoritme"
+
+msgid "create thin packs"
+msgstr "skep dun pakke"
+
+msgid "use the path-walk API to walk objects when possible"
+msgstr "gebruik die path-walk-API om objekte te deurloop waar moontlik"
+
+msgid "create packs suitable for shallow fetches"
+msgstr "skep pakke wat geskik is vir vlak haalbewerkings"
+
+msgid "ignore packs that have companion .keep file"
+msgstr "ignoreer pakke wat 'n gepaardgaande .keep-lêer het"
+
+msgid "ignore this pack"
+msgstr "ignoreer hierdie pak"
+
+msgid "pack compression level"
+msgstr "pakkompressievlak"
+
+msgid "do not hide commits by grafts"
+msgstr "moenie vasleggings deur oorplantings verberg nie"
+
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr ""
+"gebruik 'n bitmapindeks indien beskikbaar om die tel van objekte te versnel"
+
+msgid "write a bitmap index together with the pack index"
+msgstr "skryf 'n bitmapindeks saam met die pakindeks"
+
+msgid "write a bitmap index if possible"
+msgstr "skryf 'n bitmapindeks indien moontlik"
+
+msgid "handling for missing objects"
+msgstr "hantering van ontbrekende objekte"
+
+msgid "do not pack objects in promisor packfiles"
+msgstr "moenie objekte in beloftegewer-paklêers pak nie"
+
+msgid "implies --missing=allow-any"
+msgstr "impliseer --missing=allow-any"
+
+msgid "respect islands during delta compression"
+msgstr "respekteer eilande tydens delta-kompressie"
+
+msgid "protocol"
+msgstr "protokol"
+
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr ""
+"sluit enige gekonfigureerde uploadpack.blobpackfileuri met hierdie protokol "
+"uit"
+
+msgid "use the specified name-hash function to group similar objects"
+msgstr ""
+"gebruik die gespesifiseerde naam-hash-funksie om soortgelyke objekte te "
+"groepeer"
+
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr "deltakettingdiepte %d is te diep, dwing %d af"
+
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr "pack.deltaCacheLimit is te hoog, dwing %d af"
+
+#, c-format
+msgid "cannot use %s with %s"
+msgstr "kan nie %s met %s gebruik nie"
+
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "slegte pakkompressievlak %d"
+
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr "--max-pack-size kan nie gebruik word om 'n pak vir oordrag te bou nie"
+
+msgid "minimum pack size limit is 1 MiB"
+msgstr "minimum pakgroottelimiet is 1 MiB"
+
+msgid "--thin cannot be used to build an indexable pack"
+msgstr "--thin kan nie gebruik word om 'n indekseerbare pak te bou nie"
+
+msgid "cannot use internal rev list with --stdin-packs"
+msgstr "kan nie interne revisielys met --stdin-packs gebruik nie"
+
+msgid "cannot use internal rev list with --cruft"
+msgstr "kan nie interne revisielys met --cruft gebruik nie"
+
+msgid "Enumerating objects"
+msgstr "Som objekte op"
+
+#, c-format
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32> (from %<PRIuMAX>)"
+msgstr ""
+"Totaal %<PRIu32> (delta %<PRIu32>), hergebruik %<PRIu32> (delta %<PRIu32>), "
+"pak-hergebruik %<PRIu32> (van %<PRIuMAX>)"
+
+msgid "git pack-refs "
+msgstr "git pack-refs "
+
+msgid "git patch-id [--stable | --unstable | --verbatim]"
+msgstr "git patch-id [--stable | --unstable | --verbatim]"
+
+msgid "use the unstable patch ID algorithm"
+msgstr "gebruik die onstabiele lap-ID-algoritme"
+
+msgid "use the stable patch ID algorithm"
+msgstr "gebruik die stabiele lap-ID-algoritme"
+
+msgid "don't strip whitespace from the patch"
+msgstr "moenie witspasie van die lap verwyder nie"
+
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <tyd>] [--] [<kop>...]"
+
+msgid "report pruned objects"
+msgstr "rapporteer gesnoeide objekte"
+
+msgid "expire objects older than <time>"
+msgstr "laat objekte ouer as <tyd> verval"
+
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr "beperk deurloop tot objekte buite beloftegewer-paklêers"
+
+msgid "cannot prune in a precious-objects repo"
+msgstr "kan nie in 'n bewaarplek met kosbare objekte snoei nie"
+
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr "git pull [<opsies>] [<bewaarplek> [<verwysingspesifikasie>...]]"
+
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr ""
+"Daar is geen kandidaat om teen te herbaseer onder die verwysings wat jy pas "
+"gehaal het nie."
+
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr ""
+"Daar is geen kandidate om mee saam te smelt onder die verwysings wat jy pas "
+"gehaal het nie."
+
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+"Oor die algemeen beteken dit dat jy 'n verwysingspesifikasie met 'n\n"
+"jokerteken verskaf het wat geen passings aan die afgeleë kant gehad het nie."
+
+#, 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 ""
+"Jy het gevra om van die afgeleë '%s' te trek, maar het nie 'n tak\n"
+"gespesifiseer nie. Omdat dit nie die verstek gekonfigureerde afgeleë vir\n"
+"jou huidige tak is nie, moet jy 'n tak op die opdragreël spesifiseer."
+
+msgid "You are not currently on a branch."
+msgstr "Jy is tans nie op 'n tak nie."
+
+msgid "Please specify which branch you want to rebase against."
+msgstr "Spesifiseer asseblief teen watter tak jy wil herbaseer."
+
+msgid "Please specify which branch you want to merge with."
+msgstr "Spesifiseer asseblief met watter tak jy wil saamsmelt."
+
+msgid "See git-pull(1) for details."
+msgstr "Sien git-pull(1) vir besonderhede."
+
+msgid "<remote>"
+msgstr "<afgeleë>"
+
+msgid "<branch>"
+msgstr "<tak>"
+
+msgid "There is no tracking information for the current branch."
+msgstr "Daar is geen volginligting vir die huidige tak nie."
+
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr "As jy volginligting vir hierdie tak wil instel, kan jy dit doen met:"
+
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr ""
+"Jou konfigurasie spesifiseer om met die verwysing '%s'\n"
+"van die afgeleë saam te smelt, maar geen sodanige verwysing is gehaal nie."
+
+#, c-format
+msgid "unable to access commit %s"
+msgstr "kan nie toegang tot vaslegging %s kry nie"
+
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "ongeldige verwysingspesifikasie '%s'"
+
+msgid "ignoring --verify-signatures for rebase"
+msgstr "ignoreer --verify-signatures vir herbasering"
+
+msgid ""
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
+"\n"
+"  git config pull.rebase false  # merge\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 ""
+"Jy het uiteenlopende takke en moet spesifiseer hoe om hulle te versoen.\n"
+"Jy kan dit doen deur een van die volgende opdragte voor jou volgende\n"
+"trek uit te voer:\n"
+"\n"
+"  git config pull.rebase false  # saamsmelt\n"
+"  git config pull.rebase true   # herbaseer\n"
+"  git config pull.ff only       # slegs vooruitspoel\n"
+"\n"
+"Jy kan \"git config\" met \"git config --global\" vervang om 'n\n"
+"verstekvoorkeur vir alle bewaarplekke in te stel. Jy kan ook --rebase,\n"
+"--no-rebase of --ff-only op die opdragreël gee om die gekonfigureerde\n"
+"verstek per aanroep te oorheers.\n"
+
+msgid "control for recursive fetching of submodules"
+msgstr "beheer rekursiewe haal van submodules"
+
+msgid "Options related to merging"
+msgstr "Opsies wat met saamsmelting verband hou"
+
+msgid "incorporate changes by rebasing rather than merging"
+msgstr "inkorporeer veranderinge deur te herbaseer eerder as om saam te smelt"
+
+msgid "allow fast-forward"
+msgstr "laat vooruitspoel toe"
+
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "beheer gebruik van pre-merge-commit- en commit-msg-hake"
+
+msgid "automatically stash/stash pop before and after"
+msgstr "bêre outomaties weg en haal terug (stash/stash pop) voor en na"
+
+msgid "Options related to fetching"
+msgstr "Opsies wat met haal verband hou"
+
+msgid "force overwrite of local branch"
+msgstr "dwing oorskrywing van plaaslike tak af"
+
+msgid "number of submodules pulled in parallel"
+msgstr "aantal submodules wat parallel getrek word"
+
+msgid "use IPv4 addresses only"
+msgstr "gebruik slegs IPv4-adresse"
+
+msgid "use IPv6 addresses only"
+msgstr "gebruik slegs IPv6-adresse"
+
+msgid "Updating an unborn branch with changes added to the index."
+msgstr "Werk 'n ongebore tak by met veranderinge wat by die indeks gevoeg is."
+
+msgid "pull with rebase"
+msgstr "trek met herbasering"
+
+msgid "Please commit or stash them."
+msgstr "Lê hulle asseblief vas of bêre hulle weg."
+
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+"haal het die huidige takkop bygewerk.\n"
+"spoel jou werkboom vooruit vanaf\n"
+"vaslegging %s."
+
+#, 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 ""
+"Kan nie jou werkboom vooruitspoel nie.\n"
+"Nadat jy seker gemaak het dat jy enigiets kosbaars uit die\n"
+"$ git diff %s\n"
+"uitvoer gestoor het, voer\n"
+"$ git reset --hard\n"
+"uit om te herstel."
+
+msgid "Cannot merge multiple branches into empty head."
+msgstr "Kan nie veelvuldige takke in 'n leë kop saamsmelt nie."
+
+msgid "Cannot rebase onto multiple branches."
+msgstr "Kan nie op veelvuldige takke herbaseer nie."
+
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Kan nie na veelvuldige takke vooruitspoel nie."
+
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Moet spesifiseer hoe om uiteenlopende takke te versoen."
+
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr "kan nie herbaseer met plaaslik aangetekende submodule-wysigings nie"
+
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr "git push [<opsies>] [<bewaarplek> [<verwysingspesifikasie>...]]"
+
+msgid "tag shorthand without <tag>"
+msgstr "etiket-verkorting sonder <etiket>"
+
+msgid "--delete only accepts plain target ref names"
+msgstr "--delete aanvaar slegs gewone teikenverwysingsname"
+
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'.\n"
+msgstr ""
+"\n"
+"Om enige opsie permanent te kies, sien push.default in 'git help config'.\n"
+
+msgid ""
+"\n"
+"To avoid automatically configuring an upstream branch when its name\n"
+"won't match the local branch, see option 'simple' of branch.autoSetupMerge\n"
+"in 'git help config'.\n"
+msgstr ""
+"\n"
+"Om te voorkom dat 'n stroomop-tak outomaties opgestel word wanneer sy naam\n"
+"nie by die plaaslike tak pas nie, sien opsie 'simple' van "
+"branch.autoSetupMerge\n"
+"in 'git help config'.\n"
+
+#, 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%s"
+msgstr ""
+"Die stroomop-tak van jou huidige tak pas nie\n"
+"by die naam van jou huidige tak nie.  Om na die stroomop-tak\n"
+"op die afgeleë te stoot, gebruik\n"
+"\n"
+"    git push %s HEAD:%s\n"
+"\n"
+"Om na die tak met dieselfde naam op die afgeleë te stoot, gebruik\n"
+"\n"
+"    git push %s HEAD\n"
+"%s%s"
+
+#, 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 ""
+"Jy is tans nie op 'n tak nie.\n"
+"Om die geskiedenis wat tot die huidige (ontkoppelde HEAD)\n"
+"toestand lei nou te stoot, gebruik\n"
+"\n"
+"    git push %s HEAD:<naam-van-afgeleë-tak>\n"
+
+msgid ""
+"\n"
+"To have this happen automatically for branches without a tracking\n"
+"upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
+msgstr ""
+"\n"
+"Om dit outomaties te laat gebeur vir takke sonder 'n volg-\n"
+"stroomop, sien 'push.autoSetupRemote' in 'git help config'.\n"
+
+#, 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"
+"%s"
+msgstr ""
+"Die huidige tak %s het geen stroomop-tak nie.\n"
+"Om die huidige tak te stoot en die afgeleë as stroomop te stel, gebruik\n"
+"\n"
+"    git push --set-upstream %s %s\n"
+"%s"
+
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr "Die huidige tak %s het verskeie stroomop-takke, weier om te stoot."
+
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"Jy het geen verwysingspesifikasies om te stoot gespesifiseer nie, en "
+"push.default is \"nothing\"."
+
+#, 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 ""
+"Jy stoot na afgeleë '%s', wat nie die stroomop van\n"
+"jou huidige tak '%s' is nie, sonder om te sê wat om te stoot\n"
+"om watter afgeleë tak op te dateer."
+
+msgid ""
+"Updates were rejected because the tip of your current branch is behind\n"
+"its remote counterpart. If you want to integrate the remote changes,\n"
+"use 'git pull' before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"Opdaterings is geweier omdat die punt van jou huidige tak agter\n"
+"sy afgeleë eweknie is. As jy die afgeleë wysigings wil integreer,\n"
+"gebruik 'git pull' voordat jy weer stoot.\n"
+"Sien die 'Note about fast-forwards' in 'git push --help' vir besonderhede."
+
+msgid ""
+"Updates were rejected because a pushed branch tip is behind its remote\n"
+"counterpart. If you want to integrate the remote changes, use 'git pull'\n"
+"before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"Opdaterings is geweier omdat 'n gestote takpunt agter sy afgeleë\n"
+"eweknie is. As jy die afgeleë wysigings wil integreer, gebruik 'git pull'\n"
+"voordat jy weer stoot.\n"
+"Sien die 'Note about fast-forwards' in 'git push --help' vir besonderhede."
+
+msgid ""
+"Updates were rejected because the remote contains work that you do not\n"
+"have locally. This is usually caused by another repository pushing to\n"
+"the same ref. If you want to integrate the remote changes, use\n"
+"'git pull' before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"Opdaterings is geweier omdat die afgeleë werk bevat wat jy nie\n"
+"plaaslik het nie. Dit word gewoonlik veroorsaak deur 'n ander bewaarplek wat "
+"na\n"
+"dieselfde verwysing stoot. As jy die afgeleë wysigings wil integreer, "
+"gebruik\n"
+"'git pull' voordat jy weer stoot.\n"
+"Sien die 'Note about fast-forwards' in 'git push --help' vir besonderhede."
+
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr "Opdaterings is geweier omdat die etiket reeds in die afgeleë bestaan."
+
+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 ""
+"Jy kan nie 'n afgeleë verwysing opdateer wat na 'n nie-vaslegging-objek wys "
+"nie,\n"
+"of 'n afgeleë verwysing opdateer om dit na 'n nie-vaslegging-objek te laat "
+"wys nie,\n"
+"sonder om die '--force'-opsie te gebruik.\n"
+
+msgid ""
+"Updates were rejected because the tip of the remote-tracking branch has\n"
+"been updated since the last checkout. If you want to integrate the\n"
+"remote changes, use 'git pull' before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"Opdaterings is geweier omdat die punt van die afgeleë volgtak\n"
+"sedert die laaste uitcheck opgedateer is. As jy die\n"
+"afgeleë wysigings wil integreer, gebruik 'git pull' voordat jy weer stoot.\n"
+"Sien die 'Note about fast-forwards' in 'git push --help' vir besonderhede."
+
+#, c-format
+msgid "Pushing to %s\n"
+msgstr "Stoot tans na %s\n"
+
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr "kon nie sommige verwysings na '%s' stoot nie"
+
+msgid ""
+"recursing into submodule with push.recurseSubmodules=only; using on-demand "
+"instead"
+msgstr ""
+"herhaal tans in submodule met push.recurseSubmodules=only; gebruik in plaas "
+"on-demand"
+
+#, c-format
+msgid "invalid value for '%s'"
+msgstr "ongeldige waarde vir '%s'"
+
+#, c-format
+msgid "could not push to %s"
+msgstr "kon nie na %s stoot nie"
+
+#, c-format
+msgid "'%s' is not a valid push target"
+msgstr "'%s' is nie 'n geldige stootteiken nie"
+
+#, c-format
+msgid "Did you mean to use: git push %s %s?"
+msgstr "Het jy bedoel om dit te gebruik: git push %s %s?"
+
+msgid "repository"
+msgstr "bewaarplek"
+
+msgid "push all branches"
+msgstr "stoot alle takke"
+
+msgid "mirror all refs"
+msgstr "spieël alle verwysings"
+
+msgid "delete refs"
+msgstr "skrap verwysings"
+
+msgid "push tags (can't be used with --all or --branches or --mirror)"
+msgstr ""
+"stoot etikette (kan nie saam met --all of --branches of --mirror gebruik "
+"word nie)"
+
+msgid "force updates"
+msgstr "dwing opdaterings af"
+
+msgid "<refname>:<expect>"
+msgstr "<verwysingsnaam>:<verwag>"
+
+msgid "require old value of ref to be at this value"
+msgstr "vereis dat die ou waarde van die verwysing hierdie waarde is"
+
+msgid "require remote updates to be integrated locally"
+msgstr "vereis dat afgeleë opdaterings plaaslik geïntegreer word"
+
+msgid "control recursive pushing of submodules"
+msgstr "beheer herhalende stoot van submodules"
+
+msgid "use thin pack"
+msgstr "gebruik dun pak"
+
+msgid "receive pack program"
+msgstr "ontvang-pak-program"
+
+msgid "set upstream for git pull/status"
+msgstr "stel stroomop vir git pull/status"
+
+msgid "prune locally removed refs"
+msgstr "sny plaaslik verwyderde verwysings weg"
+
+msgid "bypass pre-push hook"
+msgstr "omseil pre-push-haak"
+
+msgid "push missing but relevant tags"
+msgstr "stoot ontbrekende maar tersaaklike etikette"
+
+msgid "GPG sign the push"
+msgstr "onderteken die stoot met GPG"
+
+msgid "request atomic transaction on remote side"
+msgstr "versoek atoomtransaksie aan die afgeleë kant"
+
+msgid "--delete doesn't make sense without any refs"
+msgstr "--delete maak nie sin sonder enige verwysings nie"
+
+#, c-format
+msgid "bad repository '%s'"
+msgstr "slegte bewaarplek '%s'"
+
+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"
+"\n"
+"To push to multiple remotes at once, configure a remote group using\n"
+"\n"
+"    git config remotes.<groupname> \"<remote1> <remote2>\"\n"
+"\n"
+"and then push using the group name\n"
+"\n"
+"    git push <groupname>\n"
+msgstr ""
+"Geen gekonfigureerde stootbestemming nie.\n"
+"Spesifiseer of die URL vanaf die opdraglyn of stel 'n afgeleë bewaarplek op "
+"met\n"
+"\n"
+"    git remote add <naam> <url>\n"
+"\n"
+"en stoot dan met die afgeleë naam\n"
+"\n"
+"    git push <naam>\n"
+"\n"
+"Om gelyktydig na verskeie afgeleës te stoot, stel 'n afgeleë groep op met\n"
+"\n"
+"    git config remotes.<groepnaam> \"<afgeleë1> <afgeleë2>\"\n"
+"\n"
+"en stoot dan met die groepnaam\n"
+"\n"
+"    git push <groepnaam>\n"
+
+msgid "push options must not have new line characters"
+msgstr "stootopsies mag nie nuwereëlkarakters hê nie"
+
+msgid "--all can't be combined with refspecs"
+msgstr "--all kan nie met verwysingspesifikasies gekombineer word nie"
+
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror kan nie met verwysingspesifikasies gekombineer word nie"
+
+msgid "--atomic can only be used when pushing to one remote"
+msgstr ""
+"--atomic kan slegs gebruik word wanneer daar na een afgeleë gestoot word"
+
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr ""
+"git range-diff [<opsies>] <ou-basis>..<ou-punt> <nuwe-basis>..<nuwe-punt>"
+
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+msgstr "git range-diff [<opsies>] <ou-punt>...<nuwe-punt>"
+
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+msgstr "git range-diff [<opsies>] <basis> <ou-punt> <nuwe-punt>"
+
+#, c-format
+msgid "invalid max-memory value: %s"
+msgstr "ongeldige max-memory-waarde: %s"
+
+msgid "use simple diff colors"
+msgstr "gebruik eenvoudige verskilkleure"
+
+msgid "passed to 'git log'"
+msgstr "word aan 'git log' deurgegee"
+
+msgid "size"
+msgstr "grootte"
+
+msgid "maximum memory for cost matrix (default 4G)"
+msgstr "maksimum geheue vir kostematriks (verstek 4G)"
+
+msgid "only emit output related to the first range"
+msgstr "lewer slegs uitvoer wat met die eerste reeks verband hou"
+
+msgid "only emit output related to the second range"
+msgstr "lewer slegs uitvoer wat met die tweede reeks verband hou"
+
+#, c-format
+msgid "not a revision: '%s'"
+msgstr "nie 'n revisie nie: '%s'"
+
+#, c-format
+msgid "not a commit range: '%s'"
+msgstr "nie 'n vasleggingsreeks nie: '%s'"
+
+#, c-format
+msgid "not a symmetric range: '%s'"
+msgstr "nie 'n simmetriese reeks nie: '%s'"
+
+msgid "need two commit ranges"
+msgstr "benodig twee vasleggingsreekse"
+
+msgid ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
+"prefix=<prefix>)\n"
+"              [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n"
+"              (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+msgstr ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
+"prefix=<voorvoegsel>)\n"
+"              [-u | -i]] [--index-output=<lêer>] [--no-sparse-checkout]\n"
+"              (--empty | <boomagtige1> [<boomagtige2> [<boomagtige3>]])"
+
+msgid "write resulting index to <file>"
+msgstr "skryf resulterende indeks na <lêer>"
+
+msgid "only empty the index"
+msgstr "maak slegs die indeks leeg"
+
+msgid "Merging"
+msgstr "Saamsmelting"
+
+msgid "perform a merge in addition to a read"
+msgstr "voer 'n saamsmelting benewens 'n lees uit"
+
+msgid "3-way merge if no file level merging required"
+msgstr ""
+"3-rigting-saamsmelting indien geen saamsmelting op lêervlak nodig is nie"
+
+msgid "3-way merge in presence of adds and removes"
+msgstr ""
+"3-rigting-saamsmelting in die teenwoordigheid van byvoegings en verwyderings"
+
+msgid "same as -m, but discard unmerged entries"
+msgstr "dieselfde as -m, maar verwerp inskrywings wat nie saamgesmelt is nie"
+
+msgid "<subdirectory>/"
+msgstr "<subgids>/"
+
+msgid "read the tree into the index under <subdirectory>/"
+msgstr "lees die boom in die indeks onder <subgids>/ in"
+
+msgid "update working tree with merge result"
+msgstr "werk werkboom by met saamsmeltresultaat"
+
+msgid "gitignore"
+msgstr "gitignore"
+
+msgid "allow explicitly ignored files to be overwritten"
+msgstr "laat toe dat uitdruklik geïgnoreerde lêers oorskryf word"
+
+msgid "don't check the working tree after merging"
+msgstr "moenie die werkboom na saamsmelting nagaan nie"
+
+msgid "don't update the index or the work tree"
+msgstr "moenie die indeks of die werkboom bywerk nie"
+
+msgid "skip applying sparse checkout filter"
+msgstr "slaan die toepassing van die yl-uitcheck-filter oor"
+
+msgid "debug unpack-trees"
+msgstr "ontfout unpack-trees"
+
+msgid "suppress feedback messages"
+msgstr "onderdruk terugvoerboodskappe"
+
+msgid "You need to resolve your current index first"
+msgstr "Jy moet eers jou huidige indeks oplos"
+
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
+msgstr ""
+"git rebase [-i] [opsies] [--exec <opdrag>] [--onto <nuwebasis> | --keep-"
+"base] [<stroomop> [<tak>]]"
+
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+"git rebase [-i] [opsies] [--exec <opdrag>] [--onto <nuwebasis>] --root "
+"[<tak>]"
+
+#, c-format
+msgid "could not read '%s'."
+msgstr "kon nie '%s' lees nie."
+
+#, c-format
+msgid "could not create temporary %s"
+msgstr "kon nie tydelike %s skep nie"
+
+msgid "could not mark as interactive"
+msgstr "kon nie as interaktief merk nie"
+
+msgid "could not generate todo list"
+msgstr "kon nie die taaklys genereer nie"
+
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr "'n basisvaslegging moet met --upstream of --onto verskaf word"
+
+#, c-format
+msgid "%s requires the merge backend"
+msgstr "%s vereis die saamsmelt-agterkant"
+
+#, c-format
+msgid "invalid onto: '%s'"
+msgstr "ongeldige onto: '%s'"
+
+#, c-format
+msgid "invalid orig-head: '%s'"
+msgstr "ongeldige orig-head: '%s'"
+
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
+msgstr "ignoreer ongeldige allow_rerere_autoupdate: '%s'"
+
+#, c-format
+msgid "could not remove '%s'"
+msgstr "kon nie '%s' verwyder nie"
+
+#, 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 het 'n fout teëgekom terwyl die lappe voorberei is om hierdie\n"
+"hersienings oor te speel:\n"
+"\n"
+"    %s\n"
+"\n"
+"Gevolglik kan git hulle nie herbaseer nie."
+
+#, c-format
+msgid "Unknown rebase-merges mode: %s"
+msgstr "Onbekende rebase-merges-modus: %s"
+
+#, c-format
+msgid "could not switch to %s"
+msgstr "kon nie na %s oorskakel nie"
+
+msgid "apply options and merge options cannot be used together"
+msgstr "apply-opsies en merge-opsies kan nie saam gebruik word nie"
+
+msgid "--empty=ask is deprecated; use '--empty=stop' instead."
+msgstr "--empty=ask is verouderd; gebruik eerder '--empty=stop'."
+
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and "
+"\"stop\"."
+msgstr ""
+"onherkende leë tipe '%s'; geldige waardes is \"drop\", \"keep\" en \"stop\"."
+
+msgid ""
+"--rebase-merges with an empty string argument is deprecated and will stop "
+"working in a future version of Git. Use --rebase-merges without an argument "
+"instead, which does the same thing."
+msgstr ""
+"--rebase-merges met 'n leë string as argument is verouderd en sal in 'n "
+"toekomstige weergawe van Git ophou werk. Gebruik eerder --rebase-merges "
+"sonder 'n argument, wat dieselfde doen."
+
+#, 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"
+"Spesifiseer asseblief teen watter tak jy wil herbaseer.\n"
+"Sien git-rebase(1) vir besonderhede.\n"
+"\n"
+"    git rebase '<tak>'\n"
+"\n"
+
+#, 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 ""
+"As jy naspoorinligting vir hierdie tak wil stel, kan jy dit doen met:\n"
+"\n"
+"    git branch --set-upstream-to=%s/<tak> %s\n"
+"\n"
+
+msgid "exec commands cannot contain newlines"
+msgstr "exec-opdragte kan nie nuwe reëls bevat nie"
+
+msgid "empty exec command"
+msgstr "leë exec-opdrag"
+
+msgid "rebase onto given branch instead of upstream"
+msgstr "herbaseer op die gegewe tak in plaas van stroomop"
+
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr ""
+"gebruik die saamsmeltbasis van stroomop en die tak as die huidige basis"
+
+msgid "allow pre-rebase hook to run"
+msgstr "laat die pre-rebase-haak toe om te loop"
+
+msgid "be quiet. implies --no-stat"
+msgstr "wees stil. impliseer --no-stat"
+
+msgid "display a diffstat of what changed upstream"
+msgstr "vertoon 'n diffstat van wat stroomop verander het"
+
+msgid "do not show diffstat of what changed upstream"
+msgstr "moenie 'n diffstat van wat stroomop verander het wys nie"
+
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "voeg 'n Signed-off-by-sleepreël by elke vaslegging"
+
+msgid "make committer date match author date"
+msgstr "laat die vasleggerdatum met die outeurdatum ooreenstem"
+
+msgid "ignore author date and use current date"
+msgstr "ignoreer die outeurdatum en gebruik die huidige datum"
+
+msgid "synonym of --reset-author-date"
+msgstr "sinoniem van --reset-author-date"
+
+msgid "passed to 'git apply'"
+msgstr "deurgegee aan 'git apply'"
+
+msgid "ignore changes in whitespace"
+msgstr "ignoreer veranderinge in witspasie"
+
+msgid "cherry-pick all commits, even if unchanged"
+msgstr "kersiepluk alle vasleggings, selfs al is hulle onveranderd"
+
+msgid "continue"
+msgstr "gaan voort"
+
+msgid "skip current patch and continue"
+msgstr "slaan die huidige lap oor en gaan voort"
+
+msgid "abort and check out the original branch"
+msgstr "staak en check die oorspronklike tak uit"
+
+msgid "abort but keep HEAD where it is"
+msgstr "staak maar hou HEAD waar dit is"
+
+msgid "edit the todo list during an interactive rebase"
+msgstr "wysig die taaklys tydens 'n interaktiewe herbasering"
+
+msgid "show the patch file being applied or merged"
+msgstr "wys die laplêer wat toegepas of saamgesmelt word"
+
+msgid "use apply strategies to rebase"
+msgstr "gebruik apply-strategieë om te herbaseer"
+
+msgid "use merging strategies to rebase"
+msgstr "gebruik saamsmeltstrategieë om te herbaseer"
+
+msgid "let the user edit the list of commits to rebase"
+msgstr "laat die gebruiker die lys vasleggings wysig wat herbaseer moet word"
+
+msgid "(REMOVED) was: try to recreate merges instead of ignoring them"
+msgstr ""
+"(VERWYDER) was: probeer saamsmeltings herskep in plaas daarvan om hulle te "
+"ignoreer"
+
+msgid "keep commits which start empty"
+msgstr "behou vasleggings wat leeg begin"
+
+msgid "move commits that begin with squash!/fixup! under -i"
+msgstr "skuif vasleggings wat met squash!/fixup! begin onder -i"
+
+msgid "update branches that point to commits that are being rebased"
+msgstr "werk takke by wat na vasleggings wys wat tans herbaseer word"
+
+msgid "add exec lines after each commit of the editable list"
+msgstr "voeg exec-reëls by na elke vaslegging van die wysigbare lys"
+
+msgid "allow rebasing commits with empty messages"
+msgstr "laat die herbasering van vasleggings met leë boodskappe toe"
+
+msgid "try to rebase merges instead of skipping them"
+msgstr "probeer saamsmeltings herbaseer in plaas daarvan om hulle oor te slaan"
+
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr "gebruik 'merge-base --fork-point' om stroomop te verfyn"
+
+msgid "use the given merge strategy"
+msgstr "gebruik die gegewe saamsmeltstrategie"
+
+msgid "option"
+msgstr "opsie"
+
+msgid "pass the argument through to the merge strategy"
+msgstr "gee die argument deur na die saamsmeltstrategie"
+
+msgid "rebase all reachable commits up to the root(s)"
+msgstr "herbaseer alle bereikbare vasleggings tot by die wortel(s)"
+
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "herskeduleer outomaties enige `exec` wat misluk"
+
+msgid "apply all changes, even those already present upstream"
+msgstr "pas alle veranderinge toe, selfs dié wat reeds stroomop bestaan"
+
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr "Dit lyk of 'git am' aan die gang is. Kan nie herbaseer nie."
+
+msgid ""
+"`rebase --preserve-merges` (-p) is no longer supported.\n"
+"Use `git rebase --abort` to terminate current rebase.\n"
+"Or downgrade to v2.33, or earlier, to complete the rebase."
+msgstr ""
+"`rebase --preserve-merges` (-p) word nie meer ondersteun nie.\n"
+"Gebruik `git rebase --abort` om die huidige herbasering te beëindig.\n"
+"Of gradeer af na v2.33, of vroeër, om die herbasering te voltooi."
+
+msgid ""
+"--preserve-merges was replaced by --rebase-merges\n"
+"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
+"which is no longer supported; use 'merges' instead"
+msgstr ""
+"--preserve-merges is deur --rebase-merges vervang\n"
+"Let wel: Jou `pull.rebase`-konfigurasie is dalk ook op 'preserve' gestel,\n"
+"wat nie meer ondersteun word nie; gebruik eerder 'merges'"
+
+msgid "no rebase in progress"
+msgstr "geen herbasering aan die gang nie"
+
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr ""
+"Die aksie --edit-todo kan slegs tydens 'n interaktiewe herbasering gebruik "
+"word."
+
+msgid "Cannot read HEAD"
+msgstr "Kan nie HEAD lees nie"
+
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+"Jy moet alle saamsmeltkonflikte wysig en hulle dan\n"
+"met git add as opgelos merk"
+
+msgid "could not discard worktree changes"
+msgstr "kon nie die werkboomveranderinge weggooi nie"
+
+#, c-format
+msgid "could not move back to %s"
+msgstr "kon nie terug na %s skuif nie"
+
+#, 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 ""
+"Dit lyk of daar reeds 'n %s-gids is, en ek wonder\n"
+"of jy middel-in 'n ander herbasering is.  As dit die\n"
+"geval is, probeer asseblief\n"
+"\t%s\n"
+"As dit nie die geval is nie, voer asseblief\n"
+"\t%s\n"
+"uit en laat loop my weer.  Ek stop ingeval jy nog iets\n"
+"waardevols daar het.\n"
+
+msgid "switch `C' expects a numerical value"
+msgstr "skakelaar `C' verwag 'n numeriese waarde"
+
+msgid ""
+"apply options are incompatible with rebase.rebaseMerges.  Consider adding --"
+"no-rebase-merges"
+msgstr ""
+"apply-opsies is onversoenbaar met rebase.rebaseMerges.  Oorweeg om --no-"
+"rebase-merges by te voeg"
+
+msgid ""
+"apply options are incompatible with rebase.updateRefs.  Consider adding --no-"
+"update-refs"
+msgstr ""
+"apply-opsies is onversoenbaar met rebase.updateRefs.  Oorweeg om --no-update-"
+"refs by te voeg"
+
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "Onbekende herbaseer-agterkant: %s"
+
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--reschedule-failed-exec vereis --exec of --interactive"
+
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr "ongeldige stroomop '%s'"
+
+msgid "Could not create new root commit"
+msgstr "Kon nie 'n nuwe wortelvaslegging skep nie"
+
+#, c-format
+msgid "no such branch/commit '%s'"
+msgstr "geen sodanige tak/vaslegging '%s' nie"
+
+#, c-format
+msgid "No such ref: %s"
+msgstr "Geen sodanige verwysing nie: %s"
+
+msgid "Could not resolve HEAD to a commit"
+msgstr "Kon nie HEAD na 'n vaslegging oplos nie"
+
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr "'%s': benodig presies een saamsmeltbasis met die tak"
+
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr "'%s': benodig presies een saamsmeltbasis"
+
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr "Wys nie na 'n geldige vaslegging '%s' nie"
+
+msgid "HEAD is up to date."
+msgstr "HEAD is op datum."
+
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr "Huidige tak %s is op datum.\n"
+
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD is op datum, herbasering afgedwing."
+
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
+msgstr "Huidige tak %s is op datum, herbasering afgedwing.\n"
+
+msgid "The pre-rebase hook refused to rebase."
+msgstr "Die pre-rebase-haak het geweier om te herbaseer."
+
+#, c-format
+msgid "Changes to %s:\n"
+msgstr "Veranderinge aan %s:\n"
+
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr "Veranderinge van %s na %s:\n"
+
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
+msgstr "Spoel eers head terug om jou werk daarbo oor te speel...\n"
+
+msgid "Could not detach HEAD"
+msgstr "Kon nie HEAD ontkoppel nie"
+
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr "%s is na %s vooruitgespoel.\n"
+
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <Git-gids>"
+
+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 ""
+"By verstek word die bywerk van die huidige tak in 'n nie-kaal bewaarplek\n"
+"geweier, omdat dit die indeks en werkboom onsamehangend sal maak met\n"
+"wat jy gestoot het, en 'git reset --hard' sal vereis om die werkboom\n"
+"met HEAD te laat ooreenstem.\n"
+"\n"
+"Jy kan die 'receive.denyCurrentBranch'-konfigurasieveranderlike in die\n"
+"afgeleë bewaarplek op 'ignore' of 'warn' stel om stoot na sy huidige\n"
+"tak toe te laat; dit word egter nie aanbeveel nie, tensy jy op 'n ander\n"
+"manier gereël het dat sy werkboom bygewerk word om met wat jy gestoot\n"
+"het ooreen te stem.\n"
+"\n"
+"Om hierdie boodskap stil te maak en steeds die verstekgedrag te behou,\n"
+"stel die 'receive.denyCurrentBranch'-konfigurasieveranderlike op 'refuse'."
+
+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 ""
+"By verstek word die skrap van die huidige tak geweier, omdat die volgende\n"
+"'git clone' nie tot enige uitgecheckte lêer sal lei nie, wat verwarring\n"
+"veroorsaak.\n"
+"\n"
+"Jy kan die 'receive.denyDeleteCurrent'-konfigurasieveranderlike in die\n"
+"afgeleë bewaarplek op 'warn' of 'ignore' stel om die skrap van die\n"
+"huidige tak toe te laat, met of sonder 'n waarskuwingsboodskap.\n"
+"\n"
+"Om hierdie boodskap stil te maak, kan jy dit op 'refuse' stel."
+
+msgid "quiet"
+msgstr "stil"
+
+msgid "you must specify a directory"
+msgstr "jy moet 'n gids spesifiseer"
+
+msgid "git reflog [show] [<log-options>] [<ref>]"
+msgstr "git reflog [show] [<log-opsies>] [<verwysing>]"
+
+msgid "git reflog list"
+msgstr "git reflog list"
+
+msgid "git reflog exists <ref>"
+msgstr "git reflog exists <verwysing>"
+
+msgid "git reflog write <ref> <old-oid> <new-oid> <message>"
+msgstr "git reflog write <verwysing> <ou-oid> <nuwe-oid> <boodskap>"
+
+msgid ""
+"git reflog delete [--rewrite] [--updateref]\n"
+"                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
+msgstr ""
+"git reflog delete [--rewrite] [--updateref]\n"
+"                  [--dry-run | -n] [--verbose] "
+"<verwysing>@{<spesifiseerder>}..."
+
+msgid "git reflog drop [--all [--single-worktree] | <refs>...]"
+msgstr "git reflog drop [--all [--single-worktree] | <verwysings>...]"
+
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
+"                  [--rewrite] [--updateref] [--stale-fix]\n"
+"                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
+msgstr ""
+"git reflog expire [--expire=<tyd>] [--expire-unreachable=<tyd>]\n"
+"                  [--rewrite] [--updateref] [--stale-fix]\n"
+"                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<verwysings>...]"
+
+#, c-format
+msgid "invalid timestamp '%s' given to '--%s'"
+msgstr "ongeldige tydstempel '%s' aan '--%s' gegee"
+
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s aanvaar nie argumente nie: '%s'"
+
+msgid "do not actually prune any entries"
+msgstr "moenie werklik enige inskrywings snoei nie"
+
+msgid ""
+"rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
+msgstr ""
+"herskryf die ou SHA1 met die nuwe SHA1 van die inskrywing wat dit nou "
+"voorafgaan"
+
+msgid "update the reference to the value of the top reflog entry"
+msgstr "werk die verwysing by na die waarde van die boonste reflog-inskrywing"
+
+msgid "print extra information on screen"
+msgstr "druk ekstra inligting op die skerm"
+
+msgid "timestamp"
+msgstr "tydstempel"
+
+msgid "prune entries older than the specified time"
+msgstr "snoei inskrywings ouer as die gespesifiseerde tyd"
+
+msgid ""
+"prune entries older than <time> that are not reachable from the current tip "
+"of the branch"
+msgstr ""
+"snoei inskrywings ouer as <tyd> wat nie vanaf die huidige punt van die tak "
+"bereikbaar is nie"
+
+msgid "prune any reflog entries that point to broken commits"
+msgstr "snoei enige reflog-inskrywings wat na gebreekte vasleggings wys"
+
+msgid "process the reflogs of all references"
+msgstr "verwerk die reflogs van alle verwysings"
+
+msgid "limits processing to reflogs from the current worktree only"
+msgstr "beperk verwerking tot reflogs van slegs die huidige werkboom"
+
+#, c-format
+msgid "Marking reachable objects..."
+msgstr "Merk bereikbare objekte..."
+
+#, c-format
+msgid "reflog could not be found: '%s'"
+msgstr "reflog kon nie gevind word nie: '%s'"
+
+msgid "no reflog specified to delete"
+msgstr "geen reflog is gespesifiseer om te skrap nie"
+
+#, c-format
+msgid "invalid ref format: %s"
+msgstr "ongeldige verwysingsformaat: %s"
+
+msgid "drop the reflogs of all references"
+msgstr "laat die reflogs van alle verwysings val"
+
+msgid "drop reflogs from the current worktree only"
+msgstr "laat slegs die reflogs van die huidige werkboom val"
+
+msgid "references specified along with --all"
+msgstr "verwysings saam met --all gespesifiseer"
+
+#, c-format
+msgid "invalid reference name: %s"
+msgstr "ongeldige verwysingsnaam: %s"
+
+#, c-format
+msgid "invalid old object ID: '%s'"
+msgstr "ongeldige ou objek-ID: '%s'"
+
+#, c-format
+msgid "old object '%s' does not exist"
+msgstr "ou objek '%s' bestaan nie"
+
+#, c-format
+msgid "invalid new object ID: '%s'"
+msgstr "ongeldige nuwe objek-ID: '%s'"
+
+#, c-format
+msgid "new object '%s' does not exist"
+msgstr "nuwe objek '%s' bestaan nie"
+
+#, c-format
+msgid "cannot start transaction: %s"
+msgstr "kan nie transaksie begin nie: %s"
+
+#, c-format
+msgid "cannot queue reflog update: %s"
+msgstr "kan nie reflog-bywerking in die ry plaas nie: %s"
+
+#, c-format
+msgid "cannot commit reflog update: %s"
+msgstr "kan nie reflog-bywerking vaslê nie: %s"
+
+msgid "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]"
+msgstr "git refs migrate --ref-format=<formaat> [--no-reflog] [--dry-run]"
+
+msgid "git refs verify [--strict] [--verbose]"
+msgstr "git refs verify [--strict] [--verbose]"
+
+msgid "git refs exists <ref>"
+msgstr "git refs exists <verwysing>"
+
+msgid "git refs optimize "
+msgstr "git refs optimize "
+
+msgid ""
+"git refs create [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value>"
+msgstr ""
+"git refs create [--message=<rede>] [--no-deref] [--create-reflog] "
+"<verwysing> <nuwe-waarde>"
+
+msgid "git refs delete [--message=<reason>] [--no-deref] <ref> [<old-value>]"
+msgstr ""
+"git refs delete [--message=<rede>] [--no-deref] <verwysing> [<ou-waarde>]"
+
+msgid ""
+"git refs update [--message=<reason>] [--no-deref] [--create-reflog] <ref> "
+"<new-value> [<old-value>]"
+msgstr ""
+"git refs update [--message=<rede>] [--no-deref] [--create-reflog] "
+"<verwysing> <nuwe-waarde> [<ou-waarde>]"
+
+msgid "git refs rename [--message=<reason>] <old-ref> <new-ref>"
+msgstr "git refs rename [--message=<rede>] <ou-verwysing> <nuwe-verwysing>"
+
+msgid "specify the reference format to convert to"
+msgstr "spesifiseer die verwysingsformaat om na om te skakel"
+
+msgid "perform a non-destructive dry-run"
+msgstr "voer 'n nie-vernietigende proeflopie uit"
+
+msgid "drop reflogs entirely during the migration"
+msgstr "laat reflogs heeltemal val tydens die migrasie"
+
+msgid "missing --ref-format=<format>"
+msgstr "--ref-format=<formaat> ontbreek"
+
+#, c-format
+msgid "repository already uses '%s' format"
+msgstr "bewaarplek gebruik reeds die '%s'-formaat"
+
+msgid "enable strict checking"
+msgstr "aktiveer streng kontrolering"
+
+msgid "'git refs verify' takes no arguments"
+msgstr "'git refs verify' neem geen argumente nie"
+
+msgid "git refs list "
+msgstr "git refs list "
+
+msgid "'git refs exists' requires a reference"
+msgstr "'git refs exists' vereis 'n verwysing"
+
+msgid "reference does not exist"
+msgstr "verwysing bestaan nie"
+
+msgid "failed to look up reference"
+msgstr "kon nie verwysing opsoek nie"
+
+msgid "reason"
+msgstr "rede"
+
+msgid "reason of the update"
+msgstr "rede vir die bywerking"
+
+msgid "update <refname> not the one it points to"
+msgstr "werk <verwysingsnaam> by, nie die een waarna dit wys nie"
+
+msgid "create a reflog"
+msgstr "skep 'n reflog"
+
+msgid "create requires reference name and an object ID"
+msgstr "create vereis 'n verwysingsnaam en 'n objek-ID"
+
+msgid "refusing to perform update with empty message"
+msgstr "weier om bywerking met 'n leë boodskap uit te voer"
+
+#, c-format
+msgid "invalid object ID: '%s'"
+msgstr "ongeldige objek-ID: '%s'"
+
+msgid "cannot create reference with null new object ID"
+msgstr "kan nie verwysing met nul nuwe objek-ID skep nie"
+
+msgid "delete requires reference name and an optional old object ID"
+msgstr "delete vereis 'n verwysingsnaam en 'n opsionele ou objek-ID"
+
+msgid "cannot delete reference with null old object ID"
+msgstr "kan nie verwysing met nul ou objek-ID skrap nie"
+
+msgid "update requires reference name, new value and an optional old value"
+msgstr "update vereis 'n verwysingsnaam, nuwe waarde en 'n opsionele ou waarde"
+
+msgid "rename requires old and new reference name"
+msgstr "rename vereis ou en nuwe verwysingsnaam"
+
+#, c-format
+msgid "invalid ref format: '%s'"
+msgstr "ongeldige verwysingsformaat: '%s'"
+
+#, c-format
+msgid "reference does not exist: '%s'"
+msgstr "verwysing bestaan nie: '%s'"
+
+#, c-format
+msgid "reference already exists: '%s'"
+msgstr "verwysing bestaan reeds: '%s'"
+
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
+msgstr ""
+"git remote add [-t <tak>] [-m <meester>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <naam> <url>"
+
+msgid "git remote rename [--[no-]progress] <old> <new>"
+msgstr "git remote rename [--[no-]progress] <oud> <nuut>"
+
+msgid "git remote remove <name>"
+msgstr "git remote remove <naam>"
+
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr "git remote set-head <naam> (-a | --auto | -d | --delete | <tak>)"
+
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr "git remote [-v | --verbose] show [-n] <naam>"
+
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr "git remote prune [-n | --dry-run] <naam>"
+
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+"git remote [-v | --verbose] update [-p | --prune] [(<groep> | <afgeleë>)...]"
+
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr "git remote set-branches [--add] <naam> <tak>..."
+
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <naam>"
+
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr "git remote set-url [--push] <naam> <nuweurl> [<ouurl>]"
+
+msgid "git remote set-url --add <name> <newurl>"
+msgstr "git remote set-url --add <naam> <nuweurl>"
+
+msgid "git remote set-url --delete <name> <url>"
+msgstr "git remote set-url --delete <naam> <url>"
+
+msgid "git remote add [<options>] <name> <url>"
+msgstr "git remote add [<opsies>] <naam> <url>"
+
+msgid "git remote set-branches <name> <branch>..."
+msgstr "git remote set-branches <naam> <tak>..."
+
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr "git remote set-branches --add <naam> <tak>..."
+
+msgid "git remote show [<options>] <name>"
+msgstr "git remote show [<opsies>] <naam>"
+
+msgid "git remote prune [<options>] <name>"
+msgstr "git remote prune [<opsies>] <naam>"
+
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr "git remote update [<opsies>] [<groep> | <afgeleë>]..."
+
+#, c-format
+msgid "Updating %s"
+msgstr "Werk %s by"
+
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Kon nie %s haal nie"
+
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+"--mirror is gevaarlik en verouderd; gebruik asseblief\n"
+"\t eerder --mirror=fetch of --mirror=push"
+
+#, c-format
+msgid "unknown --mirror argument: %s"
+msgstr "onbekende argument --mirror: %s"
+
+#, c-format
+msgid "remote name '%s' is a subset of existing remote '%s'"
+msgstr "afgeleë naam '%s' is 'n subversameling van bestaande afgeleë '%s'"
+
+#, c-format
+msgid "remote name '%s' is a superset of existing remote '%s'"
+msgstr "afgeleë naam '%s' is 'n superversameling van bestaande afgeleë '%s'"
+
+msgid "fetch the remote branches"
+msgstr "haal die afgeleë takke"
+
+msgid ""
+"import all tags and associated objects when fetching\n"
+"or do not fetch any tag at all (--no-tags)"
+msgstr ""
+"voer alle etikette en geassosieerde objekte in tydens haal\n"
+"of haal glad geen etiket nie (--no-tags)"
+
+msgid "branch(es) to track"
+msgstr "tak(ke) om na te spoor"
+
+msgid "master branch"
+msgstr "meestertak"
+
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr "stel die afgeleë op as 'n spieël om na te stoot of van af te haal"
+
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr "dit maak geen sin om 'n meestertak met --mirror te spesifiseer nie"
+
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr ""
+"dit maak slegs sin om takke om na te spoor te spesifiseer met haal-spieëls"
+
+#, c-format
+msgid "remote %s already exists."
+msgstr "afgeleë %s bestaan reeds."
+
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr "Kon nie meester '%s' opstel nie"
+
+#, c-format
+msgid "more than one %s"
+msgstr "meer as een %s"
+
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "onhanteerde branch.%s.rebase=%s; neem 'true' aan"
+
+#, c-format
+msgid "Could not get fetch map for refspec %s"
+msgstr "Kon nie haalkaart vir verwysingspesifikasie %s kry nie"
+
+msgid "(matching)"
+msgstr "(ooreenstemmend)"
+
+msgid "(delete)"
+msgstr "(skrap)"
+
+#, c-format
+msgid "could not set '%s'"
+msgstr "kon nie '%s' stel nie"
+
+#, c-format
+msgid "could not unset '%s'"
+msgstr "kon nie '%s' ontstel nie"
+
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"Die %s-konfigurasie remote.pushDefault in:\n"
+"\t%s:%d\n"
+"benoem nou die nie-bestaande afgeleë '%s'"
+
+msgid ""
+"The remote you are trying to rename has conflicting references in the\n"
+"new target refspec. This is most likely caused by you trying to nest\n"
+"a remote into itself, e.g. by renaming 'parent' into 'parent/child'\n"
+"or by unnesting a remote, e.g. the other way round.\n"
+"\n"
+"If that is the case, you can address this by first renaming the\n"
+"remote to a different name.\n"
+msgstr ""
+"Die afgeleë wat jy probeer hernoem, het botsende verwysings in die\n"
+"nuwe teiken-verwysingspesifikasie. Dit word heel waarskynlik veroorsaak\n"
+"doordat jy 'n afgeleë in homself probeer nes, bv. deur 'parent' na\n"
+"'parent/child' te hernoem, of deur 'n afgeleë te ontnes, bv. andersom.\n"
+"\n"
+"As dit die geval is, kan jy dit oplos deur die afgeleë eers na 'n\n"
+"ander naam te hernoem.\n"
+
+#, c-format
+msgid "No such remote: '%s'"
+msgstr "Geen sodanige afgeleë nie: '%s'"
+
+#, c-format
+msgid "Could not rename config section '%s' to '%s'"
+msgstr "Kon nie konfigurasie-afdeling '%s' na '%s' hernoem nie"
+
+msgid "Renaming remote references"
+msgstr "Hernoem afgeleë verwysings"
+
+#, c-format
+msgid "queueing remote ref renames failed: %s"
+msgstr "die plasing van afgeleë verwysingshernoemings in die ry het misluk: %s"
+
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+"Werk nie nie-verstek haal-verwysingspesifikasie by nie\n"
+"\t%s\n"
+"\tWerk asseblief die konfigurasie self by indien nodig."
+
+#, c-format
+msgid "renaming remote refs failed: %s"
+msgstr "hernoeming van afgeleë verwysings het misluk: %s"
+
+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] ""
+"Let wel: 'n Tak buite die hiërargie refs/remotes/ is nie verwyder nie;\n"
+"gebruik die volgende om dit te skrap:"
+msgstr[1] ""
+"Let wel: Sommige takke buite die hiërargie refs/remotes/ is nie verwyder "
+"nie;\n"
+"gebruik die volgende om hulle te skrap:"
+
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr "Kon nie konfigurasie-afdeling '%s' verwyder nie"
+
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr " nuut (volgende haal sal in remotes/%s stoor)"
+
+msgid " tracked"
+msgstr " nagespoor"
+
+msgid " skipped"
+msgstr " oorgeslaan"
+
+msgid " stale (use 'git remote prune' to remove)"
+msgstr " verouderd (gebruik 'git remote prune' om te verwyder)"
+
+msgid " ???"
+msgstr " ???"
+
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgstr "ongeldige branch.%s.merge; kan nie op > 1 tak herbaseer nie"
+
+#, c-format
+msgid "rebases interactively onto remote %s"
+msgstr "herbaseer interaktief op afgeleë %s"
+
+#, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr "herbaseer interaktief (met saamsmeltings) op afgeleë %s"
+
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "herbaseer op afgeleë %s"
+
+#, c-format
+msgid " merges with remote %s"
+msgstr " smelt saam met afgeleë %s"
+
+#, c-format
+msgid "merges with remote %s"
+msgstr "smelt saam met afgeleë %s"
+
+#, c-format
+msgid "%-*s    and with remote %s\n"
+msgstr "%-*s    en met afgeleë %s\n"
+
+msgid "create"
+msgstr "skep"
+
+msgid "delete"
+msgstr "skrap"
+
+msgid "up to date"
+msgstr "op datum"
+
+msgid "fast-forwardable"
+msgstr "kan vooruitgespoel word"
+
+msgid "local out of date"
+msgstr "plaaslik verouderd"
+
+#, c-format
+msgid "    %-*s forces to %-*s (%s)"
+msgstr "    %-*s dwing na %-*s (%s)"
+
+#, c-format
+msgid "    %-*s pushes to %-*s (%s)"
+msgstr "    %-*s stoot na %-*s (%s)"
+
+#, c-format
+msgid "    %-*s forces to %s"
+msgstr "    %-*s dwing na %s"
+
+#, c-format
+msgid "    %-*s pushes to %s"
+msgstr "    %-*s stoot na %s"
+
+msgid "do not query remotes"
+msgstr "moenie afgeleës navraag doen nie"
+
+#, c-format
+msgid "* remote %s"
+msgstr "* afgeleë %s"
+
+#, c-format
+msgid "  Fetch URL: %s"
+msgstr "  Haal  URL: %s"
+
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#, c-format
+msgid "  Push  URL: %s"
+msgstr "  Stoot URL: %s"
+
+msgid "(no URL)"
+msgstr "(geen URL)"
+
+#, c-format
+msgid "  HEAD branch: %s"
+msgstr "  HEAD-tak: %s"
+
+msgid "(not queried)"
+msgstr "(nie navraag gedoen nie)"
+
+msgid "(unknown)"
+msgstr "(onbekend)"
+
+#, c-format
+msgid ""
+"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr ""
+"  HEAD-tak (afgeleë HEAD is dubbelsinnig, kan een van die volgende wees):\n"
+
+#, c-format
+msgid "  Remote branch:%s"
+msgid_plural "  Remote branches:%s"
+msgstr[0] "  Afgeleë tak:%s"
+msgstr[1] "  Afgeleë takke:%s"
+
+msgid " (status not queried)"
+msgstr " (status nie navraag gedoen nie)"
+
+msgid "  Local branch configured for 'git pull':"
+msgid_plural "  Local branches configured for 'git pull':"
+msgstr[0] "  Plaaslike tak opgestel vir 'git pull':"
+msgstr[1] "  Plaaslike takke opgestel vir 'git pull':"
+
+msgid "  Local refs will be mirrored by 'git push'"
+msgstr "  Plaaslike verwysings sal deur 'git push' gespieël word"
+
+#, c-format
+msgid "  Local ref configured for 'git push'%s:"
+msgid_plural "  Local refs configured for 'git push'%s:"
+msgstr[0] "  Plaaslike verwysing opgestel vir 'git push'%s:"
+msgstr[1] "  Plaaslike verwysings opgestel vir 'git push'%s:"
+
+#, c-format
+msgid "'%s/HEAD' is unchanged and points to '%s'\n"
+msgstr "'%s/HEAD' is onveranderd en wys na '%s'\n"
+
+#, c-format
+msgid "'%s/HEAD' has changed from '%s' and now points to '%s'\n"
+msgstr "'%s/HEAD' het van '%s' verander en wys nou na '%s'\n"
+
+#, c-format
+msgid "'%s/HEAD' is now created and points to '%s'\n"
+msgstr "'%s/HEAD' is nou geskep en wys na '%s'\n"
+
+#, c-format
+msgid "'%s/HEAD' was detached at '%s' and now points to '%s'\n"
+msgstr "'%s/HEAD' was by '%s' ontkoppel en wys nou na '%s'\n"
+
+#, c-format
+msgid ""
+"'%s/HEAD' used to point to '%s' (which is not a remote branch), but now "
+"points to '%s'\n"
+msgstr ""
+"'%s/HEAD' het vroeër na '%s' gewys (wat nie 'n afgeleë tak is nie), maar wys "
+"nou na '%s'\n"
+
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr "stel refs/remotes/<name>/HEAD volgens die afgeleë"
+
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr "skrap refs/remotes/<name>/HEAD"
+
+msgid "Cannot determine remote HEAD"
+msgstr "Kan nie afgeleë HEAD bepaal nie"
+
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr "Veelvuldige afgeleë HEAD-takke. Kies asseblief een uitdruklik met:"
+
+#, c-format
+msgid "Could not delete %s"
+msgstr "Kon nie %s skrap nie"
+
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr "Nie 'n geldige verwysing nie: %s"
+
+#, c-format
+msgid "Could not set up %s"
+msgstr "Kon nie %s opstel nie"
+
+#, c-format
+msgid "Pruning %s"
+msgstr "Snoei %s"
+
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#, c-format
+msgid " * [would prune] %s"
+msgstr " * [sou snoei] %s"
+
+#, c-format
+msgid " * [pruned] %s"
+msgstr " * [gesnoei] %s"
+
+msgid "prune remotes after fetching"
+msgstr "snoei afgeleës na haal"
+
+#, c-format
+msgid "No such remote '%s'"
+msgstr "Geen sodanige afgeleë '%s' nie"
+
+msgid "add branch"
+msgstr "voeg tak by"
+
+msgid "no remote specified"
+msgstr "geen afgeleë gespesifiseer nie"
+
+msgid "query push URLs rather than fetch URLs"
+msgstr "doen navraag oor stoot-URL's eerder as haal-URL's"
+
+msgid "return all URLs"
+msgstr "gee alle URL's terug"
+
+msgid "manipulate push URLs"
+msgstr "manipuleer stoot-URL's"
+
+msgid "add URL"
+msgstr "voeg URL by"
+
+msgid "delete URLs"
+msgstr "skrap URL's"
+
+msgid "--add --delete doesn't make sense"
+msgstr "--add --delete maak nie sin nie"
+
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr "Ongeldige ou URL-patroon: %s"
+
+#, c-format
+msgid "No such URL found: %s"
+msgstr "Geen sodanige URL gevind nie: %s"
+
+msgid "Will not delete all non-push URLs"
+msgstr "Sal nie alle nie-stoot-URL's skrap nie"
+
+msgid "be verbose; must be placed before a subcommand"
+msgstr "wees breedsprakig; moet voor 'n subopdrag geplaas word"
+
+msgid ""
+"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
+"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
+"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]\n"
+"[--filter=<filter-spec>] [--drop-filtered [--dry-run]]"
+msgstr ""
+"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
+"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<paknaam>]\n"
+"[--write-midx[=<modus>]] [--name-hash-version=<n>] [--path-walk]\n"
+"[--filter=<filterspesifikasie>] [--drop-filtered [--dry-run]]"
+
+msgid ""
+"Incremental repacks are incompatible with bitmap indexes.  Use\n"
+"--no-write-bitmap-index or disable the pack.writeBitmaps configuration."
+msgstr ""
+"Inkrementele herpakkings is onversoenbaar met bitmap-indekse.  Gebruik\n"
+"--no-write-bitmap-index of deaktiveer die pack.writeBitmaps-konfigurasie."
+
+#, c-format
+msgid "unknown value for %s: %s"
+msgstr "onbekende waarde vir %s: %s"
+
+msgid "pack everything in a single pack"
+msgstr "pak alles in 'n enkele pak"
+
+msgid "same as -a, and turn unreachable objects loose"
+msgstr "dieselfde as -a, en maak onbereikbare objekte los"
+
+msgid "same as -a, pack unreachable cruft objects separately"
+msgstr "dieselfde as -a, pak onbereikbare afvalobjekte afsonderlik"
+
+msgid "approxidate"
+msgstr "benaderde-datum"
+
+msgid "with --cruft, expire objects older than this"
+msgstr "met --cruft, laat objekte ouer as dit verval"
+
+msgid "with --cruft, only repack cruft packs smaller than this"
+msgstr "met --cruft, herpak slegs afvalpakke kleiner as dit"
+
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "verwyder oortollige pakke, en voer git-prune-packed uit"
+
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "gee --no-reuse-delta deur aan git-pack-objects"
+
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "gee --no-reuse-object deur aan git-pack-objects"
+
+msgid ""
+"specify the name hash version to use for grouping similar objects by path"
+msgstr ""
+"spesifiseer die naam-hutsweergawe om te gebruik om soortgelyke objekte "
+"volgens pad te groepeer"
+
+msgid "pass --path-walk to git-pack-objects"
+msgstr "gee --path-walk deur aan git-pack-objects"
+
+msgid "do not run git-update-server-info"
+msgstr "moenie git-update-server-info uitvoer nie"
+
+msgid "pass --local to git-pack-objects"
+msgstr "gee --local deur aan git-pack-objects"
+
+msgid "write bitmap index"
+msgstr "skryf bitmap-indeks"
+
+msgid "pass --delta-islands to git-pack-objects"
+msgstr "gee --delta-islands deur aan git-pack-objects"
+
+msgid "with -A, do not loosen objects older than this"
+msgstr "met -A, moenie objekte ouer as dit losmaak nie"
+
+msgid "with -a, repack unreachable objects"
+msgstr "met -a, herpak onbereikbare objekte"
+
+msgid "size of the window used for delta compression"
+msgstr "grootte van die venster wat vir delta-kompressie gebruik word"
+
+msgid "bytes"
+msgstr "grepe"
+
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr ""
+"dieselfde as hierbo, maar beperk geheuegrootte in plaas van die aantal "
+"inskrywings"
+
+msgid "limits the maximum delta depth"
+msgstr "beperk die maksimum delta-diepte"
+
+msgid "limits the maximum number of threads"
+msgstr "beperk die maksimum aantal drade"
+
+msgid "maximum size of each packfile"
+msgstr "maksimum grootte van elke paklêer"
+
+msgid "repack objects in packs marked with .keep"
+msgstr "herpak objekte in pakke wat met .keep gemerk is"
+
+msgid "do not repack this pack"
+msgstr "moenie hierdie pak herpak nie"
+
+msgid "find a geometric progression with factor <N>"
+msgstr "vind 'n meetkundige reeks met faktor <N>"
+
+msgid "write a multi-pack index of the resulting packs"
+msgstr "skryf 'n multipak-indeks van die resulterende pakke"
+
+msgid "pack prefix to store a pack containing filtered out objects"
+msgstr "pakvoorvoegsel om 'n pak te stoor wat uitgefiltreerde objekte bevat"
+
+msgid "delete filtered out objects (requires --filter)"
+msgstr "skrap uitgefiltreerde objekte (vereis --filter)"
+
+msgid "only show which objects would be dropped"
+msgstr "wys slegs watter objekte weggelaat sou word"
+
+msgid "--dry-run only takes effect with --drop-filtered"
+msgstr "--dry-run het slegs effek saam met --drop-filtered"
+
+msgid "--drop-filtered requires --filter"
+msgstr "--drop-filtered vereis --filter"
+
+msgid "--drop-filtered requires -a"
+msgstr "--drop-filtered vereis -a"
+
+msgid "--drop-filtered only supports --filter=blob:limit=<n> for now"
+msgstr "--drop-filtered ondersteun tans slegs --filter=blob:limit=<n>"
+
+msgid "--drop-filtered requires a promisor remote"
+msgstr "--drop-filtered vereis 'n afgeleë beloftegewer"
+
+msgid ""
+"--drop-filtered cannot be used while another operation (merge, rebase, am, "
+"cherry-pick, revert, or bisect) is in progress"
+msgstr ""
+"--drop-filtered kan nie gebruik word terwyl 'n ander bewerking (merge, "
+"rebase, am, cherry-pick, revert of bisect) aan die gang is nie"
+
+#, c-format
+msgid "cannot drop '%s' (%s): it is referenced by the current index"
+msgstr "kan nie '%s' (%s) laat val nie: die huidige indeks verwys daarna"
+
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "kan nie pakke in 'n precious-objects-bewaarplek skrap nie"
+
+#, c-format
+msgid "invalid value for %s: %d"
+msgstr "ongeldige waarde vir %s: %d"
+
+#, c-format
+msgid "option '%s' can only be used along with '%s'"
+msgstr "opsie '%s' kan slegs saam met '%s' gebruik word"
+
+msgid "Nothing new to pack."
+msgstr "Niks nuuts om te pak nie."
+
+msgid "git replace [-f] <object> <replacement>"
+msgstr "git replace [-f] <objek> <vervanging>"
+
+msgid "git replace [-f] --edit <object>"
+msgstr "git replace [-f] --edit <objek>"
+
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr "git replace [-f] --graft <vaslegging> [<ouer>...]"
+
+msgid "git replace -d <object>..."
+msgstr "git replace -d <objek>..."
+
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr "git replace [--format=<formaat>] [-l [<patroon>]]"
+
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+"ongeldige vervangformaat '%s'\n"
+"geldige formate is 'short', 'medium' en 'long'"
+
+#, c-format
+msgid "replace ref '%s' not found"
+msgstr "vervangverwysing '%s' nie gevind nie"
+
+#, c-format
+msgid "Deleted replace ref '%s'"
+msgstr "Vervangverwysing '%s' geskrap"
+
+#, c-format
+msgid "'%s' is not a valid ref name"
+msgstr "'%s' is nie 'n geldige verwysingsnaam nie"
+
+#, c-format
+msgid "replace ref '%s' already exists"
+msgstr "vervangverwysing '%s' bestaan reeds"
+
+#, 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 moet van dieselfde tipe wees.\n"
+"'%s' wys na 'n vervangde objek van tipe '%s'\n"
+"terwyl '%s' na 'n vervangingsobjek van tipe '%s' wys."
+
+#, c-format
+msgid "unable to open %s for writing"
+msgstr "kan nie %s oopmaak om te skryf nie"
+
+msgid "cat-file reported failure"
+msgstr "cat-file het mislukking gerapporteer"
+
+#, c-format
+msgid "unable to open %s for reading"
+msgstr "kan nie %s oopmaak om te lees nie"
+
+msgid "unable to spawn mktree"
+msgstr "kan nie mktree begin nie"
+
+msgid "unable to read from mktree"
+msgstr "kan nie van mktree lees nie"
+
+msgid "mktree reported failure"
+msgstr "mktree het mislukking gerapporteer"
+
+msgid "mktree did not return an object name"
+msgstr "mktree het nie 'n objeknaam teruggegee nie"
+
+#, c-format
+msgid "unable to fstat %s"
+msgstr "kan nie %s fstat nie"
+
+msgid "unable to write object to database"
+msgstr "kan nie objek na databasis skryf nie"
+
+#, c-format
+msgid "unable to get object type for %s"
+msgstr "kan nie objektipe vir %s kry nie"
+
+msgid "editing object file failed"
+msgstr "wysiging van objeklêer het misluk"
+
+#, c-format
+msgid "new object is the same as the old one: '%s'"
+msgstr "nuwe objek is dieselfde as die ou een: '%s'"
+
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr "kon nie %s as 'n vaslegging ontleed nie"
+
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr "slegte mergetag in vaslegging '%s'"
+
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr "misvormde mergetag in vaslegging '%s'"
+
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr ""
+"oorspronklike vaslegging '%s' bevat mergetag '%s' wat weggegooi word; "
+"gebruik --edit in plaas van --graft"
+
+#, c-format
+msgid "the original commit '%s' has a gpg signature"
+msgstr "die oorspronklike vaslegging '%s' het 'n gpg-handtekening"
+
+msgid "the signature will be removed in the replacement commit!"
+msgstr "die handtekening sal in die vervangingsvaslegging verwyder word!"
+
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr "kon nie vervangingsvaslegging skryf vir: '%s' nie"
+
+#, c-format
+msgid "graft for '%s' unnecessary"
+msgstr "oorplanting vir '%s' onnodig"
+
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
+msgstr "nuwe vaslegging is dieselfde as die ou een: '%s'"
+
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+"kon nie die volgende oorplanting(s) omskakel nie:\n"
+"%s"
+
+msgid "list replace refs"
+msgstr "lys vervangverwysings"
+
+msgid "delete replace refs"
+msgstr "skrap vervangverwysings"
+
+msgid "edit existing object"
+msgstr "wysig bestaande objek"
+
+msgid "change a commit's parents"
+msgstr "verander 'n vaslegging se ouers"
+
+msgid "convert existing graft file"
+msgstr "skakel bestaande oorplantingslêer om"
+
+msgid "replace the ref if it exists"
+msgstr "vervang die verwysing as dit bestaan"
+
+msgid "do not pretty-print contents for --edit"
+msgstr "moenie inhoud vir --edit mooi druk nie"
+
+msgid "use this format"
+msgstr "gebruik hierdie formaat"
+
+msgid "--format cannot be used when not listing"
+msgstr "--format kan nie gebruik word wanneer daar nie gelys word nie"
+
+msgid "-f only makes sense when writing a replacement"
+msgstr "-f maak slegs sin wanneer 'n vervanging geskryf word"
+
+msgid "--raw only makes sense with --edit"
+msgstr "--raw maak slegs sin met --edit"
+
+msgid "-d needs at least one argument"
+msgstr "-d benodig ten minste een argument"
+
+msgid "bad number of arguments"
+msgstr "verkeerde aantal argumente"
+
+msgid "-e needs exactly one argument"
+msgstr "-e benodig presies een argument"
+
+msgid "-g needs at least one argument"
+msgstr "-g benodig ten minste een argument"
+
+msgid "--convert-graft-file takes no argument"
+msgstr "--convert-graft-file neem geen argument nie"
+
+msgid "only one pattern can be given with -l"
+msgstr "slegs een patroon kan met -l gegee word"
+
+#, c-format
+msgid "invalid %s value: '%s'"
+msgstr "ongeldige %s-waarde: '%s'"
+
+msgid ""
+"(EXPERIMENTAL!) git replay ([--contained] --onto=<newbase> | --"
+"advance=<branch> | --revert=<branch>)\n"
+"[--ref=<ref>] [--ref-action=<mode>] [--linearize] <revision-range>"
+msgstr ""
+"(EKSPERIMENTEEL!) git replay ([--contained] --onto=<nuwebasis> | --"
+"advance=<tak> | --revert=<tak>)\n"
+"[--ref=<verwysing>] [--ref-action=<modus>] [--linearize] <hersieningsreeks>"
+
+msgid "update all branches that point at commits in <revision-range>"
+msgstr "werk alle takke by wat na vasleggings in <hersieningsreeks> wys"
+
+msgid "replay onto given commit"
+msgstr "speel oor op die gegewe vaslegging"
+
+msgid "make replay advance given branch"
+msgstr "laat replay die gegewe tak vorentoe skuif"
+
+msgid "revert commits onto given branch"
+msgstr "keer vasleggings om op die gegewe tak"
+
+msgid "reference to update with result"
+msgstr "verwysing om met die resultaat by te werk"
+
+msgid "control ref update behavior (update|print)"
+msgstr "beheer verwysingsbywerkingsgedrag (update|print)"
+
+msgid "drop merge commits, replaying only non-merge commits"
+msgstr ""
+"laat saamsmeltvasleggings weg en speel slegs nie-saamsmeltvasleggings oor"
+
+msgid "exactly one of --onto, --advance, or --revert is required"
+msgstr "presies een van --onto, --advance of --revert word vereis"
+
+#, c-format
+msgid ""
+"some rev walking options will be overridden as '%s' bit in 'struct rev_info' "
+"will be forced"
+msgstr ""
+"sommige hersieningsdeurloop-opsies sal oorheers word aangesien die '%s'-bis "
+"in 'struct rev_info' afgedwing sal word"
+
+msgid "unable to get common directory"
+msgstr "kan nie gemeenskaplike gids kry nie"
+
+msgid "unable to get git directory"
+msgstr "kan nie Git-gids kry nie"
+
+#, c-format
+msgid "key '%s' not found"
+msgstr "sleutel '%s' nie gevind nie"
+
+msgid "--keys can only be used with --format=lines or --format=nul"
+msgstr "--keys kan slegs met --format=lines of --format=nul gebruik word"
+
+#, c-format
+msgid "invalid format '%s'"
+msgstr "ongeldige formaat '%s'"
+
+msgid "output format"
+msgstr "afvoerformaat"
+
+msgid "synonym for --format=nul"
+msgstr "sinoniem vir --format=nul"
+
+msgid "print all keys/values"
+msgstr "druk alle sleutels/waardes"
+
+msgid "show keys"
+msgstr "wys sleutels"
+
+msgid "--keys cannot be used with a <key> or --all"
+msgstr "--keys kan nie saam met 'n <sleutel> of --all gebruik word nie"
+
+msgid "unsupported output format"
+msgstr "nie-ondersteunde afvoerformaat"
+
+msgid "--all and <key> cannot be used together"
+msgstr "--all en <sleutel> kan nie saam gebruik word nie"
+
+msgid "References"
+msgstr "Verwysings"
+
+msgid "Count"
+msgstr "Aantal"
+
+msgid "Branches"
+msgstr "Takke"
+
+msgid "Tags"
+msgstr "Etikette"
+
+msgid "Remotes"
+msgstr "Afgeleës"
+
+msgid "Others"
+msgstr "Ander"
+
+msgid "Reachable objects"
+msgstr "Bereikbare objekte"
+
+msgid "Commits"
+msgstr "Vasleggings"
+
+msgid "Trees"
+msgstr "Bome"
+
+msgid "Blobs"
+msgstr "Blobs"
+
+msgid "Inflated size"
+msgstr "Uitgepakte grootte"
+
+msgid "Disk size"
+msgstr "Skyfgrootte"
+
+msgid "Largest objects"
+msgstr "Grootste objekte"
+
+msgid "Maximum size"
+msgstr "Maksimum grootte"
+
+msgid "Maximum parents"
+msgstr "Maksimum ouers"
+
+msgid "Maximum entries"
+msgstr "Maksimum inskrywings"
+
+msgid "Repository structure"
+msgstr "Bewaarplekstruktuur"
+
+msgid "Value"
+msgstr "Waarde"
+
+msgid "Counting references"
+msgstr "Tel verwysings"
+
+msgid ""
+"git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]"
+msgstr ""
+"git rerere [clear | forget <padspesifikasie>... | diff | status | remaining "
+"| gc]"
+
+msgid "register clean resolutions in index"
+msgstr "registreer skoon oplossings in die indeks"
+
+msgid "'git rerere forget' without paths is deprecated"
+msgstr "'git rerere forget' sonder paaie is verouderd"
+
+#, c-format
+msgid "unable to generate diff for '%s'"
+msgstr "kan nie verskil vir '%s' genereer nie"
+
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<vaslegging>]"
+
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<boomagtige>] [--] <padspesifikasie>..."
+
+msgid ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+msgstr ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<boomagtige>]"
+
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<boomagtige>] [--] [<padspesifikasie>...]"
+
+msgid "mixed"
+msgstr "mixed"
+
+msgid "soft"
+msgstr "soft"
+
+msgid "hard"
+msgstr "hard"
+
+msgid "merge"
+msgstr "merge"
+
+msgid "keep"
+msgstr "keep"
+
+msgid "You do not have a valid HEAD."
+msgstr "Jy het nie 'n geldige HEAD nie."
+
+msgid "Failed to find tree of HEAD."
+msgstr "Kon nie boom van HEAD vind nie."
+
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr "Kon nie boom van %s vind nie."
+
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD is nou by %s"
+
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
+msgstr ""
+"Kan nie 'n %s-terugstelling in die middel van 'n saamsmelting doen nie."
+
+msgid "be quiet, only report errors"
+msgstr "wees stil, rapporteer slegs foute"
+
+msgid "skip refreshing the index after reset"
+msgstr "slaan die verversing van die indeks na terugstelling oor"
+
+msgid "reset HEAD and index"
+msgstr "stel HEAD en indeks terug"
+
+msgid "reset only HEAD"
+msgstr "stel slegs HEAD terug"
+
+msgid "reset HEAD, index and working tree"
+msgstr "stel HEAD, indeks en werkboom terug"
+
+msgid "reset HEAD but keep local changes"
+msgstr "stel HEAD terug maar behou plaaslike wysigings"
+
+msgid "record only the fact that removed paths will be added later"
+msgstr "teken slegs aan dat verwyderde paaie later bygevoeg sal word"
+
+#, c-format
+msgid "Failed to resolve '%s' as a valid revision."
+msgstr "Kon nie '%s' as 'n geldige hersiening oplos nie."
+
+#, c-format
+msgid "Failed to resolve '%s' as a valid tree."
+msgstr "Kon nie '%s' as 'n geldige boom oplos nie."
+
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr "--mixed met paaie is verouderd; gebruik liewer 'git reset -- <paaie>'."
+
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr "Kan nie %s-terugstelling met paaie doen nie."
+
+#, c-format
+msgid "%s reset is not allowed in a bare repository"
+msgstr "%s-terugstelling word nie in 'n kaal bewaarplek toegelaat nie"
+
+msgid "Unstaged changes after reset:"
+msgstr "Ongeplaaste wysigings na terugstelling:"
+
+#, c-format
+msgid ""
+"It took %.2f seconds to refresh the index after reset.  You can use\n"
+"'--no-refresh' to avoid this."
+msgstr ""
+"Dit het %.2f sekondes geneem om die indeks na terugstelling te ververs.  Jy "
+"kan\n"
+"'--no-refresh' gebruik om dit te vermy."
+
+#, c-format
+msgid "Could not reset index file to revision '%s'."
+msgstr "Kon nie indekslêer na hersiening '%s' terugstel nie."
+
+msgid "Could not write new index file."
+msgstr "Kon nie nuwe indekslêer skryf nie."
+
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "kan nie skyfgebruik van %s kry nie"
+
+msgid "--missing-only requires --missing=print or --missing=print-info"
+msgstr "--missing-only vereis --missing=print of --missing=print-info"
+
+#, c-format
+msgid "invalid value for '%s': '%s', the only allowed format is '%s'"
+msgstr "ongeldige waarde vir '%s': '%s', die enigste toegelate formaat is '%s'"
+
+msgid "-z option used with unsupported option"
+msgstr "-z-opsie gebruik saam met 'n nie-ondersteunde opsie"
+
+msgid "rev-list does not support display of notes"
+msgstr "rev-list ondersteun nie die vertoon van notas nie"
+
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "gemerkte telling en '%s' kan nie saam gebruik word nie"
+
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr "git rev-parse --parseopt [<opsies>] -- [<argumente>...]"
+
+msgid "keep the `--` passed as an arg"
+msgstr "behou die `--` wat as 'n argument deurgegee is"
+
+msgid "stop parsing after the first non-option argument"
+msgstr "hou op ontleed na die eerste nie-opsie-argument"
+
+msgid "output in stuck long form"
+msgstr "afvoer in vasgeplakte lang vorm"
+
+msgid "premature end of input"
+msgstr "voortydige einde van invoer"
+
+msgid "no usage string given before the `--' separator"
+msgstr "geen gebruikstring voor die `--'-skeier gegee nie"
+
+msgid "missing opt-spec before option flags"
+msgstr "opsiespesifikasie ontbreek voor opsievlae"
+
+msgid "Needed a single revision"
+msgstr "'n Enkele hersiening is benodig"
+
+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 [<opsies>] -- [<argumente>...]\n"
+"   of: git rev-parse --sq-quote [<argument>...]\n"
+"   of: git rev-parse [<opsies>] [<argument>...]\n"
+"\n"
+"Voer \"git rev-parse --parseopt -h\" uit vir meer inligting oor die eerste "
+"gebruik."
+
+msgid "--resolve-git-dir requires an argument"
+msgstr "--resolve-git-dir vereis 'n argument"
+
+#, c-format
+msgid "not a gitdir '%s'"
+msgstr "nie 'n gitdir '%s' nie"
+
+msgid "--git-path requires an argument"
+msgstr "--git-path vereis 'n argument"
+
+msgid "-n requires an argument"
+msgstr "-n vereis 'n argument"
+
+msgid "--path-format requires an argument"
+msgstr "--path-format vereis 'n argument"
+
+#, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "onbekende argument vir --path-format: %s"
+
+msgid "--default requires an argument"
+msgstr "--default vereis 'n argument"
+
+msgid "--prefix requires an argument"
+msgstr "--prefix vereis 'n argument"
+
+msgid "no object format specified"
+msgstr "geen objekformaat gespesifiseer nie"
+
+#, c-format
+msgid "unsupported object format: %s"
+msgstr "nie-ondersteunde objekformaat: %s"
+
+#, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "onbekende modus vir --abbrev-ref: %s"
+
+msgid "this operation must be run in a work tree"
+msgstr "hierdie bewerking moet in 'n werkboom uitgevoer word"
+
+msgid "Could not read the index"
+msgstr "Kon nie die indeks lees nie"
+
+#, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr "onbekende modus vir --show-object-format: %s"
+
+msgid ""
+"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] "
+"<commit>..."
+msgstr ""
+"git revert [--[no-]edit] [-n] [-m <ouernommer>] [-s] [-S[<sleutel-id>]] "
+"<vaslegging>..."
+
+msgid "git revert (--continue | --skip | --abort | --quit)"
+msgstr "git revert (--continue | --skip | --abort | --quit)"
+
+msgid ""
+"git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n"
+"                [-S[<keyid>]] <commit>..."
+msgstr ""
+"git cherry-pick [--edit] [-n] [-m <ouernommer>] [-s] [-x] [--ff]\n"
+"                [-S[<sleutel-id>]] <vaslegging>..."
+
+msgid "git cherry-pick (--continue | --skip | --abort | --quit)"
+msgstr "git cherry-pick (--continue | --skip | --abort | --quit)"
+
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr "opsie `%s' verwag 'n getal groter as nul"
+
+#, c-format
+msgid "%s: %s cannot be used with %s"
+msgstr "%s: %s kan nie saam met %s gebruik word nie"
+
+msgid "end revert or cherry-pick sequence"
+msgstr "beëindig omkeer- of kersiepluk-reeks"
+
+msgid "resume revert or cherry-pick sequence"
+msgstr "hervat omkeer- of kersiepluk-reeks"
+
+msgid "cancel revert or cherry-pick sequence"
+msgstr "kanselleer omkeer- of kersiepluk-reeks"
+
+msgid "skip current commit and continue"
+msgstr "slaan huidige vaslegging oor en gaan voort"
+
+msgid "don't automatically commit"
+msgstr "moenie outomaties vaslê nie"
+
+msgid "edit the commit message"
+msgstr "wysig die vasleggingsboodskap"
+
+msgid "parent-number"
+msgstr "ouernommer"
+
+msgid "select mainline parent"
+msgstr "kies hooflyn-ouer"
+
+msgid "merge strategy"
+msgstr "saamsmeltstrategie"
+
+msgid "option for merge strategy"
+msgstr "opsie vir saamsmeltstrategie"
+
+msgid "append commit name"
+msgstr "voeg vasleggingsnaam agteraan"
+
+msgid "preserve initially empty commits"
+msgstr "behou aanvanklik leë vasleggings"
+
+msgid "allow commits with empty messages"
+msgstr "laat vasleggings met leë boodskappe toe"
+
+msgid "deprecated: use --empty=keep instead"
+msgstr "verouderd: gebruik eerder --empty=keep"
+
+msgid "use the 'reference' format to refer to commits"
+msgstr "gebruik die 'reference'-formaat om na vasleggings te verwys"
+
+msgid "revert failed"
+msgstr "omkeer het misluk"
+
+msgid "cherry-pick failed"
+msgstr "kersiepluk het misluk"
+
+msgid ""
+"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"       [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"       [--] [<pathspec>...]"
+msgstr ""
+"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"       [--quiet] [--pathspec-from-file=<lêer> [--pathspec-file-nul]]\n"
+"       [--] [<padspesifikasie>...]"
+
+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 volgende lêer het geplaasde inhoud wat verskil van beide die\n"
+"lêer en die HEAD:"
+msgstr[1] ""
+"die volgende lêers het geplaasde inhoud wat verskil van beide die\n"
+"lêer en die HEAD:"
+
+msgid ""
+"\n"
+"(use -f to force removal)"
+msgstr ""
+"\n"
+"(gebruik -f om verwydering af te dwing)"
+
+msgid "the following file has changes staged in the index:"
+msgid_plural "the following files have changes staged in the index:"
+msgstr[0] "die volgende lêer het veranderinge wat in die indeks geplaas is:"
+msgstr[1] "die volgende lêers het veranderinge wat in die indeks geplaas is:"
+
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+"\n"
+"(gebruik --cached om die lêer te behou, of -f om verwydering af te dwing)"
+
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] "die volgende lêer het plaaslike wysigings:"
+msgstr[1] "die volgende lêers het plaaslike wysigings:"
+
+msgid "do not list removed files"
+msgstr "moenie verwyderde lêers lys nie"
+
+msgid "only remove from the index"
+msgstr "verwyder slegs uit die indeks"
+
+msgid "override the up-to-date check"
+msgstr "ignoreer die bygewerktheidskontrole"
+
+msgid "allow recursive removal"
+msgstr "laat rekursiewe verwydering toe"
+
+msgid "exit with a zero status even if nothing matched"
+msgstr "verlaat met 'n nulstatus selfs al het niks ooreengestem nie"
+
+msgid "No pathspec was given. Which files should I remove?"
+msgstr "Geen padspesifikasie is gegee nie. Watter lêers moet ek verwyder?"
+
+msgid "please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+"plaas asseblief jou veranderinge aan .gitmodules of bêre dit weg om voort te "
+"gaan"
+
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr "'%s' word nie rekursief sonder -r verwyder nie"
+
+#, c-format
+msgid "git rm: unable to remove %s"
+msgstr "git rm: kan nie %s verwyder nie"
+
+msgid ""
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+"              [--receive-pack=<git-receive-pack>]\n"
+"              [--verbose] [--thin] [--atomic]\n"
+"              [--[no-]signed | --signed=(true|false|if-asked)]\n"
+"              [<host>:]<directory> (--all | <ref>...)"
+msgstr ""
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+"              [--receive-pack=<git-receive-pack>]\n"
+"              [--verbose] [--thin] [--atomic]\n"
+"              [--[no-]signed | --signed=(true|false|if-asked)]\n"
+"              [<gasheer>:]<gids> (--all | <verwysing>...)"
+
+msgid "remote name"
+msgstr "afgeleë naam"
+
+msgid "push all refs"
+msgstr "stoot alle verwysings"
+
+msgid "use stateless RPC protocol"
+msgstr "gebruik toestandlose RPC-protokol"
+
+msgid "read refs from stdin"
+msgstr "lees verwysings vanaf stdin"
+
+msgid "print status from remote helper"
+msgstr "druk status vanaf afgeleë helper"
+
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git shortlog [<opsies>] [<hersieningsreeks>] [[--] <pad>...]"
+
+msgid "git log --pretty=short | git shortlog [<options>]"
+msgstr "git log --pretty=short | git shortlog [<opsies>]"
+
+msgid "using multiple --group options with stdin is not supported"
+msgstr ""
+"die gebruik van veelvuldige opsies --group met stdin word nie ondersteun nie"
+
+#, c-format
+msgid "using %s with stdin is not supported"
+msgstr "die gebruik van %s met stdin word nie ondersteun nie"
+
+#, c-format
+msgid "unknown group type: %s"
+msgstr "onbekende groeptipe: %s"
+
+msgid "group by committer rather than author"
+msgstr "groepeer volgens vaslegger eerder as outeur"
+
+msgid "sort output according to the number of commits per author"
+msgstr "sorteer afvoer volgens die aantal vasleggings per outeur"
+
+msgid "suppress commit descriptions, only provides commit count"
+msgstr "onderdruk vasleggingsbeskrywings, gee slegs vasleggingstelling"
+
+msgid "show the email address of each author"
+msgstr "wys die e-posadres van elke outeur"
+
+msgid "<w>[,<i1>[,<i2>]]"
+msgstr "<w>[,<i1>[,<i2>]]"
+
+msgid "linewrap output"
+msgstr "draai afvoerreëls om"
+
+msgid "field"
+msgstr "veld"
+
+msgid "group by field"
+msgstr "groepeer volgens veld"
+
+msgid "too many arguments given outside repository"
+msgstr "te veel argumente buite 'n bewaarplek gegee"
+
+msgid ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics]\n"
+"                [(<rev> | <glob>)...]"
+msgstr ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"                [--current] [--color[=<wanneer>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics]\n"
+"                [(<hersiening> | <glob>)...]"
+
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgstr "git show-branch (-g | --reflog)[=<n>[,<basis>]] [--list] [<verwysing>]"
+
+#, c-format
+msgid "ignoring %s; cannot handle more than %d ref"
+msgid_plural "ignoring %s; cannot handle more than %d refs"
+msgstr[0] "%s word geïgnoreer; kan nie meer as %d verwysing hanteer nie"
+msgstr[1] "%s word geïgnoreer; kan nie meer as %d verwysings hanteer nie"
+
+#, c-format
+msgid "no matching refs with %s"
+msgstr "geen ooreenstemmende verwysings met %s nie"
+
+msgid "show remote-tracking and local branches"
+msgstr "wys afgeleë volgtakke en plaaslike takke"
+
+msgid "show remote-tracking branches"
+msgstr "wys afgeleë volgtakke"
+
+msgid "color '*!+-' corresponding to the branch"
+msgstr "kleur '*!+-' ooreenkomstig die tak"
+
+msgid "show <n> more commits after the common ancestor"
+msgstr "wys <n> meer vasleggings na die gemeenskaplike voorouer"
+
+msgid "synonym to more=-1"
+msgstr "sinoniem vir more=-1"
+
+msgid "suppress naming strings"
+msgstr "onderdruk naamstringe"
+
+msgid "include the current branch"
+msgstr "sluit die huidige tak in"
+
+msgid "name commits with their object names"
+msgstr "benoem vasleggings met hul objekname"
+
+msgid "show possible merge bases"
+msgstr "wys moontlike saamsmeltbasisse"
+
+msgid "show refs unreachable from any other ref"
+msgstr "wys verwysings wat vanaf geen ander verwysing bereikbaar is nie"
+
+msgid "show commits in topological order"
+msgstr "wys vasleggings in topologiese volgorde"
+
+msgid "show only commits not on the first branch"
+msgstr "wys slegs vasleggings wat nie op die eerste tak is nie"
+
+msgid "show merges reachable from only one tip"
+msgstr "wys saamsmeltings wat vanaf slegs een punt bereikbaar is"
+
+msgid "topologically sort, maintaining date order where possible"
+msgstr "sorteer topologies, en behou datumvolgorde waar moontlik"
+
+msgid "<n>[,<base>]"
+msgstr "<n>[,<basis>]"
+
+msgid "show <n> most recent ref-log entries starting at base"
+msgstr "wys die <n> mees onlangse reflog-inskrywings vanaf basis"
+
+msgid "no branches given, and HEAD is not valid"
+msgstr "geen takke gegee nie, en HEAD is nie geldig nie"
+
+msgid "--reflog option needs one branch name"
+msgstr "opsie --reflog benodig een taknaam"
+
+#, 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] "slegs %d inskrywing kan op 'n slag gewys word."
+msgstr[1] "slegs %d inskrywings kan op 'n slag gewys word."
+
+#, c-format
+msgid "no such ref %s"
+msgstr "geen sodanige verwysing %s nie"
+
+#, c-format
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
+msgstr[0] "kan nie meer as %d hersiening hanteer nie."
+msgstr[1] "kan nie meer as %d hersienings hanteer nie."
+
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "'%s' is nie 'n geldige verwysing nie."
+
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "kan nie vaslegging %s (%s) vind nie"
+
+msgid "hash-algorithm"
+msgstr "hutsalgoritme"
+
+msgid "Unknown hash algorithm"
+msgstr "Onbekende hutsalgoritme"
+
+msgid "assuming SHA-1; use --object-format to override"
+msgstr "SHA-1 word aanvaar; gebruik --object-format om te oorheers"
+
+msgid "unable to read header"
+msgstr "kan nie kopstuk lees nie"
+
+msgid "unknown index version"
+msgstr "onbekende indeksweergawe"
+
+msgid "corrupt index file"
+msgstr "korrupte indekslêer"
+
+#, c-format
+msgid "unable to read entry %u/%u"
+msgstr "kan nie inskrywing %u/%u lees nie"
+
+#, c-format
+msgid "unable to read sha1 %u/%u"
+msgstr "kan nie sha1 %u/%u lees nie"
+
+#, c-format
+msgid "unable to read crc %u/%u"
+msgstr "kan nie crc %u/%u lees nie"
+
+#, c-format
+msgid "unable to read 32b offset %u/%u"
+msgstr "kan nie 32b-verskuiwing %u/%u lees nie"
+
+msgid "inconsistent 64b offset index"
+msgstr "inkonsekwente 64b-verskuiwingsindeks"
+
+#, c-format
+msgid "unable to read 64b offset %u"
+msgstr "kan nie 64b-verskuiwing %u lees nie"
+
+msgid ""
+"git show-ref [--head] [-d | --dereference]\n"
+"             [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n"
+"             [--] [<pattern>...]"
+msgstr ""
+"git show-ref [--head] [-d | --dereference]\n"
+"             [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n"
+"             [--] [<patroon>...]"
+
+msgid ""
+"git show-ref --verify [-q | --quiet] [-d | --dereference]\n"
+"             [-s | --hash[=<n>]] [--abbrev[=<n>]]\n"
+"             [--] [<ref>...]"
+msgstr ""
+"git show-ref --verify [-q | --quiet] [-d | --dereference]\n"
+"             [-s | --hash[=<n>]] [--abbrev[=<n>]]\n"
+"             [--] [<verwysing>...]"
+
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<patroon>]"
+
+msgid "git show-ref --exists <ref>"
+msgstr "git show-ref --exists <verwysing>"
+
+msgid "only show tags (can be combined with --branches)"
+msgstr "wys slegs etikette (kan met --branches gekombineer word)"
+
+msgid "only show branches (can be combined with --tags)"
+msgstr "wys slegs takke (kan met --tags gekombineer word)"
+
+msgid "check for reference existence without resolving"
+msgstr "kontroleer of die verwysing bestaan sonder om dit op te los"
+
+msgid "stricter reference checking, requires exact ref path"
+msgstr "strenger verwysingskontrole, vereis presiese verwysingspad"
+
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr "wys die HEAD-verwysing, selfs al sou dit uitgefiltreer word"
+
+msgid "dereference tags into object IDs"
+msgstr "herlei etikette na objek-ID's"
+
+msgid "only show SHA1 hash using <n> digits"
+msgstr "wys slegs SHA1-hutswaarde met <n> syfers"
+
+msgid "do not print results to stdout (useful with --verify)"
+msgstr "moenie resultate na stdout druk nie (nuttig met --verify)"
+
+msgid "show refs from stdin that aren't in local repository"
+msgstr "wys verwysings vanaf stdin wat nie in die plaaslike bewaarplek is nie"
+
+msgid ""
+"git sparse-checkout (init | list | set | add | reapply | disable | check-"
+"rules | clean) [<options>]"
+msgstr ""
+"git sparse-checkout (init | list | set | add | reapply | disable | check-"
+"rules | clean) [<opsies>]"
+
+msgid "this worktree is not sparse"
+msgstr "hierdie werkboom is nie yl nie"
+
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr "hierdie werkboom is nie yl nie (yl-uitcheck-lêer bestaan dalk nie)"
+
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"gids '%s' bevat onnaspoorbare lêers, maar is nie in die yl-uitcheck-keël nie"
+
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "kon nie gids '%s' verwyder nie"
+
+msgid "failed to create directory for sparse-checkout file"
+msgstr "kon nie gids vir yl-uitcheck-lêer skep nie"
+
+#, c-format
+msgid "unable to fdopen %s"
+msgstr "kan nie %s met fdopen oopmaak nie"
+
+msgid "failed to initialize worktree config"
+msgstr "kon nie werkboomkonfigurasie inisialiseer nie"
+
+msgid "failed to modify sparse-index config"
+msgstr "kon nie yl-indekskonfigurasie wysig nie"
+
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "inisialiseer die yl-uitcheck in keëlmodus"
+
+msgid "toggle the use of a sparse index"
+msgstr "wissel die gebruik van 'n yl indeks"
+
+#, c-format
+msgid "failed to open '%s'"
+msgstr "kon nie '%s' oopmaak nie"
+
+#, c-format
+msgid "could not normalize path %s"
+msgstr "kon nie pad %s normaliseer nie"
+
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "kan nie aanhalingstekens van C-styl-string '%s' verwyder nie"
+
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "kan nie bestaande yl-uitcheck-patrone laai nie"
+
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr "bestaande yl-uitcheck-patrone gebruik nie keëlmodus nie"
+
+msgid "please run from the toplevel directory in non-cone mode"
+msgstr "voer asseblief vanaf die topvlakgids uit in nie-keëlmodus"
+
+msgid "specify directories rather than patterns (no leading slash)"
+msgstr "spesifiseer gidse eerder as patrone (geen voorste skuinsstreep nie)"
+
+msgid ""
+"specify directories rather than patterns.  If your directory starts with a "
+"'!', pass --skip-checks"
+msgstr ""
+"spesifiseer gidse eerder as patrone.  As jou gids met 'n '!' begin, gee --"
+"skip-checks"
+
+msgid ""
+"specify directories rather than patterns.  If your directory really has any "
+"of '*?[]\\' in it, pass --skip-checks"
+msgstr ""
+"spesifiseer gidse eerder as patrone.  As jou gids werklik enige van '*?[]\\' "
+"bevat, gee --skip-checks"
+
+#, c-format
+msgid ""
+"'%s' is not a directory; to treat it as a directory anyway, rerun with --"
+"skip-checks"
+msgstr ""
+"'%s' is nie 'n gids nie; om dit tog as 'n gids te hanteer, voer weer uit met "
+"--skip-checks"
+
+#, c-format
+msgid ""
+"pass a leading slash before paths such as '%s' if you want a single file "
+"(see NON-CONE PROBLEMS in the git-sparse-checkout manual)."
+msgstr ""
+"plaas 'n voorste skuinsstreep voor paaie soos '%s' as jy 'n enkele lêer wil "
+"hê (sien NON-CONE PROBLEMS in die handleiding vir git-sparse-checkout)."
+
+msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
+msgstr "git sparse-checkout add [--skip-checks] (--stdin | <patrone>)"
+
+msgid ""
+"skip some sanity checks on the given paths that might give false positives"
+msgstr ""
+"slaan sommige gesondheidskontroles op die gegewe paaie oor wat vals "
+"positiewe kan gee"
+
+msgid "read patterns from standard in"
+msgstr "lees patrone vanaf standaardinvoer"
+
+msgid "no sparse-checkout to add to"
+msgstr "geen yl-uitcheck om by te voeg nie"
+
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patrone>)"
+
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr "moet in 'n yl-uitcheck wees om ylheidspatrone weer toe te pas"
+
+msgid "report each affected file, not just directories"
+msgstr "rapporteer elke geaffekteerde lêer, nie net gidse nie"
+
+msgid "must be in a sparse-checkout to clean directories"
+msgstr "moet in 'n yl-uitcheck wees om gidse skoon te maak"
+
+msgid "must be in a cone-mode sparse-checkout to clean directories"
+msgstr "moet in 'n keëlmodus-yl-uitcheck wees om gidse skoon te maak"
+
+msgid "for safety, refusing to clean without one of --force or --dry-run"
+msgstr ""
+"weier om veiligheidshalwe skoon te maak sonder een van --force of --dry-run"
+
+msgid "failed to read index"
+msgstr "kon nie indeks lees nie"
+
+msgid ""
+"failed to convert index to a sparse index; resolve merge conflicts and try "
+"again"
+msgstr ""
+"kon nie indeks na 'n yl indeks omskakel nie; los saamsmeltkonflikte op en "
+"probeer weer"
+
+#, c-format
+msgid "failed to remove '%s'"
+msgstr "kon nie '%s' verwyder nie"
+
+msgid "error while refreshing working directory"
+msgstr "fout tydens verfrissing van werkgids"
+
+msgid ""
+"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-"
+"file <file>]"
+msgstr ""
+"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-"
+"file <lêer>]"
+
+msgid "terminate input and output files by a NUL character"
+msgstr "beëindig invoer- en afvoerlêers met 'n NUL-karakter"
+
+msgid "when used with --rules-file interpret patterns as cone mode patterns"
+msgstr ""
+"wanneer saam met --rules-file gebruik, vertolk patrone as keëlmoduspatrone"
+
+msgid "use patterns in <file> instead of the current ones."
+msgstr "gebruik patrone in <lêer> in plaas van die huidige."
+
+msgid "git stash list [<log-options>]"
+msgstr "git stash list [<log-opsies>]"
+
+msgid ""
+"git stash show [-u | --include-untracked | --only-untracked] [<diff-"
+"options>] [<stash>]"
+msgstr ""
+"git stash show [-u | --include-untracked | --only-untracked] [<diff-opsies>] "
+"[<wegbêre>]"
+
+msgid "git stash drop [-q | --quiet] [<stash>]"
+msgstr "git stash drop [-q | --quiet] [<wegbêre>]"
+
+msgid "git stash pop [--index] [-q | --quiet] [<stash>]"
+msgstr "git stash pop [--index] [-q | --quiet] [<wegbêre>]"
+
+msgid ""
+"git stash apply [--index] [-q | --quiet] [--label-ours=<label>] [--label-"
+"theirs=<label>] [--label-base=<label>] [<stash>]"
+msgstr ""
+"git stash apply [--index] [-q | --quiet] [--label-ours=<byskrif>] [--label-"
+"theirs=<byskrif>] [--label-base=<byskrif>] [<wegbêre>]"
+
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git stash branch <taknaam> [<wegbêre>]"
+
+msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>"
+msgstr ""
+"git stash store [(-m | --message) <boodskap>] [-q | --quiet] <vaslegging>"
+
+msgid ""
+"git stash [push] [-p | --patch] [-S | --staged] [-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] [-S | --staged] [-k | --[no-]keep-index] [-q "
+"| --quiet]\n"
+"          [-u | --include-untracked] [-a | --all] [(-m | --message) "
+"<boodskap>]\n"
+"          [--pathspec-from-file=<lêer> [--pathspec-file-nul]]\n"
+"          [--] [<padspesifikasie>...]"
+
+msgid ""
+"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | "
+"--quiet]\n"
+"          [-u | --include-untracked] [-a | --all] [<message>]"
+msgstr ""
+"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | "
+"--quiet]\n"
+"          [-u | --include-untracked] [-a | --all] [<boodskap>]"
+
+msgid "git stash create [<message>]"
+msgstr "git stash create [<boodskap>]"
+
+msgid "git stash export (--print | --to-ref <ref>) [<stash>...]"
+msgstr "git stash export (--print | --to-ref <verwysing>) [<wegbêre>...]"
+
+msgid "git stash import <commit>"
+msgstr "git stash import <vaslegging>"
+
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "'%s' is nie 'n wegbêre-agtige vaslegging nie"
+
+msgid "No stash entries found."
+msgstr "Geen wegbêre-inskrywings gevind nie."
+
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr "Te veel hersienings gespesifiseer:%s"
+
+#, c-format
+msgid "%s is not a valid reference"
+msgstr "%s is nie 'n geldige verwysing nie"
+
+msgid "git stash clear with arguments is unimplemented"
+msgstr "git stash clear met argumente is nie geïmplementeer nie"
+
+#, c-format
+msgid ""
+"WARNING: Untracked file in way of tracked file!  Renaming\n"
+"            %s -> %s\n"
+"         to make room.\n"
+msgstr ""
+"WAARSKUWING: Onnaspoorbare lêer in die pad van nagespoorde lêer!  Hernoem\n"
+"            %s -> %s\n"
+"         om plek te maak.\n"
+
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "kan nie 'n wegbêre in die middel van 'n saamsmelting toepas nie"
+
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr "kon nie verskil %s^! genereer nie."
+
+msgid "conflicts in index. Try without --index."
+msgstr "konflikte in indeks. Probeer sonder --index."
+
+msgid "could not save index tree"
+msgstr "kon nie indeksboom stoor nie"
+
+#, c-format
+msgid "Merging %s with %s"
+msgstr "Smelt %s saam met %s"
+
+msgid "Index was not unstashed."
+msgstr "Indeks is nie uit die wegbêre teruggehaal nie."
+
+msgid "could not restore untracked files from stash"
+msgstr "kon nie onnaspoorbare lêers vanuit wegbêre herstel nie"
+
+msgid "attempt to recreate the index"
+msgstr "probeer om die indeks weer te skep"
+
+msgid "label"
+msgstr "byskrif"
+
+msgid "label for the upstream side in conflict markers"
+msgstr "byskrif vir die stroomop-kant in konflikmerkers"
+
+msgid "label for the stashed side in conflict markers"
+msgstr "byskrif vir die weggebêrde kant in konflikmerkers"
+
+msgid "label for the base in diff3 conflict markers"
+msgstr "byskrif vir die basis in diff3-konflikmerkers"
+
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr "%s (%s) laat val"
+
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "%s: Kon nie wegbêre-inskrywing laat val nie"
+
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr "'%s' is nie 'n wegbêre-verwysing nie"
+
+msgid "The stash entry is kept in case you need it again."
+msgstr "Die wegbêre-inskrywing word behou ingeval jy dit weer nodig het."
+
+msgid "No branch name specified"
+msgstr "Geen taknaam gespesifiseer nie"
+
+msgid "failed to parse tree"
+msgstr "kon nie boom ontleed nie"
+
+msgid "failed to unpack trees"
+msgstr "kon nie bome uitpak nie"
+
+msgid "include untracked files in the stash"
+msgstr "sluit onnaspoorbare lêers by die wegbêre in"
+
+msgid "only show untracked files in the stash"
+msgstr "wys slegs onnaspoorbare lêers in die wegbêre"
+
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr "Kan nie %s met %s bywerk nie"
+
+msgid "stash message"
+msgstr "wegbêre-boodskap"
+
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "\"git stash store\" vereis een <vaslegging>-argument"
+
+msgid "No staged changes"
+msgstr "Geen geplaasde veranderinge nie"
+
+msgid "No changes selected"
+msgstr "Geen veranderinge gekies nie"
+
+msgid "You do not have the initial commit yet"
+msgstr "Jy het nog nie die aanvanklike vaslegging nie"
+
+msgid "Cannot save the current index state"
+msgstr "Kan nie die huidige indekstoestand stoor nie"
+
+msgid "Cannot save the untracked files"
+msgstr "Kan nie die onnaspoorbare lêers stoor nie"
+
+msgid "Cannot save the current worktree state"
+msgstr "Kan nie die huidige werkboomtoestand stoor nie"
+
+msgid "Cannot save the current staged state"
+msgstr "Kan nie die huidige geplaasde toestand stoor nie"
+
+msgid "Cannot record working tree state"
+msgstr "Kan nie werkboomtoestand opteken nie"
+
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr "Kan nie --patch en --include-untracked of --all gelyktydig gebruik nie"
+
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr ""
+"Kan nie --staged en --include-untracked of --all gelyktydig gebruik nie"
+
+msgid "Did you forget to 'git add'?"
+msgstr "Het jy vergeet om 'git add' te doen?"
+
+msgid "No local changes to save"
+msgstr "Geen plaaslike veranderinge om te stoor nie"
+
+msgid "Cannot initialize stash"
+msgstr "Kan nie wegbêre inisialiseer nie"
+
+msgid "Cannot save the current status"
+msgstr "Kan nie die huidige status stoor nie"
+
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr "Werkgids- en indekstoestand %s gestoor"
+
+msgid "Cannot remove worktree changes"
+msgstr "Kan nie werkboomveranderinge verwyder nie"
+
+msgid "keep index"
+msgstr "behou indeks"
+
+msgid "stash staged changes only"
+msgstr "bêre slegs geplaasde veranderinge weg"
+
+msgid "stash in patch mode"
+msgstr "bêre weg in lapmodus"
+
+msgid "quiet mode"
+msgstr "stil modus"
+
+msgid "include untracked files in stash"
+msgstr "sluit onnaspoorbare lêers by wegbêre in"
+
+msgid "include ignore files"
+msgstr "sluit geïgnoreerde lêers in"
+
+#, c-format
+msgid "cannot parse commit %s"
+msgstr "kan nie vaslegging %s ontleed nie"
+
+#, c-format
+msgid "invalid author or committer for %s"
+msgstr "ongeldige outeur of vaslegger vir %s"
+
+msgid "could not write commit"
+msgstr "kon nie vaslegging skryf nie"
+
+#, c-format
+msgid "not a valid revision: %s"
+msgstr "nie 'n geldige hersiening nie: %s"
+
+#, c-format
+msgid "not a commit: %s"
+msgstr "nie 'n vaslegging nie: %s"
+
+#, c-format
+msgid "%s is not a valid exported stash commit"
+msgstr "%s is nie 'n geldige uitgevoerde wegbêre-vaslegging nie"
+
+#, c-format
+msgid "found root commit %s with invalid data"
+msgstr "wortelvaslegging %s met ongeldige data gevind"
+
+#, c-format
+msgid "found stash commit %s without expected prefix"
+msgstr "wegbêre-vaslegging %s sonder verwagte voorvoegsel gevind"
+
+#, c-format
+msgid "cannot parse parents of commit: %s"
+msgstr "kan nie ouers van vaslegging ontleed nie: %s"
+
+#, c-format
+msgid "%s does not look like a stash commit"
+msgstr "%s lyk nie soos 'n wegbêre-vaslegging nie"
+
+#, c-format
+msgid "cannot read commit buffer for %s"
+msgstr "kan nie vasleggingsbuffer vir %s lees nie"
+
+#, c-format
+msgid "cannot save the stash for %s"
+msgstr "kan nie die wegbêre vir %s stoor nie"
+
+msgid "unable to write base commit"
+msgstr "kan nie basisvaslegging skryf nie"
+
+#, c-format
+msgid "unable to find stash entry %s"
+msgstr "kan nie wegbêre-inskrywing %s vind nie"
+
+msgid "print the object ID instead of writing it to a ref"
+msgstr "druk die objek-ID in plaas daarvan om dit na 'n verwysing te skryf"
+
+msgid "save the data to the given ref"
+msgstr "stoor die data na die gegewe verwysing"
+
+msgid "exactly one of --print and --to-ref is required"
+msgstr "presies een van --print en --to-ref word vereis"
+
+msgid "skip and remove all lines starting with comment character"
+msgstr "slaan oor en verwyder alle reëls wat met die kommentaarkarakter begin"
+
+msgid "prepend comment character and space to each line"
+msgstr "voeg kommentaarkarakter en spasie voor elke reël by"
+
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"kon nie konfigurasie '%s' opsoek nie. Daar word aanvaar dat hierdie "
+"bewaarplek sy eie gesaghebbende stroomop is."
+
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr "kon nie 'n bewaarplekhandvatsel vir submodule '%s' kry nie"
+
+msgid "git submodule--helper get-default-remote <path>"
+msgstr "git submodule--helper get-default-remote <pad>"
+
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "Geen url vir submodulepad '%s' in .gitmodules gevind nie"
+
+#, c-format
+msgid "Entering '%s'\n"
+msgstr "Gaan '%s' binne\n"
+
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+"run_command het nie-nul-status vir %s teruggegee\n"
+"."
+
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+"run_command het nie-nul-status teruggegee tydens rekursie in die geneste "
+"submodules van %s\n"
+"."
+
+msgid "suppress output of entering each submodule command"
+msgstr "onderdruk afvoer by die binnegaan van elke submodule-opdrag"
+
+msgid "recurse into nested submodules"
+msgstr "gaan rekursief in geneste submodules in"
+
+msgid "git submodule foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule foreach [--quiet] [--recursive] [--] <opdrag>"
+
+#, c-format
+msgid ""
+"failed to set a valid default config for 'submodule.%s.gitdir'. Please "
+"ensure it is set, for example by running something like: 'git config "
+"submodule.%s.gitdir .git/modules/%s'"
+msgstr ""
+"kon nie 'n geldige verstekkonfigurasie vir 'submodule.%s.gitdir' stel nie. "
+"Maak asseblief seker dit is gestel, byvoorbeeld deur iets soos die volgende "
+"uit te voer: 'git config submodule.%s.gitdir .git/modules/%s'"
+
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "Kon nie url vir submodulepad '%s' registreer nie"
+
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "Submodule '%s' (%s) geregistreer vir pad '%s'\n"
+
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr "waarskuwing: opdrag-bywerkmodus voorgestel vir submodule '%s'\n"
+
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr "Kon nie bywerkmodus vir submodulepad '%s' registreer nie"
+
+msgid "suppress output for initializing a submodule"
+msgstr "onderdruk afvoer by die inisialisering van 'n submodule"
+
+msgid "git submodule init [<options>] [<path>]"
+msgstr "git submodule init [<opsies>] [<pad>]"
+
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr "geen submodule-toewysing in .gitmodules vir pad '%s' gevind nie"
+
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr "kon nie HEAD-verwysing binne die submodule '%s' oplos nie"
+
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "kon nie rekursief in submodule '%s' ingaan nie"
+
+msgid "suppress submodule status output"
+msgstr "onderdruk submodule-statusafvoer"
+
+msgid ""
+"use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr ""
+"gebruik die vaslegging wat in die indeks gestoor is in plaas van dié in die "
+"submodule se HEAD"
+
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [<pad>...]"
+
+#, c-format
+msgid "* %s %s(blob)->%s(submodule)"
+msgstr "* %s %s(blob)->%s(submodule)"
+
+#, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr "* %s %s(submodule)->%s(blob)"
+
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#, c-format
+msgid "couldn't hash object from '%s'"
+msgstr "kon nie objek vanaf '%s' huts nie"
+
+#, c-format
+msgid "unexpected mode %o"
+msgstr "onverwagte modus %o"
+
+msgid "use the commit stored in the index instead of the submodule HEAD"
+msgstr ""
+"gebruik die vaslegging wat in die indeks gestoor is in plaas van die "
+"submodule se HEAD"
+
+msgid "compare the commit in the index with that in the submodule HEAD"
+msgstr "vergelyk die vaslegging in die indeks met dié in die submodule se HEAD"
+
+msgid "skip submodules with 'ignore_config' value set to 'all'"
+msgstr ""
+"slaan submodules oor waarvan die 'ignore_config'-waarde op 'all' gestel is"
+
+msgid "limit the summary size"
+msgstr "beperk die opsommingsgrootte"
+
+msgid "git submodule summary [<options>] [<commit>] [--] [<path>]"
+msgstr "git submodule summary [<opsies>] [<vaslegging>] [--] [<pad>]"
+
+msgid "could not fetch a revision for HEAD"
+msgstr "kon nie 'n hersiening vir HEAD haal nie"
+
+msgid "git submodule--helper gitdir <name>"
+msgstr "git submodule--helper gitdir <naam>"
+
+msgid ""
+"could not set core.repositoryformatversion to 1.\n"
+"Please set it for migration to work, for example:\n"
+"git config core.repositoryformatversion 1"
+msgstr ""
+"kon nie core.repositoryformatversion op 1 stel nie.\n"
+"Stel dit asseblief sodat migrasie kan werk, byvoorbeeld:\n"
+"git config core.repositoryformatversion 1"
+
+msgid ""
+"could not enable submodulePathConfig extension. It is required\n"
+"for migration to work. Please enable it in the root repo:\n"
+"git config extensions.submodulePathConfig true"
+msgstr ""
+"kon nie submodulePathConfig-uitbreiding aktiveer nie. Dit word vereis\n"
+"sodat migrasie kan werk. Aktiveer dit asseblief in die wortelbewaarplek:\n"
+"git config extensions.submodulePathConfig true"
+
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "Sinkroniseer submodule-url vir '%s'\n"
+
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "kon nie url vir submodulepad '%s' registreer nie"
+
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr "kon nie afgeleë vir submodule '%s' bywerk nie"
+
+msgid "suppress output of synchronizing submodule url"
+msgstr "onderdruk afvoer by die sinkronisering van submodule-url"
+
+msgid "git submodule sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule sync [--quiet] [--recursive] [<pad>]"
+
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
+msgstr ""
+"Submodule-werkboom '%s' bevat 'n gids .git. Dit sal met behulp van "
+"absorbgitdirs deur 'n lêer .git vervang word."
+
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+"Submodule-werkboom '%s' bevat plaaslike wysigings; gebruik '-f' om dit te "
+"verwerp"
+
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "Gids '%s' skoongemaak\n"
+
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "Kon nie submodule-werkboom '%s' verwyder nie\n"
+
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "kon nie leë submodulegids %s skep nie"
+
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr "Submodule '%s' (%s) gederegistreer vir pad '%s'\n"
+
+msgid "remove submodule working trees even if they contain local changes"
+msgstr ""
+"verwyder submodule-werkbome selfs al bevat hulle plaaslike veranderinge"
+
+msgid "unregister all submodules"
+msgstr "deregistreer alle submodules"
+
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<pad>...]]"
+
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "Gebruik '--all' as jy werklik alle submodules wil deïnisialiseer"
+
+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 ""
+"'n Alternatief wat uit 'n superprojek se alternatief bereken is, is "
+"ongeldig.\n"
+"Om Git toe te laat om in so 'n geval sonder 'n alternatief te kloon, stel\n"
+"submodule.alternateErrorStrategy op 'info' of, gelykwaardig, kloon met\n"
+"'--reference-if-able' in plaas van '--reference'."
+
+#, c-format
+msgid "could not get a repository handle for gitdir '%s'"
+msgstr "kon nie 'n bewaarplekhandvatsel vir gitdir '%s' kry nie"
+
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "submodule '%s' kan nie alternatief byvoeg nie: %s"
+
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr "Waarde '%s' vir submodule.alternateErrorStrategy word nie herken nie"
+
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr "Waarde '%s' vir submodule.alternateLocation word nie herken nie"
+
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "gids is nie leeg nie: '%s'"
+
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "kloon van '%s' na submodulepad '%s' het misluk"
+
+#, c-format
+msgid ""
+"refusing to create/use '%s' in another submodule's git dir. Enabling "
+"extensions.submodulePathConfig should fix this."
+msgstr ""
+"weier om '%s' in 'n ander submodule se Git-gids te skep/gebruik. Deur "
+"extensions.submodulePathConfig te aktiveer, behoort dit reg te stel."
+
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "kon nie submodulegids vir '%s' kry nie"
+
+msgid "alternative anchor for relative paths"
+msgstr "alternatiewe anker vir relatiewe paaie"
+
+msgid "where the new submodule will be cloned to"
+msgstr "waarheen die nuwe submodule gekloon sal word"
+
+msgid "name of the new submodule"
+msgstr "naam van die nuwe submodule"
+
+msgid "url where to clone the submodule from"
+msgstr "url waarvandaan die submodule gekloon moet word"
+
+msgid "depth for shallow clones"
+msgstr "diepte vir vlak klone"
+
+msgid "force cloning progress"
+msgstr "dwing kloonvordering af"
+
+msgid "disallow cloning into non-empty directory"
+msgstr "verbied kloning na 'n nie-leë gids"
+
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
+"<filter-spec>] --url <url> --path <path>"
+msgstr ""
+"git submodule--helper clone [--prefix=<pad>] [--quiet] [--reference "
+"<bewaarplek>] [--name <naam>] [--depth <diepte>] [--single-branch] [--filter "
+"<filterspesifikasie>] --url <url> --path <pad>"
+
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
+msgstr "Ongeldige bywerkmodus '%s' gekonfigureer vir submodulepad '%s'"
+
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Submodulepad '%s' is nie geïnisialiseer nie"
+
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Wil jy dalk 'update --init' gebruik?"
+
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "Slaan submodule %s oor wat nie saamgesmelt is nie"
+
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "Slaan submodule '%s' oor"
+
+#, c-format
+msgid "cannot clone submodule '%s' without a URL"
+msgstr "kan nie submodule '%s' sonder 'n URL kloon nie"
+
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "Kon nie '%s' kloon nie. Herpoging geskeduleer"
+
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr "Kon nie '%s' 'n tweede keer kloon nie, staak"
+
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "Kan nie '%s' in submodulepad '%s' uitcheck nie"
+
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "Kan nie '%s' in submodulepad '%s' herbaseer nie"
+
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Kan nie '%s' in submodulepad '%s' saamsmelt nie"
+
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "Uitvoering van '%s %s' het in submodulepad '%s' misluk"
+
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Submodulepad '%s': '%s' uitgecheck\n"
+
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Submodulepad '%s': herbaseer na '%s'\n"
+
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Submodulepad '%s': '%s' ingesmelt\n"
+
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Submodulepad '%s': '%s %s'\n"
+
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr "Kan nie in submodulepad '%s' haal nie; probeer om %s direk te haal:"
+
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Gehaal in submodulepad '%s', maar dit het nie %s bevat nie. Direkte haal van "
+"daardie vaslegging het misluk."
+
+#, c-format
+msgid "could not initialize submodule at path '%s'"
+msgstr "kon nie submodule by pad '%s' inisialiseer nie"
+
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+"Submodule (%s) se tak is gekonfigureer om die tak van die superprojek te "
+"erf, maar die superprojek is nie op enige tak nie"
+
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Verwag 'n volledige verwysingsnaam, het %s gekry"
+
+#, c-format
+msgid "Unable to find current revision in submodule path '%s'"
+msgstr "Kan nie huidige revisie in submodulepad '%s' vind nie"
+
+#, c-format
+msgid "Unable to fetch in submodule path '%s'"
+msgstr "Kan nie in submodulepad '%s' haal nie"
+
+#, c-format
+msgid "Unable to find %s revision in submodule path '%s'"
+msgstr "Kan nie revisie %s in submodulepad '%s' vind nie"
+
+#, c-format
+msgid "Failed to recurse into submodule path '%s'"
+msgstr "Kon nie rekursief in submodulepad '%s' ingaan nie"
+
+msgid "force checkout updates"
+msgstr "dwing uitcheck-bywerkings af"
+
+msgid "initialize uninitialized submodules before update"
+msgstr "inisialiseer ongeïnisialiseerde submodules voor bywerking"
+
+msgid "use SHA-1 of submodule's remote tracking branch"
+msgstr "gebruik SHA-1 van die submodule se afgeleë volgtak"
+
+msgid "traverse submodules recursively"
+msgstr "deurloop submodules rekursief"
+
+msgid "don't fetch new objects from the remote site"
+msgstr "moenie nuwe objekte van die afgeleë werf haal nie"
+
+msgid "use the 'checkout' update strategy (default)"
+msgstr "gebruik die 'checkout'-bywerkingstrategie (verstek)"
+
+msgid "use the 'merge' update strategy"
+msgstr "gebruik die 'merge'-bywerkingstrategie"
+
+msgid "use the 'rebase' update strategy"
+msgstr "gebruik die 'rebase'-bywerkingstrategie"
+
+msgid "create a shallow clone truncated to the specified number of revisions"
+msgstr "skep 'n vlak kloon, afgekap tot die gespesifiseerde aantal revisies"
+
+msgid "parallel jobs"
+msgstr "parallelle take"
+
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "of die aanvanklike kloon die vlak-aanbeveling moet volg"
+
+msgid "don't print cloning progress"
+msgstr "moenie kloonvordering druk nie"
+
+msgid "disallow cloning into non-empty directory, implies --init"
+msgstr "verbied kloning na 'n nie-leë gids, impliseer --init"
+
+msgid ""
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<path>...]"
+msgstr ""
+"git submodule [--quiet] update [--init [--filter=<filterspesifikasie>]] [--"
+"remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--"
+"[no-]recommend-shallow] [--reference <bewaarplek>] [--recursive] [--"
+"[no-]single-branch] [--] [<pad>...]"
+
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Kon nie HEAD as 'n geldige verwysing oplos nie."
+
+msgid "git submodule absorbgitdirs [<options>] [<path>...]"
+msgstr "git submodule absorbgitdirs [<opsies>] [<pad>...]"
+
+msgid "suppress output for setting url of a submodule"
+msgstr "onderdruk afvoer vir die instel van 'n submodule se url"
+
+msgid "git submodule set-url [--quiet] <path> <newurl>"
+msgstr "git submodule set-url [--quiet] <pad> <nuweurl>"
+
+msgid "set the default tracking branch to master"
+msgstr "stel die verstek-volgtak na master"
+
+msgid "set the default tracking branch"
+msgstr "stel die verstek-volgtak"
+
+msgid "git submodule set-branch [-q|--quiet] (-d|--default) <path>"
+msgstr "git submodule set-branch [-q|--quiet] (-d|--default) <pad>"
+
+msgid "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
+msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <tak> <pad>"
+
+msgid "--branch or --default required"
+msgstr "--branch of --default word vereis"
+
+msgid "print only error messages"
+msgstr "druk slegs foutboodskappe"
+
+msgid "force creation"
+msgstr "dwing skepping af"
+
+msgid "show whether the branch would be created"
+msgstr "wys of die tak geskep sou word"
+
+msgid ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
+msgstr ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <naam> <begin-oid> <beginnaam>"
+
+#, c-format
+msgid "creating branch '%s'"
+msgstr "skep tak '%s'"
+
+#, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr "Voeg bestaande bewaarplek by '%s' by die indeks\n"
+
+#, c-format
+msgid "'%s' already exists and is not a valid git repo"
+msgstr "'%s' bestaan reeds en is nie 'n geldige Git-bewaarplek nie"
+
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr "'n Git-gids vir '%s' is plaaslik gevind met afgeleë(s):\n"
+
+#, c-format
+msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+"  %s\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 ""
+"As jy hierdie plaaslike Git-gids wil hergebruik in plaas daarvan om weer te "
+"kloon vanaf\n"
+"  %s\n"
+"gebruik die '--force'-opsie. As die plaaslike Git-gids nie die korrekte "
+"bewaarplek is nie\n"
+"of jy onseker is wat dit beteken, kies 'n ander naam met die '--name'-opsie."
+
+#, c-format
+msgid "Reactivating local git directory for submodule '%s'\n"
+msgstr "Heraktiveer plaaslike Git-gids vir submodule '%s'\n"
+
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "kan nie submodule '%s' uitcheck nie"
+
+msgid "please make sure that the .gitmodules file is in the working tree"
+msgstr "maak asseblief seker dat die .gitmodules-lêer in die werkboom is"
+
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Kon nie submodule '%s' byvoeg nie"
+
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Kon nie submodule '%s' registreer nie"
+
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' bestaan reeds in die indeks"
+
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "'%s' bestaan reeds in die indeks en is nie 'n submodule nie"
+
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "'%s' het nie 'n vaslegging uitgecheck nie"
+
+msgid "branch of repository to add as submodule"
+msgstr "tak van bewaarplek om as submodule by te voeg"
+
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "laat toe om 'n andersins geïgnoreerde submodulepad by te voeg"
+
+msgid "borrow the objects from reference repositories"
+msgstr "leen die objekte uit verwysingsbewaarplekke"
+
+msgid ""
+"sets the submodule's name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"stel die submodule se naam na die gegewe string in plaas daarvan om by "
+"verstek sy pad te gebruik"
+
+msgid "git submodule add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule add [<opsies>] [--] <bewaarplek> [<pad>]"
+
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+"Relatiewe pad kan slegs vanaf die boonste vlak van die werkboom gebruik word"
+
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "bewaarplek-URL: '%s' moet absoluut wees of met ./|../ begin"
+
+#, c-format
+msgid "submodule name '%s' already used for path '%s'"
+msgstr "submodulenaam '%s' word reeds vir pad '%s' gebruik"
+
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "'%s' is nie 'n geldige submodulenaam nie"
+
+msgid "git submodule--helper <command>"
+msgstr "git submodule--helper <opdrag>"
+
+msgid "git symbolic-ref [-m <reason>] <name> <ref>"
+msgstr "git symbolic-ref [-m <rede>] <naam> <verwysing>"
+
+msgid "git symbolic-ref [-q] [--short] [--no-recurse] <name>"
+msgstr "git symbolic-ref [-q] [--short] [--no-recurse] <naam>"
+
+msgid "git symbolic-ref --delete [-q] <name>"
+msgstr "git symbolic-ref --delete [-q] <naam>"
+
+msgid "suppress error message for non-symbolic (detached) refs"
+msgstr "onderdruk foutboodskap vir nie-simboliese (ontkoppelde) verwysings"
+
+msgid "delete symbolic ref"
+msgstr "skrap simboliese verwysing"
+
+msgid "shorten ref output"
+msgstr "verkort verwysingsafvoer"
+
+msgid "recursively dereference (default)"
+msgstr "volg verwysings rekursief (verstek)"
+
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
+"        [(--trailer <token>[(=|:)<value>])...]\n"
+"        <tagname> [<commit> | <object>]"
+msgstr ""
+"git tag [-a | -s | -u <sleutel-id>] [-f] [-m <boodskap> | -F <lêer>] [-e]\n"
+"        [(--trailer <teken>[(=|:)<waarde>])...]\n"
+"        <etiketnaam> [<vaslegging> | <objek>]"
+
+msgid "git tag -d <tagname>..."
+msgstr "git tag -d <etiketnaam>..."
+
+msgid ""
+"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n"
+"        [--points-at <object>] [--column[=<options>] | --no-column]\n"
+"        [--create-reflog] [--sort=<key>] [--format=<format>]\n"
+"        [--merged <commit>] [--no-merged <commit>] [<pattern>...]"
+msgstr ""
+"git tag [-n[<getal>]] -l [--contains <vaslegging>] [--no-contains "
+"<vaslegging>]\n"
+"        [--points-at <objek>] [--column[=<opsies>] | --no-column]\n"
+"        [--create-reflog] [--sort=<sleutel>] [--format=<formaat>]\n"
+"        [--merged <vaslegging>] [--no-merged <vaslegging>] [<patroon>...]"
+
+msgid "git tag -v [--format=<format>] <tagname>..."
+msgstr "git tag -v [--format=<formaat>] <etiketnaam>..."
+
+#, c-format
+msgid "tag '%s' not found."
+msgstr "etiket '%s' nie gevind nie."
+
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr "Etiket '%s' geskrap (was %s)\n"
+
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+"  %s\n"
+"Lines starting with '%s' will be ignored.\n"
+msgstr ""
+"\n"
+"Skryf 'n boodskap vir etiket:\n"
+"  %s\n"
+"Reëls wat met '%s' begin, sal geïgnoreer word.\n"
+
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+"  %s\n"
+"Lines starting with '%s' will be kept; you may remove them yourself if you "
+"want to.\n"
+msgstr ""
+"\n"
+"Skryf 'n boodskap vir etiket:\n"
+"  %s\n"
+"Reëls wat met '%s' begin, sal behou word; jy kan hulle self verwyder as jy "
+"wil.\n"
+
+msgid "unable to sign the tag"
+msgstr "kan nie die etiket onderteken nie"
+
+#, 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 ""
+"Jy het 'n geneste etiket geskep. Die objek waarna jou nuwe etiket verwys, "
+"is\n"
+"reeds 'n etiket. As jy bedoel het om die objek waarna dit wys te etiketteer, "
+"gebruik:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+
+msgid "bad object type."
+msgstr "slegte objektipe."
+
+msgid "no tag message?"
+msgstr "geen etiketboodskap nie?"
+
+#, c-format
+msgid "The tag message has been left in %s\n"
+msgstr "Die etiketboodskap is in %s gelaat\n"
+
+msgid "list tag names"
+msgstr "lys etiketname"
+
+msgid "print <n> lines of each tag message"
+msgstr "druk <n> reëls van elke etiketboodskap"
+
+msgid "delete tags"
+msgstr "skrap etikette"
+
+msgid "verify tags"
+msgstr "verifieer etikette"
+
+msgid "Tag creation options"
+msgstr "Opsies vir etiketskepping"
+
+msgid "annotated tag, needs a message"
+msgstr "geannoteerde etiket, benodig 'n boodskap"
+
+msgid "tag message"
+msgstr "etiketboodskap"
+
+msgid "force edit of tag message"
+msgstr "dwing redigering van etiketboodskap af"
+
+msgid "annotated and GPG-signed tag"
+msgstr "geannoteerde en GPG-ondertekende etiket"
+
+msgid "use another key to sign the tag"
+msgstr "gebruik 'n ander sleutel om die etiket te onderteken"
+
+msgid "replace the tag if exists"
+msgstr "vervang die etiket as dit bestaan"
+
+msgid "Tag listing options"
+msgstr "Opsies vir etiketlys"
+
+msgid "show tag list in columns"
+msgstr "wys etiketlys in kolomme"
+
+msgid "print only tags that contain the commit"
+msgstr "druk slegs etikette wat die vaslegging bevat"
+
+msgid "print only tags that don't contain the commit"
+msgstr "druk slegs etikette wat nie die vaslegging bevat nie"
+
+msgid "print only tags that are merged"
+msgstr "druk slegs etikette wat saamgesmelt is"
+
+msgid "print only tags that are not merged"
+msgstr "druk slegs etikette wat nie saamgesmelt is nie"
+
+msgid "print only tags of the object"
+msgstr "druk slegs etikette van die objek"
+
+msgid "could not start 'git column'"
+msgstr "kon nie 'git column' begin nie"
+
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "die '%s'-opsie word slegs in lysmodus toegelaat"
+
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr "'%s' is nie 'n geldige etiketnaam nie."
+
+#, c-format
+msgid "tag '%s' already exists"
+msgstr "etiket '%s' bestaan reeds"
+
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Ongeldige opruimmodus %s"
+
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr "Etiket '%s' bygewerk (was %s)\n"
+
+msgid "pack exceeds maximum allowed size"
+msgstr "pak oorskry die maksimum toegelate grootte"
+
+msgid "failed to write object in stream"
+msgstr "kon nie objek in stroom skryf nie"
+
+#, c-format
+msgid "inflate returned (%d)"
+msgstr "inflate het (%d) teruggegee"
+
+msgid "invalid blob object from stream"
+msgstr "ongeldige blob-objek uit stroom"
+
+msgid "Unpacking objects"
+msgstr "Pak objekte uit"
+
+#, c-format
+msgid "failed to create directory %s"
+msgstr "kon nie gids %s skep nie"
+
+#, c-format
+msgid "failed to delete file %s"
+msgstr "kon nie lêer %s skrap nie"
+
+#, c-format
+msgid "failed to delete directory %s"
+msgstr "kon nie gids %s skrap nie"
+
+#, c-format
+msgid "Testing mtime in '%s' "
+msgstr "Toets mtime in '%s' "
+
+msgid "directory stat info does not change after adding a new file"
+msgstr "gids se stat-inligting verander nie nadat 'n nuwe lêer bygevoeg is nie"
+
+msgid "directory stat info does not change after adding a new directory"
+msgstr "gids se stat-inligting verander nie nadat 'n nuwe gids bygevoeg is nie"
+
+msgid "directory stat info changes after updating a file"
+msgstr "gids se stat-inligting verander nadat 'n lêer bygewerk is"
+
+msgid "directory stat info changes after adding a file inside subdirectory"
+msgstr ""
+"gids se stat-inligting verander nadat 'n lêer binne 'n subgids bygevoeg is"
+
+msgid "directory stat info does not change after deleting a file"
+msgstr "gids se stat-inligting verander nie nadat 'n lêer geskrap is nie"
+
+msgid "directory stat info does not change after deleting a directory"
+msgstr "gids se stat-inligting verander nie nadat 'n gids geskrap is nie"
+
+msgid " OK"
+msgstr " Goed"
+
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr "git update-index [<opsies>] [--] [<lêer>...]"
+
+msgid "continue refresh even when index needs update"
+msgstr "gaan voort met verfris selfs wanneer die indeks bygewerk moet word"
+
+msgid "refresh: ignore submodules"
+msgstr "verfris: ignoreer submodules"
+
+msgid "do not ignore new files"
+msgstr "moenie nuwe lêers ignoreer nie"
+
+msgid "let files replace directories and vice-versa"
+msgstr "laat lêers gidse vervang en andersom"
+
+msgid "notice files missing from worktree"
+msgstr "let op lêers wat uit die werkboom ontbreek"
+
+msgid "refresh even if index contains unmerged entries"
+msgstr ""
+"verfris selfs as die indeks inskrywings bevat wat nie saamgesmelt is nie"
+
+msgid "refresh stat information"
+msgstr "verfris stat-inligting"
+
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr "soos --refresh, maar ignoreer die assume-unchanged-instelling"
+
+msgid "<mode>,<object>,<path>"
+msgstr "<modus>,<objek>,<pad>"
+
+msgid "add the specified entry to the index"
+msgstr "voeg die gespesifiseerde inskrywing by die indeks"
+
+msgid "mark files as \"not changing\""
+msgstr "merk lêers as \"verander nie\""
+
+msgid "clear assumed-unchanged bit"
+msgstr "maak assumed-unchanged-bis skoon"
+
+msgid "mark files as \"index-only\""
+msgstr "merk lêers as \"slegs-indeks\""
+
+msgid "clear skip-worktree bit"
+msgstr "maak skip-worktree-bis skoon"
+
+msgid "do not touch index-only entries"
+msgstr "moenie slegs-indeks-inskrywings aanraak nie"
+
+msgid "add to index only; do not add content to object database"
+msgstr "voeg slegs by die indeks; moenie inhoud by die objekdatabasis voeg nie"
+
+msgid "remove named paths even if present in worktree"
+msgstr "verwyder genoemde paaie selfs as hulle in die werkboom teenwoordig is"
+
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr "met --stdin: invoerreëls word deur nulgrepe beëindig"
+
+msgid "read list of paths to be updated from standard input"
+msgstr "lees lys van paaie wat bygewerk moet word vanaf standaardinvoer"
+
+msgid "add entries from standard input to the index"
+msgstr "voeg inskrywings vanaf standaardinvoer by die indeks"
+
+msgid "repopulate stages #2 and #3 for the listed paths"
+msgstr "hervul stadiums #2 en #3 vir die gelyste paaie"
+
+msgid "only update entries that differ from HEAD"
+msgstr "werk slegs inskrywings by wat van HEAD verskil"
+
+msgid "ignore files missing from worktree"
+msgstr "ignoreer lêers wat uit die werkboom ontbreek"
+
+msgid "report actions to standard output"
+msgstr "rapporteer aksies na standaardafvoer"
+
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr "(vir porselein) vergeet gestoorde onopgeloste konflikte"
+
+msgid "write index in this format"
+msgstr "skryf indeks in hierdie formaat"
+
+msgid "report on-disk index format version"
+msgstr "rapporteer die weergawe van die indeksformaat op skyf"
+
+msgid "enable or disable split index"
+msgstr "aktiveer of deaktiveer gesplete indeks"
+
+msgid "enable/disable untracked cache"
+msgstr "aktiveer/deaktiveer onnaspoorbare kas"
+
+msgid "test if the filesystem supports untracked cache"
+msgstr "toets of die lêerstelsel onnaspoorbare kas ondersteun"
+
+msgid "enable untracked cache without testing the filesystem"
+msgstr "aktiveer onnaspoorbare kas sonder om die lêerstelsel te toets"
+
+msgid "write out the index even if is not flagged as changed"
+msgstr "skryf die indeks uit selfs as dit nie as verander gemerk is nie"
+
+msgid "enable or disable file system monitor"
+msgstr "aktiveer of deaktiveer lêerstelselmonitor"
+
+msgid "mark files as fsmonitor valid"
+msgstr "merk lêers as fsmonitor-geldig"
+
+msgid "clear fsmonitor valid bit"
+msgstr "maak fsmonitor-geldig-bis skoon"
+
+#, c-format
+msgid "%d\n"
+msgstr "%d\n"
+
+#, c-format
+msgid "index-version: was %d, set to %d"
+msgstr "indeksweergawe: was %d, gestel na %d"
+
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+msgstr ""
+"core.splitIndex is op false gestel; verwyder of verander dit as jy regtig "
+"gesplete indeks wil aktiveer"
+
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+msgstr ""
+"core.splitIndex is op true gestel; verwyder of verander dit as jy regtig "
+"gesplete indeks wil deaktiveer"
+
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr ""
+"core.untrackedCache is op true gestel; verwyder of verander dit as jy regtig "
+"die onnaspoorbare kas wil deaktiveer"
+
+msgid "Untracked cache disabled"
+msgstr "Onnaspoorbare kas gedeaktiveer"
+
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+msgstr ""
+"core.untrackedCache is op false gestel; verwyder of verander dit as jy "
+"regtig die onnaspoorbare kas wil aktiveer"
+
+#, c-format
+msgid "Untracked cache enabled for '%s'"
+msgstr "Onnaspoorbare kas geaktiveer vir '%s'"
+
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr ""
+"core.fsmonitor is nie gestel nie; stel dit as jy regtig fsmonitor wil "
+"aktiveer"
+
+msgid "fsmonitor enabled"
+msgstr "fsmonitor geaktiveer"
+
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr ""
+"core.fsmonitor is gestel; verwyder dit as jy regtig fsmonitor wil deaktiveer"
+
+msgid "fsmonitor disabled"
+msgstr "fsmonitor gedeaktiveer"
+
+msgid "git update-ref [<options>] -d <refname> [<old-oid>]"
+msgstr "git update-ref [<opsies>] -d <verwysingsnaam> [<ou-oid>]"
+
+msgid "git update-ref [<options>]    <refname> <new-oid> [<old-oid>]"
+msgstr "git update-ref [<opsies>]    <verwysingsnaam> <nuwe-oid> [<ou-oid>]"
+
+msgid "git update-ref [<options>] --stdin [-z] [--batch-updates]"
+msgstr "git update-ref [<opsies>] --stdin [-z] [--batch-updates]"
+
+msgid "delete the reference"
+msgstr "skrap die verwysing"
+
+msgid "stdin has NUL-terminated arguments"
+msgstr "stdin het NUL-beëindigde argumente"
+
+msgid "read updates from stdin"
+msgstr "lees bywerkings vanaf stdin"
+
+msgid "batch reference updates"
+msgstr "bondel verwysingsbywerkings"
+
+msgid "update the info files from scratch"
+msgstr "werk die inligtingslêers van voor af by"
+
+msgid ""
+"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n"
+"                [--advertise-refs] <directory>"
+msgstr ""
+"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n"
+"                [--advertise-refs] <gids>"
+
+msgid "quit after a single request/response exchange"
+msgstr "hou op na 'n enkele versoek/antwoord-uitruiling"
+
+msgid "serve up the info/refs for git-http-backend"
+msgstr "bedien die info/refs vir git-http-backend"
+
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "moenie <gids>/.git/ probeer as <gids> geen Git-gids is nie"
+
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "onderbreek oordrag na <n> sekondes van onaktiwiteit"
+
+msgid "git url-parse [-c <component>] [--] <url>..."
+msgstr "git url-parse [-c <komponent>] [--] <url>..."
+
+msgid "component"
+msgstr "komponent"
+
+msgid "which URL component to extract"
+msgstr "watter URL-komponent om te onttrek"
+
+msgid "git verify-commit [-v | --verbose] [--raw] <commit>..."
+msgstr "git verify-commit [-v | --verbose] [--raw] <vaslegging>..."
+
+msgid "print commit contents"
+msgstr "druk vasleggingsinhoud"
+
+msgid "print raw gpg status output"
+msgstr "druk rou gpg-statusafvoer"
+
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..."
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pak>.idx..."
+
+msgid "verbose"
+msgstr "breedvoerig"
+
+msgid "show statistics only"
+msgstr "wys slegs statistieke"
+
+msgid "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..."
+msgstr ""
+"git verify-tag [-v | --verbose] [--format=<formaat>] [--raw] <etiket>..."
+
+msgid "print tag contents"
+msgstr "druk etiketinhoud"
+
+msgid ""
+"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n"
+"                 [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]"
+msgstr ""
+"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n"
+"                 [--orphan] [(-b | -B) <nuwe-tak>] <pad> [<vasleggingagtige>]"
+
+msgid "git worktree list [-v | --porcelain [-z]]"
+msgstr "git worktree list [-v | --porcelain [-z]]"
+
+msgid "git worktree lock [--reason <string>] <worktree>"
+msgstr "git worktree lock [--reason <string>] <werkboom>"
+
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <werkboom> <nuwe-pad>"
+
+msgid "git worktree prune [-n] [-v] [--expire <expire>]"
+msgstr "git worktree prune [-n] [-v] [--expire <verval>]"
+
+msgid "git worktree remove [-f] <worktree>"
+msgstr "git worktree remove [-f] <werkboom>"
+
+msgid "git worktree repair [<path>...]"
+msgstr "git worktree repair [<pad>...]"
+
+msgid "git worktree unlock <worktree>"
+msgstr "git worktree unlock <werkboom>"
+
+msgid "No possible source branch, inferring '--orphan'"
+msgstr "Geen moontlike brontak nie, lei '--orphan' af"
+
+#, c-format
+msgid ""
+"If you meant to create a worktree containing a new unborn branch\n"
+"(branch with no commits) for this repository, you can do so\n"
+"using the --orphan flag:\n"
+"\n"
+"    git worktree add --orphan -b %s %s\n"
+msgstr ""
+"As jy bedoel het om 'n werkboom te skep wat 'n nuwe ongebore tak\n"
+"(tak sonder vasleggings) vir hierdie bewaarplek bevat, kan jy dit doen\n"
+"met die vlag --orphan:\n"
+"\n"
+"    git worktree add --orphan -b %s %s\n"
+
+#, c-format
+msgid ""
+"If you meant to create a worktree containing a new unborn branch\n"
+"(branch with no commits) for this repository, you can do so\n"
+"using the --orphan flag:\n"
+"\n"
+"    git worktree add --orphan %s\n"
+msgstr ""
+"As jy bedoel het om 'n werkboom te skep wat 'n nuwe ongebore tak\n"
+"(tak sonder vasleggings) vir hierdie bewaarplek bevat, kan jy dit doen\n"
+"met die vlag --orphan:\n"
+"\n"
+"    git worktree add --orphan %s\n"
+
+#, c-format
+msgid "Removing %s/%s: %s"
+msgstr "Verwyder %s/%s: %s"
+
+msgid "report pruned working trees"
+msgstr "rapporteer gesnoeide werkbome"
+
+msgid "prune missing working trees older than <time>"
+msgstr "snoei ontbrekende werkbome ouer as <tyd>"
+
+#, c-format
+msgid "'%s' already exists"
+msgstr "'%s' bestaan reeds"
+
+#, c-format
+msgid "unusable worktree destination '%s'"
+msgstr "onbruikbare werkboombestemming '%s'"
+
+#, 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' is 'n ontbrekende maar geslote werkboom;\n"
+"gebruik '%s -f -f' om te oorheers, of 'unlock' en 'prune' of 'remove' om "
+"skoon te maak"
+
+#, 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' is 'n ontbrekende maar reeds geregistreerde werkboom;\n"
+"gebruik '%s -f' om te oorheers, of 'prune' of 'remove' om skoon te maak"
+
+#, c-format
+msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
+msgstr "kon nie '%s' na '%s' kopieer nie; yl-uitcheck werk dalk nie korrek nie"
+
+#, c-format
+msgid "failed to copy worktree config from '%s' to '%s'"
+msgstr "kon nie werkboomkonfigurasie van '%s' na '%s' kopieer nie"
+
+#, c-format
+msgid "failed to unset '%s' in '%s'"
+msgstr "kon nie '%s' in '%s' ontstel nie"
+
+#, c-format
+msgid "could not create directory of '%s'"
+msgstr "kon nie gids van '%s' skep nie"
+
+msgid "initializing"
+msgstr "inisialiseer"
+
+#, c-format
+msgid "could not find created worktree '%s'"
+msgstr "kon nie geskepte werkboom '%s' vind nie"
+
+#, c-format
+msgid "Preparing worktree (new branch '%s')"
+msgstr "Berei werkboom voor (nuwe tak '%s')"
+
+#, c-format
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
+msgstr "Berei werkboom voor (herstel tak '%s'; was by %s)"
+
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
+msgstr "Berei werkboom voor (check '%s' uit)"
+
+#, c-format
+msgid "Preparing worktree (detached HEAD %s)"
+msgstr "Berei werkboom voor (ontkoppelde HEAD %s)"
+
+msgid "HEAD points to an invalid (or orphaned) reference.\n"
+msgstr "HEAD wys na 'n ongeldige (of weeskind-) verwysing.\n"
+
+msgid ""
+"No local or remote refs exist despite at least one remote\n"
+"present, stopping; use 'add -f' to override or fetch a remote first"
+msgstr ""
+"Geen plaaslike of afgeleë verwysings bestaan nie, ten spyte daarvan dat ten "
+"minste een afgeleë\n"
+"teenwoordig is; stop. Gebruik 'add -f' om te oorheers of haal eers 'n afgeleë"
+
+#, c-format
+msgid ""
+"If you meant to create a worktree from a remote tracking branch on\n"
+"<remote>, you can do so by:\n"
+"\n"
+"    git worktree add -b %s %s <remote>/%s\n"
+"\n"
+"If you'd like to always prefer some remote, e.g. 'origin',\n"
+"consider setting checkout.defaultRemote=origin in your config."
+msgstr ""
+"As jy bedoel het om 'n werkboom vanaf 'n afgeleë volgtak op\n"
+"<remote> te skep, kan jy dit so doen:\n"
+"\n"
+"    git worktree add -b %s %s <remote>/%s\n"
+"\n"
+"As jy altyd 'n sekere afgeleë wil verkies, bv. 'origin',\n"
+"oorweeg dit om checkout.defaultRemote=origin in jou konfigurasie in te stel."
+
+msgid "checkout <branch> even if already checked out in other worktree"
+msgstr "check <tak> uit selfs al is dit reeds in 'n ander werkboom uitgecheck"
+
+msgid "create a new branch"
+msgstr "skep 'n nuwe tak"
+
+msgid "create or reset a branch"
+msgstr "skep of herstel 'n tak"
+
+msgid "create unborn branch"
+msgstr "skep ongebore tak"
+
+msgid "populate the new working tree"
+msgstr "vul die nuwe werkboom"
+
+msgid "keep the new working tree locked"
+msgstr "hou die nuwe werkboom gesluit"
+
+msgid "reason for locking"
+msgstr "rede vir sluiting"
+
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "stel naspoormodus op (sien git-branch(1))"
+
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr "probeer om die nuwe taknaam met 'n afgeleë volgtak te pas"
+
+msgid "use relative paths for worktrees"
+msgstr "gebruik relatiewe paaie vir werkbome"
+
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "opsies '%s', '%s' en '%s' kan nie saam gebruik word nie"
+
+#, c-format
+msgid "option '%s' and commit-ish cannot be used together"
+msgstr "opsie '%s' en vasleggingagtige kan nie saam gebruik word nie"
+
+msgid "added with --lock"
+msgstr "bygevoeg met --lock"
+
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr "--[no-]track kan slegs gebruik word as 'n nuwe tak geskep word"
+
+msgid "show extended annotations and reasons, if available"
+msgstr "wys uitgebreide annotasies en redes, indien beskikbaar"
+
+msgid "add 'prunable' annotation to missing worktrees older than <time>"
+msgstr "voeg 'prunable'-annotasie by ontbrekende werkbome ouer as <tyd>"
+
+msgid "terminate records with a NUL character"
+msgstr "beëindig rekords met 'n NUL-karakter"
+
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr "'%s' is nie 'n werkboom nie"
+
+msgid "The main working tree cannot be locked or unlocked"
+msgstr "Die hoofwerkboom kan nie gesluit of ontsluit word nie"
+
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr "'%s' is reeds gesluit, rede: %s"
+
+#, c-format
+msgid "'%s' is already locked"
+msgstr "'%s' is reeds gesluit"
+
+#, c-format
+msgid "'%s' is not locked"
+msgstr "'%s' is nie gesluit nie"
+
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr "werkbome wat submodules bevat, kan nie geskuif of verwyder word nie"
+
+msgid "force move even if worktree is dirty or locked"
+msgstr "dwing skuif af selfs as die werkboom vuil of gesluit is"
+
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr "'%s' is 'n hoofwerkboom"
+
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "kon nie bestemmingsnaam uit '%s' bepaal nie"
+
+#, c-format
+msgid ""
+"cannot move a locked working tree, lock reason: %s\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+"kan nie 'n geslote werkboom skuif nie, rede vir sluiting: %s\n"
+"gebruik 'move -f -f' om te oorheers of ontsluit dit eers"
+
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+"kan nie 'n geslote werkboom skuif nie;\n"
+"gebruik 'move -f -f' om te oorheers of ontsluit dit eers"
+
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr "validering het misluk, kan nie werkboom skuif nie: %s"
+
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "kon nie '%s' na '%s' skuif nie"
+
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "kon nie 'git status' op '%s' laat loop nie"
+
+#, c-format
+msgid "'%s' contains modified or untracked files, use --force to delete it"
+msgstr ""
+"'%s' bevat gewysigde of onnaspoorbare lêers, gebruik --force om dit te skrap"
+
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr "kon nie 'git status' op '%s' laat loop nie, kode %d"
+
+msgid "force removal even if worktree is dirty or locked"
+msgstr "dwing verwydering af selfs as die werkboom vuil of gesluit is"
+
+#, c-format
+msgid ""
+"cannot remove a locked working tree, lock reason: %s\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+"kan nie 'n geslote werkboom verwyder nie, rede vir sluiting: %s\n"
+"gebruik 'remove -f -f' om te oorheers of ontsluit dit eers"
+
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+"kan nie 'n geslote werkboom verwyder nie;\n"
+"gebruik 'remove -f -f' om te oorheers of ontsluit dit eers"
+
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr "validering het misluk, kan nie werkboom verwyder nie: %s"
+
+#, c-format
+msgid "repair: %s: %s"
+msgstr "herstel: %s: %s"
+
+#, c-format
+msgid "error: %s: %s"
+msgstr "fout: %s: %s"
+
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+msgstr "git write-tree [--missing-ok] [--prefix=<voorvoegsel>/]"
+
+msgid "<prefix>/"
+msgstr "<voorvoegsel>/"
+
+msgid "write tree object for a subdirectory <prefix>"
+msgstr "skryf boomobjek vir 'n subgids <voorvoegsel>"
+
+msgid "only useful for debugging"
+msgstr "slegs nuttig vir ontfouting"
+
+#, c-format
+msgid "could not parse bundle list key %s with value '%s'"
+msgstr "kon nie bondellys-sleutel %s met waarde '%s' ontleed nie"
+
+#, c-format
+msgid "bundle list at '%s' has no mode"
+msgstr "bondellys by '%s' het geen modus nie"
+
+#, c-format
+msgid "bundle list at '%s': bundle '%s' has no uri"
+msgstr "bondellys by '%s': bondel '%s' het geen uri nie"
+
+msgid "failed to create temporary file"
+msgstr "kon nie tydelike lêer skep nie"
+
+msgid "insufficient capabilities"
+msgstr "onvoldoende vermoëns"
+
+#, c-format
+msgid "file downloaded from '%s' is not a bundle"
+msgstr "lêer afgelaai vanaf '%s' is nie 'n bondel nie"
+
+msgid "failed to store maximum creation token"
+msgstr "kon nie maksimum skeppingstoken stoor nie"
+
+#, c-format
+msgid "unrecognized bundle mode from URI '%s'"
+msgstr "onbekende bondelmodus vanaf URI '%s'"
+
+#, c-format
+msgid "exceeded bundle URI recursion limit (%d)"
+msgstr "bondel-URI-rekursielimiet (%d) oorskry"
+
+#, c-format
+msgid "bundle '%s' has no uri"
+msgstr "bondel '%s' het geen uri nie"
+
+#, c-format
+msgid "failed to download bundle from URI '%s'"
+msgstr "kon nie bondel vanaf URI '%s' aflaai nie"
+
+#, c-format
+msgid "file at URI '%s' is not a bundle or bundle list"
+msgstr "lêer by URI '%s' is nie 'n bondel of bondellys nie"
+
+#, c-format
+msgid "config '%s' has no value"
+msgstr "konfigurasie '%s' het geen waarde nie"
+
+#, c-format
+msgid "bundle-uri: unexpected argument: '%s'"
+msgstr "bundle-uri: onverwagte argument: '%s'"
+
+msgid "bundle-uri: expected flush after arguments"
+msgstr "bundle-uri: het 'flush' ná argumente verwag"
+
+msgid "bundle-uri: got an empty line"
+msgstr "bundle-uri: het 'n leë reël gekry"
+
+msgid "bundle-uri: line is not of the form 'key=value'"
+msgstr "bundle-uri: reël is nie van die vorm 'key=value' nie"
+
+msgid "bundle-uri: line has empty key or value"
+msgstr "bundle-uri: reël het leë sleutel of waarde"
+
+#, c-format
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "onbekende bondel-hutsalgoritme: %s"
+
+#, c-format
+msgid "unknown capability '%s'"
+msgstr "onbekende vermoë '%s'"
+
+#, c-format
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr "'%s' lyk nie soos 'n v2- of v3-bondellêer nie"
+
+#, c-format
+msgid "unrecognized header: %s%s (%d)"
+msgstr "onbekende kopskrif: %s%s (%d)"
+
+msgid "Repository lacks these prerequisite commits:"
+msgstr "Bewaarplek kort hierdie voorvereiste vasleggings:"
+
+msgid ""
+"some prerequisite commits exist in the object store, but are not connected "
+"to the repository's history"
+msgstr ""
+"sommige voorvereiste vasleggings bestaan in die objekstoor, maar is nie aan "
+"die bewaarplek se geskiedenis gekoppel nie"
+
+#, c-format
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "Die bondel bevat hierdie verwysing:"
+msgstr[1] "Die bondel bevat hierdie %<PRIuMAX> verwysings:"
+
+msgid "The bundle records a complete history."
+msgstr "Die bondel teken 'n volledige geskiedenis aan."
+
+#, c-format
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "Die bondel vereis hierdie verwysing:"
+msgstr[1] "Die bondel vereis hierdie %<PRIuMAX> verwysings:"
+
+#, c-format
+msgid "The bundle uses this hash algorithm: %s"
+msgstr "Die bondel gebruik hierdie hutsalgoritme: %s"
+
+#, c-format
+msgid "The bundle uses this filter: %s"
+msgstr "Die bondel gebruik hierdie filter: %s"
+
+msgid "unable to dup bundle descriptor"
+msgstr "kan nie bondelbeskrywer dupliseer nie"
+
+msgid "Could not spawn pack-objects"
+msgstr "Kon nie pack-objects begin nie"
+
+msgid "pack-objects died"
+msgstr "pack-objects het gesterf"
+
+#, c-format
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "verwysing '%s' word deur die rev-list-opsies uitgesluit"
+
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "nie-ondersteunde bondelweergawe %d"
+
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "kan nie bondelweergawe %d met algoritme %s skryf nie"
+
+msgid "Refusing to create empty bundle."
+msgstr "Weier om leë bondel te skep."
+
+#, c-format
+msgid "cannot create '%s'"
+msgstr "kan nie '%s' skep nie"
+
+msgid "index-pack died"
+msgstr "index-pack het gesterf"
+
+#, c-format
+msgid "directory '%s' is present in index, but not sparse"
+msgstr "gids '%s' is in die indeks teenwoordig, maar nie yl nie"
+
+msgid "corrupted cache-tree has entries not present in index"
+msgstr ""
+"korrupte cache-tree het inskrywings wat nie in die indeks teenwoordig is nie"
+
+#, c-format
+msgid "%s with flags 0x%x should not be in cache-tree"
+msgstr "%s met vlae 0x%x behoort nie in cache-tree te wees nie"
+
+#, c-format
+msgid "bad subtree '%.*s'"
+msgstr "slegte subboom '%.*s'"
+
+#, c-format
+msgid "cache-tree for path %.*s does not match. Expected %s got %s"
+msgstr "cache-tree vir pad %.*s stem nie ooreen nie. Het %s verwag, %s gekry"
+
+msgid "terminating chunk id appears earlier than expected"
+msgstr "beëindigende stuk-id verskyn vroeër as verwag"
+
+#, c-format
+msgid "chunk id %<PRIx32> not %d-byte aligned"
+msgstr "stuk-id %<PRIx32> is nie %d-greep-belyn nie"
+
+#, c-format
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "onbehoorlike stukverskuiwing(s) %<PRIx64> en %<PRIx64>"
+
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "duplikaat stuk-ID %<PRIx32> gevind"
+
+#, c-format
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "finale stuk het nie-nul id %<PRIx32>"
+
+msgid "invalid hash version"
+msgstr "ongeldige hutsweergawe"
+
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr "ongeldige kleurwaarde: %.*s"
+
+msgid "Add file contents to the index"
+msgstr "Voeg lêerinhoud by die indeks"
+
+msgid "Apply a series of patches from a mailbox"
+msgstr "Pas 'n reeks lappe vanaf 'n posbus toe"
+
+msgid "Annotate file lines with commit information"
+msgstr "Annoteer lêerreëls met vasleggingsinligting"
+
+msgid "Apply a patch to files and/or to the index"
+msgstr "Pas 'n lap op lêers en/of op die indeks toe"
+
+msgid "Import a GNU Arch repository into Git"
+msgstr "Voer 'n GNU Arch-bewaarplek in Git in"
+
+msgid "Create an archive of files from a named tree"
+msgstr "Skep 'n argief van lêers uit 'n benoemde boom"
+
+msgid "Download missing objects in a partial clone"
+msgstr "Laai ontbrekende objekte in 'n gedeeltelike kloon af"
+
+msgid "Use binary search to find the commit that introduced a bug"
+msgstr ""
+"Gebruik binêre soektog om die vaslegging te vind wat 'n fout ingevoer het"
+
+msgid "Show what revision and author last modified each line of a file"
+msgstr "Wys watter revisie en outeur elke reël van 'n lêer laaste gewysig het"
+
+msgid "List, create, or delete branches"
+msgstr "Lys, skep of skrap takke"
+
+msgid "Collect information for user to file a bug report"
+msgstr "Versamel inligting sodat die gebruiker 'n foutverslag kan indien"
+
+msgid "Move objects and refs by archive"
+msgstr "Skuif objekte en verwysings per argief"
+
+msgid "Provide contents or details of repository objects"
+msgstr "Verskaf inhoud of besonderhede van bewaarplekobjekte"
+
+msgid "Display gitattributes information"
+msgstr "Vertoon gitattributes-inligting"
+
+msgid "Debug gitignore / exclude files"
+msgstr "Ontfout gitignore- / uitsluitlêers"
+
+msgid "Show canonical names and email addresses of contacts"
+msgstr "Wys kanonieke name en e-posadresse van kontakte"
+
+msgid "Ensures that a reference name is well formed"
+msgstr "Verseker dat 'n verwysingsnaam goed gevorm is"
+
+msgid "Switch branches or restore working tree files"
+msgstr "Wissel takke of herstel werkboomlêers"
+
+msgid "Copy files from the index to the working tree"
+msgstr "Kopieer lêers van die indeks na die werkboom"
+
+msgid "Find commits yet to be applied to upstream"
+msgstr "Vind vasleggings wat nog nie stroomop toegepas is nie"
+
+msgid "Apply the changes introduced by some existing commits"
+msgstr ""
+"Pas die veranderinge toe wat deur sekere bestaande vasleggings ingevoer is"
+
+msgid "Graphical alternative to git-commit"
+msgstr "Grafiese alternatief vir git-commit"
+
+msgid "Remove untracked files from the working tree"
+msgstr "Verwyder onnaspoorbare lêers uit die werkboom"
+
+msgid "Clone a repository into a new directory"
+msgstr "Kloon 'n bewaarplek na 'n nuwe gids"
+
+msgid "Display data in columns"
+msgstr "Vertoon data in kolomme"
+
+msgid "Record changes to the repository"
+msgstr "Teken veranderinge in die bewaarplek aan"
+
+msgid "Write and verify Git commit-graph files"
+msgstr "Skryf en verifieer Git commit-graph-lêers"
+
+msgid "Create a new commit object"
+msgstr "Skep 'n nuwe vasleggingsobjek"
+
+msgid "Get and set repository or global options"
+msgstr "Kry en stel bewaarplek- of globale opsies"
+
+msgid "Count unpacked number of objects and their disk consumption"
+msgstr "Tel die aantal uitgepakte objekte en hul skyfverbruik"
+
+msgid "Retrieve and store user credentials"
+msgstr "Haal en stoor gebruikersbewyse"
+
+msgid "Helper to temporarily store passwords in memory"
+msgstr "Helper om wagwoorde tydelik in geheue te stoor"
+
+msgid "Helper to store credentials on disk"
+msgstr "Hulpprogram om aanmeldbewyse op skyf te stoor"
+
+msgid "Export a single commit to a CVS checkout"
+msgstr "Voer 'n enkele vaslegging uit na 'n CVS-uitcheck"
+
+msgid "Salvage your data out of another SCM people love to hate"
+msgstr "Red jou data uit 'n ander SCM wat mense graag haat"
+
+msgid "A CVS server emulator for Git"
+msgstr "'n CVS-bedienernabootser vir Git"
+
+msgid "A really simple server for Git repositories"
+msgstr "'n Baie eenvoudige bediener vir Git-bewaarplekke"
+
+msgid "Give an object a human readable name based on an available ref"
+msgstr "Gee 'n objek 'n mensleesbare naam gebaseer op 'n beskikbare verwysing"
+
+msgid "Generate a zip archive of diagnostic information"
+msgstr "Genereer 'n zip-argief van diagnostiese inligting"
+
+msgid "Show changes between commits, commit and working tree, etc"
+msgstr "Wys veranderinge tussen vasleggings, vaslegging en werkboom, ens."
+
+msgid "Compares files in the working tree and the index"
+msgstr "Vergelyk lêers in die werkboom en die indeks"
+
+msgid "Compare a tree to the working tree or index"
+msgstr "Vergelyk 'n boom met die werkboom of indeks"
+
+msgid "Compare the content and mode of provided blob pairs"
+msgstr "Vergelyk die inhoud en modus van gegewe blob-pare"
+
+msgid "Compares the content and mode of blobs found via two tree objects"
+msgstr ""
+"Vergelyk die inhoud en modus van blobs wat via twee boomobjekte gevind is"
+
+msgid "Show changes using common diff tools"
+msgstr "Wys veranderinge met algemene verskilgereedskap"
+
+msgid "Git data exporter"
+msgstr "Git-data-uitvoerder"
+
+msgid "Backend for fast Git data importers"
+msgstr "Agterkant vir vinnige Git-data-invoerders"
+
+msgid "Download objects and refs from another repository"
+msgstr "Laai objekte en verwysings van 'n ander bewaarplek af"
+
+msgid "Receive missing objects from another repository"
+msgstr "Ontvang ontbrekende objekte van 'n ander bewaarplek"
+
+msgid "Rewrite branches"
+msgstr "Herskryf takke"
+
+msgid "Produce a merge commit message"
+msgstr "Skep 'n saamsmeltingsvasleggingsboodskap"
+
+msgid "Output information on each ref"
+msgstr "Voer inligting oor elke verwysing uit"
+
+msgid "Run a Git command on a list of repositories"
+msgstr "Voer 'n Git-opdrag op 'n lys bewaarplekke uit"
+
+msgid "Prepare patches for e-mail submission"
+msgstr "Berei lappe voor vir indiening per e-pos"
+
+msgid "EXPERIMENTAL: Pretty format revisions on demand"
+msgstr "EKSPERIMENTEEL: Formateer revisies netjies op aanvraag"
+
+msgid "Verifies the connectivity and validity of the objects in the database"
+msgstr ""
+"Verifieer die verbondenheid en geldigheid van die objekte in die databasis"
+
+msgid "Cleanup unnecessary files and optimize the local repository"
+msgstr "Ruim onnodige lêers op en optimeer die plaaslike bewaarplek"
+
+msgid "Extract commit ID from an archive created using git-archive"
+msgstr "Onttrek vasleggings-ID uit 'n argief wat met git-archive geskep is"
+
+msgid "Print lines matching a pattern"
+msgstr "Druk reëls wat by 'n patroon pas"
+
+msgid "A portable graphical interface to Git"
+msgstr "'n Draagbare grafiese koppelvlak vir Git"
+
+msgid "Compute object ID and optionally create an object from a file"
+msgstr "Bereken objek-ID en skep opsioneel 'n objek uit 'n lêer"
+
+msgid "Display help information about Git"
+msgstr "Vertoon hulpinligting oor Git"
+
+msgid "EXPERIMENTAL: Rewrite history"
+msgstr "EKSPERIMENTEEL: Herskryf geskiedenis"
+
+msgid "Run Git hooks"
+msgstr "Voer Git-hake uit"
+
+msgid "Server side implementation of Git over HTTP"
+msgstr "Bedienerkant-implementering van Git oor HTTP"
+
+msgid "Download from a remote Git repository via HTTP"
+msgstr "Laai af van 'n afgeleë Git-bewaarplek via HTTP"
+
+msgid "Push objects over HTTP/DAV to another repository"
+msgstr "Stoot objekte oor HTTP/DAV na 'n ander bewaarplek"
+
+msgid "Send a collection of patches from stdin to an IMAP folder"
+msgstr "Stuur 'n versameling lappe vanaf stdin na 'n IMAP-vouer"
+
+msgid "Build pack index file for an existing packed archive"
+msgstr "Bou pakindekslêer vir 'n bestaande gepakte argief"
+
+msgid "Create an empty Git repository or reinitialize an existing one"
+msgstr "Skep 'n leë Git-bewaarplek of herinisialiseer 'n bestaande een"
+
+msgid "Instantly browse your working repository in gitweb"
+msgstr "Blaai onmiddellik deur jou werkende bewaarplek in gitweb"
+
+msgid "Add or parse metadata in commit messages"
+msgstr "Voeg metadata in vasleggingsboodskappe by of ontleed dit"
+
+msgid "EXPERIMENTAL: Show when files were last modified"
+msgstr "EKSPERIMENTEEL: Wys wanneer lêers laas gewysig is"
+
+msgid "Show commit logs"
+msgstr "Wys vasleggingslogboeke"
+
+msgid "Show information about files in the index and the working tree"
+msgstr "Wys inligting oor lêers in die indeks en die werkboom"
+
+msgid "List references in a remote repository"
+msgstr "Lys verwysings in 'n afgeleë bewaarplek"
+
+msgid "List the contents of a tree object"
+msgstr "Lys die inhoud van 'n boomobjek"
+
+msgid "Extracts patch and authorship from a single e-mail message"
+msgstr "Onttrek lap en outeurskap uit 'n enkele e-posboodskap"
+
+msgid "Simple UNIX mbox splitter program"
+msgstr "Eenvoudige UNIX-mbox-verdeelprogram"
+
+msgid "Run tasks to optimize Git repository data"
+msgstr "Voer take uit om Git-bewaarplekdata te optimeer"
+
+msgid "Join two or more development histories together"
+msgstr "Voeg twee of meer ontwikkelingsgeskiedenisse saam"
+
+msgid "Find as good common ancestors as possible for a merge"
+msgstr "Vind so goed moontlik gemeenskaplike voorouers vir 'n saamsmelting"
+
+msgid "Run a three-way file merge"
+msgstr "Voer 'n drierigting-lêersaamsmelting uit"
+
+msgid "Run a merge for files needing merging"
+msgstr "Voer 'n saamsmelting uit vir lêers wat saamgesmelt moet word"
+
+msgid "The standard helper program to use with git-merge-index"
+msgstr "Die standaard hulpprogram om saam met git-merge-index te gebruik"
+
+msgid "Perform merge without touching index or working tree"
+msgstr "Voer saamsmelting uit sonder om indeks of werkboom aan te raak"
+
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgstr "Voer konflikoplossingsgereedskap uit om saamsmeltkonflikte op te los"
+
+msgid "Creates a tag object with extra validation"
+msgstr "Skep 'n etiketobjek met ekstra validering"
+
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr "Bou 'n boomobjek uit ls-tree-geformateerde teks"
+
+msgid "Write and verify multi-pack-indexes"
+msgstr "Skryf en verifieer multipak-indekse"
+
+msgid "Move or rename a file, a directory, or a symlink"
+msgstr "Skuif of hernoem 'n lêer, 'n gids of 'n simboliese skakel"
+
+msgid "Find symbolic names for given revs"
+msgstr "Vind simboliese name vir gegewe revisies"
+
+msgid "Add or inspect object notes"
+msgstr "Voeg objeknotas by of inspekteer dit"
+
+msgid "Import from and submit to Perforce repositories"
+msgstr "Voer in vanaf en dien in by Perforce-bewaarplekke"
+
+msgid "Create a packed archive of objects"
+msgstr "Skep 'n gepakte argief van objekte"
+
+msgid "Find redundant pack files"
+msgstr "Vind oortollige paklêers"
+
+msgid "Pack heads and tags for efficient repository access"
+msgstr "Pak koppe en etikette vir doeltreffende bewaarplektoegang"
+
+msgid "Compute unique IDs for patches"
+msgstr "Bereken unieke ID's vir lappe"
+
+msgid "Prune all unreachable objects from the object database"
+msgstr "Snoei alle onbereikbare objekte uit die objekdatabasis"
+
+msgid "Remove extra objects that are already in pack files"
+msgstr "Verwyder ekstra objekte wat reeds in paklêers is"
+
+msgid "Fetch from and integrate with another repository or a local branch"
+msgstr "Haal van en integreer met 'n ander bewaarplek of 'n plaaslike tak"
+
+msgid "Update remote refs along with associated objects"
+msgstr "Werk afgeleë verwysings saam met geassosieerde objekte by"
+
+msgid "Applies a quilt patchset onto the current branch"
+msgstr "Pas 'n quilt-lapstel op die huidige tak toe"
+
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgstr "Vergelyk twee vasleggingsreekse (bv. twee weergawes van 'n tak)"
+
+msgid "Reads tree information into the index"
+msgstr "Lees boominligting in die indeks in"
+
+msgid "Reapply commits on top of another base tip"
+msgstr "Pas vasleggings weer toe bo-op 'n ander basispunt"
+
+msgid "Receive what is pushed into the repository"
+msgstr "Ontvang wat in die bewaarplek gestoot word"
+
+msgid "Manage reflog information"
+msgstr "Bestuur reflog-inligting"
+
+msgid "Low-level access to refs"
+msgstr "Laevlak-toegang tot verwysings"
+
+msgid "Manage set of tracked repositories"
+msgstr "Bestuur stel nagespoorde bewaarplekke"
+
+msgid "Pack unpacked objects in a repository"
+msgstr "Pak ongepakte objekte in 'n bewaarplek"
+
+msgid "Create, list, delete refs to replace objects"
+msgstr "Skep, lys, skrap verwysings om objekte te vervang"
+
+msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too"
+msgstr ""
+"EKSPERIMENTEEL: Speel vasleggings oor op 'n nuwe basis, werk ook met kaal "
+"bewaarplekke"
+
+msgid "Retrieve information about the repository"
+msgstr "Verkry inligting oor die bewaarplek"
+
+msgid "Generates a summary of pending changes"
+msgstr "Genereer 'n opsomming van hangende veranderinge"
+
+msgid "Reuse recorded resolution of conflicted merges"
+msgstr "Hergebruik opgetekende oplossing van saamsmeltings met konflikte"
+
+msgid "Set `HEAD` or the index to a known state"
+msgstr "Stel `HEAD` of die indeks na 'n bekende toestand"
+
+msgid "Restore working tree files"
+msgstr "Herstel werkboomlêers"
+
+msgid "Lists commit objects in reverse chronological order"
+msgstr "Lys vasleggingsobjekte in omgekeerde chronologiese volgorde"
+
+msgid "Pick out and massage parameters"
+msgstr "Kies en bewerk parameters"
+
+msgid "Revert some existing commits"
+msgstr "Keer 'n paar bestaande vasleggings om"
+
+msgid "Remove files from the working tree and from the index"
+msgstr "Verwyder lêers uit die werkboom en uit die indeks"
+
+msgid "Send a collection of patches as emails"
+msgstr "Stuur 'n versameling lappe as e-posse"
+
+msgid "Push objects over Git protocol to another repository"
+msgstr "Stoot objekte oor die Git-protokol na 'n ander bewaarplek"
+
+msgid "Git's i18n setup code for shell scripts"
+msgstr "Git se i18n-opstelkode vir dopskripte"
+
+msgid "Common Git shell script setup code"
+msgstr "Algemene Git-dopskrip-opstelkode"
+
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "Beperkte aanmelddop vir SSH-toegang slegs vir Git"
+
+msgid "Summarize `git log` output"
+msgstr "Som `git log`-afvoer op"
+
+msgid "Show various types of objects"
+msgstr "Wys verskeie soorte objekte"
+
+msgid "Show branches and their commits"
+msgstr "Wys takke en hul vasleggings"
+
+msgid "Show packed archive index"
+msgstr "Wys gepakte argiefindeks"
+
+msgid "List references in a local repository"
+msgstr "Lys verwysings in 'n plaaslike bewaarplek"
+
+msgid "Reduce your working tree to a subset of tracked files"
+msgstr "Verminder jou werkboom tot 'n substel van nagespoorde lêers"
+
+msgid "Add file contents to the staging area"
+msgstr "Voeg lêerinhoud by die indeks"
+
+msgid "Stash the changes in a dirty working directory away"
+msgstr "Bêre die veranderinge in 'n vuil werkgids weg"
+
+msgid "Show the working tree status"
+msgstr "Wys die status van die werkboom"
+
+msgid "Remove unnecessary whitespace"
+msgstr "Verwyder onnodige witspasie"
+
+msgid "Initialize, update or inspect submodules"
+msgstr "Inisialiseer, werk by of inspekteer submodules"
+
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr "Tweerigting-werking tussen 'n Subversion-bewaarplek en Git"
+
+msgid "Switch branches"
+msgstr "Wissel takke"
+
+msgid "Read, modify and delete symbolic refs"
+msgstr "Lees, wysig en skrap simboliese verwysings"
+
+msgid "Create, list, delete or verify tags"
+msgstr "Skep, lys, skrap of verifieer etikette"
+
+msgid "Creates a temporary file with a blob's contents"
+msgstr "Skep 'n tydelike lêer met 'n blob se inhoud"
+
+msgid "Unpack objects from a packed archive"
+msgstr "Pak objekte uit 'n gepakte argief uit"
+
+msgid "Register file contents in the working tree to the index"
+msgstr "Registreer lêerinhoud in die werkboom by die indeks"
+
+msgid "Update the object name stored in a ref safely"
+msgstr "Werk die objeknaam wat in 'n verwysing gestoor is veilig by"
+
+msgid "Update auxiliary info file to help dumb servers"
+msgstr "Werk hulpinligtingslêer by om dom bedieners te help"
+
+msgid "Send archive back to git-archive"
+msgstr "Stuur argief terug na git-archive"
+
+msgid "Send objects packed back to git-fetch-pack"
+msgstr "Stuur objekte gepak terug na git-fetch-pack"
+
+msgid "Parse and extract git URL components"
+msgstr "Ontleed en onttrek Git-URL-komponente"
+
+msgid "Show a Git logical variable"
+msgstr "Wys 'n Git logiese veranderlike"
+
+msgid "Check the GPG signature of commits"
+msgstr "Kontroleer die GPG-handtekening van vasleggings"
+
+msgid "Validate packed Git archive files"
+msgstr "Valideer gepakte Git-argieflêers"
+
+msgid "Check the GPG signature of tags"
+msgstr "Kontroleer die GPG-handtekening van etikette"
+
+msgid "Display version information about Git"
+msgstr "Vertoon weergawe-inligting oor Git"
+
+msgid "Show logs with differences each commit introduces"
+msgstr "Wys logboeke met die verskille wat elke vaslegging inbring"
+
+msgid "Manage multiple working trees"
+msgstr "Bestuur meervoudige werkbome"
+
+msgid "Create a tree object from the current index"
+msgstr "Skep 'n boomobjek uit die huidige indeks"
+
+msgid "Defining attributes per path"
+msgstr "Definieer eienskappe per pad"
+
+msgid "Git command-line interface and conventions"
+msgstr "Git-opdragreëlkoppelvlak en konvensies"
+
+msgid "A Git core tutorial for developers"
+msgstr "'n Git-kerntutoriaal vir ontwikkelaars"
+
+msgid "Providing usernames and passwords to Git"
+msgstr "Verskaf gebruikersname en wagwoorde aan Git"
+
+msgid "Git for CVS users"
+msgstr "Git vir CVS-gebruikers"
+
+msgid "Git's core data model"
+msgstr "Git se kerndatamodel"
+
+msgid "Tweaking diff output"
+msgstr "Verstel verskilafvoer"
+
+msgid "A useful minimum set of commands for Everyday Git"
+msgstr "'n Nuttige minimum stel opdragte vir Alledaagse Git"
+
+msgid "Frequently asked questions about using Git"
+msgstr "Algemene vrae oor die gebruik van Git"
+
+msgid "The bundle file format"
+msgstr "Die bundellêerformaat"
+
+msgid "Chunk-based file formats"
+msgstr "Blokgebaseerde lêerformate"
+
+msgid "Git commit-graph format"
+msgstr "Git-vasleggingsgrafiekformaat"
+
+msgid "Git index format"
+msgstr "Git-indeksformaat"
+
+msgid "Git pack format"
+msgstr "Git-pakformaat"
+
+msgid "Git cryptographic signature formats"
+msgstr "Git kriptografiese handtekeningformate"
+
+msgid "A Git Glossary"
+msgstr "'n Git-woordelys"
+
+msgid "Hooks used by Git"
+msgstr "Hake wat deur Git gebruik word"
+
+msgid "Specifies intentionally untracked files to ignore"
+msgstr "Spesifiseer doelbewus onnaspoorbare lêers om te ignoreer"
+
+msgid "The Git repository browser"
+msgstr "Die Git-bewaarplekblaaier"
+
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr "Beeld outeur-/vasleggername en/of e-posadresse af"
+
+msgid "Defining submodule properties"
+msgstr "Definieer submodule-eienskappe"
+
+msgid "Git namespaces"
+msgstr "Git-naamruimtes"
+
+msgid "Protocol v0 and v1 capabilities"
+msgstr "Protokol v0- en v1-vermoëns"
+
+msgid "Things common to various protocols"
+msgstr "Dinge wat verskeie protokolle gemeen het"
+
+msgid "Git HTTP-based protocols"
+msgstr "Git HTTP-gebaseerde protokolle"
+
+msgid "How packs are transferred over-the-wire"
+msgstr "Hoe pakke oor die netwerk oorgedra word"
+
+msgid "Git Wire Protocol, Version 2"
+msgstr "Git-netwerkprotokol, weergawe 2"
+
+msgid "Helper programs to interact with remote repositories"
+msgstr "Hulpprogramme om met afgeleë bewaarplekke te werk"
+
+msgid "Git Repository Layout"
+msgstr "Git-bewaarplekuitleg"
+
+msgid "Specifying revisions and ranges for Git"
+msgstr "Spesifiseer revisies en reekse vir Git"
+
+msgid "Mounting one repository inside another"
+msgstr "Heg een bewaarplek binne 'n ander aan"
+
+msgid "A tutorial introduction to Git"
+msgstr "'n Tutoriaal-inleiding tot Git"
+
+msgid "A tutorial introduction to Git: part two"
+msgstr "'n Tutoriaal-inleiding tot Git: deel twee"
+
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Git-webkoppelvlak (webvoorkant vir Git-bewaarplekke)"
+
+msgid "An overview of recommended workflows with Git"
+msgstr "'n Oorsig van aanbevole werkvloeie met Git"
+
+msgid "A tool for managing large Git repositories"
+msgstr "'n Hulpmiddel vir die bestuur van groot Git-bewaarplekke"
+
+msgid "commit-graph file is too small"
+msgstr "commit-graph-lêer is te klein"
+
+msgid "commit-graph oid fanout chunk is wrong size"
+msgstr "commit-graph OID-waaierblok het die verkeerde grootte"
+
+msgid "commit-graph fanout values out of order"
+msgstr "commit-graph-waaierwaardes is buite volgorde"
+
+msgid "commit-graph OID lookup chunk is the wrong size"
+msgstr "commit-graph OID-opsoekblok het die verkeerde grootte"
+
+msgid "commit-graph commit data chunk is wrong size"
+msgstr "commit-graph vasleggingsdatablok het die verkeerde grootte"
+
+msgid "commit-graph generations chunk is wrong size"
+msgstr "commit-graph generasieblok het die verkeerde grootte"
+
+msgid "commit-graph changed-path index chunk is too small"
+msgstr "commit-graph veranderde-pad-indeksblok is te klein"
+
+#, c-format
+msgid ""
+"ignoring too-small changed-path chunk (%<PRIuMAX> < %<PRIuMAX>) in commit-"
+"graph file"
+msgstr ""
+"ignoreer te klein veranderde-pad-blok (%<PRIuMAX> < %<PRIuMAX>) in commit-"
+"graph-lêer"
+
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "commit-graph-handtekening %X stem nie ooreen met handtekening %X nie"
+
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "commit-graph-weergawe %X stem nie ooreen met weergawe %X nie"
+
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "commit-graph-hutsweergawe %X stem nie ooreen met weergawe %X nie"
+
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "commit-graph-lêer is te klein om %u blokke te bevat"
+
+msgid "commit-graph required OID fanout chunk missing or corrupted"
+msgstr "commit-graph vereiste OID-waaierblok ontbreek of is korrup"
+
+msgid "commit-graph required OID lookup chunk missing or corrupted"
+msgstr "commit-graph vereiste OID-opsoekblok ontbreek of is korrup"
+
+msgid "commit-graph required commit data chunk missing or corrupted"
+msgstr "commit-graph vereiste vasleggingsdatablok ontbreek of is korrup"
+
+#, c-format
+msgid ""
+"disabling Bloom filters for commit-graph layer '%s' due to incompatible "
+"settings"
+msgstr ""
+"deaktiveer Bloom-filters vir commit-graph-laag '%s' weens onversoenbare "
+"instellings"
+
+msgid "commit-graph has no base graphs chunk"
+msgstr "commit-graph het geen basisgrafiekeblok nie"
+
+msgid "commit-graph base graphs chunk is too small"
+msgstr "commit-graph basisgrafiekeblok is te klein"
+
+msgid "commit-graph chain does not match"
+msgstr "commit-graph-ketting stem nie ooreen nie"
+
+#, c-format
+msgid "commit count in base graph too high: %<PRIuMAX>"
+msgstr "aantal vasleggings in basisgrafiek te hoog: %<PRIuMAX>"
+
+msgid "commit-graph chain file too small"
+msgstr "commit-graph-kettinglêer te klein"
+
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "ongeldige commit-graph-ketting: reël '%s' is nie 'n hutswaarde nie"
+
+msgid "unable to find all commit-graph files"
+msgstr "kan nie alle commit-graph-lêers vind nie"
+
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "ongeldige vasleggingsposisie. commit-graph is waarskynlik korrup"
+
+msgid "commit-graph requires overflow generation data but has none"
+msgstr "commit-graph vereis oorloop-generasiedata maar het geen nie"
+
+msgid "commit-graph overflow generation data is too small"
+msgstr "commit-graph oorloop-generasiedata is te klein"
+
+msgid "commit-graph extra-edges pointer out of bounds"
+msgstr "commit-graph ekstra-rande-wyser buite grense"
+
+msgid "Loading known commits in commit graph"
+msgstr "Laai bekende vasleggings in vasleggingsgrafiek"
+
+msgid "Expanding reachable commits in commit graph"
+msgstr "Brei bereikbare vasleggings in vasleggingsgrafiek uit"
+
+msgid "Clearing commit marks in commit graph"
+msgstr "Maak vasleggingsmerke in vasleggingsgrafiek skoon"
+
+msgid "Computing commit graph topological levels"
+msgstr "Bereken topologiese vlakke van vasleggingsgrafiek"
+
+msgid "Computing commit graph generation numbers"
+msgstr "Bereken generasienommers van vasleggingsgrafiek"
+
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Bereken Bloom-filters vir veranderde paaie van vasleggings"
+
+msgid "Collecting referenced commits"
+msgstr "Versamel verwysde vasleggings"
+
+#, c-format
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] "Soek vasleggings vir vasleggingsgrafiek in %<PRIuMAX> pak"
+msgstr[1] "Soek vasleggings vir vasleggingsgrafiek in %<PRIuMAX> pakke"
+
+#, c-format
+msgid "error adding pack %s"
+msgstr "fout met byvoeg van pak %s"
+
+#, c-format
+msgid "error opening index for %s"
+msgstr "fout met oopmaak van indeks vir %s"
+
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Soek vasleggings vir vasleggingsgrafiek onder gepakte objekte"
+
+msgid "Finding extra edges in commit graph"
+msgstr "Soek ekstra rande in vasleggingsgrafiek"
+
+msgid "failed to write correct number of base graph ids"
+msgstr "kon nie korrekte aantal basisgrafiek-ID's skryf nie"
+
+msgid "unable to create temporary graph layer"
+msgstr "kan nie tydelike grafieklaag skep nie"
+
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "kan nie gedeelde toestemmings vir '%s' aanpas nie"
+
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] "Skryf vasleggingsgrafiek uit in %d deurgang"
+msgstr[1] "Skryf vasleggingsgrafiek uit in %d deurgange"
+
+msgid "unable to open commit-graph chain file"
+msgstr "kan nie commit-graph-kettinglêer oopmaak nie"
+
+msgid "failed to rename base commit-graph file"
+msgstr "kon nie basis-commit-graph-lêer hernoem nie"
+
+msgid "failed to rename temporary commit-graph file"
+msgstr "kon nie tydelike commit-graph-lêer hernoem nie"
+
+#, c-format
+msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits"
+msgstr "kan nie grafieke met %<PRIuMAX>, %<PRIuMAX> vasleggings saamsmelt nie"
+
+#, c-format
+msgid "cannot merge graph %s, too many commits: %<PRIuMAX>"
+msgstr "kan nie grafiek %s saamsmelt nie, te veel vasleggings: %<PRIuMAX>"
+
+msgid "Scanning merged commits"
+msgstr "Skandeer saamgesmelte vasleggings"
+
+msgid "Merging commit-graph"
+msgstr "Smelt commit-graph saam"
+
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr "probeer 'n commit-graph skryf, maar 'core.commitGraph' is gedeaktiveer"
+
+#, c-format
+msgid ""
+"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' "
+"(%d) is not supported"
+msgstr ""
+"probeer 'n commit-graph skryf, maar 'commitGraph.changedPathsVersion' (%d) "
+"word nie ondersteun nie"
+
+msgid "too many commits to write graph"
+msgstr "te veel vasleggings om grafiek te skryf"
+
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr ""
+"die commit-graph-lêer het 'n verkeerde kontrolesom en is waarskynlik korrup"
+
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "commit-graph het verkeerde OID-volgorde: %s dan %s"
+
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr "commit-graph het verkeerde waaierwaarde: fanout[%d] = %u != %u"
+
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "kon nie vaslegging %s uit commit-graph ontleed nie"
+
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr "kon nie vaslegging %s uit objekdatabasis vir commit-graph ontleed nie"
+
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr "wortelboom-OID vir vaslegging %s in commit-graph is %s != %s"
+
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "commit-graph-ouerlys vir vaslegging %s is te lank"
+
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "commit-graph-ouer vir %s is %s != %s"
+
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "commit-graph-ouerlys vir vaslegging %s eindig te vroeg"
+
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr "commit-graph-generasie vir vaslegging %s is %<PRIuMAX> < %<PRIuMAX>"
+
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+"vasleggingsdatum vir vaslegging %s in commit-graph is %<PRIuMAX> != "
+"%<PRIuMAX>"
+
+#, c-format
+msgid ""
+"commit-graph has both zero and non-zero generations (e.g., commits '%s' and "
+"'%s')"
+msgstr ""
+"commit-graph het sowel nul- as nie-nul-generasies (bv. vasleggings '%s' en "
+"'%s')"
+
+msgid "Verifying commits in commit graph"
+msgstr "Verifieer vasleggings in vasleggingsgrafiek"
+
+#, c-format
+msgid "could not parse commit %s"
+msgstr "kon nie vaslegging %s ontleed nie"
+
+msgid "commit ancestry contains a cycle"
+msgstr "vasleggingsafkoms bevat 'n siklus"
+
+msgid "failed to check reachability"
+msgstr "kon nie bereikbaarheid nagaan nie"
+
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "objek %s is 'n %s, nie 'n %s nie"
+
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s is nie 'n vaslegging nie!"
+
+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 set advice.graftFileDeprecated false\""
+msgstr ""
+"Ondersteuning vir <GIT_DIR>/info/grafts is verouderd\n"
+"en sal in 'n toekomstige Git-weergawe verwyder word.\n"
+"\n"
+"Gebruik asseblief \"git replace --convert-graft-file\"\n"
+"om die entings na vervangingsverwysings om te skakel.\n"
+"\n"
+"Skakel hierdie boodskap af deur die volgende uit te voer:\n"
+"\"git config set advice.graftFileDeprecated false\""
+
+#, c-format
+msgid "commit %s exists in commit-graph but not in the object database"
+msgstr ""
+"vaslegging %s bestaan in commit-graph maar nie in die objekdatabasis nie"
+
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr "Vaslegging %s het 'n onvertroude GPG-handtekening, kwansuis deur %s."
+
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "Vaslegging %s het 'n slegte GPG-handtekening, kwansuis deur %s."
+
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Vaslegging %s het nie 'n GPG-handtekening nie."
+
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "Vaslegging %s het 'n goeie GPG-handtekening deur %s\n"
+
+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 ""
+"Waarskuwing: vasleggingsboodskap voldoen nie aan UTF-8 nie.\n"
+"Jy wil dit dalk wysig nadat jy die boodskap reggemaak het, of die\n"
+"konfigurasieveranderlike i18n.commitEncoding stel na die enkodering\n"
+"wat jou projek gebruik.\n"
+
+msgid "no compiler information available\n"
+msgstr "geen samestellerinligting beskikbaar nie\n"
+
+msgid "no libc information available\n"
+msgstr "geen libc-inligting beskikbaar nie\n"
+
+#, c-format
+msgid "could not determine free disk size for '%s'"
+msgstr "kon nie vrye skyfruimte vir '%s' bepaal nie"
+
+#, c-format
+msgid "could not get info for '%s'"
+msgstr "kon nie inligting vir '%s' kry nie"
+
+#, c-format
+msgid "[GLE %ld] health thread could not open '%ls'"
+msgstr "[GLE %ld] gesondheidsdraad kon nie '%ls' oopmaak nie"
+
+#, c-format
+msgid "[GLE %ld] health thread getting BHFI for '%ls'"
+msgstr "[GLE %ld] gesondheidsdraad kry BHFI vir '%ls'"
+
+#, c-format
+msgid "could not convert to wide characters: '%s'"
+msgstr "kon nie na wye karakters omskakel nie: '%s'"
+
+#, c-format
+msgid "BHFI changed '%ls'"
+msgstr "BHFI het '%ls' verander"
+
+#, c-format
+msgid "unhandled case in 'has_worktree_moved': %d"
+msgstr "onbehandelde geval in 'has_worktree_moved': %d"
+
+#, c-format
+msgid "health thread wait failed [GLE %ld]"
+msgstr "wag van gesondheidsdraad het misluk [GLE %ld]"
+
+#, c-format
+msgid "Invalid path: %s"
+msgstr "Ongeldige pad: %s"
+
+msgid "Unable to create FSEventStream."
+msgstr "Kan nie FSEventStream skep nie."
+
+msgid "Failed to start the FSEventStream"
+msgstr "Kon nie die FSEventStream begin nie"
+
+msgid "inotify watch limit reached; increase fs.inotify.max_user_watches"
+msgstr "inotify-waglimiet bereik; verhoog fs.inotify.max_user_watches"
+
+#, c-format
+msgid "inotify_add_watch('%s') failed"
+msgstr "inotify_add_watch('%s') het misluk"
+
+msgid "inotify_rm_watch() failed"
+msgstr "inotify_rm_watch() het misluk"
+
+#, c-format
+msgid "opendir('%s') failed"
+msgstr "opendir('%s') het misluk"
+
+#, c-format
+msgid "lstat('%s') failed"
+msgstr "lstat('%s') het misluk"
+
+#, c-format
+msgid "closedir('%s') failed"
+msgstr "closedir('%s') het misluk"
+
+msgid "inotify_init1() failed"
+msgstr "inotify_init1() het misluk"
+
+msgid "closing inotify file descriptor failed"
+msgstr "sluit van inotify-lêerbeskrywer het misluk"
+
+msgid "reading inotify message stream failed"
+msgstr "lees van inotify-boodskapstroom het misluk"
+
+msgid "polling inotify message stream failed"
+msgstr "peiling van inotify-boodskapstroom het misluk"
+
+#, c-format
+msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'"
+msgstr "[GLE %ld] kon nie pad na UTF-8 omskakel nie: '%.*ls'"
+
+#, c-format
+msgid "[GLE %ld] could not watch '%s'"
+msgstr "[GLE %ld] kon nie '%s' dophou nie"
+
+#, c-format
+msgid "[GLE %ld] could not get longname of '%s'"
+msgstr "[GLE %ld] kon nie lang naam van '%s' kry nie"
+
+#, c-format
+msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]"
+msgstr "ReadDirectoryChangedW het misluk op '%s' [GLE %ld]"
+
+#, c-format
+msgid "GetOverlappedResult failed on '%s' [GLE %ld]"
+msgstr "GetOverlappedResult het misluk op '%s' [GLE %ld]"
+
+#, c-format
+msgid "could not read directory changes [GLE %ld]"
+msgstr "kon nie gidsveranderinge lees nie [GLE %ld]"
+
+#, c-format
+msgid "strbuf_readlink('%s') failed"
+msgstr "strbuf_readlink('%s') het misluk"
+
+#, c-format
+msgid "[GLE %ld] unable to open for read '%ls'"
+msgstr "[GLE %ld] kan nie '%ls' oopmaak om te lees nie"
+
+#, c-format
+msgid "[GLE %ld] unable to get protocol information for '%ls'"
+msgstr "[GLE %ld] kan nie protokolinligting vir '%ls' kry nie"
+
+#, c-format
+msgid "failed to copy SID (%ld)"
+msgstr "kon nie SID kopieer nie (%ld)"
+
+#, c-format
+msgid "failed to get owner for '%s' (%ld)"
+msgstr "kon nie eienaar vir '%s' kry nie (%ld)"
+
+msgid "memory exhausted"
+msgstr "geheue uitgeput"
+
+msgid "Success"
+msgstr "Sukses"
+
+msgid "No match"
+msgstr "Geen passing nie"
+
+msgid "Invalid regular expression"
+msgstr "Ongeldige gereelde uitdrukking"
+
+msgid "Invalid collation character"
+msgstr "Ongeldige sorteerkarakter"
+
+msgid "Invalid character class name"
+msgstr "Ongeldige karakterklasnaam"
+
+msgid "Trailing backslash"
+msgstr "Agterste trugstreep"
+
+msgid "Invalid back reference"
+msgstr "Ongeldige terugverwysing"
+
+msgid "Unmatched [ or [^"
+msgstr "Ongepaarde [ of [^"
+
+msgid "Unmatched ( or \\("
+msgstr "Ongepaarde ( of \\("
+
+msgid "Unmatched \\{"
+msgstr "Ongepaarde \\{"
+
+msgid "Invalid content of \\{\\}"
+msgstr "Ongeldige inhoud van \\{\\}"
+
+msgid "Invalid range end"
+msgstr "Ongeldige reekseinde"
+
+msgid "Memory exhausted"
+msgstr "Geheue uitgeput"
+
+msgid "Invalid preceding regular expression"
+msgstr "Ongeldige voorafgaande gereelde uitdrukking"
+
+msgid "Premature end of regular expression"
+msgstr "Voortydige einde van gereelde uitdrukking"
+
+msgid "Regular expression too big"
+msgstr "Gereelde uitdrukking te groot"
+
+msgid "Unmatched ) or \\)"
+msgstr "Ongepaarde ) of \\)"
+
+msgid "No previous regular expression"
+msgstr "Geen vorige gereelde uitdrukking nie"
+
+msgid "could not send IPC command"
+msgstr "kon nie IPC-opdrag stuur nie"
+
+msgid "could not read IPC response"
+msgstr "kon nie IPC-antwoord lees nie"
+
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "kon nie accept_thread '%s' begin nie"
+
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr "kon nie worker[0] vir '%s' begin nie"
+
+#, c-format
+msgid "ConnectNamedPipe failed for '%s' (%lu)"
+msgstr "ConnectNamedPipe het misluk vir '%s' (%lu)"
+
+#, c-format
+msgid "could not create fd from pipe for '%s'"
+msgstr "kon nie fd uit pyp vir '%s' skep nie"
+
+#, c-format
+msgid "could not start thread[0] for '%s'"
+msgstr "kon nie thread[0] vir '%s' begin nie"
+
+#, c-format
+msgid "wait for hEvent failed for '%s'"
+msgstr "wag vir hEvent het misluk vir '%s'"
+
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr ""
+"kan nie in die agtergrond hervat nie, gebruik asseblief 'fg' om te hervat"
+
+msgid "cannot restore terminal settings"
+msgstr "kan nie terminaalinstellings herstel nie"
+
+#, 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 ""
+"maksimum insluitdiepte (%d) oorskry tydens insluiting van\n"
+"\t%s\n"
+"vanaf\n"
+"\t%s\n"
+"Dit kan weens sirkulêre insluitings wees."
+
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "kon nie insluitpad '%s' uitbrei nie"
+
+msgid "relative config includes must come from files"
+msgstr "relatiewe konfigurasie-insluitings moet van lêers kom"
+
+msgid "relative config include conditionals must come from files"
+msgstr "relatiewe voorwaardelike konfigurasie-insluitings moet van lêers kom"
+
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"afgeleë URL's kan nie gekonfigureer word in 'n lêer wat direk of indirek "
+"ingesluit is deur includeIf.hasconfig:remote.*.url nie"
+
+#, c-format
+msgid "invalid config format: %s"
+msgstr "ongeldige konfigurasieformaat: %s"
+
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "ontbrekende omgewingsveranderlike-naam vir konfigurasie '%.*s'"
+
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "ontbrekende omgewingsveranderlike '%s' vir konfigurasie '%.*s'"
+
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "sleutel bevat nie 'n afdeling nie: %s"
+
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "sleutel bevat nie 'n veranderlikenaam nie: %s"
+
+#, c-format
+msgid "invalid key: %s"
+msgstr "ongeldige sleutel: %s"
+
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "ongeldige sleutel (nuwe reël): %s"
+
+msgid "empty config key"
+msgstr "leë konfigurasiesleutel"
+
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "vals konfigurasieparameter: %s"
+
+#, c-format
+msgid "bogus format in %s"
+msgstr "vals formaat in %s"
+
+#, c-format
+msgid "bogus count in %s"
+msgstr "vals telling in %s"
+
+#, c-format
+msgid "too many entries in %s"
+msgstr "te veel inskrywings in %s"
+
+#, c-format
+msgid "missing config key %s"
+msgstr "ontbrekende konfigurasiesleutel %s"
+
+#, c-format
+msgid "missing config value %s"
+msgstr "ontbrekende konfigurasiewaarde %s"
+
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "slegte konfigurasiereël %d in blob %s"
+
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "slegte konfigurasiereël %d in lêer %s"
+
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "slegte konfigurasiereël %d in standaardinvoer"
+
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "slegte konfigurasiereël %d in submodule-blob %s"
+
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "slegte konfigurasiereël %d in opdragreël %s"
+
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "slegte konfigurasiereël %d in %s"
+
+msgid "out of range"
+msgstr "buite bereik"
+
+msgid "invalid unit"
+msgstr "ongeldige eenheid"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "slegte numeriese konfigurasiewaarde '%s' vir '%s': %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "slegte numeriese konfigurasiewaarde '%s' vir '%s' in blob %s: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "slegte numeriese konfigurasiewaarde '%s' vir '%s' in lêer %s: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr ""
+"slegte numeriese konfigurasiewaarde '%s' vir '%s' in standaardinvoer: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr ""
+"slegte numeriese konfigurasiewaarde '%s' vir '%s' in submodule-blob %s: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr "slegte numeriese konfigurasiewaarde '%s' vir '%s' in opdragreël %s: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "slegte numeriese konfigurasiewaarde '%s' vir '%s' in %s: %s"
+
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "kon nie gebruikersgids uitbrei nie in: '%s'"
+
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%s' vir '%s' is nie 'n geldige tydstempel nie"
+
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "kan nie konfigurasie-blob-objek '%s' laai nie"
+
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "verwysing '%s' wys nie na 'n blob nie"
+
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "kan nie konfigurasie-blob '%s' oplos nie"
+
+msgid "unable to parse command-line config"
+msgstr "kan nie opdragreël-konfigurasie ontleed nie"
+
+#, c-format
+msgid ""
+"\n"
+"To use the default comment string (#) please run\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"Om die verstek-kommentaarstring (#) te gebruik, voer asseblief uit\n"
+"\n"
+"%s"
+
+msgid "<comment string>"
+msgstr "<kommentaarstring>"
+
+#, c-format
+msgid ""
+"\n"
+"To set a custom comment string please run\n"
+"\n"
+"%s\n"
+"where '%s' is the string you wish to use.\n"
+msgstr ""
+"\n"
+"Om 'n pasgemaakte kommentaarstring te stel, voer asseblief uit\n"
+"\n"
+"%s\n"
+"waar '%s' die string is wat jy wil gebruik.\n"
+
+#, c-format
+msgid "Support for '%s=auto' has been removed in Git 3.0"
+msgstr "Ondersteuning vir '%s=auto' is in Git 3.0 verwyder"
+
+#, c-format
+msgid "Support for '%s=auto' is deprecated and will be removed in Git 3.0"
+msgstr ""
+"Ondersteuning vir '%s=auto' is verouderd en sal in Git 3.0 verwyder word"
+
+msgid "unknown error occurred while reading the configuration files"
+msgstr "onbekende fout het voorgekom tydens die lees van die konfigurasielêers"
+
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "Ongeldige %s: '%s'"
+
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr "splitIndex.maxPercentChange-waarde '%d' moet tussen 0 en 100 wees"
+
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "kan nie '%s' uit opdragreël-konfigurasie ontleed nie"
+
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "slegte konfigurasieveranderlike '%s' in lêer '%s' op reël %d"
+
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "ongeldige afdelingnaam '%s'"
+
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s het meervoudige waardes"
+
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "kon nie nuwe konfigurasielêer %s skryf nie"
+
+#, c-format
+msgid "no multi-line comment allowed: '%s'"
+msgstr "geen meerreëlige kommentaar toegelaat nie: '%s'"
+
+#, c-format
+msgid "could not lock config file %s"
+msgstr "kon nie konfigurasielêer %s sluit nie"
+
+#, c-format
+msgid "opening %s"
+msgstr "maak %s oop"
+
+#, c-format
+msgid "invalid config file %s"
+msgstr "ongeldige konfigurasielêer %s"
+
+#, c-format
+msgid "fstat on %s failed"
+msgstr "fstat op %s het misluk"
+
+#, c-format
+msgid "unable to mmap '%s'%s"
+msgstr "kan nie '%s'%s mmap nie"
+
+#, c-format
+msgid "chmod on %s failed"
+msgstr "chmod op %s het misluk"
+
+#, c-format
+msgid "could not write config file %s"
+msgstr "kon nie konfigurasielêer %s skryf nie"
+
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "kon nie '%s' op '%s' stel nie"
+
+#, c-format
+msgid "invalid section name: %s"
+msgstr "ongeldige afdelingnaam: %s"
+
+#, c-format
+msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>"
+msgstr "weier om met oormatig lang reël in '%s' op reël %<PRIuMAX> te werk"
+
+#, c-format
+msgid "missing value for '%s'"
+msgstr "ontbrekende waarde vir '%s'"
+
+msgid "the remote end hung up upon initial contact"
+msgstr "die afgeleë kant het met die eerste kontak afgehaak"
+
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"Kon nie van afgeleë bewaarplek lees nie.\n"
+"\n"
+"Maak asseblief seker dat u die korrekte toegangsregte het\n"
+"en dat die bewaarplek bestaan."
+
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "bediener ondersteun nie '%s' nie"
+
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "bediener ondersteun nie funksie '%s' nie"
+
+msgid "expected flush after capabilities"
+msgstr "het 'flush' ná vermoëns verwag"
+
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "ignoreer vermoëns ná eerste reël '%s'"
+
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "protokolfout: onverwagte capabilities^{}"
+
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr "protokolfout: het vlak sha-1 verwag, het '%s' gekry"
+
+msgid "repository on the other end cannot be shallow"
+msgstr "bewaarplek aan die ander kant kan nie vlak wees nie"
+
+msgid "invalid packet"
+msgstr "ongeldige pakkie"
+
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "protokolfout: onverwagte '%s'"
+
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "onbekende objekformaat '%s' deur bediener gespesifiseer"
+
+#, c-format
+msgid "error on bundle-uri response line %d: %s"
+msgstr "fout op bundle-uri-antwoordreël %d: %s"
+
+msgid "expected flush after bundle-uri listing"
+msgstr "het 'flush' ná bundle-uri-lys verwag"
+
+msgid "expected response end packet after ref listing"
+msgstr "het antwoord-eindpakkie ná verwysingslys verwag"
+
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "ongeldige ls-refs-antwoord: %s"
+
+msgid "expected flush after ref listing"
+msgstr "het 'flush' ná verwysingslys verwag"
+
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "algoritmes stem nie ooreen nie: kliënt %s; bediener %s"
+
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "die bediener ondersteun nie algoritme '%s' nie"
+
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "kan nie SO_KEEPALIVE op sok stel nie"
+
+#, c-format
+msgid "Looking up %s ... "
+msgstr "Soek %s op ... "
+
+#, c-format
+msgid "unable to look up %s (port %s) (%s)"
+msgstr "kan nie %s (poort %s) (%s) opsoek nie"
+
+#. TRANSLATORS: this is the end of "Looking up %s ... "
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"klaar.\n"
+"Verbind met %s (poort %s) ... "
+
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"kan nie met %s verbind nie:\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+msgid "done."
+msgstr "klaar."
+
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "kan nie %s (%s) opsoek nie"
+
+#, c-format
+msgid "unknown port %s"
+msgstr "onbekende poort %s"
+
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "vreemde gasheernaam '%s' geblokkeer"
+
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "vreemde poort '%s' geblokkeer"
+
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "kan nie instaanbediener %s begin nie"
+
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "protokol '%s' word nie ondersteun nie"
+
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr ""
+"geen pad gespesifiseer nie; sien 'git help pull' vir geldige URL-sintaksis"
+
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "nuwe reël is verbode in git://-gashere en bewaarplekpaaie"
+
+msgid "ssh variant 'simple' does not support -4"
+msgstr "ssh-variant 'simple' ondersteun nie -4 nie"
+
+msgid "ssh variant 'simple' does not support -6"
+msgstr "ssh-variant 'simple' ondersteun nie -6 nie"
+
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "ssh-variant 'simple' ondersteun nie die stel van 'n poort nie"
+
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "vreemde padnaam '%s' geblokkeer"
+
+msgid "unable to fork"
+msgstr "kan nie vurk nie"
+
+msgid "Could not run 'git rev-list'"
+msgstr "Kon nie 'git rev-list' uitvoer nie"
+
+msgid "failed write to rev-list"
+msgstr "kon nie na rev-list skryf nie"
+
+msgid "failed to close rev-list's stdin"
+msgstr "kon nie rev-list se stdin sluit nie"
+
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr "ongeldige crlf_action %d"
+
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "CRLF sou deur LF vervang word in %s"
+
+#, c-format
+msgid ""
+"in the working copy of '%s', CRLF will be replaced by LF the next time Git "
+"touches it"
+msgstr ""
+"in die werkkopie van '%s' sal CRLF deur LF vervang word die volgende keer "
+"dat Git dit aanraak"
+
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF sou deur CRLF vervang word in %s"
+
+#, c-format
+msgid ""
+"in the working copy of '%s', LF will be replaced by CRLF the next time Git "
+"touches it"
+msgstr ""
+"in die werkkopie van '%s' sal LF deur CRLF vervang word die volgende keer "
+"dat Git dit aanraak"
+
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "BOM is verbode in '%s' indien as %s geënkodeer"
+
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr ""
+"Die lêer '%s' bevat 'n greepvolgordemerk (BOM). Gebruik asseblief UTF-%.*s "
+"as working-tree-encoding."
+
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "BOM word vereis in '%s' indien as %s geënkodeer"
+
+#, 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 ""
+"Die lêer '%s' het nie 'n greepvolgordemerk (BOM) nie. Gebruik asseblief UTF-"
+"%sBE of UTF-%sLE (afhangend van die greepvolgorde) as working-tree-encoding."
+
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "kon nie '%s' van %s na %s enkodeer nie"
+
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr "enkodering van '%s' van %s na %s en terug is nie dieselfde nie"
+
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "kan nie vurk om eksterne filter '%s' uit te voer nie"
+
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr "kan nie die invoer aan eksterne filter '%s' voer nie"
+
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "eksterne filter '%s' het misluk %d"
+
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr "lees vanaf eksterne filter '%s' het misluk"
+
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "eksterne filter '%s' het misluk"
+
+msgid "unexpected filter type"
+msgstr "onverwagte filtertipe"
+
+msgid "path name too long for external filter"
+msgstr "padnaam te lank vir eksterne filter"
+
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+"eksterne filter '%s' is nie meer beskikbaar nie, hoewel nog nie alle paaie "
+"gefiltreer is nie"
+
+msgid "true/false are no valid working-tree-encodings"
+msgstr "true/false is nie geldige working-tree-encodings nie"
+
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr "%s: clean-filter '%s' het misluk"
+
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s: smudge-filter %s het misluk"
+
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "slaan opsoek van geloofsbriewe oor vir sleutel: credential.%s"
+
+msgid "refusing to work with credential missing host field"
+msgstr "weier om te werk met geloofsbrief sonder gasheerveld"
+
+msgid "refusing to work with credential missing protocol field"
+msgstr "weier om te werk met geloofsbrief sonder protokolveld"
+
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "URL bevat 'n nuwe reël in sy %s-komponent: %s"
+
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "URL het geen skema nie: %s"
+
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "geloofsbrief-URL kan nie ontleed word nie: %s"
+
+#, c-format
+msgid "invalid timeout '%s', expecting a non-negative integer"
+msgstr "ongeldige timeout '%s', verwag 'n nie-negatiewe heelgetal"
+
+#, c-format
+msgid "invalid init-timeout '%s', expecting a non-negative integer"
+msgstr "ongeldige init-timeout '%s', verwag 'n nie-negatiewe heelgetal"
+
+#, c-format
+msgid "invalid max-connections '%s', expecting an integer"
+msgstr "ongeldige max-connections '%s', verwag 'n heelgetal"
+
+msgid "in the future"
+msgstr "in die toekoms"
+
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> sekonde gelede"
+msgstr[1] "%<PRIuMAX> sekondes gelede"
+
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> minuut gelede"
+msgstr[1] "%<PRIuMAX> minute gelede"
+
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> uur gelede"
+msgstr[1] "%<PRIuMAX> uur gelede"
+
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> dag gelede"
+msgstr[1] "%<PRIuMAX> dae gelede"
+
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> week gelede"
+msgstr[1] "%<PRIuMAX> weke gelede"
+
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX> maand gelede"
+msgstr[1] "%<PRIuMAX> maande gelede"
+
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> jaar"
+msgstr[1] "%<PRIuMAX> jaar"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s, %<PRIuMAX> maand gelede"
+msgstr[1] "%s, %<PRIuMAX> maande gelede"
+
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> jaar gelede"
+msgstr[1] "%<PRIuMAX> jaar gelede"
+
+msgid "Propagating island marks"
+msgstr "Versprei eilandmerke"
+
+#, c-format
+msgid "bad tree object %s"
+msgstr "slegte boomobjek %s"
+
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr "kon nie eiland-regex vir '%s' laai nie: %s"
+
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr "eiland-regex uit konfigurasie het te veel vanggroepe (maks=%d)"
+
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr "%d eilande gemerk, klaar.\n"
+
+#, c-format
+msgid "invalid --%s value '%s'"
+msgstr "ongeldige --%s-waarde '%s'"
+
+#, c-format
+msgid "could not archive missing directory '%s'"
+msgstr "kon nie ontbrekende gids '%s' argiveer nie"
+
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "kon nie gids '%s' oopmaak nie"
+
+#, c-format
+msgid "skipping '%s', which is neither file nor directory"
+msgstr "slaan '%s' oor, wat nóg 'n lêer nóg 'n gids is"
+
+#, c-format
+msgid "could not add directory '%s' to archiver"
+msgstr "kon nie gids '%s' by argiveerder voeg nie"
+
+msgid "failed to write archive"
+msgstr "kon nie argief skryf nie"
+
+msgid "max-depth is not supported for worktree diffs"
+msgstr "max-depth word nie vir werkboomverskille ondersteun nie"
+
+msgid "max-depth is not supported for index diffs"
+msgstr "max-depth word nie vir indeksverskille ondersteun nie"
+
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base werk nie met reekse nie"
+
+msgid "unable to get HEAD"
+msgstr "kan nie HEAD kry nie"
+
+msgid "no merge base found"
+msgstr "geen saamsmeltbasis gevind nie"
+
+msgid "multiple merge bases found"
+msgstr "veelvuldige saamsmeltbasisse gevind"
+
+msgid "cannot compare stdin to a directory"
+msgstr "kan nie stdin met 'n gids vergelyk nie"
+
+msgid "cannot compare a named pipe to a directory"
+msgstr "kan nie 'n benoemde pyp met 'n gids vergelyk nie"
+
+msgid "git diff --no-index [<options>] <path> <path> [<pathspec>...]"
+msgstr "git diff --no-index [<opsies>] <pad> <pad> [<padspesifikasie>...]"
+
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"Nie 'n Git-bewaarplek nie. Gebruik --no-index om twee paaie buite 'n "
+"werkboom te vergelyk"
+
+msgid ""
+"Limiting comparison with pathspecs is only supported if both paths are "
+"directories."
+msgstr ""
+"Die beperking van vergelyking met padspesifikasies word slegs ondersteun as "
+"albei paaie gidse is."
+
+#, c-format
+msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr "  Kon nie dirstat-afsnypersentasie '%s' ontleed nie\n"
+
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  Onbekende dirstat-parameter '%s'\n"
+
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"color moved-instelling moet een wees van 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+
+#, 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 ""
+"onbekende color-moved-ws-modus '%s', moontlike waardes is 'ignore-space-"
+"change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
+"change'"
+
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr ""
+"color-moved-ws: allow-indentation-change kan nie met ander witspasiemodusse "
+"gekombineer word nie"
+
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "Onbekende waarde vir 'diff.submodule'-konfigurasieveranderlike: '%s'"
+
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"Foute gevind in 'diff.dirstat'-konfigurasieveranderlike:\n"
+"%s"
+
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "eksterne diff het gesterf, stop by %s"
+
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow vereis presies een padspesifikasie"
+
+#, c-format
+msgid "pathspec magic not supported by --follow: %s"
+msgstr "padspesifikasie-magie word nie deur --follow ondersteun nie: %s"
+
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "opsies '%s', '%s', '%s' en '%s' kan nie saam gebruik word nie"
+
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr ""
+"opsies '%s' en '%s' kan nie saam gebruik word nie, gebruik '%s' met '%s'"
+
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr ""
+"opsies '%s' en '%s' kan nie saam gebruik word nie, gebruik '%s' met '%s' en "
+"'%s'"
+
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "ongeldige waarde --stat: %s"
+
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s verwag 'n numeriese waarde"
+
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"Kon nie --dirstat/-X-opsieparameter ontleed nie:\n"
+"%s"
+
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "onbekende veranderingsklas '%c' in --diff-filter=%s"
+
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "onbekende waarde ná ws-error-highlight=%.*s"
+
+msgid "--find-object requires a git repository"
+msgstr "--find-object vereis 'n Git-bewaarplek"
+
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "kan nie '%s' oplos nie"
+
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s verwag <n>/<m>-vorm"
+
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s verwag 'n karakter, het '%s' gekry"
+
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "slegte argument --color-moved: %s"
+
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "ongeldige modus '%s' in --color-moved-ws"
+
+#, c-format
+msgid "invalid argument to %s"
+msgstr "ongeldige argument vir %s"
+
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "ongeldige regex aan -I gegee: '%s'"
+
+msgid "-G requires a non-empty argument"
+msgstr "-G vereis 'n nie-leë argument"
+
+msgid "-S requires a non-empty argument"
+msgstr "-S vereis 'n nie-leë argument"
+
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "kon nie opsieparameter --submodule ontleed nie: '%s'"
+
+#, c-format
+msgid "%s expects a non-negative integer"
+msgstr "%s verwag 'n nie-negatiewe heelgetal"
+
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "slegte argument --word-diff: %s"
+
+msgid "Diff output format options"
+msgstr "Opsies vir verskil-afvoerformaat"
+
+msgid "generate patch"
+msgstr "genereer lap"
+
+msgid "<n>"
+msgstr "<n>"
+
+msgid "generate diffs with <n> lines context"
+msgstr "genereer verskille met <n> reëls konteks"
+
+msgid "generate the diff in raw format"
+msgstr "genereer die verskil in rou formaat"
+
+msgid "synonym for '-p --raw'"
+msgstr "sinoniem vir '-p --raw'"
+
+msgid "synonym for '-p --stat'"
+msgstr "sinoniem vir '-p --stat'"
+
+msgid "machine friendly --stat"
+msgstr "masjienvriendelike --stat"
+
+msgid "output only the last line of --stat"
+msgstr "voer slegs die laaste reël van --stat uit"
+
+msgid "<param1>,<param2>..."
+msgstr "<param1>,<param2>..."
+
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr ""
+"voer die verspreiding van die relatiewe hoeveelheid veranderinge vir elke "
+"subgids uit"
+
+msgid "synonym for --dirstat=cumulative"
+msgstr "sinoniem vir --dirstat=cumulative"
+
+msgid "synonym for --dirstat=files,<param1>,<param2>..."
+msgstr "sinoniem vir --dirstat=files,<param1>,<param2>..."
+
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr "waarsku as veranderinge konflikmerkers of witspasiefoute inbring"
+
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr "beknopte opsomming soos skeppings, hernoemings en modusveranderinge"
+
+msgid "show only names of changed files"
+msgstr "wys slegs name van veranderde lêers"
+
+msgid "show only names and status of changed files"
+msgstr "wys slegs name en status van veranderde lêers"
+
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<breedte>[,<naambreedte>[,<aantal>]]"
+
+msgid "generate diffstat"
+msgstr "genereer diffstat"
+
+msgid "<width>"
+msgstr "<breedte>"
+
+msgid "generate diffstat with a given width"
+msgstr "genereer diffstat met 'n gegewe breedte"
+
+msgid "generate diffstat with a given name width"
+msgstr "genereer diffstat met 'n gegewe naambreedte"
+
+msgid "generate diffstat with a given graph width"
+msgstr "genereer diffstat met 'n gegewe grafiekbreedte"
+
+msgid "<count>"
+msgstr "<aantal>"
+
+msgid "generate diffstat with limited lines"
+msgstr "genereer diffstat met beperkte reëls"
+
+msgid "generate compact summary in diffstat"
+msgstr "genereer kompakte opsomming in diffstat"
+
+msgid "output a binary diff that can be applied"
+msgstr "voer 'n binêre verskil uit wat toegepas kan word"
+
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr "wys volledige voor- en na-beeld-objekname op die \"index\"-reëls"
+
+msgid "show colored diff"
+msgstr "wys gekleurde verskil"
+
+msgid "<kind>"
+msgstr "<soort>"
+
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+"lig witspasiefoute uit in die 'context'-, 'old'- of 'new'-reëls in die "
+"verskil"
+
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"moenie padname verander nie en gebruik NUL's as afvoerveldafsluiters in --"
+"raw of --numstat"
+
+msgid "<prefix>"
+msgstr "<voorvoegsel>"
+
+msgid "show the given source prefix instead of \"a/\""
+msgstr "wys die gegewe bronvoorvoegsel in plaas van \"a/\""
+
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "wys die gegewe bestemmingsvoorvoegsel in plaas van \"b/\""
+
+msgid "prepend an additional prefix to every line of output"
+msgstr "voeg 'n bykomende voorvoegsel voor elke afvoerreël"
+
+msgid "do not show any source or destination prefix"
+msgstr "moenie enige bron- of bestemmingsvoorvoegsel wys nie"
+
+msgid "use default prefixes a/ and b/"
+msgstr "gebruik verstekvoorvoegsels a/ en b/"
+
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr "wys konteks tussen verskilbrokke tot die gespesifiseerde aantal reëls"
+
+msgid "<char>"
+msgstr "<karakter>"
+
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "spesifiseer die karakter om 'n nuwe reël aan te dui in plaas van '+'"
+
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "spesifiseer die karakter om 'n ou reël aan te dui in plaas van '-'"
+
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "spesifiseer die karakter om konteks aan te dui in plaas van ' '"
+
+msgid "Diff rename options"
+msgstr "Opsies vir verskil-hernoeming"
+
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr ""
+"breek volledige herskryfveranderinge op in pare van skrapping en skepping"
+
+msgid "detect renames"
+msgstr "bespeur hernoemings"
+
+msgid "omit the preimage for deletes"
+msgstr "laat die voor-beeld vir skrappings weg"
+
+msgid "detect copies"
+msgstr "bespeur kopieë"
+
+msgid "use unmodified files as source to find copies"
+msgstr "gebruik onveranderde lêers as bron om kopieë te vind"
+
+msgid "disable rename detection"
+msgstr "deaktiveer hernoemingsbespeuring"
+
+msgid "use empty blobs as rename source"
+msgstr "gebruik leë blobs as hernoemingsbron"
+
+msgid "continue listing the history of a file beyond renames"
+msgstr "gaan voort om die geskiedenis van 'n lêer verby hernoemings te lys"
+
+msgid ""
+"limit to cheap rename/copy detection if the number of rename/copy targets "
+"exceeds this value"
+msgstr ""
+"beperk tot goedkoop hernoem-/kopieerbespeuring as die aantal hernoem-/"
+"kopieerteikens hierdie waarde oorskry"
+
+msgid "Diff algorithm options"
+msgstr "Opsies vir verskilalgoritme"
+
+msgid "produce the smallest possible diff"
+msgstr "produseer die kleinste moontlike verskil"
+
+msgid "ignore whitespace when comparing lines"
+msgstr "ignoreer witspasie wanneer reëls vergelyk word"
+
+msgid "ignore changes in amount of whitespace"
+msgstr "ignoreer veranderinge in hoeveelheid witspasie"
+
+msgid "ignore changes in whitespace at EOL"
+msgstr "ignoreer veranderinge in witspasie aan die einde van die reël"
+
+msgid "ignore carrier-return at the end of line"
+msgstr "ignoreer karretjie-terugkeer aan die einde van die reël"
+
+msgid "ignore changes whose lines are all blank"
+msgstr "ignoreer veranderinge waarvan al die reëls leeg is"
+
+msgid "<regex>"
+msgstr "<regex>"
+
+msgid "ignore changes whose all lines match <regex>"
+msgstr "ignoreer veranderinge waarvan al die reëls by <regex> pas"
+
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr "heuristiek om verskilbrokgrense te skuif vir maklike lees"
+
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "genereer verskil met die \"patience diff\"-algoritme"
+
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "genereer verskil met die \"histogram diff\"-algoritme"
+
+msgid "<text>"
+msgstr "<teks>"
+
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "genereer verskil met die \"anchored diff\"-algoritme"
+
+msgid "<mode>"
+msgstr "<modus>"
+
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr "wys woordverskil, met <modus> om veranderde woorde af te baken"
+
+msgid "use <regex> to decide what a word is"
+msgstr "gebruik <regex> om te besluit wat 'n woord is"
+
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "gelykstaande aan --word-diff=color --word-diff-regex=<regex>"
+
+msgid "moved lines of code are colored differently"
+msgstr "verskuifde kodereëls word anders gekleur"
+
+msgid "how white spaces are ignored in --color-moved"
+msgstr "hoe witspasies in --color-moved geïgnoreer word"
+
+msgid "Other diff options"
+msgstr "Ander verskilopsies"
+
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+"wanneer uit 'n subgids uitgevoer, sluit veranderinge daarbuite uit en wys "
+"relatiewe paaie"
+
+msgid "treat all files as text"
+msgstr "behandel alle lêers as teks"
+
+msgid "swap two inputs, reverse the diff"
+msgstr "ruil twee invoere om, keer die verskil om"
+
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "verlaat met 1 as daar verskille was, anders 0"
+
+msgid "disable all output of the program"
+msgstr "deaktiveer alle afvoer van die program"
+
+msgid "allow an external diff helper to be executed"
+msgstr "laat toe dat 'n eksterne diff-helper uitgevoer word"
+
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+"voer eksterne teksomskakelingsfilters uit wanneer binêre lêers vergelyk word"
+
+msgid "<when>"
+msgstr "<wanneer>"
+
+msgid "ignore changes to submodules in the diff generation"
+msgstr "ignoreer veranderinge aan submodules by die generering van die verskil"
+
+msgid "<format>"
+msgstr "<formaat>"
+
+msgid "specify how differences in submodules are shown"
+msgstr "spesifiseer hoe verskille in submodules gewys word"
+
+msgid "hide 'git add -N' entries from the index"
+msgstr "versteek 'git add -N'-inskrywings uit die indeks"
+
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "behandel 'git add -N'-inskrywings as werklik in die indeks"
+
+msgid "<string>"
+msgstr "<string>"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+"soek na verskille wat die aantal voorkomste van die gespesifiseerde string "
+"verander"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+"soek na verskille wat die aantal voorkomste van die gespesifiseerde regex "
+"verander"
+
+msgid "show all changes in the changeset with -S or -G"
+msgstr "wys alle veranderinge in die veranderingstel met -S of -G"
+
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "behandel <string> in -S as uitgebreide POSIX-gereelde uitdrukking"
+
+msgid "control the order in which files appear in the output"
+msgstr "beheer die volgorde waarin lêers in die afvoer verskyn"
+
+msgid "<path>"
+msgstr "<pad>"
+
+msgid "show the change in the specified path first"
+msgstr "wys die verandering in die gespesifiseerde pad eerste"
+
+msgid "skip the output to the specified path"
+msgstr "slaan die afvoer na die gespesifiseerde pad oor"
+
+msgid "<object-id>"
+msgstr "<objek-id>"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+"soek na verskille wat die aantal voorkomste van die gespesifiseerde objek "
+"verander"
+
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+msgid "select files by diff type"
+msgstr "kies lêers volgens verskiltipe"
+
+msgid "<depth>"
+msgstr "<diepte>"
+
+msgid "<file>"
+msgstr "<lêer>"
+
+msgid "output to a specific file"
+msgstr "voer uit na 'n spesifieke lêer"
+
+msgid "exhaustive rename detection was skipped due to too many files."
+msgstr "volledige hernoemingsbespeuring is oorgeslaan weens te veel lêers."
+
+msgid "only found copies from modified paths due to too many files."
+msgstr "het weens te veel lêers slegs kopieë van gewysigde paaie gevind."
+
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"u wil dalk u %s-veranderlike op ten minste %d stel en die opdrag weer "
+"probeer."
+
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "kon nie volgordelêer '%s' lees nie"
+
+msgid "Performing inexact rename detection"
+msgstr "Voer onpresiese hernoemingsbespeuring uit"
+
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "Geen sodanige pad '%s' in die verskil nie"
+
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr ""
+"padspesifikasie '%s' het met geen lêer(s) wat aan git bekend is ooreengestem "
+"nie"
+
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "onherkende patroon: '%s'"
+
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "onherkende negatiewe patroon: '%s'"
+
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr "u yl-uitcheck-lêer het dalk probleme: patroon '%s' word herhaal"
+
+msgid "disabling cone pattern matching"
+msgstr "deaktiveer keëlpatroonpassing"
+
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "kan nie %s as 'n uitsluitlêer gebruik nie"
+
+msgid "failed to get kernel name and information"
+msgstr "kon nie kernnaam en -inligting kry nie"
+
+msgid "untracked cache is disabled on this system or location"
+msgstr "onnaspoorbare kas is op hierdie stelsel of ligging gedeaktiveer"
+
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Geen gidsnaam kon geraai word nie.\n"
+"Spesifiseer asseblief 'n gids op die opdragreël"
+
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr "indekslêer korrup in bewaarplek %s"
+
+#, c-format
+msgid "could not create directories for %s"
+msgstr "kon nie gidse vir %s skep nie"
+
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "kon nie Git-gids van '%s' na '%s' migreer nie"
+
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "wenk: Wag vir u redigeerder om die lêer te sluit...%c"
+
+#, c-format
+msgid "could not edit '%s'"
+msgstr "kon nie '%s' redigeer nie"
+
+msgid "Filtering content"
+msgstr "Filtreer inhoud"
+
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "kon nie stat op lêer '%s' uitvoer nie"
+
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr "slegte Git-naamruimtepad \"%s\""
+
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "ongeldige waarde vir veranderlike %s"
+
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "ignoreer onbekende core.fsync-komponent '%s'"
+
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "abbrev-lengte buite bereik: %d"
+
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "slegte zlib-kompressievlak %d"
+
+#, c-format
+msgid "%s cannot contain newline"
+msgstr "%s kan nie 'n nuwe reël bevat nie"
+
+#, c-format
+msgid "%s must have at least one character"
+msgstr "%s moet ten minste een karakter hê"
+
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "ignoreer onbekende core.fsyncMethod-waarde '%s'"
+
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles is verouderd; gebruik eerder core.fsync"
+
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "ongeldige modus vir objekskepping: %s"
+
+#, c-format
+msgid "malformed value for %s"
+msgstr "misvormde waarde vir %s"
+
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "misvormde waarde vir %s: %s"
+
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "moet een wees van nothing, matching, simple, upstream of current"
+
+#, c-format
+msgid "too many args to run %s"
+msgstr "te veel argumente om %s uit te voer"
+
+msgid "unable to write request to remote"
+msgstr "kan nie versoek na afgeleë skryf nie"
+
+msgid "object-info capability is not enabled on the server"
+msgstr "die vermoë object-info is nie op die bediener geaktiveer nie"
+
+msgid "object-info requires protocol v2"
+msgstr "object-info vereis protokol v2"
+
+#, c-format
+msgid "object-info: expected %<PRIuMAX> attributes, got %<PRIuMAX>"
+msgstr "object-info: %<PRIuMAX> eienskappe verwag, %<PRIuMAX> gekry"
+
+msgid "object-info: unrequested 'size' attribute"
+msgstr "object-info: onversoekte eienskap 'size'"
+
+msgid "object-info: duplicate 'size' attribute"
+msgstr "object-info: duplikaat eienskap 'size'"
+
+msgid "object-info: unrequested 'type' attribute"
+msgstr "object-info: onversoekte eienskap 'type'"
+
+msgid "object-info: duplicate 'type' attribute"
+msgstr "object-info: duplikaat eienskap 'type'"
+
+#, c-format
+msgid "object-info: unknown attribute '%s'"
+msgstr "object-info: onbekende eienskap '%s'"
+
+#, c-format
+msgid "object-info: expected %<PRIuMAX> objects, got %<PRIuMAX>"
+msgstr "object-info: %<PRIuMAX> objekte verwag, %<PRIuMAX> gekry"
+
+#, c-format
+msgid "object-info: expected OID: %s, got %s"
+msgstr "object-info: OID verwag: %s, %s gekry"
+
+#, c-format
+msgid "object-info: object %s has invalid type '%s'"
+msgstr "object-info: objek %s het ongeldige tipe '%s'"
+
+#, c-format
+msgid "object-info: expected flush after %<PRIuMAX> objects"
+msgstr "object-info: spoel verwag ná %<PRIuMAX> objekte"
+
+#, c-format
+msgid ""
+"You are attempting to fetch %s, which is in the commit graph file but not in "
+"the object database.\n"
+"This is probably due to repo corruption.\n"
+"If you are attempting to repair this repo corruption by refetching the "
+"missing object, use 'git fetch --refetch' with the missing object."
+msgstr ""
+"U probeer %s haal, wat in die vasleggingsgrafieklêer is, maar nie in die "
+"objekdatabasis nie.\n"
+"Dit is waarskynlik weens korrupsie van die bewaarplek.\n"
+"As u probeer om hierdie korrupsie te herstel deur die ontbrekende objek weer "
+"te haal, gebruik 'git fetch --refetch' met die ontbrekende objek."
+
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: het vlak lys verwag"
+
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack: het 'n flush-pakkie ná vlak lys verwag"
+
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: het ACK/NAK verwag, het 'n flush-pakkie gekry"
+
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: het ACK/NAK verwag, het '%s' gekry"
+
+msgid "unable to write to remote"
+msgstr "kan nie na afgeleë skryf nie"
+
+msgid "Server supports filter"
+msgstr "Bediener ondersteun filter"
+
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "ongeldige shallow-reël: %s"
+
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "ongeldige unshallow-reël: %s"
+
+#, c-format
+msgid "error in object: %s"
+msgstr "fout in objek: %s"
+
+#, c-format
+msgid "no shallow found: %s"
+msgstr "geen vlak gevind nie: %s"
+
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "het shallow/unshallow verwag, het %s gekry"
+
+#, c-format
+msgid "got %s %d %s"
+msgstr "het %s %d %s gekry"
+
+#, c-format
+msgid "invalid commit %s"
+msgstr "ongeldige vaslegging %s"
+
+msgid "giving up"
+msgstr "gee op"
+
+msgid "done"
+msgstr "klaar"
+
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "het %s (%d) %s gekry"
+
+#, c-format
+msgid "Marking %s as complete"
+msgstr "Merk %s as voltooi"
+
+#, c-format
+msgid "already have %s (%s)"
+msgstr "het reeds %s (%s)"
+
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: kan nie syband-demultiplekser afvurk nie"
+
+msgid "protocol error: bad pack header"
+msgstr "protokolfout: slegte pakkopskrif"
+
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: kan nie %s afvurk nie"
+
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: ongeldige index-pack-afvoer"
+
+#, c-format
+msgid "%s failed"
+msgstr "%s het misluk"
+
+msgid "error in sideband demultiplexer"
+msgstr "fout in syband-demultiplekser"
+
+#, c-format
+msgid "Server version is %.*s"
+msgstr "Bedienerweergawe is %.*s"
+
+#, c-format
+msgid "Server supports %s"
+msgstr "Bediener ondersteun %s"
+
+msgid "Server does not support shallow clients"
+msgstr "Bediener ondersteun nie vlak kliënte nie"
+
+msgid "Server does not support --shallow-since"
+msgstr "Bediener ondersteun nie --shallow-since nie"
+
+msgid "Server does not support --shallow-exclude"
+msgstr "Bediener ondersteun nie --shallow-exclude nie"
+
+msgid "Server does not support --deepen"
+msgstr "Bediener ondersteun nie --deepen nie"
+
+msgid "Server does not support this repository's object format"
+msgstr "Bediener ondersteun nie hierdie bewaarplek se objekformaat nie"
+
+msgid "no common commits"
+msgstr "geen gemeenskaplike vasleggings nie"
+
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: haal het misluk."
+
+msgid "Server does not support shallow requests"
+msgstr "Bediener ondersteun nie vlak versoeke nie"
+
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "het '%s' verwag, '%s' ontvang"
+
+#, c-format
+msgid "expected '%s'"
+msgstr "het '%s' verwag"
+
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "onverwagte erkenningsreël: '%s'"
+
+#, c-format
+msgid "error processing acks: %d"
+msgstr "fout met verwerking van erkennings: %d"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "het verwag dat paklêer ná '%s' gestuur word"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr "het verwag dat geen ander afdelings gestuur word ná geen '%s' nie"
+
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "fout met verwerking van vlak inligting: %d"
+
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "het wanted-ref verwag, het '%s' gekry"
+
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "onverwagte wanted-ref: '%s'"
+
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "fout met verwerking van gesogte verwysings: %d"
+
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: het antwoord-eindpakkie verwag"
+
+#, c-format
+msgid "couldn't resolve 'auto' filter '%s': %s"
+msgstr "kon nie 'auto'-filter '%s' oplos nie: %s"
+
+msgid "no matching remote head"
+msgstr "geen ooreenstemmende afgeleë kop nie"
+
+msgid "unexpected 'ready' from remote"
+msgstr "onverwagte 'ready' van afgeleë"
+
+#, c-format
+msgid "no such remote ref %s"
+msgstr "geen sodanige afgeleë verwysing %s nie"
+
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "Bediener laat nie versoek vir onaangekondigde objek %s toe nie"
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr "fsmonitor_ipc__send_query: ongeldige pad '%s'"
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr "fsmonitor_ipc__send_query: ongespesifiseerde fout op '%s'"
+
+msgid "fsmonitor--daemon is not running"
+msgstr "fsmonitor--daemon loop nie"
+
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "kon nie '%s'-opdrag na fsmonitor--daemon stuur nie"
+
+#, c-format
+msgid "bare repository '%s' is incompatible with fsmonitor"
+msgstr "kaal bewaarplek '%s' is onversoenbaar met fsmonitor"
+
+#, c-format
+msgid "repository '%s' is incompatible with fsmonitor due to errors"
+msgstr "bewaarplek '%s' is weens foute onversoenbaar met fsmonitor"
+
+#, c-format
+msgid "remote repository '%s' is incompatible with fsmonitor"
+msgstr "afgeleë bewaarplek '%s' is onversoenbaar met fsmonitor"
+
+#, c-format
+msgid "virtual repository '%s' is incompatible with fsmonitor"
+msgstr "virtuele bewaarplek '%s' is onversoenbaar met fsmonitor"
+
+#, c-format
+msgid ""
+"socket directory '%s' is incompatible with fsmonitor due to lack of Unix "
+"sockets support"
+msgstr ""
+"sokgids '%s' is onversoenbaar met fsmonitor weens gebrek aan ondersteuning "
+"vir Unix-sokke"
+
+msgid ""
+"git [-v | --version] [-h | --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] [--no-"
+"lazy-fetch]\n"
+"           [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n"
+"           [--work-tree=<path>] [--namespace=<name>] [--config-"
+"env=<name>=<envvar>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [-v | --version] [-h | --help] [-C <pad>] [-c <naam>=<waarde>]\n"
+"           [--exec-path[=<pad>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-"
+"lazy-fetch]\n"
+"           [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<pad>]\n"
+"           [--work-tree=<pad>] [--namespace=<naam>] [--config-"
+"env=<naam>=<omgewingsveranderlike>]\n"
+"           <opdrag> [<argumente>]"
+
+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' en 'git help -g' lys beskikbare subopdragte en sommige\n"
+"konsepgidse. Sien 'git help <opdrag>' of 'git help <konsep>'\n"
+"om oor 'n spesifieke subopdrag of konsep te lees.\n"
+"Sien 'git help git' vir 'n oorsig van die stelsel."
+
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "nie-ondersteunde opdraglystipe '%s'"
+
+#, c-format
+msgid "no directory given for '%s' option\n"
+msgstr "geen gids vir '%s'-opsie gegee nie\n"
+
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "geen naamruimte vir --namespace gegee nie\n"
+
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c verwag 'n konfigurasiestring\n"
+
+#, c-format
+msgid "no config key given for --config-env\n"
+msgstr "geen konfigurasiesleutel vir --config-env gegee nie\n"
+
+#, c-format
+msgid "no file given for '%s' option\n"
+msgstr "geen lêer vir opsie '%s' gegee nie\n"
+
+#, c-format
+msgid "no attribute source given for --attr-source\n"
+msgstr "geen attribuutbron vir --attr-source gegee nie\n"
+
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "onbekende opsie: %s\n"
+
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "tydens uitbreiding van alias '%s': '%s'"
+
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"alias '%s' verander omgewingsveranderlikes.\n"
+"U kan '!git' in die alias gebruik om dit te doen"
+
+#, c-format
+msgid "empty alias for %s"
+msgstr "leë alias vir %s"
+
+#, c-format
+msgid "recursive alias: %s"
+msgstr "rekursiewe alias: %s"
+
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr "aliaslus bespeur: uitbreiding van '%s' eindig nie:%s"
+
+msgid "write failure on standard output"
+msgstr "skryffout op standaardafvoer"
+
+msgid "unknown write failure on standard output"
+msgstr "onbekende skryffout op standaardafvoer"
+
+msgid "close failed on standard output"
+msgstr "sluiting het misluk op standaardafvoer"
+
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "kan nie %s as 'n ingeboude opdrag hanteer nie"
+
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"gebruik: %s\n"
+"\n"
+
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr "uitbreiding van alias '%s' het misluk; '%s' is nie 'n Git-opdrag nie\n"
+
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "kon nie opdrag '%s' uitvoer nie: %s\n"
+
+msgid "could not create temporary file"
+msgstr "kon nie tydelike lêer skep nie"
+
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "kon nie losstaande handtekening na '%s' skryf nie"
+
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile moet gekonfigureer wees en bestaan vir ssh-"
+"handtekeningverifikasie"
+
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh-keygen -Y find-principals/verify word benodig vir ssh-"
+"handtekeningverifikasie (beskikbaar in openssh weergawe 8.2p1+)"
+
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr ""
+"ssh-ondertekening-herroepingslêer is gekonfigureer maar nie gevind nie: %s"
+
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "slegte/onversoenbare handtekening '%s'"
+
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "kon nie die ssh-vingerafdruk vir sleutel '%s' kry nie"
+
+#, c-format
+msgid "failed to get the ssh fingerprint for key %s"
+msgstr "kon nie die ssh-vingerafdruk vir sleutel %s kry nie"
+
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+"óf user.signingkey óf gpg.ssh.defaultKeyCommand moet gekonfigureer word"
+
+#, c-format
+msgid "malformed build-time gpg.ssh.defaultKeyCommand: %s"
+msgstr "misvormde bou-tyd gpg.ssh.defaultKeyCommand: %s"
+
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+"gpg.ssh.defaultKeyCommand het geslaag maar geen sleutels teruggegee nie: %s "
+"%s"
+
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand het misluk: %s %s"
+
+#, c-format
+msgid ""
+"gpg failed to sign the data:\n"
+"%s"
+msgstr ""
+"gpg kon nie die data onderteken nie:\n"
+"%s"
+
+msgid "user.signingKey needs to be set for ssh signing"
+msgstr "user.signingKey moet gestel word vir ssh-ondertekening"
+
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "kon nie ssh-ondertekeningsleutel na '%s' skryf nie"
+
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "kon nie ssh-ondertekeningsleutelbuffer na '%s' skryf nie"
+
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"ssh-keygen -Y sign word benodig vir ssh-ondertekening (beskikbaar in openssh "
+"weergawe 8.2p1+)"
+
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "kon nie ssh-ondertekeningsdatabuffer vanaf '%s' lees nie"
+
+#, c-format
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "ongeldige kleur '%.*s' in log.graphColors geïgnoreer"
+
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"gegewe patroon bevat NULL-greep (via -f <lêer>). Dit word slegs ondersteun "
+"met -P onder PCRE v2"
+
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "'%s': kan nie %s lees nie"
+
+#, c-format
+msgid "'%s': short read"
+msgstr "'%s': kort lees"
+
+msgid "start a working area (see also: git help tutorial)"
+msgstr "begin 'n werkarea (sien ook: git help tutorial)"
+
+msgid "work on the current change (see also: git help everyday)"
+msgstr "werk aan die huidige verandering (sien ook: git help everyday)"
+
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "ondersoek die geskiedenis en toestand (sien ook: git help revisions)"
+
+msgid "grow, mark and tweak your common history"
+msgstr "laat groei, merk en verfyn julle gemeenskaplike geskiedenis"
+
+msgid "collaborate (see also: git help workflows)"
+msgstr "werk saam (sien ook: git help workflows)"
+
+msgid "Main Porcelain Commands"
+msgstr "Hoof-porseleinopdragte"
+
+msgid "Ancillary Commands / Manipulators"
+msgstr "Hulpopdragte / Manipuleerders"
+
+msgid "Ancillary Commands / Interrogators"
+msgstr "Hulpopdragte / Ondervraers"
+
+msgid "Interacting with Others"
+msgstr "Interaksie met ander"
+
+msgid "Low-level Commands / Manipulators"
+msgstr "Laevlak-opdragte / Manipuleerders"
+
+msgid "Low-level Commands / Interrogators"
+msgstr "Laevlak-opdragte / Ondervraers"
+
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "Laevlak-opdragte / Sinchronisering van bewaarplekke"
+
+msgid "Low-level Commands / Internal Helpers"
+msgstr "Laevlak-opdragte / Interne helpers"
+
+msgid "User-facing repository, command and file interfaces"
+msgstr "Gebruikersgerigte bewaarplek-, opdrag- en lêerkoppelvlakke"
+
+msgid "Developer-facing file formats, protocols and other interfaces"
+msgstr "Ontwikkelaargerigte lêerformate, protokolle en ander koppelvlakke"
+
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "beskikbare Git-opdragte in '%s'"
+
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "Git-opdragte beskikbaar van elders op jou $PATH"
+
+msgid "These are common Git commands used in various situations:"
+msgstr ""
+"Hierdie is algemene Git-opdragte wat in verskeie situasies gebruik word:"
+
+msgid "The Git concept guides are:"
+msgstr "Die Git-konsepgidse is:"
+
+msgid "User-facing repository, command and file interfaces:"
+msgstr "Gebruikersgerigte bewaarplek-, opdrag- en lêerkoppelvlakke:"
+
+msgid "File formats, protocols and other developer interfaces:"
+msgstr "Lêerformate, protokolle en ander ontwikkelaarkoppelvlakke:"
+
+msgid "External commands"
+msgstr "Eksterne opdragte"
+
+msgid "Command aliases"
+msgstr "Opdragaliasse"
+
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "Sien 'git help <opdrag>' om oor 'n spesifieke subopdrag te lees"
+
+#, 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' blyk 'n Git-opdrag te wees, maar ons kon dit nie\n"
+"uitvoer nie. Dalk is git-%s stukkend?"
+
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: '%s' is nie 'n Git-opdrag nie. Sien 'git --help'."
+
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Oeps. Jou stelsel rapporteer glad geen Git-opdragte nie."
+
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr ""
+"WAARSKUWING: Jy het 'n Git-opdrag genaamd '%s' geroep, wat nie bestaan nie."
+
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Gaan voort onder die aanname dat jy '%s' bedoel het."
+
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Voer eerder '%s' uit [y/N]? "
+
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "Gaan voort oor %0.1f sekondes, met die aanname dat jy '%s' bedoel het."
+
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"Die mees soortgelyke opdrag is"
+msgstr[1] ""
+"\n"
+"Die mees soortgelyke opdragte is"
+
+msgid "git version [--build-options]"
+msgstr "git version [--build-options]"
+
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Het jy dit bedoel?"
+msgstr[1] ""
+"\n"
+"Het jy een van hierdie bedoel?"
+
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config set advice.ignoredHook false`."
+msgstr ""
+"Die '%s'-haak is geïgnoreer omdat dit nie as uitvoerbaar gestel is nie.\n"
+"Jy kan hierdie waarskuwing afskakel met `git config set advice.ignoredHook "
+"false`."
+
+#, c-format
+msgid "hook.jobs must be an integer, ignoring: '%s'"
+msgstr "hook.jobs moet 'n heelgetal wees, word geïgnoreer: '%s'"
+
+#, c-format
+msgid "hook.jobs must be a positive integer or -1, ignoring: '%s'"
+msgstr ""
+"hook.jobs moet 'n positiewe heelgetal of -1 wees, word geïgnoreer: '%s'"
+
+#, c-format
+msgid ""
+"hook friendly-name '%s' collides with a known event name; please choose a "
+"different friendly-name"
+msgstr ""
+"haak se vriendelike naam '%s' bots met 'n bekende gebeurtenisnaam; kies "
+"asseblief 'n ander vriendelike naam"
+
+#, c-format
+msgid ""
+"hook friendly-name '%s' is the same as its event; this may cause ambiguity "
+"with hook.%s.enabled"
+msgstr ""
+"haak se vriendelike naam '%s' is dieselfde as sy gebeurtenis; dit kan "
+"dubbelsinnigheid veroorsaak met hook.%s.enabled"
+
+#, c-format
+msgid "hook.%s.parallel must be a boolean, ignoring: '%s'"
+msgstr "hook.%s.parallel moet 'n booleaanse waarde wees, word geïgnoreer: '%s'"
+
+#, c-format
+msgid "hook.%s.jobs must be an integer, ignoring: '%s'"
+msgstr "hook.%s.jobs moet 'n heelgetal wees, word geïgnoreer: '%s'"
+
+#, c-format
+msgid "hook.%s.jobs must be a positive integer or -1, ignoring: '%s'"
+msgstr ""
+"hook.%s.jobs moet 'n positiewe heelgetal of -1 wees, word geïgnoreer: '%s'"
+
+#, c-format
+msgid ""
+"hook.%s.jobs is set but '%s' looks like a hook friendly-name, not an event "
+"name; hook.<event>.jobs uses the event name (e.g. hook.post-receive.jobs), "
+"so this setting will be ignored"
+msgstr ""
+"hook.%s.jobs is gestel, maar '%s' lyk soos 'n haak se vriendelike naam, nie "
+"'n gebeurtenisnaam nie; hook.<event>.jobs gebruik die gebeurtenisnaam (bv. "
+"hook.post-receive.jobs), dus sal hierdie instelling geïgnoreer word"
+
+#, c-format
+msgid "disabled hook '%s' has no command configured"
+msgstr "gedeaktiveerde haak '%s' het geen opdrag gekonfigureer nie"
+
+#, c-format
+msgid ""
+"'hook.%s.command' must be configured or 'hook.%s.event' must be removed; "
+"aborting."
+msgstr ""
+"'hook.%s.command' moet gekonfigureer word of 'hook.%s.event' moet verwyder "
+"word; staak."
+
+#, c-format
+msgid ""
+"hook '%s' is not marked as parallel=true, running in parallel anyway due to "
+"-j%u"
+msgstr ""
+"haak '%s' is nie as parallel=true gemerk nie, loop tog parallel weens -j%u"
+
+#, c-format
+msgid "%s must be a positive integer or -1, ignoring: %d"
+msgstr "%s moet 'n positiewe heelgetal of -1 wees, word geïgnoreer: %d"
+
+msgid "not a git repository"
+msgstr "nie 'n Git-bewaarplek nie"
+
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "argument vir --packfile moet 'n geldige hash wees (het '%s' gekry)"
+
+#, c-format
+msgid "negative value for http.postBuffer; defaulting to %d"
+msgstr "negatiewe waarde vir http.postBuffer; gebruik verstek %d"
+
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "Delegasiebeheer word nie ondersteun met cURL < 7.22.0 nie"
+
+msgid "Unknown value for http.proactiveauth"
+msgstr "Onbekende waarde vir http.proactiveauth"
+
+#, c-format
+msgid "failed to parse %s"
+msgstr "kon nie %s ontleed nie"
+
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr "Nie-ondersteunde SSL-agterkant '%s'. Ondersteunde SSL-agterkante:"
+
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr ""
+"Kon nie SSL-agterkant na '%s' stel nie: cURL is sonder SSL-agterkante gebou"
+
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr "Kon nie SSL-agterkant na '%s' stel nie: reeds gestel"
+
+msgid "refusing to read cookies from http.cookiefile '-'"
+msgstr "weier om koekies vanaf http.cookiefile '-' te lees"
+
+msgid "ignoring http.savecookies for empty http.cookiefile"
+msgstr "ignoreer http.savecookies vir leë http.cookiefile"
+
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
+msgstr ""
+"kan nie URL-basis vanaf herleiding bywerk nie:\n"
+"  gevra vir: %s\n"
+"  herleiding: %s"
+
+#, c-format
+msgid ""
+"response requested a delay greater than http.maxRetryTime (%ld > %ld seconds)"
+msgstr ""
+"antwoord het 'n vertraging groter as http.maxRetryTime versoek (%ld > %ld "
+"sekondes)"
+
+#, c-format
+msgid ""
+"configured http.retryAfter exceeds http.maxRetryTime (%ld > %ld seconds)"
+msgstr ""
+"gekonfigureerde http.retryAfter oorskry http.maxRetryTime (%ld > %ld "
+"sekondes)"
+
+#, c-format
+msgid "rate limited, waiting %ld seconds before retry"
+msgstr "tempo beperk, wag %ld sekondes voor herprobeer"
+
+#, c-format
+msgid ""
+"number too large to represent as curl_off_t on this platform: %<PRIuMAX>"
+msgstr ""
+"getal te groot om as curl_off_t op hierdie platform voor te stel: %<PRIuMAX>"
+
+msgid "Author identity unknown\n"
+msgstr "Outeuridentiteit onbekend\n"
+
+msgid "Committer identity unknown\n"
+msgstr "Vasleggeridentiteit onbekend\n"
+
+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"
+"*** Sê asseblief vir my wie jy is.\n"
+"\n"
+"Voer\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Jou Naam\"\n"
+"\n"
+"uit om jou rekening se verstekidentiteit te stel.\n"
+"Laat --global weg om die identiteit slegs in hierdie bewaarplek te stel.\n"
+"\n"
+
+msgid "no email was given and auto-detection is disabled"
+msgstr "geen e-pos is gegee nie en outo-opsporing is gedeaktiveer"
+
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "kan nie e-posadres outomaties opspoor nie (het '%s' gekry)"
+
+msgid "no name was given and auto-detection is disabled"
+msgstr "geen naam is gegee nie en outo-opsporing is gedeaktiveer"
+
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "kan nie naam outomaties opspoor nie (het '%s' gekry)"
+
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "leë identiteitsnaam (vir <%s>) word nie toegelaat nie"
+
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "naam bestaan slegs uit ontoelaatbare karakters: %s"
+
+msgid ""
+"git imap-send [-v] [-q] [--[no-]curl] [--[no-]draft] [(--folder|-f) "
+"<folder>] < <mbox>"
+msgstr ""
+"git imap-send [-v] [-q] [--[no-]curl] [--[no-]draft] [(--folder|-f) <vouer>] "
+"< <mbox>"
+
+msgid "no IMAP host specified"
+msgstr "geen IMAP-gasheer gespesifiseer nie"
+
+msgid ""
+"set the IMAP host with 'git config imap.host <host>'.\n"
+"(e.g., 'git config imap.host imaps://imap.example.com')"
+msgstr ""
+"stel die IMAP-gasheer met 'git config imap.host <gasheer>'.\n"
+"(bv. 'git config imap.host imaps://imap.example.com')"
+
+msgid "no IMAP folder specified"
+msgstr "geen IMAP-vouer gespesifiseer nie"
+
+msgid ""
+"set the target folder with 'git config imap.folder <folder>'.\n"
+"(e.g., 'git config imap.folder Drafts')"
+msgstr ""
+"stel die teikenvouer met 'git config imap.folder <vouer>'.\n"
+"(bv. 'git config imap.folder Drafts')"
+
+msgid "'auto' filter not supported by this command"
+msgstr "'auto'-filter word nie deur hierdie opdrag ondersteun nie"
+
+msgid "expected 'tree:<depth>'"
+msgstr "het 'tree:<diepte>' verwag"
+
+msgid "sparse:path filters support has been dropped"
+msgstr "ondersteuning vir sparse:path-filters is laat vaar"
+
+#, c-format
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
+msgstr "'%s' vir 'object:type=<tipe>' is nie 'n geldige objektipe nie"
+
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "ongeldige filter-spesifikasie '%s'"
+
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "moet karakter ontsnap in sub-filter-spesifikasie: '%c'"
+
+msgid "an 'auto' filter cannot be combined"
+msgstr "'n 'auto'-filter kan nie gekombineer word nie"
+
+msgid "expected something after combine:"
+msgstr "het iets ná combine: verwag"
+
+msgid "multiple filter-specs cannot be combined"
+msgstr "veelvuldige filter-spesifikasies kan nie gekombineer word nie"
+
+msgid "an 'auto' filter is incompatible with any other filter"
+msgstr "'n 'auto'-filter is onversoenbaar met enige ander filter"
+
+msgid "unable to upgrade repository format to support partial clone"
+msgstr ""
+"kan nie bewaarplekformaat opgradeer om gedeeltelike kloon te ondersteun nie"
+
+msgid "args"
+msgstr "argumente"
+
+msgid "object filtering"
+msgstr "objekfiltrering"
+
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "kan nie toegang kry tot yl blob in '%s' nie"
+
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "kan nie yl filterdata in %s ontleed nie"
+
+msgid "filter_oidset: only blob:limit filters are supported"
+msgstr "filter_oidset: slegs filters van die tipe blob:limit word ondersteun"
+
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "inskrywing '%s' in boom %s het boommodus, maar is nie 'n boom nie"
+
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "inskrywing '%s' in boom %s het blobmodus, maar is nie 'n blob nie"
+
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "kan nie wortelboom vir vaslegging %s laai nie"
+
+#, c-format
+msgid "could not write lock pid file '%s'"
+msgstr "kon nie slot-pid-lêer '%s' skryf nie"
+
+#, c-format
+msgid "malformed lock pid file '%s'"
+msgstr "misvormde slot-pid-lêer '%s'"
+
+#, c-format
+msgid ""
+"Unable to create '%s': %s.\n"
+"\n"
+msgstr ""
+"Kan nie '%s' skep nie: %s.\n"
+"\n"
+
+#, c-format
+msgid ""
+"Lock may be held by process %<PRIuMAX>; if no git process is running, the "
+"lock file may be stale (PIDs can be reused)"
+msgstr ""
+"Slot word dalk deur proses %<PRIuMAX> gehou; as geen Git-proses loop nie, is "
+"die slotlêer dalk verouderd (PID's kan hergebruik word)"
+
+#, c-format
+msgid ""
+"Lock was held by process %<PRIuMAX>, which is no longer running; the lock "
+"file appears to be stale"
+msgstr ""
+"Slot is deur proses %<PRIuMAX> gehou, wat nie meer loop nie; die slotlêer "
+"blyk verouderd te wees"
+
+msgid ""
+"Another git process seems to be running in this repository, or the lock file "
+"may be stale"
+msgstr ""
+"Dit lyk of 'n ander Git-proses in hierdie bewaarplek loop, of die slotlêer "
+"is dalk verouderd"
+
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "Kan nie '%s.lock' skep nie: %s"
+
+msgid "unable to create temporary object directory"
+msgstr "kan nie tydelike objekgids skep nie"
+
+#, c-format
+msgid "could not write loose object index %s"
+msgstr "kon nie los objekindeks %s skryf nie"
+
+#, c-format
+msgid "failed to write loose object index %s"
+msgstr "kon nie los objekindeks %s skryf nie"
+
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "onverwagte reël: '%s'"
+
+msgid "expected flush after ls-refs arguments"
+msgstr "het 'flush' ná ls-refs-argumente verwag"
+
+msgid "quoted CRLF detected"
+msgstr "aangehaalde CRLF bespeur"
+
+#, c-format
+msgid "unable to format message: %s"
+msgstr "kan nie boodskap formateer nie: %s"
+
+#, c-format
+msgid "invalid marker-size '%s', expecting an integer"
+msgstr "ongeldige merkergrootte '%s', verwag 'n heelgetal"
+
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "Kon nie objek '%s' ontleed nie"
+
+#, c-format
+msgid "tree has duplicate entries for '%s'"
+msgstr "boom het duplikaatinskrywings vir '%s'"
+
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "Kon nie submodule %s saamsmelt nie (nie uitgecheck nie)"
+
+#, c-format
+msgid "Failed to merge submodule %s (no merge base)"
+msgstr "Kon nie submodule %s saamsmelt nie (geen saamsmeltbasis nie)"
+
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "Kon nie submodule %s saamsmelt nie (vasleggings nie teenwoordig nie)"
+
+#, c-format
+msgid "error: failed to merge submodule %s (repository corrupt)"
+msgstr "fout: kon nie submodule %s saamsmelt nie (bewaarplek korrup)"
+
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr ""
+"Kon nie submodule %s saamsmelt nie (vasleggings volg nie op saamsmeltbasis "
+"nie)"
+
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Let wel: Spoel submodule %s vooruit na %s"
+
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Kon nie submodule %s saamsmelt nie"
+
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists: %s"
+msgstr ""
+"Kon nie submodule %s saamsmelt nie, maar 'n moontlike saamsmeltoplossing "
+"bestaan: %s"
+
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"Kon nie submodule %s saamsmelt nie, maar veelvuldige moontlike saamsmeltings "
+"bestaan:\n"
+"%s"
+
+#, c-format
+msgid "error: failed to execute internal merge for %s"
+msgstr "fout: kon nie interne saamsmelting vir %s uitvoer nie"
+
+#, c-format
+msgid "error: unable to add %s to database"
+msgstr "fout: kan nie %s by databasis voeg nie"
+
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Smelt %s outomaties saam"
+
+#, 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 ""
+"KONFLIK (implisiete gidshernoeming): Bestaande lêer/gids by %s staan in die "
+"pad van implisiete gidshernoeming(s) wat die volgende pad(paaie) daar plaas: "
+"%s."
+
+#, 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 ""
+"KONFLIK (implisiete gidshernoeming): Kan nie meer as een pad na %s karteer "
+"nie; implisiete gidshernoemings het probeer om hierdie paaie daar te plaas: "
+"%s"
+
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+"KONFLIK (gidshernoeming verdeel): Onduidelik waarheen %s hernoem moet word; "
+"dit is na veelvuldige ander gidse hernoem, sonder dat enige bestemming 'n "
+"meerderheid van die lêers kry."
+
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"WAARSKUWING: Vermy om %s -> %s-hernoeming op %s toe te pas, omdat %s self "
+"hernoem is."
+
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"Pad bygewerk: %s bygevoeg in %s binne 'n gids wat in %s hernoem is; skuif "
+"dit na %s."
+
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"Pad bygewerk: %s hernoem na %s in %s, binne 'n gids wat in %s hernoem is; "
+"skuif dit na %s."
+
+#, 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 ""
+"KONFLIK (lêerligging): %s bygevoeg in %s binne 'n gids wat in %s hernoem is, "
+"wat daarop dui dat dit dalk na %s geskuif moet word."
+
+#, 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 ""
+"KONFLIK (lêerligging): %s hernoem na %s in %s, binne 'n gids wat in %s "
+"hernoem is, wat daarop dui dat dit dalk na %s geskuif moet word."
+
+#, c-format
+msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
+msgstr "KONFLIK (hernoem/hernoem): %s hernoem na %s in %s en na %s in %s."
+
+#, c-format
+msgid ""
+"CONFLICT (rename involved in collision): rename of %s -> %s has content "
+"conflicts AND collides with another path; this may result in nested conflict "
+"markers."
+msgstr ""
+"KONFLIK (hernoeming betrokke by botsing): hernoeming van %s -> %s het "
+"inhoudkonflikte EN bots met 'n ander pad; dit kan tot geneste konflikmerkers "
+"lei."
+
+#, c-format
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
+msgstr "KONFLIK (hernoem/skrap): %s hernoem na %s in %s, maar geskrap in %s."
+
+#, c-format
+msgid "error: cannot read object %s"
+msgstr "fout: kan nie objek %s lees nie"
+
+#, c-format
+msgid "error: object %s is not a blob"
+msgstr "fout: objek %s is nie 'n blob nie"
+
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"KONFLIK (lêer/gids): gids staan in die pad van %s vanaf %s; skuif dit eerder "
+"na %s."
+
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed both "
+"of them so each can be recorded somewhere."
+msgstr ""
+"KONFLIK (verskillende tipes): %s het verskillende tipes aan elke kant gehad; "
+"albei is hernoem sodat elkeen êrens aangeteken kan word."
+
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed one "
+"of them so each can be recorded somewhere."
+msgstr ""
+"KONFLIK (verskillende tipes): %s het verskillende tipes aan elke kant gehad; "
+"een daarvan is hernoem sodat elkeen êrens aangeteken kan word."
+
+msgid "content"
+msgstr "inhoud"
+
+msgid "add/add"
+msgstr "byvoeg/byvoeg"
+
+msgid "submodule"
+msgstr "submodule"
+
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "KONFLIK (%s): Saamsmeltkonflik in %s"
+
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
+"of %s left in tree."
+msgstr ""
+"KONFLIK (wysig/skrap): %s geskrap in %s en gewysig in %s.  Weergawe %s van "
+"%s in boom gelaat."
+
+#. TRANSLATORS: This is a line of advice to resolve a merge
+#. conflict in a submodule. The first argument is the submodule
+#. name, and the second argument is the abbreviated id of the
+#. commit that needs to be merged.  For example:
+#.  - go to submodule (mysubmodule), and either merge commit abc1234"
+#.
+#, c-format
+msgid ""
+" - go to submodule (%s), and either merge commit %s\n"
+"   or update to an existing commit which has merged those changes\n"
+msgstr ""
+" - gaan na submodule (%s), en smelt óf vaslegging %s saam\n"
+"   óf werk by na 'n bestaande vaslegging wat daardie veranderinge "
+"saamgesmelt het\n"
+
+#, c-format
+msgid ""
+"Recursive merging with submodules currently only supports trivial cases.\n"
+"Please manually handle the merging of each conflicted submodule.\n"
+"This can be accomplished with the following steps:\n"
+"%s - come back to superproject and run:\n"
+"\n"
+"      git add %s\n"
+"\n"
+"   to record the above merge or update\n"
+" - resolve any other conflicts in the superproject\n"
+" - commit the resulting index in the superproject\n"
+msgstr ""
+"Rekursiewe saamsmelting met submodules ondersteun tans slegs triviale "
+"gevalle.\n"
+"Hanteer asseblief die saamsmelting van elke submodule met konflikte "
+"handmatig.\n"
+"Dit kan met die volgende stappe gedoen word:\n"
+"%s - keer terug na die superprojek en voer uit:\n"
+"\n"
+"      git add %s\n"
+"\n"
+"   om bogenoemde saamsmelting of bywerking aan te teken\n"
+" - los enige ander konflikte in die superprojek op\n"
+" - lê die resulterende indeks in die superprojek vas\n"
+
+#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
+#. base, and 2-3) the trees for the two trees we're merging.
+#.
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr "insameling van saamsmeltinligting het misluk vir bome %s, %s, %s"
+
+msgid "failed to read the cache"
+msgstr "kon nie die kas lees nie"
+
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr "kon nie paklêer '%s' byvoeg nie"
+
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "kon nie pakindeks '%s' oopmaak nie"
+
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "kon nie objek %d in paklêer opspoor nie"
+
+msgid "cannot store reverse index file"
+msgstr "kan nie omgekeerde indekslêer stoor nie"
+
+#, c-format
+msgid "could not parse line: %s"
+msgstr "kon nie reël ontleed nie: %s"
+
+#, c-format
+msgid "malformed line: %s"
+msgstr "misvormde reël: %s"
+
+#, c-format
+msgid "could not load pack %d"
+msgstr "kon nie pak %d laai nie"
+
+msgid "too many packs, unable to compact"
+msgstr "te veel pakke, kan nie kompakteer nie"
+
+msgid "could not determine preferred pack"
+msgstr "kon nie voorkeurpak bepaal nie"
+
+#, c-format
+msgid "unable to link '%s' to '%s'"
+msgstr "kan nie '%s' aan '%s' koppel nie"
+
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr "kon nie multipakindeks by %s skoonmaak nie"
+
+#, c-format
+msgid "unknown MIDX version: %d"
+msgstr "onbekende MIDX-weergawe: %d"
+
+msgid "cannot perform MIDX compaction with v1 format"
+msgstr "kan nie MIDX-kompaktering met v1-formaat uitvoer nie"
+
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "ignoreer bestaande multipakindeks; kontrolesom stem nie ooreen nie"
+
+#, c-format
+msgid "could not find base MIDX '%s'"
+msgstr "kon nie basis-MIDX '%s' vind nie"
+
+#, c-format
+msgid "could not load reverse index for MIDX %s"
+msgstr "kon nie omgekeerde indeks vir MIDX %s laai nie"
+
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Voeg paklêers by multipakindeks"
+
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "onbekende voorkeurpak: '%s'"
+
+#, c-format
+msgid "failed to open preferred pack %s"
+msgstr "kon nie voorkeurpak %s oopmaak nie"
+
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "kan nie voorkeurpak %s sonder objekte kies nie"
+
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "het nie paklêer %s gesien om te laat val nie"
+
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "voorkeurpak '%s' het verval"
+
+msgid "no pack files to index."
+msgstr "geen paklêers om te indekseer nie."
+
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "weier om multipak-.bitmap sonder enige objekte te skryf"
+
+msgid "unable to create temporary MIDX layer"
+msgstr "kan nie tydelike MIDX-laag skep nie"
+
+msgid "could not write multi-pack bitmap"
+msgstr "kon nie multipak-bitmap skryf nie"
+
+msgid "too many multi-pack-indexes"
+msgstr "te veel multipakindekse"
+
+msgid "unable to open multi-pack-index chain file"
+msgstr "kan nie multipakindeks-kettinglêer oopmaak nie"
+
+msgid "unable to rename new multi-pack-index layer"
+msgstr "kan nie nuwe multipakindeks-laag hernoem nie"
+
+msgid "could not write multi-pack-index"
+msgstr "kon nie multipakindeks skryf nie"
+
+msgid "cannot expire packs from an incremental multi-pack-index"
+msgstr "kan nie pakke uit 'n inkrementele multipakindeks laat verval nie"
+
+msgid "Counting referenced objects"
+msgstr "Tel verwysde objekte"
+
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Vind en skrap onverwysde paklêers"
+
+msgid "cannot repack an incremental multi-pack-index"
+msgstr "kan nie 'n inkrementele multipakindeks herpak nie"
+
+msgid "could not start pack-objects"
+msgstr "kon nie pack-objects begin nie"
+
+msgid "could not finish pack-objects"
+msgstr "kon nie pack-objects voltooi nie"
+
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "multipakindeks se OID-waaier is die verkeerde grootte"
+
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr ""
+"oid-waaier buite volgorde: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+
+msgid "multi-pack-index OID lookup chunk is the wrong size"
+msgstr "multipakindeks se OID-opsoekblok is die verkeerde grootte"
+
+msgid "multi-pack-index object offset chunk is the wrong size"
+msgstr "multipakindeks se objekverplasingsblok is die verkeerde grootte"
+
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "multipakindekslêer %s is te klein"
+
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
+msgstr ""
+"multipakindeks-handtekening 0x%08x stem nie ooreen met handtekening 0x%08x "
+"nie"
+
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr "multipakindeks-weergawe %d word nie herken nie"
+
+#, c-format
+msgid "multi-pack-index hash version %u does not match version %u"
+msgstr "multipakindeks-hashweergawe %u stem nie ooreen met weergawe %u nie"
+
+msgid "multi-pack-index required pack-name chunk missing or corrupted"
+msgstr "multipakindeks se vereiste paknaamblok ontbreek of is korrup"
+
+msgid "multi-pack-index required OID fanout chunk missing or corrupted"
+msgstr "multipakindeks se vereiste OID-waaierblok ontbreek of is korrup"
+
+msgid "multi-pack-index required OID lookup chunk missing or corrupted"
+msgstr "multipakindeks se vereiste OID-opsoekblok ontbreek of is korrup"
+
+msgid "multi-pack-index required object offsets chunk missing or corrupted"
+msgstr "multipakindeks se vereiste objekverplasingsblok ontbreek of is korrup"
+
+msgid "multi-pack-index pack-name chunk is too short"
+msgstr "multipakindeks se paknaamblok is te kort"
+
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr "multipakindeks se paknaam buite volgorde: '%s' voor '%s'"
+
+msgid "multi-pack-index chain file too small"
+msgstr "multipakindeks-kettinglêer te klein"
+
+#, c-format
+msgid "pack count in base MIDX too high: %<PRIuMAX>"
+msgstr "pakaantal in basis-MIDX te hoog: %<PRIuMAX>"
+
+#, c-format
+msgid "object count in base MIDX too high: %<PRIuMAX>"
+msgstr "objekaantal in basis-MIDX te hoog: %<PRIuMAX>"
+
+#, c-format
+msgid "invalid multi-pack-index chain: line '%s' not a hash"
+msgstr "ongeldige multipakindeks-ketting: reël '%s' is nie 'n hash nie"
+
+msgid "unable to find all multi-pack index files"
+msgstr "kan nie alle multipakindekslêers vind nie"
+
+msgid "invalid MIDX object position, MIDX is likely corrupt"
+msgstr "ongeldige MIDX-objekposisie, MIDX is waarskynlik korrup"
+
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr "slegte pack-int-id: %u (%u pakke in totaal)"
+
+msgid "MIDX does not contain the BTMP chunk"
+msgstr "MIDX bevat nie die BTMP-blok nie"
+
+#, c-format
+msgid "could not load bitmapped pack %<PRIu32>"
+msgstr "kon nie bitmap-pak %<PRIu32> laai nie"
+
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr "multipakindeks stoor 'n 64-bis-verplasing, maar off_t is te klein"
+
+msgid "multi-pack-index large offset out of bounds"
+msgstr "multipakindeks se groot verplasing buite grense"
+
+#, c-format
+msgid "failed to clear multi-pack-index chain at %s"
+msgstr "kon nie multipakindeks-ketting by %s skoonmaak nie"
+
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "multipakindekslêer bestaan, maar kon nie ontleed word nie"
+
+msgid "incorrect checksum"
+msgstr "verkeerde kontrolesom"
+
+msgid "Looking for referenced packfiles"
+msgstr "Soek na verwysde paklêers"
+
+msgid "the midx contains no oid"
+msgstr "die midx bevat geen oid nie"
+
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Verifieer OID-volgorde in multipakindeks"
+
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr "oid-opsoek buite volgorde: oid[%d] = %s >= %s = oid[%d]"
+
+msgid "Sorting objects by packfile"
+msgstr "Sorteer objekte volgens paklêer"
+
+msgid "Verifying object offsets"
+msgstr "Verifieer objekverplasings"
+
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr "kon nie pakinskrywing vir oid[%d] = %s laai nie"
+
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr "kon nie pakindeks vir paklêer %s laai nie"
+
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr "verkeerde objekverplasing vir oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr "kan nie lazy_dir-draad skep nie: %s"
+
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr "kan nie lazy_name-draad skep nie: %s"
+
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr "kan nie by lazy_name-draad aansluit nie: %s"
+
+#, 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 ""
+"Jy het nie jou vorige notas-saamsmelting afgehandel nie (%s bestaan).\n"
+"Gebruik asseblief 'git notes merge --commit' of 'git notes merge --abort' om "
+"die vorige saamsmelting vas te lê/te staak voordat jy 'n nuwe notas-"
+"saamsmelting begin."
+
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Jy het nie jou notas-saamsmelting afgehandel nie (%s bestaan)."
+
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "Kan nie ongeïnisialiseerde/onverwysde notasboom vaslê nie"
+
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Slegte notes.rewriteMode-waarde: '%s'"
+
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "Weier om notas in %s te herskryf (buite refs/notes/)"
+
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "Slegte %s-waarde: '%s'"
+
+msgid "failed to decode tree entry"
+msgstr "kon nie boominskrywing dekodeer nie"
+
+#, c-format
+msgid "failed to map tree entry for %s"
+msgstr "kon nie boominskrywing vir %s karteer nie"
+
+#, c-format
+msgid "bad %s in commit"
+msgstr "slegte %s in vaslegging"
+
+#, c-format
+msgid "unable to map %s %s in commit object"
+msgstr "kan nie %s %s in vasleggingsobjek karteer nie"
+
+#, c-format
+msgid "Failed to convert object from %s to %s"
+msgstr "Kon nie objek van %s na %s omskakel nie"
+
+#, c-format
+msgid "object file %s is empty"
+msgstr "objeklêer %s is leeg"
+
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "korrupte los objek '%s'"
+
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "gemors aan die einde van los objek '%s'"
+
+#, c-format
+msgid "unable to open %s"
+msgstr "kan nie %s oopmaak nie"
+
+#, c-format
+msgid "files '%s' and '%s' differ in contents"
+msgstr "lêers '%s' en '%s' verskil in inhoud"
+
+#, c-format
+msgid "unable to write repeatedly vanishing file %s"
+msgstr "kan nie herhaaldelik verdwynende lêer %s skryf nie"
+
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "kan nie toestemming op '%s' stel nie"
+
+msgid "core.fsyncMethod = batch is unsupported on this platform"
+msgstr "core.fsyncMethod = batch word nie op hierdie platform ondersteun nie"
+
+#, c-format
+msgid "object fails fsck: %s"
+msgstr "objek druip fsck: %s"
+
+msgid "refusing to create malformed object"
+msgstr "weier om misvormde objek te skep"
+
+#, c-format
+msgid "read error while indexing %s"
+msgstr "leesfout tydens indeksering van %s"
+
+#, c-format
+msgid "short read while indexing %s"
+msgstr "kort lees tydens indeksering van %s"
+
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: kon nie in databasis invoeg nie"
+
+msgid "cannot add a submodule of a different hash algorithm"
+msgstr "kan nie 'n submodule met 'n ander hash-algoritme byvoeg nie"
+
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: nie-ondersteunde lêertipe"
+
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "hash stem nie ooreen vir %s nie (het %s verwag)"
+
+#, c-format
+msgid "unable to mmap %s"
+msgstr "kan nie %s mmap nie"
+
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "kan nie kopstuk van %s uitpak nie"
+
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "kan nie kopstuk van %s ontleed nie"
+
+#, c-format
+msgid "unable to parse type from header '%s' of %s"
+msgstr "kan nie tipe uit kopstuk '%s' van %s ontleed nie"
+
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "kan nie inhoud van %s uitpak nie"
+
+msgid "unable to migrate temporary objects"
+msgstr "kan nie tydelike objekte migreer nie"
+
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [slegte objek]"
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#.    "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "%s vaslegging %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#.    "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "%s etiket %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#.    "deadbeef [bad tag, could not parse it]"
+#.
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s [slegte etiket, kon dit nie ontleed nie]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#, c-format
+msgid "%s tree"
+msgstr "%s boom"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#, c-format
+msgid "%s blob"
+msgstr "%s blob"
+
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "kort objek-ID %s is dubbelsinnig"
+
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"Die kandidate is:\n"
+"%s"
+
+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 set advice.objectNameWarning false\""
+msgstr ""
+"Git skep normaalweg nooit 'n verwysing wat op 40 heksadesimale karakters\n"
+"eindig nie, omdat dit geïgnoreer sal word wanneer jy net 40-heks "
+"spesifiseer.\n"
+"Hierdie verwysings kan per ongeluk geskep word. Byvoorbeeld,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"waar \"$br\" op een of ander manier leeg is en 'n 40-heks-verwysing geskep\n"
+"word. Ondersoek asseblief hierdie verwysings en skrap hulle dalk. Skakel\n"
+"hierdie boodskap af deur \"git config set advice.objectNameWarning false\"\n"
+"uit te voer"
+
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "log vir '%.*s' gaan slegs terug tot %s"
+
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "log vir '%.*s' het slegs %d inskrywings"
+
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "pad '%s' bestaan op skyf, maar nie in '%.*s' nie"
+
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"pad '%s' bestaan, maar nie '%s' nie\n"
+"wenk: Het jy '%.*s:%s' oftewel '%.*s:./%s' bedoel?"
+
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "pad '%s' bestaan nie in '%.*s' nie"
+
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"pad '%s' is in die indeks, maar nie op stadium %d nie\n"
+"wenk: Het jy ':%d:%s' bedoel?"
+
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"pad '%s' is in die indeks, maar nie '%s' nie\n"
+"wenk: Het jy ':%d:%s' oftewel ':%d:./%s' bedoel?"
+
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "pad '%s' bestaan op skyf, maar nie in die indeks nie"
+
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "pad '%s' bestaan nie (nóg op skyf nóg in die indeks nie)"
+
+msgid "relative path syntax can't be used outside working tree"
+msgstr "relatiewe padsintaksis kan nie buite die werkboom gebruik word nie"
+
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "<objek>:<pad> word vereis, slegs <objek> '%s' gegee"
+
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "ongeldige objeknaam '%.*s'."
+
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "ongeldige objektipe \"%s\""
+
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "objek %s het onbekende tipe-id %d"
+
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "kan nie objek ontleed nie: %s"
+
+#, c-format
+msgid "unable to open object stream for %s"
+msgstr "kan nie objekstroom vir %s oopmaak nie"
+
+#, c-format
+msgid "hash mismatch %s"
+msgstr "hash stem nie ooreen nie %s"
+
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr "objekgids %s bestaan nie; kontroleer .git/objects/info/alternates"
+
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "kan nie alternatiewe objekpad normaliseer nie: %s"
+
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s: ignoreer alternatiewe objekstore, nesting te diep"
+
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "pad '%s' bestaan nie"
+
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+"verwysingsbewaarplek '%s' as 'n gekoppelde uitcheck word nog nie ondersteun "
+"nie."
+
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "verwysingsbewaarplek '%s' is nie 'n plaaslike bewaarplek nie."
+
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "verwysingsbewaarplek '%s' is vlak"
+
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "verwysingsbewaarplek '%s' is geënt"
+
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "kon nie objekgids vind wat by %s pas nie"
+
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "ongeldige reël tydens ontleding van alternatiewe verwysings: %s"
+
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "vervanging %s nie gevind vir %s nie"
+
+#, c-format
+msgid "object %s is corrupt"
+msgstr "objek %s is korrup"
+
+#, c-format
+msgid "missing mapping of %s to %s"
+msgstr "ontbrekende kartering van %s na %s"
+
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s is nie 'n geldige objek nie"
+
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s is nie 'n geldige '%s'-objek nie"
+
+msgid "primary object source does not support generating packfiles"
+msgstr "primêre objekbron ondersteun nie die genereer van paklêers nie"
+
+msgid "unable to fdopen alternates lockfile"
+msgstr "kan nie alternates-slotlêer fdopen nie"
+
+msgid "unable to read alternates file"
+msgstr "kan nie alternates-lêer lees nie"
+
+msgid "unable to move new alternates file into place"
+msgstr "kan nie nuwe alternates-lêer in plek skuif nie"
+
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+"Daar is te veel onbereikbare los objekte; voer 'git prune' uit om hulle te "
+"verwyder."
+
+#, c-format
+msgid "pack-objects died of signal %d"
+msgstr "pack-objects het gesterf aan sein %d"
+
+msgid "could not spawn pack-objects"
+msgstr "kon nie pack-objects begin nie"
+
+msgid "error writing to pack-objects"
+msgstr "fout met skryf na pack-objects"
+
+#, c-format
+msgid "unable to open loose object %s"
+msgstr "kan nie los objek %s oopmaak nie"
+
+#, c-format
+msgid "unable to parse %s header"
+msgstr "kan nie %s-kopstuk ontleed nie"
+
+msgid "invalid object type"
+msgstr "ongeldige objektipe"
+
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "kan nie %s-kopstuk uitpak nie"
+
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "kopstuk vir %s te lank, oorskry %d grepe"
+
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "los objek %s (gestoor in %s) is korrup"
+
+msgid "error when closing loose object file"
+msgstr "fout met die sluit van los objeklêer"
+
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr "onvoldoende toestemming om 'n objek by bewaarplekdatabasis %s te voeg"
+
+msgid "unable to create temporary file"
+msgstr "kan nie tydelike lêer skep nie"
+
+msgid "unable to write loose object file"
+msgstr "kan nie los objeklêer skryf nie"
+
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "kan nie nuwe objek %s saampers nie (%d)"
+
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "deflateEnd op objek %s het misluk (%d)"
+
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "verwar deur onstabiele objekbrondata vir %s"
+
+#, c-format
+msgid "write stream object %<PRIuMAX> != %<PRIuMAX>"
+msgstr "skryf stroomobjek %<PRIuMAX> != %<PRIuMAX>"
+
+#, c-format
+msgid "unable to stream deflate new object (%d)"
+msgstr "kan nie nuwe objek stroomsgewys saampers nie (%d)"
+
+#, c-format
+msgid "deflateEnd on stream object failed (%d)"
+msgstr "deflateEnd op stroomobjek het misluk (%d)"
+
+#, c-format
+msgid "unable to create directory %s"
+msgstr "kan nie gids %s skep nie"
+
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: hash-pad wanpassing, gevind by: %s"
+
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s: objek korrup of ontbreek: %s"
+
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "slegte sha1-lêer: %s"
+
+msgid "Checking object directory"
+msgstr "Kontroleer objekgids"
+
+msgid "Checking object directories"
+msgstr "Kontroleer objekgidse"
+
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "gepakte objek %s (gestoor in %s) is korrup"
+
+#, c-format
+msgid "unable to load rev-index for pack '%s'"
+msgstr "kan nie rev-index vir pak '%s' laai nie"
+
+#, c-format
+msgid "invalid rev-index for pack '%s'"
+msgstr "ongeldige rev-index vir pak '%s'"
+
+msgid "object database transaction already pending"
+msgstr "objekdatabasistransaksie is reeds hangende"
+
+msgid "failed to start ODB transaction"
+msgstr "kon nie ODB-transaksie begin nie"
+
+msgid "failed to commit ODB transaction"
+msgstr "kon nie ODB-transaksie vaslê nie"
+
+msgid "failed to finalize ODB transaction"
+msgstr "kon nie ODB-transaksie afhandel nie"
+
+#, c-format
+msgid "duplicate entry when writing bitmap index: %s"
+msgstr "duplikaatinskrywing tydens skryf van bitmap-indeks: %s"
+
+#, c-format
+msgid "attempted to store non-selected commit: '%s'"
+msgstr "het probeer om nie-geselekteerde vaslegging te stoor: '%s'"
+
+msgid "too many pseudo-merges"
+msgstr "te veel pseudo-saamsmeltings"
+
+msgid "failed to load bitmap index (corrupted?)"
+msgstr "kon nie bitmap-indeks laai nie (korrup?)"
+
+msgid "corrupted bitmap index (too small)"
+msgstr "korrupte bitmap-indeks (te klein)"
+
+msgid "corrupted bitmap index file (wrong header)"
+msgstr "korrupte bitmap-indekslêer (verkeerde kopstuk)"
+
+#, c-format
+msgid "unsupported version '%d' for bitmap index file"
+msgstr "nie-ondersteunde weergawe '%d' vir bitmap-indekslêer"
+
+msgid "corrupted bitmap index file (too short to fit hash cache)"
+msgstr "korrupte bitmap-indekslêer (te kort om hash-kas te bevat)"
+
+msgid "corrupted bitmap index file (too short to fit lookup table)"
+msgstr "korrupte bitmap-indekslêer (te kort om opsoektabel te bevat)"
+
+msgid ""
+"corrupted bitmap index file (too short to fit pseudo-merge table header)"
+msgstr ""
+"korrupte bitmap-indekslêer (te kort om pseudo-saamsmelttabel se kopstuk te "
+"bevat)"
+
+msgid "corrupted bitmap index file (too short to fit pseudo-merge table)"
+msgstr "korrupte bitmap-indekslêer (te kort om pseudo-saamsmelttabel te bevat)"
+
+msgid "corrupted bitmap index file, pseudo-merge table too short"
+msgstr "korrupte bitmap-indekslêer, pseudo-saamsmelttabel te kort"
+
+#, c-format
+msgid "duplicate entry in bitmap index: '%s'"
+msgstr "duplikaatinskrywing in bitmap-indeks: '%s'"
+
+#, c-format
+msgid "corrupt ewah bitmap: truncated header for entry %d"
+msgstr "korrupte ewah-bitmap: afgekapte kopstuk vir inskrywing %d"
+
+#, c-format
+msgid "corrupt ewah bitmap: commit index %u out of range"
+msgstr "korrupte ewah-bitmap: vasleggingsindeks %u buite bereik"
+
+msgid "corrupted bitmap pack index"
+msgstr "korrupte bitmap-pakindeks"
+
+msgid "invalid XOR offset in bitmap pack index"
+msgstr "ongeldige XOR-verplasing in bitmap-pakindeks"
+
+msgid "cannot fstat bitmap file"
+msgstr "kan nie fstat op bitmap-lêer doen nie"
+
+msgid "checksum doesn't match in MIDX and bitmap"
+msgstr "kontrolesom stem nie ooreen in MIDX en bitmap nie"
+
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "multipak-bitmap ontbreek vereiste omgekeerde indeks"
+
+#, c-format
+msgid "could not open pack %s"
+msgstr "kon nie pak %s oopmaak nie"
+
+msgid "could not open bitmap for base MIDX"
+msgstr "kon nie bitmap vir basis-MIDX oopmaak nie"
+
+msgid "corrupt bitmap lookup table: triplet position out of index"
+msgstr "korrupte bitmap-opsoektabel: drietal-posisie buite indeks"
+
+msgid "corrupt bitmap lookup table: xor chain exceeds entry count"
+msgstr ""
+"korrupte bitmap-opsoektabel: xor-ketting oorskry die aantal inskrywings"
+
+#, c-format
+msgid "corrupt bitmap lookup table: commit index %u out of range"
+msgstr "korrupte bitmap-opsoektabel: vasleggingsindeks %u buite bereik"
+
+#, c-format
+msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\""
+msgstr ""
+"korrupte ewah-bitmap: afgekapte kopstuk vir bitmap van vaslegging \"%s\""
+
+#, c-format
+msgid "unable to load pack: '%s', disabling pack-reuse"
+msgstr "kan nie pak '%s' laai nie; pak-hergebruik word gedeaktiveer"
+
+msgid "unable to compute preferred pack, disabling pack-reuse"
+msgstr "kan nie voorkeurpak bereken nie; pak-hergebruik word gedeaktiveer"
+
+#, c-format
+msgid "object '%s' not found in type bitmaps"
+msgstr "objek '%s' nie in tipe-bitmaps gevind nie"
+
+#, c-format
+msgid "object '%s' does not have a unique type"
+msgstr "objek '%s' het nie 'n unieke tipe nie"
+
+#, c-format
+msgid "object '%s': real type '%s', expected: '%s'"
+msgstr "objek '%s': werklike tipe '%s', verwag: '%s'"
+
+#, c-format
+msgid "object not in bitmap: '%s'"
+msgstr "objek nie in bitmap nie: '%s'"
+
+msgid "failed to load bitmap indexes"
+msgstr "kon nie bitmap-indekse laai nie"
+
+msgid "you must specify exactly one commit to test"
+msgstr "jy moet presies een vaslegging spesifiseer om te toets"
+
+#, c-format
+msgid "commit '%s' doesn't have an indexed bitmap"
+msgstr "vaslegging '%s' het nie 'n geïndekseerde bitmap nie"
+
+msgid "mismatch in bitmap results"
+msgstr "wanpassing in bitmap-resultate"
+
+#, c-format
+msgid "pseudo-merge index out of range (%<PRIu32> >= %<PRIuMAX>)"
+msgstr "pseudo-saamsmeltingsindeks buite bereik (%<PRIu32> >= %<PRIuMAX>)"
+
+#, c-format
+msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>"
+msgstr "kon nie '%s' in pak '%s' by afset %<PRIuMAX> vind nie"
+
+#, c-format
+msgid "unable to get disk usage of '%s'"
+msgstr "kan nie skyfgebruik van '%s' bepaal nie"
+
+#, c-format
+msgid "bitmap file '%s' has invalid checksum"
+msgstr "bitmap-lêer '%s' het 'n ongeldige kontrolesom"
+
+#, c-format
+msgid "mtimes file %s is too small"
+msgstr "mtimes-lêer %s is te klein"
+
+#, c-format
+msgid "mtimes file %s has unknown signature"
+msgstr "mtimes-lêer %s het 'n onbekende handtekening"
+
+#, c-format
+msgid "mtimes file %s has unsupported version %<PRIu32>"
+msgstr "mtimes-lêer %s het nie-ondersteunde weergawe %<PRIu32>"
+
+#, c-format
+msgid "mtimes file %s has unsupported hash id %<PRIu32>"
+msgstr "mtimes-lêer %s het nie-ondersteunde hash-id %<PRIu32>"
+
+#, c-format
+msgid "mtimes file %s is corrupt"
+msgstr "mtimes-lêer %s is korrup"
+
+msgid "pack everything"
+msgstr "pak alles"
+
+msgid "prune loose refs (default)"
+msgstr "snoei los verwysings (verstek)"
+
+msgid "auto-pack refs as needed"
+msgstr "pak verwysings outomaties soos nodig"
+
+msgid "references to include"
+msgstr "verwysings om in te sluit"
+
+msgid "references to exclude"
+msgstr "verwysings om uit te sluit"
+
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "omgekeerde-indekslêer %s is te klein"
+
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "omgekeerde-indekslêer %s is korrup"
+
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "omgekeerde-indekslêer %s het 'n onbekende handtekening"
+
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "omgekeerde-indekslêer %s het nie-ondersteunde weergawe %<PRIu32>"
+
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr "omgekeerde-indekslêer %s het nie-ondersteunde hash-id %<PRIu32>"
+
+msgid "invalid checksum"
+msgstr "ongeldige kontrolesom"
+
+#, c-format
+msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>"
+msgstr "ongeldige rev-index-posisie by %<PRIu64>: %<PRIu32> != %<PRIu32>"
+
+msgid "multi-pack-index reverse-index chunk is the wrong size"
+msgstr "multi-pack-index se omgekeerde-indeks-stuk het die verkeerde grootte"
+
+msgid "cannot both write and verify reverse index"
+msgstr "kan nie die omgekeerde indeks gelyktydig skryf en verifieer nie"
+
+#, c-format
+msgid "could not stat: %s"
+msgstr "kon nie stat nie: %s"
+
+#, c-format
+msgid "failed to make %s readable"
+msgstr "kon nie %s leesbaar maak nie"
+
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "kon nie belofte-lêer '%s' skryf nie"
+
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "afset voor einde van paklêer (gebreekte .idx?)"
+
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "paklêer %s kan nie gekarteer word nie%s"
+
+#, c-format
+msgid "could not load .mtimes for cruft pack '%s'"
+msgstr "kon nie .mtimes vir afvalpak '%s' laai nie"
+
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "afset voor begin van pakindeks vir %s (korrupte indeks?)"
+
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "afset verby einde van pakindeks vir %s (afgekapte indeks?)"
+
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "misvormde vervaldatum '%s'"
+
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "opsie `%s' verwag \"always\", \"auto\" of \"never\""
+
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "misvormde objeknaam '%s'"
+
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "opsie `%s' verwag \"%s\" of \"%s\""
+
+#, c-format
+msgid "%s requires a value"
+msgstr "%s vereis 'n waarde"
+
+#, c-format
+msgid "%s takes no value"
+msgstr "%s neem geen waarde nie"
+
+#, c-format
+msgid "%s isn't available"
+msgstr "%s is nie beskikbaar nie"
+
+#, c-format
+msgid "value for %s exceeds %<PRIdMAX>"
+msgstr "waarde vir %s oorskry %<PRIdMAX>"
+
+#, c-format
+msgid "value %s for %s not in range [%<PRIdMAX>,%<PRIdMAX>]"
+msgstr "waarde %s vir %s nie in bereik [%<PRIdMAX>,%<PRIdMAX>] nie"
+
+#, c-format
+msgid "%s expects an integer value with an optional k/m/g suffix"
+msgstr "%s verwag 'n heelgetalwaarde met 'n opsionele k/m/g-agtervoegsel"
+
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr ""
+"%s verwag 'n nie-negatiewe heelgetalwaarde met 'n opsionele k/m/g-"
+"agtervoegsel"
+
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "dubbelsinnige opsie: %s (kan --%s%s of --%s%s wees)"
+
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "het jy `--%s` (met twee strepies) bedoel?"
+
+#, c-format
+msgid "alias of --%s"
+msgstr "alias van --%s"
+
+msgid "need a subcommand"
+msgstr "benodig 'n subopdrag"
+
+#, c-format
+msgid "unknown option `%s'"
+msgstr "onbekende opsie `%s'"
+
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "onbekende skakelaar `%c'"
+
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "onbekende nie-ASCII-opsie in string: `%s'"
+
+#. TRANSLATORS: The "<%s>" part of this string
+#. stands for an optional value given to a command
+#. line option in the long form, and "<>" is there
+#. as a convention to signal that it is a
+#. placeholder (i.e. the user should substitute it
+#. with the real value).  If your language uses a
+#. different convention, you can change "<%s>" part
+#. to match yours, e.g. it might use "|%s|" instead,
+#. or if the alphabet is different enough it may use
+#. "%s" without any placeholder signal.  Most
+#. translations leave this message as is.
+#.
+#, c-format
+msgid "[=<%s>]"
+msgstr "[=<%s>]"
+
+#. TRANSLATORS: The "<%s>" part of this string
+#. stands for an optional value given to a command
+#. line option in the short form, and "<>" is there
+#. as a convention to signal that it is a
+#. placeholder (i.e. the user should substitute it
+#. with the real value).  If your language uses a
+#. different convention, you can change "<%s>" part
+#. to match yours, e.g. it might use "|%s|" instead,
+#. or if the alphabet is different enough it may use
+#. "%s" without any placeholder signal.  Most
+#. translations leave this message as is.
+#.
+#, c-format
+msgid "[<%s>]"
+msgstr "[<%s>]"
+
+#. TRANSLATORS: The "<%s>" part of this string stands for a
+#. value given to a command line option, and "<>" is there
+#. as a convention to signal that it is a placeholder
+#. (i.e. the user should substitute it with the real value).
+#. If your language uses a different convention, you can
+#. change "<%s>" part to match yours, e.g. it might use
+#. "|%s|" instead, or if the alphabet is different enough it
+#. may use "%s" without any placeholder signal.  Most
+#. translations leave this message as is.
+#.
+#, c-format
+msgid " <%s>"
+msgstr " <%s>"
+
+msgid "..."
+msgstr "..."
+
+#, c-format
+msgid "usage: %s"
+msgstr "gebruik: %s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#, c-format
+msgid "   or: %s"
+msgstr "     of: %s"
+
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#, c-format
+msgid "    %s"
+msgstr "    %s"
+
+msgid "-NUM"
+msgstr "-GETAL"
+
+#, c-format
+msgid "opposite of --no-%s"
+msgstr "teenoorgestelde van --no-%s"
+
+msgid "expiry-date"
+msgstr "vervaldatum"
+
+msgid "no-op (backward compatibility)"
+msgstr "geen-bewerking (terugwaartse versoenbaarheid)"
+
+msgid "be more verbose"
+msgstr "wees meer breedsprakig"
+
+msgid "be more quiet"
+msgstr "wees stiller"
+
+msgid "use <n> digits to display object names"
+msgstr "gebruik <n> syfers om objekname te vertoon"
+
+msgid "prefixed path to initial superproject"
+msgstr "voorvoegselpad na aanvanklike superprojek"
+
+msgid "how to strip spaces and #comments from message"
+msgstr "hoe om spasies en #kommentaar uit die boodskap te stroop"
+
+msgid "read pathspec from file"
+msgstr "lees padspesifikasie uit lêer"
+
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr ""
+"met --pathspec-from-file word padspesifikasie-elemente met die NUL-karakter "
+"geskei"
+
+#, c-format
+msgid "bad boolean environment value '%s' for '%s'"
+msgstr "slegte Booleaanse omgewingswaarde '%s' vir '%s'"
+
+#, c-format
+msgid "failed to walk children of tree %s: not found"
+msgstr "kon nie kinders van boom %s deurloop nie: nie gevind nie"
+
+#, c-format
+msgid "failed to find object %s"
+msgstr "kon nie objek %s vind nie"
+
+#, c-format
+msgid "failed to find tag %s"
+msgstr "kon nie etiket %s vind nie"
+
+#, c-format
+msgid "tree:%lu filter not supported by the path-walk API"
+msgstr "tree:%lu-filter word nie deur die path-walk-API ondersteun nie"
+
+msgid "sparse filter cannot be combined with existing sparse patterns"
+msgstr "yl-filter kan nie met bestaande yl-patrone gekombineer word nie"
+
+#, c-format
+msgid "unable to parse sparse filter data in '%s'"
+msgstr "kan nie yl-filterdata in '%s' ontleed nie"
+
+msgid "sparse filter is not cone-mode compatible"
+msgstr "yl-filter is nie keëlmodus-versoenbaar nie"
+
+#, c-format
+msgid "object filter '%s' not supported by the path-walk API"
+msgstr "objekfilter '%s' word nie deur die path-walk-API ondersteun nie"
+
+msgid "failed to setup revision walk"
+msgstr "kon nie revisie-deurloop opstel nie"
+
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Kon nie %s skryfbaar vir die groep maak nie"
+
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr ""
+"Ontsnapkarakter '\\' word nie as laaste karakter in 'n attr-waarde toegelaat "
+"nie"
+
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Slegs een 'attr:'-spesifikasie word toegelaat."
+
+msgid "attr spec must not be empty"
+msgstr "attr-spesifikasie mag nie leeg wees nie"
+
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "ongeldige attribuutnaam %s"
+
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr ""
+"globale 'glob'- en 'noglob'-padspesifikasie-instellings is onversoenbaar"
+
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"globale 'literal'-padspesifikasie-instelling is onversoenbaar met alle ander "
+"globale padspesifikasie-instellings"
+
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "ongeldige parameter vir padspesifikasie-magie 'prefix'"
+
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "Ongeldige padspesifikasie-magie '%.*s' in '%s'"
+
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "Ontbrekende ')' aan die einde van padspesifikasie-magie in '%s'"
+
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Ongeïmplementeerde padspesifikasie-magie '%c' in '%s'"
+
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: 'literal' en 'glob' is onversoenbaar"
+
+#, c-format
+msgid "'%s' is outside the directory tree"
+msgstr "'%s' is buite die gidsboom"
+
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: '%s' is buite die bewaarplek by '%s'"
+
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "'%s' (geheuehulp: '%c')"
+
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr ""
+"%s: padspesifikasie-magie word nie deur hierdie opdrag ondersteun nie: %s"
+
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "padspesifikasie '%s' is anderkant 'n simboliese skakel"
+
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "reël is swak aangehaal: %s"
+
+msgid "unable to write flush packet"
+msgstr "kan nie spoel-pakkie skryf nie"
+
+msgid "unable to write delim packet"
+msgstr "kan nie skeidings-pakkie skryf nie"
+
+msgid "unable to write response end packet"
+msgstr "kan nie reaksie-einde-pakkie skryf nie"
+
+msgid "flush packet write failed"
+msgstr "skryf van spoel-pakkie het misluk"
+
+msgid "protocol error: impossibly long line"
+msgstr "protokolfout: onmoontlik lang reël"
+
+msgid "packet write with format failed"
+msgstr "skryf van pakkie met formaat het misluk"
+
+msgid "packet write failed - data exceeds max packet size"
+msgstr "skryf van pakkie het misluk - data oorskry maksimum pakkiegrootte"
+
+#, c-format
+msgid "packet write failed: %s"
+msgstr "skryf van pakkie het misluk: %s"
+
+msgid "read error"
+msgstr "leesfout"
+
+msgid "the remote end hung up unexpectedly"
+msgstr "die afgeleë kant het die verbinding onverwags verbreek"
+
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
+msgstr "protokolfout: slegte reëllengte-karakter: %.4s"
+
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr "protokolfout: slegte reëllengte %d"
+
+#, c-format
+msgid "remote error: %s"
+msgstr "afgeleë fout: %s"
+
+msgid "Refreshing index"
+msgstr "Verfris indeks"
+
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr "kan nie gedrade lstat skep nie: %s"
+
+msgid "unable to parse --pretty format"
+msgstr "kan nie formaat --pretty ontleed nie"
+
+#, c-format
+msgid "%s is not supported by this command"
+msgstr "%s word nie deur hierdie opdrag ondersteun nie"
+
+msgid "lazy fetching disabled; some objects may not be available"
+msgstr "lui haal gedeaktiveer; sommige objekte is dalk nie beskikbaar nie"
+
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "promisor-remote: kan nie haal-subproses afsplits nie"
+
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr "promisor-remote: kon nie na haal-subproses skryf nie"
+
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr "promisor-remote: kon nie stdin na haal-subproses sluit nie"
+
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "naam van belofte-afgeleë kan nie met '/' begin nie: %s"
+
+#, c-format
+msgid "could not fetch %s from promisor remote"
+msgstr "kon nie %s van belofte-afgeleë haal nie"
+
+#, c-format
+msgid "unsupported field '%s' in '%s' config"
+msgstr "nie-ondersteunde veld '%s' in '%s'-konfigurasie"
+
+#, c-format
+msgid ""
+"invalid remote name '%s' before '=' sign in '%s' from "
+"promisor.acceptFromServerUrl config"
+msgstr ""
+"ongeldige afgeleë naam '%s' voor die teken '=' in '%s' uit die konfigurasie "
+"promisor.acceptFromServerUrl"
+
+#, c-format
+msgid ""
+"invalid url pattern '%s' in '%s' from promisor.acceptFromServerUrl config"
+msgstr ""
+"ongeldige URL-patroon '%s' in '%s' uit die konfigurasie "
+"promisor.acceptFromServerUrl"
+
+#, c-format
+msgid ""
+"couldn't generate a valid remote name from advertised url '%s', ignoring "
+"this remote"
+msgstr ""
+"kon nie 'n geldige afgeleë naam uit geadverteerde url '%s' genereer nie; "
+"hierdie afgeleë word geïgnoreer"
+
+#, c-format
+msgid ""
+"generated remote name '%s' from advertised url '%s' is invalid, ignoring "
+"this remote"
+msgstr ""
+"gegenereerde afgeleë naam '%s' uit geadverteerde url '%s' is ongeldig; "
+"hierdie afgeleë word geïgnoreer"
+
+#, c-format
+msgid "couldn't normalize advertised url '%s', ignoring this remote"
+msgstr ""
+"kon nie geadverteerde url '%s' normaliseer nie; hierdie afgeleë word "
+"geïgnoreer"
+
+#, c-format
+msgid "Auto-creating promisor remote '%s' for URL '%s'\n"
+msgstr "Skep outomaties afgeleë beloftegewer '%s' vir URL '%s'\n"
+
+#, c-format
+msgid "too many remotes accepted with name like '%s-X', ignoring this remote"
+msgstr ""
+"te veel afgeleës aanvaar met 'n naam soos '%s-X'; hierdie afgeleë word "
+"geïgnoreer"
+
+#, c-format
+msgid ""
+"known remote named '%s' but with URL '%s' instead of '%s', ignoring this "
+"remote"
+msgstr ""
+"bekende afgeleë genaamd '%s' maar met URL '%s' in plaas van '%s'; hierdie "
+"afgeleë word geïgnoreer"
+
+#, c-format
+msgid "invalid element '%s' from remote info"
+msgstr "ongeldige element '%s' uit afgeleë-inligting"
+
+#, c-format
+msgid ""
+"server advertised a promisor remote without a name or URL: '%s', ignoring "
+"this remote"
+msgstr ""
+"bediener het 'n belofte-afgeleë sonder 'n naam of URL geadverteer: '%s'; "
+"hierdie afgeleë word geïgnoreer"
+
+#, c-format
+msgid ""
+"Storing new %s from server for remote '%s'.\n"
+"    '%s' -> '%s'\n"
+msgstr ""
+"Stoor nuwe %s van bediener vir afgeleë '%s'.\n"
+"    '%s' -> '%s'\n"
+
+#, c-format
+msgid "invalid filter '%s' for remote '%s' will not be stored: %s"
+msgstr "ongeldige filter '%s' vir afgeleë '%s' sal nie gestoor word nie: %s"
+
+#, c-format
+msgid "invalid token '%s' for remote '%s' will not be stored"
+msgstr "ongeldige toegangsteken '%s' vir afgeleë '%s' sal nie gestoor word nie"
+
+#, c-format
+msgid "unknown '%s' value for '%s' config option"
+msgstr "onbekende '%s'-waarde vir '%s'-konfigurasie-opsie"
+
+#, c-format
+msgid "accepted promisor remote '%s' not found"
+msgstr "aanvaarde belofte-afgeleë '%s' nie gevind nie"
+
+#, c-format
+msgid "promisor remote '%s' advertised invalid filter '%s': %s"
+msgstr "belofte-afgeleë '%s' het ongeldige filter '%s' geadverteer: %s"
+
+msgid "object-info: expected flush after arguments"
+msgstr "object-info: het spoel ná argumente verwag"
+
+msgid "Removing duplicate objects"
+msgstr "Verwyder duplikaat-objekte"
+
+#, c-format
+msgid "failed to load pseudo-merge regex for %s: '%s'"
+msgstr "kon nie pseudo-saamsmelting-regex vir %s laai nie: '%s'"
+
+#, c-format
+msgid "%s must be non-negative, using default"
+msgstr "%s moet nie-negatief wees; verstek word gebruik"
+
+#, c-format
+msgid "%s must be between 0 (exclusive) and 1, using default"
+msgstr "%s moet tussen 0 (uitgesluit) en 1 wees; verstek word gebruik"
+
+#, c-format
+msgid "%s must be positive, using default"
+msgstr "%s moet positief wees; verstek word gebruik"
+
+#, c-format
+msgid "pseudo-merge group '%s' missing required pattern"
+msgstr "pseudo-saamsmeltingsgroep '%s' mis 'n vereiste patroon"
+
+#, c-format
+msgid "pseudo-merge group '%s' has unstable threshold before stable one"
+msgstr ""
+"pseudo-saamsmeltingsgroep '%s' het 'n onstabiele drempel voor die stabiele "
+"een"
+
+#, c-format
+msgid ""
+"pseudo-merge regex from config has too many capture groups (max=%<PRIuMAX>)"
+msgstr ""
+"pseudo-saamsmelting-regex uit konfigurasie het te veel vanggroepe "
+"(maks=%<PRIuMAX>)"
+
+#, c-format
+msgid "extended pseudo-merge read out-of-bounds (%<PRIuMAX> >= %<PRIuMAX>)"
+msgstr ""
+"uitgebreide pseudo-saamsmelting-lees buite grense (%<PRIuMAX> >= %<PRIuMAX>)"
+
+#, c-format
+msgid "extended pseudo-merge entry is too short (%<PRIuMAX> >= %<PRIuMAX>)"
+msgstr ""
+"uitgebreide pseudo-saamsmelting-inskrywing is te kort (%<PRIuMAX> >= "
+"%<PRIuMAX>)"
+
+#, c-format
+msgid "could not find pseudo-merge for commit %s at offset %<PRIuMAX>"
+msgstr ""
+"kon nie pseudo-saamsmelting vir vaslegging %s by afset %<PRIuMAX> vind nie"
+
+#, c-format
+msgid "extended pseudo-merge lookup out-of-bounds (%<PRIu32> >= %<PRIu32>)"
+msgstr ""
+"uitgebreide pseudo-saamsmelting-opsoek buite grense (%<PRIu32> >= %<PRIu32>)"
+
+#, c-format
+msgid "out-of-bounds read: (%<PRIuMAX> >= %<PRIuMAX>)"
+msgstr "lees buite grense: (%<PRIuMAX> >= %<PRIuMAX>)"
+
+#, c-format
+msgid "could not read extended pseudo-merge table for commit %s"
+msgstr ""
+"kon nie uitgebreide pseudo-saamsmeltingstabel vir vaslegging %s lees nie"
+
+msgid "could not start `log`"
+msgstr "kon nie `log` begin nie"
+
+msgid "could not read `log` output"
+msgstr "kon nie `log`-afvoer lees nie"
+
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "kon nie vaslegging '%s' ontleed nie"
+
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+"kon nie eerste reël van `log`-afvoer ontleed nie: het nie met 'commit ' "
+"begin nie: '%s'"
+
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "kon nie Git-kopstuk '%.*s' ontleed nie"
+
+msgid "failed to generate diff"
+msgstr "kon nie verskil genereer nie"
+
+#, c-format
+msgid ""
+"range-diff: unable to compute the range-diff, since it exceeds the maximum "
+"memory for the cost matrix: %s (%<PRIuMAX> bytes) needed, limited to %s "
+"(%<PRIuMAX> bytes)"
+msgstr ""
+"range-diff: kan nie die range-diff bereken nie, aangesien dit die maksimum "
+"geheue vir die kostematriks oorskry: %s (%<PRIuMAX> grepe) benodig, beperk "
+"tot %s (%<PRIuMAX> grepe)"
+
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr "kon nie logboek vir '%s' ontleed nie"
+
+#, c-format
+msgid "invalid extra cruft tip: '%s'"
+msgstr "ongeldige ekstra afval-punt: '%s'"
+
+msgid "unable to enumerate additional recent objects"
+msgstr "kan nie bykomende onlangse objekte opsom nie"
+
+#, c-format
+msgid "remove '%s'\n"
+msgstr "verwyder '%s'\n"
+
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "sal nie lêeralias '%s' byvoeg nie ('%s' bestaan reeds in indeks)"
+
+msgid "cannot create an empty blob in the object database"
+msgstr "kan nie 'n leë blob in die objekdatabasis skep nie"
+
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr "%s: kan slegs gewone lêers, simboliese skakels of Git-gidse byvoeg"
+
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "kan nie lêer '%s' indekseer nie"
+
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "kan nie '%s' by indeks voeg nie"
+
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "'%s' verskyn as beide 'n lêer en 'n gids"
+
+msgid "Refresh index"
+msgstr "Verfris indeks"
+
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"index.version is gestel, maar die waarde is ongeldig.\n"
+"Gebruik weergawe %i"
+
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"GIT_INDEX_VERSION is gestel, maar die waarde is ongeldig.\n"
+"Gebruik weergawe %i"
+
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "slegte handtekening 0x%08x"
+
+#, c-format
+msgid "bad index version %d"
+msgstr "slegte indeksweergawe %d"
+
+msgid "bad index file sha1 signature"
+msgstr "slegte sha1-handtekening van indekslêer"
+
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "indeks gebruik %.4s-uitbreiding, wat ons nie verstaan nie"
+
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "ignoreer %.4s-uitbreiding"
+
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "onbekende indeksinskrywingformaat 0x%08x"
+
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr "misvormde naamveld in die indeks, naby pad '%s'"
+
+msgid "unordered stage entries in index"
+msgstr "ongeordende stadium-inskrywings in indeks"
+
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "veelvuldige stadium-inskrywings vir saamgesmelte lêer '%s'"
+
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "ongeordende stadium-inskrywings vir '%s'"
+
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr "kan nie load_cache_entries-draad skep nie: %s"
+
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr "kan nie by load_cache_entries-draad aansluit nie: %s"
+
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: oopmaak van indekslêer het misluk"
+
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: kan nie stat op die oop indeks doen nie"
+
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: indekslêer kleiner as verwag"
+
+#, c-format
+msgid "%s: unable to map index file%s"
+msgstr "%s: kan nie indekslêer karteer nie%s"
+
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr "kan nie load_index_extensions-draad skep nie: %s"
+
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr "kan nie by load_index_extensions-draad aansluit nie: %s"
+
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "kon nie gedeelde indeks '%s' verfris nie"
+
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "gebreekte indeks, het %s in %s verwag, maar %s gekry"
+
+msgid "cannot write split index for a sparse index"
+msgstr "kan nie gesplitste indeks vir 'n yl indeks skryf nie"
+
+msgid "failed to convert to a sparse-index"
+msgstr "kon nie na 'n yl indeks omskakel nie"
+
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "kan nie Git-gids oopmaak nie: %s"
+
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "kan nie ontkoppel nie: %s"
+
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "kan nie toestemmingsbisse op '%s' regstel nie"
+
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s: kan nie na stadium #0 laat val nie"
+
+#, c-format
+msgid ""
+"Skipping submodule due to ignore=all: %s\n"
+"Use --force if you really want to add the submodule."
+msgstr ""
+"Slaan submodule oor weens ignore=all: %s\n"
+"Gebruik --force as jy die submodule regtig wil byvoeg."
+
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "onverwagte verskilstatus %c"
+
+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 ""
+"Jy kan dit regstel met 'git rebase --edit-todo' en dan 'git rebase --"
+"continue' uitvoer.\n"
+"Of jy kan die herbasering staak met 'git rebase --abort'.\n"
+
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"onherkende instelling %s vir opsie rebase.missingCommitsCheck. Word "
+"geïgnoreer."
+
+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 [-C | -c] <commit> = like \"squash\" but keep only the previous\n"
+"                   commit's log message, unless -C is used, in which case\n"
+"                   keep only this commit's message; -c is same as -C but\n"
+"                   opens the editor\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"
+"u, update-ref <ref> = track a placeholder for the <ref> to be updated\n"
+"                      to this position in the new commits. The <ref> is\n"
+"                      updated at the end of the rebase\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+"\n"
+"Opdragte:\n"
+"p, pick <vaslegging> = gebruik vaslegging\n"
+"r, reword <vaslegging> = gebruik vaslegging, maar wysig die "
+"vasleggingsboodskap\n"
+"e, edit <vaslegging> = gebruik vaslegging, maar stop om te wysig\n"
+"s, squash <vaslegging> = gebruik vaslegging, maar smelt dit in die vorige "
+"vaslegging in\n"
+"f, fixup [-C | -c] <vaslegging> = soos \"squash\", maar behou slegs die "
+"vorige\n"
+"                   vaslegging se logboodskap, tensy -C gebruik word; in "
+"daardie geval\n"
+"                   word slegs hierdie vaslegging se boodskap behou; -c is "
+"dieselfde as -C,\n"
+"                   maar maak die redigeerder oop\n"
+"x, exec <opdrag> = voer opdrag (die res van die reël) met die dop uit\n"
+"b, break = stop hier (gaan later met die herbasering voort met 'git rebase --"
+"continue')\n"
+"d, drop <vaslegging> = verwyder vaslegging\n"
+"l, label <merker> = merk huidige HEAD met 'n naam\n"
+"t, reset <merker> = stel HEAD terug na 'n merker\n"
+"m, merge [-C <vaslegging> | -c <vaslegging>] <merker> [# <eenreël>]\n"
+"        skep 'n saamsmeltvaslegging met die oorspronklike "
+"saamsmeltvaslegging se\n"
+"        boodskap (of die eenreël, as geen oorspronklike saamsmeltvaslegging\n"
+"        gespesifiseer is nie); gebruik -c <vaslegging> om die "
+"vasleggingsboodskap te herformuleer\n"
+"u, update-ref <verwysing> = hou 'n plekhouer by vir die <verwysing> wat na "
+"hierdie\n"
+"                      posisie in die nuwe vasleggings bygewerk moet word. "
+"Die <verwysing>\n"
+"                      word aan die einde van die herbasering bygewerk\n"
+"\n"
+"Hierdie reëls kan herrangskik word; hulle word van bo na onder uitgevoer.\n"
+
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "Herbaseer %s op %s (%d opdrag)"
+msgstr[1] "Herbaseer %s op %s (%d opdragte)"
+
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"Moenie enige reël verwyder nie. Gebruik 'drop' uitdruklik om 'n vaslegging "
+"te verwyder.\n"
+
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"As jy 'n reël hier verwyder, SAL DAARDIE VASLEGGING VERLORE GAAN.\n"
+
+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"
+"Jy wysig die todo-lêer van 'n lopende interaktiewe herbasering.\n"
+"Om ná die wysiging met die herbasering voort te gaan, voer uit:\n"
+"    git rebase --continue\n"
+"\n"
+
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"As jy egter alles verwyder, sal die herbasering gestaak word.\n"
+"\n"
+
+#, c-format
+msgid "could not write '%s'."
+msgstr "kon nie '%s' skryf nie."
+
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Waarskuwing: sommige vasleggings is dalk per ongeluk weggelaat.\n"
+"Weggelate vasleggings (nuwer na ouer):\n"
+
+#, 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 ""
+"Om hierdie boodskap te vermy, gebruik \"drop\" om 'n vaslegging uitdruklik "
+"te verwyder.\n"
+"\n"
+"Gebruik 'git config rebase.missingCommitsCheck' om die vlak van waarskuwings "
+"te verander.\n"
+"Die moontlike gedrag is: ignore, warn, error.\n"
+"\n"
+
+#, c-format
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: 'preserve' is vervang deur 'merges'"
+
+msgid "gone"
+msgstr "weg"
+
+#, c-format
+msgid "ahead %d"
+msgstr "voor %d"
+
+#, c-format
+msgid "behind %d"
+msgstr "agter %d"
+
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "voor %d, agter %d"
+
+#, c-format
+msgid "%%(%.*s) does not take arguments"
+msgstr "%%(%.*s) neem nie argumente nie"
+
+#, c-format
+msgid "unrecognized %%(%.*s) argument: %s"
+msgstr "onherkende %%(%.*s)-argument: %s"
+
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "verwagte formaat: %%(color:<kleur>)"
+
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "onherkende kleur: %%(color:%s)"
+
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Heelgetalwaarde verwag refname:lstrip=%s"
+
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Heelgetalwaarde verwag refname:rstrip=%s"
+
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "verwag %%(trailers:key=<waarde>)"
+
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "onbekende %%(trailers)-argument: %s"
+
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "positiewe waarde verwag contents:lines=%s"
+
+#, c-format
+msgid "argument expected for %s"
+msgstr "argument verwag vir %s"
+
+#, c-format
+msgid "positive value expected %s=%s"
+msgstr "positiewe waarde verwag %s=%s"
+
+#, c-format
+msgid "cannot fully parse %s=%s"
+msgstr "kan nie %s=%s volledig ontleed nie"
+
+#, c-format
+msgid "value expected %s="
+msgstr "waarde verwag %s="
+
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "positiewe waarde verwag '%s' in %%(%s)"
+
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "verwagte formaat: %%(align:<breedte>,<posisie>)"
+
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "onherkende posisie:%s"
+
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "onherkende breedte:%s"
+
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "onherkende %%(%s)-argument: %s"
+
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "positiewe breedte verwag met die %%(align)-atoom"
+
+#, c-format
+msgid "expected format: %%(ahead-behind:<committish>)"
+msgstr "verwagte formaat: %%(ahead-behind:<vasleggingagtige>)"
+
+#, c-format
+msgid "expected format: %%(is-base:<committish>)"
+msgstr "verwagte formaat: %%(is-base:<vasleggingagtige>)"
+
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "misvormde veldnaam: %.*s"
+
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "onbekende veldnaam: %.*s"
+
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr ""
+"nie 'n Git-bewaarplek nie, maar die veld '%.*s' vereis toegang tot objekdata"
+
+#, c-format
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "formaat: %%(%s)-atoom gebruik sonder 'n %%(%s)-atoom"
+
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "formaat: %%(then)-atoom meer as een keer gebruik"
+
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "formaat: %%(then)-atoom gebruik ná %%(else)"
+
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "formaat: %%(else)-atoom meer as een keer gebruik"
+
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "formaat: %%(end)-atoom gebruik sonder ooreenstemmende atoom"
+
+#, c-format
+msgid "malformed format string %s"
+msgstr "misvormde formaatstring %s"
+
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "hierdie opdrag verwerp atoom %%(%.*s)"
+
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr ""
+"--format=%.*s kan nie saam met --python, --shell, --tcl gebruik word nie"
+
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer het misluk op %s vir %s"
+
+msgid "failed to run 'describe'"
+msgstr "kon nie 'describe' uitvoer nie"
+
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(geen tak, herbaseer %s)"
+
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(geen tak, herbaseer ontkoppelde HEAD %s)"
+
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "(geen tak, halvering begin op %s)"
+
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD ontkoppel by %s)"
+
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD ontkoppel van %s)"
+
+msgid "(no branch)"
+msgstr "(geen tak)"
+
+#, c-format
+msgid "missing object %s for %s"
+msgstr "ontbrekende objek %s vir %s"
+
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "misvormde objek by '%s'"
+
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "ignoreer verwysing met gebreekte naam %s"
+
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "ignoreer gebreekte verwysing %s"
+
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "formaat: %%(end)-atoom ontbreek"
+
+#, c-format
+msgid "malformed object name %s"
+msgstr "misvormde objeknaam %s"
+
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "opsie `%s' moet na 'n vaslegging wys"
+
+msgid "key"
+msgstr "sleutel"
+
+msgid "field name to sort on"
+msgstr "veldnaam om op te sorteer"
+
+msgid "exclude refs which match pattern"
+msgstr "sluit verwysings uit wat by die patroon pas"
+
+#, c-format
+msgid "not a reflog: %s"
+msgstr "nie 'n reflog nie: %s"
+
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "geen reflog vir '%s' nie"
+
+#, c-format
+msgid "in '%s' phase, update aborted by the reference-transaction hook"
+msgstr "in '%s'-fase is bywerking deur die reference-transaction-haak gestaak"
+
+msgid "Checking references consistency"
+msgstr "Kontroleer verwysingskonsekwentheid"
+
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s wys nie na 'n geldige objek nie!"
+
+#, c-format
+msgid "%s%s will become dangling after %s is deleted\n"
+msgstr "%s%s sal hangend word nadat %s geskrap is\n"
+
+#, c-format
+msgid "%s%s has become dangling after %s was deleted\n"
+msgstr "%s%s het hangend geword nadat %s geskrap is\n"
+
+#, c-format
+msgid ""
+"Using '%s' as the name for the initial branch. This default branch name\n"
+"will change to \"main\" in Git 3.0. To configure the initial branch name\n"
+"to use in all of your new repositories, which will suppress this warning,\n"
+"call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"Gebruik '%s' as die naam vir die aanvanklike tak. Hierdie verstek-taknaam\n"
+"sal in Git 3.0 na \"main\" verander. Om die aanvanklike taknaam vir al jou\n"
+"nuwe bewaarplekke te konfigureer, wat hierdie waarskuwing sal onderdruk,\n"
+"voer uit:\n"
+"\n"
+"\tgit config --global init.defaultBranch <naam>\n"
+"\n"
+"Name wat algemeen in plaas van 'master' gekies word, is 'main', 'trunk' en\n"
+"'development'. Die pas geskepte tak kan met hierdie opdrag hernoem word:\n"
+"\n"
+"\tgit branch -m <naam>\n"
+
+#, c-format
+msgid ""
+"Using '%s' as the name for the initial branch since Git 3.0.\n"
+"If you expected Git to create 'master', the just-created\n"
+"branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m master\n"
+msgstr ""
+"Gebruik '%s' as die naam vir die aanvanklike tak sedert Git 3.0.\n"
+"As jy verwag het dat Git 'master' sou skep, kan die pas geskepte\n"
+"tak met hierdie opdrag hernoem word:\n"
+"\n"
+"\tgit branch -m master\n"
+
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "kon nie `%s` ophaal nie"
+
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "ongeldige taknaam: %s = %s"
+
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "ignoreer hangende simboliese verwysing %s"
+
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "logboek vir verwysing %s het 'n gaping ná %s"
+
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "logboek vir verwysing %s het onverwags op %s geëindig"
+
+#, c-format
+msgid "log for %s is empty"
+msgstr "logboek vir %s is leeg"
+
+#, c-format
+msgid "refusing to update reflog for pseudoref '%s'"
+msgstr "weier om reflog vir pseudo-verwysing '%s' by te werk"
+
+#, c-format
+msgid "refusing to update pseudoref '%s'"
+msgstr "weier om pseudo-verwysing '%s' by te werk"
+
+#, c-format
+msgid "refusing to update reflog with bad name '%s'"
+msgstr "weier om reflog met slegte naam '%s' by te werk"
+
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "weier om verwysing met slegte naam '%s' by te werk"
+
+msgid "refusing to force and skip creation of reflog"
+msgstr "weier om te forseer en die skepping van reflog oor te slaan"
+
+#, c-format
+msgid "trying to write ref '%s' with nonexistent object %s"
+msgstr "probeer verwysing '%s' skryf met nie-bestaande objek %s"
+
+#, c-format
+msgid "trying to write non-commit object %s to branch '%s'"
+msgstr "probeer nie-vaslegging-objek %s na tak '%s' skryf"
+
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref het misluk vir verwysing '%s': %s"
+
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "veelvuldige bywerkings vir verwysing '%s' word nie toegelaat nie"
+
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "verwysingsbywerkings is verbode binne 'n kwarantyn-omgewing"
+
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' bestaan; kan nie '%s' skep nie"
+
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "kan nie '%s' en '%s' terselfdertyd verwerk nie"
+
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "kon nie verwysing %s skrap nie: %s"
+
+#, c-format
+msgid "could not delete references: %s"
+msgstr "kon nie verwysings skrap nie: %s"
+
+#, c-format
+msgid "Finished dry-run migration of refs, the result can be found at '%s'\n"
+msgstr ""
+"Proeflopie-migrasie van verwysings voltooi; die resultaat kan by '%s' gevind "
+"word\n"
+
+#, c-format
+msgid "could not remove temporary migration directory '%s'"
+msgstr "kon nie tydelike migrasiegids '%s' verwyder nie"
+
+#, c-format
+msgid "migrated refs can be found at '%s'"
+msgstr "gemigreerde verwysings kan by '%s' gevind word"
+
+msgid ""
+"'core.preferSymlinkRefs=true' is nominated for removal.\n"
+"hint: The use of symbolic links for symbolic refs is deprecated\n"
+"hint: and will be removed in Git 3.0. The configuration that\n"
+"hint: tells Git to use them is thus going away. You can unset\n"
+"hint: it with:\n"
+"hint:\n"
+"hint:\tgit config unset core.preferSymlinkRefs\n"
+"hint:\n"
+"hint: Git will then use the textual symref format instead."
+msgstr ""
+"'core.preferSymlinkRefs=true' is benoem vir verwydering.\n"
+"wenk: Die gebruik van simboliese skakels vir simboliese verwysings is "
+"verouderd\n"
+"wenk: en sal in Git 3.0 verwyder word. Die konfigurasie wat\n"
+"wenk: Git sê om dit te gebruik, verdwyn dus. Jy kan dit\n"
+"wenk: ontstel met:\n"
+"wenk:\n"
+"wenk:\tgit config unset core.preferSymlinkRefs\n"
+"wenk:\n"
+"wenk: Git sal dan eerder die tekstuele symref-formaat gebruik."
+
+#, c-format
+msgid ""
+"cannot lock ref '%s': expected symref with target '%s': but is a regular ref"
+msgstr ""
+"kan nie verwysing '%s' sluit nie: simboliese verwysing met teiken '%s' "
+"verwag, maar dit is 'n gewone verwysing"
+
+#, c-format
+msgid "trying to write reflog for '%s' with incomplete values"
+msgstr "probeer reflog vir '%s' met onvolledige waardes skryf"
+
+#, c-format
+msgid "cannot read ref file '%s'"
+msgstr "kan nie verwysingslêer '%s' lees nie"
+
+#, c-format
+msgid "cannot open directory %s"
+msgstr "kan nie gids %s oopmaak nie"
+
+#, c-format
+msgid "unable to open '%s'"
+msgstr "kan nie '%s' oopmaak nie"
+
+#, c-format
+msgid "refname is dangerous: %s"
+msgstr "verwysingsnaam is gevaarlik: %s"
+
+#, c-format
+msgid ""
+"multiple updates for 'HEAD' (including one via its referent '%s') are not "
+"allowed"
+msgstr ""
+"veelvuldige bywerkings vir 'HEAD' (insluitend een via sy verwysde '%s') word "
+"nie toegelaat nie"
+
+#, c-format
+msgid "cannot lock ref '%s': unable to resolve reference '%s'"
+msgstr "kan nie verwysing '%s' sluit nie: kan nie verwysing '%s' oplos nie"
+
+#, c-format
+msgid "cannot lock ref '%s': error reading reference"
+msgstr "kan nie verwysing '%s' sluit nie: fout met lees van verwysing"
+
+#, c-format
+msgid ""
+"multiple updates for '%s' (including one via symref '%s') are not allowed"
+msgstr ""
+"veelvuldige bywerkings vir '%s' (insluitend een via simboliese verwysing "
+"'%s') word nie toegelaat nie"
+
+#, c-format
+msgid "cannot lock ref '%s': dangling symref already exists"
+msgstr ""
+"kan nie verwysing '%s' sluit nie: hangende simboliese verwysing bestaan reeds"
+
+#, c-format
+msgid "cannot lock ref '%s': reference already exists"
+msgstr "kan nie verwysing '%s' sluit nie: verwysing bestaan reeds"
+
+#, c-format
+msgid "cannot lock ref '%s': reference is missing but expected %s"
+msgstr ""
+"kan nie verwysing '%s' sluit nie: verwysing ontbreek, maar %s is verwag"
+
+#, c-format
+msgid "cannot lock ref '%s': is at %s but expected %s"
+msgstr "kan nie verwysing '%s' sluit nie: is by %s, maar %s is verwag"
+
+#, c-format
+msgid "reftable: transaction prepare: %s"
+msgstr "reftable: transaksie-voorbereiding: %s"
+
+#, c-format
+msgid "reftable: transaction failure: %s"
+msgstr "reftable: transaksiemislukking: %s"
+
+#, c-format
+msgid "unable to compact stack: %s"
+msgstr "kan nie stapel kompakteer nie: %s"
+
+#, c-format
+msgid "refname %s not found"
+msgstr "verwysingsnaam %s nie gevind nie"
+
+#, c-format
+msgid "refname %s is a symbolic ref, copying it is not supported"
+msgstr ""
+"verwysingsnaam %s is 'n simboliese verwysing; om dit te kopieer word nie "
+"ondersteun nie"
+
+#, c-format
+msgid "reftable stack for worktree '%s' is broken"
+msgstr "reftable-stapel vir werkboom '%s' is gebreek"
+
+#, c-format
+msgid "could not create iterator for worktree '%s'"
+msgstr "kon nie iterator vir werkboom '%s' skep nie"
+
+#, c-format
+msgid "could not read record for worktree '%s'"
+msgstr "kon nie rekord vir werkboom '%s' lees nie"
+
+#, c-format
+msgid "pattern '%s' has no '*'"
+msgstr "patroon '%s' het geen '*' nie"
+
+#, c-format
+msgid "replacement '%s' has no '*'"
+msgstr "vervanging '%s' het geen '*' nie"
+
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "ongeldige aanhaling in push-option-waarde: '%s'"
+
+#, c-format
+msgid "unknown value for object-format: %s"
+msgstr "onbekende waarde vir object-format: %s"
+
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs nie geldig nie: is dit 'n Git-bewaarplek?"
+
+msgid "invalid server response; expected service, got flush packet"
+msgstr "ongeldige bedienerreaksie; diens verwag, maar spoel-pakkie gekry"
+
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "ongeldige bedienerreaksie; '%s' gekry"
+
+#, c-format
+msgid "repository '%s' not found"
+msgstr "bewaarplek '%s' nie gevind nie"
+
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "Stawing het misluk vir '%s'"
+
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr ""
+"kan nie toegang tot '%s' met http.pinnedPubkey-konfigurasie verkry nie: %s"
+
+#, c-format
+msgid "rate limited by '%s', please try again in %ld seconds"
+msgstr "tempo beperk deur '%s'; probeer asseblief weer oor %ld sekondes"
+
+#, c-format
+msgid "rate limited by '%s', please try again later"
+msgstr "tempo beperk deur '%s'; probeer asseblief later weer"
+
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "kan nie toegang tot '%s' verkry nie: %s"
+
+#, c-format
+msgid "redirecting to %s"
+msgstr "herlei na %s"
+
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "behoort nie EOF te kry wanneer EOF nie toegeeflik hanteer word nie"
+
+msgid "remote server sent unexpected response end packet"
+msgstr "afgeleë bediener het 'n onverwagte reaksie-einde-pakkie gestuur"
+
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+"kan nie rpc-posdata terugspoel nie - probeer om http.postBuffer te verhoog"
+
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: slegte reëllengte-karakter: %.4s"
+
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: onverwagte reaksie-einde-pakkie"
+
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC het misluk; %s"
+
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "kan nie versoek saampers nie; zlib deflate-fout %d"
+
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "kan nie versoek saampers nie; zlib end-fout %d"
+
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "%d grepe van lengte-kopstuk is ontvang"
+
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "%d grepe van die liggaam word steeds verwag"
+
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "dom http-vervoer ondersteun nie vlak vermoëns nie"
+
+msgid "fetch failed."
+msgstr "haal het misluk."
+
+msgid "cannot fetch by sha1 over smart http"
+msgstr "kan nie via sha1 oor slim http haal nie"
+
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "protokolfout: sha/verwysing verwag, '%s' gekry"
+
+#, c-format
+msgid "http transport does not support %s"
+msgstr "http-vervoer ondersteun nie %s nie"
+
+msgid "protocol error: expected '<url> <path>', missing space"
+msgstr "protokolfout: '<url> <pad>' verwag, spasie ontbreek"
+
+#, c-format
+msgid "failed to download file at URL '%s'"
+msgstr "kon nie lêer by URL '%s' aflaai nie"
+
+msgid "git-http-push failed"
+msgstr "git-http-push het misluk"
+
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: gebruik: git remote-curl <afgeleë> [<url>]"
+
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl: fout met lees van opdragstroom van git"
+
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl: haal probeer sonder 'n plaaslike bewaarplek"
+
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl: onbekende opdrag '%s' van git"
+
+#, c-format
+msgid ""
+"reading remote from \"%s/%s\", which is nominated for removal.\n"
+"\n"
+"If you still use the \"remotes/\" directory it is recommended to\n"
+"migrate to config-based remotes:\n"
+"\n"
+"\tgit remote rename %s %s\n"
+"\n"
+"If you cannot, please let us know why you still need to use it by\n"
+"sending an e-mail to <git@vger.kernel.org>."
+msgstr ""
+"lees tans afgeleë vanaf \"%s/%s\", wat genomineer is vir verwydering.\n"
+"\n"
+"As jy steeds die \"remotes/\"-gids gebruik, word dit aanbeveel om\n"
+"na konfigurasie-gebaseerde afgeleës oor te skakel:\n"
+"\n"
+"\tgit remote rename %s %s\n"
+"\n"
+"As jy nie kan nie, laat ons asseblief weet hoekom jy dit steeds moet gebruik "
+"deur\n"
+"'n e-pos na <git@vger.kernel.org> te stuur."
+
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "konfigurasie-afgeleë-verkorting kan nie met '/' begin nie: %s"
+
+msgid "more than one receivepack given, using the first"
+msgstr "meer as een receivepack gegee, gebruik die eerste"
+
+msgid "more than one uploadpack given, using the first"
+msgstr "meer as een uploadpack gegee, gebruik die eerste"
+
+#, c-format
+msgid "unrecognized followRemoteHEAD value '%s' ignored"
+msgstr "onherkende followRemoteHEAD-waarde '%s' geïgnoreer"
+
+#, c-format
+msgid "unrecognized value transfer.credentialsInUrl: '%s'"
+msgstr "onherkende waarde transfer.credentialsInUrl: '%s'"
+
+#, c-format
+msgid "URL '%s' uses plaintext credentials"
+msgstr "URL '%s' gebruik gewone-teks-bewyse"
+
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "Kan nie beide %s en %s na %s haal nie"
+
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s volg gewoonlik %s, nie %s nie"
+
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s volg beide %s en %s"
+
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "bron-verwysingspesifikasie %s pas by geen"
+
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "bron-verwysingspesifikasie %s pas by meer as een"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#, 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 ""
+"Die bestemming wat jy verskaf het is nie 'n volle verwysingsnaam nie "
+"(d.w.s.,\n"
+"begin met \"refs/\"). Ons het probeer raai wat jy bedoel het deur:\n"
+"\n"
+"- Te soek na 'n verwysing wat by '%s' pas aan die afgeleë kant.\n"
+"- Na te gaan of die <bron> wat gestoot word ('%s')\n"
+"  'n verwysing in \"refs/{heads,tags}/\" is. Indien wel, voeg ons 'n "
+"ooreenstemmende\n"
+"  voorvoegsel refs/{heads,tags}/ aan die afgeleë kant by.\n"
+"\n"
+"Geeneen het gewerk nie, so ons het opgegee. Jy moet die verwysing ten volle "
+"kwalifiseer."
+
+#, 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 ""
+"Die <bron>-deel van die verwysingspesifikasie is 'n vaslegging-objek.\n"
+"Het jy bedoel om 'n nuwe tak te skep deur te stoot na\n"
+"'%s:refs/heads/%s'?"
+
+#, 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 ""
+"Die <bron>-deel van die verwysingspesifikasie is 'n etiket-objek.\n"
+"Het jy bedoel om 'n nuwe etiket te skep deur te stoot na\n"
+"'%s:refs/tags/%s'?"
+
+#, 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 ""
+"Die <bron>-deel van die verwysingspesifikasie is 'n boom-objek.\n"
+"Het jy bedoel om 'n nuwe boom te etiketteer deur te stoot na\n"
+"'%s:refs/tags/%s'?"
+
+#, 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 ""
+"Die <bron>-deel van die verwysingspesifikasie is 'n blob-objek.\n"
+"Het jy bedoel om 'n nuwe blob te etiketteer deur te stoot na\n"
+"'%s:refs/tags/%s'?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec ('%s') is an object ID that doesn't exist.\n"
+msgstr ""
+"Die <bron>-deel van die verwysingspesifikasie ('%s') is 'n objek-ID wat nie "
+"bestaan nie.\n"
+
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s kan nie na 'n tak opgelos word nie"
+
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "kan nie '%s' skrap nie: afgeleë verwysing bestaan nie"
+
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "bestemming-verwysingspesifikasie %s pas by meer as een"
+
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "bestemming-verwysing %s ontvang van meer as een bron"
+
+msgid "HEAD does not point to a branch"
+msgstr "HEAD wys nie na 'n tak nie"
+
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "geen sulke tak nie: '%s'"
+
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "geen stroomop opgestel vir tak '%s' nie"
+
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "stroomop-tak '%s' is nie as 'n afgeleë volgtak gestoor nie"
+
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr "stootbestemming '%s' op afgeleë '%s' het geen plaaslike volgtak nie"
+
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "tak '%s' het geen afgeleë om na te stoot nie"
+
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "stoot-verwysingspesifikasies vir '%s' sluit nie '%s' in nie"
+
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "stoot het geen bestemming nie (push.default is 'nothing')"
+
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "kan nie 'simple'-stoot na 'n enkele bestemming oplos nie"
+
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "kon nie afgeleë verwysing %s vind nie"
+
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Ignoreer snaakse verwysing '%s' plaaslik"
+
+#, c-format
+msgid ""
+"ignoring value '%s' for status.compareBranches, only @{upstream} and @{push} "
+"are supported"
+msgstr ""
+"ignoreer waarde '%s' vir status.compareBranches, slegs @{upstream} en "
+"@{push} word ondersteun"
+
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Jou tak is op datum met '%s'.\n"
+
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Jou tak en '%s' verwys na verskillende vasleggings.\n"
+
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (gebruik \"%s\" vir besonderhede)\n"
+
+#, 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] "Jou tak is voor '%s' met %d vaslegging.\n"
+msgstr[1] "Jou tak is voor '%s' met %d vasleggings.\n"
+
+msgid "  (use \"git push\" to publish your local commits)\n"
+msgstr "  (gebruik \"git push\" om jou plaaslike vasleggings te publiseer)\n"
+
+#, 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] ""
+"Jou tak is agter '%s' met %d vaslegging, en kan vooruitgespoel word.\n"
+msgstr[1] ""
+"Jou tak is agter '%s' met %d vasleggings, en kan vooruitgespoel word.\n"
+
+#, c-format
+msgid "  (use \"git pull %s %s\" to update your local branch)\n"
+msgstr "  (gebruik \"git pull %s %s\" om jou plaaslike tak by te werk)\n"
+
+msgid "  (use \"git pull\" to update your local branch)\n"
+msgstr "  (gebruik \"git pull\" om jou plaaslike tak op te dateer)\n"
+
+#, 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] ""
+"Jou tak en '%s' het uiteengeloop,\n"
+"en het onderskeidelik %d en %d verskillende vaslegging.\n"
+msgstr[1] ""
+"Jou tak en '%s' het uiteengeloop,\n"
+"en het onderskeidelik %d en %d verskillende vasleggings.\n"
+
+#, c-format
+msgid ""
+"  (use \"git pull %s %s\" if you want to integrate the remote branch with "
+"yours)\n"
+msgstr ""
+"  (gebruik \"git pull %s %s\" as jy die afgeleë tak met joune wil "
+"integreer)\n"
+
+msgid ""
+"  (use \"git pull\" if you want to integrate the remote branch with yours)\n"
+msgstr ""
+"  (gebruik \"git pull\" as jy die afgeleë tak met joune wil integreer)\n"
+
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "Jou tak is gebaseer op '%s', maar die stroomop is weg.\n"
+
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "  (gebruik \"git branch --unset-upstream\" om dit reg te maak)\n"
+
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "kan nie verwagte objeknaam '%s' ontleed nie"
+
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "kan nie een komponent van url '%s' afstroop nie"
+
+#, c-format
+msgid "cannot open index for %s"
+msgstr "kan nie indeks vir %s oopmaak nie"
+
+#, c-format
+msgid "pack %s too large to consider in geometric progression"
+msgstr "pak %s te groot om in geometriese progressie te oorweeg"
+
+#, c-format
+msgid "pack %s too large to roll up"
+msgstr "pak %s is te groot om saam te rol"
+
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "kon nie tydelike lêer %s oopmaak om te skryf nie"
+
+msgid "could not close refs snapshot tempfile"
+msgstr "kon nie tydelike lêer vir verwysingskiekie sluit nie"
+
+#, c-format
+msgid "could not remove stale bitmap: %s"
+msgstr "kon nie verouderde bitmap verwyder nie: %s"
+
+msgid "no packs to write MIDX during compaction"
+msgstr "geen pakke om MIDX mee te skryf tydens kompaktering nie"
+
+#, c-format
+msgid "expected exactly one line during MIDX write, got: %<PRIuMAX>"
+msgstr ""
+"het presies een reël verwag tydens MIDX-skryf, maar het gekry: %<PRIuMAX>"
+
+#, c-format
+msgid "unexpected MIDX output: '%s'"
+msgstr "onverwagte MIDX-uitvoer: '%s'"
+
+#, c-format
+msgid "could not load pack %<PRIu32> from MIDX"
+msgstr "kon nie pak %<PRIu32> uit MIDX laai nie"
+
+msgid "too many objects in MIDX compaction step"
+msgstr "te veel objekte in MIDX-kompakteringstap"
+
+#, c-format
+msgid "could not find preferred pack for MIDX %s"
+msgstr "kon nie voorkeurpak vir MIDX %s vind nie"
+
+msgid "unable to generate compaction plan"
+msgstr "kan nie kompakteringsplan genereer nie"
+
+#, c-format
+msgid "unable to execute compaction step %<PRIuMAX>"
+msgstr "kan nie kompakteringstap %<PRIuMAX> uitvoer nie"
+
+msgid "could not start pack-objects to repack promisor objects"
+msgstr "kon nie pack-objects begin om beloofde objekte te herpak nie"
+
+msgid "failed to feed promisor objects to pack-objects"
+msgstr "kon nie beloofde objekte aan pack-objects voer nie"
+
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+"repack: Verwag slegs reëls met volledige heks-objek-ID's van pack-objects."
+
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr "kon nie pack-objects voltooi om beloofde objekte te herpak nie"
+
+msgid "could not start pack-objects to repack promisor packs"
+msgstr "kon nie pack-objects begin om beloofde pakke te herpak nie"
+
+#, c-format
+msgid "pack prefix %s does not begin with objdir %s"
+msgstr "pakvoorvoegsel %s begin nie met objdir %s nie"
+
+#, c-format
+msgid "renaming pack to '%s' failed"
+msgstr "kon nie pak na '%s' hernoem nie"
+
+#, c-format
+msgid "pack-objects did not write a '%s' file for pack %s-%s"
+msgstr "pack-objects het nie 'n '%s'-lêer vir pak %s-%s geskryf nie"
+
+#, c-format
+msgid "could not unlink: %s"
+msgstr "kon nie ontkoppel nie: %s"
+
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr "slegte vervangingsverwysingnaam: %s"
+
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "duplikaat vervangingsverwysing: %s"
+
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "vervangingsdiepte te hoog vir objek %s"
+
+#, c-format
+msgid "'%s' is not a valid commit-ish for %s"
+msgstr "'%s' is nie 'n geldige vasleggingagtige vir %s nie"
+
+#, c-format
+msgid "'%s' does not point to a commit for %s"
+msgstr "'%s' wys nie na 'n vaslegging vir %s nie"
+
+#, c-format
+msgid "argument to %s must be a reference"
+msgstr "argument vir %s moet 'n verwysing wees"
+
+#, c-format
+msgid ""
+"'%s' cannot be used with multiple revision ranges because the ordering would "
+"be ill-defined"
+msgstr ""
+"'%s' kan nie met veelvuldige hersieningsreekse gebruik word nie, omdat die "
+"volgorde nie goed gedefinieer sou wees nie"
+
+msgid "need some commits to replay"
+msgstr "het 'n paar vasleggings nodig om oor te speel"
+
+msgid "all positive revisions given must be references"
+msgstr "alle gegewe positiewe hersienings moet verwysings wees"
+
+#, c-format
+msgid "merge of %s onto %s failed"
+msgstr "saamsmelting van %s op %s het misluk"
+
+#, c-format
+msgid "commit %s became empty after replay"
+msgstr "vaslegging %s het ná oorspeel leeg geword"
+
+msgid "'--linearize' cannot be used with multiple branches"
+msgstr "'--linearize' kan nie met veelvuldige takke gebruik word nie"
+
+msgid "'--ref' cannot be used with multiple revision ranges"
+msgstr "'--ref' kan nie met veelvuldige hersieningsreekse gebruik word nie"
+
+#, c-format
+msgid "'%s' is not a valid refname"
+msgstr "'%s' is nie 'n geldige verwysingnaam nie"
+
+msgid "compatibility hash algorithm support requires Rust"
+msgstr "ondersteuning vir die versoenbaarheid-hutsalgoritme vereis Rust"
+
+msgid "corrupt MERGE_RR"
+msgstr "korrupte MERGE_RR"
+
+msgid "unable to write rerere record"
+msgstr "kan nie rerere-rekord skryf nie"
+
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "daar was foute tydens die skryf van '%s' (%s)"
+
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "kon nie konflikbrokke in '%s' ontleed nie"
+
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr "utime() het misluk op '%s'"
+
+#, c-format
+msgid "writing '%s' failed"
+msgstr "skryf van '%s' het misluk"
+
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr "Het '%s' geplaas met vorige oplossing."
+
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr "Het oplossing vir '%s' aangeteken."
+
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr "Het '%s' opgelos met vorige oplossing."
+
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "kan nie verdwaalde '%s' ontkoppel nie"
+
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr "Het voor-beeld vir '%s' aangeteken"
+
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "kon nie konflikstatus in '%s' bywerk nie"
+
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "geen onthoude oplossing vir '%s' nie"
+
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "Het voor-beeld vir '%s' bygewerk"
+
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "Het oplossing vir '%s' vergeet\n"
+
+msgid "unable to open rr-cache directory"
+msgstr "kan nie rr-cache-gids oopmaak nie"
+
+msgid "update the index with reused conflict resolution if possible"
+msgstr "werk die indeks by met hergebruikte konflikoplossing indien moontlik"
+
+msgid "could not determine HEAD revision"
+msgstr "kon nie HEAD-hersiening bepaal nie"
+
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "kon nie boom van %s vind nie"
+
+#, c-format
+msgid "unsupported section for hidden refs: %s"
+msgstr "nie-ondersteunde afdeling vir versteekte verwysings: %s"
+
+msgid "--exclude-hidden= passed more than once"
+msgstr "--exclude-hidden= meer as een keer gegee"
+
+#, c-format
+msgid "resolve-undo records `%s` which is missing"
+msgstr "resolve-undo teken `%s` aan wat ontbreek"
+
+#, c-format
+msgid "%s exists but is a symbolic ref"
+msgstr "%s bestaan, maar is 'n simboliese verwysing"
+
+msgid ""
+"--merge requires one of the pseudorefs MERGE_HEAD, CHERRY_PICK_HEAD, "
+"REVERT_HEAD or REBASE_HEAD"
+msgstr ""
+"--merge vereis een van die pseudoverwysings MERGE_HEAD, CHERRY_PICK_HEAD, "
+"REVERT_HEAD of REBASE_HEAD"
+
+#, c-format
+msgid "could not get commit for --ancestry-path argument %s"
+msgstr "kon nie vaslegging vir argument --ancestry-path %s kry nie"
+
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<paklêer> word nie meer ondersteun nie"
+
+#, c-format
+msgid "invalid option '%s' in --stdin mode"
+msgstr "ongeldige opsie '%s' in modus --stdin"
+
+msgid "your current branch appears to be broken"
+msgstr "dit lyk of jou huidige tak gebreek is"
+
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "jou huidige tak '%s' het nog geen vasleggings nie"
+
+msgid "object filtering requires --objects"
+msgstr "objekfiltrering vereis --objects"
+
+msgid "-L does not yet support the requested diff format"
+msgstr "-L ondersteun nog nie die versoekte diff-formaat nie"
+
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr "kan nie asinchrone draad skep nie: %s"
+
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' bestaan nie"
+
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "kon nie na '%s' oorskakel nie"
+
+msgid "need a working directory"
+msgstr "het 'n werkgids nodig"
+
+msgid "Scalar enlistments require a worktree"
+msgstr "Scalar-inskrywings vereis 'n werkboom"
+
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "kon nie %s=%s konfigureer nie"
+
+msgid "could not configure log.excludeDecoration"
+msgstr "kon nie log.excludeDecoration konfigureer nie"
+
+msgid "could not add enlistment"
+msgstr "kon nie inskrywing byvoeg nie"
+
+msgid "could not set recommended config"
+msgstr "kon nie aanbevole konfigurasie stel nie"
+
+msgid "could not toggle maintenance"
+msgstr "kon nie onderhoud aan- of afskakel nie"
+
+msgid "could not start the FSMonitor daemon"
+msgstr "kon nie die FSMonitor-daemon begin nie"
+
+msgid "could not turn off maintenance"
+msgstr "kon nie onderhoud afskakel nie"
+
+msgid "could not remove enlistment"
+msgstr "kon nie inskrywing verwyder nie"
+
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "afgeleë HEAD is nie 'n tak nie: '%.*s'"
+
+msgid "failed to get default branch name from remote; using local default"
+msgstr "kon nie verstek-taknaam van afgeleë kry nie; gebruik plaaslike verstek"
+
+msgid "failed to get default branch name"
+msgstr "kon nie verstek-taknaam kry nie"
+
+msgid "failed to unregister repository"
+msgstr "kon nie bewaarplek deregistreer nie"
+
+msgid "failed to stop the FSMonitor daemon"
+msgstr "kon nie die FSMonitor-daemon stop nie"
+
+msgid "failed to delete enlistment directory"
+msgstr "kon nie inskrywingsgids verwyder nie"
+
+msgid "branch to checkout after clone"
+msgstr "tak om ná kloon uit te check"
+
+msgid "when cloning, create full working directory"
+msgstr "skep volledige werkgids tydens kloon"
+
+msgid "only download metadata for the branch that will be checked out"
+msgstr "laai slegs metadata af vir die tak wat uitgecheck sal word"
+
+msgid "create repository within 'src' directory"
+msgstr "skep bewaarplek binne 'src'-gids"
+
+msgid "specify if tags should be fetched during clone"
+msgstr "spesifiseer of etikette tydens kloon gehaal moet word"
+
+msgid "specify if background maintenance should be enabled"
+msgstr "spesifiseer of agtergrondonderhoud geaktiveer moet word"
+
+msgid ""
+"scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
+"\t[--[no-]src] [--[no-]tags] [--[no-]maintenance] <url> [<enlistment>]"
+msgstr ""
+"scalar clone [--single-branch] [--branch <hooftak>] [--full-clone]\n"
+"\t[--[no-]src] [--[no-]tags] [--[no-]maintenance] <url> [<inskrywing>]"
+
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "kan nie werkboomnaam van '%s' aflei nie"
+
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "gids '%s' bestaan reeds"
+
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "kon nie verstektak vir '%s' kry nie"
+
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "kon nie afgeleë in '%s' konfigureer nie"
+
+#, c-format
+msgid "could not disable tags in '%s'"
+msgstr "kon nie etikette in '%s' deaktiveer nie"
+
+#, c-format
+msgid "could not configure '%s'"
+msgstr "kon nie '%s' konfigureer nie"
+
+msgid "partial clone failed; attempting full clone"
+msgstr "gedeeltelike kloon het misluk; probeer volledige kloon"
+
+msgid "could not configure for full clone"
+msgstr "kon nie vir volledige kloon konfigureer nie"
+
+msgid "scalar diagnose [<enlistment>]"
+msgstr "scalar diagnose [<inskrywing>]"
+
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` neem nie argumente nie"
+
+msgid "scalar register [--[no-]maintenance] [<enlistment>]"
+msgstr "scalar register [--[no-]maintenance] [<inskrywing>]"
+
+msgid "reconfigure all registered enlistments"
+msgstr "herkonfigureer alle geregistreerde inskrywings"
+
+msgid "(enable|disable|keep)"
+msgstr "(enable|disable|keep)"
+
+msgid "signal how to adjust background maintenance"
+msgstr "dui aan hoe agtergrondonderhoud aangepas moet word"
+
+msgid ""
+"scalar reconfigure [--maintenance=(enable|disable|keep)] [--all | "
+"<enlistment>]"
+msgstr ""
+"scalar reconfigure [--maintenance=(enable|disable|keep)] [--all | "
+"<inskrywing>]"
+
+msgid "--all or <enlistment>, but not both"
+msgstr "--all of <inskrywing>, maar nie albei nie"
+
+#, c-format
+msgid "unknown mode for --maintenance option: %s"
+msgstr "onbekende modus vir opsie --maintenance: %s"
+
+#, c-format
+msgid "could not remove stale scalar.repo '%s'"
+msgstr "kon nie verouderde scalar.repo '%s' verwyder nie"
+
+#, c-format
+msgid "removed stale scalar.repo '%s'"
+msgstr "verouderde scalar.repo '%s' verwyder"
+
+#, c-format
+msgid "repository at '%s' has different owner"
+msgstr "bewaarplek by '%s' het 'n ander eienaar"
+
+#, c-format
+msgid "repository at '%s' has a format issue"
+msgstr "bewaarplek by '%s' het 'n formaatprobleem"
+
+#, c-format
+msgid "repository not found in '%s'"
+msgstr "bewaarplek nie in '%s' gevind nie"
+
+#, c-format
+msgid ""
+"to unregister this repository from Scalar, run\n"
+"\tgit config --global --unset --fixed-value scalar.repo \"%s\""
+msgstr ""
+"om hierdie bewaarplek van Scalar te deregistreer, voer uit\n"
+"\tgit config --global --unset --fixed-value scalar.repo \"%s\""
+
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <taak> [<inskrywing>]\n"
+"Take:\n"
+
+#, c-format
+msgid "no such task: '%s'"
+msgstr "geen sodanige taak nie: '%s'"
+
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<inskrywing>]"
+
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <inskrywing>"
+
+msgid "refusing to delete current working directory"
+msgstr "weier om huidige werkgids te skrap"
+
+msgid "include Git version"
+msgstr "sluit Git-weergawe in"
+
+msgid "include Git's build options"
+msgstr "sluit Git se bou-opsies in"
+
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+msgid "-C requires a <directory>"
+msgstr "-C vereis 'n <gids>"
+
+#, c-format
+msgid "could not change to '%s'"
+msgstr "kon nie na '%s' verander nie"
+
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c vereis 'n <sleutel>=<waarde>-argument"
+
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar [-C <gids>] [-c <sleutel>=<waarde>] <opdrag> [<opsies>]\n"
+"\n"
+"Opdragte:\n"
+
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "onverwagte spoelpakkie tydens lees van afgeleë uitpakstatus"
+
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "kan nie afgeleë uitpakstatus ontleed nie: %s"
+
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "afgeleë uitpak het misluk: %s"
+
+msgid "failed to sign the push certificate"
+msgstr "kon nie die stootsertifikaat onderteken nie"
+
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack: kan nie haal-subproses afsplits nie"
+
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr "stootonderhandeling het misluk; gaan in elk geval voort met stoot"
+
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr "die ontvangkant ondersteun nie hierdie bewaarplek se hutsalgoritme nie"
+
+msgid "the receiving end does not support --signed push"
+msgstr "die ontvangkant ondersteun nie --signed stoot nie"
+
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"stuur nie 'n stootsertifikaat nie, aangesien die ontvangkant nie --signed "
+"stoot ondersteun nie"
+
+msgid "the receiving end does not support --atomic push"
+msgstr "die ontvangkant ondersteun nie --atomic stoot nie"
+
+msgid "the receiving end does not support push options"
+msgstr "die ontvangkant ondersteun nie stoot-opsies nie"
+
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "ongeldige opruimmodus vir vasleggingsboodskap '%s'"
+
+#, c-format
+msgid "could not delete '%s'"
+msgstr "kon nie '%s' skrap nie"
+
+msgid "revert"
+msgstr "omkeer"
+
+msgid "cherry-pick"
+msgstr "kersiepluk"
+
+msgid "rebase"
+msgstr "herbaseer"
+
+#, c-format
+msgid "unknown action: %d"
+msgstr "onbekende aksie: %d"
+
+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 ""
+"Los alle konflikte handmatig op, merk hulle as opgelos met\n"
+"\"git add/rm <lêers_met_konflik>\", en voer dan \"git rebase --continue\" "
+"uit.\n"
+"Jy kan eerder hierdie vaslegging oorslaan: voer \"git rebase --skip\" uit.\n"
+"Om te staak en terug te keer na die toestand voor \"git rebase\", voer \"git "
+"rebase --abort\" uit."
+
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"nadat jy die konflikte opgelos het, merk die gekorrigeerde paaie\n"
+"met 'git add <paaie>' of 'git rm <paaie>'"
+
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
+msgstr ""
+"Nadat jy die konflikte opgelos het, merk hulle met\n"
+"\"git add/rm <padspesifikasie>\", en voer dan\n"
+"\"git cherry-pick --continue\" uit.\n"
+"Jy kan eerder hierdie vaslegging oorslaan met \"git cherry-pick --skip\".\n"
+"Om te staak en terug te keer na die toestand voor \"git cherry-pick\",\n"
+"voer \"git cherry-pick --abort\" uit."
+
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Nadat jy die konflikte opgelos het, merk hulle met\n"
+"\"git add/rm <padspesifikasie>\", en voer dan\n"
+"\"git revert --continue\" uit.\n"
+"Jy kan eerder hierdie vaslegging oorslaan met \"git revert --skip\".\n"
+"Om te staak en terug te keer na die toestand voor \"git revert\",\n"
+"voer \"git revert --abort\" uit."
+
+#, c-format
+msgid "could not lock '%s'"
+msgstr "kon nie '%s' sluit nie"
+
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "kon nie reëleinde na '%s' skryf nie"
+
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "kon nie '%s' finaliseer nie"
+
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "jou plaaslike veranderinge sal deur %s oorskryf word."
+
+msgid "commit your changes or stash them to proceed."
+msgstr "lê jou veranderinge vas of bêre hulle weg om voort te gaan."
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: Kan nie nuwe indekslêer skryf nie"
+
+msgid "unable to update cache tree"
+msgstr "kan nie kasboom bywerk nie"
+
+msgid "could not resolve HEAD commit"
+msgstr "kon nie HEAD-vaslegging oplos nie"
+
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr "geen sleutel teenwoordig in '%.*s' nie"
+
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr "kan nie aanhalingstekens van waarde van '%s' verwyder nie"
+
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "'GIT_AUTHOR_NAME' reeds gegee"
+
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "'GIT_AUTHOR_EMAIL' reeds gegee"
+
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "'GIT_AUTHOR_DATE' reeds gegee"
+
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "onbekende veranderlike '%s'"
+
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "ontbrekende 'GIT_AUTHOR_NAME'"
+
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "ontbrekende 'GIT_AUTHOR_EMAIL'"
+
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "ontbrekende 'GIT_AUTHOR_DATE'"
+
+#, 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 ""
+"jy het geplaasde veranderinge in jou werkboom\n"
+"As hierdie veranderinge bedoel is om in die vorige vaslegging saamgedruk te "
+"word, voer uit:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"As hulle bedoel is om in 'n nuwe vaslegging te gaan, voer uit:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"In albei gevalle, sodra jy klaar is, gaan voort met:\n"
+"\n"
+"  git rebase --continue\n"
+
+msgid "'prepare-commit-msg' hook failed"
+msgstr "'prepare-commit-msg'-haak het misluk"
+
+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 ""
+"Jou naam en e-posadres is outomaties gekonfigureer gebaseer\n"
+"op jou gebruikersnaam en gasheernaam. Kontroleer asseblief dat hulle "
+"akkuraat is.\n"
+"Jy kan hierdie boodskap onderdruk deur hulle uitdruklik te stel. Voer die\n"
+"volgende opdrag uit en volg die instruksies in jou redigeerder om\n"
+"jou konfigurasielêer te wysig:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"Nadat jy dit gedoen het, kan jy die identiteit wat vir hierdie vaslegging "
+"gebruik is, regmaak met:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+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 ""
+"Jou naam en e-posadres is outomaties gekonfigureer gebaseer\n"
+"op jou gebruikersnaam en gasheernaam. Kontroleer asseblief dat hulle "
+"akkuraat is.\n"
+"Jy kan hierdie boodskap onderdruk deur hulle uitdruklik te stel:\n"
+"\n"
+"    git config --global user.name \"Jou Naam\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"Nadat jy dit gedoen het, kan jy die identiteit wat vir hierdie vaslegging "
+"gebruik is, regmaak met:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+msgid "couldn't look up newly created commit"
+msgstr "kon nie nuutgeskepte vaslegging opsoek nie"
+
+msgid "could not parse newly created commit"
+msgstr "kon nie nuutgeskepte vaslegging ontleed nie"
+
+msgid "unable to resolve HEAD after creating commit"
+msgstr "kan nie HEAD oplos nadat vaslegging geskep is nie"
+
+msgid "detached HEAD"
+msgstr "ontkoppelde HEAD"
+
+msgid " (root-commit)"
+msgstr " (wortel-vaslegging)"
+
+msgid "could not parse HEAD"
+msgstr "kon nie HEAD ontleed nie"
+
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s is nie 'n vaslegging nie!"
+
+msgid "unable to parse commit author"
+msgstr "kan nie vasleggingsouteur ontleed nie"
+
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "kan nie vasleggingsboodskap uit '%s' lees nie"
+
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "ongeldige outeuridentiteit '%s'"
+
+msgid "corrupt author: missing date information"
+msgstr "korrupte outeur: datuminligting ontbreek"
+
+#, c-format
+msgid "could not update %s"
+msgstr "kon nie %s bywerk nie"
+
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "kon nie ouervaslegging %s ontleed nie"
+
+#, c-format
+msgid "unknown command: %d"
+msgstr "onbekende opdrag: %d"
+
+msgid "This is the 1st commit message:"
+msgstr "Dit is die 1ste vasleggingsboodskap:"
+
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Dit is vasleggingsboodskap #%d:"
+
+msgid "The 1st commit message will be skipped:"
+msgstr "Die 1ste vasleggingsboodskap sal oorgeslaan word:"
+
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "Vasleggingsboodskap #%d sal oorgeslaan word:"
+
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Dit is 'n kombinasie van %d vasleggings."
+
+#, c-format
+msgid "cannot write '%s'"
+msgstr "kan nie '%s' skryf nie"
+
+msgid "need a HEAD to fixup"
+msgstr "het 'n HEAD nodig om reg te maak"
+
+msgid "could not read HEAD"
+msgstr "kon nie HEAD lees nie"
+
+msgid "could not read HEAD's commit message"
+msgstr "kon nie HEAD se vasleggingsboodskap lees nie"
+
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "kon nie vasleggingsboodskap van %s lees nie"
+
+msgid "your index file is unmerged."
+msgstr "jou indekslêer is nie saamgesmelt nie."
+
+msgid "cannot fixup root commit"
+msgstr "kan nie wortelvaslegging regmaak nie"
+
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
+msgstr "vaslegging %s is 'n saamsmelting, maar geen -m-opsie is gegee nie."
+
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "vaslegging %s het nie ouer %d nie"
+
+#, c-format
+msgid "cannot get commit message for %s"
+msgstr "kan nie vasleggingsboodskap vir %s kry nie"
+
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: kan nie ouervaslegging %s ontleed nie"
+
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "kon nie %s omkeer nie... %s"
+
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "kon nie %s toepas nie... %s"
+
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "laat %s %s val -- lapinhoud reeds stroomop\n"
+
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: kon nie die indeks lees nie"
+
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: kon nie die indeks verfris nie"
+
+#, c-format
+msgid "'%s' is not a valid label"
+msgstr "'%s' is nie 'n geldige etiket nie"
+
+#, c-format
+msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s"
+msgstr ""
+"update-ref vereis 'n volledig gekwalifiseerde verwysingnaam, bv. refs/heads/"
+"%s"
+
+#, c-format
+msgid "'%s' does not accept merge commits"
+msgstr "'%s' aanvaar nie saamsmeltvasleggings nie"
+
+#. TRANSLATORS: 'pick' and 'merge -C' should not be
+#. translated.
+#.
+msgid ""
+"'pick' does not take a merge commit. If you wanted to\n"
+"replay the merge, use 'merge -C' on the commit."
+msgstr ""
+"'pick' neem nie 'n saamsmeltvaslegging nie. As jy die\n"
+"saamsmelting wou oorspeel, gebruik 'merge -C' op die vaslegging."
+
+#. TRANSLATORS: 'reword' and 'merge -c' should not be
+#. translated.
+#.
+msgid ""
+"'reword' does not take a merge commit. If you wanted to\n"
+"replay the merge and reword the commit message, use\n"
+"'merge -c' on the commit"
+msgstr ""
+"'reword' neem nie 'n saamsmeltvaslegging nie. As jy die\n"
+"saamsmelting wou oorspeel en die vasleggingsboodskap herformuleer, gebruik\n"
+"'merge -c' op die vaslegging"
+
+#. TRANSLATORS: 'edit', 'merge -C' and 'break' should
+#. not be translated.
+#.
+msgid ""
+"'edit' does not take a merge commit. If you wanted to\n"
+"replay the merge, use 'merge -C' on the commit, and then\n"
+"'break' to give the control back to you so that you can\n"
+"do 'git commit --amend && git rebase --continue'."
+msgstr ""
+"'edit' neem nie 'n saamsmeltvaslegging nie. As jy die\n"
+"saamsmelting wou oorspeel, gebruik 'merge -C' op die vaslegging, en dan\n"
+"'break' om die beheer aan jou terug te gee sodat jy\n"
+"'git commit --amend && git rebase --continue' kan doen."
+
+msgid "cannot squash merge commit into another commit"
+msgstr "kan nie saamsmeltvaslegging in 'n ander vaslegging saamdruk nie"
+
+#, c-format
+msgid "invalid command '%.*s'"
+msgstr "ongeldige opdrag '%.*s'"
+
+#, c-format
+msgid "missing arguments for %s"
+msgstr "ontbrekende argumente vir %s"
+
+#, c-format
+msgid "could not parse '%s'"
+msgstr "kon nie '%s' ontleed nie"
+
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "ongeldige reël %d: %.*s"
+
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "kan nie '%s' sonder 'n vorige vaslegging nie"
+
+msgid "cancelling a cherry picking in progress"
+msgstr "kanselleer 'n kersiepluk wat aan die gang is"
+
+msgid "cancelling a revert in progress"
+msgstr "kanselleer 'n omkering wat aan die gang is"
+
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "maak dit asseblief reg met 'git rebase --edit-todo'."
+
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "onbruikbare instruksieblad: '%s'"
+
+msgid "no commits parsed."
+msgstr "geen vasleggings ontleed nie."
+
+msgid "cannot cherry-pick during a revert."
+msgstr "kan nie kersiepluk tydens 'n omkering nie."
+
+msgid "cannot revert during a cherry-pick."
+msgstr "kan nie omkeer tydens 'n kersiepluk nie."
+
+msgid "trailers file contains empty line"
+msgstr "sleepreëllêer bevat leë reël"
+
+msgid "trailers file is empty"
+msgstr "sleepreëllêer is leeg"
+
+msgid "cannot read trailers files"
+msgstr "kan nie sleepreëllêers lees nie"
+
+msgid "unusable squash-onto"
+msgstr "onbruikbare squash-onto"
+
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "misvormde opsieblad: '%s'"
+
+msgid "empty commit set passed"
+msgstr "leë vasleggingstel gegee"
+
+msgid "revert is already in progress"
+msgstr "omkering is reeds aan die gang"
+
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "probeer \"git revert (--continue | %s--abort | --quit)\""
+
+msgid "cherry-pick is already in progress"
+msgstr "kersiepluk is reeds aan die gang"
+
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "probeer \"git cherry-pick (--continue | %s--abort | --quit)\""
+
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "kon nie volgordebepaler-gids '%s' skep nie"
+
+msgid "no cherry-pick or revert in progress"
+msgstr "geen kersiepluk of omkering aan die gang nie"
+
+msgid "cannot resolve HEAD"
+msgstr "kan nie HEAD oplos nie"
+
+msgid "cannot abort from a branch yet to be born"
+msgstr "kan nie staak vanaf 'n tak wat nog gebore moet word nie"
+
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "kan nie '%s' lees nie: %s"
+
+msgid "unexpected end of file"
+msgstr "onverwagte einde van lêer"
+
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "gestoorde pre-kersiepluk HEAD-lêer '%s' is korrup"
+
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr ""
+"Dit lyk of jy HEAD geskuif het. Spoel nie terug nie, kontroleer jou HEAD!"
+
+msgid "no revert in progress"
+msgstr "geen omkering aan die gang nie"
+
+msgid "no cherry-pick in progress"
+msgstr "geen kersiepluk aan die gang nie"
+
+msgid "failed to skip the commit"
+msgstr "kon nie die vaslegging oorslaan nie"
+
+msgid "there is nothing to skip"
+msgstr "daar is niks om oor te slaan nie"
+
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"het jy reeds vasgelê?\n"
+"probeer \"git %s --continue\""
+
+msgid "cannot read HEAD"
+msgstr "kan nie HEAD lees nie"
+
+msgid "could not write commit message file"
+msgstr "kon nie vasleggingsboodskaplêer skryf nie"
+
+#, 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 ""
+"Jy kan die vaslegging nou wysig met\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Sodra jy tevrede is met jou veranderinge, voer uit\n"
+"\n"
+"  git rebase --continue\n"
+
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "Kon nie %s toepas nie... %.*s"
+
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "Kon nie %.*s saamsmelt nie"
+
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Voer uit: %s\n"
+
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"uitvoering het misluk: %s\n"
+"%sJy kan die probleem regmaak en dan uitvoer\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+msgid "and made changes to the index and/or the working tree.\n"
+msgstr "en het veranderinge aan die indeks en/of die werkboom gemaak.\n"
+
+#, 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 ""
+"uitvoering het geslaag: %s\n"
+"maar het veranderinge aan die indeks en/of die werkboom gelaat.\n"
+"Lê jou veranderinge vas of bêre hulle weg, en voer dan uit\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "ongeldige etiketnaam: '%.*s'"
+
+msgid "writing fake root commit"
+msgstr "skryf vals wortelvaslegging"
+
+msgid "writing squash-onto"
+msgstr "skryf squash-onto"
+
+msgid "cannot merge without a current revision"
+msgstr "kan nie sonder 'n huidige hersiening saamsmelt nie"
+
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "kan nie '%.*s' ontleed nie"
+
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "niks om saam te smelt nie: '%.*s'"
+
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr "oktopus-saamsmelting kan nie bo-op 'n [nuwe wortel] uitgevoer word nie"
+
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "kon nie vasleggingsboodskap van '%s' kry nie"
+
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "kon nie eers probeer om '%.*s' saam te smelt nie"
+
+msgid "merge: Unable to write new index file"
+msgstr "merge: Kan nie nuwe indekslêer skryf nie"
+
+#, c-format
+msgid ""
+"another 'rebase' process appears to be running; '%s.lock' already exists"
+msgstr ""
+"dit lyk of 'n ander 'rebase'-proses aan die gang is; '%s.lock' bestaan reeds"
+
+#, c-format
+msgid ""
+"Updated the following refs with %s:\n"
+"%s"
+msgstr ""
+"Het die volgende verwysings met %s bygewerk:\n"
+"%s"
+
+#, c-format
+msgid ""
+"Failed to update the following refs with %s:\n"
+"%s"
+msgstr ""
+"Kon nie die volgende verwysings met %s bywerk nie:\n"
+"%s"
+
+msgid "Cannot autostash"
+msgstr "Kan nie outomaties wegbêre nie"
+
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Onverwagte wegbêre-antwoord: '%s'"
+
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Kon nie gids vir '%s' skep nie"
+
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Outomatiese wegbêre geskep: %s\n"
+
+msgid "could not reset --hard"
+msgstr "kon nie reset --hard doen nie"
+
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "Outomatiese wegbêre toegepas.\n"
+
+#, c-format
+msgid "cannot store %s"
+msgstr "kan nie %s stoor nie"
+
+#, c-format
+msgid ""
+"Your local changes are stashed, however applying them\n"
+"resulted in conflicts.  You can either resolve the conflicts\n"
+"and then discard the stash with \"git stash drop\", or, if you\n"
+"do not want to resolve them now, run \"git reset --hard\" and\n"
+"apply the local changes later by running \"git stash pop\".\n"
+msgstr ""
+"Jou plaaslike veranderinge is weggebêre, maar om hulle toe te pas\n"
+"het konflikte veroorsaak.  Jy kan die konflikte oplos\n"
+"en dan die wegbêre weggooi met \"git stash drop\", of, as jy\n"
+"hulle nie nou wil oplos nie, voer \"git reset --hard\" uit en\n"
+"pas die plaaslike veranderinge later toe deur \"git stash pop\" uit te "
+"voer.\n"
+
+msgid "could not apply autostash; your changes are safe in the stash"
+msgstr ""
+"kon nie outomatiese wegbêre toepas nie; jou veranderinge is veilig in die "
+"wegbêreplek"
+
+#, c-format
+msgid ""
+"Autostash exists; creating a new stash entry.\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+"Outomatiese wegbêre bestaan; skep 'n nuwe wegbêre-inskrywing.\n"
+"Jou veranderinge is veilig in die wegbêre.\n"
+"Jy kan enige tyd \"git stash pop\" of \"git stash drop\" uitvoer.\n"
+
+msgid "autostash reference is a symref"
+msgstr "outomatiese wegbêre-verwysing is 'n simboliese verwysing"
+
+msgid "could not detach HEAD"
+msgstr "kon nie HEAD ontkoppel nie"
+
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "Gestop by HEAD\n"
+
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "Gestop by %s\n"
+
+#, 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 ""
+"Kon nie die todo-opdrag uitvoer nie\n"
+"\n"
+"    %.*s\n"
+"Dit is herskeduleer; om die opdrag te wysig voordat jy voortgaan,\n"
+"wysig asseblief eers die todo-lys:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
+msgstr "Gestop by %s...  %.*s\n"
+
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Herbaseer (%d/%d)%s"
+
+#, c-format
+msgid "unknown command %d"
+msgstr "onbekende opdrag %d"
+
+msgid "could not read orig-head"
+msgstr "kon nie orig-head lees nie"
+
+msgid "could not read 'onto'"
+msgstr "kon nie 'onto' lees nie"
+
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "kon nie HEAD na %s bywerk nie"
+
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "%s suksesvol herbaseer en bygewerk.\n"
+
+msgid "cannot rebase: You have unstaged changes."
+msgstr "kan nie herbaseer nie: Jy het ongeplaasde veranderinge."
+
+msgid "cannot amend non-existing commit"
+msgstr "kan nie nie-bestaande vaslegging wysig nie"
+
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "ongeldige lêer: '%s'"
+
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "ongeldige inhoud: '%s'"
+
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"Jy het veranderinge in jou werkboom wat nie vasgelê is nie. Lê hulle "
+"asseblief\n"
+"eers vas en voer dan weer 'git rebase --continue' uit."
+
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "kon nie lêer skryf nie: '%s'"
+
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "kon nie CHERRY_PICK_HEAD verwyder nie"
+
+msgid "could not commit staged changes."
+msgstr "kon nie geplaasde veranderinge vaslê nie."
+
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: kan nie 'n %s kersiepluk nie"
+
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s: slegte hersiening"
+
+msgid "can't revert as initial commit"
+msgstr "kan nie as aanvanklike vaslegging omkeer nie"
+
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "het voorheen toegepaste vaslegging %s oorgeslaan"
+
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "gebruik --reapply-cherry-picks om oorgeslaande vasleggings in te sluit"
+
+msgid "make_script: unhandled options"
+msgstr "make_script: onhanteerde opsies"
+
+msgid "make_script: error preparing revisions"
+msgstr "make_script: fout tydens voorbereiding van hersienings"
+
+msgid "nothing to do"
+msgstr "niks om te doen nie"
+
+msgid "could not skip unnecessary pick commands"
+msgstr "kon nie onnodige pick-opdragte oorslaan nie"
+
+msgid "the script was already rearranged."
+msgstr "die skrip is reeds herrangskik."
+
+#, c-format
+msgid "update-refs file at '%s' is invalid"
+msgstr "update-refs-lêer by '%s' is ongeldig"
+
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' is buite bewaarplek by '%s'"
+
+#, 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: geen sodanige pad in die werkboom nie.\n"
+"Gebruik 'git <opdrag> -- <pad>...' om paaie te spesifiseer wat nie plaaslik "
+"bestaan nie."
+
+#, 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 ""
+"dubbelsinnige argument '%s': onbekende hersiening of pad nie in die werkboom "
+"nie.\n"
+"Gebruik '--' om paaie van hersienings te skei, soos volg:\n"
+"'git <opdrag> [<hersiening>...] -- [<lêer>...]'"
+
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "opsie '%s' moet voor nie-opsie-argumente kom"
+
+#, 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 ""
+"dubbelsinnige argument '%s': beide hersiening en lêernaam\n"
+"Gebruik '--' om paaie van hersienings te skei, soos volg:\n"
+"'git <opdrag> [<hersiening>...] -- [<lêer>...]'"
+
+msgid "unable to set up work tree using invalid config"
+msgstr "kan nie werkboom opstel met ongeldige konfigurasie nie"
+
+#, c-format
+msgid "'%s' already specified as '%s'"
+msgstr "'%s' reeds gespesifiseer as '%s'"
+
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Het Git-bewaarplekweergawe <= %d verwag, maar %d gevind"
+
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "onbekende bewaarplekuitbreiding gevind:"
+msgstr[1] "onbekende bewaarplekuitbreidings gevind:"
+
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] "bewaarplekweergawe is 0, maar slegs-v1-uitbreiding gevind:"
+msgstr[1] "bewaarplekweergawe is 0, maar slegs-v1-uitbreidings gevind:"
+
+#, c-format
+msgid "error opening '%s'"
+msgstr "fout met oopmaak van '%s'"
+
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "te groot om 'n lêer .git te wees: '%s'"
+
+#, c-format
+msgid "error reading %s"
+msgstr "fout met lees van %s"
+
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "ongeldige gitfile-formaat: %s"
+
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "geen pad in gitfile nie: %s"
+
+#, c-format
+msgid "gitfile does not point to a valid repository: %s"
+msgstr "gitfile wys nie na 'n geldige bewaarplek nie: %s"
+
+#, c-format
+msgid "'$%s' too big"
+msgstr "'$%s' te groot"
+
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "nie 'n Git-bewaarplek nie: '%s'"
+
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "kan nie chdir na '%s' doen nie"
+
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "kon nie '%*s%s%s' stat nie"
+
+#, c-format
+msgid "safe.directory '%s' not absolute"
+msgstr "safe.directory '%s' is nie absoluut nie"
+
+#, c-format
+msgid ""
+"detected dubious ownership in repository at '%s'\n"
+"%sTo add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"twyfelagtige eienaarskap bespeur in bewaarplek by '%s'\n"
+"%sOm 'n uitsondering vir hierdie gids by te voeg, roep:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+
+#, c-format
+msgid "error reading '%s'"
+msgstr "fout met lees van '%s'"
+
+#, c-format
+msgid "not a regular file: '%s'"
+msgstr "nie 'n gewone lêer nie: '%s'"
+
+msgid "Unable to read current working directory"
+msgstr "Kan nie huidige werkgids lees nie"
+
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "kan nie na '%s' verander nie"
+
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "nie 'n Git-bewaarplek nie (of enige van die ouergidse): %s"
+
+#, 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 ""
+"nie 'n Git-bewaarplek nie (of enige ouer tot by koppelpunt %s)\n"
+"Stop by lêerstelselgrens (GIT_DISCOVERY_ACROSS_FILESYSTEM nie gestel nie)."
+
+#, c-format
+msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')"
+msgstr "kan nie kaal bewaarplek '%s' gebruik nie (safe.bareRepository is '%s')"
+
+#, c-format
+msgid "unknown ref storage format: '%s'"
+msgstr "onbekende verwysingsbergingsformaat: '%s'"
+
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"probleem met core.sharedRepository-lêermoduswaarde (0%.3o).\n"
+"Die eienaar van lêers moet altyd lees- en skryftoestemmings hê."
+
+msgid "fork failed"
+msgstr "fork het misluk"
+
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr "kan nie sjabloon '%s' stat nie"
+
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "kan nie opendir op '%s' doen nie"
+
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "kan nie readlink op '%s' doen nie"
+
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr "kan nie symlink '%s' '%s' doen nie"
+
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr "kan nie '%s' na '%s' kopieer nie"
+
+#, c-format
+msgid "ignoring template %s"
+msgstr "ignoreer sjabloon %s"
+
+#, c-format
+msgid "templates not found in %s"
+msgstr "sjablone nie in %s gevind nie"
+
+#, c-format
+msgid "not copying templates from '%s': %s"
+msgstr "kopieer nie sjablone vanaf '%s' nie: %s"
+
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "ongeldige aanvanklike taknaam: '%s'"
+
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "herinisialiseer: --initial-branch=%s geïgnoreer"
+
+msgid "failed creating object database"
+msgstr "kon nie objekdatabasis skep nie"
+
+#, c-format
+msgid "unable to handle file type %d"
+msgstr "kan nie lêertipe %d hanteer nie"
+
+#, c-format
+msgid "unable to move %s to %s"
+msgstr "kan nie %s na %s skuif nie"
+
+msgid "attempt to reinitialize repository with different hash"
+msgstr "poging om bewaarplek met 'n ander hutswaarde te herinisialiseer"
+
+msgid ""
+"attempt to reinitialize repository with different reference storage format"
+msgstr ""
+"poging om bewaarplek met 'n ander verwysingsbergingsformaat te "
+"herinisialiseer"
+
+#, c-format
+msgid "%s already exists"
+msgstr "%s bestaan reeds"
+
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "Bestaande gedeelde Git-bewaarplek in %s%s herinisialiseer\n"
+
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "Bestaande Git-bewaarplek in %s%s herinisialiseer\n"
+
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "Leë gedeelde Git-bewaarplek in %s%s geïnisialiseer\n"
+
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "Leë Git-bewaarplek in %s%s geïnisialiseer\n"
+
+#, c-format
+msgid "unrecognized value for '%s': '%s'"
+msgstr "onherkende waarde vir '%s': '%s'"
+
+#, c-format
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "indeksinskrywing is 'n gids, maar nie yl nie (%08x)"
+
+msgid "cannot use split index with a sparse index"
+msgstr "kan nie verdeelde indeks met 'n yl indeks gebruik nie"
+
+#. TRANSLATORS: The first %s is a command like "ls-tree".
+#, c-format
+msgid "bad %s format: element '%s' does not start with '('"
+msgstr "slegte %s-formaat: element '%s' begin nie met '(' nie"
+
+#. TRANSLATORS: The first %s is a command like "ls-tree".
+#, c-format
+msgid "bad %s format: element '%s' does not end in ')'"
+msgstr "slegte %s-formaat: element '%s' eindig nie op ')' nie"
+
+#. TRANSLATORS: %s is a command like "ls-tree".
+#, c-format
+msgid "bad %s format: %%%.*s"
+msgstr "slegte %s-formaat: %%%.*s"
+
+#, c-format
+msgid "%u.%2.2u"
+msgstr "%u,%2.2u"
+
+#. TRANSLATORS: SI decimal prefix symbol for 10^9
+msgid "G"
+msgstr "G"
+
+#. TRANSLATORS: SI decimal prefix symbol for 10^6
+msgid "M"
+msgstr "M"
+
+#. TRANSLATORS: SI decimal prefix symbol for 10^3
+msgid "k"
+msgstr "k"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second and gibibyte
+msgid "GiB/s"
+msgstr "GiB/s"
+
+msgid "GiB"
+msgstr "GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second and mebibyte
+msgid "MiB/s"
+msgstr "MiB/s"
+
+msgid "MiB"
+msgstr "MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second and kibibyte
+msgid "KiB/s"
+msgstr "KiB/s"
+
+msgid "KiB"
+msgstr "KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second and byte
+msgid "B/s"
+msgstr "B/s"
+
+msgid "B"
+msgstr "B"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+msgid "byte/s"
+msgid_plural "bytes/s"
+msgstr[0] "greep/s"
+msgstr[1] "grepe/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "greep"
+msgstr[1] "grepe"
+
+#. TRANSLATORS: The first argument is the number string. The second
+#. argument is the unit string (i.e. "12.34 MiB/s").
+#.
+#, c-format
+msgid "%s %s"
+msgstr "%s %s"
+
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "verdagte submodulenaam word geïgnoreer: %s"
+
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "negatiewe waardes word nie vir submodule.fetchJobs toegelaat nie"
+
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+"'%s' word geïgnoreer, aangesien dit as 'n opdragreëlopsie vertolk kan word: "
+"%s"
+
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Kon nie .gitmodules-inskrywing %s bywerk nie"
+
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"Kan nie .gitmodules wat nie saamgesmelt is nie verander nie; los eers die "
+"saamsmeltkonflikte op"
+
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "Kon nie 'n afdeling in .gitmodules vind waar path=%s nie"
+
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Kon nie .gitmodules-inskrywing vir %s verwyder nie"
+
+msgid "staging updated .gitmodules failed"
+msgstr "kon nie bygewerkte .gitmodules plaas nie"
+
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "in onbevolkte submodule '%s'"
+
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Padspesifikasie '%s' is in submodule '%.*s'"
+
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "ongeldige argument --ignore-submodules: %s"
+
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"Submodule in vaslegging %s by pad '%s' bots met 'n submodule met dieselfde "
+"naam. Dit word oorgeslaan."
+
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "submodule-inskrywing '%s' (%s) is 'n %s, nie 'n vaslegging nie"
+
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"Kon nie die opdrag 'git rev-list <commits> --not --remotes -n 1' in "
+"submodule %s uitvoer nie"
+
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "proses vir submodule '%s' het misluk"
+
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Stoot submodule '%s'\n"
+
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "Kan nie submodule '%s' stoot nie\n"
+
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Haal submodule %s%s\n"
+
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Kon nie toegang tot submodule '%s' kry nie\n"
+
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "Kon nie toegang tot submodule '%s' by vaslegging %s kry nie\n"
+
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "Haal submodule %s%s by vaslegging %s\n"
+
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Foute tydens haal van submodule:\n"
+"%s"
+
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "'%s' word nie as 'n Git-bewaarplek herken nie"
+
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr "Kon nie 'git status --porcelain=2' in submodule %s uitvoer nie"
+
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "'git status --porcelain=2' het in submodule %s misluk"
+
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "kon nie 'git status' in submodule '%s' begin nie"
+
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "kon nie 'git status' in submodule '%s' uitvoer nie"
+
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "Kon nie die core.worktree-instelling in submodule '%s' ontstel nie"
+
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "kon nie rekursief na submodule '%s' ingaan nie"
+
+msgid "could not reset submodule index"
+msgstr "kon nie submodule-indeks terugstel nie"
+
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "submodule '%s' het 'n vuil indeks"
+
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "Submodule '%s' kon nie bygewerk word nie."
+
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "submodule-Git-gids '%s' is binne Git-gids '%.*s'"
+
+#, c-format
+msgid "expected '%.*s' in submodule path '%s' not to be a symbolic link"
+msgstr ""
+"het verwag dat '%.*s' in submodulepad '%s' nie 'n simboliese skakel is nie"
+
+#, c-format
+msgid "expected submodule path '%s' not to be a symbolic link"
+msgstr "het verwag dat submodulepad '%s' nie 'n simboliese skakel is nie"
+
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+"relocate_gitdir vir submodule '%s' met meer as een werkboom word nie "
+"ondersteun nie"
+
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "kon nie die naam vir submodule '%s' opsoek nie"
+
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"Git-gids van '%s%s' word verskuif van\n"
+"'%s' na\n"
+"'%s'\n"
+
+msgid "could not start ls-files in .."
+msgstr "kon nie ls-files in .. begin nie"
+
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree het onverwagte terugkeerkode %d teruggegee"
+
+#, c-format
+msgid ""
+"the 'submodule.%s.gitdir' config does not exist for module '%s'. Please "
+"ensure it is set, for example by running something like: 'git config "
+"submodule.%s.gitdir .git/modules/%s'. For details see the "
+"extensions.submodulePathConfig documentation."
+msgstr ""
+"die 'submodule.%s.gitdir'-konfigurasie bestaan nie vir module '%s' nie. Maak "
+"asseblief seker dat dit gestel is, byvoorbeeld deur iets soos 'git config "
+"submodule.%s.gitdir .git/modules/%s' uit te voer. Sien die "
+"extensions.submodulePathConfig-dokumentasie vir besonderhede."
+
+msgid ""
+"enabling extensions.submodulePathConfig might fix the following error, if "
+"it's not already enabled."
+msgstr ""
+"om extensions.submodulePathConfig te aktiveer kan die volgende fout regstel, "
+"indien dit nog nie geaktiveer is nie."
+
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's  git dir."
+msgstr "weier om '%s' in 'n ander submodule se Git-gids te skep/gebruik."
+
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr "kon nie lstat op '%s' uitvoer nie"
+
+msgid "no remote configured to get bundle URIs from"
+msgstr "geen afgeleë is opgestel om bundel-URI's van te kry nie"
+
+msgid "could not get the bundle-uri list"
+msgstr "kon nie die bundle-uri-lys kry nie"
+
+msgid "test-tool cache-tree <options> (control|prime|update)"
+msgstr "test-tool cache-tree <opsies> (control|prime|update)"
+
+msgid "clear the cache tree before each iteration"
+msgstr "maak die kasboom voor elke iterasie skoon"
+
+msgid "number of entries in the cache tree to invalidate (default 0)"
+msgstr "aantal inskrywings in die kasboom om ongeldig te maak (verstek 0)"
+
+msgid "the number of objects to write"
+msgstr "die aantal objekte om te skryf"
+
+msgid "test-tool path-walk <options> -- <revision-options>"
+msgstr "test-tool path-walk <opsies> -- <hersiening-opsies>"
+
+msgid "toggle inclusion of blob objects"
+msgstr "wissel insluiting van blob-objekte"
+
+msgid "toggle inclusion of commit objects"
+msgstr "wissel insluiting van vasleggingsobjekte"
+
+msgid "toggle inclusion of tag objects"
+msgstr "wissel insluiting van etiketobjekte"
+
+msgid "toggle inclusion of tree objects"
+msgstr "wissel insluiting van boomobjekte"
+
+msgid "toggle pruning of uninteresting paths"
+msgstr "wissel snoei van oninteressante paaie"
+
+msgid "toggle aggressive edge walk"
+msgstr "wissel aggressiewe randdeurloop"
+
+msgid "read a pattern list over stdin"
+msgstr "lees 'n patroonlys via stdin"
+
+msgid "toggle pruning of trees by sparse patterns"
+msgstr "wissel snoei van bome volgens yl patrone"
+
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "vaslegging %s is nie as bereikbaar gemerk nie"
+
+msgid "too many commits marked reachable"
+msgstr "te veel vasleggings is as bereikbaar gemerk"
+
+#, c-format
+msgid "could not find MIDX with checksum %s"
+msgstr "kon nie MIDX met kontrolesom %s vind nie"
+
+msgid "could not determine MIDX preferred pack"
+msgstr "kon nie die voorkeurpak van MIDX bepaal nie"
+
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<opsies>]"
+
+msgid "exit immediately after advertising capabilities"
+msgstr "verlaat onmiddellik nadat vermoëns geadverteer is"
+
+msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
+msgstr "test-helper simple-ipc is-active    [<naam>] [<opsies>]"
+
+msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
+msgstr "test-helper simple-ipc run-daemon   [<naam>] [<drade>]"
+
+msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
+msgstr "test-helper simple-ipc start-daemon [<naam>] [<drade>] [<maks-wagtyd>]"
+
+msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
+msgstr "test-helper simple-ipc stop-daemon  [<naam>] [<maks-wagtyd>]"
+
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<naam>] [<teken>]"
+
+msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+msgstr ""
+"test-helper simple-ipc sendbytes    [<naam>] [<greeptelling>] [<greep>]"
+
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [<naam>] [<drade>] [<greeptelling>] "
+"[<bondelgrootte>]"
+
+msgid "name or pathname of unix domain socket"
+msgstr "naam of padnaam van unix-domeinsok"
+
+msgid "named-pipe name"
+msgstr "naam van benoemde pyp"
+
+msgid "number of threads in server thread pool"
+msgstr "aantal drade in die bediener se draadpoel"
+
+msgid "seconds to wait for daemon to start or stop"
+msgstr "sekondes om te wag vir die daemon om te begin of te stop"
+
+msgid "number of bytes"
+msgstr "aantal grepe"
+
+msgid "number of requests per thread"
+msgstr "aantal versoeke per draad"
+
+msgid "ballast character"
+msgstr "ballaskarakter"
+
+msgid "token"
+msgstr "teken"
+
+msgid "command token to send to the server"
+msgstr "opdragteken om na die bediener te stuur"
+
+msgid "write a pack with a single reachable large blob"
+msgstr "skryf 'n pak met 'n enkele bereikbare groot blob"
+
+#, c-format
+msgid "'%s' is not a valid blob size"
+msgstr "'%s' is nie 'n geldige blob-grootte nie"
+
+msgid "unit-test [<options>]"
+msgstr "unit-test [<opsies>]"
+
+msgid "immediately exit upon the first failed test"
+msgstr "verlaat onmiddellik by die eerste mislukte toets"
+
+msgid "suite[::test]"
+msgstr "suite[::test]"
+
+msgid "run only test suite or individual test <suite[::test]>"
+msgstr "voer slegs toetsreeks of individuele toets <suite[::test]> uit"
+
+msgid "suite"
+msgstr "reeks"
+
+msgid "exclude test suite <suite>"
+msgstr "sluit toetsreeks <reeks> uit"
+
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "uitvoer van sleepreëlopdrag '%s' het misluk"
+
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "onbekende waarde '%s' vir sleutel '%s'"
+
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "leë sleepreëlteken in sleepreël '%.*s'"
+
+msgid "empty --trailer argument"
+msgstr "leë argument --trailer"
+
+#, c-format
+msgid "invalid trailer '%s': missing key before separator"
+msgstr "ongeldige sleepreël '%s': sleutel ontbreek voor skeidingsteken"
+
+#, c-format
+msgid "could not stat %s"
+msgstr "kon nie stat op %s uitvoer nie"
+
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "lêer %s is nie 'n gewone lêer nie"
+
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "lêer %s is nie skryfbaar deur die gebruiker nie"
+
+msgid "could not write to temporary file"
+msgstr "kon nie na tydelike lêer skryf nie"
+
+msgid "full write to remote helper failed"
+msgstr "volledige skryf na afgeleë helper het misluk"
+
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "kan nie afgeleë helper vir '%s' vind nie"
+
+msgid "can't dup helper output fd"
+msgstr "kan nie helper se afvoer-fd dupliseer nie"
+
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"onbekende verpligte vermoë %s; hierdie afgeleë helper het waarskynlik 'n "
+"nuwer weergawe van Git nodig"
+
+msgid "this remote helper should implement refspec capability"
+msgstr ""
+"hierdie afgeleë helper behoort die verwysingspesifikasie-vermoë te "
+"implementeer"
+
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s het onverwags gesê: '%s'"
+
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s het ook %s gesluit"
+
+msgid "could not dup helper output fd"
+msgstr "kon nie helper se afvoer-fd dupliseer nie"
+
+msgid "couldn't run fast-import"
+msgstr "kon nie fast-import uitvoer nie"
+
+msgid "error while running fast-import"
+msgstr "fout tydens uitvoer van fast-import"
+
+#, c-format
+msgid "could not read ref %s"
+msgstr "kon nie verwysing %s lees nie"
+
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "onbekende antwoord op connect: %s"
+
+msgid "setting remote service path not supported by protocol"
+msgstr ""
+"die stel van 'n afgeleë dienspad word nie deur die protokol ondersteun nie"
+
+msgid "invalid remote service path"
+msgstr "ongeldige afgeleë dienspad"
+
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "kan nie aan subdiens %s koppel nie"
+
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only vereis protokol v2"
+
+#, c-format
+msgid "ignoring %s because the protocol does not support it."
+msgstr "%s word geïgnoreer omdat die protokol dit nie ondersteun nie."
+
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "'option' sonder 'n ooreenstemmende 'ok/error'-direktief"
+
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "het ok/error verwag, helper het '%s' gesê"
+
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "helper het 'n onverwagte status van %s gerapporteer"
+
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "helper %s ondersteun nie dry-run nie"
+
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "helper %s ondersteun nie --signed nie"
+
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "helper %s ondersteun nie --signed=if-asked nie"
+
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "helper %s ondersteun nie --atomic nie"
+
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "helper %s ondersteun nie --%s nie"
+
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "helper %s ondersteun nie 'push-option' nie"
+
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr ""
+"remote-helper ondersteun nie stoot nie; verwysingspesifikasie word benodig"
+
+#, c-format
+msgid "helper %s does not support '--force'"
+msgstr "helper %s ondersteun nie '--force' nie"
+
+msgid "couldn't run fast-export"
+msgstr "kon nie fast-export uitvoer nie"
+
+msgid "error while running fast-export"
+msgstr "fout tydens uitvoer van fast-export"
+
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "kon nie '%s' na '%s' hernoem nie"
+
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+"Geen gemeenskaplike verwysings nie en geen gespesifiseer nie; niks word "
+"gedoen nie.\n"
+"Miskien moet jy 'n tak spesifiseer.\n"
+
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "nie-ondersteunde objekformaat '%s'"
+
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "misvormde antwoord in verwysingslys: %s"
+
+#, c-format
+msgid "read(%s) failed"
+msgstr "read(%s) het misluk"
+
+#, c-format
+msgid "write(%s) failed"
+msgstr "write(%s) het misluk"
+
+#, c-format
+msgid "%s thread failed"
+msgstr "%s-draad het misluk"
+
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "%s-draad kon nie aansluit nie: %s"
+
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "kan nie draad vir die kopiëring van data begin nie: %s"
+
+#, c-format
+msgid "%s process failed to wait"
+msgstr "%s-proses kon nie wag nie"
+
+#, c-format
+msgid "%s process failed"
+msgstr "%s-proses het misluk"
+
+msgid "can't start thread for copying data"
+msgstr "kan nie draad vir die kopiëring van data begin nie"
+
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Sou stroomop van '%s' na '%s' van '%s' stel\n"
+
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "kon nie bundel '%s' lees nie"
+
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: ongeldige diepte-opsie '%s'"
+
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "sien protocol.version in 'git help config' vir meer besonderhede"
+
+msgid "server options require protocol version 2 or later"
+msgstr "bedieneropsies vereis protokolweergawe 2 of later"
+
+msgid "remote does not support object-info"
+msgstr "afgeleë ondersteun nie object-info nie"
+
+msgid "server does not support wait-for-done"
+msgstr "bediener ondersteun nie wait-for-done nie"
+
+msgid "could not parse transport.color.* config"
+msgstr "kon nie transport.color.*-konfigurasie ontleed nie"
+
+msgid "support for protocol v2 not implemented yet"
+msgstr "ondersteuning vir protokol v2 is nog nie geïmplementeer nie"
+
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "transport '%s' word nie toegelaat nie"
+
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync word nie meer ondersteun nie"
+
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Die volgende submodulepaaie bevat veranderinge wat nie\n"
+"op enige afgeleë gevind kan word nie:\n"
+
+#, 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"
+"Probeer asseblief\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"of gaan met cd na die pad en gebruik\n"
+"\n"
+"\tgit push\n"
+"\n"
+"om hulle na 'n afgeleë te stoot.\n"
+"\n"
+
+msgid "Aborting."
+msgstr "Staak."
+
+msgid "failed to push all needed submodules"
+msgstr "kon nie alle benodigde submodules stoot nie"
+
+msgid "bundle-uri operation not supported by protocol"
+msgstr "bundle-uri-bewerking word nie deur die protokol ondersteun nie"
+
+msgid "could not retrieve server-advertised bundle-uri list"
+msgstr "kon nie die bundle-uri-lys wat die bediener adverteer, ophaal nie"
+
+msgid "operation not supported by protocol"
+msgstr "bewerking word nie deur die protokol ondersteun nie"
+
+msgid "too-short tree object"
+msgstr "te kort boomobjek"
+
+msgid "malformed mode in tree entry"
+msgstr "misvormde modus in boominskrywing"
+
+msgid "empty filename in tree entry"
+msgstr "leë lêernaam in boominskrywing"
+
+msgid "too-short tree file"
+msgstr "te kort boomlêer"
+
+#, 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 ""
+"Jou plaaslike veranderinge aan die volgende lêers sal deur uitcheck oorskryf "
+"word:\n"
+"%%sLê asseblief jou veranderinge vas of bêre hulle weg voordat jy van tak "
+"wissel."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Jou plaaslike veranderinge aan die volgende lêers sal deur uitcheck oorskryf "
+"word:\n"
+"%%s"
+
+#, 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 ""
+"Jou plaaslike veranderinge aan die volgende lêers sal deur saamsmelting "
+"oorskryf word:\n"
+"%%sLê asseblief jou veranderinge vas of bêre hulle weg voordat jy saamsmelt."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Jou plaaslike veranderinge aan die volgende lêers sal deur saamsmelting "
+"oorskryf word:\n"
+"%%s"
+
+#, 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 ""
+"Jou plaaslike veranderinge aan die volgende lêers sal deur %s oorskryf "
+"word:\n"
+"%%sLê asseblief jou veranderinge vas of bêre hulle weg voor %s."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Jou plaaslike veranderinge aan die volgende lêers sal deur %s oorskryf "
+"word:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"Die bywerk van die volgende gidse sal onnaspoorbare lêers daarin verloor:\n"
+"%s"
+
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Weier om die huidige werkgids te verwyder:\n"
+"%s"
+
+#, 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 volgende onnaspoorbare werkboomlêers sal deur uitcheck verwyder word:\n"
+"%%sSkuif of verwyder hulle asseblief voordat jy van tak wissel."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Die volgende onnaspoorbare werkboomlêers sal deur uitcheck verwyder word:\n"
+"%%s"
+
+#, 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 volgende onnaspoorbare werkboomlêers sal deur saamsmelting verwyder "
+"word:\n"
+"%%sSkuif of verwyder hulle asseblief voordat jy saamsmelt."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Die volgende onnaspoorbare werkboomlêers sal deur saamsmelting verwyder "
+"word:\n"
+"%%s"
+
+#, 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 volgende onnaspoorbare werkboomlêers sal deur %s verwyder word:\n"
+"%%sSkuif of verwyder hulle asseblief voor %s."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Die volgende onnaspoorbare werkboomlêers sal deur %s verwyder word:\n"
+"%%s"
+
+#, 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 volgende onnaspoorbare werkboomlêers sal deur uitcheck oorskryf word:\n"
+"%%sSkuif of verwyder hulle asseblief voordat jy van tak wissel."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Die volgende onnaspoorbare werkboomlêers sal deur uitcheck oorskryf word:\n"
+"%%s"
+
+#, 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 volgende onnaspoorbare werkboomlêers sal deur saamsmelting oorskryf "
+"word:\n"
+"%%sSkuif of verwyder hulle asseblief voordat jy saamsmelt."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Die volgende onnaspoorbare werkboomlêers sal deur saamsmelting oorskryf "
+"word:\n"
+"%%s"
+
+#, 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 volgende onnaspoorbare werkboomlêers sal deur %s oorskryf word:\n"
+"%%sSkuif of verwyder hulle asseblief voor %s."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Die volgende onnaspoorbare werkboomlêers sal deur %s oorskryf word:\n"
+"%%s"
+
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "Inskrywing '%s' oorvleuel met '%s'.  Kan nie bind nie."
+
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Kan nie submodule bywerk nie:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Die volgende paaie is nie op datum nie en is ten spyte van yl patrone "
+"gelaat:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"Die volgende paaie is nie saamgesmelt nie en is ten spyte van yl patrone "
+"gelaat:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Die volgende paaie was reeds teenwoordig en is dus ten spyte van yl patrone "
+"nie bygewerk nie:\n"
+"%s"
+
+#, c-format
+msgid "Aborting\n"
+msgstr "Staak\n"
+
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"Nadat jy die bostaande paaie reggestel het, wil jy dalk `git sparse-checkout "
+"reapply` uitvoer.\n"
+
+msgid "Updating files"
+msgstr "Lêers word bygewerk"
+
+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 volgende paaie het gebots (bv. hoofletter-sensitiewe paaie\n"
+"op 'n hoofletter-onsensitiewe lêerstelsel) en slegs een uit dieselfde\n"
+"botsende groep is in die werkboom:\n"
+
+msgid "Updating index flags"
+msgstr "Indeksvlae word bygewerk"
+
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr "werkboom en onnaspoorbare vaslegging het duplikaatinskrywings: %s"
+
+msgid "expected flush after fetch arguments"
+msgstr "het flush ná haal-argumente verwag"
+
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "ongeldige URL-skemanaam of ontbrekende '://'-agtervoegsel"
+
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "ongeldige %XX-ontsnapreeks"
+
+msgid "missing host and scheme is not 'file:'"
+msgstr "gasheer ontbreek en skema is nie 'file:' nie"
+
+msgid "a 'file:' URL may not have a port number"
+msgstr "'n 'file:'-URL mag nie 'n poortnommer hê nie"
+
+msgid "invalid characters in host name"
+msgstr "ongeldige karakters in gasheernaam"
+
+msgid "invalid port number"
+msgstr "ongeldige poortnommer"
+
+msgid "invalid '..' path segment"
+msgstr "ongeldige '..'-padsegment"
+
+#, c-format
+msgid "error: unable to format message: %s\n"
+msgstr "fout: kan nie boodskap formateer nie: %s\n"
+
+msgid "usage: "
+msgstr "gebruik: "
+
+msgid "fatal: "
+msgstr "fataal: "
+
+msgid "error: "
+msgstr "fout: "
+
+msgid "warning: "
+msgstr "waarskuwing: "
+
+#, c-format
+msgid "'%s' will be removed soon.\n"
+msgstr "'%s' sal binnekort verwyder word.\n"
+
+#, c-format
+msgid ""
+"If you need a replacement:\n"
+"\n"
+"- Read https://git-scm.com/docs/BreakingChanges.html.\n"
+"\n"
+"- Check what others on the mailing list suggest as a replacement:\n"
+"  https://lore.kernel.org/git/?q=%s\n"
+"\n"
+"- Send an email to <git@vger.kernel.org> asking for help, only if\n"
+"  suggestions by others do not work for you.\n"
+"\n"
+msgstr ""
+"As jy 'n plaasvervanger nodig het:\n"
+"\n"
+"- Lees https://git-scm.com/docs/BreakingChanges.html.\n"
+"\n"
+"- Kyk wat ander op die poslys as 'n plaasvervanger voorstel:\n"
+"  https://lore.kernel.org/git/?q=%s\n"
+"\n"
+"- Stuur 'n e-pos na <git@vger.kernel.org> en vra vir hulp, slegs as\n"
+"  voorstelle van ander nie vir jou werk nie.\n"
+"\n"
+
+msgid "refusing to run without --i-still-use-this"
+msgstr "weier om sonder --i-still-use-this uit te voer"
+
+#, c-format
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() het misluk met fout '%s' (%d)\n"
+
+msgid "Fetching objects"
+msgstr "Objekte word gehaal"
+
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "'%s' by die hoofwerkboom is nie die bewaarplekgids nie"
+
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr "'%s'-lêer bevat nie 'n absolute pad na die werkboomligging nie"
+
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' is nie 'n lêer .git nie, foutkode %d"
+
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' wys nie terug na '%s' nie"
+
+msgid "not a directory"
+msgstr "nie 'n gids nie"
+
+msgid ".git is not a file"
+msgstr ".git is nie 'n lêer nie"
+
+msgid ".git file broken"
+msgstr "lêer .git is stukkend"
+
+msgid ".git file incorrect"
+msgstr "lêer .git is verkeerd"
+
+msgid ".git file absolute/relative path mismatch"
+msgstr "lêer .git se absolute/relatiewe pad stem nie ooreen nie"
+
+msgid "not a valid path"
+msgstr "nie 'n geldige pad nie"
+
+msgid "unable to locate repository; .git is not a file"
+msgstr "kan nie bewaarplek vind nie; .git is nie 'n lêer nie"
+
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "kan nie bewaarplek vind nie; lêer .git verwys nie na 'n bewaarplek nie"
+
+msgid "unable to locate repository; .git file broken"
+msgstr "kan nie bewaarplek vind nie; lêer .git is stukkend"
+
+msgid "gitdir unreadable"
+msgstr "gitdir is onleesbaar"
+
+msgid "gitdir absolute/relative path mismatch"
+msgstr "gitdir se absolute/relatiewe pad stem nie ooreen nie"
+
+msgid "gitdir incorrect"
+msgstr "gitdir is verkeerd"
+
+msgid "not a valid directory"
+msgstr "nie 'n geldige gids nie"
+
+msgid "gitdir file does not exist"
+msgstr "gitdir-lêer bestaan nie"
+
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "kan nie gitdir-lêer (%s) lees nie"
+
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "kort lees (%<PRIuMAX> grepe verwag, %<PRIuMAX> gelees)"
+
+msgid "invalid gitdir file"
+msgstr "ongeldige gitdir-lêer"
+
+msgid "gitdir file points to non-existent location"
+msgstr "gitdir-lêer wys na 'n ligging wat nie bestaan nie"
+
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "kan nie %s in '%s' stel nie"
+
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "kan nie %s in '%s' ontstel nie"
+
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "kon nie die extensions.worktreeConfig-instelling stel nie"
+
+msgid "unable to upgrade repository format to support relative worktrees"
+msgstr ""
+"kan nie bewaarplekformaat opgradeer om relatiewe werkbome te ondersteun nie"
+
+msgid "unable to set extensions.relativeWorktrees setting"
+msgstr "kan nie die extensions.relativeWorktrees-instelling stel nie"
+
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "kon nie setenv '%s' uitvoer nie"
+
+#, c-format
+msgid "unable to create '%s'"
+msgstr "kan nie '%s' skep nie"
+
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "kon nie '%s' vir lees en skryf oopmaak nie"
+
+#, c-format
+msgid "unable to access '%s'"
+msgstr "kan nie toegang tot '%s' kry nie"
+
+msgid "unable to get current working directory"
+msgstr "kan nie huidige werkgids kry nie"
+
+msgid "unable to get random bytes"
+msgstr "kan nie ewekansige grepe kry nie"
+
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "probeer om %<PRIuMAX> te mmap, bo die limiet van %<PRIuMAX>"
+
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap het misluk%s"
+
+msgid "Unmerged paths:"
+msgstr "Paaie wat nie saamgesmelt is nie:"
+
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr "  (gebruik \"git restore --staged <lêer>...\" om te ontplaas)"
+
+#, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+"  (gebruik \"git restore --source=%s --staged <lêer>...\" om te ontplaas)"
+
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr "  (gebruik \"git rm --cached <lêer>...\" om te ontplaas)"
+
+msgid "  (use \"git add <file>...\" to mark resolution)"
+msgstr "  (gebruik \"git add <lêer>...\" om die oplossing te merk)"
+
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+"  (gebruik \"git add/rm <lêer>...\" soos van toepassing om die oplossing te "
+"merk)"
+
+msgid "  (use \"git rm <file>...\" to mark resolution)"
+msgstr "  (gebruik \"git rm <lêer>...\" om die oplossing te merk)"
+
+msgid "Changes to be committed:"
+msgstr "Wysigings om vas te lê:"
+
+msgid "Changes not staged for commit:"
+msgstr "Wysigings nie vir vaslegging geplaas nie:"
+
+msgid "  (use \"git add <file>...\" to update what will be committed)"
+msgstr "  (gebruik \"git add <lêer>...\" om op te dateer wat vasgelê sal word)"
+
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr ""
+"  (gebruik \"git add/rm <lêer>...\" om op te dateer wat vasgelê sal word)"
+
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr ""
+"  (gebruik \"git restore <lêer>...\" om wysigings in die werkgids weg te "
+"gooi)"
+
+msgid "  (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+"  (lê vas of gooi die onnaspoorbare of gewysigde inhoud in submodules weg)"
+
+#, c-format
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgstr ""
+"  (gebruik \"git %s <lêer>...\" om by te sluit by wat vasgelê sal word)"
+
+msgid "both deleted:"
+msgstr "albei geskrap:"
+
+msgid "added by us:"
+msgstr "deur ons bygevoeg:"
+
+msgid "deleted by them:"
+msgstr "deur hulle geskrap:"
+
+msgid "added by them:"
+msgstr "deur hulle bygevoeg:"
+
+msgid "deleted by us:"
+msgstr "deur ons geskrap:"
+
+msgid "both added:"
+msgstr "albei bygevoeg:"
+
+msgid "both modified:"
+msgstr "albei gewysig:"
+
+msgid "new file:"
+msgstr "nuwe lêer:"
+
+msgid "copied:"
+msgstr "gekopieer:"
+
+msgid "deleted:"
+msgstr "geskrap:"
+
+msgid "modified:"
+msgstr "gewysig:"
+
+msgid "renamed:"
+msgstr "hernoem:"
+
+msgid "typechange:"
+msgstr "tipeverandering:"
+
+msgid "unknown:"
+msgstr "onbekend:"
+
+msgid "unmerged:"
+msgstr "nie saamgesmelt:"
+
+msgid "new commits, "
+msgstr "nuwe vasleggings, "
+
+msgid "modified content, "
+msgstr "gewysigde inhoud, "
+
+msgid "untracked content, "
+msgstr "onnaspoorbare inhoud, "
+
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Jou wegbêre het tans %d inskrywing"
+msgstr[1] "Jou wegbêre het tans %d inskrywings"
+
+msgid "Submodules changed but not updated:"
+msgstr "Submodules verander maar nie opgedateer nie:"
+
+msgid "Submodule changes to be committed:"
+msgstr "Submodule-wysigings om vas te lê:"
+
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"Moenie die reël hierbo verander of verwyder nie.\n"
+"Alles daaronder sal geïgnoreer word."
+
+#, 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"
+"Dit het %.2f sekondes geneem om die tak voor/agter-waardes te bereken.\n"
+"Jy kan '--no-ahead-behind' gebruik om dit te vermy.\n"
+
+msgid "You have unmerged paths."
+msgstr "Jy het paaie wat nie saamgesmelt is nie."
+
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  (los konflikte op en voer \"git commit\" uit)"
+
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  (gebruik \"git merge --abort\" om die saamsmelting te staak)"
+
+msgid "All conflicts fixed but you are still merging."
+msgstr "Alle konflikte is opgelos, maar jy is steeds besig om saam te smelt."
+
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  (gebruik \"git commit\" om die saamsmelting af te sluit)"
+
+msgid "You are in the middle of an am session."
+msgstr "Jy is in die middel van 'n am-sessie."
+
+msgid "The current patch is empty."
+msgstr "Die huidige lap is leeg."
+
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr "  (los konflikte op en voer dan \"git am --continue\" uit)"
+
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  (gebruik \"git am --skip\" om hierdie lap oor te slaan)"
+
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+"  (gebruik \"git am --allow-empty\" om hierdie lap as 'n leë vaslegging aan "
+"te teken)"
+
+msgid "  (use \"git am --abort\" to restore the original branch)"
+msgstr "  (gebruik \"git am --abort\" om die oorspronklike tak te herstel)"
+
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo ontbreek."
+
+msgid "No commands done."
+msgstr "Geen opdragte uitgevoer nie."
+
+#, c-format
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "Laaste opdrag uitgevoer (%<PRIuMAX> opdrag uitgevoer):"
+msgstr[1] "Laaste opdragte uitgevoer (%<PRIuMAX> opdragte uitgevoer):"
+
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  (sien meer in lêer %s)"
+
+msgid "No commands remaining."
+msgstr "Geen opdragte oor nie."
+
+#, c-format
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "Volgende opdrag om te doen (%<PRIuMAX> oorblywende opdrag):"
+msgstr[1] "Volgende opdragte om te doen (%<PRIuMAX> oorblywende opdragte):"
+
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
+msgstr "  (gebruik \"git rebase --edit-todo\" om te bekyk en te wysig)"
+
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Jy herbaseer tans tak '%s' op '%s'."
+
+msgid "You are currently rebasing."
+msgstr "Jy is tans besig om te herbaseer."
+
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr "  (los konflikte op en voer dan \"git rebase --continue\" uit)"
+
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  (gebruik \"git rebase --skip\" om hierdie lap oor te slaan)"
+
+msgid "  (use \"git rebase --abort\" to check out the original branch)"
+msgstr ""
+"  (gebruik \"git rebase --abort\" om die oorspronklike tak uit te check)"
+
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr "  (alle konflikte opgelos: voer \"git rebase --continue\" uit)"
+
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr "Jy verdeel tans 'n vaslegging terwyl jy tak '%s' op '%s' herbaseer."
+
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Jy verdeel tans 'n vaslegging tydens 'n herbasering."
+
+msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr "  (Sodra jou werkgids skoon is, voer \"git rebase --continue\" uit)"
+
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr "Jy wysig tans 'n vaslegging terwyl jy tak '%s' op '%s' herbaseer."
+
+msgid "You are currently editing a commit during a rebase."
+msgstr "Jy wysig tans 'n vaslegging tydens 'n herbasering."
+
+msgid "  (use \"git commit --amend\" to amend the current commit)"
+msgstr "  (gebruik \"git commit --amend\" om die huidige vaslegging te wysig)"
+
+msgid ""
+"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+"  (gebruik \"git rebase --continue\" sodra jy tevrede is met jou wysigings)"
+
+msgid "Cherry-pick currently in progress."
+msgstr "Kersiepluk is tans aan die gang."
+
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Jy kersiepluk tans vaslegging %s."
+
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr "  (los konflikte op en voer \"git cherry-pick --continue\" uit)"
+
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr "  (voer \"git cherry-pick --continue\" uit om voort te gaan)"
+
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr "  (alle konflikte opgelos: voer \"git cherry-pick --continue\" uit)"
+
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (gebruik \"git cherry-pick --skip\" om hierdie lap oor te slaan)"
+
+msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr ""
+"  (gebruik \"git cherry-pick --abort\" om die kersiepluk-bewerking te "
+"kanselleer)"
+
+msgid "Revert currently in progress."
+msgstr "Omkering is tans aan die gang."
+
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Jy keer tans vaslegging %s om."
+
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr "  (los konflikte op en voer \"git revert --continue\" uit)"
+
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr "  (voer \"git revert --continue\" uit om voort te gaan)"
+
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr "  (alle konflikte opgelos: voer \"git revert --continue\" uit)"
+
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (gebruik \"git revert --skip\" om hierdie lap oor te slaan)"
+
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+msgstr ""
+"  (gebruik \"git revert --abort\" om die omkeer-bewerking te kanselleer)"
+
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Jy halveer tans, begin vanaf tak '%s'."
+
+msgid "You are currently bisecting."
+msgstr "Jy is tans besig om te halveer."
+
+msgid "  (use \"git bisect reset\" to get back to the original branch)"
+msgstr ""
+"  (gebruik \"git bisect reset\" om na die oorspronklike tak terug te gaan)"
+
+msgid "You are in a sparse checkout."
+msgstr "Jy is in 'n yl-uitcheck."
+
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr "Jy is in 'n yl-uitcheck met %d%% van nagespoorde lêers teenwoordig."
+
+msgid "On branch "
+msgstr "Op tak "
+
+msgid "interactive rebase in progress; onto "
+msgstr "interaktiewe herbasering aan die gang; op "
+
+msgid "rebase in progress; onto "
+msgstr "herbasering aan die gang; op "
+
+msgid "HEAD detached at "
+msgstr "HEAD ontkoppel by "
+
+msgid "HEAD detached from "
+msgstr "HEAD ontkoppel van "
+
+msgid "Not currently on any branch."
+msgstr "Tans nie op enige tak nie."
+
+msgid "Initial commit"
+msgstr "Aanvanklike vaslegging"
+
+msgid "No commits yet"
+msgstr "Nog geen vasleggings nie"
+
+msgid "Untracked files"
+msgstr "Onnaspoorbare lêers"
+
+msgid "Ignored files"
+msgstr "Geïgnoreerde lêers"
+
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files,\n"
+"but the results were cached, and subsequent runs may be faster."
+msgstr ""
+"Dit het %.2f sekondes geneem om onnaspoorbare lêers te lys,\n"
+"maar die resultate is gestoor, en latere lopies kan vinniger wees."
+
+#, c-format
+msgid "It took %.2f seconds to enumerate untracked files."
+msgstr "Dit het %.2f sekondes geneem om onnaspoorbare lêers te lys."
+
+msgid "See 'git help status' for information on how to improve this."
+msgstr "Sien 'git help status' vir inligting oor hoe om dit te verbeter."
+
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Onnaspoorbare lêers nie gelys nie%s"
+
+msgid " (use -u option to show untracked files)"
+msgstr " (gebruik die -u-opsie om onnaspoorbare lêers te wys)"
+
+msgid "No changes"
+msgstr "Geen wysigings nie"
+
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+"geen wysigings by vaslegging gevoeg nie (gebruik \"git add\" en/of \"git "
+"commit -a\")\n"
+
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "geen wysigings by vaslegging gevoeg nie\n"
+
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"niks by vaslegging gevoeg nie, maar onnaspoorbare lêers is teenwoordig "
+"(gebruik \"git add\" om te volg)\n"
+
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr ""
+"niks by vaslegging gevoeg nie, maar onnaspoorbare lêers is teenwoordig\n"
+
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr ""
+"niks om vas te lê nie (skep/kopieer lêers en gebruik \"git add\" om te "
+"volg)\n"
+
+#, c-format
+msgid "nothing to commit\n"
+msgstr "niks om vas te lê nie\n"
+
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr "niks om vas te lê nie (gebruik -u om onnaspoorbare lêers te wys)\n"
+
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "niks om vas te lê nie, werkboom is skoon\n"
+
+msgid "No commits yet on "
+msgstr "Nog geen vasleggings op "
+
+msgid "HEAD (no branch)"
+msgstr "HEAD (geen tak)"
+
+msgid "different"
+msgstr "verskillend"
+
+msgid "behind "
+msgstr "agter "
+
+msgid "ahead "
+msgstr "voor "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "kan nie %s nie: Jy het ongeplaaste wysigings."
+
+msgid "additionally, your index contains uncommitted changes."
+msgstr "boonop bevat jou indeks onvasgelegde wysigings."
+
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "kan nie %s nie: Jou indeks bevat onvasgelegde wysigings."
+
+#, c-format
+msgid "unknown style '%s' given for '%s'"
+msgstr "onbekende styl '%s' vir '%s' gegee"
+
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr ""
+"Fout: Jou plaaslike veranderinge aan die volgende lêers sal deur "
+"saamsmelting oorskryf word"
+
+msgid "Automated merge did not work."
+msgstr "Outomatiese saamsmelting het nie gewerk nie."
+
+msgid "Should not be doing an octopus."
+msgstr "Behoort nie 'n oktopus te doen nie."
+
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "Kan nie gemeenskaplike vaslegging met $pretty_name vind nie"
+
+#, sh-format
+msgid "Already up to date with $pretty_name"
+msgstr "Reeds op datum met $pretty_name"
+
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "Vooruitspoel na: $pretty_name"
+
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "Probeer eenvoudige saamsmelting met $pretty_name"
+
+msgid "Simple merge did not work, trying automatic merge."
+msgstr ""
+"Eenvoudige saamsmelting het nie gewerk nie, probeer outomatiese saamsmelting."
+
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "gebruik: $dashless $USAGE"
+
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr "Kan nie chdir na $cdup, die boonste vlak van die werkboom, uitvoer nie"
+
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr "fataal: $program_name kan nie sonder 'n werkboom gebruik word nie."
+
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr "Kan nie takke herskryf nie: Jy het ongeplaaste veranderinge."
+
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr "Kan nie $action nie: Jy het ongeplaaste veranderinge."
+
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr ""
+"Kan nie $action nie: Jou indeks bevat veranderinge wat nie vasgelê is nie."
+
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "Daarbenewens bevat jou indeks veranderinge wat nie vasgelê is nie."
+
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr ""
+"Jy moet hierdie opdrag vanaf die boonste vlak van die werkboom uitvoer."
+
+msgid "Unable to determine absolute path of git directory"
+msgstr "Kan nie absolute pad van Git-gids bepaal nie"
+
+msgid "local zone differs from GMT by a non-minute interval\n"
+msgstr ""
+"plaaslike sone verskil van GMT met 'n interval wat nie heel minute is nie\n"
+
+msgid "local time offset greater than or equal to 24 hours\n"
+msgstr "plaaslike tydverskuiwing is groter as of gelyk aan 24 uur\n"
+
+#, perl-format
+msgid "fatal: command '%s' died with exit code %d"
+msgstr "fataal: opdrag '%s' het gesterf met uittreekode %d"
+
+msgid "the editor exited uncleanly, aborting everything"
+msgstr "die redigeerder het onsuiwer afgesluit, alles word gestaak"
+
+#, perl-format
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
+msgstr ""
+"'%s' bevat 'n tussentydse weergawe van die e-pos wat jy besig was om op te "
+"stel.\n"
+
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
+msgstr "'%s.final' bevat die opgestelde e-pos.\n"
+
+msgid "--dump-aliases incompatible with other options\n"
+msgstr "--dump-aliases is onversoenbaar met ander opsies\n"
+
+msgid "--dump-aliases and --translate-aliases are mutually exclusive\n"
+msgstr "--dump-aliases en --translate-aliases sluit mekaar uit\n"
+
+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 ""
+"fataal: konfigurasie-opsies vir 'sendmail' gevind\n"
+"git-send-email word met die sendemail.*-opsies gekonfigureer - let op die "
+"'e'.\n"
+"Stel sendemail.forbidSendmailVariables op false om hierdie kontrole te "
+"deaktiveer.\n"
+
+msgid "Cannot run git format-patch from outside a repository\n"
+msgstr "Kan nie git format-patch van buite 'n bewaarplek uitvoer nie\n"
+
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr ""
+"`batch-size` en `relogin` moet saam gespesifiseer word (via die opdragreël "
+"of 'n konfigurasie-opsie)\n"
+
+#, perl-format
+msgid "Unknown --suppress-cc field: '%s'\n"
+msgstr "Onbekende veld --suppress-cc: '%s'\n"
+
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
+msgstr "Onbekende instelling --confirm: '%s'\n"
+
+#, perl-format
+msgid "warning: sendmail alias with quotes is not supported: %s\n"
+msgstr ""
+"waarskuwing: sendmail-alias met aanhalingstekens word nie ondersteun nie: "
+"%s\n"
+
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
+msgstr "waarskuwing: `:include:` word nie ondersteun nie: %s\n"
+
+#, perl-format
+msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
+msgstr ""
+"waarskuwing: `/file`- of `|pipe`-herleiding word nie ondersteun nie: %s\n"
+
+#, perl-format
+msgid "warning: sendmail line is not recognized: %s\n"
+msgstr "waarskuwing: sendmail-reël word nie herken nie: %s\n"
+
+#, 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 ""
+"Lêer '%s' bestaan, maar dit kan ook die reeks vasleggings wees\n"
+"waarvoor lappe gemaak moet word.  Maak dit asseblief ondubbelsinnig deur...\n"
+"\n"
+"    * \"./%s\" te sê as jy 'n lêer bedoel; of\n"
+"    * die opsie --format-patch te gee as jy 'n reeks bedoel.\n"
+
+#, perl-format
+msgid "Failed to opendir %s: %s"
+msgstr "Kon nie opendir op %s uitvoer nie: %s"
+
+msgid ""
+"\n"
+"No patch files specified!\n"
+"\n"
+msgstr ""
+"\n"
+"Geen laplêers gespesifiseer nie!\n"
+"\n"
+
+#, perl-format
+msgid "No 'Subject:' line in '%s'\n"
+msgstr "Geen reël 'Subject:' in '%s' nie\n"
+
+#, perl-format
+msgid "Failed to open for writing %s: %s"
+msgstr "Kon nie %s vir skryf oopmaak nie: %s"
+
+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 ""
+"Reëls wat met \"GIT:\" begin, sal verwyder word.\n"
+"Oorweeg dit om 'n algehele diffstat of inhoudsopgawe in te sluit\n"
+"vir die lap wat jy skryf.\n"
+"\n"
+"Maak die inhoud van die liggaam skoon as jy nie 'n opsomming wil stuur nie.\n"
+
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "Kon nie %s.final oopmaak nie: %s"
+
+#, perl-format
+msgid "Failed to open %s: %s"
+msgstr "Kon nie %s oopmaak nie: %s"
+
+msgid "Summary email is empty, skipping it\n"
+msgstr "Opsomming-e-pos is leeg, dit word oorgeslaan\n"
+
+#. TRANSLATORS: please keep [y/N] as is.
+#, perl-format
+msgid "Are you sure you want to use <%s> [y/N]? "
+msgstr "Is jy seker jy wil <%s> gebruik [y/N]? "
+
+msgid ""
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
+msgstr ""
+"Die volgende lêers is 8-bis, maar verklaar nie 'n Content-Transfer-Encoding "
+"nie.\n"
+
+msgid "Declare which 8bit encoding to use [default: UTF-8]? "
+msgstr "Watter 8-bis-enkodering moet gebruik word [verstek: UTF-8]? "
+
+#, perl-format
+msgid "'%s' does not appear to be a valid charset name. Use it anyway [y/N]? "
+msgstr ""
+"'%s' lyk nie na 'n geldige karakterstelnaam nie. Gebruik dit in elk geval [y/"
+"N]? "
+
+#, 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 ""
+"Weier om te stuur omdat die lap\n"
+"\t%s\n"
+"die sjabloononderwerp '*** SUBJECT HERE ***' het. Gee --force as jy regtig "
+"wil stuur.\n"
+
+msgid "To whom should the emails be sent (if anyone)?"
+msgstr "Aan wie moet die e-posse gestuur word (indien enigiemand)?"
+
+#, perl-format
+msgid "fatal: alias '%s' expands to itself\n"
+msgstr "fataal: alias '%s' brei na homself uit\n"
+
+msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
+msgstr ""
+"Message-ID om as In-Reply-To vir die eerste e-pos te gebruik (indien enige)? "
+
+#, perl-format
+msgid "error: unable to extract a valid address from: %s\n"
+msgstr "fout: kan nie 'n geldige adres onttrek uit: %s\n"
+
+#. TRANSLATORS: Make sure to include [q] [d] [e] in your
+#. translation. The program will only accept English input
+#. at this point.
+msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
+msgstr ""
+"Wat om met hierdie adres te doen? ([q] verlaat|[d] laat val|[e] wysig): "
+
+#, perl-format
+msgid "CA path \"%s\" does not exist"
+msgstr "CA-pad \"%s\" bestaan nie"
+
+#, perl-format
+msgid "Only client key \"%s\" specified"
+msgstr "Slegs kliëntsleutel \"%s\" gespesifiseer"
+
+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-lys hierbo is uitgebrei met bykomende adresse\n"
+"    wat in die lap se vasleggingsboodskap gevind is. By verstek\n"
+"    vra send-email voor stuur wanneer dit gebeur.\n"
+"    Hierdie gedrag word deur die sendemail.confirm-\n"
+"    konfigurasie-instelling beheer.\n"
+"\n"
+"    Voer 'git send-email --help' uit vir meer inligting.\n"
+"    Om die huidige gedrag te behou, maar hierdie boodskap te\n"
+"    onderdruk, voer 'git config --global sendemail.confirm auto' uit.\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.
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
+msgstr ""
+"Stuur hierdie e-pos? ([y] ja|[n] nee|[e] wysig|[q] verlaat|[a] almal): "
+
+msgid "Send this email reply required"
+msgstr "Stuur hierdie e-pos? Antwoord word vereis"
+
+msgid "The destination IMAP folder is not properly defined."
+msgstr "Die bestemming-IMAP-vouer is nie behoorlik gedefinieer nie."
+
+msgid "The required SMTP server is not properly defined."
+msgstr "Die vereiste SMTP-bediener is nie behoorlik gedefinieer nie."
+
+#, perl-format
+msgid "Server does not support STARTTLS! %s"
+msgstr "Bediener ondersteun nie STARTTLS nie! %s"
+
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "STARTTLS het misluk! %s"
+
+msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
+msgstr ""
+"Kan nie SMTP behoorlik inisialiseer nie. Kontroleer die konfigurasie en "
+"gebruik --smtp-debug."
+
+#, perl-format
+msgid "Outlook reassigned Message-ID to: %s\n"
+msgstr "Outlook het Message-ID hertoegeken aan: %s\n"
+
+msgid "Warning: Could not retrieve Message-ID from server response.\n"
+msgstr ""
+"Waarskuwing: Kon nie Message-ID uit die bediener se antwoord kry nie.\n"
+
+#, perl-format
+msgid "Failed to send %s\n"
+msgstr "Kon nie %s stuur nie\n"
+
+#, perl-format
+msgid "Dry-Sent %s"
+msgstr "Droog gestuur %s"
+
+#, perl-format
+msgid "Sent %s"
+msgstr "%s gestuur"
+
+msgid "Dry-OK. Log says:"
+msgstr "Droog-OK. Log sê:"
+
+msgid "OK. Log says:"
+msgstr "OK. Log sê:"
+
+msgid "Result: "
+msgstr "Resultaat: "
+
+msgid "Result: OK"
+msgstr "Resultaat: OK"
+
+#, perl-format
+msgid "can't open file %s"
+msgstr "kan nie lêer %s oopmaak nie"
+
+#, perl-format
+msgid "(mbox) Adding cc: %s from line '%s'\n"
+msgstr "(mbox) Voeg cc by: %s uit reël '%s'\n"
+
+#, perl-format
+msgid "(mbox) Adding to: %s from line '%s'\n"
+msgstr "(mbox) Voeg to by: %s uit reël '%s'\n"
+
+#, perl-format
+msgid "(non-mbox) Adding cc: %s from line '%s'\n"
+msgstr "(nie-mbox) Voeg cc by: %s uit reël '%s'\n"
+
+#, perl-format
+msgid "(body) Adding cc: %s from line '%s'\n"
+msgstr "(liggaam) Voeg cc by: %s uit reël '%s'\n"
+
+#, perl-format
+msgid "error: invalid SMTP port '%s'\n"
+msgstr "fout: ongeldige SMTP-poort '%s'\n"
+
+#, perl-format
+msgid "(%s) Could not execute '%s'"
+msgstr "(%s) Kon nie '%s' uitvoer nie"
+
+#, perl-format
+msgid "(%s) Malformed output from '%s'"
+msgstr "(%s) Misvormde afvoer van '%s'"
+
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
+msgstr "(%s) kon nie pyp na '%s' toemaak nie"
+
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
+msgstr "(%s) Voeg %s by: %s van: '%s'\n"
+
+msgid "cannot send message as 7bit"
+msgstr "kan nie boodskap as 7-bis stuur nie"
+
+msgid "invalid transfer encoding"
+msgstr "ongeldige oordragenkodering"
+
+#, perl-format
+msgid ""
+"fatal: %s: rejected by %s hook\n"
+"%s\n"
+"warning: no patches were sent\n"
+msgstr ""
+"fataal: %s: deur %s-haak verwerp\n"
+"%s\n"
+"waarskuwing: geen lappe is gestuur nie\n"
+
+#, perl-format
+msgid "unable to open %s: %s\n"
+msgstr "kan nie %s oopmaak nie: %s\n"
+
+#, perl-format
+msgid ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
+msgstr ""
+"fataal: %s:%d is langer as 998 karakters\n"
+"waarskuwing: geen lappe is gestuur nie\n"
+
+#, perl-format
+msgid "Skipping %s with backup suffix '%s'.\n"
+msgstr "Slaan %s met rugsteunagtervoegsel '%s' oor.\n"
+
+#. TRANSLATORS: please keep "[y|N]" as is.
+#, perl-format
+msgid "Do you really want to send %s? [y|N]: "
+msgstr "Wil jy %s regtig stuur? [y|N]: "
+
+#~ msgid "The now-empty commit has been dropped -- cannot amend."
+#~ msgstr "Die nou leë vaslegging is laat val -- kan nie wysig nie."
+
+#~ msgid "cannot do a partial commit during an am session."
+#~ msgstr ""
+#~ "kan nie 'n gedeeltelike vaslegging tydens 'n sessie van am doen nie."
+
+#~ msgid ""
+#~ "cannot do a partial commit while resolving conflicts during a rebase."
+#~ msgstr ""
+#~ "kan nie 'n gedeeltelike vaslegging doen terwyl konflikte tydens 'n "
+#~ "herbasering opgelos word nie."
+
+#~ msgid "You are in the middle of an am session -- cannot amend."
+#~ msgstr "Jy is in die middel van 'n sessie van am -- kan nie wysig nie."
+
+#~ msgid "You are resolving conflicts during a rebase -- cannot amend."
+#~ msgstr ""
+#~ "Jy is besig om konflikte tydens 'n herbasering op te los -- kan nie wysig "
+#~ "nie."

From 14a748f8522dd86bb0d42f435bab8fd665bb864b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9fan=20Driaan=20Turvey?= <stefanturvey1912@gmail.com>
Date: Sun, 27 Sep 2026 11:39:01 +0200
Subject: [PATCH 019/247] l10n: af: fix review comments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéfan Driaan Turvey <stefanturvey1912@gmail.com>
---
 po/af.po | 117 +++++++++++++++++++++++--------------------------------
 1 file changed, 48 insertions(+), 69 deletions(-)

diff --git a/po/af.po b/po/af.po
index 82e7b804b61922..2a3c9b981a63b6 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2026-09-27 15:58+0800\n"
-"PO-Revision-Date: 2026-07-29 10:15+0200\n"
+"POT-Creation-Date: 2026-09-23 23:13+0000\n"
+"PO-Revision-Date: 2026-09-27 11:40+0200\n"
 "Last-Translator: Stéfan Driaan Turvey <stefanturvey1912@gmail.com>\n"
 "Language-Team: Stéfan Driaan Turvey <stefanturvey1912@gmail.com>\n"
 "Language: af\n"
@@ -697,19 +697,20 @@ msgstr ""
 
 msgid "Merging is not possible because you have unmerged files."
 msgstr ""
-"Saamsmelt is nie moontlik nie, omdat jy lêers het wat nie saamgesmelt is nie."
+"Saamsmelting is nie moontlik nie, omdat jy lêers het wat nie saamgesmelt is "
+"nie."
 
 msgid "Pulling is not possible because you have unmerged files."
-msgstr ""
-"Trek is nie moontlik nie, omdat jy lêers het wat nie saamgesmelt is nie."
+msgstr "Jy kan nie trek nie, omdat jy lêers het wat nie saamgesmelt is nie."
 
 msgid "Reverting is not possible because you have unmerged files."
 msgstr ""
-"Omkeer is nie moontlik nie, omdat jy lêers het wat nie saamgesmelt is nie."
+"Omkering is nie moontlik nie, omdat jy lêers het wat nie saamgesmelt is nie."
 
 msgid "Rebasing is not possible because you have unmerged files."
 msgstr ""
-"Herbaseer is nie moontlik nie, omdat jy lêers het wat nie saamgesmelt is nie."
+"Herbasering is nie moontlik nie, omdat jy lêers het wat nie saamgesmelt is "
+"nie."
 
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
@@ -2341,7 +2342,7 @@ msgid "be quiet"
 msgstr "wees stil"
 
 msgid "add a Signed-off-by trailer to the commit message"
-msgstr "voeg 'n Signed-off-by-sleepreël by die vasleggingsboodskap"
+msgstr "voeg 'n Signed-off-by-aanhangsel by die vasleggingsboodskap"
 
 msgid "recode into utf8 (default)"
 msgstr "herkodeer na utf8 (verstek)"
@@ -2425,7 +2426,7 @@ 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/opsie --binary doen al lank niks nie, en\n"
+"Die opsie -b/--binary doen al lank niks nie, en\n"
 "dit sal verwyder word. Moet dit asseblief nie meer gebruik nie."
 
 msgid "failed to read the index"
@@ -3380,7 +3381,7 @@ msgstr ""
 "\n"
 "Wat het jy verwag moes gebeur? (Verwagte gedrag)\n"
 "\n"
-"Wat het eerder gebeur? (Werklike gedrag)\n"
+"Wat het in plaas daarvan gebeur? (Werklike gedrag)\n"
 "\n"
 "Wat is die verskil tussen wat jy verwag het en wat werklik gebeur het?\n"
 "\n"
@@ -3401,7 +3402,7 @@ msgid "specify a destination for the bugreport file(s)"
 msgstr "spesifiseer 'n bestemming vir die foutverslaglêer(s)"
 
 msgid "specify a strftime format suffix for the filename(s)"
-msgstr "spesifiseer 'n strftime-formaatagtervoegsel vir die lêernaam(name)"
+msgstr "spesifiseer 'n strftime-formaatagtervoegsel vir die lêernaam(e)"
 
 #, c-format
 msgid "unknown argument `%s'"
@@ -3894,7 +3895,7 @@ msgstr "Reeds op '%s'\n"
 
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
-msgstr "Oorgeskakel na tak '%s' en dit teruggestel\n"
+msgstr "Oorgeskakel na tak '%s' en dit herstel\n"
 
 #, c-format
 msgid "Switched to a new branch '%s'\n"
@@ -4321,7 +4322,7 @@ msgstr "Voer ignoreerpatrone in>> "
 
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
-msgstr "WAARSKUWING: Kan nie items vind wat ooreenstem met nie: %s"
+msgstr "WAARSKUWING: Kan nie items vind wat hiermee ooreenstem nie: %s"
 
 msgid "Select items to delete"
 msgstr "Kies items om uit te vee"
@@ -4387,7 +4388,7 @@ msgstr "inligting: Kon nie alternatief vir '%s' byvoeg nie: %s\n"
 
 #, c-format
 msgid "failed to stat '%s'"
-msgstr "kon nie '%s' lees nie"
+msgstr "kon nie stat op '%s' uitvoer nie"
 
 #, c-format
 msgid "%s exists and is not a directory"
@@ -4965,9 +4966,8 @@ msgstr "kan nie 'n gedeeltelike vaslegging tydens 'n saamsmelting doen nie."
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "kan nie 'n gedeeltelike vaslegging tydens 'n kersiepluk doen nie."
 
-#, fuzzy
 msgid "cannot do a partial commit during a rebase."
-msgstr "kan nie 'n gedeeltelike vaslegging tydens 'n omkering doen nie."
+msgstr "kan nie 'n gedeeltelike vaslegging tydens 'n herbasering doen nie."
 
 msgid "cannot read the index"
 msgstr "kan nie die indeks lees nie"
@@ -5152,9 +5152,8 @@ msgstr "Jy is in die middel van 'n saamsmelting -- kan nie wysig nie."
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Jy is in die middel van 'n kersiepluk -- kan nie wysig nie."
 
-#, fuzzy
 msgid "You are in the middle of a rebase -- cannot amend."
-msgstr "Jy is in die middel van 'n omkering -- kan nie wysig nie."
+msgstr "Jy is in die middel van 'n herbasering -- kan nie wysig nie."
 
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author kan slegs met -C, -c of --amend gebruik word."
@@ -5228,7 +5227,7 @@ msgid "suppress summary after successful commit"
 msgstr "onderdruk opsomming na suksesvolle vaslegging"
 
 msgid "show diff in commit message template"
-msgstr "wys verskil in vasleggingsboodskapjabloon"
+msgstr "wys verskil in vasleggingsboodskapsjabloon"
 
 msgid "Commit message options"
 msgstr "Vasleggingsboodskapopsies"
@@ -5287,13 +5286,13 @@ msgid "add a Signed-off-by trailer"
 msgstr "voeg 'n Signed-off-by-aanhangsel by"
 
 msgid "use specified template file"
-msgstr "gebruik gespesifiseerde jabloonlêer"
+msgstr "gebruik gespesifiseerde sjabloonlêer"
 
 msgid "force edit of commit"
 msgstr "dwing redigering van vaslegging af"
 
 msgid "include status in commit message template"
-msgstr "sluit status in vasleggingsboodskapjabloon in"
+msgstr "sluit status in vasleggingsboodskapsjabloon in"
 
 msgid "Commit contents options"
 msgstr "Vasleggingsinhoudopsies"
@@ -5607,7 +5606,7 @@ msgid "return all values for multi-valued config options"
 msgstr "gee alle waardes terug vir meerwaardige konfigurasie-opsies"
 
 msgid "interpret the name as a regular expression"
-msgstr "interpreteer die naam as 'n gereelde uitdrukking"
+msgstr "interpreteer die naam as 'n reguliere uitdrukking"
 
 msgid "show config with values matching the pattern"
 msgstr "wys konfigurasie met waardes wat by die patroon pas"
@@ -5693,7 +5692,7 @@ msgid "get all values: key [<value-pattern>]"
 msgstr "kry alle waardes: sleutel [<waardepatroon>]"
 
 msgid "get values for regexp: name-regex [<value-pattern>]"
-msgstr "kry waardes vir gereelde uitdrukking: naam-regex [<waardepatroon>]"
+msgstr "kry waardes vir reguliere uitdrukking: naam-regex [<waardepatroon>]"
 
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "kry waarde spesifiek vir die URL: afdeling[.var] URL"
@@ -5759,7 +5758,7 @@ msgid ""
 "       Use a regexp, --add or --replace-all to change %s."
 msgstr ""
 "kan nie veelvuldige waardes met 'n enkele waarde oorskryf nie\n"
-"       Gebruik 'n gereelde uitdrukking, --add of --replace-all om %s te "
+"       Gebruik 'n reguliere uitdrukking, --add of --replace-all om %s te "
 "verander."
 
 msgid "print sizes in human readable format"
@@ -7085,17 +7084,17 @@ msgid ""
 "new format yet. So if you use tools other than Git to access this\n"
 "repository it may not be an option to migrate to reftables.\n"
 msgstr ""
-"U is op 'n hoofletter-onsensitiewe lêerstelsel, en die afgeleë waarvandaan\n"
-"u probeer haal, het verwysings wat slegs in hoofletters verskil. Dit is\n"
-"onmoontlik om sulke verwysings met die 'files'-agterkant te stoor. U kan\n"
-"dit óf aanvaar soos dit is, in welke geval u nie alle afgeleë verwysings\n"
-"op skyf sal kan stoor nie. Of u kan alternatiewelik u bewaarplek migreer\n"
+"Jy is op 'n hoofletter-onsensitiewe lêerstelsel, en die afgeleë waarvandaan\n"
+"jy probeer haal, het verwysings wat slegs in hoofletters verskil. Dit is\n"
+"onmoontlik om sulke verwysings met die 'files'-agterkant te stoor. Jy kan\n"
+"dit óf aanvaar soos dit is, in welke geval jy nie alle afgeleë verwysings\n"
+"op skyf sal kan stoor nie. Of jy kan alternatiewelik jou bewaarplek migreer\n"
 "om die 'reftable'-agterkant te gebruik met die volgende opdrag:\n"
 "\n"
 "    git refs migrate --ref-format=reftable\n"
 "\n"
 "Hou asseblief in gedagte dat nog nie alle implementerings van Git hierdie\n"
-"nuwe formaat ondersteun nie. As u dus ander hulpmiddels as Git gebruik om\n"
+"nuwe formaat ondersteun nie. As jy dus ander hulpmiddels as Git gebruik om\n"
 "toegang tot hierdie bewaarplek te kry, is migrasie na reftables dalk nie 'n "
 "opsie nie.\n"
 
@@ -7713,7 +7712,8 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Die laaste gc-lopie het die volgende gerapporteer. Korrigeer asseblief die\n"
+"Die laaste gc-uitvoering het die volgende gerapporteer. Korrigeer asseblief "
+"die\n"
 "grondoorsaak en verwyder %s\n"
 "Outomatiese opruiming sal nie uitgevoer word totdat die lêer verwyder is "
 "nie.\n"
@@ -8049,16 +8049,16 @@ msgid "descend at most <n> levels"
 msgstr "daal hoogstens <n> vlakke af"
 
 msgid "use extended POSIX regular expressions"
-msgstr "gebruik uitgebreide POSIX-gereelde uitdrukkings"
+msgstr "gebruik uitgebreide POSIX-reguliere uitdrukkings"
 
 msgid "use basic POSIX regular expressions (default)"
-msgstr "gebruik basiese POSIX-gereelde uitdrukkings (verstek)"
+msgstr "gebruik basiese POSIX-reguliere uitdrukkings (verstek)"
 
 msgid "interpret patterns as fixed strings"
 msgstr "interpreteer patrone as vaste stringe"
 
 msgid "use Perl-compatible regular expressions"
-msgstr "gebruik Perl-versoenbare gereelde uitdrukkings"
+msgstr "gebruik Perl-versoenbare reguliere uitdrukkings"
 
 msgid "show line numbers"
 msgstr "wys reëlnommers"
@@ -11855,7 +11855,7 @@ msgid "do not show diffstat of what changed upstream"
 msgstr "moenie 'n diffstat van wat stroomop verander het wys nie"
 
 msgid "add a Signed-off-by trailer to each commit"
-msgstr "voeg 'n Signed-off-by-sleepreël by elke vaslegging"
+msgstr "voeg 'n Signed-off-by-aanhangsel by elke vaslegging"
 
 msgid "make committer date match author date"
 msgstr "laat die vasleggerdatum met die outeurdatum ooreenstem"
@@ -13470,7 +13470,7 @@ msgid "%s reset is not allowed in a bare repository"
 msgstr "%s-terugstelling word nie in 'n kaal bewaarplek toegelaat nie"
 
 msgid "Unstaged changes after reset:"
-msgstr "Ongeplaaste wysigings na terugstelling:"
+msgstr "Ongeplaasde veranderinge ná herstelling:"
 
 #, c-format
 msgid ""
@@ -14863,7 +14863,7 @@ msgstr "Submodulepad '%s': herbaseer na '%s'\n"
 
 #, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
-msgstr "Submodulepad '%s': '%s' ingesmelt\n"
+msgstr "Submodulepad '%s': in '%s' saamgesmelt\n"
 
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
@@ -17149,7 +17149,7 @@ msgid "No match"
 msgstr "Geen passing nie"
 
 msgid "Invalid regular expression"
-msgstr "Ongeldige gereelde uitdrukking"
+msgstr "Ongeldige reguliere uitdrukking"
 
 msgid "Invalid collation character"
 msgstr "Ongeldige sorteerkarakter"
@@ -17158,7 +17158,7 @@ msgid "Invalid character class name"
 msgstr "Ongeldige karakterklasnaam"
 
 msgid "Trailing backslash"
-msgstr "Agterste trugstreep"
+msgstr "Terugskuinsstreep aan die einde"
 
 msgid "Invalid back reference"
 msgstr "Ongeldige terugverwysing"
@@ -17182,19 +17182,19 @@ msgid "Memory exhausted"
 msgstr "Geheue uitgeput"
 
 msgid "Invalid preceding regular expression"
-msgstr "Ongeldige voorafgaande gereelde uitdrukking"
+msgstr "Ongeldige voorafgaande reguliere uitdrukking"
 
 msgid "Premature end of regular expression"
-msgstr "Voortydige einde van gereelde uitdrukking"
+msgstr "Voortydige einde van reguliere uitdrukking"
 
 msgid "Regular expression too big"
-msgstr "Gereelde uitdrukking te groot"
+msgstr "Reguliere uitdrukking te groot"
 
 msgid "Unmatched ) or \\)"
 msgstr "Ongepaarde ) of \\)"
 
 msgid "No previous regular expression"
-msgstr "Geen vorige gereelde uitdrukking nie"
+msgstr "Geen vorige reguliere uitdrukking nie"
 
 msgid "could not send IPC command"
 msgstr "kon nie IPC-opdrag stuur nie"
@@ -18409,7 +18409,7 @@ msgid "show all changes in the changeset with -S or -G"
 msgstr "wys alle veranderinge in die veranderingstel met -S of -G"
 
 msgid "treat <string> in -S as extended POSIX regular expression"
-msgstr "behandel <string> in -S as uitgebreide POSIX-gereelde uitdrukking"
+msgstr "behandel <string> in -S as uitgebreide POSIX-reguliere uitdrukking"
 
 msgid "control the order in which files appear in the output"
 msgstr "beheer die volgorde waarin lêers in die afvoer verskyn"
@@ -18945,7 +18945,7 @@ msgid ""
 "You can use '!git' in the alias to do this"
 msgstr ""
 "alias '%s' verander omgewingsveranderlikes.\n"
-"U kan '!git' in die alias gebruik om dit te doen"
+"Jy kan '!git' in die alias gebruik om dit te doen"
 
 #, c-format
 msgid "empty alias for %s"
@@ -23674,7 +23674,7 @@ msgid "trailers file is empty"
 msgstr "sleepreëllêer is leeg"
 
 msgid "cannot read trailers files"
-msgstr "kan nie sleepreëllêers lees nie"
+msgstr "kan nie aanhangsellêers lees nie"
 
 msgid "unusable squash-onto"
 msgstr "onbruikbare squash-onto"
@@ -24752,7 +24752,7 @@ msgstr "onbekende waarde '%s' vir sleutel '%s'"
 
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
-msgstr "leë sleepreëlteken in sleepreël '%.*s'"
+msgstr "leë aanhangselteken in aanhangsel '%.*s'"
 
 msgid "empty --trailer argument"
 msgstr "leë argument --trailer"
@@ -25375,7 +25375,7 @@ msgstr "'%s'-lêer bevat nie 'n absolute pad na die werkboomligging nie"
 
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
-msgstr "'%s' is nie 'n lêer .git nie, foutkode %d"
+msgstr "'%s' is nie 'n .git-lêer nie, foutkode %d"
 
 #, c-format
 msgid "'%s' does not point back to '%s'"
@@ -26351,24 +26351,3 @@ msgstr "Slaan %s met rugsteunagtervoegsel '%s' oor.\n"
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Wil jy %s regtig stuur? [y|N]: "
-
-#~ msgid "The now-empty commit has been dropped -- cannot amend."
-#~ msgstr "Die nou leë vaslegging is laat val -- kan nie wysig nie."
-
-#~ msgid "cannot do a partial commit during an am session."
-#~ msgstr ""
-#~ "kan nie 'n gedeeltelike vaslegging tydens 'n sessie van am doen nie."
-
-#~ msgid ""
-#~ "cannot do a partial commit while resolving conflicts during a rebase."
-#~ msgstr ""
-#~ "kan nie 'n gedeeltelike vaslegging doen terwyl konflikte tydens 'n "
-#~ "herbasering opgelos word nie."
-
-#~ msgid "You are in the middle of an am session -- cannot amend."
-#~ msgstr "Jy is in die middel van 'n sessie van am -- kan nie wysig nie."
-
-#~ msgid "You are resolving conflicts during a rebase -- cannot amend."
-#~ msgstr ""
-#~ "Jy is besig om konflikte tydens 'n herbasering op te los -- kan nie wysig "
-#~ "nie."

From a018953688f1b10bddf91bff8747068f5f4746a4 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 27 Sep 2026 21:20:04 -0700
Subject: [PATCH 020/247] Git 2.56

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 GIT-VERSION-GEN | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 3b5fe08c19cc40..64f4abd0f3efe4 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEF_VER=v2.56.0-rc2
+DEF_VER=v2.56.0
 
 LF='
 '

From 5ac97e2a35bea553c0a20d30cd732041053b4040 Mon Sep 17 00:00:00 2001
From: Ian Bearman <ianb@microsoft.com>
Date: Fri, 31 Jan 2020 16:00:25 -0800
Subject: [PATCH 021/247] vcbuild: install ARM64 dependencies when building
 ARM64 binaries

Co-authored-by: Dennis Ameling <dennis@dennisameling.com>
Signed-off-by: Ian Bearman <ianb@microsoft.com>
Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/vcbuild/README              | 6 +++++-
 compat/vcbuild/vcpkg_copy_dlls.bat | 7 ++++++-
 compat/vcbuild/vcpkg_install.bat   | 9 +++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/compat/vcbuild/README b/compat/vcbuild/README
index 29ec1d0f104b80..1df1cabb1ebbbd 100644
--- a/compat/vcbuild/README
+++ b/compat/vcbuild/README
@@ -6,7 +6,11 @@ The Steps to Build Git with VS2015 or VS2017 from the command line.
    Prompt or from an SDK bash window:
 
    $ cd <repo_root>
-   $ ./compat/vcbuild/vcpkg_install.bat
+   $ ./compat/vcbuild/vcpkg_install.bat x64-windows
+
+   or
+
+   $ ./compat/vcbuild/vcpkg_install.bat arm64-windows
 
    The vcpkg tools and all of the third-party sources will be installed
    in this folder:
diff --git a/compat/vcbuild/vcpkg_copy_dlls.bat b/compat/vcbuild/vcpkg_copy_dlls.bat
index 13661c14f8705c..8bea0cbf83b6cf 100644
--- a/compat/vcbuild/vcpkg_copy_dlls.bat
+++ b/compat/vcbuild/vcpkg_copy_dlls.bat
@@ -15,7 +15,12 @@ REM ================================================================
 	@FOR /F "delims=" %%D IN ("%~dp0") DO @SET cwd=%%~fD
 	cd %cwd%
 
-	SET arch=x64-windows
+	SET arch=%2
+	IF NOT DEFINED arch (
+		echo defaulting to 'x64-windows`. Invoke %0 with 'x86-windows', 'x64-windows', or 'arm64-windows'
+		set arch=x64-windows
+	)
+
 	SET inst=%cwd%vcpkg\installed\%arch%
 
 	IF [%1]==[release] (
diff --git a/compat/vcbuild/vcpkg_install.bat b/compat/vcbuild/vcpkg_install.bat
index 8330d8120fb511..cacef18c11dc79 100644
--- a/compat/vcbuild/vcpkg_install.bat
+++ b/compat/vcbuild/vcpkg_install.bat
@@ -31,6 +31,12 @@ REM ================================================================
 
 	SETLOCAL EnableDelayedExpansion
 
+	SET arch=%1
+	IF NOT DEFINED arch (
+		echo defaulting to 'x64-windows`. Invoke %0 with 'x86-windows', 'x64-windows', or 'arm64-windows'
+		set arch=x64-windows
+	)
+
 	@FOR /F "delims=" %%D IN ("%~dp0") DO @SET cwd=%%~fD
 	cd %cwd%
 
@@ -55,9 +61,8 @@ REM ================================================================
 	echo Successfully installed %cwd%vcpkg\vcpkg.exe
 
 :install_libraries
-	SET arch=x64-windows
 
-	echo Installing third-party libraries...
+	echo Installing third-party libraries(%arch%)...
 	FOR %%i IN (zlib expat libiconv openssl libssh2 curl) DO (
 	    cd %cwd%vcpkg
 	    IF NOT EXIST "packages\%%i_%arch%" CALL :sub__install_one %%i

From 918b0dc4f36ae5b3579bbc28a1eae500792c0828 Mon Sep 17 00:00:00 2001
From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Sun, 24 Jul 2011 15:54:04 +0200
Subject: [PATCH 022/247] t9350: point out that refs are not updated correctly

This happens only when the corresponding commits are not exported in
the current fast-export run. This can happen either when the relevant
commit is already marked, or when the commit is explicitly marked
as UNINTERESTING with a negative ref by another argument.

This breaks fast-export basec remote helpers.

Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
---
 t/t9350-fast-export.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
index a487476ad45beb..f4428b21e3211a 100755
--- a/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
@@ -1010,4 +1010,15 @@ test_expect_success GPG,RUST 'export and import of doubly signed commit' '
 	fi
 '
 
+test_expect_failure 'refs are updated even if no commits need to be exported' '
+	cat > expected <<-EOF &&
+	reset refs/heads/main
+	from $(git rev-parse main)
+
+	EOF
+
+	git fast-export main..main > actual &&
+	test_cmp expected actual
+'
+
 test_done

From f99f62620367371c2c2e1e286a629141a8a7ebc7 Mon Sep 17 00:00:00 2001
From: Ian Bearman <ianb@microsoft.com>
Date: Tue, 4 Feb 2020 10:34:40 -0800
Subject: [PATCH 023/247] vcbuild: add an option to install individual
 'features'

In this context, a "feature" is a dependency combined with its own
dependencies.

Signed-off-by: Ian Bearman <ianb@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/vcbuild/vcpkg_install.bat | 35 +++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/compat/vcbuild/vcpkg_install.bat b/compat/vcbuild/vcpkg_install.bat
index cacef18c11dc79..8da212487ae97d 100644
--- a/compat/vcbuild/vcpkg_install.bat
+++ b/compat/vcbuild/vcpkg_install.bat
@@ -85,14 +85,47 @@ REM ================================================================
 :sub__install_one
 	echo     Installing package %1...
 
+	call :%1_features
+
 	REM vcpkg may not be reliable on slow, intermittent or proxy
 	REM connections, see e.g.
 	REM https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/4a8f7be5-5e15-4213-a7bb-ddf424a954e6/winhttpsendrequest-ends-with-12002-errorhttptimeout-after-21-seconds-no-matter-what-timeout?forum=windowssdk
 	REM which explains the hidden 21 second timeout
 	REM (last post by Dave : Microsoft - Windows Networking team)
 
-	.\vcpkg.exe install %1:%arch%
+	.\vcpkg.exe install %1%features%:%arch%
 	IF ERRORLEVEL 1 ( EXIT /B 1 )
 
 	echo     Finished %1
 	goto :EOF
+
+::
+:: features for each vcpkg to install
+:: there should be an entry here for each package to install
+:: 'set features=' means use the default otherwise
+:: 'set features=[comma-delimited-feature-set]' is the syntax
+::
+
+:zlib_features
+set features=
+goto :EOF
+
+:expat_features
+set features=
+goto :EOF
+
+:libiconv_features
+set features=
+goto :EOF
+
+:openssl_features
+set features=
+goto :EOF
+
+:libssh2_features
+set features=
+goto :EOF
+
+:curl_features
+set features=[core,openssl]
+goto :EOF

From b22f01514c73e629b2a5f73f5abedc25a46e9232 Mon Sep 17 00:00:00 2001
From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Sat, 28 Aug 2010 20:49:01 -0500
Subject: [PATCH 024/247] transport-helper: add trailing --

[PT: ensure we add an additional element to the argv array]

Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 transport-helper.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/transport-helper.c b/transport-helper.c
index d5a064d386e35b..242a4a5d556bec 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -501,6 +501,8 @@ static int get_exporter(struct transport *transport,
 	for (size_t i = 0; i < revlist_args->nr; i++)
 		strvec_push(&fastexport->args, revlist_args->items[i].string);
 
+	strvec_push(&fastexport->args, "--");
+
 	fastexport->git_cmd = 1;
 	return start_command(fastexport);
 }

From 3d6381397182feb5ae87b87ae1731afe31b8c717 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 31 Jan 2020 12:02:47 +0100
Subject: [PATCH 025/247] mingw: demonstrate a `git add` issue with NTFS
 junctions

NTFS junctions are somewhat similar in spirit to Unix bind mounts: they
point to a different directory and are resolved by the filesystem
driver. As such, they appear to `lstat()` as if they are directories,
not as if they are symbolic links.

_Any_ user can create junctions, while symbolic links can only be
created by non-administrators in Developer Mode on Windows 10. Hence
NTFS junctions are much more common "in the wild" than NTFS symbolic
links.

It was reported in https://github.com/git-for-windows/git/issues/2481
that adding files via an absolute path that traverses an NTFS junction:
since 1e64d18 (mingw: do resolve symlinks in `getcwd()`), we resolve not
only symbolic links but also NTFS junctions when determining the
absolute path of the current directory. The same is not true for `git
add <file>`, where symbolic links are resolved in `<file>`, but not NTFS
junctions.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t3700-add.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 2947bf9a6b1404..c40d16d9149526 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -587,4 +587,15 @@ test_expect_success CASE_INSENSITIVE_FS 'path is case-insensitive' '
 	git add "$downcased"
 '
 
+test_expect_failure MINGW 'can add files via NTFS junctions' '
+	test_when_finished "cmd //c rmdir junction && rm -rf target" &&
+	test_create_repo target &&
+	cmd //c "mklink /j junction target" &&
+	>target/via-junction &&
+	git -C junction add "$(pwd)/junction/via-junction" &&
+	echo via-junction >expect &&
+	git -C target diff --cached --name-only >actual &&
+	test_cmp expect actual
+'
+
 test_done

From 38068e64e0518c3dc61da6edbd721a298b7021f5 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 10 Jun 2026 17:09:01 +0200
Subject: [PATCH 026/247] ci(vs-build): adapt to Visual Studio 2026 default on
 windows-latest

The `windows-latest` runner image migration that began on June 8, 2026
and completes on June 15, 2026 switches the default Visual Studio
install from VS 2022 (v17) to VS 2026 (v18), per
https://github.com/actions/runner-images/issues/14017.

CMake 4.x picks up the new generator name "Visual Studio 18 2026"
automatically and, crucially, writes the solution file with the new
`.slnx` (XML) extension rather than `.sln`. See
https://github.com/Kitware/CMake/blob/v4.3.2/Source/cmGlobalVisualStudioGenerator.cxx#L1147-L1159
where `GetSLNFile()` appends an "x" to the filename when the generator
version is `VS18` or newer.

As a result, the `MSBuild` step in the `vs-build` job fails with

	MSBUILD : error MSB1009: Project file does not exist.
	Switch: git.sln

because the file CMake actually wrote is `git.slnx`. An example of the
failure can be seen at
https://github.com/git-for-windows/git/actions/runs/27264770241/job/80556419519.

Teach the step to prefer `git.slnx` and fall back to `git.sln` so that
it works on both the new image and any runner still on VS 2022 during
the week-long staggered rollout. The conditional is written in
PowerShell rather than bash so the step stays on the default shell:
`microsoft/setup-msbuild@v3` adds `msbuild` to the Windows `PATH` only,
and an MSYS2 bash spawned by the SDK does not pick it up (an earlier
attempt at this fix using `shell: bash` failed with
`msbuild: command not found`, see
https://github.com/git-for-windows/git/actions/runs/27290221733/job/80608493655).
Letting MSBuild itself discover the solution by omitting the project
argument is not an option here either: CMake emits all `*.vcxproj`
files (one per `add_executable`/`add_library`, e.g.
`git-daemon.vcxproj`, `common-main.vcxproj`, `ALL_BUILD.vcxproj`, ...)
into the same build root as the solution file, and MSBuild's
auto-discovery in
`ProcessProjectSwitch()` (`dotnet/msbuild`, `src/MSBuild/XMake.cs`)
rejects that combination as `AmbiguousProjectError` because it only
disambiguates the special case of exactly two projects where one has a
`.proj` extension.

Additionally, drop the `-property:PlatformToolset=v142` argument that
had been carried since 889cacb6 (ci: configure GitHub Actions for
CI/PR, 2020-04-11), when this job was first configured for VS 2019.
The VS 2026 install on `windows-latest` only ships the v144 toolset
along with a v143 compatibility component
(`Microsoft.VisualStudio.Component.VC.14.44.17.14.x86.x64`); v142 is
no longer present, so the explicit pin would now also fail in its own
right. Removing it lets MSBuild use whatever toolset CMake selected
during configuration (v143 on a VS 2022 runner, v144 on a VS 2026 one),
which keeps the configure and build steps consistent with each other
regardless of which image picked up the job.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Assisted-by: Opus 4.7
---
 .github/workflows/main.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b229739be8b5ec..623cfae32231c1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -222,7 +222,9 @@ jobs:
         cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows \
         -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON
     - name: MSBuild
-      run: msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142
+      run: |
+        $sln = if (Test-Path git.slnx) { 'git.slnx' } else { 'git.sln' }
+        msbuild $sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4
     - name: bundle artifact tar
       shell: bash
       env:

From 96e57e528389b90721d71b96e256aa9239cdc231 Mon Sep 17 00:00:00 2001
From: Dennis Ameling <dennis@dennisameling.com>
Date: Fri, 4 Dec 2020 14:11:34 +0100
Subject: [PATCH 027/247] cmake: allow building for Windows/ARM64

Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 contrib/buildsystems/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 7874e5a32601d5..39bd52816abc78 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -65,9 +65,9 @@ if(USE_VCPKG)
 	set(VCPKG_DIR "${CMAKE_SOURCE_DIR}/compat/vcbuild/vcpkg")
 	if(NOT EXISTS ${VCPKG_DIR})
 		message("Initializing vcpkg and building the Git's dependencies (this will take a while...)")
-		execute_process(COMMAND ${CMAKE_SOURCE_DIR}/compat/vcbuild/vcpkg_install.bat)
+		execute_process(COMMAND ${CMAKE_SOURCE_DIR}/compat/vcbuild/vcpkg_install.bat ${VCPKG_ARCH})
 	endif()
-	list(APPEND CMAKE_PREFIX_PATH "${VCPKG_DIR}/installed/x64-windows")
+	list(APPEND CMAKE_PREFIX_PATH "${VCPKG_DIR}/installed/${VCPKG_ARCH}")
 
 	# In the vcpkg edition, we need this to be able to link to libcurl
 	set(CURL_NO_CURL_CMAKE ON)
@@ -1212,7 +1212,7 @@ string(REPLACE "@USE_LIBPCRE2@" "" git_build_options "${git_build_options}")
 string(REPLACE "@WITH_BREAKING_CHANGES@" "" git_build_options "${git_build_options}")
 string(REPLACE "@X@" "${EXE_EXTENSION}" git_build_options "${git_build_options}")
 if(USE_VCPKG)
-	string(APPEND git_build_options "PATH=\"$PATH:$TEST_DIRECTORY/../compat/vcbuild/vcpkg/installed/x64-windows/bin\"\n")
+	string(APPEND git_build_options "PATH=\"$PATH:$TEST_DIRECTORY/../compat/vcbuild/vcpkg/installed/${VCPKG_ARCH}/bin\"\n")
 endif()
 file(WRITE ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS ${git_build_options})
 

From b797b89ee6852bf1e49976ee8c5f3ae45e73715d Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 22 Jun 2026 20:32:58 +0000
Subject: [PATCH 028/247] ci: bump actions/checkout from 6 to 7

The primary change in this version jump (and the reason for a _major_
version increment) is that this Action is now disabled in GitHub
workflows triggered by workflow_run and pull_request_target events, none
of which are used in Git's workflows. For more details, see
https://github.com/actions/checkout/releases.

Originally-authored-by: dependabot[bot] <support@github.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 .github/workflows/check-style.yml      |  2 +-
 .github/workflows/check-whitespace.yml |  2 +-
 .github/workflows/coverity.yml         |  2 +-
 .github/workflows/main.yml             | 24 ++++++++++++------------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/check-style.yml b/.github/workflows/check-style.yml
index 108a2de903310c..72e66762601413 100644
--- a/.github/workflows/check-style.yml
+++ b/.github/workflows/check-style.yml
@@ -20,7 +20,7 @@ jobs:
       jobname: ClangFormat
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         fetch-depth: 0
 
diff --git a/.github/workflows/check-whitespace.yml b/.github/workflows/check-whitespace.yml
index ea6f49f742108e..7a35b67a636acc 100644
--- a/.github/workflows/check-whitespace.yml
+++ b/.github/workflows/check-whitespace.yml
@@ -19,7 +19,7 @@ jobs:
   check-whitespace:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         fetch-depth: 0
 
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index 58a78f1eb3f836..e0ee69acb3442f 100644
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -38,7 +38,7 @@ jobs:
       COVERITY_LANGUAGE: cxx
       COVERITY_PLATFORM: overridden-below
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: install minimal Git for Windows SDK
         if: contains(matrix.os, 'windows')
         uses: git-for-windows/setup-git-for-windows-sdk@v2
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b229739be8b5ec..0436cdb6fe40e6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -114,7 +114,7 @@ jobs:
       group: windows-build-${{ github.ref }}
       cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - uses: git-for-windows/setup-git-for-windows-sdk@v2
     - name: Install GCC-compatible Rust target
       shell: bash
@@ -199,10 +199,10 @@ jobs:
       group: vs-build-${{ github.ref }}
       cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - uses: git-for-windows/setup-git-for-windows-sdk@v2
     - name: initialize vcpkg
-      uses: actions/checkout@v6
+      uses: actions/checkout@v7
       with:
         repository: 'microsoft/vcpkg'
         path: 'compat/vcbuild/vcpkg'
@@ -284,7 +284,7 @@ jobs:
       group: windows-meson-build-${{ github.ref }}
       cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - uses: actions/setup-python@v6
     - name: Set up dependencies
       shell: pwsh
@@ -312,7 +312,7 @@ jobs:
       group: windows-meson-test-${{ matrix.nr }}-${{ github.ref }}
       cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - uses: actions/setup-python@v6
     - name: Set up dependencies
       shell: pwsh
@@ -367,7 +367,7 @@ jobs:
       TEST_OUTPUT_DIRECTORY: ${{github.workspace}}/t
     runs-on: ${{matrix.vector.pool}}
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - run: ci/install-dependencies.sh
     - run: ci/run-build-and-tests.sh
     - name: print test failures
@@ -388,7 +388,7 @@ jobs:
       CI_JOB_IMAGE: ubuntu-latest
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - run: ci/install-dependencies.sh
     - run: ci/run-build-and-minimal-fuzzers.sh
   dockerized:
@@ -467,7 +467,7 @@ jobs:
         else
           apt-get -q update && apt-get -q -y install git
         fi
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - run: ci/install-dependencies.sh
     - run: useradd builder --create-home
     - run: chown -R builder .
@@ -492,7 +492,7 @@ jobs:
       group: static-analysis-${{ github.ref }}
       cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - run: ci/install-dependencies.sh
     - run: ci/run-static-analysis.sh
     - run: ci/check-directional-formatting.bash
@@ -508,7 +508,7 @@ jobs:
       group: rust-analysis-${{ github.ref }}
       cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - run: ci/install-dependencies.sh
     - run: ci/run-rust-checks.sh
   sparse:
@@ -522,7 +522,7 @@ jobs:
       group: sparse-${{ github.ref }}
       cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - name: Install other dependencies
       run: ci/install-dependencies.sh
     - run: make sparse
@@ -538,6 +538,6 @@ jobs:
       CI_JOB_IMAGE: ubuntu-latest
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - run: ci/install-dependencies.sh
     - run: ci/test-documentation.sh

From 206cff3e71968b48f0df0b363be321a3f6424120 Mon Sep 17 00:00:00 2001
From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Sun, 24 Jul 2011 00:06:00 +0200
Subject: [PATCH 029/247] remote-helper: check helper status after
 import/export

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
---
 t/t5801-remote-helpers.sh |  2 +-
 transport-helper.c        | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index 5fafc857b85627..ca4373d10db0c8 100755
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh
@@ -262,7 +262,7 @@ test_expect_success 'push update refs failure' '
 	echo "update fail" >>file &&
 	git commit -a -m "update fail" &&
 	git rev-parse --verify testgit/origin/heads/update >expect &&
-	test_expect_code 1 env GIT_REMOTE_TESTGIT_FAILURE="non-fast forward" \
+	test_must_fail env GIT_REMOTE_TESTGIT_FAILURE="non-fast forward" \
 		git push origin update &&
 	git rev-parse --verify testgit/origin/heads/update >actual &&
 	test_cmp expect actual
diff --git a/transport-helper.c b/transport-helper.c
index 242a4a5d556bec..8d1d68785e8163 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -507,6 +507,19 @@ static int get_exporter(struct transport *transport,
 	return start_command(fastexport);
 }
 
+static void check_helper_status(struct helper_data *data)
+{
+	int pid, status;
+
+	pid = waitpid(data->helper->pid, &status, WNOHANG);
+	if (pid < 0)
+		die("Could not retrieve status of remote helper '%s'",
+		    data->name);
+	if (pid > 0 && WIFEXITED(status))
+		die("Remote helper '%s' died with %d",
+		    data->name, WEXITSTATUS(status));
+}
+
 static int fetch_with_import(struct transport *transport,
 			     int nr_heads, struct ref **to_fetch)
 {
@@ -543,6 +556,7 @@ static int fetch_with_import(struct transport *transport,
 
 	if (finish_command(&fastimport))
 		die(_("error while running fast-import"));
+	check_helper_status(data);
 
 	/*
 	 * The fast-import stream of a remote helper that advertises
@@ -1193,6 +1207,7 @@ static int push_refs_with_export(struct transport *transport,
 
 	if (finish_command(&exporter))
 		die(_("error while running fast-export"));
+	check_helper_status(data);
 	if (push_update_refs_status(data, remote_refs, flags))
 		return 1;
 

From fc177db564000f30479e4f9f803d261367601f9a Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 31 Jan 2020 11:44:31 +0100
Subject: [PATCH 030/247] strbuf_realpath(): use platform-dependent API if
 available

Some platforms (e.g. Windows) provide API functions to resolve paths
much quicker. Let's offer a way to short-cut `strbuf_realpath()` on
those platforms.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 abspath.c         | 3 +++
 git-compat-util.h | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/abspath.c b/abspath.c
index 1202cde23dbc9b..0c17e98654e4b0 100644
--- a/abspath.c
+++ b/abspath.c
@@ -93,6 +93,9 @@ static char *strbuf_realpath_1(struct strbuf *resolved, const char *path,
 			goto error_out;
 	}
 
+	if (platform_strbuf_realpath(resolved, path))
+		return resolved->buf;
+
 	strbuf_addstr(&remaining, path);
 	get_root_part(resolved, &remaining);
 
diff --git a/git-compat-util.h b/git-compat-util.h
index a0f901ce793ed6..3240443ae439fe 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -354,6 +354,10 @@ static inline int git_has_dir_sep(const char *path)
 #define query_user_email() NULL
 #endif
 
+#ifndef platform_strbuf_realpath
+#define platform_strbuf_realpath(resolved, path) NULL
+#endif
+
 #ifdef __TANDEM
 #include <floss.h(floss_execl,floss_execlp,floss_execv,floss_execvp)>
 #include <floss.h(floss_getpwuid)>

From e8781368ba0dfdb77f716b6f8b2609b597ae9ec0 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 9 May 2020 16:19:06 +0200
Subject: [PATCH 031/247] t5505/t5516: allow running without `.git/branches/`
 in the templates

When we commit the template directory as part of `make vcxproj`, the
`branches/` directory is not actually commited, as it is empty.

Two tests were not prepared for that situation.

This developer tried to get rid of the support for `.git/branches/` a
long time ago, but that effort did not bear fruit, so the best we can do
is work around in these here tests.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t5505-remote.sh     | 4 ++--
 t/t5516-fetch-push.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 5fbfcb084830f2..d8af3c980008f9 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -1299,7 +1299,7 @@ test_expect_success !WITH_BREAKING_CHANGES 'migrate a remote from named file in
 	(
 		cd six &&
 		git remote rm origin &&
-		mkdir .git/branches &&
+		mkdir -p .git/branches &&
 		echo "$origin_url#main" >.git/branches/origin &&
 		git remote rename origin origin &&
 		test_path_is_missing .git/branches/origin &&
@@ -1314,7 +1314,7 @@ test_expect_success !WITH_BREAKING_CHANGES 'migrate a remote from named file in
 	(
 		cd seven &&
 		git remote rm origin &&
-		mkdir .git/branches &&
+		mkdir -p .git/branches &&
 		echo "quux#foom" > .git/branches/origin &&
 		git remote rename origin origin &&
 		test_path_is_missing .git/branches/origin &&
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index b982b209bfd51e..fcb039dd6659da 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -963,7 +963,7 @@ test_expect_success !WITH_BREAKING_CHANGES 'fetch with branches' '
 	mk_empty testrepo &&
 	git branch second $the_first_commit &&
 	git checkout second &&
-	mkdir testrepo/.git/branches &&
+	mkdir -p testrepo/.git/branches &&
 	echo ".." > testrepo/.git/branches/branch1 &&
 	(
 		cd testrepo &&
@@ -977,7 +977,7 @@ test_expect_success !WITH_BREAKING_CHANGES 'fetch with branches' '
 
 test_expect_success !WITH_BREAKING_CHANGES 'fetch with branches containing #' '
 	mk_empty testrepo &&
-	mkdir testrepo/.git/branches &&
+	mkdir -p testrepo/.git/branches &&
 	echo "..#second" > testrepo/.git/branches/branch2 &&
 	(
 		cd testrepo &&
@@ -994,7 +994,7 @@ test_expect_success !WITH_BREAKING_CHANGES 'push with branches' '
 	git checkout second &&
 
 	test_when_finished "rm -rf .git/branches" &&
-	mkdir .git/branches &&
+	mkdir -p .git/branches &&
 	echo "testrepo" > .git/branches/branch1 &&
 
 	git push branch1 &&
@@ -1010,7 +1010,7 @@ test_expect_success !WITH_BREAKING_CHANGES 'push with branches containing #' '
 	mk_empty testrepo &&
 
 	test_when_finished "rm -rf .git/branches" &&
-	mkdir .git/branches &&
+	mkdir -p .git/branches &&
 	echo "testrepo#branch3" > .git/branches/branch2 &&
 
 	git push branch2 &&

From 04f92098671cdc0aee8caf55a746184058bf514e Mon Sep 17 00:00:00 2001
From: Philip Oakley <philipoakley@iee.email>
Date: Sun, 6 Oct 2019 18:40:55 +0100
Subject: [PATCH 032/247] vcpkg_install: detect lack of Git

The vcpkg_install batch file depends on the availability of a
working Git on the CMD path. This may not be present if the user
has selected the 'bash only' option during Git-for-Windows install.

Detect and tell the user about their lack of a working Git in the CMD
window.

Fixes #2348.
A separate PR https://github.com/git-for-windows/build-extra/pull/258
now highlights the recommended path setting during install.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
---
 compat/vcbuild/vcpkg_install.bat | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/compat/vcbuild/vcpkg_install.bat b/compat/vcbuild/vcpkg_install.bat
index ebd0bad242a8ca..bcbbf536af3141 100644
--- a/compat/vcbuild/vcpkg_install.bat
+++ b/compat/vcbuild/vcpkg_install.bat
@@ -36,6 +36,13 @@ REM ================================================================
 
 	dir vcpkg\vcpkg.exe >nul 2>nul && GOTO :install_libraries
 
+	git.exe version 2>nul
+	IF ERRORLEVEL 1 (
+	echo "***"
+	echo "Git not found. Please adjust your CMD path or Git install option."
+	echo "***"
+	EXIT /B 1 )
+
 	echo Fetching vcpkg in %cwd%vcpkg
 	git.exe clone https://github.com/Microsoft/vcpkg vcpkg
 	IF ERRORLEVEL 1 ( EXIT /B 1 )

From 31138aed450bf1a69bf9e7e6cc369d27c989816b Mon Sep 17 00:00:00 2001
From: Dennis Ameling <dennis@dennisameling.com>
Date: Sun, 29 Nov 2020 00:12:26 +0100
Subject: [PATCH 033/247] ci(vs-build) also build Windows/ARM64 artifacts

There are no Windows/ARM64 agents in GitHub Actions yet, therefore we
just skip adjusting the `vs-test` job for now.

Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 .github/workflows/main.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 623cfae32231c1..94324e4829ea5c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -195,8 +195,11 @@ jobs:
       NO_PERL: 1
       GIT_CONFIG_PARAMETERS: "'user.name=CI' 'user.email=ci@git'"
     runs-on: windows-latest
+    strategy:
+      matrix:
+        arch: [x64, arm64]
     concurrency:
-      group: vs-build-${{ github.ref }}
+      group: vs-build-${{ github.ref }}-${{ matrix.arch }}
       cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
     steps:
     - uses: actions/checkout@v6
@@ -215,16 +218,16 @@ jobs:
       uses: microsoft/setup-msbuild@v3
     - name: copy dlls to root
       shell: cmd
-      run: compat\vcbuild\vcpkg_copy_dlls.bat release
+      run: compat\vcbuild\vcpkg_copy_dlls.bat release ${{ matrix.arch }}-windows
     - name: generate Visual Studio solution
       shell: bash
       run: |
-        cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows \
-        -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON
+        cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/${{ matrix.arch }}-windows \
+        -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON -DCMAKE_GENERATOR_PLATFORM=${{ matrix.arch }} -DVCPKG_ARCH=${{ matrix.arch }}-windows
     - name: MSBuild
       run: |
         $sln = if (Test-Path git.slnx) { 'git.slnx' } else { 'git.sln' }
-        msbuild $sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4
+        msbuild $sln -property:Configuration=Release -property:Platform=${{ matrix.arch }} -maxCpuCount:4
     - name: bundle artifact tar
       shell: bash
       env:
@@ -238,7 +241,7 @@ jobs:
     - name: upload tracked files and build artifacts
       uses: actions/upload-artifact@v7
       with:
-        name: vs-artifacts
+        name: vs-artifacts-${{ matrix.arch }}
         path: artifacts
   vs-test:
     name: win+VS test
@@ -256,7 +259,7 @@ jobs:
     - name: download tracked files and build artifacts
       uses: actions/download-artifact@v8
       with:
-        name: vs-artifacts
+        name: vs-artifacts-x64
         path: ${{github.workspace}}
     - name: extract tracked files and build artifacts
       shell: bash

From dff9ccca96337954f527e85d6f3792b37d0f0377 Mon Sep 17 00:00:00 2001
From: Jeff King <peff@peff.net>
Date: Mon, 13 Jan 2025 01:26:01 -0500
Subject: [PATCH 034/247] grep: prevent `^$` false match at end of file

In some implementations, `regexec_buf()` assumes that it is fed lines;
Without `REG_NOTEOL` it thinks the end of the buffer is the end of a
line. Which makes sense, but trips up this case because we are not
feeding lines, but rather a whole buffer. So the final newline is not
the start of an empty line, but the true end of the buffer.

This causes an interesting bug:

  $ echo content >file.txt
  $ git grep --no-index -n '^$' file.txt
  file.txt:2:

This bug is fixed by making the end of the buffer consistently the end
of the final line.

The patch was applied from
https://lore.kernel.org/git/20250113062601.GD767856@coredump.intra.peff.net/

Reported-by: Olly Betts <olly@survex.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 grep.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/grep.c b/grep.c
index 1d75d314211aa8..733fd3a80033e2 100644
--- a/grep.c
+++ b/grep.c
@@ -1647,6 +1647,8 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
 
 	bol = gs->buf;
 	left = gs->size;
+	if (left && gs->buf[left-1] == '\n')
+		left--;
 	while (left) {
 		const char *eol;
 		int hit;

From 3c3ce82aba39dace090e5743b9ed96ecb569605c Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 30 Oct 2024 19:48:46 +0100
Subject: [PATCH 035/247] unix-socket: avoid leak when initialization fails

When a Unix socket is initialized, the current directory's path is
stored so that the cleanup code can `chdir()` back to where it was
before exit.

If the path that needs to be stored exceeds the default size of the
`sun_path` attribute of `struct sockaddr_un` (which is defined as a
108-sized byte array on Linux), a larger buffer needs to be allocated so
that it can hold the path, and it is the responsibility of the
`unix_sockaddr_cleanup()` function to release that allocated memory.

In Git's CI, this stack allocation is not necessary because the code is
checked out to `/home/runner/work/git/git`. Concatenate the path
`t/trash directory.t0301-credential-cache/.cache/git/credential/socket`
and a terminating NUL, and you end up with 96 bytes, 12 shy of the
default `sun_path` size.

However, I use worktrees with slightly longer paths:
`/home/me/projects/git/yes/i/nest/worktrees/to/organize/them/` is more
in line with what I have. When I recently tried to locally reproduce a
failure of the `linux-leaks` CI job, this t0301 test failed (where it
had not failed in CI).

The reason: When `credential-cache` tries to reach its daemon initially
by calling `unix_sockaddr_init()`, it is expected that the daemon cannot
be reached (the idea is to spin up the daemon in that case and try
again). However, when this first call to `unix_sockaddr_init()` fails,
the code returns early from the `unix_stream_connect()` function
_without_ giving the cleanup code a chance to run, skipping the
deallocation of above-mentioned path.

The fix is easy: do not return early but instead go directly to the
cleanup code.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 unix-socket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unix-socket.c b/unix-socket.c
index 8860203c3f46dc..1fa0cf6c15c721 100644
--- a/unix-socket.c
+++ b/unix-socket.c
@@ -84,7 +84,7 @@ int unix_stream_connect(const char *path, int disallow_chdir)
 	struct unix_sockaddr_context ctx;
 
 	if (unix_sockaddr_init(&sa, path, &ctx, disallow_chdir) < 0)
-		return -1;
+		goto fail;
 	fd = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (fd < 0)
 		goto fail;

From 40b7c8acfe635e29dc15a01c0c0d15cc6beacd56 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 26 Jun 2026 12:15:27 +0200
Subject: [PATCH 036/247] bundle-uri: refuse advertised URIs by protocol

Servers may advertise bundle URIs that are not HTTP(S);
copy_uri_to_file() then opens it as a local path. On Windows that can be
a UNC path like `//attacker/share/x`, i.e. a clone can be manipulated
into making an outbound SMB connection that leaks NTLM credentials
(CVE-2026-62960).

Subject advertised URIs to the usual protocol allow-list
(`protocol.*.allow`), which drops "file" (and bare/UNC paths) by default
but keeps http/https/git/ssh. Do it in fetch_bundle_list(), the
clone/fetch consume path, so ls-remote still lists everything; each
skipped URI is reported. A user-supplied `--bundle-uri` is unaffected,
and `protocol.file.allow=always` re-enables an advertised file URI.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 bundle-uri.c                 | 50 ++++++++++++++++++++++++++++++++
 t/lib-bundle-uri-protocol.sh | 56 ++++++++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+)

diff --git a/bundle-uri.c b/bundle-uri.c
index 2bb2eb99e47b58..92a36ca0ab3a43 100644
--- a/bundle-uri.c
+++ b/bundle-uri.c
@@ -15,6 +15,8 @@
 #include "remote.h"
 #include "trace2.h"
 #include "odb.h"
+#include "transport.h"
+#include "url.h"
 
 static struct {
 	enum bundle_list_heuristic heuristic;
@@ -890,11 +892,59 @@ int fetch_bundle_uri(struct repository *r, const char *uri,
 	return result;
 }
 
+/* protocol of 'uri', or "file" if it has none (bare/UNC/relative path) */
+static void bundle_uri_protocol(const char *uri, struct strbuf *out)
+{
+	const char *p = uri;
+
+	while (is_urlschemechar(p == uri, *p))
+		p++;
+	strbuf_reset(out);
+	if (p > uri && starts_with(p, "://"))
+		strbuf_add(out, uri, p - uri);
+	else
+		strbuf_addstr(out, "file");
+}
+
+/* Drop advertised URIs whose protocol is not allowed (see protocol.*.allow). */
+static void sanitize_bundle_list(struct bundle_list *list)
+{
+	struct remote_bundle_info **skipped;
+	size_t nr = 0, i;
+	struct remote_bundle_info *info;
+	struct hashmap_iter iter;
+	struct strbuf proto = STRBUF_INIT;
+
+	ALLOC_ARRAY(skipped, hashmap_get_size(&list->bundles));
+	hashmap_for_each_entry(&list->bundles, &iter, info, ent) {
+		if (!info->uri)
+			continue;
+		bundle_uri_protocol(info->uri, &proto);
+		/* advertised URIs are not user-provided */
+		if (!is_transport_allowed(proto.buf, 0)) {
+			warning(_("skipping bundle URI '%s': protocol '%s' "
+				  "is not allowed"), info->uri, proto.buf);
+			skipped[nr++] = info;
+		}
+	}
+	strbuf_release(&proto);
+
+	for (i = 0; i < nr; i++) {
+		hashmap_remove(&list->bundles, &skipped[i]->ent, NULL);
+		clear_remote_bundle_info(skipped[i], NULL);
+		free(skipped[i]);
+	}
+
+	free(skipped);
+}
+
 int fetch_bundle_list(struct repository *r, struct bundle_list *list)
 {
 	int result;
 	struct bundle_list global_list;
 
+	sanitize_bundle_list(list);
+
 	/*
 	 * If the creationToken heuristic is used, then the URIs
 	 * advertised by 'list' are not nested lists and instead
diff --git a/t/lib-bundle-uri-protocol.sh b/t/lib-bundle-uri-protocol.sh
index 794478ae194c8d..889e673a442f77 100644
--- a/t/lib-bundle-uri-protocol.sh
+++ b/t/lib-bundle-uri-protocol.sh
@@ -237,3 +237,59 @@ test_expect_success "test bundle-uri with $BUNDLE_URI_PROTOCOL:// using protocol
 		>actual &&
 	test_cmp_config_output expect actual
 '
+
+# Advertised bundle URIs are subject to protocol.*.allow; "file" (and bare or
+# UNC paths) is denied by default, so such a URI must be skipped, not fetched.
+advertise_uri () {
+	test_config -C "$BUNDLE_URI_PARENT" bundle.version 1 &&
+	test_config -C "$BUNDLE_URI_PARENT" bundle.mode all &&
+	test_config -C "$BUNDLE_URI_PARENT" bundle.payload.uri "$1"
+}
+
+ignores_advertised_uri () {
+	rm -rf victim &&
+	advertise_uri "$1" &&
+	git -c transfer.bundleURI=true -c protocol.version=2 \
+		clone "$BUNDLE_URI_REPO_URI" victim &&
+	git -C victim for-each-ref refs/bundles/ >refs &&
+	test_must_be_empty refs
+}
+
+test_expect_success "create bundle to advertise" '
+	git -C "$BUNDLE_URI_PARENT" bundle create "$PWD/payload.bundle" main
+'
+
+test_expect_success "ignore non-HTTP(S) bundle URI with $BUNDLE_URI_PROTOCOL://" '
+	ignores_advertised_uri "$PWD/payload.bundle" &&
+	ignores_advertised_uri "file://$PWD/payload.bundle"
+'
+
+test_expect_success "protocol.file.allow=always honors file bundle URI with $BUNDLE_URI_PROTOCOL://" '
+	rm -rf victim &&
+	advertise_uri "$PWD/payload.bundle" &&
+	git -c transfer.bundleURI=true -c protocol.version=2 \
+		-c protocol.file.allow=always \
+		clone "$BUNDLE_URI_REPO_URI" victim &&
+	git -C victim rev-parse --verify refs/bundles/heads/main
+'
+
+# same path via a UNC administrative share (cf. t5580-unc-paths.sh)
+if test_have_prereq CYGWIN
+then
+	UNCPATH="$(cygpath -aw .)"
+elif test_have_prereq MINGW
+then
+	UNCPATH="$(pwd)"
+fi
+case "$UNCPATH" in
+[A-Za-z]:*)
+	WITHOUTDRIVE="${UNCPATH#?:}"
+	UNCPATH="//localhost/${UNCPATH%%:*}\$$WITHOUTDRIVE"
+	test -d "$UNCPATH" && test_set_prereq ADMIN_UNC
+	;;
+esac
+
+test_expect_success ADMIN_UNC "ignore UNC bundle URI with $BUNDLE_URI_PROTOCOL://" '
+	ignores_advertised_uri "$UNCPATH/payload.bundle" &&
+	ignores_advertised_uri "file://$UNCPATH/payload.bundle"
+'

From bb304b1fa76c5d5fcb23e56789ac7a204a7193a0 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 29 Jun 2026 20:32:59 +0000
Subject: [PATCH 037/247] ci(coverity): bump actions/cache from 5 to 6

This update only means that the Action is now an ECMAScript module, no
functional changes implied.

Originally-authored-by: dependabot[bot] <support@github.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 .github/workflows/coverity.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index e0ee69acb3442f..92438f5c7d934c 100644
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -98,7 +98,7 @@ jobs:
       # A cache miss will add ~30s to create, but a cache hit will save minutes.
       - name: restore the Coverity Build Tool
         id: cache
-        uses: actions/cache/restore@v5
+        uses: actions/cache/restore@v6
         with:
           path: ${{ runner.temp }}/cov-analysis
           key: cov-build-${{ env.COVERITY_LANGUAGE }}-${{ env.COVERITY_PLATFORM }}-${{ steps.lookup.outputs.hash }}
@@ -141,7 +141,7 @@ jobs:
           esac
       - name: cache the Coverity Build Tool
         if: steps.cache.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v5
+        uses: actions/cache/save@v6
         with:
           path: ${{ runner.temp }}/cov-analysis
           key: cov-build-${{ env.COVERITY_LANGUAGE }}-${{ env.COVERITY_PLATFORM }}-${{ steps.lookup.outputs.hash }}

From e6545765c5d77a11d94d9f0eb01c2f08eba689f5 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 9 Apr 2012 13:04:35 -0500
Subject: [PATCH 038/247] Always auto-gc after calling a fast-import transport

After importing anything with fast-import, we should always let the
garbage collector do its job, since the objects are written to disk
inefficiently.

This brings down an initial import of http://selenic.com/hg from about
230 megabytes to about 14.

In the future, we may want to make this configurable on a per-remote
basis, or maybe teach fast-import about it in the first place.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 transport-helper.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/transport-helper.c b/transport-helper.c
index 8d1d68785e8163..418d8cf3c9c426 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -22,6 +22,8 @@
 #include "packfile.h"
 
 static int debug;
+/* TODO: put somewhere sensible, e.g. git_transport_options? */
+static int auto_gc = 1;
 
 struct helper_data {
 	char *name;
@@ -590,6 +592,13 @@ static int fetch_with_import(struct transport *transport,
 		}
 	}
 	strbuf_release(&buf);
+	if (auto_gc) {
+		struct child_process cmd = CHILD_PROCESS_INIT;
+
+		cmd.git_cmd = 1;
+		strvec_pushl(&cmd.args, "gc", "--auto", "--quiet", NULL);
+		run_command(&cmd);
+	}
 	return 0;
 }
 

From ac0dc06b56a43f5a9fe1e4ead45d972d9e956dce Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 18 Apr 2017 12:09:08 +0200
Subject: [PATCH 039/247] mingw: prevent regressions with "drive-less" absolute
 paths

On Windows, there are several categories of absolute paths. One such
category starts with a backslash and is implicitly relative to the drive
associated with the current working directory. Example:

	c:
	git clone https://github.com/git-for-windows/git \G4W

should clone into C:\G4W.

Back in 2017, Juan Carlos Arevalo Baeza reported a bug in Git's handling
of those absolute paths was identified, and fixed. Let's make sure that
it stays fixed.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t5580-unc-paths.sh | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/t/t5580-unc-paths.sh b/t/t5580-unc-paths.sh
index 65ef1a3628ee94..e9df367d5777fd 100755
--- a/t/t5580-unc-paths.sh
+++ b/t/t5580-unc-paths.sh
@@ -20,14 +20,11 @@ fi
 UNCPATH="$(winpwd)"
 case "$UNCPATH" in
 [A-Z]:*)
+	WITHOUTDRIVE="${UNCPATH#?:}"
 	# Use administrative share e.g. \\localhost\C$\git-sdk-64\usr\src\git
 	# (we use forward slashes here because MSYS2 and Git accept them, and
 	# they are easier on the eyes)
-	UNCPATH="//localhost/${UNCPATH%%:*}\$/${UNCPATH#?:}"
-	test -d "$UNCPATH" || {
-		skip_all='could not access administrative share; skipping'
-		test_done
-	}
+	UNCPATH="//localhost/${UNCPATH%%:*}\$$WITHOUTDRIVE"
 	;;
 *)
 	skip_all='skipping UNC path tests, cannot determine current path as UNC'
@@ -35,6 +32,18 @@ case "$UNCPATH" in
 	;;
 esac
 
+test_expect_success 'clone into absolute path lacking a drive prefix' '
+	USINGBACKSLASHES="$(echo "$WITHOUTDRIVE"/without-drive-prefix |
+		tr / \\\\)" &&
+	git clone . "$USINGBACKSLASHES" &&
+	test -f without-drive-prefix/.git/HEAD
+'
+
+test -d "$UNCPATH" || {
+	skip_all='could not access administrative share; skipping'
+	test_done
+}
+
 test_expect_success setup '
 	test_commit initial
 '

From 484bcfff9875ae74e4df8a578f471d8a53cc999e Mon Sep 17 00:00:00 2001
From: Thomas Braun <thomas.braun@byte-physics.de>
Date: Thu, 8 May 2014 21:43:24 +0200
Subject: [PATCH 040/247] transport: optionally disable side-band-64k

Since commit 0c499ea60fda (send-pack: demultiplex a sideband stream with
status data, 2010-02-05) the send-pack builtin uses the side-band-64k
capability if advertised by the server.

Unfortunately this breaks pushing over the dump git protocol if used
over a network connection.

The detailed reasons for this breakage are (by courtesy of Jeff Preshing,
quoted from https://groups.google.com/d/msg/msysgit/at8D7J-h7mw/eaLujILGUWoJ):

	MinGW wraps Windows sockets in CRT file descriptors in order to
	mimic the functionality of POSIX sockets. This causes msvcrt.dll
	to treat sockets as Installable File System (IFS) handles,
	calling ReadFile, WriteFile, DuplicateHandle and CloseHandle on
	them. This approach works well in simple cases on recent
	versions of Windows, but does not support all usage patterns. In
	particular, using this approach, any attempt to read & write
	concurrently on the same socket (from one or more processes)
	will deadlock in a scenario where the read waits for a response
	from the server which is only invoked after the write. This is
	what send_pack currently attempts to do in the use_sideband
	codepath.

The new config option `sendpack.sideband` allows to override the
side-band-64k capability of the server, and thus makes the dumb git
protocol work.

Other transportation methods like ssh and http/https still benefit from
the sideband channel, therefore the default value of `sendpack.sideband`
is still true.

Signed-off-by: Thomas Braun <thomas.braun@byte-physics.de>
Signed-off-by: Oliver Schneider <oliver@assarbad.net>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 Documentation/config.adoc          | 2 ++
 Documentation/config/sendpack.adoc | 5 +++++
 send-pack.c                        | 6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 Documentation/config/sendpack.adoc

diff --git a/Documentation/config.adoc b/Documentation/config.adoc
index f67dcd2f8e05dd..321b00c18d312e 100644
--- a/Documentation/config.adoc
+++ b/Documentation/config.adoc
@@ -578,6 +578,8 @@ include::config/safe.adoc[]
 
 include::config/sendemail.adoc[]
 
+include::config/sendpack.adoc[]
+
 include::config/sequencer.adoc[]
 
 include::config/showbranch.adoc[]
diff --git a/Documentation/config/sendpack.adoc b/Documentation/config/sendpack.adoc
new file mode 100644
index 00000000000000..e306f657fba7dd
--- /dev/null
+++ b/Documentation/config/sendpack.adoc
@@ -0,0 +1,5 @@
+sendpack.sideband::
+	Allows to disable the side-band-64k capability for send-pack even
+	when it is advertised by the server. Makes it possible to work
+	around a limitation in the git for windows implementation together
+	with the dump git protocol. Defaults to true.
diff --git a/send-pack.c b/send-pack.c
index f20460fbf487bf..c6711b0a02509c 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -489,7 +489,7 @@ int send_pack(struct repository *r,
 	int need_pack_data = 0;
 	int allow_deleting_refs = 0;
 	int status_report = 0;
-	int use_sideband = 0;
+	int use_sideband = 1;
 	int quiet_supported = 0;
 	int agent_supported = 0;
 	int advertise_sid = 0;
@@ -513,6 +513,7 @@ int send_pack(struct repository *r,
 		goto out;
 	}
 
+	repo_config_get_bool(r, "sendpack.sideband", &use_sideband);
 	repo_config_get_bool(r, "push.negotiate", &push_negotiate);
 	if (push_negotiate) {
 		trace2_region_enter("send_pack", "push_negotiate", r);
@@ -537,8 +538,7 @@ int send_pack(struct repository *r,
 		allow_deleting_refs = 1;
 	if (server_supports("ofs-delta"))
 		args->use_ofs_delta = 1;
-	if (server_supports("side-band-64k"))
-		use_sideband = 1;
+	use_sideband = use_sideband && server_supports("side-band-64k");
 	if (server_supports("quiet"))
 		quiet_supported = 1;
 	if (server_supports("agent"))

From 4e1e01eb349c9888d97102a46ca7203c2f49be61 Mon Sep 17 00:00:00 2001
From: Bjoern Mueller <bjoernm@gmx.de>
Date: Wed, 22 Jan 2020 13:49:13 +0100
Subject: [PATCH 041/247] mingw: fix fatal error working on mapped network
 drives on Windows

In 1e64d18 (mingw: do resolve symlinks in `getcwd()`) a problem was
introduced that causes git for Windows to stop working with certain
mapped network drives (in particular, drives that are mapped to
locations with long path names). Error message was "fatal: Unable to
read current working directory: No such file or directory". Present
change fixes this issue as discussed in
https://github.com/git-for-windows/git/issues/2480

Signed-off-by: Bjoern Mueller <bjoernm@gmx.de>
---
 compat/mingw.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 0c8179f3458bb8..78de2fcb1ee126 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1561,8 +1561,13 @@ char *mingw_getcwd(char *pointer, int len)
 	if (hnd != INVALID_HANDLE_VALUE) {
 		ret = GetFinalPathNameByHandleW(hnd, wpointer, ARRAY_SIZE(wpointer), 0);
 		CloseHandle(hnd);
-		if (!ret || ret >= ARRAY_SIZE(wpointer))
-			return NULL;
+		if (!ret || ret >= ARRAY_SIZE(wpointer)) {
+			ret = GetLongPathNameW(cwd, wpointer, ARRAY_SIZE(wpointer));
+			if (!ret || ret >= ARRAY_SIZE(wpointer)) {
+				errno = ret ? ENAMETOOLONG : err_win_to_posix(GetLastError());
+				return NULL;
+			}
+		}
 		if (xwcstoutf(pointer, normalize_ntpath(wpointer), len) < 0)
 			return NULL;
 		return pointer;

From c2da1e55e2074ba4b78bc7a1694aac05ee7e4653 Mon Sep 17 00:00:00 2001
From: Jeff Hostetler <jeffhost@microsoft.com>
Date: Thu, 30 Jan 2020 14:22:27 -0500
Subject: [PATCH 042/247] clink.pl: fix MSVC compile script to handle
 libcurl-d.lib

Update clink.pl to link with either libcurl.lib or libcurl-d.lib
depending on whether DEBUG=1 is set.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/vcbuild/scripts/clink.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl
index 3bd824154be381..c4c99d1a11f18c 100755
--- a/compat/vcbuild/scripts/clink.pl
+++ b/compat/vcbuild/scripts/clink.pl
@@ -56,7 +56,8 @@
 		# need to use that instead?
 		foreach my $flag (@lflags) {
 			if ($flag =~ /^-LIBPATH:(.*)/) {
-				foreach my $l ("libcurl_imp.lib", "libcurl.lib") {
+				my $libcurl = $is_debug ? "libcurl-d.lib" : "libcurl.lib";
+				foreach my $l ("libcurl_imp.lib", $libcurl) {
 					if (-f "$1/$l") {
 						$lib = $l;
 						last;

From 79bc9cedaac30f80c9e699eeed5736f0de2704ea Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 31 Jan 2020 11:49:04 +0100
Subject: [PATCH 043/247] mingw: implement a platform-specific
 `strbuf_realpath()`

There is a Win32 API function to resolve symbolic links, and we can use
that instead of resolving them manually. Even better, this function also
resolves NTFS junction points (which are somewhat similar to bind
mounts).

This fixes https://github.com/git-for-windows/git/issues/2481.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/mingw.c        | 76 +++++++++++++++++++++++++++++++++++++++++++
 compat/mingw.h        |  3 ++
 t/t0060-path-utils.sh |  8 +++++
 t/t3700-add.sh        |  2 +-
 t/t5601-clone.sh      |  7 ++++
 5 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 0c8179f3458bb8..b5eb6f04150867 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1545,6 +1545,82 @@ struct tm *localtime_r(const time_t *timep, struct tm *result)
 }
 #endif
 
+char *mingw_strbuf_realpath(struct strbuf *resolved, const char *path)
+{
+	wchar_t wpath[MAX_PATH];
+	HANDLE h;
+	DWORD ret;
+	int len;
+	const char *last_component = NULL;
+	char *append = NULL;
+
+	if (xutftowcs_path(wpath, path) < 0)
+		return NULL;
+
+	h = CreateFileW(wpath, 0,
+			FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL,
+			OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+
+	/*
+	 * strbuf_realpath() allows the last path component to not exist. If
+	 * that is the case, now it's time to try without last component.
+	 */
+	if (h == INVALID_HANDLE_VALUE &&
+	    GetLastError() == ERROR_FILE_NOT_FOUND) {
+		/* cut last component off of `wpath` */
+		wchar_t *p = wpath + wcslen(wpath);
+
+		while (p != wpath)
+			if (*(--p) == L'/' || *p == L'\\')
+				break; /* found start of last component */
+
+		if (p != wpath && (last_component = find_last_dir_sep(path))) {
+			append = xstrdup(last_component + 1); /* skip directory separator */
+			/*
+			 * Do not strip the trailing slash at the drive root, otherwise
+			 * the path would be e.g. `C:` (which resolves to the
+			 * _current_ directory on that drive).
+			 */
+			if (p[-1] == L':')
+				p[1] = L'\0';
+			else
+				*p = L'\0';
+			h = CreateFileW(wpath, 0, FILE_SHARE_READ |
+					FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+					NULL, OPEN_EXISTING,
+					FILE_FLAG_BACKUP_SEMANTICS, NULL);
+		}
+	}
+
+	if (h == INVALID_HANDLE_VALUE) {
+realpath_failed:
+		FREE_AND_NULL(append);
+		return NULL;
+	}
+
+	ret = GetFinalPathNameByHandleW(h, wpath, ARRAY_SIZE(wpath), 0);
+	CloseHandle(h);
+	if (!ret || ret >= ARRAY_SIZE(wpath))
+		goto realpath_failed;
+
+	len = wcslen(wpath) * 3;
+	strbuf_grow(resolved, len);
+	len = xwcstoutf(resolved->buf, normalize_ntpath(wpath), len);
+	if (len < 0)
+		goto realpath_failed;
+	resolved->len = len;
+
+	if (append) {
+		/* Use forward-slash, like `normalize_ntpath()` */
+		strbuf_complete(resolved, '/');
+		strbuf_addstr(resolved, append);
+		FREE_AND_NULL(append);
+	}
+
+	return resolved->buf;
+
+}
+
 char *mingw_getcwd(char *pointer, int len)
 {
 	wchar_t cwd[MAX_PATH], wpointer[MAX_PATH];
diff --git a/compat/mingw.h b/compat/mingw.h
index df02aeb632d8c3..8f3dbed9a7b789 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -39,6 +39,9 @@ static inline void convert_slashes(char *path)
 #define PATH_SEP ';'
 char *mingw_query_user_email(void);
 #define query_user_email mingw_query_user_email
+struct strbuf;
+char *mingw_strbuf_realpath(struct strbuf *resolved, const char *path);
+#define platform_strbuf_realpath mingw_strbuf_realpath
 
 /**
  * Verifies that the specified path is owned by the user running the
diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
index 56faf5fe732ee0..3cdc4738644dbc 100755
--- a/t/t0060-path-utils.sh
+++ b/t/t0060-path-utils.sh
@@ -281,6 +281,14 @@ test_expect_success SYMLINKS 'real path works on symlinks' '
 	test_cmp expect actual
 '
 
+test_expect_success MINGW 'real path works near drive root' '
+	# we need a non-existing path at the drive root; simply skip if C:/xyz exists
+	if test ! -e C:/xyz
+	then
+		test C:/xyz = $(test-tool path-utils real_path C:/xyz)
+	fi
+'
+
 test_expect_success SYMLINKS 'prefix_path works with absolute paths to work tree symlinks' '
 	ln -s target symlink &&
 	echo "symlink" >expect &&
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index c40d16d9149526..b9495e5cf00724 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -587,7 +587,7 @@ test_expect_success CASE_INSENSITIVE_FS 'path is case-insensitive' '
 	git add "$downcased"
 '
 
-test_expect_failure MINGW 'can add files via NTFS junctions' '
+test_expect_success MINGW 'can add files via NTFS junctions' '
 	test_when_finished "cmd //c rmdir junction && rm -rf target" &&
 	test_create_repo target &&
 	cmd //c "mklink /j junction target" &&
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index b6167582a185c0..6ac86471d7dc60 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -78,6 +78,13 @@ test_expect_success 'clone respects GIT_WORK_TREE' '
 
 '
 
+test_expect_success CASE_INSENSITIVE_FS 'core.worktree is not added due to path case' '
+
+	mkdir UPPERCASE &&
+	git clone src "$(pwd)/uppercase" &&
+	test "unset" = "$(git -C UPPERCASE config --default unset core.worktree)"
+'
+
 test_expect_success 'clone from hooks' '
 
 	test_create_repo r0 &&

From 1bb7c8290b5989efc25106f12e5593d3b35225cf Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 4 Mar 2020 21:55:28 +0100
Subject: [PATCH 044/247] http: use new "best effort" strategy for Secure
 Channel revoke checking
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The native Windows HTTPS backend is based on Secure Channel which lets
the caller decide how to handle revocation checking problems caused by
missing information in the certificate or offline CRL distribution
points.

Unfortunately, cURL chose to handle these problems differently than
OpenSSL by default: while OpenSSL happily ignores those problems
(essentially saying "¯\_(ツ)_/¯"), the Secure Channel backend will error
out instead.

As a remedy, the "no revoke" mode was introduced, which turns off
revocation checking altogether. This is a bit heavy-handed. We support
this via the `http.schannelCheckRevoke` setting.

In https://github.com/curl/curl/pull/4981, we contributed an opt-in
"best effort" strategy that emulates what OpenSSL seems to do.

In Git for Windows, we actually want this to be the default. This patch
makes it so, introducing it as a new value for the
`http.schannelCheckRevoke" setting, which now becmes a tristate: it
accepts the values "false", "true" or "best-effort" (defaulting to the
last one).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 Documentation/config/http.adoc | 12 +++++++-----
 http.c                         | 25 +++++++++++++++++++++----
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/Documentation/config/http.adoc b/Documentation/config/http.adoc
index 792a71b41350d4..847a9e79ab2290 100644
--- a/Documentation/config/http.adoc
+++ b/Documentation/config/http.adoc
@@ -244,11 +244,13 @@ http.sslKeyType::
 
 http.schannelCheckRevoke::
 	Used to enforce or disable certificate revocation checks in cURL
-	when http.sslBackend is set to "schannel". Defaults to `true` if
-	unset. Only necessary to disable this if Git consistently errors
-	and the message is about checking the revocation status of a
-	certificate. This option is ignored if cURL lacks support for
-	setting the relevant SSL option at runtime.
+	when http.sslBackend is set to "schannel" via "true" and "false",
+	respectively. Another accepted value is "best-effort" (the default)
+	in which case revocation checks are performed, but errors due to
+	revocation list distribution points that are offline are silently
+	ignored, as well as errors due to certificates missing revocation
+	list distribution points. This option is ignored if cURL lacks
+	support for setting the relevant SSL option at runtime.
 
 http.schannelUseSSLCAInfo::
 	As of cURL v7.60.0, the Secure Channel backend can use the
diff --git a/http.c b/http.c
index c8fcfd7693e897..7a540ecc78364d 100644
--- a/http.c
+++ b/http.c
@@ -151,7 +151,12 @@ static char *cached_accept_language;
 
 static char *http_ssl_backend;
 
-static int http_schannel_check_revoke = 1;
+static long http_schannel_check_revoke_mode =
+#ifdef CURLSSLOPT_REVOKE_BEST_EFFORT
+	CURLSSLOPT_REVOKE_BEST_EFFORT;
+#else
+	CURLSSLOPT_NO_REVOKE;
+#endif
 
 static long http_retry_after = 0;
 static long http_max_retries = 0;
@@ -431,7 +436,19 @@ static int http_options(const char *var, const char *value,
 	}
 
 	if (!strcmp("http.schannelcheckrevoke", var)) {
-		http_schannel_check_revoke = git_config_bool(var, value);
+		if (value && !strcmp(value, "best-effort")) {
+			http_schannel_check_revoke_mode =
+#ifdef CURLSSLOPT_REVOKE_BEST_EFFORT
+				CURLSSLOPT_REVOKE_BEST_EFFORT;
+#else
+				CURLSSLOPT_NO_REVOKE;
+			warning(_("%s=%s unsupported by current cURL"),
+				var, value);
+#endif
+		} else
+			http_schannel_check_revoke_mode =
+				(git_config_bool(var, value) ?
+				 0 : CURLSSLOPT_NO_REVOKE);
 		return 0;
 	}
 
@@ -1161,8 +1178,8 @@ static CURL *get_curl_handle(void)
 #endif
 
 	if (http_ssl_backend && !strcmp("schannel", http_ssl_backend) &&
-	    !http_schannel_check_revoke) {
-		curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, (long)CURLSSLOPT_NO_REVOKE);
+	    http_schannel_check_revoke_mode) {
+		curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, http_schannel_check_revoke_mode);
 	}
 
 	if (http_proactive_auth != PROACTIVE_AUTH_NONE)

From 017c05bd9a450d6aa6762c6151287dadfc8b3d7c Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 9 May 2020 19:24:23 +0200
Subject: [PATCH 045/247] t5505/t5516: fix white-space around redirectors

The convention in Git project's shell scripts is to have white-space
_before_, but not _after_ the `>` (or `<`).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t5505-remote.sh     |  6 +++---
 t/t5516-fetch-push.sh | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index d8af3c980008f9..5ea5792e14e32c 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -973,8 +973,8 @@ test_expect_success '"remote show" does not show symbolic refs' '
 	(
 		cd three &&
 		git remote show origin >output &&
-		! grep "^ *HEAD$" < output &&
-		! grep -i stale < output
+		! grep "^ *HEAD$" <output &&
+		! grep -i stale <output
 	)
 '
 
@@ -1315,7 +1315,7 @@ test_expect_success !WITH_BREAKING_CHANGES 'migrate a remote from named file in
 		cd seven &&
 		git remote rm origin &&
 		mkdir -p .git/branches &&
-		echo "quux#foom" > .git/branches/origin &&
+		echo "quux#foom" >.git/branches/origin &&
 		git remote rename origin origin &&
 		test_path_is_missing .git/branches/origin &&
 		test "$(git config remote.origin.url)" = "quux" &&
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index fcb039dd6659da..b1e82082b7823f 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -964,7 +964,7 @@ test_expect_success !WITH_BREAKING_CHANGES 'fetch with branches' '
 	git branch second $the_first_commit &&
 	git checkout second &&
 	mkdir -p testrepo/.git/branches &&
-	echo ".." > testrepo/.git/branches/branch1 &&
+	echo ".." >testrepo/.git/branches/branch1 &&
 	(
 		cd testrepo &&
 		git fetch branch1 &&
@@ -978,7 +978,7 @@ test_expect_success !WITH_BREAKING_CHANGES 'fetch with branches' '
 test_expect_success !WITH_BREAKING_CHANGES 'fetch with branches containing #' '
 	mk_empty testrepo &&
 	mkdir -p testrepo/.git/branches &&
-	echo "..#second" > testrepo/.git/branches/branch2 &&
+	echo "..#second" >testrepo/.git/branches/branch2 &&
 	(
 		cd testrepo &&
 		git fetch branch2 &&
@@ -995,7 +995,7 @@ test_expect_success !WITH_BREAKING_CHANGES 'push with branches' '
 
 	test_when_finished "rm -rf .git/branches" &&
 	mkdir -p .git/branches &&
-	echo "testrepo" > .git/branches/branch1 &&
+	echo "testrepo" >.git/branches/branch1 &&
 
 	git push branch1 &&
 	(
@@ -1011,7 +1011,7 @@ test_expect_success !WITH_BREAKING_CHANGES 'push with branches containing #' '
 
 	test_when_finished "rm -rf .git/branches" &&
 	mkdir -p .git/branches &&
-	echo "testrepo#branch3" > .git/branches/branch2 &&
+	echo "testrepo#branch3" >.git/branches/branch2 &&
 
 	git push branch2 &&
 	(
@@ -1541,7 +1541,7 @@ EOF
 	git init no-thin &&
 	git --git-dir=no-thin/.git config receive.unpacklimit 0 &&
 	git push no-thin/.git refs/heads/main:refs/heads/foo &&
-	echo modified >> path1 &&
+	echo modified >>path1 &&
 	git commit -am modified &&
 	git repack -adf &&
 	rcvpck="git receive-pack --reject-thin-pack-for-testing" &&

From d4539965792865539fca0b37f27f9a6787c4e6ef Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 12 Sep 2015 12:25:47 +0200
Subject: [PATCH 046/247] t3701: verify that we can add *lots* of files
 interactively

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t3701-add-interactive.sh | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 6e120a40011238..cb09158c214768 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -1204,6 +1204,27 @@ test_expect_success 'checkout -p patch editing of added file' '
 	)
 '
 
+test_expect_success EXPENSIVE 'add -i with a lot of files' '
+	git reset --hard &&
+	x160=0123456789012345678901234567890123456789 &&
+	x160=$x160$x160$x160$x160 &&
+	y= &&
+	i=0 &&
+	while test $i -le 200
+	do
+		name=$(printf "%s%03d" $x160 $i) &&
+		echo $name >$name &&
+		git add -N $name &&
+		y="${y}y$LF" &&
+		i=$(($i+1)) ||
+		exit 1
+	done &&
+	echo "$y" | git add -p -- . &&
+	git diff --cached >staged &&
+	test_line_count = 1407 staged &&
+	git reset --hard
+'
+
 test_expect_success 'show help from add--helper' '
 	git reset --hard &&
 	cat >expect <<-EOF &&

From 143d2ff401f4bd58712390815f6ea105874dc02e Mon Sep 17 00:00:00 2001
From: Luke Bonanomi <lbonanomi@gmail.com>
Date: Wed, 24 Jun 2020 07:45:52 -0400
Subject: [PATCH 047/247] commit: accept "scissors" with CR/LF line endings

This change enhances `git commit --cleanup=scissors` by detecting
scissors lines ending in either LF (UNIX-style) or CR/LF (DOS-style).

Regression tests are included to specifically test for trailing
comments after a CR/LF-terminated scissors line.

Signed-off-by: Luke Bonanomi <lbonanomi@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t7502-commit-porcelain.sh | 42 +++++++++++++++++++++++++++++++++++++
 wt-status.c                 | 13 +++++++++---
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/t/t7502-commit-porcelain.sh b/t/t7502-commit-porcelain.sh
index 2adfe70b3d1c25..dbacc73e9d3537 100755
--- a/t/t7502-commit-porcelain.sh
+++ b/t/t7502-commit-porcelain.sh
@@ -600,6 +600,48 @@ test_expect_success 'cleanup commit messages (scissors option,-F,-e, scissors on
 	test_must_be_empty actual
 '
 
+test_expect_success 'helper-editor' '
+
+	write_script lf-to-crlf.sh <<-\EOF
+	sed "s/\$/Q/" <"$1" | tr Q "\\015" >"$1".new &&
+	mv -f "$1".new "$1"
+	EOF
+'
+
+test_expect_success 'cleanup commit messages (scissors option,-F,-e, CR/LF line endings)' '
+
+	test_config core.editor "\"$PWD/lf-to-crlf.sh\"" &&
+	scissors="# ------------------------ >8 ------------------------" &&
+
+	test_write_lines >text \
+	"# Keep this comment" "" " $scissors" \
+	"# Keep this comment, too" "$scissors" \
+	"# Remove this comment" "$scissors" \
+	"Remove this comment, too" &&
+
+	test_write_lines >expect \
+	"# Keep this comment" "" " $scissors" \
+	"# Keep this comment, too" &&
+
+	git commit --cleanup=scissors -e -F text --allow-empty &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'cleanup commit messages (scissors option,-F,-e, scissors on first line, CR/LF line endings)' '
+
+	scissors="# ------------------------ >8 ------------------------" &&
+	test_write_lines >text \
+	"$scissors" \
+	"# Remove this comment and any following lines" &&
+	cp text /tmp/test2-text &&
+	git commit --cleanup=scissors -e -F text --allow-empty --allow-empty-message &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_must_be_empty actual
+'
+
 test_expect_success 'cleanup commit messages (strip option,-F)' '
 
 	echo >>negative &&
diff --git a/wt-status.c b/wt-status.c
index 57772c7501fdba..0a2b600f3b3b3b 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -40,7 +40,7 @@
 #define UF_DELAY_WARNING_IN_MS (2 * 1000)
 
 static const char cut_line[] =
-"------------------------ >8 ------------------------\n";
+"------------------------ >8 ------------------------";
 
 static char default_wt_status_colors[][COLOR_MAXLEN] = {
 	GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
@@ -1123,15 +1123,22 @@ static void wt_longstatus_print_other(struct wt_status *s,
 	status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
 }
 
+static inline int starts_with_newline(const char *p)
+{
+    return *p == '\n' || (*p == '\r' && p[1] == '\n');
+}
+
 size_t wt_status_locate_end(const char *s, size_t len)
 {
 	const char *p;
 	struct strbuf pattern = STRBUF_INIT;
 
 	strbuf_addf(&pattern, "\n%s %s", comment_line_str, cut_line);
-	if (starts_with(s, pattern.buf + 1))
+	if (starts_with(s, pattern.buf + 1) &&
+	    starts_with_newline(s + pattern.len - 1))
 		len = 0;
-	else if ((p = strstr(s, pattern.buf))) {
+	else if ((p = strstr(s, pattern.buf)) &&
+		 starts_with_newline(p + pattern.len)) {
 		size_t newlen = p - s + 1;
 		if (newlen < len)
 			len = newlen;

From 609693c64a20733916c3f7e6abe6d89c3d705e34 Mon Sep 17 00:00:00 2001
From: Jens Glathe <jens.glathe@oldschoolsolutions.biz>
Date: Tue, 2 Jun 2020 12:12:25 +0200
Subject: [PATCH 048/247] t0014: fix indentation

For some reason, this test case was indented with 4 spaces instead of 1
horizontal tab. The other test cases in the same test script are fine.

Signed-off-by: Jens Glathe <jens.glathe@oldschoolsolutions.biz>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t0014-alias.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/t/t0014-alias.sh b/t/t0014-alias.sh
index cbc447b4814e78..d2501fc8d643b7 100755
--- a/t/t0014-alias.sh
+++ b/t/t0014-alias.sh
@@ -60,10 +60,10 @@ test_expect_success HAVE_DEPRECATED 'looping aliases - deprecated builtins' '
 #'
 
 test_expect_success 'run-command formats empty args properly' '
-    test_must_fail env GIT_TRACE=1 git frotz a "" b " " c 2>actual.raw &&
-    sed -ne "/run_command:/s/.*trace: run_command: //p" actual.raw >actual &&
-    echo "git-frotz a '\'''\'' b '\'' '\'' c" >expect &&
-    test_cmp expect actual
+	test_must_fail env GIT_TRACE=1 git frotz a "" b " " c 2>actual.raw &&
+	sed -ne "/run_command:/s/.*trace: run_command: //p" actual.raw >actual &&
+	echo "git-frotz a '\'''\'' b '\'' '\'' c" >expect &&
+	test_cmp expect actual
 '
 
 test_expect_success 'tracing a shell alias with arguments shows trace of prepared command' '

From 0b5719db17df313b9d946232ccf976a23e9835d6 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 12 Aug 2020 15:06:17 +0000
Subject: [PATCH 049/247] git-gui: accommodate for intent-to-add files

As of Git v2.28.0, the diff for files staged via `git add -N` marks them
as new files. Git GUI was ill-prepared for that, and this patch teaches
Git GUI about them.

Please note that this will not even fix things with v2.28.0, as the
`rp/apply-cached-with-i-t-a` patches are required on Git's side, too.

This fixes https://github.com/git-for-windows/git/issues/2779

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
---
 git-gui/git-gui.sh   |  2 ++
 git-gui/lib/diff.tcl | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index 15dd2b3a84ccd1..b8737c10bce2ae 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -1991,6 +1991,7 @@ set all_icons(U$ui_index)   file_merge
 set all_icons(T$ui_index)   file_statechange
 
 set all_icons(_$ui_workdir) file_plain
+set all_icons(A$ui_workdir) file_plain
 set all_icons(M$ui_workdir) file_mod
 set all_icons(D$ui_workdir) file_question
 set all_icons(U$ui_workdir) file_merge
@@ -2017,6 +2018,7 @@ foreach i {
 		{A_ {mc "Staged for commit"}}
 		{AM {mc "Portions staged for commit"}}
 		{AD {mc "Staged for commit, missing"}}
+		{AA {mc "Intended to be added"}}
 
 		{_D {mc "Missing"}}
 		{D_ {mc "Staged for removal"}}
diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index 8be1a613fbe01f..d25a9bbdc4abde 100644
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@ -556,7 +556,8 @@ proc apply_or_revert_hunk {x y revert} {
 	if {$current_diff_side eq $ui_index} {
 		set failed_msg [mc "Failed to unstage selected hunk."]
 		lappend apply_cmd --reverse --cached
-		if {[string index $mi 0] ne {M}} {
+		set file_state [string index $mi 0]
+		if {$file_state ne {M} && $file_state ne {A}} {
 			unlock_index
 			return
 		}
@@ -569,7 +570,8 @@ proc apply_or_revert_hunk {x y revert} {
 			lappend apply_cmd --cached
 		}
 
-		if {[string index $mi 1] ne {M}} {
+		set file_state [string index $mi 1]
+		if {$file_state ne {M} && $file_state ne {A}} {
 			unlock_index
 			return
 		}
@@ -661,7 +663,8 @@ proc apply_or_revert_range_or_line {x y revert} {
 		set failed_msg [mc "Failed to unstage selected line."]
 		set to_context {+}
 		lappend apply_cmd --reverse --cached
-		if {[string index $mi 0] ne {M}} {
+		set file_state [string index $mi 0]
+		if {$file_state ne {M} && $file_state ne {A}} {
 			unlock_index
 			return
 		}
@@ -676,7 +679,8 @@ proc apply_or_revert_range_or_line {x y revert} {
 			lappend apply_cmd --cached
 		}
 
-		if {[string index $mi 1] ne {M}} {
+		set file_state [string index $mi 1]
+		if {$file_state ne {M} && $file_state ne {A}} {
 			unlock_index
 			return
 		}

From 83a7c5b3058980653b85f641e3ecdaf3bb6d2e2c Mon Sep 17 00:00:00 2001
From: Philip Oakley <philipoakley@iee.email>
Date: Sun, 6 Oct 2019 18:43:57 +0100
Subject: [PATCH 050/247] vcpkg_install: add comment regarding slow network
 connections

The vcpkg downloads may not succeed. Warn careful readers of the time out.

A simple retry will usually resolve the issue.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/vcbuild/vcpkg_install.bat | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/compat/vcbuild/vcpkg_install.bat b/compat/vcbuild/vcpkg_install.bat
index bcbbf536af3141..8330d8120fb511 100644
--- a/compat/vcbuild/vcpkg_install.bat
+++ b/compat/vcbuild/vcpkg_install.bat
@@ -80,6 +80,12 @@ REM ================================================================
 :sub__install_one
 	echo     Installing package %1...
 
+	REM vcpkg may not be reliable on slow, intermittent or proxy
+	REM connections, see e.g.
+	REM https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/4a8f7be5-5e15-4213-a7bb-ddf424a954e6/winhttpsendrequest-ends-with-12002-errorhttptimeout-after-21-seconds-no-matter-what-timeout?forum=windowssdk
+	REM which explains the hidden 21 second timeout
+	REM (last post by Dave : Microsoft - Windows Networking team)
+
 	.\vcpkg.exe install %1:%arch%
 	IF ERRORLEVEL 1 ( EXIT /B 1 )
 

From 9d7c88aeacdbe470daee5a2476d0ddbe6feadab3 Mon Sep 17 00:00:00 2001
From: Dennis Ameling <dennis@dennisameling.com>
Date: Sun, 6 Dec 2020 18:39:26 +0100
Subject: [PATCH 051/247] vcbuild: stop hard-coding OpenSSL as a dependency

Git for Windows' default SSL backend is actually Secure Channel. Let's
not hard-code any backend, just ask for _any_ SSL backend.

This is necessary because we cannot ask for `schannel`, as
https://github.com/microsoft/vcpkg/pull/46459 removed the option to
specify that as a feature.

Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/vcbuild/vcpkg_install.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compat/vcbuild/vcpkg_install.bat b/compat/vcbuild/vcpkg_install.bat
index 8da212487ae97d..b6600687dc581a 100644
--- a/compat/vcbuild/vcpkg_install.bat
+++ b/compat/vcbuild/vcpkg_install.bat
@@ -127,5 +127,5 @@ set features=
 goto :EOF
 
 :curl_features
-set features=[core,openssl]
+set features=[core,ssl]
 goto :EOF

From 3a786b732dfeac8d9b7a2c4e45bb3ccb6de2145f Mon Sep 17 00:00:00 2001
From: Dennis Ameling <dennis@dennisameling.com>
Date: Mon, 19 Jul 2021 13:02:16 +0200
Subject: [PATCH 052/247] cmake(): allow setting HOST_CPU for cross-compilation

Git's regular Makefile mentions that HOST_CPU should be defined when cross-compiling Git: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/Makefile#L438-L439

This is then used to set the GIT_HOST_CPU variable when compiling Git: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/Makefile#L1337-L1341

Then, when the user runs `git version --build-options`, it returns that value: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/help.c#L658

This commit adds the same functionality to the CMake configuration. Users can now set -DHOST_CPU= to set the target architecture.

Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
---
 .github/workflows/main.yml          | 2 +-
 contrib/buildsystems/CMakeLists.txt | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 94324e4829ea5c..81619fd3abfbf2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -223,7 +223,7 @@ jobs:
       shell: bash
       run: |
         cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/${{ matrix.arch }}-windows \
-        -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON -DCMAKE_GENERATOR_PLATFORM=${{ matrix.arch }} -DVCPKG_ARCH=${{ matrix.arch }}-windows
+        -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON -DCMAKE_GENERATOR_PLATFORM=${{ matrix.arch }} -DVCPKG_ARCH=${{ matrix.arch }}-windows -DHOST_CPU=${{ matrix.arch }}
     - name: MSBuild
       run: |
         $sln = if (Test-Path git.slnx) { 'git.slnx' } else { 'git.sln' }
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 39bd52816abc78..92eced9d27df1e 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -212,7 +212,14 @@ endif()
 
 #default behaviour
 include_directories(${CMAKE_SOURCE_DIR})
-add_compile_definitions(GIT_HOST_CPU="${CMAKE_SYSTEM_PROCESSOR}")
+
+# When cross-compiling, define HOST_CPU as the canonical name of the CPU on
+# which the built Git will run (for instance "x86_64").
+if(NOT HOST_CPU)
+	add_compile_definitions(GIT_HOST_CPU="${CMAKE_SYSTEM_PROCESSOR}")
+else()
+	add_compile_definitions(GIT_HOST_CPU="${HOST_CPU}")
+endif()
 add_compile_definitions(SHA256_BLK INTERNAL_QSORT RUNTIME_PREFIX)
 add_compile_definitions(NO_OPENSSL SHA1_DC SHA1DC_NO_STANDARD_INCLUDES
 			SHA1DC_INIT_SAFE_HASH_DEFAULT=0

From 5bc4d0f9ff8bac2750894aa65960f0ba30adc6c0 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 2 Apr 2021 22:50:54 +0200
Subject: [PATCH 053/247] mingw: allow for longer paths in
 `parse_interpreter()`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As reported in https://github.com/newren/git-filter-repo/pull/225, it
looks like 99 bytes is not really sufficient to represent e.g. the full
path to Python when installed via Windows Store (and this path is used
in the hasb bang line when installing scripts via `pip`).

Let's increase it to what is probably the maximum sensible path size:
MAX_PATH. This makes `parse_interpreter()` in line with what
`lookup_prog()` handles.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Vilius Šumskas <vilius@sumskas.eu>
---
 compat/mingw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 0c8179f3458bb8..31ba74a7f113a7 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1673,7 +1673,7 @@ static const char *quote_arg_msys2(const char *arg)
 
 static const char *parse_interpreter(const char *cmd)
 {
-	static char buf[100];
+	static char buf[MAX_PATH];
 	char *p, *opt;
 	ssize_t n; /* read() can return negative values */
 	int fd;

From bdc5af8365fdfffba6849e3504fcd25ab415e343 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 17 May 2021 10:46:52 +0200
Subject: [PATCH 054/247] compat/vcbuild: document preferred way to build in
 Visual Studio

We used to have that `make vcxproj` hack, but a hack it is. In the
meantime, we have a much cleaner solution: using CMake, either
explicitly, or even more conveniently via Visual Studio's built-in CMake
support (simply open Git's top-level directory via File>Open>Folder...).

Let's let the `README` reflect this.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/vcbuild/README | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/compat/vcbuild/README b/compat/vcbuild/README
index 29ec1d0f104b80..5c71ea2daa4017 100644
--- a/compat/vcbuild/README
+++ b/compat/vcbuild/README
@@ -37,27 +37,17 @@ The Steps to Build Git with VS2015 or VS2017 from the command line.
 
 ================================================================
 
-Alternatively, run `make vcxproj` and then load the generated `git.sln` in
-Visual Studio. The initial build will install the vcpkg system and build the
+Alternatively, just open Git's top-level directory in Visual Studio, via
+`File>Open>Folder...`. This will use CMake internally to generate the
+project definitions. It will also install the vcpkg system and build the
 dependencies automatically. This will take a while.
 
-Instead of generating the `git.sln` file yourself (which requires a full Git
-for Windows SDK), you may want to consider fetching the `vs/master` branch of
-https://github.com/git-for-windows/git instead (which is updated automatically
-via CI running `make vcxproj`). The `vs/master` branch does not require a Git
-for Windows to build, but you can run the test scripts in a regular Git Bash.
-
-Note that `make vcxproj` will automatically add and commit the generated `.sln`
-and `.vcxproj` files to the repo. This is necessary to allow building a
-fully-testable Git in Visual Studio, where a regular Git Bash can be used to
-run the test scripts (as opposed to a full Git for Windows SDK): a number of
-build targets, such as Git commands implemented as Unix shell scripts (where
-`@@SHELL_PATH@@` and other placeholders are interpolated) require a full-blown
-Git for Windows SDK (which is about 10x the size of a regular Git for Windows
-installation).
-
-If your plan is to open a Pull Request with Git for Windows, it is a good idea
-to drop this commit before submitting.
+You can also generate the Visual Studio solution manually by downloading
+and running CMake explicitly rather than letting Visual Studio doing
+that implicitly.
+
+Another, deprecated option is to run `make vcxproj`. This option is
+superseded by the CMake-based build, and will be removed at some point.
 
 ================================================================
 The Steps of Build Git with VS2008

From 046ba5f47d57f7e234f3f23fd538184cce188202 Mon Sep 17 00:00:00 2001
From: Pascal Muller <pascalmuller@gmail.com>
Date: Wed, 23 Jun 2021 21:21:10 +0200
Subject: [PATCH 055/247] http: optionally send SSL client certificate

This adds support for a new http.sslAutoClientCert config value.

In cURL 7.77 or later the schannel backend does not automatically send
client certificates from the Windows Certificate Store anymore.

This config value is only used if http.sslBackend is set to "schannel",
and can be used to opt in to the old behavior and force cURL to send
client certificates.

This fixes https://github.com/git-for-windows/git/issues/3292

Signed-off-by: Pascal Muller <pascalmuller@gmail.com>
---
 Documentation/config/http.adoc |  5 +++++
 git-curl-compat.h              |  8 ++++++++
 http.c                         | 24 +++++++++++++++++++++---
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/Documentation/config/http.adoc b/Documentation/config/http.adoc
index 847a9e79ab2290..33abad4a6e2583 100644
--- a/Documentation/config/http.adoc
+++ b/Documentation/config/http.adoc
@@ -260,6 +260,11 @@ http.schannelUseSSLCAInfo::
 	when the `schannel` backend was configured via `http.sslBackend`,
 	unless `http.schannelUseSSLCAInfo` overrides this behavior.
 
+http.sslAutoClientCert::
+	As of cURL v7.77.0, the Secure Channel backend won't automatically
+	send client certificates from the Windows Certificate Store anymore.
+	To opt in to the old behavior, http.sslAutoClientCert can be set.
+
 http.pinnedPubkey::
 	Public key of the https service. It may either be the filename of
 	a PEM or DER encoded public key file or a string starting with
diff --git a/git-curl-compat.h b/git-curl-compat.h
index 032aaf7126c977..9002b7107325f6 100644
--- a/git-curl-compat.h
+++ b/git-curl-compat.h
@@ -45,6 +45,14 @@
 #define GIT_CURL_HAVE_CURLINFO_RETRY_AFTER 1
 #endif
 
+/**
+ * CURLSSLOPT_AUTO_CLIENT_CERT was added in 7.77.0, released in May
+ * 2021.
+ */
+#if LIBCURL_VERSION_NUM >= 0x074d00
+#define GIT_CURL_HAVE_CURLSSLOPT_AUTO_CLIENT_CERT
+#endif
+
 /**
  * CURLOPT_PROTOCOLS_STR and CURLOPT_REDIR_PROTOCOLS_STR were added in 7.85.0,
  * released in August 2022.
diff --git a/http.c b/http.c
index 7a540ecc78364d..881901dcc807e0 100644
--- a/http.c
+++ b/http.c
@@ -169,6 +169,8 @@ static long http_max_retry_time = 300;
  */
 static int http_schannel_use_ssl_cainfo;
 
+static int http_auto_client_cert;
+
 static int always_auth_proactively(void)
 {
 	return http_proactive_auth != PROACTIVE_AUTH_NONE &&
@@ -457,6 +459,11 @@ static int http_options(const char *var, const char *value,
 		return 0;
 	}
 
+	if (!strcmp("http.sslautoclientcert", var)) {
+		http_auto_client_cert = git_config_bool(var, value);
+		return 0;
+	}
+
 	if (!strcmp("http.minsessions", var)) {
 		min_curl_sessions = git_config_int(var, value, ctx->kvi);
 		if (min_curl_sessions > 1)
@@ -1177,9 +1184,20 @@ static CURL *get_curl_handle(void)
 	}
 #endif
 
-	if (http_ssl_backend && !strcmp("schannel", http_ssl_backend) &&
-	    http_schannel_check_revoke_mode) {
-		curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, http_schannel_check_revoke_mode);
+	if (http_ssl_backend && !strcmp("schannel", http_ssl_backend)) {
+		long ssl_options = 0;
+		if (http_schannel_check_revoke_mode) {
+			ssl_options |= http_schannel_check_revoke_mode;
+		}
+
+		if (http_auto_client_cert) {
+#ifdef GIT_CURL_HAVE_CURLSSLOPT_AUTO_CLIENT_CERT
+			ssl_options |= CURLSSLOPT_AUTO_CLIENT_CERT;
+#endif
+		}
+
+		if (ssl_options)
+			curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, ssl_options);
 	}
 
 	if (http_proactive_auth != PROACTIVE_AUTH_NONE)

From 1db72dcae38729a2cbf94254d21fbb3a3ce73d6e Mon Sep 17 00:00:00 2001
From: Jeff Hostetler <git@jeffhostetler.com>
Date: Mon, 29 Apr 2024 08:55:03 -0400
Subject: [PATCH 056/247] survey: stub in new experimental 'git-survey' command

Start work on a new 'git survey' command to scan the repository
for monorepo performance and scaling problems.  The goal is to
measure the various known "dimensions of scale" and serve as a
foundation for adding additional measurements as we learn more
about Git monorepo scaling problems.

The initial goal is to complement the scanning and analysis performed
by the GO-based 'git-sizer' (https://github.com/github/git-sizer) tool.
It is hoped that by creating a builtin command, we may be able to take
advantage of internal Git data structures and code that is not
accessible from GO to gain further insight into potential scaling
problems.

Co-authored-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Jeff Hostetler <git@jeffhostetler.com>
Signed-off-by: Derrick Stolee <stolee@gmail.com>
---
 .gitignore                       |  1 +
 Documentation/config.adoc        |  2 +
 Documentation/config/survey.adoc | 11 +++++
 Documentation/git-survey.adoc    | 36 +++++++++++++++
 Documentation/meson.build        |  1 +
 Makefile                         |  1 +
 builtin.h                        |  1 +
 builtin/survey.c                 | 76 ++++++++++++++++++++++++++++++++
 command-list.txt                 |  1 +
 git.c                            |  1 +
 meson.build                      |  1 +
 t/meson.build                    |  1 +
 t/t1517-outside-repo.sh          |  2 +-
 t/t8100-git-survey.sh            | 18 ++++++++
 14 files changed, 152 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/config/survey.adoc
 create mode 100644 Documentation/git-survey.adoc
 create mode 100644 builtin/survey.c
 create mode 100755 t/t8100-git-survey.sh

diff --git a/.gitignore b/.gitignore
index 4da58c6754899e..1497ebb9246e06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -172,6 +172,7 @@
 /git-submodule
 /git-submodule--helper
 /git-subtree
+/git-survey
 /git-svn
 /git-switch
 /git-symbolic-ref
diff --git a/Documentation/config.adoc b/Documentation/config.adoc
index f67dcd2f8e05dd..04f7a7ec303848 100644
--- a/Documentation/config.adoc
+++ b/Documentation/config.adoc
@@ -596,6 +596,8 @@ include::config/status.adoc[]
 
 include::config/submodule.adoc[]
 
+include::config/survey.adoc[]
+
 include::config/tag.adoc[]
 
 include::config/tar.adoc[]
diff --git a/Documentation/config/survey.adoc b/Documentation/config/survey.adoc
new file mode 100644
index 00000000000000..c1b0f852a1250e
--- /dev/null
+++ b/Documentation/config/survey.adoc
@@ -0,0 +1,11 @@
+survey.*::
+	These variables adjust the default behavior of the `git survey`
+	command. The intention is that this command could be run in the
+	background with these options.
++
+--
+	verbose::
+		This boolean value implies the `--[no-]verbose` option.
+	progress::
+		This boolean value implies the `--[no-]progress` option.
+--
diff --git a/Documentation/git-survey.adoc b/Documentation/git-survey.adoc
new file mode 100644
index 00000000000000..5f8ec9bfea673b
--- /dev/null
+++ b/Documentation/git-survey.adoc
@@ -0,0 +1,36 @@
+git-survey(1)
+=============
+
+NAME
+----
+git-survey - EXPERIMENTAL: Measure various repository dimensions of scale
+
+SYNOPSIS
+--------
+[verse]
+(EXPERIMENTAL!) 'git survey' <options>
+
+DESCRIPTION
+-----------
+
+Survey the repository and measure various dimensions of scale.
+
+As repositories grow to "monorepo" size, certain data shapes can cause
+performance problems.  `git-survey` attempts to measure and report on
+known problem areas.
+
+OPTIONS
+-------
+
+--progress::
+	Show progress.  This is automatically enabled when interactive.
+
+OUTPUT
+------
+
+By default, `git survey` will print information about the repository in a
+human-readable format that includes overviews and tables.
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Documentation/meson.build b/Documentation/meson.build
index f4854f802d455f..605c0b5673205a 100644
--- a/Documentation/meson.build
+++ b/Documentation/meson.build
@@ -145,6 +145,7 @@ manpages = {
   'git-status.adoc' : 1,
   'git-stripspace.adoc' : 1,
   'git-submodule.adoc' : 1,
+  'git-survey.adoc' : 1,
   'git-svn.adoc' : 1,
   'git-switch.adoc' : 1,
   'git-symbolic-ref.adoc' : 1,
diff --git a/Makefile b/Makefile
index c649c93c510332..49a41907654605 100644
--- a/Makefile
+++ b/Makefile
@@ -1503,6 +1503,7 @@ BUILTIN_OBJS += builtin/sparse-checkout.o
 BUILTIN_OBJS += builtin/stash.o
 BUILTIN_OBJS += builtin/stripspace.o
 BUILTIN_OBJS += builtin/submodule--helper.o
+BUILTIN_OBJS += builtin/survey.o
 BUILTIN_OBJS += builtin/symbolic-ref.o
 BUILTIN_OBJS += builtin/tag.o
 BUILTIN_OBJS += builtin/unpack-file.o
diff --git a/builtin.h b/builtin.h
index 4e47a4ebd30ba3..d3caec75424f71 100644
--- a/builtin.h
+++ b/builtin.h
@@ -260,6 +260,7 @@ int cmd_sparse_checkout(int argc, const char **argv, const char *prefix, struct
 int cmd_status(int argc, const char **argv, const char *prefix, struct repository *repo);
 int cmd_stash(int argc, const char **argv, const char *prefix, struct repository *repo);
 int cmd_stripspace(int argc, const char **argv, const char *prefix, struct repository *repo);
+int cmd_survey(int argc, const char **argv, const char *prefix, struct repository *repo);
 int cmd_submodule__helper(int argc, const char **argv, const char *prefix, struct repository *repo);
 int cmd_switch(int argc, const char **argv, const char *prefix, struct repository *repo);
 int cmd_symbolic_ref(int argc, const char **argv, const char *prefix, struct repository *repo);
diff --git a/builtin/survey.c b/builtin/survey.c
new file mode 100644
index 00000000000000..f43c9e405ca8be
--- /dev/null
+++ b/builtin/survey.c
@@ -0,0 +1,76 @@
+#define USE_THE_REPOSITORY_VARIABLE
+
+#include "builtin.h"
+#include "config.h"
+#include "environment.h"
+#include "parse-options.h"
+
+static const char * const survey_usage[] = {
+	N_("(EXPERIMENTAL!) git survey <options>"),
+	NULL,
+};
+
+struct survey_opts {
+	int verbose;
+	int show_progress;
+};
+
+struct survey_context {
+	struct repository *repo;
+
+	/* Options that control what is done. */
+	struct survey_opts opts;
+};
+
+static int survey_load_config_cb(const char *var, const char *value,
+				 const struct config_context *cctx, void *pvoid)
+{
+	struct survey_context *ctx = pvoid;
+
+	if (!strcmp(var, "survey.verbose")) {
+		ctx->opts.verbose = git_config_bool(var, value);
+		return 0;
+	}
+	if (!strcmp(var, "survey.progress")) {
+		ctx->opts.show_progress = git_config_bool(var, value);
+		return 0;
+	}
+
+	return git_default_config(var, value, cctx, pvoid);
+}
+
+static void survey_load_config(struct survey_context *ctx)
+{
+	repo_config(the_repository, survey_load_config_cb, ctx);
+}
+
+int cmd_survey(int argc, const char **argv, const char *prefix, struct repository *repo)
+{
+	static struct survey_context ctx = {
+		.opts = {
+			.verbose = 0,
+			.show_progress = -1, /* defaults to isatty(2) */
+		},
+	};
+
+	static struct option survey_options[] = {
+		OPT__VERBOSE(&ctx.opts.verbose, N_("verbose output")),
+		OPT_BOOL(0, "progress", &ctx.opts.show_progress, N_("show progress")),
+		OPT_END(),
+	};
+
+	show_usage_with_options_if_asked(argc, argv,
+					 survey_usage, survey_options);
+
+	ctx.repo = repo;
+
+	prepare_repo_settings(ctx.repo);
+	survey_load_config(&ctx);
+
+	argc = parse_options(argc, argv, prefix, survey_options, survey_usage, 0);
+
+	if (ctx.opts.show_progress < 0)
+		ctx.opts.show_progress = isatty(2);
+
+	return 0;
+}
diff --git a/command-list.txt b/command-list.txt
index 63ae2a67c94055..fea32f7a61c64d 100644
--- a/command-list.txt
+++ b/command-list.txt
@@ -192,6 +192,7 @@ git-stash                               mainporcelain
 git-status                              mainporcelain           info
 git-stripspace                          purehelpers
 git-submodule                           mainporcelain
+git-survey                              mainporcelain
 git-svn                                 foreignscminterface
 git-switch                              mainporcelain           history
 git-symbolic-ref                        plumbingmanipulators
diff --git a/git.c b/git.c
index d7b5f88e52ae87..41a95435d4218a 100644
--- a/git.c
+++ b/git.c
@@ -664,6 +664,7 @@ static struct cmd_struct commands[] = {
 	{ "status", cmd_status, RUN_SETUP | NEED_WORK_TREE },
 	{ "stripspace", cmd_stripspace },
 	{ "submodule--helper", cmd_submodule__helper, RUN_SETUP },
+	{ "survey", cmd_survey, RUN_SETUP },
 	{ "switch", cmd_switch, RUN_SETUP | NEED_WORK_TREE },
 	{ "symbolic-ref", cmd_symbolic_ref, RUN_SETUP },
 	{ "tag", cmd_tag, RUN_SETUP | DELAY_PAGER_CONFIG },
diff --git a/meson.build b/meson.build
index 0a95d90d211fd6..a24b348bc45013 100644
--- a/meson.build
+++ b/meson.build
@@ -712,6 +712,7 @@ builtin_sources = [
   'builtin/stash.c',
   'builtin/stripspace.c',
   'builtin/submodule--helper.c',
+  'builtin/survey.c',
   'builtin/symbolic-ref.c',
   'builtin/tag.c',
   'builtin/unpack-file.c',
diff --git a/t/meson.build b/t/meson.build
index 3ca7b271040a62..1bb287215eac60 100644
--- a/t/meson.build
+++ b/t/meson.build
@@ -994,6 +994,7 @@ integration_tests = [
   't8014-blame-ignore-fuzzy.sh',
   't8015-blame-diff-algorithm.sh',
   't8020-last-modified.sh',
+  't8100-git-survey.sh',
   't9001-send-email.sh',
   't9002-column.sh',
   't9003-help-autocorrect.sh',
diff --git a/t/t1517-outside-repo.sh b/t/t1517-outside-repo.sh
index d1e915786eadb9..efbac29c0e7075 100755
--- a/t/t1517-outside-repo.sh
+++ b/t/t1517-outside-repo.sh
@@ -134,7 +134,7 @@ do
 	http-backend | http-fetch | http-push | init-db | \
 	mktag | p4 | p4.py | pickaxe | remote-ftp | remote-ftps | \
 	remote-http | remote-https | replay | send-email | \
-	sh-i18n--envsubst | shell | show | stage | \
+	sh-i18n--envsubst | shell | show | stage | survey | \
 	upload-archive--writer | upload-pack | whatchanged)
 		h_expect_outcome=expect_failure
 		all_expect_outcome=expect_failure
diff --git a/t/t8100-git-survey.sh b/t/t8100-git-survey.sh
new file mode 100755
index 00000000000000..a51a3e766e8a34
--- /dev/null
+++ b/t/t8100-git-survey.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+test_description='git survey'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+TEST_PASSES_SANITIZE_LEAK=0
+export TEST_PASSES_SANITIZE_LEAK
+
+. ./test-lib.sh
+
+test_expect_success 'git survey -h shows experimental warning' '
+	test_expect_code 0 git survey -h >usage &&
+	test_grep "EXPERIMENTAL!" usage
+'
+
+test_done

From 1955622706cf1478f39ddb41bb36bafedfecbc90 Mon Sep 17 00:00:00 2001
From: Jeff Hostetler <git@jeffhostetler.com>
Date: Mon, 29 Apr 2024 09:51:34 -0400
Subject: [PATCH 057/247] survey: add command line opts to select references

By default we will scan all references in "refs/heads/", "refs/tags/"
and "refs/remotes/".

Add command line opts let the use ask for all refs or a subset of them
and to include a detached HEAD.

Signed-off-by: Jeff Hostetler <git@jeffhostetler.com>
Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---
 Documentation/git-survey.adoc |  34 +++++
 builtin/survey.c              | 248 ++++++++++++++++++++++++++++++++++
 t/t8100-git-survey.sh         |   9 ++
 3 files changed, 291 insertions(+)

diff --git a/Documentation/git-survey.adoc b/Documentation/git-survey.adoc
index 5f8ec9bfea673b..56060d14b5cfef 100644
--- a/Documentation/git-survey.adoc
+++ b/Documentation/git-survey.adoc
@@ -19,12 +19,46 @@ As repositories grow to "monorepo" size, certain data shapes can cause
 performance problems.  `git-survey` attempts to measure and report on
 known problem areas.
 
+Ref Selection and Reachable Objects
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In this first analysis phase, `git survey` will iterate over the set of
+requested branches, tags, and other refs and treewalk over all of the
+reachable commits, trees, and blobs and generate various statistics.
+
 OPTIONS
 -------
 
 --progress::
 	Show progress.  This is automatically enabled when interactive.
 
+Ref Selection
+~~~~~~~~~~~~~
+
+The following options control the set of refs that `git survey` will examine.
+By default, `git survey` will look at tags, local branches, and remote refs.
+If any of the following options are given, the default set is cleared and
+only refs for the given options are added.
+
+--all-refs::
+	Use all refs.  This includes local branches, tags, remote refs,
+	notes, and stashes.  This option overrides all of the following.
+
+--branches::
+	Add local branches (`refs/heads/`) to the set.
+
+--tags::
+	Add tags (`refs/tags/`) to the set.
+
+--remotes::
+	Add remote branches (`refs/remote/`) to the set.
+
+--detached::
+	Add HEAD to the set.
+
+--other::
+	Add notes (`refs/notes/`) and stashes (`refs/stash/`) to the set.
+
 OUTPUT
 ------
 
diff --git a/builtin/survey.c b/builtin/survey.c
index f43c9e405ca8be..4cf289f1e59ec6 100644
--- a/builtin/survey.c
+++ b/builtin/survey.c
@@ -3,16 +3,55 @@
 #include "builtin.h"
 #include "config.h"
 #include "environment.h"
+#include "object.h"
+#include "odb.h"
 #include "parse-options.h"
+#include "progress.h"
+#include "ref-filter.h"
+#include "strvec.h"
+#include "trace2.h"
 
 static const char * const survey_usage[] = {
 	N_("(EXPERIMENTAL!) git survey <options>"),
 	NULL,
 };
 
+struct survey_refs_wanted {
+	int want_all_refs; /* special override */
+
+	int want_branches;
+	int want_tags;
+	int want_remotes;
+	int want_detached;
+	int want_other; /* see FILTER_REFS_OTHERS -- refs/notes/, refs/stash/ */
+};
+
+static struct survey_refs_wanted default_ref_options = {
+	.want_all_refs = 1,
+};
+
 struct survey_opts {
 	int verbose;
 	int show_progress;
+	struct survey_refs_wanted refs;
+};
+
+struct survey_report_ref_summary {
+	size_t refs_nr;
+	size_t branches_nr;
+	size_t remote_refs_nr;
+	size_t tags_nr;
+	size_t tags_annotated_nr;
+	size_t others_nr;
+	size_t unknown_nr;
+};
+
+/**
+ * This struct contains all of the information that needs to be printed
+ * at the end of the exploration of the repository and its references.
+ */
+struct survey_report {
+	struct survey_report_ref_summary refs;
 };
 
 struct survey_context {
@@ -20,8 +59,84 @@ struct survey_context {
 
 	/* Options that control what is done. */
 	struct survey_opts opts;
+
+	/* Info for output only. */
+	struct survey_report report;
+
+	/*
+	 * The rest of the members are about enabling the activity
+	 * of the 'git survey' command, including ref listings, object
+	 * pointers, and progress.
+	 */
+
+	struct progress *progress;
+	size_t progress_nr;
+	size_t progress_total;
+
+	struct strvec refs;
 };
 
+static void clear_survey_context(struct survey_context *ctx)
+{
+	strvec_clear(&ctx->refs);
+}
+
+/*
+ * After parsing the command line arguments, figure out which refs we
+ * should scan.
+ *
+ * If ANY were given in positive sense, then we ONLY include them and
+ * do not use the builtin values.
+ */
+static void fixup_refs_wanted(struct survey_context *ctx)
+{
+	struct survey_refs_wanted *rw = &ctx->opts.refs;
+
+	/*
+	 * `--all-refs` overrides and enables everything.
+	 */
+	if (rw->want_all_refs == 1) {
+		rw->want_branches = 1;
+		rw->want_tags = 1;
+		rw->want_remotes = 1;
+		rw->want_detached = 1;
+		rw->want_other = 1;
+		return;
+	}
+
+	/*
+	 * If none of the `--<ref-type>` were given, we assume all
+	 * of the builtin unspecified values.
+	 */
+	if (rw->want_branches == -1 &&
+	    rw->want_tags == -1 &&
+	    rw->want_remotes == -1 &&
+	    rw->want_detached == -1 &&
+	    rw->want_other == -1) {
+		*rw = default_ref_options;
+		return;
+	}
+
+	/*
+	 * Since we only allow positive boolean values on the command
+	 * line, we will only have true values where they specified
+	 * a `--<ref-type>`.
+	 *
+	 * So anything that still has an unspecified value should be
+	 * set to false.
+	 */
+	if (rw->want_branches == -1)
+		rw->want_branches = 0;
+	if (rw->want_tags == -1)
+		rw->want_tags = 0;
+	if (rw->want_remotes == -1)
+		rw->want_remotes = 0;
+	if (rw->want_detached == -1)
+		rw->want_detached = 0;
+	if (rw->want_other == -1)
+		rw->want_other = 0;
+}
+
 static int survey_load_config_cb(const char *var, const char *value,
 				 const struct config_context *cctx, void *pvoid)
 {
@@ -44,18 +159,146 @@ static void survey_load_config(struct survey_context *ctx)
 	repo_config(the_repository, survey_load_config_cb, ctx);
 }
 
+static void do_load_refs(struct survey_context *ctx,
+			 struct ref_array *ref_array)
+{
+	struct ref_filter filter = REF_FILTER_INIT;
+	struct ref_sorting *sorting;
+	struct string_list sorting_options = STRING_LIST_INIT_DUP;
+
+	string_list_append(&sorting_options, "objectname");
+	sorting = ref_sorting_options(&sorting_options);
+
+	if (ctx->opts.refs.want_detached)
+		strvec_push(&ctx->refs, "HEAD");
+
+	if (ctx->opts.refs.want_all_refs) {
+		strvec_push(&ctx->refs, "refs/");
+	} else {
+		if (ctx->opts.refs.want_branches)
+			strvec_push(&ctx->refs, "refs/heads/");
+		if (ctx->opts.refs.want_tags)
+			strvec_push(&ctx->refs, "refs/tags/");
+		if (ctx->opts.refs.want_remotes)
+			strvec_push(&ctx->refs, "refs/remotes/");
+		if (ctx->opts.refs.want_other) {
+			strvec_push(&ctx->refs, "refs/notes/");
+			strvec_push(&ctx->refs, "refs/stash/");
+		}
+	}
+
+	filter.name_patterns = ctx->refs.v;
+	filter.ignore_case = 0;
+	filter.match_as_path = 1;
+
+	if (ctx->opts.show_progress) {
+		ctx->progress_total = 0;
+		ctx->progress = start_progress(ctx->repo,
+					       _("Scanning refs..."), 0);
+	}
+
+	filter_refs(ref_array, &filter, FILTER_REFS_KIND_MASK);
+
+	if (ctx->opts.show_progress) {
+		ctx->progress_total = ref_array->nr;
+		display_progress(ctx->progress, ctx->progress_total);
+	}
+
+	ref_array_sort(sorting, ref_array);
+
+	stop_progress(&ctx->progress);
+	ref_filter_clear(&filter);
+	ref_sorting_release(sorting);
+}
+
+/*
+ * The REFS phase:
+ *
+ * Load the set of requested refs and assess them for scalablity problems.
+ * Use that set to start a treewalk to all reachable objects and assess
+ * them.
+ *
+ * This data will give us insights into the repository itself (the number
+ * of refs, the size and shape of the DAG, the number and size of the
+ * objects).
+ *
+ * Theoretically, this data is independent of the on-disk representation
+ * (e.g. independent of packing concerns).
+ */
+static void survey_phase_refs(struct survey_context *ctx)
+{
+	struct ref_array ref_array = { 0 };
+
+	trace2_region_enter("survey", "phase/refs", ctx->repo);
+	do_load_refs(ctx, &ref_array);
+
+	ctx->report.refs.refs_nr = ref_array.nr;
+	for (int i = 0; i < ref_array.nr; i++) {
+		size_t size;
+		struct ref_array_item *item = ref_array.items[i];
+
+		switch (item->kind) {
+		case FILTER_REFS_TAGS:
+			ctx->report.refs.tags_nr++;
+			if (odb_read_object_info(ctx->repo->objects,
+						 &item->objectname,
+						 &size) == OBJ_TAG)
+				ctx->report.refs.tags_annotated_nr++;
+			break;
+
+		case FILTER_REFS_BRANCHES:
+			ctx->report.refs.branches_nr++;
+			break;
+
+		case FILTER_REFS_REMOTES:
+			ctx->report.refs.remote_refs_nr++;
+			break;
+
+		case FILTER_REFS_OTHERS:
+			ctx->report.refs.others_nr++;
+			break;
+
+		default:
+			ctx->report.refs.unknown_nr++;
+			break;
+		}
+	}
+
+	trace2_region_leave("survey", "phase/refs", ctx->repo);
+
+	ref_array_clear(&ref_array);
+}
+
 int cmd_survey(int argc, const char **argv, const char *prefix, struct repository *repo)
 {
 	static struct survey_context ctx = {
 		.opts = {
 			.verbose = 0,
 			.show_progress = -1, /* defaults to isatty(2) */
+
+			.refs.want_all_refs = -1,
+
+			.refs.want_branches = -1, /* default these to undefined */
+			.refs.want_tags = -1,
+			.refs.want_remotes = -1,
+			.refs.want_detached = -1,
+			.refs.want_other = -1,
 		},
+		.refs = STRVEC_INIT,
 	};
 
 	static struct option survey_options[] = {
 		OPT__VERBOSE(&ctx.opts.verbose, N_("verbose output")),
 		OPT_BOOL(0, "progress", &ctx.opts.show_progress, N_("show progress")),
+
+		OPT_BOOL_F(0, "all-refs", &ctx.opts.refs.want_all_refs, N_("include all refs"),          PARSE_OPT_NONEG),
+
+		OPT_BOOL_F(0, "branches", &ctx.opts.refs.want_branches, N_("include branches"),          PARSE_OPT_NONEG),
+		OPT_BOOL_F(0, "tags",     &ctx.opts.refs.want_tags,     N_("include tags"),              PARSE_OPT_NONEG),
+		OPT_BOOL_F(0, "remotes",  &ctx.opts.refs.want_remotes,  N_("include all remotes refs"),  PARSE_OPT_NONEG),
+		OPT_BOOL_F(0, "detached", &ctx.opts.refs.want_detached, N_("include detached HEAD"),     PARSE_OPT_NONEG),
+		OPT_BOOL_F(0, "other",    &ctx.opts.refs.want_other,    N_("include notes and stashes"), PARSE_OPT_NONEG),
+
 		OPT_END(),
 	};
 
@@ -72,5 +315,10 @@ int cmd_survey(int argc, const char **argv, const char *prefix, struct repositor
 	if (ctx.opts.show_progress < 0)
 		ctx.opts.show_progress = isatty(2);
 
+	fixup_refs_wanted(&ctx);
+
+	survey_phase_refs(&ctx);
+
+	clear_survey_context(&ctx);
 	return 0;
 }
diff --git a/t/t8100-git-survey.sh b/t/t8100-git-survey.sh
index a51a3e766e8a34..8685f1fbf7bced 100755
--- a/t/t8100-git-survey.sh
+++ b/t/t8100-git-survey.sh
@@ -15,4 +15,13 @@ test_expect_success 'git survey -h shows experimental warning' '
 	test_grep "EXPERIMENTAL!" usage
 '
 
+test_expect_success 'create a semi-interesting repo' '
+	test_commit_bulk 10
+'
+
+test_expect_success 'git survey (default)' '
+	git survey >out 2>err &&
+	test_line_count = 0 err
+'
+
 test_done

From 3d41022b0473a9b6b16b8a406169d70964378866 Mon Sep 17 00:00:00 2001
From: Derrick Stolee <stolee@gmail.com>
Date: Sun, 1 Sep 2024 15:58:32 -0400
Subject: [PATCH 058/247] survey: start pretty printing data in table form

When 'git survey' provides information to the user, this will be presented
in one of two formats: plaintext and JSON. The JSON implementation will be
delayed until the functionality is complete for the plaintext format.

The most important parts of the plaintext format are headers specifying the
different sections of the report and tables providing concreted data.

Create a custom table data structure that allows specifying a list of
strings for the row values. When printing the table, check each column for
the maximum width so we can create a table of the correct size from the
start.

The table structure is designed to be flexible to the different kinds of
output that will be implemented in future changes.

Signed-off-by: Derrick Stolee <stolee@gmail.com>
---
 Documentation/git-survey.adoc |   7 ++
 builtin/survey.c              | 157 ++++++++++++++++++++++++++++++++++
 t/t8100-git-survey.sh         |  18 +++-
 3 files changed, 181 insertions(+), 1 deletion(-)

diff --git a/Documentation/git-survey.adoc b/Documentation/git-survey.adoc
index 56060d14b5cfef..120ecb9a4d49f2 100644
--- a/Documentation/git-survey.adoc
+++ b/Documentation/git-survey.adoc
@@ -65,6 +65,13 @@ OUTPUT
 By default, `git survey` will print information about the repository in a
 human-readable format that includes overviews and tables.
 
+References Summary
+~~~~~~~~~~~~~~~~~~
+
+The references summary includes a count of each kind of reference,
+including branches, remote refs, and tags (split by "all" and
+"annotated").
+
 GIT
 ---
 Part of the linkgit:git[1] suite
diff --git a/builtin/survey.c b/builtin/survey.c
index 4cf289f1e59ec6..527913d8dbf476 100644
--- a/builtin/survey.c
+++ b/builtin/survey.c
@@ -8,6 +8,7 @@
 #include "parse-options.h"
 #include "progress.h"
 #include "ref-filter.h"
+#include "strbuf.h"
 #include "strvec.h"
 #include "trace2.h"
 
@@ -81,6 +82,160 @@ static void clear_survey_context(struct survey_context *ctx)
 	strvec_clear(&ctx->refs);
 }
 
+struct survey_table {
+	const char *table_name;
+	struct strvec header;
+	struct strvec *rows;
+	size_t rows_nr;
+	size_t rows_alloc;
+};
+
+#define SURVEY_TABLE_INIT {	\
+	.header = STRVEC_INIT,	\
+}
+
+static void clear_table(struct survey_table *table)
+{
+	strvec_clear(&table->header);
+	for (size_t i = 0; i < table->rows_nr; i++)
+		strvec_clear(&table->rows[i]);
+	free(table->rows);
+}
+
+static void insert_table_rowv(struct survey_table *table, ...)
+{
+	va_list ap;
+	char *arg;
+	ALLOC_GROW(table->rows, table->rows_nr + 1, table->rows_alloc);
+
+	memset(&table->rows[table->rows_nr], 0, sizeof(struct strvec));
+
+	va_start(ap, table);
+	while ((arg = va_arg(ap, char *)))
+		strvec_push(&table->rows[table->rows_nr], arg);
+	va_end(ap);
+
+	table->rows_nr++;
+}
+
+#define SECTION_SEGMENT "========================================"
+#define SECTION_SEGMENT_LEN 40
+static const char *section_line = SECTION_SEGMENT
+				  SECTION_SEGMENT
+				  SECTION_SEGMENT
+				  SECTION_SEGMENT;
+static const size_t section_len = 4 * SECTION_SEGMENT_LEN;
+
+static void print_table_title(const char *name, size_t *widths, size_t nr)
+{
+	size_t width = 3 * (nr - 1);
+
+	for (size_t i = 0; i < nr; i++)
+		width += widths[i];
+
+	if (width > section_len)
+		width = section_len;
+
+	printf("\n%s\n%.*s\n", name, (int)width, section_line);
+}
+
+static void print_row_plaintext(struct strvec *row, size_t *widths)
+{
+	static struct strbuf line = STRBUF_INIT;
+	strbuf_setlen(&line, 0);
+
+	for (size_t i = 0; i < row->nr; i++) {
+		const char *str = row->v[i];
+		size_t len = strlen(str);
+		if (i)
+			strbuf_add(&line, " | ", 3);
+		strbuf_addchars(&line, ' ', widths[i] - len);
+		strbuf_add(&line, str, len);
+	}
+	printf("%s\n", line.buf);
+}
+
+static void print_divider_plaintext(size_t *widths, size_t nr)
+{
+	static struct strbuf line = STRBUF_INIT;
+	strbuf_setlen(&line, 0);
+
+	for (size_t i = 0; i < nr; i++) {
+		if (i)
+			strbuf_add(&line, "-+-", 3);
+		strbuf_addchars(&line, '-', widths[i]);
+	}
+	printf("%s\n", line.buf);
+}
+
+static void print_table_plaintext(struct survey_table *table)
+{
+	size_t *column_widths;
+	size_t columns_nr = table->header.nr;
+	CALLOC_ARRAY(column_widths, columns_nr);
+
+	for (size_t i = 0; i < columns_nr; i++) {
+		column_widths[i] = strlen(table->header.v[i]);
+
+		for (size_t j = 0; j < table->rows_nr; j++) {
+			size_t rowlen = strlen(table->rows[j].v[i]);
+			if (column_widths[i] < rowlen)
+				column_widths[i] = rowlen;
+		}
+	}
+
+	print_table_title(table->table_name, column_widths, columns_nr);
+	print_row_plaintext(&table->header, column_widths);
+	print_divider_plaintext(column_widths, columns_nr);
+
+	for (size_t j = 0; j < table->rows_nr; j++)
+		print_row_plaintext(&table->rows[j], column_widths);
+
+	free(column_widths);
+}
+
+static void survey_report_plaintext_refs(struct survey_context *ctx)
+{
+	struct survey_report_ref_summary *refs = &ctx->report.refs;
+	struct survey_table table = SURVEY_TABLE_INIT;
+
+	table.table_name = _("REFERENCES SUMMARY");
+
+	strvec_push(&table.header, _("Ref Type"));
+	strvec_push(&table.header, _("Count"));
+
+	if (ctx->opts.refs.want_all_refs || ctx->opts.refs.want_branches) {
+		char *fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)refs->branches_nr);
+		insert_table_rowv(&table, _("Branches"), fmt, NULL);
+		free(fmt);
+	}
+
+	if (ctx->opts.refs.want_all_refs || ctx->opts.refs.want_remotes) {
+		char *fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)refs->remote_refs_nr);
+		insert_table_rowv(&table, _("Remote refs"), fmt, NULL);
+		free(fmt);
+	}
+
+	if (ctx->opts.refs.want_all_refs || ctx->opts.refs.want_tags) {
+		char *fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)refs->tags_nr);
+		insert_table_rowv(&table, _("Tags (all)"), fmt, NULL);
+		free(fmt);
+		fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)refs->tags_annotated_nr);
+		insert_table_rowv(&table, _("Tags (annotated)"), fmt, NULL);
+		free(fmt);
+	}
+
+	print_table_plaintext(&table);
+	clear_table(&table);
+}
+
+static void survey_report_plaintext(struct survey_context *ctx)
+{
+	printf("GIT SURVEY for \"%s\"\n", ctx->repo->worktree);
+	printf("-----------------------------------------------------\n");
+	survey_report_plaintext_refs(ctx);
+}
+
 /*
  * After parsing the command line arguments, figure out which refs we
  * should scan.
@@ -319,6 +474,8 @@ int cmd_survey(int argc, const char **argv, const char *prefix, struct repositor
 
 	survey_phase_refs(&ctx);
 
+	survey_report_plaintext(&ctx);
+
 	clear_survey_context(&ctx);
 	return 0;
 }
diff --git a/t/t8100-git-survey.sh b/t/t8100-git-survey.sh
index 8685f1fbf7bced..ff0d22b0b02af3 100755
--- a/t/t8100-git-survey.sh
+++ b/t/t8100-git-survey.sh
@@ -21,7 +21,23 @@ test_expect_success 'create a semi-interesting repo' '
 
 test_expect_success 'git survey (default)' '
 	git survey >out 2>err &&
-	test_line_count = 0 err
+	test_line_count = 0 err &&
+
+	tr , " " >expect <<-EOF &&
+	GIT SURVEY for "$(pwd)"
+	-----------------------------------------------------
+
+	REFERENCES SUMMARY
+	========================
+	,       Ref Type | Count
+	-----------------+------
+	,       Branches |     1
+	     Remote refs |     0
+	      Tags (all) |     0
+	Tags (annotated) |     0
+	EOF
+
+	test_cmp expect out
 '
 
 test_done

From 46627edddc30bdb82bcf1e2b512e43381d2fa55c Mon Sep 17 00:00:00 2001
From: Jeff Hostetler <jeffhost@microsoft.com>
Date: Tue, 30 Mar 2021 14:25:31 -0400
Subject: [PATCH 059/247] clink.pl: fix libexpatd.lib link error when using
 MSVC

When building with `make MSVC=1 DEBUG=1`, link to `libexpatd.lib`
rather than `libexpat.lib`.

It appears that the `vcpkg` package for "libexpat" has changed and now
creates `libexpatd.lib` for debug mode builds.  Previously, both debug
and release builds created a ".lib" with the same basename.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
---
 compat/vcbuild/scripts/clink.pl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl
index 3bd824154be381..2768ae15f1879f 100755
--- a/compat/vcbuild/scripts/clink.pl
+++ b/compat/vcbuild/scripts/clink.pl
@@ -66,7 +66,11 @@
 		}
 		push(@args, $lib);
 	} elsif ("$arg" eq "-lexpat") {
+	    if ($is_debug) {
+		push(@args, "libexpatd.lib");
+	    } else {
 		push(@args, "libexpat.lib");
+	    }
 	} elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {
 		$arg =~ s/^-L/-LIBPATH:/;
 		push(@lflags, $arg);

From 95022f09237be2209d5839cadde0d04c5b3ab77c Mon Sep 17 00:00:00 2001
From: Derrick Stolee <stolee@gmail.com>
Date: Sun, 1 Sep 2024 20:33:47 -0400
Subject: [PATCH 060/247] survey: add object count summary

At the moment, nothing is obvious about the reason for the use of the
path-walk API, but this will become more prevelant in future iterations. For
now, use the path-walk API to sum up the counts of each kind of object.

For example, this is the reachable object summary output for my local repo:

REACHABLE OBJECT SUMMARY
========================
Object Type |  Count
------------+-------
       Tags |   1343
    Commits | 179344
      Trees | 314350
      Blobs | 184030

Signed-off-by: Derrick Stolee <stolee@gmail.com>
---
 Documentation/git-survey.adoc |   6 ++
 builtin/survey.c              | 130 ++++++++++++++++++++++++++++++++--
 t/t8100-git-survey.sh         |  23 ++++--
 3 files changed, 148 insertions(+), 11 deletions(-)

diff --git a/Documentation/git-survey.adoc b/Documentation/git-survey.adoc
index 120ecb9a4d49f2..44f3a0568b7697 100644
--- a/Documentation/git-survey.adoc
+++ b/Documentation/git-survey.adoc
@@ -72,6 +72,12 @@ The references summary includes a count of each kind of reference,
 including branches, remote refs, and tags (split by "all" and
 "annotated").
 
+Reachable Object Summary
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+The reachable object summary shows the total number of each kind of Git
+object, including tags, commits, trees, and blobs.
+
 GIT
 ---
 Part of the linkgit:git[1] suite
diff --git a/builtin/survey.c b/builtin/survey.c
index 527913d8dbf476..d85d999f497bde 100644
--- a/builtin/survey.c
+++ b/builtin/survey.c
@@ -3,13 +3,19 @@
 #include "builtin.h"
 #include "config.h"
 #include "environment.h"
+#include "hex.h"
 #include "object.h"
 #include "odb.h"
+#include "object-name.h"
 #include "parse-options.h"
+#include "path-walk.h"
 #include "progress.h"
 #include "ref-filter.h"
+#include "refs.h"
+#include "revision.h"
 #include "strbuf.h"
 #include "strvec.h"
+#include "tag.h"
 #include "trace2.h"
 
 static const char * const survey_usage[] = {
@@ -47,12 +53,20 @@ struct survey_report_ref_summary {
 	size_t unknown_nr;
 };
 
+struct survey_report_object_summary {
+	size_t commits_nr;
+	size_t tags_nr;
+	size_t trees_nr;
+	size_t blobs_nr;
+};
+
 /**
  * This struct contains all of the information that needs to be printed
  * at the end of the exploration of the repository and its references.
  */
 struct survey_report {
 	struct survey_report_ref_summary refs;
+	struct survey_report_object_summary reachable_objects;
 };
 
 struct survey_context {
@@ -75,10 +89,12 @@ struct survey_context {
 	size_t progress_total;
 
 	struct strvec refs;
+	struct ref_array ref_array;
 };
 
 static void clear_survey_context(struct survey_context *ctx)
 {
+	ref_array_clear(&ctx->ref_array);
 	strvec_clear(&ctx->refs);
 }
 
@@ -129,10 +145,14 @@ static const size_t section_len = 4 * SECTION_SEGMENT_LEN;
 static void print_table_title(const char *name, size_t *widths, size_t nr)
 {
 	size_t width = 3 * (nr - 1);
+	size_t min_width = strlen(name);
 
 	for (size_t i = 0; i < nr; i++)
 		width += widths[i];
 
+	if (width < min_width)
+		width = min_width;
+
 	if (width > section_len)
 		width = section_len;
 
@@ -229,11 +249,43 @@ static void survey_report_plaintext_refs(struct survey_context *ctx)
 	clear_table(&table);
 }
 
+static void survey_report_plaintext_reachable_object_summary(struct survey_context *ctx)
+{
+	struct survey_report_object_summary *objs = &ctx->report.reachable_objects;
+	struct survey_table table = SURVEY_TABLE_INIT;
+	char *fmt;
+
+	table.table_name = _("REACHABLE OBJECT SUMMARY");
+
+	strvec_push(&table.header, _("Object Type"));
+	strvec_push(&table.header, _("Count"));
+
+	fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)objs->tags_nr);
+	insert_table_rowv(&table, _("Tags"), fmt, NULL);
+	free(fmt);
+
+	fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)objs->commits_nr);
+	insert_table_rowv(&table, _("Commits"), fmt, NULL);
+	free(fmt);
+
+	fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)objs->trees_nr);
+	insert_table_rowv(&table, _("Trees"), fmt, NULL);
+	free(fmt);
+
+	fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)objs->blobs_nr);
+	insert_table_rowv(&table, _("Blobs"), fmt, NULL);
+	free(fmt);
+
+	print_table_plaintext(&table);
+	clear_table(&table);
+}
+
 static void survey_report_plaintext(struct survey_context *ctx)
 {
 	printf("GIT SURVEY for \"%s\"\n", ctx->repo->worktree);
 	printf("-----------------------------------------------------\n");
 	survey_report_plaintext_refs(ctx);
+	survey_report_plaintext_reachable_object_summary(ctx);
 }
 
 /*
@@ -382,15 +434,13 @@ static void do_load_refs(struct survey_context *ctx,
  */
 static void survey_phase_refs(struct survey_context *ctx)
 {
-	struct ref_array ref_array = { 0 };
-
 	trace2_region_enter("survey", "phase/refs", ctx->repo);
-	do_load_refs(ctx, &ref_array);
+	do_load_refs(ctx, &ctx->ref_array);
 
-	ctx->report.refs.refs_nr = ref_array.nr;
-	for (int i = 0; i < ref_array.nr; i++) {
+	ctx->report.refs.refs_nr = ctx->ref_array.nr;
+	for (int i = 0; i < ctx->ref_array.nr; i++) {
 		size_t size;
-		struct ref_array_item *item = ref_array.items[i];
+		struct ref_array_item *item = ctx->ref_array.items[i];
 
 		switch (item->kind) {
 		case FILTER_REFS_TAGS:
@@ -420,8 +470,72 @@ static void survey_phase_refs(struct survey_context *ctx)
 	}
 
 	trace2_region_leave("survey", "phase/refs", ctx->repo);
+}
+
+static void increment_object_counts(
+		struct survey_report_object_summary *summary,
+		enum object_type type,
+		size_t nr)
+{
+	switch (type) {
+	case OBJ_COMMIT:
+		summary->commits_nr += nr;
+		break;
 
-	ref_array_clear(&ref_array);
+	case OBJ_TREE:
+		summary->trees_nr += nr;
+		break;
+
+	case OBJ_BLOB:
+		summary->blobs_nr += nr;
+		break;
+
+	case OBJ_TAG:
+		summary->tags_nr += nr;
+		break;
+
+	default:
+		break;
+	}
+}
+
+static int survey_objects_path_walk_fn(const char *path UNUSED,
+				       struct oid_array *oids,
+				       enum object_type type,
+				       void *data)
+{
+	struct survey_context *ctx = data;
+
+	increment_object_counts(&ctx->report.reachable_objects,
+				type, oids->nr);
+
+	return 0;
+}
+
+static void survey_phase_objects(struct survey_context *ctx)
+{
+	struct rev_info revs = REV_INFO_INIT;
+	struct path_walk_info info = PATH_WALK_INFO_INIT;
+	unsigned int add_flags = 0;
+
+	trace2_region_enter("survey", "phase/objects", ctx->repo);
+
+	info.revs = &revs;
+	info.path_fn = survey_objects_path_walk_fn;
+	info.path_fn_data = ctx;
+
+	repo_init_revisions(ctx->repo, &revs, "");
+	revs.tag_objects = 1;
+
+	for (int i = 0; i < ctx->ref_array.nr; i++) {
+		struct ref_array_item *item = ctx->ref_array.items[i];
+		add_pending_oid(&revs, NULL, &item->objectname, add_flags);
+	}
+
+	walk_objects_by_path(&info);
+
+	release_revisions(&revs);
+	trace2_region_leave("survey", "phase/objects", ctx->repo);
 }
 
 int cmd_survey(int argc, const char **argv, const char *prefix, struct repository *repo)
@@ -474,6 +588,8 @@ int cmd_survey(int argc, const char **argv, const char *prefix, struct repositor
 
 	survey_phase_refs(&ctx);
 
+	survey_phase_objects(&ctx);
+
 	survey_report_plaintext(&ctx);
 
 	clear_survey_context(&ctx);
diff --git a/t/t8100-git-survey.sh b/t/t8100-git-survey.sh
index ff0d22b0b02af3..68968129cb3a76 100755
--- a/t/t8100-git-survey.sh
+++ b/t/t8100-git-survey.sh
@@ -16,11 +16,17 @@ test_expect_success 'git survey -h shows experimental warning' '
 '
 
 test_expect_success 'create a semi-interesting repo' '
-	test_commit_bulk 10
+	test_commit_bulk 10 &&
+	git tag -a -m one one HEAD~5 &&
+	git tag -a -m two two HEAD~3 &&
+	git tag -a -m three three two &&
+	git tag -a -m four four three &&
+	git update-ref -d refs/tags/three &&
+	git update-ref -d refs/tags/two
 '
 
 test_expect_success 'git survey (default)' '
-	git survey >out 2>err &&
+	git survey --all-refs >out 2>err &&
 	test_line_count = 0 err &&
 
 	tr , " " >expect <<-EOF &&
@@ -33,8 +39,17 @@ test_expect_success 'git survey (default)' '
 	-----------------+------
 	,       Branches |     1
 	     Remote refs |     0
-	      Tags (all) |     0
-	Tags (annotated) |     0
+	      Tags (all) |     2
+	Tags (annotated) |     2
+
+	REACHABLE OBJECT SUMMARY
+	========================
+	Object Type | Count
+	------------+------
+	       Tags |     4
+	    Commits |    10
+	      Trees |    10
+	      Blobs |    10
 	EOF
 
 	test_cmp expect out

From 36640f3f8e5b5c84d50c332d815eb3be1e02eb22 Mon Sep 17 00:00:00 2001
From: Jeff Hostetler <jeffhost@microsoft.com>
Date: Mon, 5 Apr 2021 15:27:38 -0400
Subject: [PATCH 061/247] Makefile: clean up .ilk files when MSVC=1

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index c649c93c510332..42f34345fdda42 100644
--- a/Makefile
+++ b/Makefile
@@ -3944,12 +3944,15 @@ ifdef MSVC
 	$(RM) $(patsubst %.o,%.o.pdb,$(OBJECTS))
 	$(RM) headless-git.o.pdb
 	$(RM) $(patsubst %.exe,%.pdb,$(OTHER_PROGRAMS))
+	$(RM) $(patsubst %.exe,%.ilk,$(OTHER_PROGRAMS))
 	$(RM) $(patsubst %.exe,%.iobj,$(OTHER_PROGRAMS))
 	$(RM) $(patsubst %.exe,%.ipdb,$(OTHER_PROGRAMS))
 	$(RM) $(patsubst %.exe,%.pdb,$(PROGRAMS))
+	$(RM) $(patsubst %.exe,%.ilk,$(PROGRAMS))
 	$(RM) $(patsubst %.exe,%.iobj,$(PROGRAMS))
 	$(RM) $(patsubst %.exe,%.ipdb,$(PROGRAMS))
 	$(RM) $(patsubst %.exe,%.pdb,$(TEST_PROGRAMS))
+	$(RM) $(patsubst %.exe,%.ilk,$(TEST_PROGRAMS))
 	$(RM) $(patsubst %.exe,%.iobj,$(TEST_PROGRAMS))
 	$(RM) $(patsubst %.exe,%.ipdb,$(TEST_PROGRAMS))
 	$(RM) compat/vcbuild/MSVC-DEFS-GEN

From 1fe1b8b5d151720df4e8bd04801363d3ef1d6317 Mon Sep 17 00:00:00 2001
From: Derrick Stolee <stolee@gmail.com>
Date: Sun, 1 Sep 2024 20:58:35 -0400
Subject: [PATCH 062/247] survey: summarize total sizes by object type

Now that we have explored objects by count, we can expand that a bit more to
summarize the data for the on-disk and inflated size of those objects. This
information is helpful for diagnosing both why disk space (and perhaps
clone or fetch times) is growing but also why certain operations are slow
because the inflated size of the abstract objects that must be processed is
so large.

Note: zlib-ng is slightly more efficient even at those small sizes. Even
between zlib versions, there are slight differences in compression. To
accommodate for that in the tests, not the exact numbers but some rough
approximations are validated (the test should validate `git survey`,
after all, not zlib).

Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/survey.c      | 133 ++++++++++++++++++++++++++++++++++++++++++
 t/t8100-git-survey.sh |  37 +++++++++++-
 2 files changed, 169 insertions(+), 1 deletion(-)

diff --git a/builtin/survey.c b/builtin/survey.c
index d85d999f497bde..bd19a823b92d38 100644
--- a/builtin/survey.c
+++ b/builtin/survey.c
@@ -60,6 +60,19 @@ struct survey_report_object_summary {
 	size_t blobs_nr;
 };
 
+/**
+ * For some category given by 'label', count the number of objects
+ * that match that label along with the on-disk size and the size
+ * after decompressing (both with delta bases and zlib).
+ */
+struct survey_report_object_size_summary {
+	char *label;
+	size_t nr;
+	size_t disk_size;
+	size_t inflated_size;
+	size_t num_missing;
+};
+
 /**
  * This struct contains all of the information that needs to be printed
  * at the end of the exploration of the repository and its references.
@@ -67,8 +80,16 @@ struct survey_report_object_summary {
 struct survey_report {
 	struct survey_report_ref_summary refs;
 	struct survey_report_object_summary reachable_objects;
+
+	struct survey_report_object_size_summary *by_type;
 };
 
+#define REPORT_TYPE_COMMIT 0
+#define REPORT_TYPE_TREE 1
+#define REPORT_TYPE_BLOB 2
+#define REPORT_TYPE_TAG 3
+#define REPORT_TYPE_COUNT 4
+
 struct survey_context {
 	struct repository *repo;
 
@@ -280,12 +301,48 @@ static void survey_report_plaintext_reachable_object_summary(struct survey_conte
 	clear_table(&table);
 }
 
+static void survey_report_object_sizes(const char *title,
+				       const char *categories,
+				       struct survey_report_object_size_summary *summary,
+				       size_t summary_nr)
+{
+	struct survey_table table = SURVEY_TABLE_INIT;
+	table.table_name = title;
+
+	strvec_push(&table.header, categories);
+	strvec_push(&table.header, _("Count"));
+	strvec_push(&table.header, _("Disk Size"));
+	strvec_push(&table.header, _("Inflated Size"));
+
+	for (size_t i = 0; i < summary_nr; i++) {
+		char *label_str =  xstrdup(summary[i].label);
+		char *nr_str = xstrfmt("%"PRIuMAX, (uintmax_t)summary[i].nr);
+		char *disk_str = xstrfmt("%"PRIuMAX, (uintmax_t)summary[i].disk_size);
+		char *inflate_str = xstrfmt("%"PRIuMAX, (uintmax_t)summary[i].inflated_size);
+
+		insert_table_rowv(&table, label_str, nr_str,
+				  disk_str, inflate_str, NULL);
+
+		free(label_str);
+		free(nr_str);
+		free(disk_str);
+		free(inflate_str);
+	}
+
+	print_table_plaintext(&table);
+	clear_table(&table);
+}
+
 static void survey_report_plaintext(struct survey_context *ctx)
 {
 	printf("GIT SURVEY for \"%s\"\n", ctx->repo->worktree);
 	printf("-----------------------------------------------------\n");
 	survey_report_plaintext_refs(ctx);
 	survey_report_plaintext_reachable_object_summary(ctx);
+	survey_report_object_sizes(_("TOTAL OBJECT SIZES BY TYPE"),
+				   _("Object Type"),
+				   ctx->report.by_type,
+				   REPORT_TYPE_COUNT);
 }
 
 /*
@@ -499,6 +556,69 @@ static void increment_object_counts(
 	}
 }
 
+static void increment_totals(struct survey_context *ctx,
+			     struct oid_array *oids,
+			     struct survey_report_object_size_summary *summary)
+{
+	for (size_t i = 0; i < oids->nr; i++) {
+		struct object_info oi = OBJECT_INFO_INIT;
+		unsigned oi_flags = OBJECT_INFO_FOR_PREFETCH;
+		size_t object_length = 0;
+		off_t disk_sizep = 0;
+		enum object_type type;
+
+		oi.typep = &type;
+		oi.sizep = &object_length;
+		oi.disk_sizep = &disk_sizep;
+
+		if (odb_read_object_info_extended(ctx->repo->objects,
+						  &oids->oid[i],
+						  &oi, oi_flags) < 0) {
+			summary->num_missing++;
+		} else {
+			summary->nr++;
+			summary->disk_size += disk_sizep;
+			summary->inflated_size += object_length;
+		}
+	}
+}
+
+static void increment_object_totals(struct survey_context *ctx,
+				    struct oid_array *oids,
+				    enum object_type type)
+{
+	struct survey_report_object_size_summary *total;
+	struct survey_report_object_size_summary summary = { 0 };
+
+	increment_totals(ctx, oids, &summary);
+
+	switch (type) {
+	case OBJ_COMMIT:
+		total = &ctx->report.by_type[REPORT_TYPE_COMMIT];
+		break;
+
+	case OBJ_TREE:
+		total = &ctx->report.by_type[REPORT_TYPE_TREE];
+		break;
+
+	case OBJ_BLOB:
+		total = &ctx->report.by_type[REPORT_TYPE_BLOB];
+		break;
+
+	case OBJ_TAG:
+		total = &ctx->report.by_type[REPORT_TYPE_TAG];
+		break;
+
+	default:
+		BUG("No other type allowed");
+	}
+
+	total->nr += summary.nr;
+	total->disk_size += summary.disk_size;
+	total->inflated_size += summary.inflated_size;
+	total->num_missing += summary.num_missing;
+}
+
 static int survey_objects_path_walk_fn(const char *path UNUSED,
 				       struct oid_array *oids,
 				       enum object_type type,
@@ -508,10 +628,20 @@ static int survey_objects_path_walk_fn(const char *path UNUSED,
 
 	increment_object_counts(&ctx->report.reachable_objects,
 				type, oids->nr);
+	increment_object_totals(ctx, oids, type);
 
 	return 0;
 }
 
+static void initialize_report(struct survey_context *ctx)
+{
+	CALLOC_ARRAY(ctx->report.by_type, REPORT_TYPE_COUNT);
+	ctx->report.by_type[REPORT_TYPE_COMMIT].label = xstrdup(_("Commits"));
+	ctx->report.by_type[REPORT_TYPE_TREE].label = xstrdup(_("Trees"));
+	ctx->report.by_type[REPORT_TYPE_BLOB].label = xstrdup(_("Blobs"));
+	ctx->report.by_type[REPORT_TYPE_TAG].label = xstrdup(_("Tags"));
+}
+
 static void survey_phase_objects(struct survey_context *ctx)
 {
 	struct rev_info revs = REV_INFO_INIT;
@@ -524,12 +654,15 @@ static void survey_phase_objects(struct survey_context *ctx)
 	info.path_fn = survey_objects_path_walk_fn;
 	info.path_fn_data = ctx;
 
+	initialize_report(ctx);
+
 	repo_init_revisions(ctx->repo, &revs, "");
 	revs.tag_objects = 1;
 
 	for (int i = 0; i < ctx->ref_array.nr; i++) {
 		struct ref_array_item *item = ctx->ref_array.items[i];
 		add_pending_oid(&revs, NULL, &item->objectname, add_flags);
+		display_progress(ctx->progress, ++(ctx->progress_nr));
 	}
 
 	walk_objects_by_path(&info);
diff --git a/t/t8100-git-survey.sh b/t/t8100-git-survey.sh
index 68968129cb3a76..88d80597579603 100755
--- a/t/t8100-git-survey.sh
+++ b/t/t8100-git-survey.sh
@@ -25,10 +25,35 @@ test_expect_success 'create a semi-interesting repo' '
 	git update-ref -d refs/tags/two
 '
 
+approximate_sizes() {
+	# very simplistic approximate rounding
+	sed -Ee "s/  *(1[0-9][0-9])( |$)/ ~0.1kB\2/g" \
+	  -e "s/  *(4[6-9][0-9]|5[0-6][0-9])( |$)/ ~0.5kB\2/g" \
+	  -e "s/  *(5[6-9][0-9]|6[0-6][0-9])( |$)/ ~0.6kB\2/g" \
+	  -e "s/  *1(4[89][0-9]|5[0-8][0-9])( |$)/ ~1.5kB\2/g" \
+	  -e "s/  *1(69[0-9]|7[0-9][0-9])( |$)/ ~1.7kB\2/g" \
+	  -e "s/  *1(79[0-9]|8[0-9][0-9])( |$)/ ~1.8kB\2/g" \
+	  -e "s/  *2(1[0-9][0-9]|20[0-1])( |$)/ ~2.1kB\2/g" \
+	  -e "s/  *2(3[0-9][0-9]|4[0-1][0-9])( |$)/ ~2.3kB\2/g" \
+	  -e "s/  *2(5[0-9][0-9]|6[0-1][0-9])( |$)/ ~2.5kB\2/g" \
+	 "$@"
+}
+
 test_expect_success 'git survey (default)' '
 	git survey --all-refs >out 2>err &&
 	test_line_count = 0 err &&
 
+	test_oid_cache <<-EOF &&
+	commits_sizes sha1:~1.5kB | ~2.1kB
+	commits_sizes sha256:~1.8kB | ~2.5kB
+	trees_sizes sha1:~0.5kB | ~1.7kB
+	trees_sizes sha256:~0.6kB | ~2.3kB
+	blobs_sizes sha1:~0.1kB | ~0.1kB
+	blobs_sizes sha256:~0.1kB | ~0.1kB
+	tags_sizes sha1:~0.5kB | ~0.5kB
+	tags_sizes sha256:~0.5kB | ~0.6kB
+	EOF
+
 	tr , " " >expect <<-EOF &&
 	GIT SURVEY for "$(pwd)"
 	-----------------------------------------------------
@@ -50,9 +75,19 @@ test_expect_success 'git survey (default)' '
 	    Commits |    10
 	      Trees |    10
 	      Blobs |    10
+
+	TOTAL OBJECT SIZES BY TYPE
+	===============================================
+	Object Type | Count | Disk Size | Inflated Size
+	------------+-------+-----------+--------------
+	    Commits |    10 | $(test_oid commits_sizes)
+	      Trees |    10 | $(test_oid trees_sizes)
+	      Blobs |    10 | $(test_oid blobs_sizes)
+	       Tags |     4 | $(test_oid tags_sizes)
 	EOF
 
-	test_cmp expect out
+	approximate_sizes out >out-edited &&
+	test_cmp expect out-edited
 '
 
 test_done

From 47a54d98b0ccc6fd8b9acfa101baf55f5fceb955 Mon Sep 17 00:00:00 2001
From: Jeff Hostetler <jeffhost@microsoft.com>
Date: Mon, 5 Apr 2021 14:08:22 -0400
Subject: [PATCH 063/247] vcbuild: add support for compiling Windows resource
 files

Create a wrapper for the Windows Resource Compiler (RC.EXE)
for use by the MSVC=1 builds. This is similar to the CL.EXE
and LIB.EXE wrappers used for the MSVC=1 builds.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
---
 compat/vcbuild/find_vs_env.bat |  7 ++++++
 compat/vcbuild/scripts/rc.pl   | 46 ++++++++++++++++++++++++++++++++++
 config.mak.uname               |  3 ++-
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 compat/vcbuild/scripts/rc.pl

diff --git a/compat/vcbuild/find_vs_env.bat b/compat/vcbuild/find_vs_env.bat
index b35d264c0e6bed..379b16296e09c2 100644
--- a/compat/vcbuild/find_vs_env.bat
+++ b/compat/vcbuild/find_vs_env.bat
@@ -99,6 +99,7 @@ REM ================================================================
 
    SET sdk_dir=%WindowsSdkDir%
    SET sdk_ver=%WindowsSDKVersion%
+   SET sdk_ver_bin_dir=%WindowsSdkVerBinPath%%tgt%
    SET si=%sdk_dir%Include\%sdk_ver%
    SET sdk_includes=-I"%si%ucrt" -I"%si%um" -I"%si%shared"
    SET sl=%sdk_dir%lib\%sdk_ver%
@@ -130,6 +131,7 @@ REM ================================================================
 
    SET sdk_dir=%WindowsSdkDir%
    SET sdk_ver=%WindowsSDKVersion%
+   SET sdk_ver_bin_dir=%WindowsSdkVerBinPath%bin\amd64
    SET si=%sdk_dir%Include\%sdk_ver%
    SET sdk_includes=-I"%si%ucrt" -I"%si%um" -I"%si%shared" -I"%si%winrt"
    SET sl=%sdk_dir%lib\%sdk_ver%
@@ -160,6 +162,11 @@ REM ================================================================
    echo msvc_includes=%msvc_includes%
    echo msvc_libs=%msvc_libs%
 
+   echo sdk_ver_bin_dir=%sdk_ver_bin_dir%
+   SET X1=%sdk_ver_bin_dir:C:=/C%
+   SET X2=%X1:\=/%
+   echo sdk_ver_bin_dir_msys=%X2%
+
    echo sdk_includes=%sdk_includes%
    echo sdk_libs=%sdk_libs%
 
diff --git a/compat/vcbuild/scripts/rc.pl b/compat/vcbuild/scripts/rc.pl
new file mode 100644
index 00000000000000..7bca4cd81c6c63
--- /dev/null
+++ b/compat/vcbuild/scripts/rc.pl
@@ -0,0 +1,46 @@
+#!/usr/bin/perl -w
+######################################################################
+# Compile Resources on Windows
+#
+# This is a wrapper to facilitate the compilation of Git with MSVC
+# using GNU Make as the build system. So, instead of manipulating the
+# Makefile into something nasty, just to support non-space arguments
+# etc, we use this wrapper to fix the command line options
+#
+######################################################################
+use strict;
+my @args = ();
+my @input = ();
+
+while (@ARGV) {
+	my $arg = shift @ARGV;
+	if ("$arg" =~ /^-[dD]/) {
+		# GIT_VERSION gets passed with too many
+		# layers of dquote escaping.
+		$arg =~ s/\\"/"/g;
+
+		push(@args, $arg);
+
+	} elsif ("$arg" eq "-i") {
+		my $arg = shift @ARGV;
+		# TODO complain if NULL or is dashed ??
+		push(@input, $arg);
+
+	} elsif ("$arg" eq "-o") {
+		my $arg = shift @ARGV;
+		# TODO complain if NULL or is dashed ??
+		push(@args, "-fo$arg");
+
+	} else {
+		push(@args, $arg);
+	}
+}
+
+push(@args, "-nologo");
+push(@args, "-v");
+push(@args, @input);
+
+unshift(@args, "rc.exe");
+printf("**** @args\n");
+
+exit (system(@args) != 0);
diff --git a/config.mak.uname b/config.mak.uname
index b58bcdf943a287..e161164a119a0e 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -474,7 +474,7 @@ ifeq ($(uname_S),Windows)
 	# link.exe next to, and required by, cl.exe, we have to prepend this
 	# onto the existing $PATH.
 	#
-	SANE_TOOL_PATH ?= $(msvc_bin_dir_msys)
+	SANE_TOOL_PATH ?= $(msvc_bin_dir_msys):$(sdk_ver_bin_dir_msys)
 	HAVE_ALLOCA_H = YesPlease
 	NO_PREAD = YesPlease
 	NO_WRITEV = YesPlease
@@ -545,6 +545,7 @@ endif
 	# See https://msdn.microsoft.com/en-us/library/ms235330.aspx
 	EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj kernel32.lib ntdll.lib
 	PTHREAD_LIBS =
+	RC = compat/vcbuild/scripts/rc.pl
 	lib =
 	BASIC_CFLAGS += $(vcpkg_inc) $(sdk_includes) $(msvc_includes)
 ifndef DEBUG

From 3042869ea953e0ec99af63eb8a58c59a4a3b5817 Mon Sep 17 00:00:00 2001
From: Derrick Stolee <stolee@gmail.com>
Date: Sun, 1 Sep 2024 21:21:54 -0400
Subject: [PATCH 064/247] survey: show progress during object walk

Signed-off-by: Derrick Stolee <stolee@gmail.com>
---
 builtin/survey.c      | 16 ++++++++++++++++
 t/t8100-git-survey.sh |  5 +++++
 2 files changed, 21 insertions(+)

diff --git a/builtin/survey.c b/builtin/survey.c
index bd19a823b92d38..dd026e1bcdf414 100644
--- a/builtin/survey.c
+++ b/builtin/survey.c
@@ -630,6 +630,9 @@ static int survey_objects_path_walk_fn(const char *path UNUSED,
 				type, oids->nr);
 	increment_object_totals(ctx, oids, type);
 
+	ctx->progress_nr += oids->nr;
+	display_progress(ctx->progress, ctx->progress_nr);
+
 	return 0;
 }
 
@@ -659,13 +662,26 @@ static void survey_phase_objects(struct survey_context *ctx)
 	repo_init_revisions(ctx->repo, &revs, "");
 	revs.tag_objects = 1;
 
+	ctx->progress_nr = 0;
+	ctx->progress_total = ctx->ref_array.nr;
+	if (ctx->opts.show_progress)
+		ctx->progress = start_progress(ctx->repo,
+					       _("Preparing object walk"),
+					       ctx->progress_total);
 	for (int i = 0; i < ctx->ref_array.nr; i++) {
 		struct ref_array_item *item = ctx->ref_array.items[i];
 		add_pending_oid(&revs, NULL, &item->objectname, add_flags);
 		display_progress(ctx->progress, ++(ctx->progress_nr));
 	}
+	stop_progress(&ctx->progress);
 
+	ctx->progress_nr = 0;
+	ctx->progress_total = 0;
+	if (ctx->opts.show_progress)
+		ctx->progress = start_progress(ctx->repo,
+					       _("Walking objects"), 0);
 	walk_objects_by_path(&info);
+	stop_progress(&ctx->progress);
 
 	release_revisions(&revs);
 	trace2_region_leave("survey", "phase/objects", ctx->repo);
diff --git a/t/t8100-git-survey.sh b/t/t8100-git-survey.sh
index 88d80597579603..b63ba3a1c8e310 100755
--- a/t/t8100-git-survey.sh
+++ b/t/t8100-git-survey.sh
@@ -25,6 +25,11 @@ test_expect_success 'create a semi-interesting repo' '
 	git update-ref -d refs/tags/two
 '
 
+test_expect_success 'git survey --progress' '
+	GIT_PROGRESS_DELAY=0 git survey --all-refs --progress >out 2>err &&
+	grep "Preparing object walk" err
+'
+
 approximate_sizes() {
 	# very simplistic approximate rounding
 	sed -Ee "s/  *(1[0-9][0-9])( |$)/ ~0.1kB\2/g" \

From 3e4f53319dd81af2ca211eb7542339e87cedf015 Mon Sep 17 00:00:00 2001
From: Philip Oakley <philipoakley@iee.email>
Date: Fri, 2 Jul 2021 00:30:24 +0100
Subject: [PATCH 065/247] CMake: default Visual Studio generator has changed

Correct some wording and inform users regarding the Visual Studio
changes (from V16.6) to the default generator.

Subsequent commits ensure that Git for Windows can be directly
opened in modern Visual Studio without needing special configuration
of the CMakeLists settings.

It appeares that internally Visual Studio creates it's own version of the
.sln file (etc.) for extension tools that expect them.

The large number of references below document the shifting of Visual Studio
default and CMake setting options.

refs: https://docs.microsoft.com/en-us/search/?scope=C%2B%2B&view=msvc-150&terms=Ninja

1. https://docs.microsoft.com/en-us/cpp/linux/cmake-linux-configure?view=msvc-160
(note the linux bit)
 "In Visual Studio 2019 version 16.6 or later ***, Ninja is the default
generator for configurations targeting a remote system or WSL. For more
information, see this post on the C++ Team Blog
[https://devblogs.microsoft.com/cppblog/linux-development-with-visual-studio-first-class-support-for-gdbserver-improved-build-times-with-ninja-and-updates-to-the-connection-manager/].

For more information about these settings, see CMakeSettings.json reference
[https://docs.microsoft.com/en-us/cpp/build/cmakesettings-reference?view=msvc-160]."

2. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160
"CMake supports two files that allow users to specify common configure,
build, and test options and share them with others: CMakePresets.json
and CMakeUserPresets.json."

" Both files are supported in Visual Studio 2019 version 16.10 or later.
***"
3. https://devblogs.microsoft.com/cppblog/linux-development-with-visual-studio-first-class-support-for-gdbserver-improved-build-times-with-ninja-and-updates-to-the-connection-manager/
" Ninja has been the default generator (underlying build system) for
CMake configurations targeting Windows for some time***, but in Visual
Studio 2019 version 16.6 Preview 3*** we added support for Ninja on Linux."

4. https://docs.microsoft.com/en-us/cpp/build/cmakesettings-reference?view=msvc-160
" `generator`: specifies CMake generator to use for this configuration.
May be one of:

    Visual Studio 2019 only:
        Visual Studio 16 2019
        Visual Studio 16 2019 Win64
        Visual Studio 16 2019 ARM

    Visual Studio 2017 and later:
        Visual Studio 15 2017
        Visual Studio 15 2017 Win64
        Visual Studio 15 2017 ARM
        Visual Studio 14 2015
        Visual Studio 14 2015 Win64
        Visual Studio 14 2015 ARM
        Unix Makefiles
        Ninja

Because Ninja is designed for fast build speeds instead of flexibility
and function, it is set as the default. However, some CMake projects may
be unable to correctly build using Ninja. If this occurs, you can
instruct CMake to generate Visual Studio projects instead.

To specify a Visual Studio generator in Visual Studio 2017, open the
settings editor from the main menu by choosing CMake | Change CMake
Settings. Delete "Ninja" and type "V". This activates IntelliSense,
which enables you to choose the generator you want."

"To specify a Visual Studio generator in Visual Studio 2019, right-click
on the CMakeLists.txt file in Solution Explorer and choose CMake
Settings for project > Show Advanced Settings > CMake Generator.

When the active configuration specifies a Visual Studio generator, by
default MSBuild.exe is invoked with` -m -v:minimal` arguments."

5. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160#enable-cmakepresetsjson-integration-in-visual-studio-2019
"Enable CMakePresets.json integration in Visual Studio 2019

CMakePresets.json integration isn't enabled by default in Visual Studio
2019. You can enable it for all CMake projects in Tools > Options >
CMake > General: (tick a box)" ... see more.

6. https://docs.microsoft.com/en-us/cpp/build/cmakesettings-reference?view=msvc-140
(whichever v140 is..)
"CMake projects are supported in Visual Studio 2017 and later."

7. https://docs.microsoft.com/en-us/cpp/overview/what-s-new-for-cpp-2017?view=msvc-150
"Support added for the CMake Ninja generator."

8. https://docs.microsoft.com/en-us/cpp/overview/what-s-new-for-cpp-2017?view=msvc-150#cmake-support-via-open-folder
"CMake support via Open Folder
Visual Studio 2017 introduces support for using CMake projects without
converting to MSBuild project files (.vcxproj). For more information,
see CMake projects in Visual
Studio[https://docs.microsoft.com/en-us/cpp/build/cmake-projects-in-visual-studio?view=msvc-150].
Opening CMake projects with Open Folder automatically configures the
environment for C++ editing, building, and debugging." ... +more!

9. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160#supported-cmake-and-cmakepresetsjson-versions
"Visual Studio reads and evaluates CMakePresets.json and
CMakeUserPresets.json itself and doesn't invoke CMake directly with the
--preset option. So, CMake version 3.20 or later isn't strictly required
when you're building with CMakePresets.json inside Visual Studio. We
recommend using CMake version 3.14 or later."

10. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160#enable-cmakepresetsjson-integration-in-visual-studio-2019
"If you don't want to enable CMakePresets.json integration for all CMake
projects, you can enable CMakePresets.json integration for a single
CMake project by adding a CMakePresets.json file to the root of the open
folder. You must close and reopen the folder in Visual Studio to
activate the integration.

11. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160#default-configure-presets
***(doesn't actually say which version..)
"Default Configure Presets
If no CMakePresets.json or CMakeUserPresets.json file exists, or if
CMakePresets.json or CMakeUserPresets.json is invalid, Visual Studio
will fall back*** on the following default Configure Presets:

Windows example
JSON
{
  "name": "windows-default",
  "displayName": "Windows x64 Debug",
  "description": "Sets Ninja generator, compilers, x64 architecture,
build and install directory, debug build type",
  "generator": "Ninja",
  "binaryDir": "${sourceDir}/out/build/${presetName}",
  "architecture": {
    "value": "x64",
    "strategy": "external"
  },
  "cacheVariables": {
    "CMAKE_BUILD_TYPE": "Debug",
    "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
  },
  "vendor": {
    "microsoft.com/VisualStudioSettings/CMake/1.0": {
      "hostOS": [ "Windows" ]
    }
  }
},
"

Signed-off-by: Philip Oakley <philipoakley@iee.email>
---
 contrib/buildsystems/CMakeLists.txt | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 92eced9d27df1e..0e581982c12741 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -14,6 +14,11 @@ Note: Visual Studio also has the option of opening `CMakeLists.txt`
 directly; Using this option, Visual Studio will not find the source code,
 though, therefore the `File>Open>Folder...` option is preferred.
 
+Visual Studio does not produce a .sln solution file nor the .vcxproj files
+that may be required by VS extension tools.
+
+To generate the .sln/.vcxproj files run CMake manually, as described below.
+
 Instructions to run CMake manually:
 
     mkdir -p contrib/buildsystems/out
@@ -22,7 +27,7 @@ Instructions to run CMake manually:
 
 This will build the git binaries in contrib/buildsystems/out
 directory (our top-level .gitignore file knows to ignore contents of
-this directory).
+this directory). The project .sln and .vcxproj files are also generated.
 
 Possible build configurations(-DCMAKE_BUILD_TYPE) with corresponding
 compiler flags
@@ -35,17 +40,16 @@ empty(default) :
 NOTE: -DCMAKE_BUILD_TYPE is optional. For multi-config generators like Visual Studio
 this option is ignored
 
-This process generates a Makefile(Linux/*BSD/MacOS) , Visual Studio solution(Windows) by default.
+This process generates a Makefile(Linux/*BSD/MacOS), Visual Studio solution(Windows) by default.
 Run `make` to build Git on Linux/*BSD/MacOS.
 Open git.sln on Windows and build Git.
 
-NOTE: By default CMake uses Makefile as the build tool on Linux and Visual Studio in Windows,
-to use another tool say `ninja` add this to the command line when configuring.
-`-G Ninja`
-
 NOTE: By default CMake will install vcpkg locally to your source tree on configuration,
 to avoid this, add `-DNO_VCPKG=TRUE` to the command line when configuring.
 
+The Visual Studio default generator changed in v16.6 from its Visual Studio
+implemenation to `Ninja` This required changes to many CMake scripts.
+
 ]]
 cmake_minimum_required(VERSION 3.14)
 

From 641543b8f83e0034e8283786134758efe3acf437 Mon Sep 17 00:00:00 2001
From: Jeff Hostetler <jeffhost@microsoft.com>
Date: Mon, 5 Apr 2021 14:12:14 -0400
Subject: [PATCH 066/247] config.mak.uname: add git.rc to MSVC builds

Teach MSVC=1 builds to depend on the `git.rc` file so that
the resulting executables have Windows-style resources and
version number information within them.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
---
 config.mak.uname | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config.mak.uname b/config.mak.uname
index e161164a119a0e..354be98342fbd8 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -544,6 +544,7 @@ endif
 	# handle twice, or to access the osfhandle of an already-closed stdout
 	# See https://msdn.microsoft.com/en-us/library/ms235330.aspx
 	EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj kernel32.lib ntdll.lib
+	GITLIBS += git.res
 	PTHREAD_LIBS =
 	RC = compat/vcbuild/scripts/rc.pl
 	lib =

From 8f4471e9108b3502fa47ab0c3ec9a7c27623b168 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 6 May 2023 22:26:15 +0200
Subject: [PATCH 067/247] http: optionally load libcurl lazily

This compile-time option allows to ask Git to load libcurl dynamically
at runtime.

Together with a follow-up patch that optionally overrides the file name
depending on the `http.sslBackend` setting, this kicks open the door for
installing multiple libcurl flavors side by side, and load the one
corresponding to the (runtime-)configured SSL/TLS backend.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 Makefile               |  28 +++-
 compat/lazyload-curl.c | 364 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 385 insertions(+), 7 deletions(-)
 create mode 100644 compat/lazyload-curl.c

diff --git a/Makefile b/Makefile
index c649c93c510332..7cb9bc5c80537f 100644
--- a/Makefile
+++ b/Makefile
@@ -479,6 +479,11 @@ include shared.mak
 #
 #     CURL_LDFLAGS=-lcurl
 #
+# Define LAZYLOAD_LIBCURL to dynamically load the libcurl; This can be useful
+# if Multiple libcurl versions exist (with different file names) that link to
+# various SSL/TLS backends, to support the `http.sslBackend` runtime switch in
+# such a scenario.
+#
 # === Optional library: libpcre2 ===
 #
 # Define USE_LIBPCRE if you have and want to use libpcre. Various
@@ -1804,10 +1809,19 @@ else
 		CURL_LIBCURL =
         endif
 
-        ifndef CURL_LDFLAGS
-		CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
+        ifdef LAZYLOAD_LIBCURL
+		LAZYLOAD_LIBCURL_OBJ = compat/lazyload-curl.o
+		OBJECTS += $(LAZYLOAD_LIBCURL_OBJ)
+		# The `CURL_STATICLIB` constant must be defined to avoid seeing the functions
+		# declared as DLL imports
+		CURL_CFLAGS = -DCURL_STATICLIB
+		CURL_LIBCURL = -ldl
+        else
+                ifndef CURL_LDFLAGS
+			CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
+                endif
+		CURL_LIBCURL += $(CURL_LDFLAGS)
         endif
-	CURL_LIBCURL += $(CURL_LDFLAGS)
 
         ifndef CURL_CFLAGS
 		CURL_CFLAGS = $(eval CURL_CFLAGS := $$(shell $$(CURL_CONFIG) --cflags))$(CURL_CFLAGS)
@@ -1828,7 +1842,7 @@ else
         endif
         ifdef USE_CURL_FOR_IMAP_SEND
 		BASIC_CFLAGS += -DUSE_CURL_FOR_IMAP_SEND
-		IMAP_SEND_BUILDDEPS = http.o
+		IMAP_SEND_BUILDDEPS = http.o $(LAZYLOAD_LIBCURL_OBJ)
 		IMAP_SEND_LDFLAGS += $(CURL_LIBCURL)
         endif
         ifndef NO_EXPAT
@@ -3012,10 +3026,10 @@ git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) GIT-LDFLAGS $(GITLIBS)
 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
 		$(IMAP_SEND_LDFLAGS) $(LIBS)
 
-git-http-fetch$X: http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS)
+git-http-fetch$X: http.o http-walker.o http-fetch.o $(LAZYLOAD_LIBCURL_OBJ) GIT-LDFLAGS $(GITLIBS)
 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
 		$(CURL_LIBCURL) $(LIBS)
-git-http-push$X: http.o http-push.o GIT-LDFLAGS $(GITLIBS)
+git-http-push$X: http.o http-push.o $(LAZYLOAD_LIBCURL_OBJ) GIT-LDFLAGS $(GITLIBS)
 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
 		$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
 
@@ -3025,7 +3039,7 @@ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
 	ln -s $< $@ 2>/dev/null || \
 	cp $< $@
 
-$(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS)
+$(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o $(LAZYLOAD_LIBCURL_OBJ) GIT-LDFLAGS $(GITLIBS)
 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
 		$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
 
diff --git a/compat/lazyload-curl.c b/compat/lazyload-curl.c
new file mode 100644
index 00000000000000..f4e08f76dfcd7f
--- /dev/null
+++ b/compat/lazyload-curl.c
@@ -0,0 +1,364 @@
+#include "../git-compat-util.h"
+#include "../git-curl-compat.h"
+#include <dlfcn.h>
+
+/*
+ * The ABI version of libcurl is encoded in its shared libraries' file names.
+ * This ABI version has not changed since October 2006 and is unlikely to be
+ * changed in the future. See https://curl.se/libcurl/abi.html for details.
+ */
+#define LIBCURL_ABI_VERSION "4"
+
+typedef void (*func_t)(void);
+
+#ifdef __APPLE__
+#define LIBCURL_FILE_NAME(base) base "." LIBCURL_ABI_VERSION ".dylib"
+#else
+#define LIBCURL_FILE_NAME(base) base ".so." LIBCURL_ABI_VERSION
+#endif
+
+static void *load_library(const char *name)
+{
+	return dlopen(name, RTLD_LAZY);
+}
+
+static func_t load_function(void *handle, const char *name)
+{
+	/*
+	 * Casting the return value of `dlsym()` to a function pointer is
+	 * explicitly allowed in recent POSIX standards, but GCC complains
+	 * about this in pedantic mode nevertheless. For more about this issue,
+	 * see https://stackoverflow.com/q/31526876/1860823 and
+	 * http://stackoverflow.com/a/36385690/1905491.
+	 */
+	func_t f;
+	*(void **)&f = dlsym(handle, name);
+	return f;
+}
+
+typedef struct curl_version_info_data *(*curl_version_info_type)(CURLversion version);
+static curl_version_info_type curl_version_info_func;
+
+typedef char *(*curl_easy_escape_type)(CURL *handle, const char *string, int length);
+static curl_easy_escape_type curl_easy_escape_func;
+
+typedef void (*curl_free_type)(void *p);
+static curl_free_type curl_free_func;
+
+typedef CURLcode (*curl_global_init_type)(long flags);
+static curl_global_init_type curl_global_init_func;
+
+typedef CURLsslset (*curl_global_sslset_type)(curl_sslbackend id, const char *name, const curl_ssl_backend ***avail);
+static curl_global_sslset_type curl_global_sslset_func;
+
+typedef void (*curl_global_cleanup_type)(void);
+static curl_global_cleanup_type curl_global_cleanup_func;
+
+typedef CURLcode (*curl_global_trace_type)(const char *config);
+static curl_global_trace_type curl_global_trace_func;
+
+typedef struct curl_slist *(*curl_slist_append_type)(struct curl_slist *list, const char *data);
+static curl_slist_append_type curl_slist_append_func;
+
+typedef void (*curl_slist_free_all_type)(struct curl_slist *list);
+static curl_slist_free_all_type curl_slist_free_all_func;
+
+typedef const char *(*curl_easy_strerror_type)(CURLcode error);
+static curl_easy_strerror_type curl_easy_strerror_func;
+
+typedef CURLM *(*curl_multi_init_type)(void);
+static curl_multi_init_type curl_multi_init_func;
+
+typedef CURLMcode (*curl_multi_add_handle_type)(CURLM *multi_handle, CURL *curl_handle);
+static curl_multi_add_handle_type curl_multi_add_handle_func;
+
+typedef CURLMcode (*curl_multi_remove_handle_type)(CURLM *multi_handle, CURL *curl_handle);
+static curl_multi_remove_handle_type curl_multi_remove_handle_func;
+
+typedef CURLMcode (*curl_multi_fdset_type)(CURLM *multi_handle, fd_set *read_fd_set, fd_set *write_fd_set, fd_set *exc_fd_set, int *max_fd);
+static curl_multi_fdset_type curl_multi_fdset_func;
+
+typedef CURLMcode (*curl_multi_perform_type)(CURLM *multi_handle, int *running_handles);
+static curl_multi_perform_type curl_multi_perform_func;
+
+typedef CURLMcode (*curl_multi_cleanup_type)(CURLM *multi_handle);
+static curl_multi_cleanup_type curl_multi_cleanup_func;
+
+typedef CURLMsg *(*curl_multi_info_read_type)(CURLM *multi_handle, int *msgs_in_queue);
+static curl_multi_info_read_type curl_multi_info_read_func;
+
+typedef const char *(*curl_multi_strerror_type)(CURLMcode error);
+static curl_multi_strerror_type curl_multi_strerror_func;
+
+typedef CURLMcode (*curl_multi_timeout_type)(CURLM *multi_handle, long *milliseconds);
+static curl_multi_timeout_type curl_multi_timeout_func;
+
+typedef CURL *(*curl_easy_init_type)(void);
+static curl_easy_init_type curl_easy_init_func;
+
+typedef CURLcode (*curl_easy_perform_type)(CURL *curl);
+static curl_easy_perform_type curl_easy_perform_func;
+
+typedef void (*curl_easy_cleanup_type)(CURL *curl);
+static curl_easy_cleanup_type curl_easy_cleanup_func;
+
+typedef CURL *(*curl_easy_duphandle_type)(CURL *curl);
+static curl_easy_duphandle_type curl_easy_duphandle_func;
+
+typedef CURLcode (*curl_easy_getinfo_long_type)(CURL *curl, CURLINFO info, long *value);
+static curl_easy_getinfo_long_type curl_easy_getinfo_long_func;
+
+typedef CURLcode (*curl_easy_getinfo_pointer_type)(CURL *curl, CURLINFO info, void **value);
+static curl_easy_getinfo_pointer_type curl_easy_getinfo_pointer_func;
+
+typedef CURLcode (*curl_easy_getinfo_off_t_type)(CURL *curl, CURLINFO info, curl_off_t *value);
+static curl_easy_getinfo_off_t_type curl_easy_getinfo_off_t_func;
+
+typedef CURLcode (*curl_easy_setopt_long_type)(CURL *curl, CURLoption opt, long value);
+static curl_easy_setopt_long_type curl_easy_setopt_long_func;
+
+typedef CURLcode (*curl_easy_setopt_pointer_type)(CURL *curl, CURLoption opt, void *value);
+static curl_easy_setopt_pointer_type curl_easy_setopt_pointer_func;
+
+typedef CURLcode (*curl_easy_setopt_off_t_type)(CURL *curl, CURLoption opt, curl_off_t value);
+static curl_easy_setopt_off_t_type curl_easy_setopt_off_t_func;
+
+static void lazy_load_curl(void)
+{
+	static int initialized;
+	void *libcurl;
+	func_t curl_easy_getinfo_func, curl_easy_setopt_func;
+
+	if (initialized)
+		return;
+
+	initialized = 1;
+	libcurl = load_library(LIBCURL_FILE_NAME("libcurl"));
+	if (!libcurl)
+		die("failed to load library '%s'", LIBCURL_FILE_NAME("libcurl"));
+
+	curl_version_info_func = (curl_version_info_type)load_function(libcurl, "curl_version_info");
+	curl_easy_escape_func = (curl_easy_escape_type)load_function(libcurl, "curl_easy_escape");
+	curl_free_func = (curl_free_type)load_function(libcurl, "curl_free");
+	curl_global_init_func = (curl_global_init_type)load_function(libcurl, "curl_global_init");
+	curl_global_sslset_func = (curl_global_sslset_type)load_function(libcurl, "curl_global_sslset");
+	curl_global_cleanup_func = (curl_global_cleanup_type)load_function(libcurl, "curl_global_cleanup");
+	curl_global_trace_func = (curl_global_trace_type)load_function(libcurl, "curl_global_trace");
+	curl_slist_append_func = (curl_slist_append_type)load_function(libcurl, "curl_slist_append");
+	curl_slist_free_all_func = (curl_slist_free_all_type)load_function(libcurl, "curl_slist_free_all");
+	curl_easy_strerror_func = (curl_easy_strerror_type)load_function(libcurl, "curl_easy_strerror");
+	curl_multi_init_func = (curl_multi_init_type)load_function(libcurl, "curl_multi_init");
+	curl_multi_add_handle_func = (curl_multi_add_handle_type)load_function(libcurl, "curl_multi_add_handle");
+	curl_multi_remove_handle_func = (curl_multi_remove_handle_type)load_function(libcurl, "curl_multi_remove_handle");
+	curl_multi_fdset_func = (curl_multi_fdset_type)load_function(libcurl, "curl_multi_fdset");
+	curl_multi_perform_func = (curl_multi_perform_type)load_function(libcurl, "curl_multi_perform");
+	curl_multi_cleanup_func = (curl_multi_cleanup_type)load_function(libcurl, "curl_multi_cleanup");
+	curl_multi_info_read_func = (curl_multi_info_read_type)load_function(libcurl, "curl_multi_info_read");
+	curl_multi_strerror_func = (curl_multi_strerror_type)load_function(libcurl, "curl_multi_strerror");
+	curl_multi_timeout_func = (curl_multi_timeout_type)load_function(libcurl, "curl_multi_timeout");
+	curl_easy_init_func = (curl_easy_init_type)load_function(libcurl, "curl_easy_init");
+	curl_easy_perform_func = (curl_easy_perform_type)load_function(libcurl, "curl_easy_perform");
+	curl_easy_cleanup_func = (curl_easy_cleanup_type)load_function(libcurl, "curl_easy_cleanup");
+	curl_easy_duphandle_func = (curl_easy_duphandle_type)load_function(libcurl, "curl_easy_duphandle");
+
+	curl_easy_getinfo_func = load_function(libcurl, "curl_easy_getinfo");
+	curl_easy_getinfo_long_func = (curl_easy_getinfo_long_type)curl_easy_getinfo_func;
+	curl_easy_getinfo_pointer_func = (curl_easy_getinfo_pointer_type)curl_easy_getinfo_func;
+	curl_easy_getinfo_off_t_func = (curl_easy_getinfo_off_t_type)curl_easy_getinfo_func;
+
+	curl_easy_setopt_func = load_function(libcurl, "curl_easy_setopt");
+	curl_easy_setopt_long_func = (curl_easy_setopt_long_type)curl_easy_setopt_func;
+	curl_easy_setopt_pointer_func = (curl_easy_setopt_pointer_type)curl_easy_setopt_func;
+	curl_easy_setopt_off_t_func = (curl_easy_setopt_off_t_type)curl_easy_setopt_func;
+}
+
+struct curl_version_info_data *curl_version_info(CURLversion version)
+{
+	lazy_load_curl();
+	return curl_version_info_func(version);
+}
+
+char *curl_easy_escape(CURL *handle, const char *string, int length)
+{
+	lazy_load_curl();
+	return curl_easy_escape_func(handle, string, length);
+}
+
+void curl_free(void *p)
+{
+	lazy_load_curl();
+	curl_free_func(p);
+}
+
+CURLcode curl_global_init(long flags)
+{
+	lazy_load_curl();
+	return curl_global_init_func(flags);
+}
+
+CURLsslset curl_global_sslset(curl_sslbackend id, const char *name, const curl_ssl_backend ***avail)
+{
+	lazy_load_curl();
+	return curl_global_sslset_func(id, name, avail);
+}
+
+void curl_global_cleanup(void)
+{
+	lazy_load_curl();
+	curl_global_cleanup_func();
+}
+
+CURLcode curl_global_trace(const char *config)
+{
+	lazy_load_curl();
+	return curl_global_trace_func(config);
+}
+
+struct curl_slist *curl_slist_append(struct curl_slist *list, const char *data)
+{
+	lazy_load_curl();
+	return curl_slist_append_func(list, data);
+}
+
+void curl_slist_free_all(struct curl_slist *list)
+{
+	lazy_load_curl();
+	curl_slist_free_all_func(list);
+}
+
+const char *curl_easy_strerror(CURLcode error)
+{
+	lazy_load_curl();
+	return curl_easy_strerror_func(error);
+}
+
+CURLM *curl_multi_init(void)
+{
+	lazy_load_curl();
+	return curl_multi_init_func();
+}
+
+CURLMcode curl_multi_add_handle(CURLM *multi_handle, CURL *curl_handle)
+{
+	lazy_load_curl();
+	return curl_multi_add_handle_func(multi_handle, curl_handle);
+}
+
+CURLMcode curl_multi_remove_handle(CURLM *multi_handle, CURL *curl_handle)
+{
+	lazy_load_curl();
+	return curl_multi_remove_handle_func(multi_handle, curl_handle);
+}
+
+CURLMcode curl_multi_fdset(CURLM *multi_handle, fd_set *read_fd_set, fd_set *write_fd_set, fd_set *exc_fd_set, int *max_fd)
+{
+	lazy_load_curl();
+	return curl_multi_fdset_func(multi_handle, read_fd_set, write_fd_set, exc_fd_set, max_fd);
+}
+
+CURLMcode curl_multi_perform(CURLM *multi_handle, int *running_handles)
+{
+	lazy_load_curl();
+	return curl_multi_perform_func(multi_handle, running_handles);
+}
+
+CURLMcode curl_multi_cleanup(CURLM *multi_handle)
+{
+	lazy_load_curl();
+	return curl_multi_cleanup_func(multi_handle);
+}
+
+CURLMsg *curl_multi_info_read(CURLM *multi_handle, int *msgs_in_queue)
+{
+	lazy_load_curl();
+	return curl_multi_info_read_func(multi_handle, msgs_in_queue);
+}
+
+const char *curl_multi_strerror(CURLMcode error)
+{
+	lazy_load_curl();
+	return curl_multi_strerror_func(error);
+}
+
+CURLMcode curl_multi_timeout(CURLM *multi_handle, long *milliseconds)
+{
+	lazy_load_curl();
+	return curl_multi_timeout_func(multi_handle, milliseconds);
+}
+
+CURL *curl_easy_init(void)
+{
+	lazy_load_curl();
+	return curl_easy_init_func();
+}
+
+CURLcode curl_easy_perform(CURL *curl)
+{
+	lazy_load_curl();
+	return curl_easy_perform_func(curl);
+}
+
+void curl_easy_cleanup(CURL *curl)
+{
+	lazy_load_curl();
+	curl_easy_cleanup_func(curl);
+}
+
+CURL *curl_easy_duphandle(CURL *curl)
+{
+	lazy_load_curl();
+	return curl_easy_duphandle_func(curl);
+}
+
+#ifndef CURL_IGNORE_DEPRECATION
+#define CURL_IGNORE_DEPRECATION(x) x
+#endif
+
+#ifndef CURLOPTTYPE_BLOB
+#define CURLOPTTYPE_BLOB 40000
+#endif
+
+#undef curl_easy_getinfo
+CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ...)
+{
+	va_list ap;
+	CURLcode res;
+
+	va_start(ap, info);
+	lazy_load_curl();
+	CURL_IGNORE_DEPRECATION(
+		if (info >= CURLINFO_LONG && info < CURLINFO_DOUBLE)
+			res = curl_easy_getinfo_long_func(curl, info, va_arg(ap, long *));
+		else if ((info >= CURLINFO_STRING && info < CURLINFO_LONG) ||
+			 (info >= CURLINFO_SLIST && info < CURLINFO_SOCKET))
+			res = curl_easy_getinfo_pointer_func(curl, info, va_arg(ap, void **));
+		else if (info >= CURLINFO_OFF_T)
+			res = curl_easy_getinfo_off_t_func(curl, info, va_arg(ap, curl_off_t *));
+		else
+			die("%s:%d: TODO (info: %d)!", __FILE__, __LINE__, info);
+	)
+	va_end(ap);
+	return res;
+}
+
+#undef curl_easy_setopt
+CURLcode curl_easy_setopt(CURL *curl, CURLoption opt, ...)
+{
+	va_list ap;
+	CURLcode res;
+
+	va_start(ap, opt);
+	lazy_load_curl();
+	CURL_IGNORE_DEPRECATION(
+		if (opt >= CURLOPTTYPE_LONG && opt < CURLOPTTYPE_OBJECTPOINT)
+			res = curl_easy_setopt_long_func(curl, opt, va_arg(ap, long));
+		else if (opt >= CURLOPTTYPE_OBJECTPOINT && opt < CURLOPTTYPE_OFF_T)
+			res = curl_easy_setopt_pointer_func(curl, opt, va_arg(ap, void *));
+		else if (opt >= CURLOPTTYPE_OFF_T && opt < CURLOPTTYPE_BLOB)
+			res = curl_easy_setopt_off_t_func(curl, opt, va_arg(ap, curl_off_t));
+		else
+			die("%s:%d: TODO (opt: %d)!", __FILE__, __LINE__, opt);
+	)
+	va_end(ap);
+	return res;
+}

From 2578677228945a6de7573fde728912995db8d05c Mon Sep 17 00:00:00 2001
From: Derrick Stolee <stolee@gmail.com>
Date: Sun, 1 Sep 2024 22:35:06 -0400
Subject: [PATCH 068/247] survey: add ability to track prioritized lists

In future changes, we will make use of these methods. The intention is to
keep track of the top contributors according to some metric. We don't want
to store all of the entries and do a sort at the end, so track a
constant-size table and remove rows that get pushed out depending on the
chosen sorting algorithm.

Co-authored-by: Jeff Hostetler <git@jeffhostetler.com>
Signed-off-by; Jeff Hostetler <git@jeffhostetler.com>
Signed-off-by: Derrick Stolee <stolee@gmail.com>
---
 builtin/survey.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)

diff --git a/builtin/survey.c b/builtin/survey.c
index dd026e1bcdf414..c513b653f9604a 100644
--- a/builtin/survey.c
+++ b/builtin/survey.c
@@ -73,6 +73,119 @@ struct survey_report_object_size_summary {
 	size_t num_missing;
 };
 
+typedef int (*survey_top_cmp)(void *v1, void *v2);
+
+MAYBE_UNUSED
+static int cmp_by_nr(void *v1, void *v2)
+{
+	struct survey_report_object_size_summary *s1 = v1;
+	struct survey_report_object_size_summary *s2 = v2;
+
+	if (s1->nr < s2->nr)
+		return -1;
+	if (s1->nr > s2->nr)
+		return 1;
+	return 0;
+}
+
+MAYBE_UNUSED
+static int cmp_by_disk_size(void *v1, void *v2)
+{
+	struct survey_report_object_size_summary *s1 = v1;
+	struct survey_report_object_size_summary *s2 = v2;
+
+	if (s1->disk_size < s2->disk_size)
+		return -1;
+	if (s1->disk_size > s2->disk_size)
+		return 1;
+	return 0;
+}
+
+MAYBE_UNUSED
+static int cmp_by_inflated_size(void *v1, void *v2)
+{
+	struct survey_report_object_size_summary *s1 = v1;
+	struct survey_report_object_size_summary *s2 = v2;
+
+	if (s1->inflated_size < s2->inflated_size)
+		return -1;
+	if (s1->inflated_size > s2->inflated_size)
+		return 1;
+	return 0;
+}
+
+/**
+ * Store a list of "top" categories by some sorting function. When
+ * inserting a new category, reorder the list and free the one that
+ * got ejected (if any).
+ */
+struct survey_report_top_table {
+	const char *name;
+	survey_top_cmp cmp_fn;
+	size_t nr;
+	size_t alloc;
+
+	/**
+	 * 'data' stores an array of structs and must be cast into
+	 * the proper array type before evaluating an index.
+	 */
+	void *data;
+};
+
+MAYBE_UNUSED
+static void init_top_sizes(struct survey_report_top_table *top,
+			   size_t limit, const char *name,
+			   survey_top_cmp cmp)
+{
+	struct survey_report_object_size_summary *sz_array;
+
+	top->name = name;
+	top->cmp_fn = cmp;
+	top->alloc = limit;
+	top->nr = 0;
+
+	CALLOC_ARRAY(sz_array, limit);
+	top->data = sz_array;
+}
+
+MAYBE_UNUSED
+static void clear_top_sizes(struct survey_report_top_table *top)
+{
+	struct survey_report_object_size_summary *sz_array = top->data;
+
+	for (size_t i = 0; i < top->nr; i++)
+		free(sz_array[i].label);
+	free(sz_array);
+}
+
+MAYBE_UNUSED
+static void maybe_insert_into_top_size(struct survey_report_top_table *top,
+				       struct survey_report_object_size_summary *summary)
+{
+	struct survey_report_object_size_summary *sz_array = top->data;
+	size_t pos = top->nr;
+
+	/* Compare against list from the bottom. */
+	while (pos > 0 && top->cmp_fn(&sz_array[pos - 1], summary) < 0)
+		pos--;
+
+	/* Not big enough! */
+	if (pos >= top->alloc)
+		return;
+
+	/* We need to shift the data. */
+	if (top->nr == top->alloc)
+		free(sz_array[top->nr - 1].label);
+	else
+		top->nr++;
+
+	for (size_t i = top->nr - 1; i > pos; i--)
+		memcpy(&sz_array[i], &sz_array[i - 1], sizeof(*sz_array));
+
+	memcpy(&sz_array[pos], summary, sizeof(*summary));
+	sz_array[pos].label = xstrdup(summary->label);
+}
+
 /**
  * This struct contains all of the information that needs to be printed
  * at the end of the exploration of the repository and its references.

From 3a857133857a6bdcceeb87f9556922f519e333f3 Mon Sep 17 00:00:00 2001
From: Philip Oakley <philipoakley@iee.email>
Date: Sat, 24 Apr 2021 11:09:58 +0100
Subject: [PATCH 069/247] .gitignore: add Visual Studio CMakeSetting.json file

The CMakeSettings.json file is tool generated. Developers may track it
should they provide additional settings.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 4da58c6754899e..7ef7ff7ab1c74b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -259,5 +259,6 @@ Release/
 /git.VC.db
 *.dSYM
 /contrib/buildsystems/out
+CMakeSettings.json
 /contrib/libgit-rs/target
 /contrib/libgit-sys/target

From 46c831b57299241c192d1f499c1e57aeb8729273 Mon Sep 17 00:00:00 2001
From: Jeff Hostetler <jeffhost@microsoft.com>
Date: Mon, 5 Apr 2021 14:24:52 -0400
Subject: [PATCH 070/247] clink.pl: ignore no-stack-protector arg on MSVC=1
 builds

Ignore the `-fno-stack-protector` compiler argument when building
with MSVC.  This will be used in a later commit that needs to build
a Win32 GUI app.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
---
 compat/vcbuild/scripts/clink.pl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl
index 2768ae15f1879f..73c8a2b184f38b 100755
--- a/compat/vcbuild/scripts/clink.pl
+++ b/compat/vcbuild/scripts/clink.pl
@@ -122,6 +122,8 @@
 		push(@cflags, "-wd4996");
 	} elsif ("$arg" =~ /^-W[a-z]/) {
 		# let's ignore those
+	} elsif ("$arg" eq "-fno-stack-protector") {
+		# eat this
 	} else {
 		push(@args, $arg);
 	}

From d22b961f2d2ffa66311b49c89ec897ffb824c274 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 7 May 2023 22:51:52 +0200
Subject: [PATCH 071/247] http: support lazy-loading libcurl also on Windows

This implements the Windows-specific support code, because everything is
slightly different on Windows, even loading shared libraries.

Note: I specifically do _not_ use the code from
`compat/win32/lazyload.h` here because that code is optimized for
loading individual functions from various system DLLs, while we
specifically want to load _many_ functions from _one_ DLL here, and
distinctly not a system DLL (we expect libcurl to be located outside
`C:\Windows\system32`, something `INIT_PROC_ADDR` refuses to work with).
Also, the `curl_easy_getinfo()`/`curl_easy_setopt()` functions are
declared as vararg functions, which `lazyload.h` cannot handle. Finally,
we are about to optionally override the exact file name that is to be
loaded, which is a goal contrary to `lazyload.h`'s design.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 Makefile               |  4 ++++
 compat/lazyload-curl.c | 52 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/Makefile b/Makefile
index 7cb9bc5c80537f..64b1656bad50f0 100644
--- a/Makefile
+++ b/Makefile
@@ -1815,7 +1815,11 @@ else
 		# The `CURL_STATICLIB` constant must be defined to avoid seeing the functions
 		# declared as DLL imports
 		CURL_CFLAGS = -DCURL_STATICLIB
+ifneq ($(uname_S),MINGW)
+ifneq ($(uname_S),Windows)
 		CURL_LIBCURL = -ldl
+endif
+endif
         else
                 ifndef CURL_LDFLAGS
 			CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
diff --git a/compat/lazyload-curl.c b/compat/lazyload-curl.c
index f4e08f76dfcd7f..82ab11de43a0fb 100644
--- a/compat/lazyload-curl.c
+++ b/compat/lazyload-curl.c
@@ -1,6 +1,8 @@
 #include "../git-compat-util.h"
 #include "../git-curl-compat.h"
+#ifndef WIN32
 #include <dlfcn.h>
+#endif
 
 /*
  * The ABI version of libcurl is encoded in its shared libraries' file names.
@@ -11,6 +13,7 @@
 
 typedef void (*func_t)(void);
 
+#ifndef WIN32
 #ifdef __APPLE__
 #define LIBCURL_FILE_NAME(base) base "." LIBCURL_ABI_VERSION ".dylib"
 #else
@@ -35,6 +38,55 @@ static func_t load_function(void *handle, const char *name)
 	*(void **)&f = dlsym(handle, name);
 	return f;
 }
+#else
+#define LIBCURL_FILE_NAME(base) base "-" LIBCURL_ABI_VERSION ".dll"
+
+static void *load_library(const char *name)
+{
+	size_t name_size = strlen(name) + 1;
+	const char *path = getenv("PATH");
+	char dll_path[MAX_PATH];
+
+	while (path && *path) {
+		const char *sep = strchrnul(path, ';');
+		size_t len = sep - path;
+
+		if (len && len + name_size < sizeof(dll_path)) {
+			memcpy(dll_path, path, len);
+			dll_path[len] = '/';
+			memcpy(dll_path + len + 1, name, name_size);
+
+			if (!access(dll_path, R_OK)) {
+				wchar_t wpath[MAX_PATH];
+				int wlen = MultiByteToWideChar(CP_UTF8, 0, dll_path, -1, wpath, ARRAY_SIZE(wpath));
+				void *res = wlen ? (void *)LoadLibraryExW(wpath, NULL, 0) : NULL;
+				if (!res) {
+					DWORD err = GetLastError();
+					char buf[1024];
+
+					if (!FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM |
+							    FORMAT_MESSAGE_ARGUMENT_ARRAY |
+							    FORMAT_MESSAGE_IGNORE_INSERTS,
+							    NULL, err, LANG_NEUTRAL,
+							    buf, sizeof(buf) - 1, NULL))
+						xsnprintf(buf, sizeof(buf), "last error: %ld", err);
+					error("LoadLibraryExW() failed with: %s", buf);
+				}
+				return res;
+			}
+		}
+
+		path = *sep ? sep + 1 : NULL;
+	}
+
+	return NULL;
+}
+
+static func_t load_function(void *handle, const char *name)
+{
+	return (func_t)GetProcAddress((HANDLE)handle, name);
+}
+#endif
 
 typedef struct curl_version_info_data *(*curl_version_info_type)(CURLversion version);
 static curl_version_info_type curl_version_info_func;

From 754603f030e45ba88178740986a2901871eee7c8 Mon Sep 17 00:00:00 2001
From: Derrick Stolee <stolee@gmail.com>
Date: Sun, 1 Sep 2024 22:35:40 -0400
Subject: [PATCH 072/247] survey: add report of "largest" paths
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since we are already walking our reachable objects using the path-walk API,
let's now collect lists of the paths that contribute most to different
metrics. Specifically, we care about

 * Number of versions.
 * Total size on disk.
 * Total inflated size (no delta or zlib compression).

This information can be critical to discovering which parts of the
repository are causing the most growth, especially on-disk size. Different
packing strategies might help compress data more efficiently, but the toal
inflated size is a representation of the raw size of all snapshots of those
paths. Even when stored efficiently on disk, that size represents how much
information must be processed to complete a command such as 'git blame'.

The exact disk size seems to be not quite robust enough for testing, as
could be seen by the `linux-musl-meson` job consistently failing, possibly
because of zlib-ng deflates differently: t8100.4(git survey
(default)) was failing with a symptom like this:

   TOTAL OBJECT SIZES BY TYPE
   ===============================================
   Object Type | Count | Disk Size | Inflated Size
   ------------+-------+-----------+--------------
  -    Commits |    10 |      1523 |          2153
  +    Commits |    10 |      1528 |          2153
         Trees |    10 |       495 |          1706
         Blobs |    10 |       191 |           101
  -       Tags |     4 |       510 |           528
  +       Tags |     4 |       547 |           528

This means: the disk size is unlikely something we can verify robustly.
Since zlib-ng seems to increase the disk size of the tags from 528 to
547, we cannot even assume that the disk size is always smaller than the
inflated size. We will most likely want to either skip verifying the
disk size altogether, or go for some kind of fuzzy matching, say, by
replacing `s/ 1[45][0-9][0-9] / ~1.5k /` and `s/ [45][0-9][0-9] / ~½k /`
or something like that.

Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/survey.c      | 79 ++++++++++++++++++++++++++++++++++++++-----
 t/t8100-git-survey.sh | 12 ++++++-
 2 files changed, 82 insertions(+), 9 deletions(-)

diff --git a/builtin/survey.c b/builtin/survey.c
index c513b653f9604a..a0a3966295340f 100644
--- a/builtin/survey.c
+++ b/builtin/survey.c
@@ -75,7 +75,6 @@ struct survey_report_object_size_summary {
 
 typedef int (*survey_top_cmp)(void *v1, void *v2);
 
-MAYBE_UNUSED
 static int cmp_by_nr(void *v1, void *v2)
 {
 	struct survey_report_object_size_summary *s1 = v1;
@@ -88,7 +87,6 @@ static int cmp_by_nr(void *v1, void *v2)
 	return 0;
 }
 
-MAYBE_UNUSED
 static int cmp_by_disk_size(void *v1, void *v2)
 {
 	struct survey_report_object_size_summary *s1 = v1;
@@ -101,7 +99,6 @@ static int cmp_by_disk_size(void *v1, void *v2)
 	return 0;
 }
 
-MAYBE_UNUSED
 static int cmp_by_inflated_size(void *v1, void *v2)
 {
 	struct survey_report_object_size_summary *s1 = v1;
@@ -132,7 +129,6 @@ struct survey_report_top_table {
 	void *data;
 };
 
-MAYBE_UNUSED
 static void init_top_sizes(struct survey_report_top_table *top,
 			   size_t limit, const char *name,
 			   survey_top_cmp cmp)
@@ -158,7 +154,6 @@ static void clear_top_sizes(struct survey_report_top_table *top)
 	free(sz_array);
 }
 
-MAYBE_UNUSED
 static void maybe_insert_into_top_size(struct survey_report_top_table *top,
 				       struct survey_report_object_size_summary *summary)
 {
@@ -195,6 +190,10 @@ struct survey_report {
 	struct survey_report_object_summary reachable_objects;
 
 	struct survey_report_object_size_summary *by_type;
+
+	struct survey_report_top_table *top_paths_by_count;
+	struct survey_report_top_table *top_paths_by_disk;
+	struct survey_report_top_table *top_paths_by_inflate;
 };
 
 #define REPORT_TYPE_COMMIT 0
@@ -446,6 +445,13 @@ static void survey_report_object_sizes(const char *title,
 	clear_table(&table);
 }
 
+static void survey_report_plaintext_sorted_size(
+		struct survey_report_top_table *top)
+{
+	survey_report_object_sizes(top->name,  _("Path"),
+				   top->data, top->nr);
+}
+
 static void survey_report_plaintext(struct survey_context *ctx)
 {
 	printf("GIT SURVEY for \"%s\"\n", ctx->repo->worktree);
@@ -456,6 +462,21 @@ static void survey_report_plaintext(struct survey_context *ctx)
 				   _("Object Type"),
 				   ctx->report.by_type,
 				   REPORT_TYPE_COUNT);
+
+	survey_report_plaintext_sorted_size(
+		&ctx->report.top_paths_by_count[REPORT_TYPE_TREE]);
+	survey_report_plaintext_sorted_size(
+		&ctx->report.top_paths_by_count[REPORT_TYPE_BLOB]);
+
+	survey_report_plaintext_sorted_size(
+		&ctx->report.top_paths_by_disk[REPORT_TYPE_TREE]);
+	survey_report_plaintext_sorted_size(
+		&ctx->report.top_paths_by_disk[REPORT_TYPE_BLOB]);
+
+	survey_report_plaintext_sorted_size(
+		&ctx->report.top_paths_by_inflate[REPORT_TYPE_TREE]);
+	survey_report_plaintext_sorted_size(
+		&ctx->report.top_paths_by_inflate[REPORT_TYPE_BLOB]);
 }
 
 /*
@@ -698,7 +719,8 @@ static void increment_totals(struct survey_context *ctx,
 
 static void increment_object_totals(struct survey_context *ctx,
 				    struct oid_array *oids,
-				    enum object_type type)
+				    enum object_type type,
+				    const char *path)
 {
 	struct survey_report_object_size_summary *total;
 	struct survey_report_object_size_summary summary = { 0 };
@@ -730,9 +752,30 @@ static void increment_object_totals(struct survey_context *ctx,
 	total->disk_size += summary.disk_size;
 	total->inflated_size += summary.inflated_size;
 	total->num_missing += summary.num_missing;
+
+	if (type == OBJ_TREE || type == OBJ_BLOB) {
+		int index = type == OBJ_TREE ?
+			    REPORT_TYPE_TREE : REPORT_TYPE_BLOB;
+		struct survey_report_top_table *top;
+
+		/*
+		 * Temporarily store (const char *) here, but it will
+		 * be duped if inserted and will not be freed.
+		 */
+		summary.label = (char *)path;
+
+		top = ctx->report.top_paths_by_count;
+		maybe_insert_into_top_size(&top[index], &summary);
+
+		top = ctx->report.top_paths_by_disk;
+		maybe_insert_into_top_size(&top[index], &summary);
+
+		top = ctx->report.top_paths_by_inflate;
+		maybe_insert_into_top_size(&top[index], &summary);
+	}
 }
 
-static int survey_objects_path_walk_fn(const char *path UNUSED,
+static int survey_objects_path_walk_fn(const char *path,
 				       struct oid_array *oids,
 				       enum object_type type,
 				       void *data)
@@ -741,7 +784,7 @@ static int survey_objects_path_walk_fn(const char *path UNUSED,
 
 	increment_object_counts(&ctx->report.reachable_objects,
 				type, oids->nr);
-	increment_object_totals(ctx, oids, type);
+	increment_object_totals(ctx, oids, type, path);
 
 	ctx->progress_nr += oids->nr;
 	display_progress(ctx->progress, ctx->progress_nr);
@@ -751,11 +794,31 @@ static int survey_objects_path_walk_fn(const char *path UNUSED,
 
 static void initialize_report(struct survey_context *ctx)
 {
+	const int top_limit = 100;
+
 	CALLOC_ARRAY(ctx->report.by_type, REPORT_TYPE_COUNT);
 	ctx->report.by_type[REPORT_TYPE_COMMIT].label = xstrdup(_("Commits"));
 	ctx->report.by_type[REPORT_TYPE_TREE].label = xstrdup(_("Trees"));
 	ctx->report.by_type[REPORT_TYPE_BLOB].label = xstrdup(_("Blobs"));
 	ctx->report.by_type[REPORT_TYPE_TAG].label = xstrdup(_("Tags"));
+
+	CALLOC_ARRAY(ctx->report.top_paths_by_count, REPORT_TYPE_COUNT);
+	init_top_sizes(&ctx->report.top_paths_by_count[REPORT_TYPE_TREE],
+		       top_limit, _("TOP DIRECTORIES BY COUNT"), cmp_by_nr);
+	init_top_sizes(&ctx->report.top_paths_by_count[REPORT_TYPE_BLOB],
+		       top_limit, _("TOP FILES BY COUNT"), cmp_by_nr);
+
+	CALLOC_ARRAY(ctx->report.top_paths_by_disk, REPORT_TYPE_COUNT);
+	init_top_sizes(&ctx->report.top_paths_by_disk[REPORT_TYPE_TREE],
+		       top_limit, _("TOP DIRECTORIES BY DISK SIZE"), cmp_by_disk_size);
+	init_top_sizes(&ctx->report.top_paths_by_disk[REPORT_TYPE_BLOB],
+		       top_limit, _("TOP FILES BY DISK SIZE"), cmp_by_disk_size);
+
+	CALLOC_ARRAY(ctx->report.top_paths_by_inflate, REPORT_TYPE_COUNT);
+	init_top_sizes(&ctx->report.top_paths_by_inflate[REPORT_TYPE_TREE],
+		       top_limit, _("TOP DIRECTORIES BY INFLATED SIZE"), cmp_by_inflated_size);
+	init_top_sizes(&ctx->report.top_paths_by_inflate[REPORT_TYPE_BLOB],
+		       top_limit, _("TOP FILES BY INFLATED SIZE"), cmp_by_inflated_size);
 }
 
 static void survey_phase_objects(struct survey_context *ctx)
diff --git a/t/t8100-git-survey.sh b/t/t8100-git-survey.sh
index b63ba3a1c8e310..703860d22ff4c3 100755
--- a/t/t8100-git-survey.sh
+++ b/t/t8100-git-survey.sh
@@ -92,7 +92,17 @@ test_expect_success 'git survey (default)' '
 	EOF
 
 	approximate_sizes out >out-edited &&
-	test_cmp expect out-edited
+	lines=$(wc -l <expect) &&
+	head -n "$lines" <out-edited >out-trimmed &&
+	test_cmp expect out-trimmed &&
+
+	for type in "DIRECTORIES" "FILES"
+	do
+		for metric in "COUNT" "DISK SIZE" "INFLATED SIZE"
+		do
+			grep "TOP $type BY $metric" out || return 1
+		done || return 1
+	done
 '
 
 test_done

From 593aae70721a7f2173ed50c2ea72dc5d0028d817 Mon Sep 17 00:00:00 2001
From: Victoria Dye <vdye@github.com>
Date: Thu, 5 Aug 2021 19:04:13 -0400
Subject: [PATCH 073/247] subtree: update `contrib/subtree` `test` target

The intention of this change is to align with how the top-level git
`Makefile` defines its own test target (which also internally calls
`$(MAKE) -C t/ all`). This change also ensures the consistency of
`make -C contrib/subtree test` with other testing in CI executions
(which rely on `$DEFAULT_TEST_TARGET` being defined as `prove`).

Signed-off-by: Victoria Dye <vdye@github.com>
---
 contrib/subtree/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index c0c9f21cb78022..dab2dfc08ee222 100644
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -95,7 +95,7 @@ $(GIT_SUBTREE_TEST): $(GIT_SUBTREE)
 	cp $< $@
 
 test: $(GIT_SUBTREE_TEST)
-	$(MAKE) -C t/ test
+	$(MAKE) -C t/ all
 
 clean:
 	$(RM) $(GIT_SUBTREE)

From 2bd5d623d956aa59742768268b992f25daedcfa3 Mon Sep 17 00:00:00 2001
From: Philip Oakley <philipoakley@iee.email>
Date: Thu, 22 Apr 2021 11:11:38 +0100
Subject: [PATCH 074/247] CMakeLists: add default "x64-windows" arch for Visual
 Studio

In Git-for-Windows, work on using ARM64 has progressed. The
commit 2d94b77b27 (cmake: allow building for Windows/ARM64, 2020-12-04)
failed to notice that /compat/vcbuild/vcpkg_install.bat will default to
using the "x64-windows" architecture for the vcpkg installation if not set,
but CMake is not told of this default. Commit 635b6d99b3 (vcbuild: install
ARM64 dependencies when building ARM64 binaries, 2020-01-31) later updated
vcpkg_install.bat to accept an arch (%1) parameter, but retained the default.

This default is neccessary for the use case where the project directory is
opened directly in Visual Studio, which will find and build a CMakeLists.txt
file without any parameters, thus expecting use of the default setting.

Also Visual studio will generate internal .sln solution and .vcxproj project
files needed for some extension tools. Inform users of the additional
.sln/.vcxproj generation.

** How to test:
 rm -rf '.vs' # remove old visual studio settings
 rm -rf 'compat/vcbuild/vcpkg' # remove any vcpkg downloads
 rm -rf 'contrib/buildsystems/out' # remove builds & CMake artifacts
 with a fresh Visual Studio Community Edition, File>>Open>>(git *folder*)
   to load the project (which will take some time!).
 check for successful compilation.
The implicit .sln (etc.) are in the hidden .vs directory created by
Visual Studio.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
---
 contrib/buildsystems/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 0e581982c12741..3c21a12ea606e2 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -71,6 +71,10 @@ if(USE_VCPKG)
 		message("Initializing vcpkg and building the Git's dependencies (this will take a while...)")
 		execute_process(COMMAND ${CMAKE_SOURCE_DIR}/compat/vcbuild/vcpkg_install.bat ${VCPKG_ARCH})
 	endif()
+	if(NOT EXISTS ${VCPKG_ARCH})
+		message("VCPKG_ARCH: unset, using 'x64-windows'")
+		set(VCPKG_ARCH "x64-windows") # default from vcpkg_install.bat
+	endif()
 	list(APPEND CMAKE_PREFIX_PATH "${VCPKG_DIR}/installed/${VCPKG_ARCH}")
 
 	# In the vcpkg edition, we need this to be able to link to libcurl

From 92803c6bcfdf367b19d2a4a4f62f389bfa1fa65a Mon Sep 17 00:00:00 2001
From: Derrick Stolee <derrickstolee@github.com>
Date: Wed, 13 Apr 2022 14:49:17 -0400
Subject: [PATCH 075/247] setup: properly use "%(prefix)/" when in WSL

Signed-off-by: Derrick Stolee <derrickstolee@github.com>
---
 setup.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/setup.c b/setup.c
index 0d157ac2548f00..5657aa3eda45c8 100644
--- a/setup.c
+++ b/setup.c
@@ -1980,10 +1980,19 @@ static void repo_discover(struct repo_discovery *discovery, int *nongit_ok)
 		break;
 	case GIT_DIR_INVALID_OWNERSHIP:
 		if (!nongit_ok) {
+			struct strbuf prequoted = STRBUF_INIT;
 			struct strbuf quoted = STRBUF_INIT;
 
 			strbuf_complete(&report, '\n');
-			sq_quote_buf_pretty(&quoted, dir.buf);
+
+#ifdef __MINGW32__
+			if (dir.buf[0] == '/')
+				strbuf_addstr(&prequoted, "%(prefix)/");
+#endif
+
+			strbuf_add(&prequoted, dir.buf, dir.len);
+			sq_quote_buf_pretty(&quoted, prequoted.buf);
+
 			die(_("detected dubious ownership in repository at '%s'\n"
 			      "%s"
 			      "To add an exception for this directory, call:\n"

From 75953ccc16d60ef1cf577345dd3a264098e7e3c9 Mon Sep 17 00:00:00 2001
From: Jeff Hostetler <jeffhost@microsoft.com>
Date: Mon, 5 Apr 2021 14:39:33 -0400
Subject: [PATCH 076/247] clink.pl: move default linker options for MSVC=1
 builds

Move the default `-ENTRY` and `-SUBSYSTEM` arguments for
MSVC=1 builds from `config.mak.uname` into `clink.pl`.
These args are constant for console-mode executables.

Add support to `clink.pl` for generating a Win32 GUI application
using the `-mwindows` argument (to match how GCC does it).  This
changes the `-ENTRY` and `-SUBSYSTEM` arguments accordingly.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
---
 compat/vcbuild/scripts/clink.pl | 11 +++++++++++
 config.mak.uname                |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl
index 73c8a2b184f38b..a38b360015ece9 100755
--- a/compat/vcbuild/scripts/clink.pl
+++ b/compat/vcbuild/scripts/clink.pl
@@ -15,6 +15,7 @@
 my @lflags = ();
 my $is_linking = 0;
 my $is_debug = 0;
+my $is_gui = 0;
 while (@ARGV) {
 	my $arg = shift @ARGV;
 	if ("$arg" eq "-DDEBUG") {
@@ -124,11 +125,21 @@
 		# let's ignore those
 	} elsif ("$arg" eq "-fno-stack-protector") {
 		# eat this
+	} elsif ("$arg" eq "-mwindows") {
+		$is_gui = 1;
 	} else {
 		push(@args, $arg);
 	}
 }
 if ($is_linking) {
+	if ($is_gui) {
+		push(@args, "-ENTRY:wWinMainCRTStartup");
+		push(@args, "-SUBSYSTEM:WINDOWS");
+	} else {
+		push(@args, "-ENTRY:wmainCRTStartup");
+		push(@args, "-SUBSYSTEM:CONSOLE");
+	}
+
 	push(@args, @lflags);
 	unshift(@args, "link.exe");
 } else {
diff --git a/config.mak.uname b/config.mak.uname
index 354be98342fbd8..a85a842deba8d2 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -539,7 +539,7 @@ endif
 	COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DDETECT_MSYS_TTY \
 		-DENSURE_MSYSTEM_IS_SET="\"$(MSYSTEM)\"" -DMINGW_PREFIX="\"$(patsubst /%,%,$(MINGW_PREFIX))\"" \
 		-DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
-	BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -ENTRY:wmainCRTStartup -SUBSYSTEM:CONSOLE
+	BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO
 	# invalidcontinue.obj allows Git's source code to close the same file
 	# handle twice, or to access the osfhandle of an already-closed stdout
 	# See https://msdn.microsoft.com/en-us/library/ms235330.aspx

From 3ad122df4253a9477bc08d87fc9bb06896f77a7a Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 7 May 2023 22:05:33 +0200
Subject: [PATCH 077/247] http: when loading libcurl lazily, allow for multiple
 SSL backends

The previous commits introduced a compile-time option to load libcurl
lazily, but it uses the hard-coded name "libcurl-4.dll" (or equivalent
on platforms other than Windows).

To allow for installing multiple libcurl flavors side by side, where
each supports one specific SSL/TLS backend, let's first look whether
`libcurl-<backend>-4.dll` exists, and only use `libcurl-4.dll` as a fall
back.

That will allow us to ship with a libcurl by default that only supports
the Secure Channel backend for the `https://` protocol. This libcurl
won't suffer from any dependency problem when upgrading OpenSSL to a new
major version (which will change the DLL name, and hence break every
program and library that depends on it).

This is crucial because Git for Windows relies on libcurl to keep
working when building and deploying a new OpenSSL package because that
library is used by `git fetch` and `git clone`.

Note that this feature is by no means specific to Windows. On Ubuntu,
for example, a `git` built using `LAZY_LOAD_LIBCURL` will use
`libcurl.so.4` for `http.sslbackend=openssl` and `libcurl-gnutls.so.4`
for `http.sslbackend=gnutls`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/lazyload-curl.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/compat/lazyload-curl.c b/compat/lazyload-curl.c
index 82ab11de43a0fb..a6a3f7e3a7aeaa 100644
--- a/compat/lazyload-curl.c
+++ b/compat/lazyload-curl.c
@@ -175,17 +175,26 @@ static curl_easy_setopt_pointer_type curl_easy_setopt_pointer_func;
 typedef CURLcode (*curl_easy_setopt_off_t_type)(CURL *curl, CURLoption opt, curl_off_t value);
 static curl_easy_setopt_off_t_type curl_easy_setopt_off_t_func;
 
+static char ssl_backend[64];
+
 static void lazy_load_curl(void)
 {
 	static int initialized;
-	void *libcurl;
+	void *libcurl = NULL;
 	func_t curl_easy_getinfo_func, curl_easy_setopt_func;
 
 	if (initialized)
 		return;
 
 	initialized = 1;
-	libcurl = load_library(LIBCURL_FILE_NAME("libcurl"));
+	if (ssl_backend[0]) {
+		char dll_name[64 + 16];
+		snprintf(dll_name, sizeof(dll_name) - 1,
+			 LIBCURL_FILE_NAME("libcurl-%s"), ssl_backend);
+		libcurl = load_library(dll_name);
+	}
+	if (!libcurl)
+		libcurl = load_library(LIBCURL_FILE_NAME("libcurl"));
 	if (!libcurl)
 		die("failed to load library '%s'", LIBCURL_FILE_NAME("libcurl"));
 
@@ -250,6 +259,9 @@ CURLcode curl_global_init(long flags)
 
 CURLsslset curl_global_sslset(curl_sslbackend id, const char *name, const curl_ssl_backend ***avail)
 {
+	if (name && strlen(name) < sizeof(ssl_backend))
+		strlcpy(ssl_backend, name, sizeof(ssl_backend));
+
 	lazy_load_curl();
 	return curl_global_sslset_func(id, name, avail);
 }

From a1def63663369c1101b9785f549b83e8d1a05faf Mon Sep 17 00:00:00 2001
From: Derrick Stolee <stolee@gmail.com>
Date: Mon, 23 Sep 2024 15:38:25 -0400
Subject: [PATCH 078/247] survey: add --top=<N> option and config

The 'git survey' builtin provides several detail tables, such as "top
files by on-disk size". The size of these tables defaults to 10,
currently.

Allow the user to specify this number via a new --top=<N> option or the
new survey.top config key.

Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 Documentation/config/survey.adoc |  3 +++
 builtin/survey.c                 | 22 ++++++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Documentation/config/survey.adoc b/Documentation/config/survey.adoc
index c1b0f852a1250e..9e594a2092f225 100644
--- a/Documentation/config/survey.adoc
+++ b/Documentation/config/survey.adoc
@@ -8,4 +8,7 @@ survey.*::
 		This boolean value implies the `--[no-]verbose` option.
 	progress::
 		This boolean value implies the `--[no-]progress` option.
+	top::
+		This integer value implies `--top=<N>`, specifying the
+		number of entries in the detail tables.
 --
diff --git a/builtin/survey.c b/builtin/survey.c
index a0a3966295340f..936a27d0ca9784 100644
--- a/builtin/survey.c
+++ b/builtin/survey.c
@@ -40,6 +40,7 @@ static struct survey_refs_wanted default_ref_options = {
 struct survey_opts {
 	int verbose;
 	int show_progress;
+	int top_nr;
 	struct survey_refs_wanted refs;
 };
 
@@ -548,6 +549,10 @@ static int survey_load_config_cb(const char *var, const char *value,
 		ctx->opts.show_progress = git_config_bool(var, value);
 		return 0;
 	}
+	if (!strcmp(var, "survey.top")) {
+		ctx->opts.top_nr = git_config_bool(var, value);
+		return 0;
+	}
 
 	return git_default_config(var, value, cctx, pvoid);
 }
@@ -794,8 +799,6 @@ static int survey_objects_path_walk_fn(const char *path,
 
 static void initialize_report(struct survey_context *ctx)
 {
-	const int top_limit = 100;
-
 	CALLOC_ARRAY(ctx->report.by_type, REPORT_TYPE_COUNT);
 	ctx->report.by_type[REPORT_TYPE_COMMIT].label = xstrdup(_("Commits"));
 	ctx->report.by_type[REPORT_TYPE_TREE].label = xstrdup(_("Trees"));
@@ -804,21 +807,21 @@ static void initialize_report(struct survey_context *ctx)
 
 	CALLOC_ARRAY(ctx->report.top_paths_by_count, REPORT_TYPE_COUNT);
 	init_top_sizes(&ctx->report.top_paths_by_count[REPORT_TYPE_TREE],
-		       top_limit, _("TOP DIRECTORIES BY COUNT"), cmp_by_nr);
+		       ctx->opts.top_nr, _("TOP DIRECTORIES BY COUNT"), cmp_by_nr);
 	init_top_sizes(&ctx->report.top_paths_by_count[REPORT_TYPE_BLOB],
-		       top_limit, _("TOP FILES BY COUNT"), cmp_by_nr);
+		       ctx->opts.top_nr, _("TOP FILES BY COUNT"), cmp_by_nr);
 
 	CALLOC_ARRAY(ctx->report.top_paths_by_disk, REPORT_TYPE_COUNT);
 	init_top_sizes(&ctx->report.top_paths_by_disk[REPORT_TYPE_TREE],
-		       top_limit, _("TOP DIRECTORIES BY DISK SIZE"), cmp_by_disk_size);
+		       ctx->opts.top_nr, _("TOP DIRECTORIES BY DISK SIZE"), cmp_by_disk_size);
 	init_top_sizes(&ctx->report.top_paths_by_disk[REPORT_TYPE_BLOB],
-		       top_limit, _("TOP FILES BY DISK SIZE"), cmp_by_disk_size);
+		       ctx->opts.top_nr, _("TOP FILES BY DISK SIZE"), cmp_by_disk_size);
 
 	CALLOC_ARRAY(ctx->report.top_paths_by_inflate, REPORT_TYPE_COUNT);
 	init_top_sizes(&ctx->report.top_paths_by_inflate[REPORT_TYPE_TREE],
-		       top_limit, _("TOP DIRECTORIES BY INFLATED SIZE"), cmp_by_inflated_size);
+		       ctx->opts.top_nr, _("TOP DIRECTORIES BY INFLATED SIZE"), cmp_by_inflated_size);
 	init_top_sizes(&ctx->report.top_paths_by_inflate[REPORT_TYPE_BLOB],
-		       top_limit, _("TOP FILES BY INFLATED SIZE"), cmp_by_inflated_size);
+		       ctx->opts.top_nr, _("TOP FILES BY INFLATED SIZE"), cmp_by_inflated_size);
 }
 
 static void survey_phase_objects(struct survey_context *ctx)
@@ -869,6 +872,7 @@ int cmd_survey(int argc, const char **argv, const char *prefix, struct repositor
 		.opts = {
 			.verbose = 0,
 			.show_progress = -1, /* defaults to isatty(2) */
+			.top_nr = 10,
 
 			.refs.want_all_refs = -1,
 
@@ -884,6 +888,8 @@ int cmd_survey(int argc, const char **argv, const char *prefix, struct repositor
 	static struct option survey_options[] = {
 		OPT__VERBOSE(&ctx.opts.verbose, N_("verbose output")),
 		OPT_BOOL(0, "progress", &ctx.opts.show_progress, N_("show progress")),
+		OPT_INTEGER('n', "top", &ctx.opts.top_nr,
+			    N_("number of entries to include in detail tables")),
 
 		OPT_BOOL_F(0, "all-refs", &ctx.opts.refs.want_all_refs, N_("include all refs"),          PARSE_OPT_NONEG),
 

From c4e0b80044602a0d7624cf377074459a7ac50002 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 23:33:56 +0200
Subject: [PATCH 079/247] repo: split annotated tags out from total tag count
 in structure

Mirror what git survey already reports: lightweight tags
(pointing straight at a commit/tree/blob) and annotated tags
(pointing at an OBJ_TAG that is itself stored as a separate
object) are different things in many monorepo contexts, and one
of the differences git survey users routinely care about. Add
an annotated_tags counter to struct ref_stats, populate it in
count_references() by peeking at the ref OID's object type, and
expose it as a sub-row under Tags in the table output and as
references.tags.annotated.count in the machine-readable formats.

Step toward pivoting the standalone git survey command onto
git repo structure; this fills the first of the four feature
gaps documented in the assessment.

Tests in t1901 widened to assert the new row and key.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/repo.c            | 10 ++++++++++
 t/t1901-repo-structure.sh |  6 +++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/builtin/repo.c b/builtin/repo.c
index 84e012f83f65ae..74fbc8285bbd76 100644
--- a/builtin/repo.c
+++ b/builtin/repo.c
@@ -319,6 +319,7 @@ struct ref_stats {
 	size_t branches;
 	size_t remotes;
 	size_t tags;
+	size_t annotated_tags;
 	size_t others;
 };
 
@@ -504,6 +505,8 @@ static void stats_table_setup_structure(struct stats_table *table,
 	stats_table_count_addf(table, ref_total, "  * %s", _("Count"));
 	stats_table_count_addf(table, refs->branches, "    * %s", _("Branches"));
 	stats_table_count_addf(table, refs->tags, "    * %s", _("Tags"));
+	stats_table_count_addf(table, refs->annotated_tags,
+			       "      * %s", _("Annotated"));
 	stats_table_count_addf(table, refs->remotes, "    * %s", _("Remotes"));
 	stats_table_count_addf(table, refs->others, "    * %s", _("Others"));
 
@@ -687,6 +690,8 @@ static void structure_keyvalue_print(struct repo_structure *stats,
 		       stats->refs.branches, value_delim);
 	print_keyvalue("references.tags.count", key_delim,
 		       stats->refs.tags, value_delim);
+	print_keyvalue("references.tags.annotated.count", key_delim,
+		       stats->refs.annotated_tags, value_delim);
 	print_keyvalue("references.remotes.count", key_delim,
 		       stats->refs.remotes, value_delim);
 	print_keyvalue("references.others.count", key_delim,
@@ -739,6 +744,7 @@ static void structure_keyvalue_print(struct repo_structure *stats,
 struct count_references_data {
 	struct ref_stats *stats;
 	struct rev_info *revs;
+	struct repository *repo;
 	struct progress *progress;
 };
 
@@ -757,6 +763,9 @@ static int count_references(const struct reference *ref, void *cb_data)
 		break;
 	case FILTER_REFS_TAGS:
 		stats->tags++;
+		if (odb_read_object_info(data->repo->objects,
+					 ref->oid, NULL) == OBJ_TAG)
+			stats->annotated_tags++;
 		break;
 	case FILTER_REFS_OTHERS:
 		stats->others++;
@@ -785,6 +794,7 @@ static void structure_count_references(struct ref_stats *stats,
 	struct count_references_data data = {
 		.stats = stats,
 		.revs = revs,
+		.repo = repo,
 	};
 
 	if (show_progress)
diff --git a/t/t1901-repo-structure.sh b/t/t1901-repo-structure.sh
index 02cc2b594a48b5..90774786d90a9a 100755
--- a/t/t1901-repo-structure.sh
+++ b/t/t1901-repo-structure.sh
@@ -33,6 +33,7 @@ test_expect_success 'empty repository' '
 		|   * Count                 |    0   |
 		|     * Branches            |    0   |
 		|     * Tags                |    0   |
+		|       * Annotated         |    0   |
 		|     * Remotes             |    0   |
 		|     * Others              |    0   |
 		|                           |        |
@@ -97,6 +98,7 @@ test_expect_success SHA1 'repository with references and objects' '
 		|   * Count                 |      4     |
 		|     * Branches            |      1     |
 		|     * Tags                |      1     |
+		|       * Annotated         |      1     |
 		|     * Remotes             |      1     |
 		|     * Others              |      1     |
 		|                           |            |
@@ -150,11 +152,13 @@ test_expect_success SHA1 'lines and nul format' '
 	(
 		cd repo &&
 		test_commit_bulk 42 &&
+		git tag lightweight-tag-is-not-counted-as-annotated &&
 		git tag -a foo -m bar &&
 
 		cat >expect <<-EOF &&
 		references.branches.count=1
-		references.tags.count=1
+		references.tags.count=2
+		references.tags.annotated.count=1
 		references.remotes.count=0
 		references.others.count=0
 		objects.commits.count=42

From c51a6fd529eca092095d3e2fc56292899ba741a9 Mon Sep 17 00:00:00 2001
From: Victoria Dye <vdye@github.com>
Date: Thu, 5 Aug 2021 19:11:59 -0400
Subject: [PATCH 080/247] ci: run `contrib/subtree` tests in CI builds

Because `git subtree` (unlike most other `contrib` modules) is included as
part of the standard release of Git for Windows, its stability should be
verified as consistently as it is for the rest of git. By including the
`git subtree` tests in the CI workflow, these tests are as much of a gate to
merging and indicator of stability as the standard test suite.

Signed-off-by: Victoria Dye <vdye@github.com>
---
 ci/run-build-and-tests.sh | 4 ++++
 ci/run-test-slice.sh      | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index 1d9a0a736d255b..7133cd901a9ea2 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -72,5 +72,9 @@ case "$jobname" in
 	;;
 esac
 
+case " $MAKE_TARGETS " in
+*" all "*) make -C contrib/subtree test;;
+esac
+
 check_unignored_build_artifacts
 save_good_tree
diff --git a/ci/run-test-slice.sh b/ci/run-test-slice.sh
index ff948e397fcb70..f84190e7b73180 100755
--- a/ci/run-test-slice.sh
+++ b/ci/run-test-slice.sh
@@ -15,4 +15,7 @@ if [ "$1" == "0" ] ; then
 	group "Run unit tests" make --quiet -C t unit-tests-test-tool
 fi
 
+# Run the git subtree tests only if main tests succeeded
+test 0 != "$1" || make -C contrib/subtree test
+
 check_unignored_build_artifacts

From dc1f98a23d944294287ec3583d4d25023c0ce93e Mon Sep 17 00:00:00 2001
From: Philip Oakley <philipoakley@iee.email>
Date: Mon, 10 May 2021 16:47:40 +0100
Subject: [PATCH 081/247] CMake: show Win32 and Generator_platform build-option
 values

Ensure key CMake option values are part of the CMake output to
facilitate user support when tool updates impact the wider CMake
actions, particularly ongoing 'improvements' in Visual Studio.

These CMake displays perform the same function as the build-options.txt
provided in the main Git for Windows. CMake is already chatty.
The setting of CMAKE_EXPORT_COMPILE_COMMANDS is also reported.

Include the environment's CMAKE_EXPORT_COMPILE_COMMANDS value which
may have been propogated to CMake's internal value.

Testing the CMAKE_EXPORT_COMPILE_COMMANDS processing can be difficult
in the Visual Studio environment, as it may be cached in many places.
The 'environment' may include the OS, the user shell, CMake's
own environment, along with the Visual Studio presets and caches.

See previous commit for arefacts that need removing for a clean test.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
---
 contrib/buildsystems/CMakeLists.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 3c21a12ea606e2..c8230e72014e76 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -63,10 +63,20 @@ endif()
 
 if(NOT DEFINED CMAKE_EXPORT_COMPILE_COMMANDS)
 	set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
+	message("settting CMAKE_EXPORT_COMPILE_COMMANDS: ${CMAKE_EXPORT_COMPILE_COMMANDS}")
 endif()
 
 if(USE_VCPKG)
 	set(VCPKG_DIR "${CMAKE_SOURCE_DIR}/compat/vcbuild/vcpkg")
+	message("WIN32: ${WIN32}") # show its underlying text values
+	message("VCPKG_DIR: ${VCPKG_DIR}")
+	message("VCPKG_ARCH: ${VCPKG_ARCH}") # maybe unset
+	message("MSVC: ${MSVC}")
+	message("CMAKE_GENERATOR: ${CMAKE_GENERATOR}")
+	message("CMAKE_CXX_COMPILER_ID: ${CMAKE_CXX_COMPILER_ID}")
+	message("CMAKE_GENERATOR_PLATFORM: ${CMAKE_GENERATOR_PLATFORM}")
+	message("CMAKE_EXPORT_COMPILE_COMMANDS: ${CMAKE_EXPORT_COMPILE_COMMANDS}")
+	message("ENV(CMAKE_EXPORT_COMPILE_COMMANDS): $ENV{CMAKE_EXPORT_COMPILE_COMMANDS}")
 	if(NOT EXISTS ${VCPKG_DIR})
 		message("Initializing vcpkg and building the Git's dependencies (this will take a while...)")
 		execute_process(COMMAND ${CMAKE_SOURCE_DIR}/compat/vcbuild/vcpkg_install.bat ${VCPKG_ARCH})

From 136254e7678f0d054aa994041638fb7faabc30fb Mon Sep 17 00:00:00 2001
From: Derrick Stolee <derrickstolee@github.com>
Date: Wed, 13 Apr 2022 14:54:43 -0400
Subject: [PATCH 082/247] compat/mingw.c: do not warn when failing to get owner

In the case of Git for Windows (say, in a Git Bash window) running in a
Windows Subsystem for Linux (WSL) directory, the GetNamedSecurityInfoW()
call in is_path_owned_By_current_side() returns an error code other than
ERROR_SUCCESS. This is consistent behavior across this boundary.

In these cases, the owner would always be different because the WSL
owner is a different entity than the Windows user.

The change here is to suppress the error message that looks like this:

  error: failed to get owner for '//wsl.localhost/...' (1)

Before this change, this warning happens for every Git command,
regardless of whether the directory is marked with safe.directory.

Signed-off-by: Derrick Stolee <derrickstolee@github.com>
---
 compat/mingw.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 0c8179f3458bb8..2675f4dc7e4df4 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -3408,9 +3408,7 @@ int is_path_owned_by_current_sid(const char *path, struct strbuf *report)
 				    DACL_SECURITY_INFORMATION,
 				    &sid, NULL, NULL, NULL, &descriptor);
 
-	if (err != ERROR_SUCCESS)
-		error(_("failed to get owner for '%s' (%ld)"), path, err);
-	else if (sid && IsValidSid(sid)) {
+	if (err == ERROR_SUCCESS && sid && IsValidSid(sid)) {
 		/* Now, verify that the SID matches the current user's */
 		static PSID current_user_sid;
 		static HANDLE linked_token;

From 43aeff0094ac79c857193d37293b1da075e5058c Mon Sep 17 00:00:00 2001
From: Rafael Kitover <rkitover@gmail.com>
Date: Tue, 12 Apr 2022 19:53:33 +0000
Subject: [PATCH 083/247] mingw: $env:TERM="xterm-256color" for newer OSes

For Windows builds >= 15063 set $env:TERM to "xterm-256color" instead of
"cygwin" because they have a more capable console system that supports
this. Also set $env:COLORTERM="truecolor" if unset.

$env:TERM is initialized so that ANSI colors in color.c work, see
29a3963484 (Win32: patch Windows environment on startup, 2012-01-15).

See git-for-windows/git#3629 regarding problems caused by always setting
$env:TERM="cygwin".

This is the same heuristic used by the Cygwin runtime.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/mingw.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 0c8179f3458bb8..02a7f6faaa0bfc 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -3220,9 +3220,20 @@ static void setup_windows_environment(void)
 		convert_slashes(tmp);
 	}
 
-	/* simulate TERM to enable auto-color (see color.c) */
-	if (!getenv("TERM"))
-		setenv("TERM", "cygwin", 1);
+
+	/*
+	 * Make sure TERM is set up correctly to enable auto-color
+	 * (see color.c .) Use "cygwin" for older OS releases which
+	 * works correctly with MSYS2 utilities on older consoles.
+	 */
+	if (!getenv("TERM")) {
+		if ((GetVersion() >> 16) < 15063)
+			setenv("TERM", "cygwin", 0);
+		else {
+			setenv("TERM", "xterm-256color", 0);
+			setenv("COLORTERM", "truecolor", 0);
+		}
+	}
 
 	/* calculate HOME if not set */
 	if (!getenv("HOME")) {

From 6dc31b7cb17fd6ff719b58205c6c7daea19845d4 Mon Sep 17 00:00:00 2001
From: Christopher Degawa <ccom@randomderp.com>
Date: Sat, 28 May 2022 14:53:54 -0500
Subject: [PATCH 084/247] winansi: check result and Buffer before using Name

NtQueryObject under Wine can return a success but fill out no name.
In those situations, Wine will set Buffer to NULL, and set result to
the sizeof(OBJECT_NAME_INFORMATION).

Running a command such as

echo "$(git.exe --version 2>/dev/null)"

will crash due to a NULL pointer dereference when the code attempts to
null terminate the buffer, although, weirdly, removing the subshell or
redirecting stdout to a file will not trigger the crash.

Code has been added to also check Buffer and Length to ensure the check
is as robust as possible due to the current behavior being fragile at
best, and could potentially change in the future

This code is based on the behavior of NtQueryObject under wine and
reactos.

Signed-off-by: Christopher Degawa <ccom@randomderp.com>
---
 compat/winansi.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/compat/winansi.c b/compat/winansi.c
index 3ce190093901b4..601f5c01446e5d 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -546,6 +546,9 @@ static void detect_msys_tty(int fd)
 	if (!NT_SUCCESS(NtQueryObject(h, ObjectNameInformation,
 			buffer, sizeof(buffer) - 2, &result)))
 		return;
+	if (result < sizeof(*nameinfo) || !nameinfo->Name.Buffer ||
+		!nameinfo->Name.Length)
+		return;
 	name = nameinfo->Name.Buffer;
 	name[nameinfo->Name.Length / sizeof(*name)] = 0;
 

From 3ee2ed2279f0bd2a3c496124d401e2f250efdfba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=93=E8=AF=86?= <sunzhuoshi@gmail.com>
Date: Sun, 16 Jan 2022 03:38:33 +0800
Subject: [PATCH 085/247] Add config option `windows.appendAtomically`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Atomic append on windows is only supported on local disk files, and it may
cause errors in other situations, e.g. network file system. If that is the
case, this config option should be used to turn atomic append off.

Co-Authored-By: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: 孙卓识 <sunzhuoshi@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 Documentation/config.adoc         |  2 ++
 Documentation/config/windows.adoc |  4 ++++
 compat/mingw.c                    | 36 ++++++++++++++++++++++++++++---
 3 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 Documentation/config/windows.adoc

diff --git a/Documentation/config.adoc b/Documentation/config.adoc
index f67dcd2f8e05dd..2b3ddfcee7b559 100644
--- a/Documentation/config.adoc
+++ b/Documentation/config.adoc
@@ -618,4 +618,6 @@ include::config/versionsort.adoc[]
 
 include::config/web.adoc[]
 
+include::config/windows.adoc[]
+
 include::config/worktree.adoc[]
diff --git a/Documentation/config/windows.adoc b/Documentation/config/windows.adoc
new file mode 100644
index 00000000000000..fdaaf1c65504f3
--- /dev/null
+++ b/Documentation/config/windows.adoc
@@ -0,0 +1,4 @@
+windows.appendAtomically::
+	By default, append atomic API is used on windows. But it works only with
+	local disk files, if you're working on a network file system, you should
+	set it false to turn it off.
diff --git a/compat/mingw.c b/compat/mingw.c
index 0c8179f3458bb8..3126ad081a39b1 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -9,6 +9,7 @@
 #include "environment.h"
 #include "repository.h"
 #include "gettext.h"
+#include "repository.h"
 #include "run-command.h"
 #include "strbuf.h"
 #include "symlinks.h"
@@ -834,6 +835,7 @@ static int is_local_named_pipe_path(const char *filename)
 
 int mingw_open (const char *filename, int oflags, ...)
 {
+	static int append_atomically = -1;
 	typedef int (*open_fn_t)(wchar_t const *wfilename, int oflags, ...);
 	va_list args;
 	unsigned mode;
@@ -853,7 +855,16 @@ int mingw_open (const char *filename, int oflags, ...)
 		return -1;
 	}
 
-	if ((oflags & O_APPEND) && !is_local_named_pipe_path(filename))
+	/*
+	 * Only set append_atomically to default value(1) when repo is initialized
+	 * and fail to get config value
+	 */
+	if ((oflags & O_APPEND) && append_atomically < 0 && the_repository && the_repository->commondir &&
+		repo_config_get_bool(the_repository, "windows.appendatomically", &append_atomically))
+		append_atomically = 1;
+
+	if (append_atomically && (oflags & O_APPEND) &&
+		!is_local_named_pipe_path(filename))
 		open_fn = mingw_open_append;
 	else if (!(oflags & ~(O_ACCMODE | O_NOINHERIT)))
 		open_fn = mingw_open_existing;
@@ -1032,9 +1043,28 @@ ssize_t mingw_write(int fd, const void *buf, size_t len)
 
 		/* check if fd is a pipe */
 		HANDLE h = (HANDLE) _get_osfhandle(fd);
-		if (GetFileType(h) != FILE_TYPE_PIPE)
+		if (GetFileType(h) != FILE_TYPE_PIPE) {
+			if (orig == EINVAL) {
+				wchar_t path[MAX_PATH];
+				DWORD ret = GetFinalPathNameByHandleW(h, path,
+								ARRAY_SIZE(path), 0);
+				UINT drive_type = ret > 0 && ret < ARRAY_SIZE(path) ?
+					GetDriveTypeW(path) : DRIVE_UNKNOWN;
+
+				/*
+				 * The default atomic append causes such an error on
+				 * network file systems, in such a case, it should be
+				 * turned off via config.
+				 *
+				 * `drive_type` of UNC path: DRIVE_NO_ROOT_DIR
+				 */
+				if (DRIVE_NO_ROOT_DIR == drive_type || DRIVE_REMOTE == drive_type)
+					warning("invalid write operation detected; you may try:\n"
+						"\n\tgit config windows.appendAtomically false");
+			}
+
 			errno = orig;
-		else if (orig == EINVAL)
+		} else if (orig == EINVAL)
 			errno = EPIPE;
 		else {
 			DWORD buf_size;

From ed7b77b0fdd95e7622889c53da90565cf30592cd Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 4 Sep 2017 11:59:45 +0200
Subject: [PATCH 086/247] mingw: change core.fsyncObjectFiles = 1 by default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From the documentation of said setting:

	This boolean will enable fsync() when writing object files.

	This is a total waste of time and effort on a filesystem that
	orders data writes properly, but can be useful for filesystems
	that do not use journalling (traditional UNIX filesystems) or
	that only journal metadata and not file contents (OS X’s HFS+,
	or Linux ext3 with "data=writeback").

The most common file system on Windows (NTFS) does not guarantee that
order, therefore a sudden loss of power (or any other event causing an
unclean shutdown) would cause corrupt files (i.e. files filled with
NULs). Therefore we need to change the default.

Note that the documentation makes it sound as if this causes really bad
performance. In reality, writing loose objects is something that is done
only rarely, and only a handful of files at a time.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/mingw.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/compat/mingw.c b/compat/mingw.c
index 3126ad081a39b1..6c072900415c4a 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -18,6 +18,7 @@
 #include "win32/exit-process.h"
 #include "win32/lazyload.h"
 #include "wrapper.h"
+#include "write-or-die.h"
 #include <aclapi.h>
 #include <conio.h>
 #include <sddl.h>
@@ -3799,6 +3800,7 @@ int wmain(int argc, const wchar_t **wargv)
 
 	maybe_redirect_std_handles();
 	adjust_symlink_flags();
+	fsync_object_files = 1;
 
 	/* determine size of argv and environ conversion buffer */
 	maxlen = wcslen(wargv[0]);

From 7d688a6ca8789987b774bd522c6941cecb14648e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20A=C3=9Fhauer?= <mha1993@live.de>
Date: Sun, 10 Jul 2022 11:27:25 +0200
Subject: [PATCH 087/247] MinGW: link as terminal server aware
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Whith Windows 2000, Microsoft introduced a flag to the PE header to mark executables as
"terminal server aware". Windows terminal servers provide a redirected Windows directory and
redirected registry hives when launching legacy applications without this flag set. Since we
do not use any INI files in the Windows directory and don't write to the registry, we don't
need  this additional preparation. Telling the OS that we don't need this should provide
slightly improved startup times in terminal server environments.

When building for supported Windows Versions with MSVC the /TSAWARE linker flag is
automatically set, but MinGW requires us to set the --tsaware flag manually.

This partially addresses https://github.com/git-for-windows/git/issues/3935.

Signed-off-by: Matthias Aßhauer <mha1993@live.de>
---
 config.mak.uname | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.mak.uname b/config.mak.uname
index b58bcdf943a287..b8ad54e06e0b34 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -730,7 +730,7 @@ ifeq ($(uname_S),MINGW)
 	DEFAULT_HELP_FORMAT = html
 	HAVE_PLATFORM_PROCINFO = YesPlease
 	CSPRNG_METHOD = rtlgenrandom
-	BASIC_LDFLAGS += -municode
+	BASIC_LDFLAGS += -municode -Wl,--tsaware
 	COMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32
 	COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
 	COMPAT_OBJS += compat/mingw.o compat/winansi.o \

From 77036ec67ebbddbc057827276ad3bfea85d4c392 Mon Sep 17 00:00:00 2001
From: Kiel Hurley <kielhurley@gmail.com>
Date: Wed, 2 Nov 2022 22:56:16 +1300
Subject: [PATCH 088/247] Fix Windows version resources

Add FileVersion, which is a required field
As not all required fields were present, none were being included
Fixes #4090

Signed-off-by: Kiel Hurley <kielhurley@gmail.com>
---
 git.rc.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/git.rc.in b/git.rc.in
index e69444eef3f0c5..460ea39561b87f 100644
--- a/git.rc.in
+++ b/git.rc.in
@@ -12,6 +12,7 @@ BEGIN
       VALUE "OriginalFilename", "git.exe\0"
       VALUE "ProductName", "Git\0"
       VALUE "ProductVersion", "@GIT_VERSION@\0"
+      VALUE "FileVersion", "@GIT_VERSION@\0"
     END
   END
 

From 3b7acd406308ed51789d62bf022c1656e8fe0cba Mon Sep 17 00:00:00 2001
From: Andrey Zabavnikov <zabavnikov@gmail.com>
Date: Fri, 28 Oct 2022 17:12:06 +0300
Subject: [PATCH 089/247] status: fix for old-style submodules with commondir

In f9b7573f6b00 (repository: free fields before overwriting them,
2017-09-05), Git was taught to release memory before overwriting it, but
357a03ebe9e0 (repository.c: move env-related setup code back to
environment.c, 2018-03-03) changed the code so that it would not
_always_ be overwritten.

As a consequence, the `commondir` attribute would point to
already-free()d memory.

This seems not to cause problems in core Git, but there are add-on
patches in Git for Windows where the `commondir` attribute is
subsequently used and causing invalid memory accesses e.g. in setups
containing old-style submodules (i.e. the ones with a `.git` directory
within theirs worktrees) that have `commondir` configured.

This fixes https://github.com/git-for-windows/git/pull/4083.

Signed-off-by: Andrey Zabavnikov <zabavnikov@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 repository.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/repository.c b/repository.c
index b857e1c580e83e..74e7d9527ea4c3 100644
--- a/repository.c
+++ b/repository.c
@@ -155,7 +155,7 @@ static void repo_set_commondir(struct repository *repo,
 {
 	struct strbuf sb = STRBUF_INIT;
 
-	free(repo->commondir);
+	FREE_AND_NULL(repo->commondir);
 
 	if (commondir) {
 		repo->different_commondir = 1;

From 6c42df12eb63607da35de1f736192f81b5b846d8 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 21 Nov 2025 15:15:42 +0100
Subject: [PATCH 090/247] max_tree_depth: lower it for clang builds in general
 on Windows

In 436a42215e5 (max_tree_depth: lower it for clangarm64 on Windows,
2025-04-23), I provided a work-around for a nasty issue with clangarm
builds, where the stack is exhausted before the maximal tree depth is
reached, and the resulting error cannot easily be handled by Git
(because it would require Windows-specific handling).

Turns out that this is not at all limited to ARM64. In my tests with
CLANG64 in MSYS2 on the GitHub Actions runners, the test t6700.4 failed
in the exact same way. What's worse: The limit needs to be quite a bit
lower for x86_64 than for aarch64. In aforementioned tests, the breaking
point was 1232: With 1231 it still worked as expected, with 1232 it
would fail with the `STATUS_STACK_OVERFLOW` incorrectly mapped to exit
code 127. For comparison, in my tests on GitHub Actions' Windows/ARM64
runners, the breaking point was 1439 instead.

Therefore the condition needs to be adapted once more, to accommodate
(with some safety margin) both aarch64 and x86_64 in clang-based builds
on Windows, to let that test pass.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 git-compat-util.h | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/git-compat-util.h b/git-compat-util.h
index a0f901ce793ed6..7d1df43e212ae7 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -601,17 +601,23 @@ static inline bool strip_suffix(const char *str, const char *suffix,
    * the stack overflow can occur.
    */
 #define DEFAULT_MAX_ALLOWED_TREE_DEPTH 512
-#elif defined(GIT_WINDOWS_NATIVE) && defined(__clang__) && defined(__aarch64__)
+#elif defined(GIT_WINDOWS_NATIVE) && defined(__clang__)
   /*
-   * Similar to Visual C, it seems that on Windows/ARM64 the clang-based
-   * builds have a smaller stack space available. When running out of
-   * that stack space, a `STATUS_STACK_OVERFLOW` is produced. When the
+   * Similar to Visual C, it seems that clang-based builds on Windows
+   * have a smaller stack space available. When running out of that
+   * stack space, a `STATUS_STACK_OVERFLOW` is produced. When the
    * Git command was run from an MSYS2 Bash, this unfortunately results
    * in an exit code 127. Let's prevent that by lowering the maximal
-   * tree depth; This value seems to be low enough.
+   * tree depth; Unfortunately, it seems that the exact limit differs
+   * for aarch64 vs x86_64, and the difference is too large to simply
+   * use a single limit.
    */
+#if defined(__aarch64__)
 #define DEFAULT_MAX_ALLOWED_TREE_DEPTH 1280
 #else
+#define DEFAULT_MAX_ALLOWED_TREE_DEPTH 1152
+#endif
+#else
 #define DEFAULT_MAX_ALLOWED_TREE_DEPTH 2048
 #endif
 

From 96ce121bec43c9baf996016a4f9e8518484ddb59 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 25 Aug 2020 12:13:26 +0200
Subject: [PATCH 091/247] mingw: ignore HOMEDRIVE/HOMEPATH if it points to
 Windows' system directory

Internally, Git expects the environment variable `HOME` to be set, and
to point to the current user's home directory.

This environment variable is not set by default on Windows, and
therefore Git tries its best to construct one if it finds `HOME` unset.

There are actually two different approaches Git tries: first, it looks
at `HOMEDRIVE`/`HOMEPATH` because this is widely used in corporate
environments with roaming profiles, and a user generally wants their
global Git settings to be in a roaming profile.

Only when `HOMEDRIVE`/`HOMEPATH` is either unset or does not point to a
valid location, Git will fall back to using `USERPROFILE` instead.

However, starting with Windows Vista, for secondary logons and services,
the environment variables `HOMEDRIVE`/`HOMEPATH` point to Windows'
system directory (usually `C:\Windows\system32`).

That is undesirable, and that location is usually write-protected anyway.

So let's verify that the `HOMEDRIVE`/`HOMEPATH` combo does not point to
Windows' system directory before using it, falling back to `USERPROFILE`
if it does.

This fixes git-for-windows#2709

Initial-Path-by: Ivan Pozdeev <vano@mail.mipt.ru>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/mingw.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 0c8179f3458bb8..93eb3509544092 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -3196,6 +3196,18 @@ static size_t append_system_bin_dirs(char *path, size_t size)
 #endif
 #endif
 
+static int is_system32_path(const char *path)
+{
+	WCHAR system32[MAX_PATH], wpath[MAX_PATH];
+
+	if (xutftowcs_path(wpath, path) < 0 ||
+	    !GetSystemDirectoryW(system32, ARRAY_SIZE(system32)) ||
+	    _wcsicmp(system32, wpath))
+		return 0;
+
+	return 1;
+}
+
 static void setup_windows_environment(void)
 {
 	char *tmp = getenv("TMPDIR");
@@ -3236,7 +3248,8 @@ static void setup_windows_environment(void)
 			strbuf_addstr(&buf, tmp);
 			if ((tmp = getenv("HOMEPATH"))) {
 				strbuf_addstr(&buf, tmp);
-				if (is_directory(buf.buf))
+				if (!is_system32_path(buf.buf) &&
+				    is_directory(buf.buf))
 					setenv("HOME", buf.buf, 1);
 				else
 					tmp = NULL; /* use $USERPROFILE */

From 75c2ed50a470c96407183744fc5aed8d13263351 Mon Sep 17 00:00:00 2001
From: Yuyi Wang <Strawberry_Str@hotmail.com>
Date: Sat, 11 Mar 2023 17:51:18 +0800
Subject: [PATCH 092/247] cmake: install headless-git.

headless-git is a git executable without opening a console window. It is
useful when other GUI executables want to call git. We should install it
together with git on Windows.

Signed-off-by: Yuyi Wang <Strawberry_Str@hotmail.com>
---
 contrib/buildsystems/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 7874e5a32601d5..3bcccc0b9e0a7b 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -744,6 +744,7 @@ if(WIN32)
 	endif()
 
 	add_executable(headless-git ${CMAKE_SOURCE_DIR}/compat/win32/headless.c)
+	list(APPEND PROGRAMS_BUILT headless-git)
 	if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
 		target_link_options(headless-git PUBLIC -municode -Wl,-subsystem,windows)
 	elseif(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
@@ -944,7 +945,7 @@ list(TRANSFORM git_perl_scripts PREPEND "${CMAKE_BINARY_DIR}/")
 
 #install
 foreach(program ${PROGRAMS_BUILT})
-if(program MATCHES "^(git|git-shell|scalar)$")
+if(program MATCHES "^(git|git-shell|headless-git|scalar)$")
 install(TARGETS ${program}
 	RUNTIME DESTINATION bin)
 else()

From 4d0e49257107ed716522c96daf60b1b93ef9822a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20A=C3=9Fhauer?= <mha1993@live.de>
Date: Sat, 2 Dec 2023 12:10:00 +0100
Subject: [PATCH 093/247] git.rc: include winuser.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

winuser.h contains the definition of RT_MANIFEST that our LLVM based
toolchain needs to understand that we want to embed
compat/win32/git.manifest as an application manifest. It currently just
embeds it as additional data that Windows doesn't understand.

This also helps our GCC based toolchain understand that we only want one
copy embedded. It currently embeds one working assembly manifest and one
nearly identical, but useless copy as additional data.

This also teaches our Visual Studio based buildsystems to pick up the
manifest file from git.rc. This means we don't have to explicitly specify
it in contrib/buildsystems/Generators/Vcxproj.pm anymore. Slightly
counter-intuitively this also means we have to explicitly tell Cmake
not to embed a default manifest.

This fixes https://github.com/git-for-windows/git/issues/4707

Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---
 contrib/buildsystems/CMakeLists.txt | 1 +
 git.rc.in                           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 3bcccc0b9e0a7b..9f4d61148f767b 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -208,6 +208,7 @@ if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
 	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
 	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
 	add_compile_options(/MP /std:c11)
+	add_link_options(/MANIFEST:NO)
 endif()
 
 #default behaviour
diff --git a/git.rc.in b/git.rc.in
index e69444eef3f0c5..1d5b627b610549 100644
--- a/git.rc.in
+++ b/git.rc.in
@@ -1,3 +1,4 @@
+#include<winuser.h>
 1 VERSIONINFO
 FILEVERSION     @GIT_MAJOR_VERSION@,@GIT_MINOR_VERSION@,@GIT_MICRO_VERSION@,@GIT_PATCH_LEVEL@
 PRODUCTVERSION  @GIT_MAJOR_VERSION@,@GIT_MINOR_VERSION@,@GIT_MICRO_VERSION@,@GIT_PATCH_LEVEL@

From c10690e48f8ee9bd27995d7aa8220b2e1c23a4b8 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 7 May 2023 22:43:37 +0200
Subject: [PATCH 094/247] mingw: do load libcurl dynamically by default

This will help with Git for Windows' maintenance going forward: It
allows Git for Windows to switch its primary libcurl to a variant
without the OpenSSL backend, while still loading an alternate when
setting `http.sslBackend = openssl`.

This is necessary to avoid maintenance headaches with upgrading OpenSSL:
its major version name is encoded in the shared library's file name and
hence major version updates (temporarily) break libraries that are
linked against the OpenSSL library.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 config.mak.uname | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config.mak.uname b/config.mak.uname
index b8ad54e06e0b34..e655cdd0f8bd0a 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -731,6 +731,7 @@ ifeq ($(uname_S),MINGW)
 	HAVE_PLATFORM_PROCINFO = YesPlease
 	CSPRNG_METHOD = rtlgenrandom
 	BASIC_LDFLAGS += -municode -Wl,--tsaware
+	LAZYLOAD_LIBCURL = YesDoThatPlease
 	COMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32
 	COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
 	COMPAT_OBJS += compat/mingw.o compat/winansi.o \

From 146cb0b8d04c626293034acb0472a048b1cad714 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 2 Nov 2022 16:23:58 +0100
Subject: [PATCH 095/247] Add a GitHub workflow to verify that Git/Scalar work
 in Nano Server

In Git for Windows v2.39.0, we fixed a regression where `git.exe` would
no longer work in Windows Nano Server (frequently used in Docker
containers).

This GitHub workflow can be used to verify manually that the Git/Scalar
executables work in Nano Server.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 .github/workflows/nano-server.yml | 76 +++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 .github/workflows/nano-server.yml

diff --git a/.github/workflows/nano-server.yml b/.github/workflows/nano-server.yml
new file mode 100644
index 00000000000000..2e6da3ceea6f90
--- /dev/null
+++ b/.github/workflows/nano-server.yml
@@ -0,0 +1,76 @@
+name: Windows Nano Server tests
+
+on:
+  workflow_dispatch:
+
+env:
+  DEVELOPER: 1
+
+jobs:
+  test-nano-server:
+    runs-on: windows-2022
+    env:
+      WINDBG_DIR: "C:/Program Files (x86)/Windows Kits/10/Debuggers/x64"
+      IMAGE: mcr.microsoft.com/powershell:nanoserver-ltsc2022
+
+    steps:
+      - uses: actions/checkout@v7
+      - uses: git-for-windows/setup-git-for-windows-sdk@v2
+      - name: build Git
+        shell: bash
+        run: make -j15
+      - name: pull nanoserver image
+        shell: bash
+        run: docker pull $IMAGE
+      - name: run nano-server test
+        shell: bash
+        run: |
+          docker run \
+            --user "ContainerAdministrator" \
+            -v "$WINDBG_DIR:C:/dbg" \
+            -v "$(cygpath -aw /mingw64/bin):C:/mingw64-bin" \
+            -v "$(cygpath -aw .):C:/test" \
+            $IMAGE pwsh.exe -Command '
+              # Extend the PATH to include the `.dll` files in /mingw64/bin/
+              $env:PATH += ";C:\mingw64-bin"
+
+              # For each executable to test pick some no-operation set of
+              # flags/subcommands or something that should quickly result in an
+              # error with known exit code that is not a negative 32-bit
+              # number, and set the expected return code appropriately.
+              #
+              # Only test executables that could be expected to run in a UI
+              # less environment.
+              #
+              # ( Executable path, arguments, expected return code )
+              # also note space is required before close parenthesis (a
+              # powershell quirk when defining nested arrays like this)
+
+              $executables_to_test = @(
+                  ("C:\test\git.exe", "", 1 ),
+                  ("C:\test\scalar.exe", "version", 0 )
+              )
+
+              foreach ($executable in $executables_to_test)
+              {
+                  Write-Output "Now testing $($executable[0])"
+                  &$executable[0] $executable[1]
+                  if ($LASTEXITCODE -ne $executable[2]) {
+                      # if we failed, run the debugger to find out what function
+                      # or DLL could not be found and then exit the script with
+                      # failure The missing DLL or EXE will be referenced near
+                      # the end of the output
+
+                      # Set a flag to have the debugger show loader stub
+                      # diagnostics. This requires running as administrator,
+                      # otherwise the flag will be ignored.
+                      C:\dbg\gflags -i $executable[0] +SLS
+
+                      C:\dbg\cdb.exe -c "g" -c "q" $executable[0] $executable[1]
+
+                      exit 1
+                  }
+              }
+
+              exit 0
+            '

From 5470cbc209e76d0bc2109c49be65adf04a4f13eb Mon Sep 17 00:00:00 2001
From: David Lomas <dl3@pale-eds.co.uk>
Date: Fri, 28 Jul 2023 15:31:25 +0100
Subject: [PATCH 096/247] mingw: suggest `windows.appendAtomically` in more
 cases

When running Git for Windows on a remote APFS filesystem, it would
appear that the `mingw_open_append()`/`write()` combination would fail
almost exactly like on some CIFS-mounted shares as had been reported in
https://github.com/git-for-windows/git/issues/2753, albeit with a
different `errno` value.

Let's handle that `errno` value just the same, by suggesting to set
`windows.appendAtomically=false`.

Signed-off-by: David Lomas <dl3@pale-eds.co.uk>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/mingw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 3126ad081a39b1..2528310e2d1de8 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1038,7 +1038,7 @@ ssize_t mingw_write(int fd, const void *buf, size_t len)
 {
 	ssize_t result = write(fd, buf, len);
 
-	if (result < 0 && (errno == EINVAL || errno == ENOSPC) && buf) {
+	if (result < 0 && (errno == EINVAL || errno == EBADF || errno == ENOSPC) && buf) {
 		int orig = errno;
 
 		/* check if fd is a pipe */
@@ -1064,7 +1064,7 @@ ssize_t mingw_write(int fd, const void *buf, size_t len)
 			}
 
 			errno = orig;
-		} else if (orig == EINVAL)
+		} else if (orig == EINVAL || errno == EBADF)
 			errno = EPIPE;
 		else {
 			DWORD buf_size;

From ae48d951decf950e03a22c0e693c37dfc1c55038 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 22 Nov 2023 22:57:38 +0100
Subject: [PATCH 097/247] win32: use native ANSI sequence processing, if
 possible

Windows 10 version 1511 (also known as Anniversary Update), according to
https://learn.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences
introduced native support for ANSI sequence processing. This allows
using colors from the entire 24-bit color range.

All we need to do is test whether the console's "virtual processing
support" can be enabled. If it can, we do not even need to start the
`console_thread` to handle ANSI sequences.

Or, almost all we need to do: When `console_thread()` does its work, it
uses the Unicode-aware `write_console()` function to write to the Win32
Console, which supports Git for Windows' implicit convention that all
text that is written is encoded in UTF-8. The same is not necessarily
true if native ANSI sequence processing is used, as the output is then
subject to the current code page. Let's ensure that the code page is set
to `CP_UTF8` as long as Git writes to it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/winansi.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/compat/winansi.c b/compat/winansi.c
index 3ce190093901b4..147e88e1781300 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -564,6 +564,49 @@ static void detect_msys_tty(int fd)
 
 #endif
 
+static HANDLE std_console_handle;
+static DWORD std_console_mode = ENABLE_VIRTUAL_TERMINAL_PROCESSING;
+static UINT std_console_code_page = CP_UTF8;
+
+static void reset_std_console(void)
+{
+	if (std_console_mode != ENABLE_VIRTUAL_TERMINAL_PROCESSING)
+		SetConsoleMode(std_console_handle, std_console_mode);
+	if (std_console_code_page != CP_UTF8)
+		SetConsoleOutputCP(std_console_code_page);
+}
+
+static int enable_virtual_processing(void)
+{
+	std_console_handle = GetStdHandle(STD_OUTPUT_HANDLE);
+	if (std_console_handle == INVALID_HANDLE_VALUE ||
+	    !GetConsoleMode(std_console_handle, &std_console_mode)) {
+		std_console_handle = GetStdHandle(STD_ERROR_HANDLE);
+		if (std_console_handle == INVALID_HANDLE_VALUE ||
+		    !GetConsoleMode(std_console_handle, &std_console_mode))
+		return 0;
+	}
+
+	std_console_code_page = GetConsoleOutputCP();
+	if (std_console_code_page != CP_UTF8)
+		SetConsoleOutputCP(CP_UTF8);
+	if (!std_console_code_page)
+		std_console_code_page = CP_UTF8;
+
+	atexit(reset_std_console);
+
+	if (std_console_mode & ENABLE_VIRTUAL_TERMINAL_PROCESSING)
+		return 1;
+
+	if (!SetConsoleMode(std_console_handle,
+			    std_console_mode |
+			    ENABLE_PROCESSED_OUTPUT |
+			    ENABLE_VIRTUAL_TERMINAL_PROCESSING))
+		return 0;
+
+	return 1;
+}
+
 /*
  * Wrapper for isatty().  Most calls in the main git code
  * call isatty(1 or 2) to see if the instance is interactive
@@ -602,6 +645,9 @@ void winansi_init(void)
 		return;
 	}
 
+	if (enable_virtual_processing())
+		return;
+
 	/* create a named pipe to communicate with the console thread */
 	if (swprintf(name, ARRAY_SIZE(name) - 1, L"\\\\.\\pipe\\winansi%lu",
 		     GetCurrentProcessId()) < 0)

From 071d56472cda96d889fbc151f9fae5f1c1877c27 Mon Sep 17 00:00:00 2001
From: MinarKotonoha <chengzhuo5@qq.com>
Date: Mon, 8 Apr 2024 16:41:10 +0800
Subject: [PATCH 098/247] common-main.c: fflush stdout buffer upon exit

By default, the buffer type of Windows' `stdout` is unbuffered (_IONBF),
and there is no need to manually fflush `stdout`.

But some programs, such as the Windows Filtering Platform driver
provided by the security software, may change the buffer type of
`stdout` to full buffering. This nees `fflush(stdout)` to be called
manually, otherwise there will be no output to `stdout`.

Signed-off-by: MinarKotonoha <chengzhuo5@qq.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 common-exit.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/common-exit.c b/common-exit.c
index 1aaa538be3ed67..609f32abed8b53 100644
--- a/common-exit.c
+++ b/common-exit.c
@@ -11,6 +11,13 @@ static void check_bug_if_BUG(void)
 /* We wrap exit() to call common_exit() in git-compat-util.h */
 int common_exit(const char *file, int line, int code)
 {
+	/*
+	 *  Windows Filtering Platform driver provided by the security software
+	 * may change buffer type of stdout from _IONBF to _IOFBF.
+	 * It will no output without fflush manually.
+	 */
+	fflush(stdout);
+
 	/*
 	 * For non-POSIX systems: Take the lowest 8 bits of the "code"
 	 * to e.g. turn -1 into 255. On a POSIX system this is

From 44da6d79efc85bc05527b72f56ddb8cac7953791 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 9 Apr 2024 16:50:56 +0200
Subject: [PATCH 099/247] t5601/t7406(mingw): do run tests with symlink support

A long time ago, we decided to run tests in Git for Windows' SDK with
the default `winsymlinks` mode: copying instead of linking. This is
still the default mode of MSYS2 to this day.

However, this is not how most users run Git for Windows: As the majority
of Git for Windows' users seem to be on Windows 10 and newer, likely
having enabled Developer Mode (which allows creating symbolic links
without administrator privileges), they will run with symlink support
enabled.

This is the reason why it is crucial to get the fixes for CVE-2024-? to
the users, and also why it is crucial to ensure that the test suite
exercises the related test cases. This commit ensures the latter.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t5601-clone.sh            | 10 ++++++++++
 t/t7406-submodule-update.sh |  9 +++++++++
 2 files changed, 19 insertions(+)

diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index b6167582a185c0..a7ce17648e4471 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -7,6 +7,16 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
 
+# This test script contains test cases that need to create symbolic links. To
+# make sure that these test cases are exercised in Git for Windows, where (for
+# historical reasons) `ln -s` creates copies by default, let's specifically ask
+# for `ln -s` to create symbolic links whenever possible.
+if test_have_prereq MINGW
+then
+	MSYS=${MSYS+$MSYS }winsymlinks:nativestrict
+	export MSYS
+fi
+
 X=
 test_have_prereq !MINGW || X=.exe
 
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 10adeabf0fcc85..f3b0353c78fcea 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -14,6 +14,15 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
 
+# This test script contains test cases that need to create symbolic links. To
+# make sure that these test cases are exercised in Git for Windows, where (for
+# historical reasons) `ln -s` creates copies by default, let's specifically ask
+# for `ln -s` to create symbolic links whenever possible.
+if test_have_prereq MINGW
+then
+	MSYS=${MSYS+$MSYS }winsymlinks:nativestrict
+	export MSYS
+fi
 
 compare_head()
 {

From 5a075cb25ed1b435890fd1772ea854f8d1e89f9e Mon Sep 17 00:00:00 2001
From: Ariel Lourenco <ariellourenco@users.noreply.github.com>
Date: Tue, 2 Jul 2024 18:09:43 -0300
Subject: [PATCH 100/247] Fallback to AppData if XDG_CONFIG_HOME is unset

In order to be a better Windows citizenship, Git should
save its configuration files on AppData folder. This can
enables git configuration files be replicated between machines
using the same Microsoft account logon which would reduce the
friction of setting up Git on new systems. Therefore, if
%APPDATA%\Git\config exists, we use it; otherwise
$HOME/.config/git/config is used.

Signed-off-by: Ariel Lourenco <ariellourenco@users.noreply.github.com>
---
 path.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/path.c b/path.c
index c3a709a9284b7f..f62b57893cf1d1 100644
--- a/path.c
+++ b/path.c
@@ -1545,6 +1545,7 @@ int looks_like_command_line_option(const char *str)
 char *xdg_config_home_for(const char *subdir, const char *filename)
 {
 	const char *home, *config_home;
+	char *home_config = NULL;
 
 	assert(subdir);
 	assert(filename);
@@ -1553,10 +1554,26 @@ char *xdg_config_home_for(const char *subdir, const char *filename)
 		return mkpathdup("%s/%s/%s", config_home, subdir, filename);
 
 	home = getenv("HOME");
-	if (home)
-		return mkpathdup("%s/.config/%s/%s", home, subdir, filename);
+	if (home && *home)
+		home_config = mkpathdup("%s/.config/%s/%s", home, subdir, filename);
+
+	#ifdef WIN32
+	{
+		const char *appdata = getenv("APPDATA");
+		if (appdata && *appdata) {
+			char *appdata_config = mkpathdup("%s/Git/%s", appdata, filename);
+			if (file_exists(appdata_config)) {
+				if (home_config && file_exists(home_config))
+					warning("'%s' was ignored because '%s' exists.", home_config, appdata_config);
+				free(home_config);
+				return appdata_config;
+			}
+			free(appdata_config);
+		}
+	}
+	#endif
 
-	return NULL;
+	return home_config;
 }
 
 char *xdg_config_home(const char *filename)

From 1ab45001917ec7381a00d5fc8e973a6f6db635c5 Mon Sep 17 00:00:00 2001
From: Derrick Stolee <stolee@gmail.com>
Date: Fri, 6 Sep 2024 14:16:13 -0400
Subject: [PATCH 101/247] revision: create mark_trees_uninteresting_dense()

The sparse tree walk algorithm was created in d5d2e93577e (revision:
implement sparse algorithm, 2019-01-16) and involves using the
mark_trees_uninteresting_sparse() method. This method takes a repository
and an oidset of tree IDs, some of which have the UNINTERESTING flag and
some of which do not.

Create a method that has an equivalent set of preconditions but uses a
"dense" walk (recursively visits all reachable trees, as long as they
have not previously been marked UNINTERESTING). This is an important
difference from mark_tree_uninteresting(), which short-circuits if the
given tree has the UNINTERESTING flag.

A use of this method will be added in a later change, with a condition
set whether the sparse or dense approach should be used.

Signed-off-by: Derrick Stolee <stolee@gmail.com>

From d6a340773d9d18348760273b08ccafdbdde02054 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 1 Jul 2024 23:28:45 +0200
Subject: [PATCH 102/247] survey: clearly note the experimental nature in the
 output

While this command is definitely something we _want_, chances are that
upstreaming this will require substantial changes.

We still want to be able to experiment with this before that, to focus
on what we need out of this command: To assist with diagnosing issues
with large repositories, as well as to help monitoring the growth and
the associated painpoints of such repositories.

To that end, we are about to integrate this command into
`microsoft/git`, to get the tool into the hands of users who need it
most, with the idea to iterate in close collaboration between these
users and the developers familar with Git's internals.

However, we will definitely want to avoid letting anybody have the
impression that this command, its exact inner workings, as well as its
output format, are anywhere close to stable. To make that fact utterly
clear (and thereby protect the freedom to iterate and innovate freely
before upstreaming the command), let's mark its output as experimental
in all-caps, as the first thing we do.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/survey.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/builtin/survey.c b/builtin/survey.c
index 936a27d0ca9784..406e76eb098d03 100644
--- a/builtin/survey.c
+++ b/builtin/survey.c
@@ -17,6 +17,7 @@
 #include "strvec.h"
 #include "tag.h"
 #include "trace2.h"
+#include "color.h"
 
 static const char * const survey_usage[] = {
 	N_("(EXPERIMENTAL!) git survey <options>"),
@@ -905,6 +906,11 @@ int cmd_survey(int argc, const char **argv, const char *prefix, struct repositor
 	show_usage_with_options_if_asked(argc, argv,
 					 survey_usage, survey_options);
 
+	if (isatty(2))
+		color_fprintf_ln(stderr,
+				 want_color_fd(2, GIT_COLOR_AUTO) ? GIT_COLOR_YELLOW : "",
+				 "(THIS IS EXPERIMENTAL, EXPECT THE OUTPUT FORMAT TO CHANGE!)");
+
 	ctx.repo = repo;
 
 	prepare_repo_settings(ctx.repo);

From 0cd8584d40264f161e4264c930aa7853813c3593 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 6 Jun 2026 00:47:53 +0200
Subject: [PATCH 103/247] repo: filter the structure scope via
 --ref-filter=<pattern>

`git repo structure` walks every reference enumerated by
`refs_for_each_ref()` and feeds each reference's tip into the path
walk that produces the object counts. There is no way to scope the
inquiry to a subset of refs, even though that is the most common
need when an operator is investigating what part of the history is
driving cost: only branches, only release tags, only one remote's
view, etc.

Add a single `--ref-filter=<pattern>` option that, when given,
restricts both the reference count and the object walk to refs whose
full name matches one of the patterns. The option is repeatable;
multiple patterns form a union, so `--ref-filter='refs/heads/*'
--ref-filter='refs/tags/v*'` includes local branches and tags whose
short name starts with `v`. Patterns use `wildmatch()` with
`WM_PATHNAME` semantics so a `*` does not cross `/`, matching the
convention used by `git for-each-ref` positional arguments.

Choosing a single flexible filter, rather than a proliferation of
per-kind flags like `--branches`, `--tags`, `--remotes`, keeps the
option surface small and lets the same mechanism express
narrow selections the per-kind flags could not, such as "only release
tags" (`'refs/tags/v*'`) or "only one remote's branches"
(`'refs/remotes/origin/*'`). Without `--ref-filter`, behaviour is
unchanged: every ref `refs_for_each_ref()` enumerates contributes.

Both the reference counter and the path-walk seeding (via
`add_pending_oid()`) sit on the same callback, so an early return
when no pattern matches naturally excludes a ref from both. No
separate object-walk machinery is needed.

Cover the two interesting code paths with tests in t1901: a single
filter narrowing to branches, and two filters unioning to include
both branches and tags.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 Documentation/git-repo.adoc | 19 +++++++++++++++++--
 builtin/repo.c              | 36 ++++++++++++++++++++++++++++++++++--
 t/t1901-repo-structure.sh   | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 4 deletions(-)

diff --git a/Documentation/git-repo.adoc b/Documentation/git-repo.adoc
index ed7d80c690c720..c266ff70535536 100644
--- a/Documentation/git-repo.adoc
+++ b/Documentation/git-repo.adoc
@@ -10,7 +10,7 @@ SYNOPSIS
 [synopsis]
 git repo info [--format=(lines|nul) | -z] [--all | <key>...]
 git repo info --keys [--format=(lines|nul) | -z]
-git repo structure [--format=(table|lines|nul) | -z]
+git repo structure [<options>]
 
 DESCRIPTION
 -----------
@@ -56,7 +56,7 @@ supported:
 `nul`:::
 	Similar to `lines`, but using a _NUL_ character after each value.
 
-`structure [--format=(table|lines|nul) | -z]`::
+`structure`::
 	Retrieve statistics about the current repository structure. The
 	following kinds of information are reported:
 +
@@ -66,6 +66,21 @@ supported:
 * Total disk size of reachable objects by type
 * Largest reachable objects in the repository by type
 +
+By default every reference enumerated by `for-each-ref` contributes to
+the counts and object walk. Use `--ref-filter` to narrow the scope.
+
+	`--ref-filter=<pattern>`;;
+		Only count references whose full name matches one of the
+		given <pattern>s, and only seed the object walk from
+		those references. The option is repeatable; multiple
+		patterns form a union. Patterns use the same `wildmatch`
+		semantics as `git for-each-ref`'s positional arguments,
+		so `*` does not cross `/`. Examples:
+		`--ref-filter='refs/heads/*'` for local branches,
+		`--ref-filter='refs/tags/v*'` for release tags,
+		`--ref-filter='refs/remotes/origin/*'` for a single
+		remote's branches.
++
 The output format can be chosen through the flag `--format`. Three formats are
 supported:
 +
diff --git a/builtin/repo.c b/builtin/repo.c
index 74fbc8285bbd76..5a1130b9815365 100644
--- a/builtin/repo.c
+++ b/builtin/repo.c
@@ -21,13 +21,14 @@
 #include "tree.h"
 #include "tree-walk.h"
 #include "utf8.h"
+#include "wildmatch.h"
 
 #define REPO_INFO_USAGE \
 	"git repo info [--format=(lines|nul) | -z] [--all | <key>...]", \
 	"git repo info --keys [--format=(lines|nul) | -z]"
 
 #define REPO_STRUCTURE_USAGE \
-	"git repo structure [--format=(table|lines|nul) | -z]"
+	"git repo structure [<options>]"
 
 static const char *const repo_usage[] = {
 	REPO_INFO_USAGE,
@@ -745,15 +746,38 @@ struct count_references_data {
 	struct ref_stats *stats;
 	struct rev_info *revs;
 	struct repository *repo;
+	const struct string_list *filters;
 	struct progress *progress;
 };
 
+static int ref_matches_any_filter(const char *refname,
+				  const struct string_list *filters)
+{
+	if (!filters->nr)
+		return 1;
+	for (size_t i = 0, namelen = strlen(refname); i < filters->nr; i++) {
+		const char *p = filters->items[i].string;
+		size_t plen = strlen(p);
+		if (plen <= namelen &&
+		    !strncmp(refname, p, plen) &&
+		    (refname[plen] == '\0' || refname[plen] == '/' ||
+		     (plen && p[plen - 1] == '/')))
+			return 1;
+		if (!wildmatch(p, refname, WM_PATHNAME))
+			return 1;
+	}
+	return 0;
+}
+
 static int count_references(const struct reference *ref, void *cb_data)
 {
 	struct count_references_data *data = cb_data;
 	struct ref_stats *stats = data->stats;
 	size_t ref_count;
 
+	if (!ref_matches_any_filter(ref->name, data->filters))
+		return 0;
+
 	switch (ref_kind_from_refname(ref->name)) {
 	case FILTER_REFS_BRANCHES:
 		stats->branches++;
@@ -789,12 +813,14 @@ static int count_references(const struct reference *ref, void *cb_data)
 static void structure_count_references(struct ref_stats *stats,
 				       struct rev_info *revs,
 				       struct repository *repo,
+				       const struct string_list *filters,
 				       int show_progress)
 {
 	struct count_references_data data = {
 		.stats = stats,
 		.revs = revs,
 		.repo = repo,
+		.filters = filters,
 	};
 
 	if (show_progress)
@@ -945,6 +971,7 @@ static int cmd_repo_structure(int argc, const char **argv, const char *prefix,
 	struct repo_structure stats = { 0 };
 	struct rev_info revs;
 	int show_progress = -1;
+	struct string_list ref_filters = STRING_LIST_INIT_DUP;
 	struct option options[] = {
 		OPT_CALLBACK_F(0, "format", &format, N_("format"),
 			       N_("output format"),
@@ -954,6 +981,9 @@ static int cmd_repo_structure(int argc, const char **argv, const char *prefix,
 			       PARSE_OPT_NONEG | PARSE_OPT_NOARG,
 			       parse_format_cb),
 		OPT_BOOL(0, "progress", &show_progress, N_("show progress")),
+		OPT_STRING_LIST(0, "ref-filter", &ref_filters, N_("pattern"),
+				N_("only count refs matching <pattern>; "
+				   "repeat to union multiple patterns")),
 		OPT_END()
 	};
 
@@ -966,7 +996,8 @@ static int cmd_repo_structure(int argc, const char **argv, const char *prefix,
 	if (show_progress < 0)
 		show_progress = isatty(2);
 
-	structure_count_references(&stats.refs, &revs, repo, show_progress);
+	structure_count_references(&stats.refs, &revs, repo, &ref_filters,
+				   show_progress);
 	structure_count_objects(&stats.objects, &revs, repo, show_progress);
 
 	switch (format) {
@@ -985,6 +1016,7 @@ static int cmd_repo_structure(int argc, const char **argv, const char *prefix,
 	}
 
 	stats_table_clear(&table);
+	string_list_clear(&ref_filters, 0);
 	release_revisions(&revs);
 
 	return 0;
diff --git a/t/t1901-repo-structure.sh b/t/t1901-repo-structure.sh
index 90774786d90a9a..3d259eff00a715 100755
--- a/t/t1901-repo-structure.sh
+++ b/t/t1901-repo-structure.sh
@@ -228,6 +228,41 @@ test_expect_success 'progress meter option' '
 	)
 '
 
+test_expect_success '--ref-filter narrows the set of refs' '
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit foo &&
+		git tag v1 &&
+		git update-ref refs/remotes/origin/main HEAD &&
+
+		git repo structure --format=lines \
+			--ref-filter="refs/heads/*" >out &&
+		test_grep "^references.branches.count=1$" out &&
+		test_grep "^references.tags.count=0$" out &&
+		test_grep "^references.remotes.count=0$" out
+	)
+'
+
+test_expect_success '--ref-filter unions multiple patterns' '
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit foo &&
+		git tag v1 &&
+		git update-ref refs/remotes/origin/main HEAD &&
+
+		git repo structure --format=lines \
+			--ref-filter="refs/heads/*" \
+			--ref-filter="refs/tags/*" >out &&
+		test_grep "^references.branches.count=1$" out &&
+		test_grep "^references.tags.count=2$" out &&
+		test_grep "^references.remotes.count=0$" out
+	)
+'
+
 test_expect_success 'git repo structure -h shows only repo structure usage' '
 	git repo structure -h >actual &&
 	test_grep "git repo structure" actual &&

From 27337ddff3f6fabcfab1d426680b8c9c06b1738b Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 16:41:17 +0200
Subject: [PATCH 104/247] diff: stop truncating the deflated-binary-diff size
 on Windows

Continue the size_t evacuation around large object handling: with
deflate_it() and the locals around it widened, the
cast_size_t_to_ulong() shim the prior delta_delta() widening had to
leave behind in emit_binary_diff_body() goes away. deflate_it() is
file-static; the only callers are the two in emit_binary_diff_body()
already touched here.

emit_diff_symbol() formats the resulting sizes via uintmax_t / %"PRIuMAX",
so the diff output is not affected; only the per-process upper bound
on a binary patch chunk that this function can address grows beyond
4 GiB on Windows.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 diff.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/diff.c b/diff.c
index 414532d09f5ba3..5380a255dfb29a 100644
--- a/diff.c
+++ b/diff.c
@@ -3583,8 +3583,8 @@ static int checkdiff_consume(void *priv, char *line, unsigned long len)
 }
 
 static unsigned char *deflate_it(char *data,
-				 unsigned long size,
-				 unsigned long *result_size)
+				 size_t size,
+				 size_t *result_size)
 {
 	size_t bound;
 	unsigned char *deflated;
@@ -3613,10 +3613,10 @@ static void emit_binary_diff_body(struct diff_options *o,
 	void *delta;
 	void *deflated;
 	void *data;
-	unsigned long orig_size;
-	unsigned long delta_size;
-	unsigned long deflate_size;
-	unsigned long data_size;
+	size_t orig_size;
+	size_t delta_size;
+	size_t deflate_size;
+	size_t data_size;
 
 	/* We could do deflated delta, or we could do just deflated two,
 	 * whichever is smaller.
@@ -3624,11 +3624,9 @@ static void emit_binary_diff_body(struct diff_options *o,
 	delta = NULL;
 	deflated = deflate_it(two->ptr, two->size, &deflate_size);
 	if (one->size && two->size) {
-		size_t delta_size_st = 0;
 		delta = diff_delta(one->ptr, one->size,
 				   two->ptr, two->size,
-				   &delta_size_st, deflate_size);
-		delta_size = cast_size_t_to_ulong(delta_size_st);
+				   &delta_size, deflate_size);
 		if (delta) {
 			void *to_free = delta;
 			orig_size = delta_size;

From 5f4cbe80f7e1a2e582b34b43a2c545b7839c8f14 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 6 Jun 2026 00:05:16 +0200
Subject: [PATCH 105/247] repo: report top-N paths by count, disk, and inflated
 size in structure

`git survey` distinguishes itself from `git repo structure` largely by
its path-level reporting: in addition to whole-repo totals it lists the
paths whose object histories dominate the repository, ranked by raw
count, on-disk size, and inflated size, separately for trees and blobs.
That is often the most actionable output from `git survey`, since it
points an operator at the directories and files that should be reviewed
for cleanup, sparse-checkout exclusion, or rewriting.

`git repo structure` already drives the same path-walk traversal that
`git survey` uses to gather its per-path numbers; the callback simply
discards the path. Aggregate per-(path, type) summaries inside that
existing callback and add a bounded, descending-sorted "top-N" table
keyed by each of the three axes. Gate the feature behind a new
`--top=<n>` option, defaulting to 0, so unadorned invocations are
unaffected and pay no extra work for the top-N tracking.

Mirror the sort and eviction strategy from `builtin/survey.c`: keep an
array of at most N entries sorted from largest to smallest, walk it
from the bottom on each candidate, and shift entries down when a new
one belongs. Compared to `builtin/survey.c`, drop the void-pointer
indirection in the table data, type the comparator's arguments, and
fold the trivial comparators into the `(a > b) - (a < b)` idiom.

For the human-readable `table` output, extend the existing nested
bullet layout with two new top-level sections, `* Top trees` and
`* Top blobs`, each containing three sub-tables (`Top by count`,
`Top by disk size`, `Top by inflated size`). The path becomes the row
name and the relevant scalar becomes the value, reusing
`stats_table_count_addf` and `stats_table_size_addf` so units and
column alignment match the rest of the table.

For the `lines`/`nul` key-value formats, emit one
`objects.<type>.top.by_<axis>.<rank>.path=<path>` entry alongside an
`objects.<type>.top.by_<axis>.<rank>.<axis>=<value>` entry per ranked
path, so consumers can dispatch by axis without parsing the schema.
The root tree's path is the empty string as produced by the path-walk
machinery; preserve that as-is to stay faithful to the upstream
representation rather than fabricating a placeholder.

This is the first piece of folding `git survey`'s functionality into
`git repo structure`. Subsequent commits will add the corresponding
configuration knob and, eventually, turn `git survey` into a thin
deprecated shim over `git repo structure`.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 Documentation/git-repo.adoc |  11 ++
 builtin/repo.c              | 250 +++++++++++++++++++++++++++++++++++-
 2 files changed, 258 insertions(+), 3 deletions(-)

diff --git a/Documentation/git-repo.adoc b/Documentation/git-repo.adoc
index c266ff70535536..fd498abb7fa658 100644
--- a/Documentation/git-repo.adoc
+++ b/Documentation/git-repo.adoc
@@ -65,6 +65,8 @@ supported:
 * Total inflated size of reachable objects by type
 * Total disk size of reachable objects by type
 * Largest reachable objects in the repository by type
+* Optionally, the top-_N_ largest paths by count, on-disk size, and
+  inflated size (see `--top` below)
 +
 By default every reference enumerated by `for-each-ref` contributes to
 the counts and object walk. Use `--ref-filter` to narrow the scope.
@@ -80,6 +82,15 @@ the counts and object walk. Use `--ref-filter` to narrow the scope.
 		`--ref-filter='refs/tags/v*'` for release tags,
 		`--ref-filter='refs/remotes/origin/*'` for a single
 		remote's branches.
+
+	`--top=<n>`;;
+		Also report the _n_ largest paths in the repository,
+		separately for trees and blobs and separately ranked by
+		object count, on-disk size, and inflated size. Defaults
+		to `0`, which suppresses the detail tables. The default
+		can also be set via the `repo.structure.top` configuration
+		variable; an explicit `--top=<n>` on the command line
+		overrides the configured value.
 +
 The output format can be chosen through the flag `--format`. Three formats are
 supported:
diff --git a/builtin/repo.c b/builtin/repo.c
index 5a1130b9815365..596761339e4209 100644
--- a/builtin/repo.c
+++ b/builtin/repo.c
@@ -316,6 +316,40 @@ struct largest_objects {
 	struct object_data tree_entries;
 };
 
+/*
+ * Per-path summary of all objects that share a given (path, type) under the
+ * path-walk traversal: the count of objects, their on-disk size, and their
+ * inflated size.
+ */
+struct path_size_summary {
+	char *path;
+	size_t nr;
+	size_t disk_size;
+	size_t inflated_size;
+};
+
+typedef int (*path_summary_cmp)(const struct path_size_summary *,
+				const struct path_size_summary *);
+
+/*
+ * A bounded, descending-sorted list of the largest summaries seen so far,
+ * with a fixed comparison function defining "largest". New summaries are
+ * inserted with maybe_insert_into_top_paths(); smaller ones fall off the
+ * end of the list.
+ */
+struct top_paths_table {
+	path_summary_cmp cmp_fn;
+	size_t nr;
+	size_t alloc;
+	struct path_size_summary *data;
+};
+
+struct top_paths {
+	struct top_paths_table by_count;
+	struct top_paths_table by_disk;
+	struct top_paths_table by_inflated;
+};
+
 struct ref_stats {
 	size_t branches;
 	size_t remotes;
@@ -336,6 +370,8 @@ struct object_stats {
 	struct object_values inflated_sizes;
 	struct object_values disk_sizes;
 	struct largest_objects largest;
+	struct top_paths top_trees;
+	struct top_paths top_blobs;
 };
 
 struct repo_structure {
@@ -580,6 +616,41 @@ static void stats_table_setup_structure(struct stats_table *table,
 				     "    * %s", _("Maximum size"));
 }
 
+static void stats_table_add_top_paths(struct stats_table *table,
+				      const struct top_paths *top,
+				      const char *header)
+{
+	if (!top->by_count.nr && !top->by_disk.nr && !top->by_inflated.nr)
+		return;
+
+	stats_table_addf(table, "");
+	stats_table_addf(table, "* %s", header);
+
+	stats_table_addf(table, "  * %s", _("Top by count"));
+	for (size_t i = 0; i < top->by_count.nr; i++)
+		stats_table_count_addf(table, top->by_count.data[i].nr,
+				       "    * %s", top->by_count.data[i].path);
+
+	stats_table_addf(table, "  * %s", _("Top by disk size"));
+	for (size_t i = 0; i < top->by_disk.nr; i++)
+		stats_table_size_addf(table, top->by_disk.data[i].disk_size,
+				      "    * %s", top->by_disk.data[i].path);
+
+	stats_table_addf(table, "  * %s", _("Top by inflated size"));
+	for (size_t i = 0; i < top->by_inflated.nr; i++)
+		stats_table_size_addf(table,
+				      top->by_inflated.data[i].inflated_size,
+				      "    * %s",
+				      top->by_inflated.data[i].path);
+}
+
+static void stats_table_setup_top_paths(struct stats_table *table,
+					struct object_stats *objects)
+{
+	stats_table_add_top_paths(table, &objects->top_trees, _("Top trees"));
+	stats_table_add_top_paths(table, &objects->top_blobs, _("Top blobs"));
+}
+
 #define INDEX_WIDTH 4
 
 static void stats_table_print_structure(const struct stats_table *table)
@@ -684,6 +755,54 @@ static void print_object_data(const char *key, char key_delim,
 	       value_delim);
 }
 
+static void print_keyvalue_path(const char *key, char key_delim,
+				const char *path, char value_delim)
+{
+	printf("%s%c", key, key_delim);
+	if (key_delim == '=')
+		quote_c_style(path, NULL, stdout, 0);
+	else
+		fputs(path, stdout);
+	fputc(value_delim, stdout);
+}
+
+static void top_paths_keyvalue_print(const char *prefix,
+				     const struct top_paths *top,
+				     char key_delim, char value_delim)
+{
+	for (size_t i = 0; i < top->by_count.nr; i++) {
+		printf("%s.by_count.%" PRIuMAX ".",
+		       prefix, (uintmax_t)(i + 1));
+		print_keyvalue_path("path", key_delim,
+				    top->by_count.data[i].path, value_delim);
+		printf("%s.by_count.%" PRIuMAX ".",
+		       prefix, (uintmax_t)(i + 1));
+		print_keyvalue("count", key_delim,
+			       top->by_count.data[i].nr, value_delim);
+	}
+	for (size_t i = 0; i < top->by_disk.nr; i++) {
+		printf("%s.by_disk_size.%" PRIuMAX ".",
+		       prefix, (uintmax_t)(i + 1));
+		print_keyvalue_path("path", key_delim,
+				    top->by_disk.data[i].path, value_delim);
+		printf("%s.by_disk_size.%" PRIuMAX ".",
+		       prefix, (uintmax_t)(i + 1));
+		print_keyvalue("disk_size", key_delim,
+			       top->by_disk.data[i].disk_size, value_delim);
+	}
+	for (size_t i = 0; i < top->by_inflated.nr; i++) {
+		printf("%s.by_inflated_size.%" PRIuMAX ".",
+		       prefix, (uintmax_t)(i + 1));
+		print_keyvalue_path("path", key_delim,
+				    top->by_inflated.data[i].path, value_delim);
+		printf("%s.by_inflated_size.%" PRIuMAX ".",
+		       prefix, (uintmax_t)(i + 1));
+		print_keyvalue("inflated_size", key_delim,
+			       top->by_inflated.data[i].inflated_size,
+			       value_delim);
+	}
+}
+
 static void structure_keyvalue_print(struct repo_structure *stats,
 				     char key_delim, char value_delim)
 {
@@ -739,6 +858,11 @@ static void structure_keyvalue_print(struct repo_structure *stats,
 	print_object_data("objects.trees.max_entries", key_delim,
 			  &stats->objects.largest.tree_entries, value_delim);
 
+	top_paths_keyvalue_print("objects.trees.top", &stats->objects.top_trees,
+				 key_delim, value_delim);
+	top_paths_keyvalue_print("objects.blobs.top", &stats->objects.top_blobs,
+				 key_delim, value_delim);
+
 	fflush(stdout);
 }
 
@@ -835,8 +959,88 @@ struct count_objects_data {
 	struct object_database *odb;
 	struct object_stats *stats;
 	struct progress *progress;
+	size_t top_nr;
 };
 
+static int cmp_by_nr(const struct path_size_summary *s1,
+		     const struct path_size_summary *s2)
+{
+	return (s1->nr > s2->nr) - (s1->nr < s2->nr);
+}
+
+static int cmp_by_disk_size(const struct path_size_summary *s1,
+			    const struct path_size_summary *s2)
+{
+	return (s1->disk_size > s2->disk_size) -
+	       (s1->disk_size < s2->disk_size);
+}
+
+static int cmp_by_inflated_size(const struct path_size_summary *s1,
+				const struct path_size_summary *s2)
+{
+	return (s1->inflated_size > s2->inflated_size) -
+	       (s1->inflated_size < s2->inflated_size);
+}
+
+static void init_top_paths_table(struct top_paths_table *top, size_t limit,
+				 path_summary_cmp cmp)
+{
+	top->cmp_fn = cmp;
+	top->alloc = limit;
+	top->nr = 0;
+	CALLOC_ARRAY(top->data, limit);
+}
+
+static void init_top_paths(struct top_paths *top, size_t limit)
+{
+	init_top_paths_table(&top->by_count, limit, cmp_by_nr);
+	init_top_paths_table(&top->by_disk, limit, cmp_by_disk_size);
+	init_top_paths_table(&top->by_inflated, limit, cmp_by_inflated_size);
+}
+
+static void clear_top_paths_table(struct top_paths_table *top)
+{
+	for (size_t i = 0; i < top->nr; i++)
+		free(top->data[i].path);
+	free(top->data);
+}
+
+static void clear_top_paths(struct top_paths *top)
+{
+	clear_top_paths_table(&top->by_count);
+	clear_top_paths_table(&top->by_disk);
+	clear_top_paths_table(&top->by_inflated);
+}
+
+/*
+ * Insert 'summary' into 'top' if it ranks among the top alloc entries by the
+ * table's comparator. The list is kept sorted from largest (index 0) to
+ * smallest. If the table is already full, the smallest entry is evicted to
+ * make room.
+ */
+static void maybe_insert_into_top_paths(struct top_paths_table *top,
+					const struct path_size_summary *summary)
+{
+	size_t pos = top->nr;
+
+	while (pos > 0 && top->cmp_fn(&top->data[pos - 1], summary) < 0)
+		pos--;
+
+	if (pos >= top->alloc)
+		return;
+
+	if (top->nr == top->alloc)
+		free(top->data[top->nr - 1].path);
+	else
+		top->nr++;
+
+	for (size_t i = top->nr - 1; i > pos; i--)
+		top->data[i] = top->data[i - 1];
+
+	top->data[pos] = *summary;
+	top->data[pos].path = xstrdup(summary->path);
+}
+
 static void check_largest(struct object_data *data, struct object_id *oid,
 			  size_t value)
 {
@@ -860,11 +1064,12 @@ static size_t count_tree_entries(struct object *obj)
 	return count;
 }
 
-static int count_objects(const char *path UNUSED, struct oid_array *oids,
+static int count_objects(const char *path, struct oid_array *oids,
 			 enum object_type type, void *cb_data)
 {
 	struct count_objects_data *data = cb_data;
 	struct object_stats *stats = data->stats;
+	struct path_size_summary summary = { .path = (char *)path };
 	size_t object_count;
 
 	for (size_t i = 0; i < oids->nr; i++) {
@@ -890,6 +1095,10 @@ static int count_objects(const char *path UNUSED, struct oid_array *oids,
 		obj = parse_object_buffer(the_repository, &oids->oid[i], type,
 					  inflated, content, &eaten);
 
+		summary.nr++;
+		summary.disk_size += disk;
+		summary.inflated_size += inflated;
+
 		switch (type) {
 		case OBJ_TAG:
 			stats->type_counts.tags++;
@@ -932,6 +1141,22 @@ static int count_objects(const char *path UNUSED, struct oid_array *oids,
 			free(content);
 	}
 
+	if (data->top_nr) {
+		struct top_paths *top = NULL;
+
+		if (type == OBJ_TREE)
+			top = &stats->top_trees;
+		else if (type == OBJ_BLOB)
+			top = &stats->top_blobs;
+
+		if (top) {
+			maybe_insert_into_top_paths(&top->by_count, &summary);
+			maybe_insert_into_top_paths(&top->by_disk, &summary);
+			maybe_insert_into_top_paths(&top->by_inflated,
+						    &summary);
+		}
+	}
+
 	object_count = get_total_object_values(&stats->type_counts);
 	display_progress(data->progress, object_count);
 
@@ -940,12 +1165,14 @@ static int count_objects(const char *path UNUSED, struct oid_array *oids,
 
 static void structure_count_objects(struct object_stats *stats,
 				    struct rev_info *revs,
-				    struct repository *repo, int show_progress)
+				    struct repository *repo, size_t top_nr,
+				    int show_progress)
 {
 	struct path_walk_info info = PATH_WALK_INFO_INIT;
 	struct count_objects_data data = {
 		.odb = repo->objects,
 		.stats = stats,
+		.top_nr = top_nr,
 	};
 
 	info.revs = revs;
@@ -971,6 +1198,7 @@ static int cmd_repo_structure(int argc, const char **argv, const char *prefix,
 	struct repo_structure stats = { 0 };
 	struct rev_info revs;
 	int show_progress = -1;
+	int top_nr = 0;
 	struct string_list ref_filters = STRING_LIST_INIT_DUP;
 	struct option options[] = {
 		OPT_CALLBACK_F(0, "format", &format, N_("format"),
@@ -984,25 +1212,37 @@ static int cmd_repo_structure(int argc, const char **argv, const char *prefix,
 		OPT_STRING_LIST(0, "ref-filter", &ref_filters, N_("pattern"),
 				N_("only count refs matching <pattern>; "
 				   "repeat to union multiple patterns")),
+		OPT_INTEGER(0, "top", &top_nr,
+			    N_("report the top <n> largest paths "
+			       "per category")),
 		OPT_END()
 	};
 
 	argc = parse_options(argc, argv, prefix, options, repo_structure_usage, 0);
 	if (argc)
 		usage(_("too many arguments"));
+	if (top_nr < 0)
+		die(_("--top=<n> must be non-negative"));
 
 	repo_init_revisions(repo, &revs, prefix);
 
 	if (show_progress < 0)
 		show_progress = isatty(2);
 
+	if (top_nr) {
+		init_top_paths(&stats.objects.top_trees, top_nr);
+		init_top_paths(&stats.objects.top_blobs, top_nr);
+	}
+
 	structure_count_references(&stats.refs, &revs, repo, &ref_filters,
 				   show_progress);
-	structure_count_objects(&stats.objects, &revs, repo, show_progress);
+	structure_count_objects(&stats.objects, &revs, repo, top_nr,
+				show_progress);
 
 	switch (format) {
 	case FORMAT_TABLE:
 		stats_table_setup_structure(&table, &stats);
+		stats_table_setup_top_paths(&table, &stats.objects);
 		stats_table_print_structure(&table);
 		break;
 	case FORMAT_NEWLINE_TERMINATED:
@@ -1017,6 +1257,10 @@ static int cmd_repo_structure(int argc, const char **argv, const char *prefix,
 
 	stats_table_clear(&table);
 	string_list_clear(&ref_filters, 0);
+	if (top_nr) {
+		clear_top_paths(&stats.objects.top_trees);
+		clear_top_paths(&stats.objects.top_blobs);
+	}
 	release_revisions(&revs);
 
 	return 0;

From 1f37fd2b8b3c415a32ec10247eb89d48ab988db2 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 14 Nov 2019 20:09:23 +0100
Subject: [PATCH 106/247] mingw: make sure `errno` is set correctly when socket
 operations fail

The winsock2 library provides functions that work on different data
types than file descriptors, therefore we wrap them.

But that is not the only difference: they also do not set `errno` but
expect the callers to enquire about errors via `WSAGetLastError()`.

Let's translate that into appropriate `errno` values whenever the socket
operations fail so that Git's code base does not have to change its
expectations.

This closes https://github.com/git-for-windows/git/issues/2404

Helped-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/mingw.c | 157 +++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 147 insertions(+), 10 deletions(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 0c8179f3458bb8..3b788764946ec0 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -2419,18 +2419,150 @@ static void ensure_socket_initialization(void)
 	initialized = 1;
 }
 
+static int winsock_error_to_errno(DWORD err)
+{
+	switch (err) {
+	case WSAEINTR: return EINTR;
+	case WSAEBADF: return EBADF;
+	case WSAEACCES: return EACCES;
+	case WSAEFAULT: return EFAULT;
+	case WSAEINVAL: return EINVAL;
+	case WSAEMFILE: return EMFILE;
+	case WSAEWOULDBLOCK: return EWOULDBLOCK;
+	case WSAEINPROGRESS: return EINPROGRESS;
+	case WSAEALREADY: return EALREADY;
+	case WSAENOTSOCK: return ENOTSOCK;
+	case WSAEDESTADDRREQ: return EDESTADDRREQ;
+	case WSAEMSGSIZE: return EMSGSIZE;
+	case WSAEPROTOTYPE: return EPROTOTYPE;
+	case WSAENOPROTOOPT: return ENOPROTOOPT;
+	case WSAEPROTONOSUPPORT: return EPROTONOSUPPORT;
+	case WSAEOPNOTSUPP: return EOPNOTSUPP;
+	case WSAEAFNOSUPPORT: return EAFNOSUPPORT;
+	case WSAEADDRINUSE: return EADDRINUSE;
+	case WSAEADDRNOTAVAIL: return EADDRNOTAVAIL;
+	case WSAENETDOWN: return ENETDOWN;
+	case WSAENETUNREACH: return ENETUNREACH;
+	case WSAENETRESET: return ENETRESET;
+	case WSAECONNABORTED: return ECONNABORTED;
+	case WSAECONNRESET: return ECONNRESET;
+	case WSAENOBUFS: return ENOBUFS;
+	case WSAEISCONN: return EISCONN;
+	case WSAENOTCONN: return ENOTCONN;
+	case WSAETIMEDOUT: return ETIMEDOUT;
+	case WSAECONNREFUSED: return ECONNREFUSED;
+	case WSAELOOP: return ELOOP;
+	case WSAENAMETOOLONG: return ENAMETOOLONG;
+	case WSAEHOSTUNREACH: return EHOSTUNREACH;
+	case WSAENOTEMPTY: return ENOTEMPTY;
+	/* No errno equivalent; default to EIO */
+	case WSAESOCKTNOSUPPORT:
+	case WSAEPFNOSUPPORT:
+	case WSAESHUTDOWN:
+	case WSAETOOMANYREFS:
+	case WSAEHOSTDOWN:
+	case WSAEPROCLIM:
+	case WSAEUSERS:
+	case WSAEDQUOT:
+	case WSAESTALE:
+	case WSAEREMOTE:
+	case WSASYSNOTREADY:
+	case WSAVERNOTSUPPORTED:
+	case WSANOTINITIALISED:
+	case WSAEDISCON:
+	case WSAENOMORE:
+	case WSAECANCELLED:
+	case WSAEINVALIDPROCTABLE:
+	case WSAEINVALIDPROVIDER:
+	case WSAEPROVIDERFAILEDINIT:
+	case WSASYSCALLFAILURE:
+	case WSASERVICE_NOT_FOUND:
+	case WSATYPE_NOT_FOUND:
+	case WSA_E_NO_MORE:
+	case WSA_E_CANCELLED:
+	case WSAEREFUSED:
+	case WSAHOST_NOT_FOUND:
+	case WSATRY_AGAIN:
+	case WSANO_RECOVERY:
+	case WSANO_DATA:
+	case WSA_QOS_RECEIVERS:
+	case WSA_QOS_SENDERS:
+	case WSA_QOS_NO_SENDERS:
+	case WSA_QOS_NO_RECEIVERS:
+	case WSA_QOS_REQUEST_CONFIRMED:
+	case WSA_QOS_ADMISSION_FAILURE:
+	case WSA_QOS_POLICY_FAILURE:
+	case WSA_QOS_BAD_STYLE:
+	case WSA_QOS_BAD_OBJECT:
+	case WSA_QOS_TRAFFIC_CTRL_ERROR:
+	case WSA_QOS_GENERIC_ERROR:
+	case WSA_QOS_ESERVICETYPE:
+	case WSA_QOS_EFLOWSPEC:
+	case WSA_QOS_EPROVSPECBUF:
+	case WSA_QOS_EFILTERSTYLE:
+	case WSA_QOS_EFILTERTYPE:
+	case WSA_QOS_EFILTERCOUNT:
+	case WSA_QOS_EOBJLENGTH:
+	case WSA_QOS_EFLOWCOUNT:
+#ifndef _MSC_VER
+	case WSA_QOS_EUNKNOWNPSOBJ:
+#endif
+	case WSA_QOS_EPOLICYOBJ:
+	case WSA_QOS_EFLOWDESC:
+	case WSA_QOS_EPSFLOWSPEC:
+	case WSA_QOS_EPSFILTERSPEC:
+	case WSA_QOS_ESDMODEOBJ:
+	case WSA_QOS_ESHAPERATEOBJ:
+	case WSA_QOS_RESERVED_PETYPE:
+	default: return EIO;
+	}
+}
+
+/*
+ * On Windows, `errno` is a global macro to a function call.
+ * This makes it difficult to debug and single-step our mappings.
+ */
+static inline void set_wsa_errno(void)
+{
+	DWORD wsa = WSAGetLastError();
+	int e = winsock_error_to_errno(wsa);
+	errno = e;
+
+#ifdef DEBUG_WSA_ERRNO
+	fprintf(stderr, "winsock error: %d -> %d\n", wsa, e);
+	fflush(stderr);
+#endif
+}
+
+static inline int winsock_return(int ret)
+{
+	if (ret < 0)
+		set_wsa_errno();
+
+	return ret;
+}
+
+#define WINSOCK_RETURN(x) do { return winsock_return(x); } while (0)
+
 #undef gethostname
 int mingw_gethostname(char *name, int namelen)
 {
-    ensure_socket_initialization();
-    return gethostname(name, namelen);
+	ensure_socket_initialization();
+	WINSOCK_RETURN(gethostname(name, namelen));
 }
 
 #undef gethostbyname
 struct hostent *mingw_gethostbyname(const char *host)
 {
+	struct hostent *ret;
+
 	ensure_socket_initialization();
-	return gethostbyname(host);
+
+	ret = gethostbyname(host);
+	if (!ret)
+		set_wsa_errno();
+
+	return ret;
 }
 
 #undef getaddrinfo
@@ -2438,7 +2570,7 @@ int mingw_getaddrinfo(const char *node, const char *service,
 		      const struct addrinfo *hints, struct addrinfo **res)
 {
 	ensure_socket_initialization();
-	return getaddrinfo(node, service, hints, res);
+	WINSOCK_RETURN(getaddrinfo(node, service, hints, res));
 }
 
 int mingw_socket(int domain, int type, int protocol)
@@ -2458,7 +2590,7 @@ int mingw_socket(int domain, int type, int protocol)
 		 * in errno so that _if_ someone looks up the code somewhere,
 		 * then it is at least the number that are usually listed.
 		 */
-		errno = WSAGetLastError();
+		set_wsa_errno();
 		return -1;
 	}
 	/* convert into a file descriptor */
@@ -2474,35 +2606,35 @@ int mingw_socket(int domain, int type, int protocol)
 int mingw_connect(int sockfd, struct sockaddr *sa, size_t sz)
 {
 	SOCKET s = (SOCKET)_get_osfhandle(sockfd);
-	return connect(s, sa, sz);
+	WINSOCK_RETURN(connect(s, sa, sz));
 }
 
 #undef bind
 int mingw_bind(int sockfd, struct sockaddr *sa, size_t sz)
 {
 	SOCKET s = (SOCKET)_get_osfhandle(sockfd);
-	return bind(s, sa, sz);
+	WINSOCK_RETURN(bind(s, sa, sz));
 }
 
 #undef setsockopt
 int mingw_setsockopt(int sockfd, int lvl, int optname, void *optval, int optlen)
 {
 	SOCKET s = (SOCKET)_get_osfhandle(sockfd);
-	return setsockopt(s, lvl, optname, (const char*)optval, optlen);
+	WINSOCK_RETURN(setsockopt(s, lvl, optname, (const char*)optval, optlen));
 }
 
 #undef shutdown
 int mingw_shutdown(int sockfd, int how)
 {
 	SOCKET s = (SOCKET)_get_osfhandle(sockfd);
-	return shutdown(s, how);
+	WINSOCK_RETURN(shutdown(s, how));
 }
 
 #undef listen
 int mingw_listen(int sockfd, int backlog)
 {
 	SOCKET s = (SOCKET)_get_osfhandle(sockfd);
-	return listen(s, backlog);
+	WINSOCK_RETURN(listen(s, backlog));
 }
 
 #undef accept
@@ -2513,6 +2645,11 @@ int mingw_accept(int sockfd1, struct sockaddr *sa, socklen_t *sz)
 	SOCKET s1 = (SOCKET)_get_osfhandle(sockfd1);
 	SOCKET s2 = accept(s1, sa, sz);
 
+	if (s2 == INVALID_SOCKET) {
+		set_wsa_errno();
+		return -1;
+	}
+
 	/* convert into a file descriptor */
 	if ((sockfd2 = _open_osfhandle(s2, O_RDWR|O_BINARY)) < 0) {
 		int err = errno;

From f123d3d6950bdb2aaeaf97fef45da724dc3c20fe Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 16:44:00 +0200
Subject: [PATCH 107/247] convert: widen gather_convert_stats() helpers to
 size_t

Prep for the upcoming read_blob_data_from_index() widening, whose
callers in convert.c feed the size they receive straight into these
two helpers. Both are file-static, so the change is contained.

Also fixes a small pre-existing narrowing on the get_wt_convert_stats_ascii()
path, where strbuf.len (size_t) was passed to a unsigned long
parameter.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 convert.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/convert.c b/convert.c
index 036506842c3d41..74d452b0deac20 100644
--- a/convert.c
+++ b/convert.c
@@ -102,7 +102,7 @@ static int convert_is_binary(const struct text_stat *stats)
 	return 0;
 }
 
-static unsigned int gather_convert_stats(const char *data, unsigned long size)
+static unsigned int gather_convert_stats(const char *data, size_t size)
 {
 	struct text_stat stats;
 	int ret = 0;
@@ -119,7 +119,7 @@ static unsigned int gather_convert_stats(const char *data, unsigned long size)
 	return ret;
 }
 
-static const char *gather_convert_stats_ascii(const char *data, unsigned long size)
+static const char *gather_convert_stats_ascii(const char *data, size_t size)
 {
 	unsigned int convert_stats = gather_convert_stats(data, size);
 

From bd5637f23ef492b8ab0c788df339d2c08304dd4e Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 6 Jun 2026 00:13:46 +0200
Subject: [PATCH 108/247] t1901: cover the --top option of `git repo structure`

The preceding commit added `--top=<n>` to `git repo structure`,
reporting the top-N paths per type ranked by count, on-disk size, and
inflated size. Cover the three behaviors that matter for that option:

  * Without `--top`, the key-value output emits no `top.*` keys, so
    existing parsers stay unaffected.

  * `--top=N` produces exactly N ranked entries on each of the six
    `objects.<type>.top.by_<axis>` axes (count/disk_size/inflated_size
    crossed with trees/blobs), and a constructed input where one blob
    is several orders of magnitude bigger than the other lets us
    assert the ordering on the disk-size and inflated-size axes.

  * A negative `--top` is rejected with a non-zero exit and a message
    naming the constraint, so a typo cannot silently degrade into the
    default zero.

Avoid grep patterns starting with `--`; grep would parse the leading
double dash as an option terminator.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t1901-repo-structure.sh | 50 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/t/t1901-repo-structure.sh b/t/t1901-repo-structure.sh
index 3d259eff00a715..baafd7fbe756ec 100755
--- a/t/t1901-repo-structure.sh
+++ b/t/t1901-repo-structure.sh
@@ -263,6 +263,56 @@ test_expect_success '--ref-filter unions multiple patterns' '
 	)
 '
 
+test_expect_success '--top omitted: no top.* keys' '
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit foo &&
+
+		git repo structure --format=lines >out &&
+		test_grep ! "\.top\." out
+	)
+'
+
+test_expect_success '--top=N reports the N largest paths per axis' '
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		mkdir -p dir1 dir2 &&
+		echo small >dir1/small.txt &&
+		printf "%010000d" 0 >dir2/big.txt &&
+		git add . &&
+		test_tick &&
+		git commit -m commit &&
+
+		git repo structure --format=lines --top=2 >out &&
+
+		# Two ranked entries on each axis for both types.
+		for axis in by_count by_disk_size by_inflated_size
+		do
+			for type in trees blobs
+			do
+				key=objects.${type}.top.${axis} &&
+				test_grep -E "^${key}\.1\.path=" out &&
+				test_grep -E "^${key}\.2\.path=" out &&
+				test_grep ! -E "^${key}\.3\." out || return 1
+			done
+		done &&
+
+		# The big blob outranks the small one on disk and inflated.
+		key=objects.blobs.top &&
+		test_grep "^${key}.by_disk_size.1.path=dir2/big.txt$" out &&
+		test_grep "^${key}.by_inflated_size.1.path=dir2/big.txt$" out
+	)
+'
+
+test_expect_success '--top rejects negative values' '
+	test_must_fail git repo structure --top=-1 2>err &&
+	test_grep "must be non-negative" err
+'
+
 test_expect_success 'git repo structure -h shows only repo structure usage' '
 	git repo structure -h >actual &&
 	test_grep "git repo structure" actual &&

From c5bc0d4cdce45ee731dd530e10444a1738950a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20A=C3=9Fhauer?= <mha1993@live.de>
Date: Sun, 22 Dec 2024 17:15:39 +0100
Subject: [PATCH 109/247] compat/mingw: handle WSA errors in strerror
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We map WSAGetLastError() errors to errno errors in winsock_error_to_errno(),
but the MSVC strerror() implementation only produces "Unknown error" for
most of them. Produce some more meaningful error messages in these
cases.

Our builds for ARM64 link against the newer UCRT strerror() that does know
these errors, so we won't change the strerror() used there.

The wording of the messages is copied from glibc strerror() messages.

Reported-by: M Hickford <mirth.hickford@gmail.com>
Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 Makefile               |  1 +
 compat/mingw-posix.h   |  5 +++
 compat/mingw.c         | 85 ++++++++++++++++++++++++++++++++++++++++++
 t/meson.build          |  1 +
 t/unit-tests/u-mingw.c | 72 +++++++++++++++++++++++++++++++++++
 5 files changed, 164 insertions(+)
 create mode 100644 t/unit-tests/u-mingw.c

diff --git a/Makefile b/Makefile
index c649c93c510332..0dc1681a3e6024 100644
--- a/Makefile
+++ b/Makefile
@@ -1542,6 +1542,7 @@ CLAR_TEST_SUITES += u-hash
 CLAR_TEST_SUITES += u-hashmap
 CLAR_TEST_SUITES += u-list-objects-filter-options
 CLAR_TEST_SUITES += u-mem-pool
+CLAR_TEST_SUITES += u-mingw
 CLAR_TEST_SUITES += u-odb-inmemory
 CLAR_TEST_SUITES += u-oid-array
 CLAR_TEST_SUITES += u-oidmap
diff --git a/compat/mingw-posix.h b/compat/mingw-posix.h
index 2d989fd762474e..da934834a1a177 100644
--- a/compat/mingw-posix.h
+++ b/compat/mingw-posix.h
@@ -288,6 +288,11 @@ int mingw_socket(int domain, int type, int protocol);
 int mingw_connect(int sockfd, struct sockaddr *sa, size_t sz);
 #define connect mingw_connect
 
+char *mingw_strerror(int errnum);
+#ifndef _UCRT
+#define strerror mingw_strerror
+#endif
+
 int mingw_bind(int sockfd, struct sockaddr *sa, size_t sz);
 #define bind mingw_bind
 
diff --git a/compat/mingw.c b/compat/mingw.c
index 3b788764946ec0..d0416f8d8e2664 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -2544,6 +2544,91 @@ static inline int winsock_return(int ret)
 
 #define WINSOCK_RETURN(x) do { return winsock_return(x); } while (0)
 
+#undef strerror
+char *mingw_strerror(int errnum)
+{
+	static char buf[41] ="";
+	switch (errnum) {
+		case EWOULDBLOCK:
+			xsnprintf(buf, 41, "%s", "Operation would block");
+			break;
+		case EINPROGRESS:
+			xsnprintf(buf, 41, "%s", "Operation now in progress");
+			break;
+		case EALREADY:
+			xsnprintf(buf, 41, "%s", "Operation already in progress");
+			break;
+		case ENOTSOCK:
+			xsnprintf(buf, 41, "%s", "Socket operation on non-socket");
+			break;
+		case EDESTADDRREQ:
+			xsnprintf(buf, 41, "%s", "Destination address required");
+			break;
+		case EMSGSIZE:
+			xsnprintf(buf, 41, "%s", "Message too long");
+			break;
+		case EPROTOTYPE:
+			xsnprintf(buf, 41, "%s", "Protocol wrong type for socket");
+			break;
+		case ENOPROTOOPT:
+			xsnprintf(buf, 41, "%s", "Protocol not available");
+			break;
+		case EPROTONOSUPPORT:
+			xsnprintf(buf, 41, "%s", "Protocol not supported");
+			break;
+		case EOPNOTSUPP:
+			xsnprintf(buf, 41, "%s", "Operation not supported");
+			break;
+		case EAFNOSUPPORT:
+			xsnprintf(buf, 41, "%s", "Address family not supported by protocol");
+			break;
+		case EADDRINUSE:
+			xsnprintf(buf, 41, "%s", "Address already in use");
+			break;
+		case EADDRNOTAVAIL:
+			xsnprintf(buf, 41, "%s", "Cannot assign requested address");
+			break;
+		case ENETDOWN:
+			xsnprintf(buf, 41, "%s", "Network is down");
+			break;
+		case ENETUNREACH:
+			xsnprintf(buf, 41, "%s", "Network is unreachable");
+			break;
+		case ENETRESET:
+			xsnprintf(buf, 41, "%s", "Network dropped connection on reset");
+			break;
+		case ECONNABORTED:
+			xsnprintf(buf, 41, "%s", "Software caused connection abort");
+			break;
+		case ECONNRESET:
+			xsnprintf(buf, 41, "%s", "Connection reset by peer");
+			break;
+		case ENOBUFS:
+			xsnprintf(buf, 41, "%s", "No buffer space available");
+			break;
+		case EISCONN:
+			xsnprintf(buf, 41, "%s", "Transport endpoint is already connected");
+			break;
+		case ENOTCONN:
+			xsnprintf(buf, 41, "%s", "Transport endpoint is not connected");
+			break;
+		case ETIMEDOUT:
+			xsnprintf(buf, 41, "%s", "Connection timed out");
+			break;
+		case ECONNREFUSED:
+			xsnprintf(buf, 41, "%s", "Connection refused");
+			break;
+		case ELOOP:
+			xsnprintf(buf, 41, "%s", "Too many levels of symbolic links");
+			break;
+		case EHOSTUNREACH:
+			xsnprintf(buf, 41, "%s", "No route to host");
+			break;
+		default: return strerror(errnum);
+	}
+	return buf;
+}
+
 #undef gethostname
 int mingw_gethostname(char *name, int namelen)
 {
diff --git a/t/meson.build b/t/meson.build
index 3ca7b271040a62..ad3e87901c28e7 100644
--- a/t/meson.build
+++ b/t/meson.build
@@ -6,6 +6,7 @@ clar_test_suites = [
   'unit-tests/u-hashmap.c',
   'unit-tests/u-list-objects-filter-options.c',
   'unit-tests/u-mem-pool.c',
+  'unit-tests/u-mingw.c',
   'unit-tests/u-odb-inmemory.c',
   'unit-tests/u-oid-array.c',
   'unit-tests/u-oidmap.c',
diff --git a/t/unit-tests/u-mingw.c b/t/unit-tests/u-mingw.c
new file mode 100644
index 00000000000000..cb74da5e793a33
--- /dev/null
+++ b/t/unit-tests/u-mingw.c
@@ -0,0 +1,72 @@
+#include "unit-test.h"
+
+#if defined(GIT_WINDOWS_NATIVE) && !defined(_UCRT)
+#undef strerror
+int errnos_contains(int);
+static int errnos [53]={
+    /* errnos in err_win_to_posix */
+    EACCES, EBUSY, EEXIST, ERANGE, EIO, ENODEV, ENXIO, ENOEXEC, EINVAL, ENOENT,
+    EPIPE, ENAMETOOLONG, ENOSYS, ENOTEMPTY, ENOSPC, EFAULT, EBADF, EPERM, EINTR,
+    E2BIG, ESPIPE, ENOMEM, EXDEV, EAGAIN, ENFILE, EMFILE, ECHILD, EROFS,
+    /* errnos only in winsock_error_to_errno */
+    EWOULDBLOCK, EINPROGRESS, EALREADY, ENOTSOCK, EDESTADDRREQ, EMSGSIZE,
+    EPROTOTYPE, ENOPROTOOPT, EPROTONOSUPPORT, EOPNOTSUPP, EAFNOSUPPORT,
+    EADDRINUSE, EADDRNOTAVAIL, ENETDOWN, ENETUNREACH, ENETRESET, ECONNABORTED,
+    ECONNRESET, ENOBUFS, EISCONN, ENOTCONN, ETIMEDOUT, ECONNREFUSED, ELOOP,
+    EHOSTUNREACH
+    };
+
+int errnos_contains(int errnum)
+{
+    for(int i=0;i<53;i++)
+	if(errnos[i]==errnum)
+	    return 1;
+    return 0;
+}
+#endif
+
+void test_mingw__no_strerror_shim_on_ucrt(void)
+{
+#if defined(GIT_WINDOWS_NATIVE) && defined(_UCRT)
+    cl_assert_(strerror != mingw_strerror,
+	"mingw_strerror is unnescessary when building against UCRT");
+#else
+    cl_skip();
+#endif
+}
+
+void test_mingw__strerror(void)
+{
+#if defined(GIT_WINDOWS_NATIVE) && !defined(_UCRT)
+    for(int i=0;i<53;i++)
+    {
+	char *crt;
+	char *mingw;
+	mingw = mingw_strerror(errnos[i]);
+	crt = strerror(errnos[i]);
+	cl_assert_(!strcasestr(mingw, "unknown error"),
+	    "mingw_strerror should know all errno values we care about");
+	if(!strcasestr(crt, "unknown error"))
+	    cl_assert_equal_s(crt,mingw);
+    }
+#else
+    cl_skip();
+#endif
+}
+
+void test_mingw__errno_translation(void)
+{
+#if defined(GIT_WINDOWS_NATIVE) && !defined(_UCRT)
+    /* GetLastError() return values are currently defined from 0 to 15841,
+    testing up to 20000 covers some room for future expansion */
+    for (int i=0;i<20000;i++)
+    {
+	if(i!=ERROR_SUCCESS)
+	    cl_assert_(errnos_contains(err_win_to_posix(i)),
+		"all err_win_to_posix return values should be tested against mingw_strerror");
+	/* ideally we'd test the same for winsock_error_to_errno, but it's static */
+    }
+#else
+    cl_skip();
+#endif
+}

From ed297803a9cdcd046ae62ade4a2f0de9d3065169 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 26 Nov 2025 17:51:41 +0100
Subject: [PATCH 110/247] t5563: verify that NTLM authentication works

Although NTLM authentication is considered weak (extending even to
NTLMv2, which purportedly allows brute-forcing reasonably complex
8-character passwords in a matter of days, given ample compute
resources), it _is_ one of the authentication methods supported by
libcurl.

Note: The added test case *cannot* reuse the existing `custom_auth`
facility. The reason is that that facility is backed by an NPH script
("No Parse Headers"), which does not allow handling the 3-phase NTLM
authentication correctly (in my hands, the NPH script would not even be
called upon the Type 3 message, a "200 OK" would be returned, but no
headers, let alone the `git http-backend` output as payload). Having a
separate NTLM authentication script makes the exact workings clearer and
more readable, anyway.

Co-authored-by: Matthew John Cheetham <mjcheetham@outlook.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/lib-httpd.sh                |  1 +
 t/lib-httpd/apache.conf       |  8 ++++
 t/lib-httpd/ntlm-handshake.sh | 38 +++++++++++++++++++
 t/t5563-simple-http-auth.sh   | 71 +++--------------------------------
 4 files changed, 53 insertions(+), 65 deletions(-)
 create mode 100755 t/lib-httpd/ntlm-handshake.sh

diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 115455784c8fd6..99c3e6c5221681 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -180,6 +180,7 @@ prepare_httpd() {
 	install_script apply-one-time-script.sh
 	install_script nph-custom-auth.sh
 	install_script http-429.sh
+	install_script ntlm-handshake.sh
 
 	ln -s "$LIB_HTTPD_MODULE_PATH" "$HTTPD_ROOT_PATH/modules"
 
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 4149fc1078a877..a2dd5dc18d2aad 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -156,6 +156,13 @@ SetEnv PERL_PATH ${PERL_PATH}
 	CGIPassAuth on
 	</IfDefine>
 </LocationMatch>
+<LocationMatch /ntlm_auth/>
+	SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
+	SetEnv GIT_HTTP_EXPORT_ALL
+	<IfDefine USE_CGIPASSAUTH>
+	CGIPassAuth on
+	</IfDefine>
+</LocationMatch>
 ScriptAlias /smart/incomplete_length/git-upload-pack incomplete-length-upload-pack-v2-http.sh/
 ScriptAlias /smart/incomplete_body/git-upload-pack incomplete-body-upload-pack-v2-http.sh/
 ScriptAlias /smart/no_report/git-receive-pack error-no-report.sh/
@@ -167,6 +174,7 @@ ScriptAlias /error/ error.sh/
 ScriptAliasMatch /one_time_script/(.*) apply-one-time-script.sh/$1
 ScriptAliasMatch /http_429/(.*) http-429.sh/$1
 ScriptAliasMatch /custom_auth/(.*) nph-custom-auth.sh/$1
+ScriptAliasMatch /ntlm_auth/(.*) ntlm-handshake.sh/$1
 <Directory ${GIT_EXEC_PATH}>
 	Options FollowSymlinks
 </Directory>
diff --git a/t/lib-httpd/ntlm-handshake.sh b/t/lib-httpd/ntlm-handshake.sh
new file mode 100755
index 00000000000000..3cf1266e40f20a
--- /dev/null
+++ b/t/lib-httpd/ntlm-handshake.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+case "$HTTP_AUTHORIZATION" in
+'')
+	# No Authorization header -> send NTLM challenge
+	echo "Status: 401 Unauthorized"
+	echo "WWW-Authenticate: NTLM"
+	echo
+	;;
+"NTLM TlRMTVNTUAAB"*)
+	# Type 1 -> respond with Type 2 challenge (hardcoded)
+	echo "Status: 401 Unauthorized"
+	# Base64-encoded version of the Type 2 challenge:
+	# signature: 'NTLMSSP\0'
+	# message_type: 2
+	# target_name: 'NTLM-GIT-SERVER'
+	# flags: 0xa2898205 =
+	#   NEGOTIATE_UNICODE, REQUEST_TARGET, NEGOTIATE_NT_ONLY,
+	#   TARGET_TYPE_SERVER, TARGET_TYPE_SHARE, REQUEST_NON_NT_SESSION_KEY,
+	#   NEGOTIATE_VERSION, NEGOTIATE_128, NEGOTIATE_56
+	# challenge: 0xfa3dec518896295b
+	# context: '0000000000000000'
+	# target_info_present: true
+	# target_info_len: 128
+	# version: '10.0 (build 19041)'
+	echo "WWW-Authenticate: NTLM TlRMTVNTUAACAAAAHgAeADgAAAAFgomi+j3sUYiWKVsAAAAAAAAAAIAAgABWAAAACgBhSgAAAA9OAFQATABNAC0ARwBJAFQALQBTAEUAUgBWAEUAUgACABIAVwBPAFIASwBHAFIATwBVAFAAAQAeAE4AVABMAE0ALQBHAEkAVAAtAFMARQBSAFYARQBSAAQAEgBXAE8AUgBLAEcAUgBPAFUAUAADAB4ATgBUAEwATQAtAEcASQBUAC0AUwBFAFIAVgBFAFIABwAIAACfOcZKYNwBAAAAAA=="
+	echo
+	;;
+"NTLM TlRMTVNTUAAD"*)
+	# Type 3 -> accept without validation
+	exec "$GIT_EXEC_PATH"/git-http-backend
+	;;
+*)
+	echo "Status: 500 Unrecognized"
+	echo
+	echo "Unhandled auth: '$HTTP_AUTHORIZATION'"
+	;;
+esac
diff --git a/t/t5563-simple-http-auth.sh b/t/t5563-simple-http-auth.sh
index a7d475dd68dbd7..b8cef9dd5b1413 100755
--- a/t/t5563-simple-http-auth.sh
+++ b/t/t5563-simple-http-auth.sh
@@ -719,78 +719,19 @@ test_expect_success 'access using three-legged auth' '
 	EOF
 '
 
-test_lazy_prereq SPNEGO 'curl --version | grep -qi "SPNEGO\|GSS-API\|Kerberos\|negotiate"'
+test_lazy_prereq NTLM 'curl --version | grep -q NTLM'
 
-test_expect_success SPNEGO 'http.emptyAuth=auto attempts Negotiate before credential_fill' '
+test_expect_success NTLM 'access using NTLM auth' '
 	test_when_finished "per_test_cleanup" &&
 
 	set_credential_reply get <<-EOF &&
-	username=alice
-	password=secret-passwd
-	EOF
-
-	# Basic base64(alice:secret-passwd)
-	cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF &&
-	id=1 creds=Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA==
-	EOF
-
-	cat >"$HTTPD_ROOT_PATH/custom-auth.challenge" <<-EOF &&
-	id=1 status=200
-	id=default response=WWW-Authenticate: Negotiate
-	id=default response=WWW-Authenticate: Basic realm="example.com"
-	EOF
-
-	test_config_global credential.helper test-helper &&
-	GIT_TRACE_CURL="$TRASH_DIRECTORY/trace-auto" \
-		git -c http.emptyAuth=auto \
-		ls-remote "$HTTPD_URL/custom_auth/repo.git" &&
-
-	# In auto mode with a Negotiate+Basic server, there should be
-	# three 401 responses: (1) initial no-auth request, (2) empty-auth
-	# retry where Negotiate fails (no Kerberos ticket), (3) libcurl
-	# internal Negotiate retry. The fourth attempt uses Basic
-	# credentials from credential_fill and succeeds.
-	grep "HTTP/[0-9.]* 401" "$TRASH_DIRECTORY/trace-auto" >actual_401s &&
-	test_line_count = 3 actual_401s &&
-
-	expect_credential_query get <<-EOF
-	capability[]=authtype
-	capability[]=state
-	protocol=http
-	host=$HTTPD_DEST
-	wwwauth[]=Negotiate
-	wwwauth[]=Basic realm="example.com"
-	EOF
-'
-
-test_expect_success SPNEGO 'http.emptyAuth=false skips Negotiate' '
-	test_when_finished "per_test_cleanup" &&
-
-	set_credential_reply get <<-EOF &&
-	username=alice
-	password=secret-passwd
-	EOF
-
-	# Basic base64(alice:secret-passwd)
-	cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF &&
-	id=1 creds=Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA==
-	EOF
-
-	cat >"$HTTPD_ROOT_PATH/custom-auth.challenge" <<-EOF &&
-	id=1 status=200
-	id=default response=WWW-Authenticate: Negotiate
-	id=default response=WWW-Authenticate: Basic realm="example.com"
+	username=user
+	password=pwd
 	EOF
 
 	test_config_global credential.helper test-helper &&
-	GIT_TRACE_CURL="$TRASH_DIRECTORY/trace-false" \
-		git -c http.emptyAuth=false \
-		ls-remote "$HTTPD_URL/custom_auth/repo.git" &&
-
-	# With emptyAuth=false, Negotiate is stripped immediately and
-	# credential_fill is called right away. Only one 401 response.
-	grep "HTTP/[0-9.]* 401" "$TRASH_DIRECTORY/trace-false" >actual_401s &&
-	test_line_count = 1 actual_401s
+	GIT_TRACE_CURL=1 \
+	git ls-remote "$HTTPD_URL/ntlm_auth/repo.git"
 '
 
 test_done

From b5e4c5f45c8247b870ece265b38de99c722ecc90 Mon Sep 17 00:00:00 2001
From: JiSeop Moon <zcube@zcube.kr>
Date: Mon, 23 Apr 2018 22:30:18 +0900
Subject: [PATCH 111/247] mingw: introduce code to detect whether we're inside
 a Windows container

This will come in handy in the next commit.

Signed-off-by: JiSeop Moon <zcube@zcube.kr>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/mingw.c | 32 ++++++++++++++++++++++++++++++++
 compat/mingw.h |  5 +++++
 2 files changed, 37 insertions(+)

diff --git a/compat/mingw.c b/compat/mingw.c
index 0c8179f3458bb8..bc4d54db58df0e 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -3853,3 +3853,35 @@ int mingw_have_unix_sockets(void)
 	return ret;
 }
 #endif
+
+/*
+ * Based on https://stackoverflow.com/questions/43002803
+ *
+ * [HKLM\SYSTEM\CurrentControlSet\Services\cexecsvc]
+ * "DisplayName"="@%systemroot%\\system32\\cexecsvc.exe,-100"
+ * "ErrorControl"=dword:00000001
+ * "ImagePath"=hex(2):25,00,73,00,79,00,73,00,74,00,65,00,6d,00,72,00,6f,00,
+ *    6f,00,74,00,25,00,5c,00,73,00,79,00,73,00,74,00,65,00,6d,00,33,00,32,00,
+ *    5c,00,63,00,65,00,78,00,65,00,63,00,73,00,76,00,63,00,2e,00,65,00,78,00,
+ *    65,00,00,00
+ * "Start"=dword:00000002
+ * "Type"=dword:00000010
+ * "Description"="@%systemroot%\\system32\\cexecsvc.exe,-101"
+ * "ObjectName"="LocalSystem"
+ * "ServiceSidType"=dword:00000001
+ */
+int is_inside_windows_container(void)
+{
+	static int inside_container = -1; /* -1 uninitialized */
+	const char *key = "SYSTEM\\CurrentControlSet\\Services\\cexecsvc";
+	HKEY handle = NULL;
+
+	if (inside_container != -1)
+		return inside_container;
+
+	inside_container = ERROR_SUCCESS ==
+		RegOpenKeyExA(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &handle);
+	RegCloseKey(handle);
+
+	return inside_container;
+}
diff --git a/compat/mingw.h b/compat/mingw.h
index df02aeb632d8c3..745cc657b76b98 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -216,3 +216,8 @@ int mingw_have_unix_sockets(void);
 #undef have_unix_sockets
 #define have_unix_sockets mingw_have_unix_sockets
 #endif
+
+/*
+ * Check current process is inside Windows Container.
+ */
+int is_inside_windows_container(void);

From ceb9bac3f2862e00fbd8e37d6e678c8aea9b1814 Mon Sep 17 00:00:00 2001
From: Bert Belder <bertbelder@gmail.com>
Date: Fri, 26 Oct 2018 11:13:45 +0200
Subject: [PATCH 112/247] Win32: symlink: move phantom symlink creation to a
 separate function

Signed-off-by: Bert Belder <bertbelder@gmail.com>
---
 compat/mingw.c | 91 +++++++++++++++++++++++++++-----------------------
 1 file changed, 49 insertions(+), 42 deletions(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 0c8179f3458bb8..b3af992def50bf 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -449,6 +449,54 @@ static void process_phantom_symlinks(void)
 	LeaveCriticalSection(&phantom_symlinks_cs);
 }
 
+static int create_phantom_symlink(wchar_t *wtarget, wchar_t *wlink)
+{
+	int len;
+
+	/* create file symlink */
+	if (!CreateSymbolicLinkW(wlink, wtarget, symlink_file_flags)) {
+		errno = err_win_to_posix(GetLastError());
+		return -1;
+	}
+
+	/* convert to directory symlink if target exists */
+	switch (process_phantom_symlink(wtarget, wlink)) {
+	case PHANTOM_SYMLINK_RETRY: {
+		/* if target doesn't exist, add to phantom symlinks list */
+		wchar_t wfullpath[MAX_LONG_PATH];
+		struct phantom_symlink_info *psi;
+
+		/* convert to absolute path to be independent of cwd */
+		len = GetFullPathNameW(wlink, MAX_LONG_PATH, wfullpath, NULL);
+		if (!len || len >= MAX_LONG_PATH) {
+			errno = err_win_to_posix(GetLastError());
+			return -1;
+		}
+
+		/* over-allocate and fill phantom_symlink_info structure */
+		psi = xmalloc(sizeof(struct phantom_symlink_info) +
+			      sizeof(wchar_t) * (len + wcslen(wtarget) + 2));
+		psi->wlink = (wchar_t *)(psi + 1);
+		wcscpy(psi->wlink, wfullpath);
+		psi->wtarget = psi->wlink + len + 1;
+		wcscpy(psi->wtarget, wtarget);
+
+		EnterCriticalSection(&phantom_symlinks_cs);
+		psi->next = phantom_symlinks;
+		phantom_symlinks = psi;
+		LeaveCriticalSection(&phantom_symlinks_cs);
+		break;
+	}
+	case PHANTOM_SYMLINK_DIRECTORY:
+		/* if we created a dir symlink, process other phantom symlinks */
+		process_phantom_symlinks();
+		break;
+	default:
+		break;
+	}
+	return 0;
+}
+
 /* Normalizes NT paths as returned by some low-level APIs. */
 static wchar_t *normalize_ntpath(wchar_t *wbuf)
 {
@@ -2952,48 +3000,7 @@ int symlink(const char *target, const char *link)
 		if (wtarget[len] == '/')
 			wtarget[len] = '\\';
 
-	/* create file symlink */
-	if (!CreateSymbolicLinkW(wlink, wtarget, symlink_file_flags)) {
-		errno = err_win_to_posix(GetLastError());
-		return -1;
-	}
-
-	/* convert to directory symlink if target exists */
-	switch (process_phantom_symlink(wtarget, wlink)) {
-	case PHANTOM_SYMLINK_RETRY:	{
-		/* if target doesn't exist, add to phantom symlinks list */
-		wchar_t wfullpath[MAX_PATH];
-		struct phantom_symlink_info *psi;
-
-		/* convert to absolute path to be independent of cwd */
-		len = GetFullPathNameW(wlink, MAX_PATH, wfullpath, NULL);
-		if (!len || len >= MAX_PATH) {
-			errno = err_win_to_posix(GetLastError());
-			return -1;
-		}
-
-		/* over-allocate and fill phantom_symlink_info structure */
-		psi = xmalloc(sizeof(struct phantom_symlink_info)
-			+ sizeof(wchar_t) * (len + wcslen(wtarget) + 2));
-		psi->wlink = (wchar_t *)(psi + 1);
-		wcscpy(psi->wlink, wfullpath);
-		psi->wtarget = psi->wlink + len + 1;
-		wcscpy(psi->wtarget, wtarget);
-
-		EnterCriticalSection(&phantom_symlinks_cs);
-		psi->next = phantom_symlinks;
-		phantom_symlinks = psi;
-		LeaveCriticalSection(&phantom_symlinks_cs);
-		break;
-	}
-	case PHANTOM_SYMLINK_DIRECTORY:
-		/* if we created a dir symlink, process other phantom symlinks */
-		process_phantom_symlinks();
-		break;
-	default:
-		break;
-	}
-	return 0;
+	return create_phantom_symlink(wtarget, wlink);
 }
 
 int readlink(const char *path, char *buf, size_t bufsiz)

From 14fe6d7c894d406f3326eb141e75f154880f004b Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 17:00:12 +0200
Subject: [PATCH 113/247] read-cache: stop truncating index blob sizes on
 Windows

Continue the size_t evacuation. read_blob_data_from_index() reads
the blob through the size_t odb_read_object() API but writes the
size back through an unsigned long out-parameter, silently
truncating anything past 4 GiB on Windows. Widen the out-parameter,
drop the cast_size_t_to_ulong() shim, and move the matching locals
in the two convert.c callers and the one in attr.c. Their
downstream consumers (gather_convert_stats() widened in the prior
commit and read_attr_from_buf() already size_t) take the new type
directly.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 attr.c          | 2 +-
 convert.c       | 4 ++--
 read-cache-ll.h | 2 +-
 read-cache.c    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/attr.c b/attr.c
index 0e63f1b6de8f53..1acb4ef430f5c9 100644
--- a/attr.c
+++ b/attr.c
@@ -793,7 +793,7 @@ static struct attr_stack *read_attr_from_index(struct index_state *istate,
 {
 	struct attr_stack *stack = NULL;
 	char *buf;
-	unsigned long size;
+	size_t size;
 	int sparse_dir_pos = -1;
 
 	if (!istate)
diff --git a/convert.c b/convert.c
index 74d452b0deac20..77f06fcfdba018 100644
--- a/convert.c
+++ b/convert.c
@@ -141,7 +141,7 @@ const char *get_cached_convert_stats_ascii(struct index_state *istate,
 					   const char *path)
 {
 	const char *ret;
-	unsigned long sz;
+	size_t sz;
 	void *data = read_blob_data_from_index(istate, path, &sz);
 	ret = gather_convert_stats_ascii(data, sz);
 	free(data);
@@ -223,7 +223,7 @@ static void check_global_conv_flags_eol(const char *path,
 
 static int has_crlf_in_index(struct index_state *istate, const char *path)
 {
-	unsigned long sz;
+	size_t sz;
 	void *data;
 	const char *crp;
 	int has_crlf = 0;
diff --git a/read-cache-ll.h b/read-cache-ll.h
index 066dd8bc3b8397..d279059b5fa428 100644
--- a/read-cache-ll.h
+++ b/read-cache-ll.h
@@ -416,7 +416,7 @@ int chmod_index_entry(struct index_state *, struct cache_entry *ce, char flip);
 int ce_same_name(const struct cache_entry *a, const struct cache_entry *b);
 void set_object_name_for_intent_to_add_entry(struct cache_entry *ce);
 int index_name_is_other(struct index_state *, const char *, int);
-void *read_blob_data_from_index(struct index_state *, const char *, unsigned long *);
+void *read_blob_data_from_index(struct index_state *, const char *, size_t *);
 
 /* do stat comparison even if CE_VALID is true */
 #define CE_MATCH_IGNORE_VALID		01
diff --git a/read-cache.c b/read-cache.c
index e40f290bb385e9..7a1e04c4c686d0 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -3475,7 +3475,7 @@ int index_name_is_other(struct index_state *istate, const char *name,
 }
 
 void *read_blob_data_from_index(struct index_state *istate,
-				const char *path, unsigned long *size)
+				const char *path, size_t *size)
 {
 	int pos, len;
 	size_t sz;
@@ -3506,7 +3506,7 @@ void *read_blob_data_from_index(struct index_state *istate,
 		return NULL;
 	}
 	if (size)
-		*size = cast_size_t_to_ulong(sz);
+		*size = sz;
 	return data;
 }
 

From 3a9a9f85ac1a426ea9f766bdc79fb8066e9896df Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 6 Jun 2026 00:23:37 +0200
Subject: [PATCH 114/247] repo: read the `--top` default from
 `repo.structure.top`

`git survey` exposes its `--top` default via `survey.top` so that a
site or per-repository operator can switch the detail tables on once
and have every subsequent invocation include them. Mirror that
ergonomics for `git repo structure` so that, as `git survey`'s
functionality is folded into `git repo structure`, the configuration
side of the migration story stays equivalent.

Add a small `git_config_int` callback bound to `repo.structure.top`
and invoke it before `parse_options()`, so a `--top=<N>` on the
command line cleanly overrides the configured default (including
`--top=0` to opt out of the detail tables when configuration enables
them). Reject negative configured values with the same wording as the
command-line guard, since `git_config_int()` happily returns negative
integers.

Document the new variable in a fresh `Documentation/config/repo.adoc`
and wire it into the alphabetical includes in `Documentation/config.adoc`
between `repack.adoc` and `rerere.adoc`. Cover the precedence
behaviour with a t1901 test: a configured value enables the tables by
default, and a command-line `--top=0` suppresses them again.

Note that the reported paths respect the `core.quotePath` setting.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 Documentation/config.adoc      |  2 ++
 Documentation/config/repo.adoc | 11 +++++++++++
 builtin/repo.c                 | 19 +++++++++++++++++++
 t/t1901-repo-structure.sh      | 17 +++++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 Documentation/config/repo.adoc

diff --git a/Documentation/config.adoc b/Documentation/config.adoc
index 04f7a7ec303848..624773e0d69078 100644
--- a/Documentation/config.adoc
+++ b/Documentation/config.adoc
@@ -570,6 +570,8 @@ include::config/repack.adoc[]
 
 include::config/replay.adoc[]
 
+include::config/repo.adoc[]
+
 include::config/rerere.adoc[]
 
 include::config/revert.adoc[]
diff --git a/Documentation/config/repo.adoc b/Documentation/config/repo.adoc
new file mode 100644
index 00000000000000..7f8cd632965aab
--- /dev/null
+++ b/Documentation/config/repo.adoc
@@ -0,0 +1,11 @@
+repo.structure.*::
+	These variables adjust the default behavior of the
+	`git repo structure` command.
++
+--
+	top::
+		This integer value implies `--top=<N>`, specifying the
+		number of largest paths to report in each detail table.
+		Must be non-negative; defaults to `0`, which disables the
+		detail tables.
+--
diff --git a/builtin/repo.c b/builtin/repo.c
index 596761339e4209..7e61c6d308d176 100644
--- a/builtin/repo.c
+++ b/builtin/repo.c
@@ -2,6 +2,7 @@
 
 #include "builtin.h"
 #include "commit.h"
+#include "config.h"
 #include "environment.h"
 #include "hash.h"
 #include "hex.h"
@@ -1187,6 +1188,22 @@ static void structure_count_objects(struct object_stats *stats,
 	stop_progress(&data.progress);
 }
 
+static int repo_structure_config_cb(const char *var, const char *value,
+				    const struct config_context *cctx,
+				    void *cb)
+{
+	int *top_nr = cb;
+
+	if (!strcmp(var, "repo.structure.top")) {
+		*top_nr = git_config_int(var, value, cctx->kvi);
+		if (*top_nr < 0)
+			die(_("repo.structure.top must be non-negative"));
+		return 0;
+	}
+
+	return git_default_config(var, value, cctx, NULL);
+}
+
 static int cmd_repo_structure(int argc, const char **argv, const char *prefix,
 			      struct repository *repo)
 {
@@ -1218,6 +1235,8 @@ static int cmd_repo_structure(int argc, const char **argv, const char *prefix,
 		OPT_END()
 	};
 
+	repo_config(repo, repo_structure_config_cb, &top_nr);
+
 	argc = parse_options(argc, argv, prefix, options, repo_structure_usage, 0);
 	if (argc)
 		usage(_("too many arguments"));
diff --git a/t/t1901-repo-structure.sh b/t/t1901-repo-structure.sh
index baafd7fbe756ec..c2c198c43e9922 100755
--- a/t/t1901-repo-structure.sh
+++ b/t/t1901-repo-structure.sh
@@ -313,6 +313,23 @@ test_expect_success '--top rejects negative values' '
 	test_grep "must be non-negative" err
 '
 
+test_expect_success 'repo.structure.top supplies the default for --top' '
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit foo &&
+
+		git -c repo.structure.top=2 \
+			repo structure --format=lines >with-config &&
+		test_grep "^objects.blobs.top.by_count.1.path=" with-config &&
+
+		git -c repo.structure.top=2 \
+			repo structure --format=lines --top=0 >cli-override &&
+		test_grep ! "\.top\." cli-override
+	)
+'
+
 test_expect_success 'git repo structure -h shows only repo structure usage' '
 	git repo structure -h >actual &&
 	test_grep "git repo structure" actual &&

From 1dcd28312f20a97f69346118fc443e2dabbcb2da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20A=C3=9Fhauer?= <mha1993@live.de>
Date: Sun, 22 Dec 2024 17:43:45 +0100
Subject: [PATCH 115/247] compat/mingw: drop outdated comment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This comment has been true for the longest time; The combination of the
two preceding commits made it incorrect, so let's drop that comment.

Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/mingw.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index d0416f8d8e2664..c4c57cb12022ea 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -2666,15 +2666,6 @@ int mingw_socket(int domain, int type, int protocol)
 	ensure_socket_initialization();
 	s = WSASocket(domain, type, protocol, NULL, 0, 0);
 	if (s == INVALID_SOCKET) {
-		/*
-		 * WSAGetLastError() values are regular BSD error codes
-		 * biased by WSABASEERR.
-		 * However, strerror() does not know about networking
-		 * specific errors, which are values beginning at 38 or so.
-		 * Therefore, we choose to leave the biased error code
-		 * in errno so that _if_ someone looks up the code somewhere,
-		 * then it is at least the number that are usually listed.
-		 */
 		set_wsa_errno();
 		return -1;
 	}

From 4ff3b1230fa1d1c257193840a92cd0e878392645 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 26 Nov 2025 18:47:19 +0100
Subject: [PATCH 116/247] http: disallow NTLM authentication by default

NTLM authentication is relatively weak. This is the case even with the
default setting of modern Windows versions, where NTLMv1 and LanManager
are disabled and only NTLMv2 is enabled: NTLMv2 hashes of even
reasonably complex 8-character passwords can be broken in a matter of
days, given enough compute resources.

Even worse: On Windows, NTLM authentication uses Security Support
Provider Interface ("SSPI"), which provides the credentials without
requiring the user to type them in.

Which means that an attacker could talk an unsuspecting user into
cloning from a server that is under the attacker's control and extracts
the user's NTLMv2 hash without their knowledge.

For that reason, let's disallow NTLM authentication by default.

NTLM authentication is quite simple to set up, though, and therefore
there are still some on-prem Azure DevOps setups out there whose users
and/or automation rely on this type of authentication. To give them an
escape hatch, introduce the `http.<url>.allowNTLMAuth` config setting
that can be set to `true` to opt back into using NTLM for a specific
remote repository.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 Documentation/config/http.adoc |  5 +++++
 http.c                         | 20 ++++++++++++++++----
 t/t5563-simple-http-auth.sh    |  6 ++++--
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/Documentation/config/http.adoc b/Documentation/config/http.adoc
index 792a71b41350d4..ed1281b82c59f5 100644
--- a/Documentation/config/http.adoc
+++ b/Documentation/config/http.adoc
@@ -242,6 +242,11 @@ http.sslKeyType::
 	See also libcurl `CURLOPT_SSLKEYTYPE`. Can be overridden by the
 	`GIT_SSL_KEY_TYPE` environment variable.
 
+http.allowNTLMAuth::
+	Whether or not to allow NTLM authentication. While very convenient to set
+	up, and therefore still used in many on-prem scenarios, NTLM is a weak
+	authentication method and therefore deprecated. Defaults to "false".
+
 http.schannelCheckRevoke::
 	Used to enforce or disable certificate revocation checks in cURL
 	when http.sslBackend is set to "schannel". Defaults to `true` if
diff --git a/http.c b/http.c
index c8fcfd7693e897..8cd0559e980dbe 100644
--- a/http.c
+++ b/http.c
@@ -131,7 +131,8 @@ enum http_follow_config http_follow_config = HTTP_FOLLOW_INITIAL;
 
 static struct credential cert_auth = CREDENTIAL_INIT;
 static int ssl_cert_password_required;
-static unsigned long http_auth_methods = CURLAUTH_ANY;
+static unsigned long http_auth_any = CURLAUTH_ANY & ~CURLAUTH_NTLM;
+static unsigned long http_auth_methods;
 static int http_auth_methods_restricted;
 /* Modes for which empty_auth cannot actually help us. */
 static unsigned long empty_auth_useless =
@@ -430,6 +431,15 @@ static int http_options(const char *var, const char *value,
 		return 0;
 	}
 
+	if (!strcmp("http.allowntlmauth", var)) {
+		if (git_config_bool(var, value)) {
+			http_auth_any |= CURLAUTH_NTLM;
+		} else {
+			http_auth_any &= ~CURLAUTH_NTLM;
+		}
+		return 0;
+	}
+
 	if (!strcmp("http.schannelcheckrevoke", var)) {
 		http_schannel_check_revoke = git_config_bool(var, value);
 		return 0;
@@ -726,11 +736,11 @@ static void init_curl_proxy_auth(CURL *result)
 		if (i == ARRAY_SIZE(proxy_authmethods)) {
 			warning("unsupported proxy authentication method %s: using anyauth",
 					http_proxy_authmethod);
-			curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
+			curl_easy_setopt(result, CURLOPT_PROXYAUTH, http_auth_any);
 		}
 	}
 	else
-		curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
+		curl_easy_setopt(result, CURLOPT_PROXYAUTH, http_auth_any);
 }
 
 static int has_cert_password(void)
@@ -1142,7 +1152,7 @@ static CURL *get_curl_handle(void)
     }
 
 	curl_easy_setopt(result, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
-	curl_easy_setopt(result, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
+	curl_easy_setopt(result, CURLOPT_HTTPAUTH, http_auth_any);
 
 #ifdef CURLGSSAPI_DELEGATION_FLAG
 	if (curl_deleg) {
@@ -1510,6 +1520,8 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
 	set_long_from_env(&http_max_retries, "GIT_HTTP_MAX_RETRIES");
 	set_long_from_env(&http_max_retry_time, "GIT_HTTP_MAX_RETRY_TIME");
 
+	http_auth_methods = http_auth_any;
+
 	curl_default = get_curl_handle();
 }
 
diff --git a/t/t5563-simple-http-auth.sh b/t/t5563-simple-http-auth.sh
index b8cef9dd5b1413..822d64ed5ec9cb 100755
--- a/t/t5563-simple-http-auth.sh
+++ b/t/t5563-simple-http-auth.sh
@@ -730,8 +730,10 @@ test_expect_success NTLM 'access using NTLM auth' '
 	EOF
 
 	test_config_global credential.helper test-helper &&
-	GIT_TRACE_CURL=1 \
-	git ls-remote "$HTTPD_URL/ntlm_auth/repo.git"
+	test_must_fail env GIT_TRACE_CURL=1 git \
+		ls-remote "$HTTPD_URL/ntlm_auth/repo.git" &&
+	GIT_TRACE_CURL=1 git -c http.$HTTPD_URL.allowNTLMAuth=true \
+		ls-remote "$HTTPD_URL/ntlm_auth/repo.git"
 '
 
 test_done

From beb6012accd623027fa982091e8b91d0819fd2ea Mon Sep 17 00:00:00 2001
From: Karsten Blees <blees@dcon.de>
Date: Thu, 19 Mar 2015 16:33:44 +0100
Subject: [PATCH 117/247] mingw: Support `git_terminal_prompt` with more
 terminals

The `git_terminal_prompt()` function expects the terminal window to be
attached to a Win32 Console. However, this is not the case with terminal
windows other than `cmd.exe`'s, e.g. with MSys2's own `mintty`.

Non-cmd terminals such as `mintty` still have to have a Win32 Console
to be proper console programs, but have to hide the Win32 Console to
be able to provide more flexibility (such as being resizeable not only
vertically but also horizontally). By writing to that Win32 Console,
`git_terminal_prompt()` manages only to send the prompt to nowhere and
to wait for input from a Console to which the user has no access.

This commit introduces a function specifically to support `mintty` -- or
other terminals that are compatible with MSys2's `/dev/tty` emulation. We
use the `TERM` environment variable as an indicator for that: if the value
starts with "xterm" (such as `mintty`'s "xterm_256color"), we prefer to
let `xterm_prompt()` handle the user interaction.

The most prominent user of `git_terminal_prompt()` is certainly
`git-remote-https.exe`. It is an interesting use case because both
`stdin` and `stdout` are redirected when Git calls said executable, yet
it still wants to access the terminal.

When running inside a `mintty`, the terminal is not accessible to the
`git-remote-https.exe` program, though, because it is a MinGW program
and the `mintty` terminal is not backed by a Win32 console.

To solve that problem, we simply call out to the shell -- which is an
*MSys2* program and can therefore access `/dev/tty`.

Helped-by: nalla <nalla@hamal.uberspace.de>
Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/terminal.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/compat/terminal.c b/compat/terminal.c
index 584f27bf7e1078..cdcde283644e41 100644
--- a/compat/terminal.c
+++ b/compat/terminal.c
@@ -418,6 +418,54 @@ static int getchar_with_timeout(int timeout)
 	return getchar();
 }
 
+static char *shell_prompt(const char *prompt, int echo)
+{
+	const char *read_input[] = {
+		/* Note: call 'bash' explicitly, as 'read -s' is bash-specific */
+		"bash", "-c", echo ?
+		"cat >/dev/tty && read -r line </dev/tty && echo \"$line\"" :
+		"cat >/dev/tty && read -r -s line </dev/tty && echo \"$line\" && echo >/dev/tty",
+		NULL
+	};
+	struct child_process child = CHILD_PROCESS_INIT;
+	static struct strbuf buffer = STRBUF_INIT;
+	int prompt_len = strlen(prompt), len = -1, code;
+
+	strvec_pushv(&child.args, read_input);
+	child.in = -1;
+	child.out = -1;
+
+	if (start_command(&child))
+		return NULL;
+
+	if (write_in_full(child.in, prompt, prompt_len) != prompt_len) {
+		error("could not write to prompt script");
+		close(child.in);
+		goto ret;
+	}
+	close(child.in);
+
+	strbuf_reset(&buffer);
+	len = strbuf_read(&buffer, child.out, 1024);
+	if (len < 0) {
+		error("could not read from prompt script");
+		goto ret;
+	}
+
+	strbuf_strip_suffix(&buffer, "\n");
+	strbuf_strip_suffix(&buffer, "\r");
+
+ret:
+	close(child.out);
+	code = finish_command(&child);
+	if (code) {
+		error("failed to execute prompt script (exit code %d)", code);
+		return NULL;
+	}
+
+	return len < 0 ? NULL : buffer.buf;
+}
+
 #endif
 
 #ifndef FORCE_TEXT
@@ -429,6 +477,12 @@ char *git_terminal_prompt(const char *prompt, int echo)
 	static struct strbuf buf = STRBUF_INIT;
 	int r;
 	FILE *input_fh, *output_fh;
+#ifdef GIT_WINDOWS_NATIVE
+	const char *term = getenv("TERM");
+
+	if (term && starts_with(term, "xterm"))
+		return shell_prompt(prompt, echo);
+#endif
 
 	input_fh = fopen(INPUT_PATH, "r" FORCE_TEXT);
 	if (!input_fh)

From 758df87c616f5769e7a2e29de41dd65028f15476 Mon Sep 17 00:00:00 2001
From: JiSeop Moon <zcube@zcube.kr>
Date: Mon, 23 Apr 2018 22:31:42 +0200
Subject: [PATCH 118/247] mingw: when running in a Windows container, try to
 rename() harder

It is a known issue that a rename() can fail with an "Access denied"
error at times, when copying followed by deleting the original file
works. Let's just fall back to that behavior.

Signed-off-by: JiSeop Moon <zcube@zcube.kr>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/mingw.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/compat/mingw.c b/compat/mingw.c
index bc4d54db58df0e..e6e85e4be4028d 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -2619,6 +2619,13 @@ int mingw_rename(const char *pold, const char *pnew)
 		gle = GetLastError();
 	}
 
+	if (gle == ERROR_ACCESS_DENIED && is_inside_windows_container()) {
+		/* Fall back to copy to destination & remove source */
+		if (CopyFileW(wpold, wpnew, FALSE) && !mingw_unlink(pold, 1))
+			return 0;
+		gle = GetLastError();
+	}
+
 	/* revert file attributes on failure */
 	if (attrs != INVALID_FILE_ATTRIBUTES)
 		SetFileAttributesW(wpnew, attrs);

From 1b0e62ffaa40ad47779cd37182aff9e5abe2ef34 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 11 Feb 2019 14:19:18 +0100
Subject: [PATCH 119/247] Introduce helper to create symlinks that knows about
 index_state

On Windows, symbolic links actually have a type depending on the target:
it can be a file or a directory.

In certain circumstances, this poses problems, e.g. when a symbolic link
is supposed to point into a submodule that is not checked out, so there
is no way for Git to auto-detect the type.

To help with that, we will add support over the course of the next
commits to specify that symlink type via the Git attributes. This
requires an index_state, though, something that Git for Windows'
`symlink()` replacement cannot know about because the function signature
is defined by the POSIX standard and not ours to change.

So let's introduce a helper function to create symbolic links that
*does* know about the index_state.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 apply.c              |  2 +-
 builtin/difftool.c   |  2 +-
 compat/mingw-posix.h |  4 +++-
 compat/mingw.c       |  2 +-
 entry.c              |  2 +-
 git-compat-util.h    | 10 ++++++++++
 refs/files-backend.c |  2 +-
 setup.c              |  4 ++--
 8 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/apply.c b/apply.c
index f00b7ba4d3a7e6..f7f9f21809df5f 100644
--- a/apply.c
+++ b/apply.c
@@ -4528,7 +4528,7 @@ static int try_create_file(struct apply_state *state, const char *path,
 		/* Although buf:size is counted string, it also is NUL
 		 * terminated.
 		 */
-		return !!symlink(buf, path);
+		return !!create_symlink(state && state->repo ? state->repo->index : NULL, buf, path);
 
 	fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
 	if (fd < 0)
diff --git a/builtin/difftool.c b/builtin/difftool.c
index bc7b2ea44396bb..ba33402308577b 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -544,7 +544,7 @@ static int run_dir_diff(struct repository *repo,
 				}
 				add_path(&wtdir, wtdir_len, dst_path);
 				if (dt_options->symlinks) {
-					if (symlink(wtdir.buf, rdir.buf)) {
+					if (create_symlink(lstate.istate, wtdir.buf, rdir.buf)) {
 						ret = error_errno("could not symlink '%s' to '%s'", wtdir.buf, rdir.buf);
 						goto finish;
 					}
diff --git a/compat/mingw-posix.h b/compat/mingw-posix.h
index 2d989fd762474e..2c96303a83e720 100644
--- a/compat/mingw-posix.h
+++ b/compat/mingw-posix.h
@@ -193,8 +193,10 @@ int setitimer(int type, struct itimerval *in, struct itimerval *out);
 int sigaction(int sig, struct sigaction *in, struct sigaction *out);
 int link(const char *oldpath, const char *newpath);
 int uname(struct utsname *buf);
-int symlink(const char *target, const char *link);
 int readlink(const char *path, char *buf, size_t bufsiz);
+struct index_state;
+int mingw_create_symlink(struct index_state *index, const char *target, const char *link);
+#define create_symlink mingw_create_symlink
 
 /*
  * replacements of existing functions
diff --git a/compat/mingw.c b/compat/mingw.c
index b3af992def50bf..06194706419b02 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -2980,7 +2980,7 @@ int link(const char *oldpath, const char *newpath)
 	return 0;
 }
 
-int symlink(const char *target, const char *link)
+int mingw_create_symlink(struct index_state *index UNUSED, const char *target, const char *link)
 {
 	wchar_t wtarget[MAX_PATH], wlink[MAX_PATH];
 	int len;
diff --git a/entry.c b/entry.c
index 1c4f0f44070ea3..46cac258374d8e 100644
--- a/entry.c
+++ b/entry.c
@@ -323,7 +323,7 @@ static int write_entry(struct cache_entry *ce, char *path, struct conv_attrs *ca
 				       state->istate->repo : the_repository) || to_tempfile)
 			goto write_file_entry;
 
-		ret = symlink(new_blob, path);
+		ret = create_symlink(state->istate, new_blob, path);
 		free(new_blob);
 		if (ret)
 			return error_errno("unable to create symlink %s", path);
diff --git a/git-compat-util.h b/git-compat-util.h
index a0f901ce793ed6..cd3f4c0baa15d6 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -350,6 +350,16 @@ static inline int git_has_dir_sep(const char *path)
 #define has_dir_sep(path) git_has_dir_sep(path)
 #endif
 
+#ifndef create_symlink
+struct index_state;
+static inline int git_create_symlink(struct index_state *index UNUSED,
+				     const char *target, const char *link)
+{
+	return symlink(target, link);
+}
+#define create_symlink git_create_symlink
+#endif
+
 #ifndef query_user_email
 #define query_user_email() NULL
 #endif
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 71628550f20a57..42361639f33186 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -2152,7 +2152,7 @@ static int create_ref_symlink(struct ref_lock *lock, const char *target)
 
 	ref_path = get_locked_file_path(&lock->lk);
 	unlink(ref_path);
-	ret = symlink(target, ref_path);
+	ret = create_symlink(NULL, target, ref_path);
 	free(ref_path);
 
 	if (ret)
diff --git a/setup.c b/setup.c
index 0d157ac2548f00..8ff1a563001dfd 100644
--- a/setup.c
+++ b/setup.c
@@ -2359,7 +2359,7 @@ static void copy_templates_1(struct repository *repo,
 			if (strbuf_readlink(&lnk, template_path->buf,
 					    st_template.st_size) < 0)
 				die_errno(_("cannot readlink '%s'"), template_path->buf);
-			if (symlink(lnk.buf, path->buf))
+			if (create_symlink(NULL, lnk.buf, path->buf))
 				die_errno(_("cannot symlink '%s' '%s'"),
 					  lnk.buf, path->buf);
 			strbuf_release(&lnk);
@@ -2645,7 +2645,7 @@ static int create_default_files(struct repository *repo,
 		repo_git_path_replace(repo, &path, "tXXXXXX");
 		if (!close(xmkstemp(path.buf)) &&
 		    !unlink(path.buf) &&
-		    !symlink("testing", path.buf) &&
+		    !create_symlink(NULL, "testing", path.buf) &&
 		    !lstat(path.buf, &st1) &&
 		    S_ISLNK(st1.st_mode))
 			unlink(path.buf); /* good */

From 8b6ef9bc71e7212584c44dedae9a4df2dd30ef45 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 17:33:36 +0200
Subject: [PATCH 120/247] xdiff-interface: widen buffer_is_binary() size
 parameter to size_t

Prep for the widenings of its callers, where size-receiving locals
will become size_t (combine-diff's result_size in the immediately
following commit, struct diff_filespec.size in a later topic). Body
caps the parameter at 8000 anyway, so the type change is mechanical.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 xdiff-interface.c | 2 +-
 xdiff-interface.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xdiff-interface.c b/xdiff-interface.c
index db6938689f0a9e..18e37d2479292c 100644
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -195,7 +195,7 @@ void read_mmblob(mmfile_t *ptr, struct object_database *odb,
 }
 
 #define FIRST_FEW_BYTES 8000
-int buffer_is_binary(const char *ptr, unsigned long size)
+int buffer_is_binary(const char *ptr, size_t size)
 {
 	if (FIRST_FEW_BYTES < size)
 		size = FIRST_FEW_BYTES;
diff --git a/xdiff-interface.h b/xdiff-interface.h
index ce54e1c0e002f8..41fa1d75628b45 100644
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -49,7 +49,7 @@ int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
 int read_mmfile(mmfile_t *ptr, const char *filename);
 void read_mmblob(mmfile_t *ptr, struct object_database *odb,
 		 const struct object_id *oid);
-int buffer_is_binary(const char *ptr, unsigned long size);
+int buffer_is_binary(const char *ptr, size_t size);
 
 void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
 void xdiff_clear_find_func(xdemitconf_t *xecfg);

From 38ebd7497511b526d75be0a7d7fcd67ca45d3717 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 6 Jun 2026 01:31:22 +0200
Subject: [PATCH 121/247] git-survey: announce the upcoming pivot into `git
 repo structure`

`git survey` started life as an experimental scale-measurement tool;
the preceding commits give `git repo structure` the path-level detail
tables and ref-scoping mechanism that were `git survey`'s main draw,
so the two now overlap substantially. Plan the migration explicitly:
add a short notice at the top of the description making clear which
of `git survey`'s knobs map to which `git repo structure` option, and
state that a future release will turn `git survey` into a thin shim
over `git repo structure`.

Putting the notice in the description (rather than only the synopsis)
ensures it shows up in `git help survey` rendering before the reader
sees any option specifics, so an operator skimming the page learns
about the replacement before adopting any survey-specific flags.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 Documentation/git-survey.adoc | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-survey.adoc b/Documentation/git-survey.adoc
index 44f3a0568b7697..349560eaa7ec28 100644
--- a/Documentation/git-survey.adoc
+++ b/Documentation/git-survey.adoc
@@ -3,16 +3,23 @@ git-survey(1)
 
 NAME
 ----
-git-survey - EXPERIMENTAL: Measure various repository dimensions of scale
+git-survey - DEPRECATED: Measure various repository dimensions of scale
 
 SYNOPSIS
 --------
 [verse]
-(EXPERIMENTAL!) 'git survey' <options>
+(DEPRECATED!) 'git survey' <options>
 
 DESCRIPTION
 -----------
 
+NOTE: `git survey` is being superseded by `git repo structure`. New
+deployments and new features should use `git repo structure`; its
+`--ref-filter=<pattern>` option subsumes the various `--branches`,
+`--tags`, and `--remotes` flags here, and `--top=<N>` provides the
+same detail tables. A future release will turn `git survey` into a
+thin shim over `git repo structure`. See linkgit:git-repo[1].
+
 Survey the repository and measure various dimensions of scale.
 
 As repositories grow to "monorepo" size, certain data shapes can cause

From 60bde05a7d77869a08214e1d12886f23102df80c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20A=C3=9Fhauer?= <mha1993@live.de>
Date: Sun, 29 Dec 2024 11:48:34 +0100
Subject: [PATCH 122/247] t0301: actually test credential-cache on Windows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Commit 2406bf5 (Win32: detect unix socket support at runtime,
2024-04-03) introduced a runtime detection for whether the operating
system supports unix sockets for Windows, but a mistake snuck into the
tests. When building and testing Git without NO_UNIX_SOCKETS we
currently skip t0301-credential-cache on Windows if unix sockets are
supported and run the tests if they aren't.

Flip that logic to actually work the way it was intended.

Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t0301-credential-cache.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/t0301-credential-cache.sh b/t/t0301-credential-cache.sh
index 6f7cfd9e33f633..a14032626192d0 100755
--- a/t/t0301-credential-cache.sh
+++ b/t/t0301-credential-cache.sh
@@ -12,7 +12,7 @@ test -z "$NO_UNIX_SOCKETS" || {
 if test_have_prereq MINGW
 then
 	service_running=$(sc query afunix | grep "4  RUNNING")
-	test -z "$service_running" || {
+	test -n "$service_running" || {
 		skip_all='skipping credential-cache tests, unix sockets not available'
 		test_done
 	}

From 0e76203eecb7381991b3033fa51088549b5454b0 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 26 Nov 2025 19:18:35 +0100
Subject: [PATCH 123/247] http: warn if might have failed because of NTLM

The new default of Git is to disable NTLM authentication by default.

To help users find the escape hatch of that config setting, should they
need it, suggest it when the authentication failed and the server had
offered NTLM, i.e. if re-enabling it would fix the problem.

Helped-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 http.c                      | 11 +++++++++++
 t/t5563-simple-http-auth.sh |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/http.c b/http.c
index 8cd0559e980dbe..23476fd3244039 100644
--- a/http.c
+++ b/http.c
@@ -1964,6 +1964,17 @@ static int handle_curl_result(struct slot_results *results)
 			credential_reject(the_repository, &http_auth);
 			if (always_auth_proactively())
 				http_proactive_auth = PROACTIVE_AUTH_NONE;
+			if ((results->auth_avail & CURLAUTH_NTLM) &&
+			    !(http_auth_any & CURLAUTH_NTLM)) {
+				warning(_("Due to its cryptographic weaknesses, "
+					  "NTLM authentication has been\n"
+					  "disabled in Git by default. You can "
+					  "re-enable it for trusted servers\n"
+					  "by running:\n\n"
+					  "git config set "
+					  "http.%s://%s.allowNTLMAuth true"),
+					http_auth.protocol, http_auth.host);
+			}
 			return HTTP_NOAUTH;
 		} else {
 			if (curl_empty_auth == -1 &&
diff --git a/t/t5563-simple-http-auth.sh b/t/t5563-simple-http-auth.sh
index 822d64ed5ec9cb..303f8589640aa2 100755
--- a/t/t5563-simple-http-auth.sh
+++ b/t/t5563-simple-http-auth.sh
@@ -731,7 +731,8 @@ test_expect_success NTLM 'access using NTLM auth' '
 
 	test_config_global credential.helper test-helper &&
 	test_must_fail env GIT_TRACE_CURL=1 git \
-		ls-remote "$HTTPD_URL/ntlm_auth/repo.git" &&
+		ls-remote "$HTTPD_URL/ntlm_auth/repo.git" 2>err &&
+	test_grep "allowNTLMAuth" err &&
 	GIT_TRACE_CURL=1 git -c http.$HTTPD_URL.allowNTLMAuth=true \
 		ls-remote "$HTTPD_URL/ntlm_auth/repo.git"
 '

From 78484fef6a52facc45a8ac8e6f55fddee5cd1f6d Mon Sep 17 00:00:00 2001
From: Karsten Blees <blees@dcon.de>
Date: Sat, 9 May 2015 02:11:48 +0200
Subject: [PATCH 124/247] compat/terminal.c: only use the Windows console if
 bash 'read -r' fails
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Accessing the Windows console through the special CONIN$ / CONOUT$ devices
doesn't work properly for non-ASCII usernames an passwords.

It also doesn't work for terminal emulators that hide the native console
window (such as mintty), and 'TERM=xterm*' is not necessarily a reliable
indicator for such terminals.

The new shell_prompt() function, on the other hand, works fine for both
MSys1 and MSys2, in native console windows as well as mintty, and properly
supports Unicode. It just needs bash on the path (for 'read -s', which is
bash-specific).

On Windows, try to use the shell to read from the terminal. If that fails
with ENOENT (i.e. bash was not found), use CONIN/OUT as fallback.

Note: To test this, create a UTF-8 credential file with non-ASCII chars,
e.g. in git-bash: 'echo url=http://täst.com > cred.txt'. Then in git-cmd,
'git credential fill <cred.txt' works (shell version), while calling git
without the git-wrapper (i.e. 'mingw64\bin\git credential fill <cred.txt')
mangles non-ASCII chars in both console output and input.

Signed-off-by: Karsten Blees <blees@dcon.de>
---
 compat/terminal.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/compat/terminal.c b/compat/terminal.c
index cdcde283644e41..a89c5cd9ccf604 100644
--- a/compat/terminal.c
+++ b/compat/terminal.c
@@ -434,6 +434,7 @@ static char *shell_prompt(const char *prompt, int echo)
 	strvec_pushv(&child.args, read_input);
 	child.in = -1;
 	child.out = -1;
+	child.silent_exec_failure = 1;
 
 	if (start_command(&child))
 		return NULL;
@@ -477,11 +478,14 @@ char *git_terminal_prompt(const char *prompt, int echo)
 	static struct strbuf buf = STRBUF_INIT;
 	int r;
 	FILE *input_fh, *output_fh;
+
 #ifdef GIT_WINDOWS_NATIVE
-	const char *term = getenv("TERM");
 
-	if (term && starts_with(term, "xterm"))
-		return shell_prompt(prompt, echo);
+	/* try shell_prompt first, fall back to CONIN/OUT if bash is missing */
+	char *result = shell_prompt(prompt, echo);
+	if (result || errno != ENOENT)
+		return result;
+
 #endif
 
 	input_fh = fopen(INPUT_PATH, "r" FORCE_TEXT);

From 9449cc82cc3139ab316b678a36c0ff1b157a47d9 Mon Sep 17 00:00:00 2001
From: JiSeop Moon <zcube@zcube.kr>
Date: Mon, 23 Apr 2018 22:35:26 +0200
Subject: [PATCH 125/247] mingw: move the file_attr_to_st_mode() function
 definition

In preparation for making this function a bit more complicated (to allow
for special-casing the `ContainerMappedDirectories` in Windows
containers, which look like a symbolic link, but are not), let's move it
out of the header.

Signed-off-by: JiSeop Moon <zcube@zcube.kr>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/mingw.c | 14 ++++++++++++++
 compat/win32.h | 14 +-------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index e6e85e4be4028d..9b6ad28b05243d 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -3892,3 +3892,17 @@ int is_inside_windows_container(void)
 
 	return inside_container;
 }
+
+int file_attr_to_st_mode (DWORD attr, DWORD tag)
+{
+	int fMode = S_IREAD;
+	if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) && tag == IO_REPARSE_TAG_SYMLINK)
+		fMode |= S_IFLNK;
+	else if (attr & FILE_ATTRIBUTE_DIRECTORY)
+		fMode |= S_IFDIR;
+	else
+		fMode |= S_IFREG;
+	if (!(attr & FILE_ATTRIBUTE_READONLY))
+		fMode |= S_IWRITE;
+	return fMode;
+}
diff --git a/compat/win32.h b/compat/win32.h
index 671bcc81f93351..52169ae19f4371 100644
--- a/compat/win32.h
+++ b/compat/win32.h
@@ -6,19 +6,7 @@
 #include <windows.h>
 #endif
 
-static inline int file_attr_to_st_mode (DWORD attr, DWORD tag)
-{
-	int fMode = S_IREAD;
-	if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) && tag == IO_REPARSE_TAG_SYMLINK)
-		fMode |= S_IFLNK;
-	else if (attr & FILE_ATTRIBUTE_DIRECTORY)
-		fMode |= S_IFDIR;
-	else
-		fMode |= S_IFREG;
-	if (!(attr & FILE_ATTRIBUTE_READONLY))
-		fMode |= S_IWRITE;
-	return fMode;
-}
+extern int file_attr_to_st_mode (DWORD attr, DWORD tag);
 
 static inline int get_file_attr(const char *fname, WIN32_FILE_ATTRIBUTE_DATA *fdata)
 {

From 80813d5aaef67157d75621e8e524dedd33fab2a6 Mon Sep 17 00:00:00 2001
From: Bert Belder <bertbelder@gmail.com>
Date: Fri, 26 Oct 2018 11:51:51 +0200
Subject: [PATCH 126/247] mingw: allow to specify the symlink type in
 .gitattributes

On Windows, symbolic links have a type: a "file symlink" must point at
a file, and a "directory symlink" must point at a directory. If the
type of symlink does not match its target, it doesn't work.

Git does not record the type of symlink in the index or in a tree. On
checkout it'll guess the type, which only works if the target exists
at the time the symlink is created. This may often not be the case,
for example when the link points at a directory inside a submodule.

By specifying `symlink=file` or `symlink=dir` the user can specify what
type of symlink Git should create, so Git doesn't have to rely on
unreliable heuristics.

Signed-off-by: Bert Belder <bertbelder@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 Documentation/gitattributes.adoc | 30 ++++++++++++++++
 compat/mingw.c                   | 60 ++++++++++++++++++++++++++++++--
 2 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/Documentation/gitattributes.adoc b/Documentation/gitattributes.adoc
index 9fea75f96f928f..5e71f47225b481 100644
--- a/Documentation/gitattributes.adoc
+++ b/Documentation/gitattributes.adoc
@@ -403,6 +403,36 @@ sign `$` upon checkout.  Any byte sequence that begins with
 with `$Id$` upon check-in.
 
 
+`symlink`
+^^^^^^^^^
+
+On Windows, symbolic links have a type: a "file symlink" must point at
+a file, and a "directory symlink" must point at a directory. If the
+type of symlink does not match its target, it doesn't work.
+
+Git does not record the type of symlink in the index or in a tree. On
+checkout it'll guess the type, which only works if the target exists
+at the time the symlink is created. This may often not be the case,
+for example when the link points at a directory inside a submodule.
+
+The `symlink` attribute allows you to explicitly set the type of symlink
+to `file` or `dir`, so Git doesn't have to guess. If you have a set of
+symlinks that point at other files, you can do:
+
+------------------------
+*.gif 	symlink=file
+------------------------
+
+To tell Git that a symlink points at a directory, use:
+
+------------------------
+tools_folder 	symlink=dir
+------------------------
+
+The `symlink` attribute is ignored on platforms other than Windows,
+since they don't distinguish between different types of symlinks.
+
+
 `filter`
 ^^^^^^^^
 
diff --git a/compat/mingw.c b/compat/mingw.c
index 06194706419b02..02b488bd6abafc 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -4,6 +4,7 @@
 #include "git-compat-util.h"
 #include "abspath.h"
 #include "alloc.h"
+#include "attr.h"
 #include "config.h"
 #include "dir.h"
 #include "environment.h"
@@ -2980,7 +2981,38 @@ int link(const char *oldpath, const char *newpath)
 	return 0;
 }
 
-int mingw_create_symlink(struct index_state *index UNUSED, const char *target, const char *link)
+enum symlink_type {
+	SYMLINK_TYPE_UNSPECIFIED = 0,
+	SYMLINK_TYPE_FILE,
+	SYMLINK_TYPE_DIRECTORY,
+};
+
+static enum symlink_type check_symlink_attr(struct index_state *index, const char *link)
+{
+	static struct attr_check *check;
+	const char *value;
+
+	if (!index)
+		return SYMLINK_TYPE_UNSPECIFIED;
+
+	if (!check)
+		check = attr_check_initl("symlink", NULL);
+
+	git_check_attr(index, link, check);
+
+	value = check->items[0].value;
+	if (ATTR_UNSET(value))
+		return SYMLINK_TYPE_UNSPECIFIED;
+	if (!strcmp(value, "file"))
+		return SYMLINK_TYPE_FILE;
+	if (!strcmp(value, "dir") || !strcmp(value, "directory"))
+		return SYMLINK_TYPE_DIRECTORY;
+
+	warning(_("ignoring invalid symlink type '%s' for '%s'"), value, link);
+	return SYMLINK_TYPE_UNSPECIFIED;
+}
+
+int mingw_create_symlink(struct index_state *index, const char *target, const char *link)
 {
 	wchar_t wtarget[MAX_PATH], wlink[MAX_PATH];
 	int len;
@@ -3000,7 +3032,31 @@ int mingw_create_symlink(struct index_state *index UNUSED, const char *target, c
 		if (wtarget[len] == '/')
 			wtarget[len] = '\\';
 
-	return create_phantom_symlink(wtarget, wlink);
+	switch (check_symlink_attr(index, link)) {
+	case SYMLINK_TYPE_UNSPECIFIED:
+		/* Create a phantom symlink: it is initially created as a file
+		 * symlink, but may change to a directory symlink later if/when
+		 * the target exists. */
+		return create_phantom_symlink(wtarget, wlink);
+	case SYMLINK_TYPE_FILE:
+		if (!CreateSymbolicLinkW(wlink, wtarget, symlink_file_flags))
+			break;
+		return 0;
+	case SYMLINK_TYPE_DIRECTORY:
+		if (!CreateSymbolicLinkW(wlink, wtarget,
+					 symlink_directory_flags))
+			break;
+		/* There may be dangling phantom symlinks that point at this
+		 * one, which should now morph into directory symlinks. */
+		process_phantom_symlinks();
+		return 0;
+	default:
+		BUG("unhandled symlink type");
+	}
+
+	/* CreateSymbolicLinkW failed. */
+	errno = err_win_to_posix(GetLastError());
+	return -1;
 }
 
 int readlink(const char *path, char *buf, size_t bufsiz)

From a4d9b74070ae0c909dab62d1959acdb73e35afb1 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 7 Dec 2018 13:39:30 +0100
Subject: [PATCH 127/247] clean: do not traverse mount points

It seems to be not exactly rare on Windows to install NTFS junction
points (the equivalent of "bind mounts" on Linux/Unix) in worktrees,
e.g. to map some development tools into a subdirectory.

In such a scenario, it is pretty horrible if `git clean -dfx` traverses
into the mapped directory and starts to "clean up".

Let's just not do that. Let's make sure before we traverse into a
directory that it is not a mount point (or junction).

This addresses https://github.com/git-for-windows/git/issues/607

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/clean.c   | 14 ++++++++++++++
 compat/mingw.c    | 22 ++++++++++++++++++++++
 compat/mingw.h    |  3 +++
 git-compat-util.h |  4 ++++
 path.c            | 39 +++++++++++++++++++++++++++++++++++++++
 path.h            |  1 +
 t/t7300-clean.sh  |  9 +++++++++
 7 files changed, 92 insertions(+)

diff --git a/builtin/clean.c b/builtin/clean.c
index 1d5e7e5366bf09..e4f2d56d3210ba 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -41,6 +41,8 @@ static const char *msg_remove = N_("Removing %s\n");
 static const char *msg_would_remove = N_("Would remove %s\n");
 static const char *msg_skip_git_dir = N_("Skipping repository %s\n");
 static const char *msg_would_skip_git_dir = N_("Would skip repository %s\n");
+static const char *msg_skip_mount_point = N_("Skipping mount point %s\n");
+static const char *msg_would_skip_mount_point = N_("Would skip mount point %s\n");
 static const char *msg_warn_remove_failed = N_("failed to remove %s");
 static const char *msg_warn_lstat_failed = N_("could not lstat %s\n");
 static const char *msg_skip_cwd = N_("Refusing to remove current working directory\n");
@@ -185,6 +187,18 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 		goto out;
 	}
 
+	if (is_mount_point(path)) {
+		if (!quiet) {
+			quote_path(path->buf, prefix, &quoted, 0);
+			printf(dry_run ?
+			       _(msg_would_skip_mount_point) :
+			       _(msg_skip_mount_point), quoted.buf);
+		}
+		*dir_gone = 0;
+
+		goto out;
+	}
+
 	dir = opendir(path->buf);
 	if (!dir) {
 		/* an empty dir could be removed even if it is unreadble */
diff --git a/compat/mingw.c b/compat/mingw.c
index 02b488bd6abafc..bd23250bb6d2d4 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -3135,6 +3135,28 @@ pid_t waitpid(pid_t pid, int *status, int options)
 	return -1;
 }
 
+int mingw_is_mount_point(struct strbuf *path)
+{
+	WIN32_FIND_DATAW findbuf = { 0 };
+	HANDLE handle;
+	wchar_t wfilename[MAX_PATH];
+	int wlen = xutftowcs_path(wfilename, path->buf);
+	if (wlen < 0)
+		die(_("could not get long path for '%s'"), path->buf);
+
+	/* remove trailing slash, if any */
+	if (wlen > 0 && wfilename[wlen - 1] == L'/')
+		wfilename[--wlen] = L'\0';
+
+	handle = FindFirstFileW(wfilename, &findbuf);
+	if (handle == INVALID_HANDLE_VALUE)
+		return 0;
+	FindClose(handle);
+
+	return (findbuf.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
+		(findbuf.dwReserved0 == IO_REPARSE_TAG_MOUNT_POINT);
+}
+
 int xutftowcsn(wchar_t *wcs, const char *utfs, size_t wcslen, int utflen)
 {
 	int upos = 0, wpos = 0;
diff --git a/compat/mingw.h b/compat/mingw.h
index df02aeb632d8c3..92237e14c4a87c 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -36,6 +36,9 @@ static inline void convert_slashes(char *path)
 		if (*path == '\\')
 			*path = '/';
 }
+struct strbuf;
+int mingw_is_mount_point(struct strbuf *path);
+#define is_mount_point mingw_is_mount_point
 #define PATH_SEP ';'
 char *mingw_query_user_email(void);
 #define query_user_email mingw_query_user_email
diff --git a/git-compat-util.h b/git-compat-util.h
index cd3f4c0baa15d6..51f1b2ecce338b 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -350,6 +350,10 @@ static inline int git_has_dir_sep(const char *path)
 #define has_dir_sep(path) git_has_dir_sep(path)
 #endif
 
+#ifndef is_mount_point
+#define is_mount_point is_mount_point_via_stat
+#endif
+
 #ifndef create_symlink
 struct index_state;
 static inline int git_create_symlink(struct index_state *index UNUSED,
diff --git a/path.c b/path.c
index c3a709a9284b7f..0360d04be63d42 100644
--- a/path.c
+++ b/path.c
@@ -1328,6 +1328,45 @@ char *strip_path_suffix(const char *path, const char *suffix)
 	return offset == -1 ? NULL : xstrndup(path, offset);
 }
 
+int is_mount_point_via_stat(struct strbuf *path)
+{
+	size_t len = path->len;
+	dev_t current_dev;
+	struct stat st;
+
+	if (!strcmp("/", path->buf))
+		return 1;
+
+	strbuf_addstr(path, "/.");
+	if (lstat(path->buf, &st)) {
+		/*
+		 * If we cannot access the current directory, we cannot say
+		 * that it is a bind mount.
+		 */
+		strbuf_setlen(path, len);
+		return 0;
+	}
+	current_dev = st.st_dev;
+
+	/* Now look at the parent directory */
+	strbuf_addch(path, '.');
+	if (lstat(path->buf, &st)) {
+		/*
+		 * If we cannot access the parent directory, we cannot say
+		 * that it is a bind mount.
+		 */
+		strbuf_setlen(path, len);
+		return 0;
+	}
+	strbuf_setlen(path, len);
+
+	/*
+	 * If the device ID differs between current and parent directory,
+	 * then it is a bind mount.
+	 */
+	return current_dev != st.st_dev;
+}
+
 int daemon_avoid_alias(const char *p)
 {
 	int sl, ndot;
diff --git a/path.h b/path.h
index 7e7408dd05fce3..81a84a18b8fe37 100644
--- a/path.h
+++ b/path.h
@@ -161,6 +161,7 @@ int normalize_path_copy(char *dst, const char *src);
 int strbuf_normalize_path(struct strbuf *src);
 int longest_ancestor_length(const char *path, struct string_list *prefixes);
 char *strip_path_suffix(const char *path, const char *suffix);
+int is_mount_point_via_stat(struct strbuf *path);
 int daemon_avoid_alias(const char *path);
 
 /*
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 13ad3eec772e37..af9c05255ca040 100755
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -800,4 +800,13 @@ test_expect_success 'traverse into directories that may have ignored entries' '
 	)
 '
 
+test_expect_success MINGW 'clean does not traverse mount points' '
+	mkdir target &&
+	>target/dont-clean-me &&
+	git init with-mountpoint &&
+	cmd //c "mklink /j with-mountpoint\\mountpoint target" &&
+	git -C with-mountpoint clean -dfx &&
+	test_path_is_file target/dont-clean-me
+'
+
 test_done

From 4901bd7f238039a7fe90e12d66d18c47e3c372c0 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 18:07:31 +0200
Subject: [PATCH 128/247] combine-diff: stop truncating combined-diff blob
 sizes on Windows

Continue the size_t evacuation. With buffer_is_binary() widened
in the prior commit, every consumer that the size flows into in
combine-diff.c is size_t-ready, so widen grab_blob()'s out-param
outright and move the matching locals at its three call sites
together. grab_blob()'s body collapses to a direct
odb_read_object(&size) since the bridge variable is no longer
needed.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 combine-diff.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/combine-diff.c b/combine-diff.c
index 717d5376888f8e..09dca8fee9165a 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -304,7 +304,7 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,
 
 static char *grab_blob(struct repository *r,
 		       const struct object_id *oid, unsigned int mode,
-		       unsigned long *size, struct userdiff_driver *textconv,
+		       size_t *size, struct userdiff_driver *textconv,
 		       const char *path)
 {
 	char *blob;
@@ -325,9 +325,7 @@ static char *grab_blob(struct repository *r,
 		*size = fill_textconv(r, textconv, df, &blob);
 		free_filespec(df);
 	} else {
-		size_t size_st = 0;
-		blob = odb_read_object(r->objects, oid, &type, &size_st);
-		*size = cast_size_t_to_ulong(size_st);
+		blob = odb_read_object(r->objects, oid, &type, size);
 		if (!blob)
 			die(_("unable to read %s"), oid_to_hex(oid));
 		if (type != OBJ_BLOB)
@@ -431,7 +429,7 @@ static void combine_diff(struct repository *r,
 	xdemitconf_t xecfg;
 	mmfile_t parent_file;
 	struct combine_diff_state state;
-	unsigned long sz;
+	size_t sz;
 
 	if (result_deleted)
 		return; /* result deleted */
@@ -1015,7 +1013,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
 			    struct rev_info *rev)
 {
 	struct diff_options *opt = &rev->diffopt;
-	unsigned long result_size, cnt, lno;
+	size_t result_size, cnt, lno;
 	int result_deleted = 0;
 	char *result, *cp;
 	struct sline *sline; /* survived lines */
@@ -1134,7 +1132,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
 		is_binary = buffer_is_binary(result, result_size);
 		for (i = 0; !is_binary && i < num_parent; i++) {
 			char *buf;
-			unsigned long size;
+			size_t size;
 			buf = grab_blob(opt->repo,
 					&elem->parent[i].oid,
 					elem->parent[i].mode,

From 4d2c654369ae1140e627c51edcbd2102f8b03169 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 15:00:18 +0200
Subject: [PATCH 129/247] pack-bitmap: stop truncating blob sizes used by
 --filter=blob:limit

Same theme as the preceding pack-objects series: get_size_by_pos()
returns an unsigned long but reads its size out of packed_object_info()
/ odb_read_object_info_extended() via a size_t out-parameter, so on
Windows it would silently truncate the very sizes filter_bitmap_blob_limit()
then compares against the --filter=blob:limit threshold to decide which
blobs to elide from the bitmap-backed traversal. Drop the
cast_size_t_to_ulong() and return size_t directly.

The two callers' limit comparison promotes to size_t cleanly. limit
itself stays unsigned long; it is part of a filter API ripple of its
own.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 pack-bitmap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pack-bitmap.c b/pack-bitmap.c
index 3de8e9590cff4f..54cba883228c3f 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -1869,8 +1869,8 @@ static void filter_bitmap_blob_none(struct bitmap_index *bitmap_git,
 				   OBJ_BLOB);
 }
 
-static unsigned long get_size_by_pos(struct bitmap_index *bitmap_git,
-				     uint32_t pos)
+static size_t get_size_by_pos(struct bitmap_index *bitmap_git,
+			      uint32_t pos)
 {
 	size_t size;
 	struct object_info oi = OBJECT_INFO_INIT;
@@ -1907,7 +1907,7 @@ static unsigned long get_size_by_pos(struct bitmap_index *bitmap_git,
 			die(_("unable to get size of %s"), oid_to_hex(&obj->oid));
 	}
 
-	return cast_size_t_to_ulong(size);
+	return size;
 }
 
 static void filter_bitmap_blob_limit(struct bitmap_index *bitmap_git,

From eac899e005b28559f7bff88417c0cab073fb827a Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 6 Jun 2026 01:46:57 +0200
Subject: [PATCH 130/247] survey: turn into a thin shim over `git repo
 structure`

`git survey` was an experimental scale-measurement tool whose
distinctive features (ref-kind filters, top-N path tables) are now
all available in `git repo structure`. With the path-level reporting
in place (commits "repo: filter the structure scope via
--ref-filter=<pattern>" and "repo: report top-N paths by count, disk,
and inflated size in structure"), there is no functionality `git
survey` provides that `git repo structure` cannot.

Replace the 764-line `git survey` implementation with a roughly
hundred-line shim that:

  * Accepts the existing `git survey` command line so callers in
    scripts continue to parse without changes.
  * Emits a deprecation warning naming the replacement command, so
    interactive users learn about the migration target.
  * Translates the survey-specific knobs into the equivalent
    `git repo structure` invocation and re-execs the canonical
    command via `execv_git_cmd()`. Per-kind ref selectors fan out
    into the corresponding `refs/heads/*`, `refs/tags/*`, etc.
    `--ref-filter` patterns; `--top=<N>` is forwarded directly;
    `--all-refs` becomes the absence of any `--ref-filter`.

Two survey options have no `git repo structure` counterpart:
`--verbose` controlled per-step trace output the new command does
not emit, and `--detached` selected the detached HEAD which
`git repo structure` does not enumerate separately. Both are
silently accepted and produce a single warning each, so old
invocations keep working while the absence of these knobs in `git
repo structure` is made visible.

Rewrite t8100 to assert the shim's contract: the deprecation
warning is printed, the output is byte-identical to a corresponding
`git repo structure` invocation, and the per-kind selector
translation produces the right `--ref-filter` pattern. The
preceding survey-specific output assertions (the multi-column
plaintext tables) no longer apply, since `git repo structure`'s
output format is now the canonical one and is covered by t1901.

The `survey.*` configuration keys (`survey.top`, `survey.progress`,
`survey.verbose`) are no longer honored by the shim. They were
mirrored by the preceding `repo.structure.top` work for the most
useful knob; users with `survey.top` set in config should migrate
to `repo.structure.top`. This is a backward-incompatible removal
documented by the deprecation notice in `git-survey.adoc`.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 Documentation/git-survey.adoc |    4 +-
 builtin/survey.c              | 1007 +++------------------------------
 t/t8100-git-survey.sh         |   98 +---
 3 files changed, 116 insertions(+), 993 deletions(-)

diff --git a/Documentation/git-survey.adoc b/Documentation/git-survey.adoc
index 349560eaa7ec28..e97656b49dee75 100644
--- a/Documentation/git-survey.adoc
+++ b/Documentation/git-survey.adoc
@@ -17,8 +17,8 @@ NOTE: `git survey` is being superseded by `git repo structure`. New
 deployments and new features should use `git repo structure`; its
 `--ref-filter=<pattern>` option subsumes the various `--branches`,
 `--tags`, and `--remotes` flags here, and `--top=<N>` provides the
-same detail tables. A future release will turn `git survey` into a
-thin shim over `git repo structure`. See linkgit:git-repo[1].
+same detail tables. During the deprecation phase, `git survey` is
+a thin shim over `git repo structure`. See linkgit:git-repo[1].
 
 Survey the repository and measure various dimensions of scale.
 
diff --git a/builtin/survey.c b/builtin/survey.c
index 406e76eb098d03..d3b36b891404cd 100644
--- a/builtin/survey.c
+++ b/builtin/survey.c
@@ -1,934 +1,113 @@
 #define USE_THE_REPOSITORY_VARIABLE
 
 #include "builtin.h"
-#include "config.h"
-#include "environment.h"
-#include "hex.h"
-#include "object.h"
-#include "odb.h"
-#include "object-name.h"
+#include "color.h"
+#include "exec-cmd.h"
+#include "gettext.h"
 #include "parse-options.h"
-#include "path-walk.h"
-#include "progress.h"
-#include "ref-filter.h"
-#include "refs.h"
-#include "revision.h"
-#include "strbuf.h"
 #include "strvec.h"
-#include "tag.h"
-#include "trace2.h"
-#include "color.h"
 
 static const char * const survey_usage[] = {
-	N_("(EXPERIMENTAL!) git survey <options>"),
+	N_("(DEPRECATED!) git survey <options>"),
 	NULL,
 };
 
-struct survey_refs_wanted {
-	int want_all_refs; /* special override */
-
-	int want_branches;
-	int want_tags;
-	int want_remotes;
-	int want_detached;
-	int want_other; /* see FILTER_REFS_OTHERS -- refs/notes/, refs/stash/ */
-};
-
-static struct survey_refs_wanted default_ref_options = {
-	.want_all_refs = 1,
-};
-
-struct survey_opts {
-	int verbose;
-	int show_progress;
-	int top_nr;
-	struct survey_refs_wanted refs;
-};
-
-struct survey_report_ref_summary {
-	size_t refs_nr;
-	size_t branches_nr;
-	size_t remote_refs_nr;
-	size_t tags_nr;
-	size_t tags_annotated_nr;
-	size_t others_nr;
-	size_t unknown_nr;
-};
-
-struct survey_report_object_summary {
-	size_t commits_nr;
-	size_t tags_nr;
-	size_t trees_nr;
-	size_t blobs_nr;
-};
-
-/**
- * For some category given by 'label', count the number of objects
- * that match that label along with the on-disk size and the size
- * after decompressing (both with delta bases and zlib).
- */
-struct survey_report_object_size_summary {
-	char *label;
-	size_t nr;
-	size_t disk_size;
-	size_t inflated_size;
-	size_t num_missing;
-};
-
-typedef int (*survey_top_cmp)(void *v1, void *v2);
-
-static int cmp_by_nr(void *v1, void *v2)
-{
-	struct survey_report_object_size_summary *s1 = v1;
-	struct survey_report_object_size_summary *s2 = v2;
-
-	if (s1->nr < s2->nr)
-		return -1;
-	if (s1->nr > s2->nr)
-		return 1;
-	return 0;
-}
-
-static int cmp_by_disk_size(void *v1, void *v2)
-{
-	struct survey_report_object_size_summary *s1 = v1;
-	struct survey_report_object_size_summary *s2 = v2;
-
-	if (s1->disk_size < s2->disk_size)
-		return -1;
-	if (s1->disk_size > s2->disk_size)
-		return 1;
-	return 0;
-}
-
-static int cmp_by_inflated_size(void *v1, void *v2)
-{
-	struct survey_report_object_size_summary *s1 = v1;
-	struct survey_report_object_size_summary *s2 = v2;
-
-	if (s1->inflated_size < s2->inflated_size)
-		return -1;
-	if (s1->inflated_size > s2->inflated_size)
-		return 1;
-	return 0;
-}
-
-/**
- * Store a list of "top" categories by some sorting function. When
- * inserting a new category, reorder the list and free the one that
- * got ejected (if any).
- */
-struct survey_report_top_table {
-	const char *name;
-	survey_top_cmp cmp_fn;
-	size_t nr;
-	size_t alloc;
-
-	/**
-	 * 'data' stores an array of structs and must be cast into
-	 * the proper array type before evaluating an index.
-	 */
-	void *data;
-};
-
-static void init_top_sizes(struct survey_report_top_table *top,
-			   size_t limit, const char *name,
-			   survey_top_cmp cmp)
-{
-	struct survey_report_object_size_summary *sz_array;
-
-	top->name = name;
-	top->cmp_fn = cmp;
-	top->alloc = limit;
-	top->nr = 0;
-
-	CALLOC_ARRAY(sz_array, limit);
-	top->data = sz_array;
-}
-
-MAYBE_UNUSED
-static void clear_top_sizes(struct survey_report_top_table *top)
-{
-	struct survey_report_object_size_summary *sz_array = top->data;
-
-	for (size_t i = 0; i < top->nr; i++)
-		free(sz_array[i].label);
-	free(sz_array);
-}
-
-static void maybe_insert_into_top_size(struct survey_report_top_table *top,
-				       struct survey_report_object_size_summary *summary)
-{
-	struct survey_report_object_size_summary *sz_array = top->data;
-	size_t pos = top->nr;
-
-	/* Compare against list from the bottom. */
-	while (pos > 0 && top->cmp_fn(&sz_array[pos - 1], summary) < 0)
-		pos--;
-
-	/* Not big enough! */
-	if (pos >= top->alloc)
-		return;
-
-	/* We need to shift the data. */
-	if (top->nr == top->alloc)
-		free(sz_array[top->nr - 1].label);
-	else
-		top->nr++;
-
-	for (size_t i = top->nr - 1; i > pos; i--)
-		memcpy(&sz_array[i], &sz_array[i - 1], sizeof(*sz_array));
-
-	memcpy(&sz_array[pos], summary, sizeof(*summary));
-	sz_array[pos].label = xstrdup(summary->label);
-}
-
-/**
- * This struct contains all of the information that needs to be printed
- * at the end of the exploration of the repository and its references.
- */
-struct survey_report {
-	struct survey_report_ref_summary refs;
-	struct survey_report_object_summary reachable_objects;
-
-	struct survey_report_object_size_summary *by_type;
-
-	struct survey_report_top_table *top_paths_by_count;
-	struct survey_report_top_table *top_paths_by_disk;
-	struct survey_report_top_table *top_paths_by_inflate;
-};
-
-#define REPORT_TYPE_COMMIT 0
-#define REPORT_TYPE_TREE 1
-#define REPORT_TYPE_BLOB 2
-#define REPORT_TYPE_TAG 3
-#define REPORT_TYPE_COUNT 4
-
-struct survey_context {
-	struct repository *repo;
-
-	/* Options that control what is done. */
-	struct survey_opts opts;
-
-	/* Info for output only. */
-	struct survey_report report;
-
-	/*
-	 * The rest of the members are about enabling the activity
-	 * of the 'git survey' command, including ref listings, object
-	 * pointers, and progress.
-	 */
-
-	struct progress *progress;
-	size_t progress_nr;
-	size_t progress_total;
-
-	struct strvec refs;
-	struct ref_array ref_array;
-};
-
-static void clear_survey_context(struct survey_context *ctx)
-{
-	ref_array_clear(&ctx->ref_array);
-	strvec_clear(&ctx->refs);
-}
-
-struct survey_table {
-	const char *table_name;
-	struct strvec header;
-	struct strvec *rows;
-	size_t rows_nr;
-	size_t rows_alloc;
-};
-
-#define SURVEY_TABLE_INIT {	\
-	.header = STRVEC_INIT,	\
-}
-
-static void clear_table(struct survey_table *table)
-{
-	strvec_clear(&table->header);
-	for (size_t i = 0; i < table->rows_nr; i++)
-		strvec_clear(&table->rows[i]);
-	free(table->rows);
-}
-
-static void insert_table_rowv(struct survey_table *table, ...)
-{
-	va_list ap;
-	char *arg;
-	ALLOC_GROW(table->rows, table->rows_nr + 1, table->rows_alloc);
-
-	memset(&table->rows[table->rows_nr], 0, sizeof(struct strvec));
-
-	va_start(ap, table);
-	while ((arg = va_arg(ap, char *)))
-		strvec_push(&table->rows[table->rows_nr], arg);
-	va_end(ap);
-
-	table->rows_nr++;
-}
-
-#define SECTION_SEGMENT "========================================"
-#define SECTION_SEGMENT_LEN 40
-static const char *section_line = SECTION_SEGMENT
-				  SECTION_SEGMENT
-				  SECTION_SEGMENT
-				  SECTION_SEGMENT;
-static const size_t section_len = 4 * SECTION_SEGMENT_LEN;
-
-static void print_table_title(const char *name, size_t *widths, size_t nr)
-{
-	size_t width = 3 * (nr - 1);
-	size_t min_width = strlen(name);
-
-	for (size_t i = 0; i < nr; i++)
-		width += widths[i];
-
-	if (width < min_width)
-		width = min_width;
-
-	if (width > section_len)
-		width = section_len;
-
-	printf("\n%s\n%.*s\n", name, (int)width, section_line);
-}
-
-static void print_row_plaintext(struct strvec *row, size_t *widths)
-{
-	static struct strbuf line = STRBUF_INIT;
-	strbuf_setlen(&line, 0);
-
-	for (size_t i = 0; i < row->nr; i++) {
-		const char *str = row->v[i];
-		size_t len = strlen(str);
-		if (i)
-			strbuf_add(&line, " | ", 3);
-		strbuf_addchars(&line, ' ', widths[i] - len);
-		strbuf_add(&line, str, len);
-	}
-	printf("%s\n", line.buf);
-}
-
-static void print_divider_plaintext(size_t *widths, size_t nr)
-{
-	static struct strbuf line = STRBUF_INIT;
-	strbuf_setlen(&line, 0);
-
-	for (size_t i = 0; i < nr; i++) {
-		if (i)
-			strbuf_add(&line, "-+-", 3);
-		strbuf_addchars(&line, '-', widths[i]);
-	}
-	printf("%s\n", line.buf);
-}
-
-static void print_table_plaintext(struct survey_table *table)
-{
-	size_t *column_widths;
-	size_t columns_nr = table->header.nr;
-	CALLOC_ARRAY(column_widths, columns_nr);
-
-	for (size_t i = 0; i < columns_nr; i++) {
-		column_widths[i] = strlen(table->header.v[i]);
-
-		for (size_t j = 0; j < table->rows_nr; j++) {
-			size_t rowlen = strlen(table->rows[j].v[i]);
-			if (column_widths[i] < rowlen)
-				column_widths[i] = rowlen;
-		}
-	}
-
-	print_table_title(table->table_name, column_widths, columns_nr);
-	print_row_plaintext(&table->header, column_widths);
-	print_divider_plaintext(column_widths, columns_nr);
-
-	for (size_t j = 0; j < table->rows_nr; j++)
-		print_row_plaintext(&table->rows[j], column_widths);
-
-	free(column_widths);
-}
-
-static void survey_report_plaintext_refs(struct survey_context *ctx)
-{
-	struct survey_report_ref_summary *refs = &ctx->report.refs;
-	struct survey_table table = SURVEY_TABLE_INIT;
-
-	table.table_name = _("REFERENCES SUMMARY");
-
-	strvec_push(&table.header, _("Ref Type"));
-	strvec_push(&table.header, _("Count"));
-
-	if (ctx->opts.refs.want_all_refs || ctx->opts.refs.want_branches) {
-		char *fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)refs->branches_nr);
-		insert_table_rowv(&table, _("Branches"), fmt, NULL);
-		free(fmt);
-	}
-
-	if (ctx->opts.refs.want_all_refs || ctx->opts.refs.want_remotes) {
-		char *fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)refs->remote_refs_nr);
-		insert_table_rowv(&table, _("Remote refs"), fmt, NULL);
-		free(fmt);
-	}
-
-	if (ctx->opts.refs.want_all_refs || ctx->opts.refs.want_tags) {
-		char *fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)refs->tags_nr);
-		insert_table_rowv(&table, _("Tags (all)"), fmt, NULL);
-		free(fmt);
-		fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)refs->tags_annotated_nr);
-		insert_table_rowv(&table, _("Tags (annotated)"), fmt, NULL);
-		free(fmt);
-	}
-
-	print_table_plaintext(&table);
-	clear_table(&table);
-}
-
-static void survey_report_plaintext_reachable_object_summary(struct survey_context *ctx)
-{
-	struct survey_report_object_summary *objs = &ctx->report.reachable_objects;
-	struct survey_table table = SURVEY_TABLE_INIT;
-	char *fmt;
-
-	table.table_name = _("REACHABLE OBJECT SUMMARY");
-
-	strvec_push(&table.header, _("Object Type"));
-	strvec_push(&table.header, _("Count"));
-
-	fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)objs->tags_nr);
-	insert_table_rowv(&table, _("Tags"), fmt, NULL);
-	free(fmt);
-
-	fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)objs->commits_nr);
-	insert_table_rowv(&table, _("Commits"), fmt, NULL);
-	free(fmt);
-
-	fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)objs->trees_nr);
-	insert_table_rowv(&table, _("Trees"), fmt, NULL);
-	free(fmt);
-
-	fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)objs->blobs_nr);
-	insert_table_rowv(&table, _("Blobs"), fmt, NULL);
-	free(fmt);
-
-	print_table_plaintext(&table);
-	clear_table(&table);
-}
-
-static void survey_report_object_sizes(const char *title,
-				       const char *categories,
-				       struct survey_report_object_size_summary *summary,
-				       size_t summary_nr)
-{
-	struct survey_table table = SURVEY_TABLE_INIT;
-	table.table_name = title;
-
-	strvec_push(&table.header, categories);
-	strvec_push(&table.header, _("Count"));
-	strvec_push(&table.header, _("Disk Size"));
-	strvec_push(&table.header, _("Inflated Size"));
-
-	for (size_t i = 0; i < summary_nr; i++) {
-		char *label_str =  xstrdup(summary[i].label);
-		char *nr_str = xstrfmt("%"PRIuMAX, (uintmax_t)summary[i].nr);
-		char *disk_str = xstrfmt("%"PRIuMAX, (uintmax_t)summary[i].disk_size);
-		char *inflate_str = xstrfmt("%"PRIuMAX, (uintmax_t)summary[i].inflated_size);
-
-		insert_table_rowv(&table, label_str, nr_str,
-				  disk_str, inflate_str, NULL);
-
-		free(label_str);
-		free(nr_str);
-		free(disk_str);
-		free(inflate_str);
-	}
-
-	print_table_plaintext(&table);
-	clear_table(&table);
-}
-
-static void survey_report_plaintext_sorted_size(
-		struct survey_report_top_table *top)
-{
-	survey_report_object_sizes(top->name,  _("Path"),
-				   top->data, top->nr);
-}
-
-static void survey_report_plaintext(struct survey_context *ctx)
-{
-	printf("GIT SURVEY for \"%s\"\n", ctx->repo->worktree);
-	printf("-----------------------------------------------------\n");
-	survey_report_plaintext_refs(ctx);
-	survey_report_plaintext_reachable_object_summary(ctx);
-	survey_report_object_sizes(_("TOTAL OBJECT SIZES BY TYPE"),
-				   _("Object Type"),
-				   ctx->report.by_type,
-				   REPORT_TYPE_COUNT);
-
-	survey_report_plaintext_sorted_size(
-		&ctx->report.top_paths_by_count[REPORT_TYPE_TREE]);
-	survey_report_plaintext_sorted_size(
-		&ctx->report.top_paths_by_count[REPORT_TYPE_BLOB]);
-
-	survey_report_plaintext_sorted_size(
-		&ctx->report.top_paths_by_disk[REPORT_TYPE_TREE]);
-	survey_report_plaintext_sorted_size(
-		&ctx->report.top_paths_by_disk[REPORT_TYPE_BLOB]);
-
-	survey_report_plaintext_sorted_size(
-		&ctx->report.top_paths_by_inflate[REPORT_TYPE_TREE]);
-	survey_report_plaintext_sorted_size(
-		&ctx->report.top_paths_by_inflate[REPORT_TYPE_BLOB]);
-}
-
 /*
- * After parsing the command line arguments, figure out which refs we
- * should scan.
- *
- * If ANY were given in positive sense, then we ONLY include them and
- * do not use the builtin values.
+ * `git survey` has been superseded by `git repo structure`. To keep
+ * older callers working while the migration completes, accept the
+ * `git survey` command line, translate the options into the
+ * equivalent `git repo structure` invocation, and re-exec.
  */
-static void fixup_refs_wanted(struct survey_context *ctx)
-{
-	struct survey_refs_wanted *rw = &ctx->opts.refs;
-
-	/*
-	 * `--all-refs` overrides and enables everything.
-	 */
-	if (rw->want_all_refs == 1) {
-		rw->want_branches = 1;
-		rw->want_tags = 1;
-		rw->want_remotes = 1;
-		rw->want_detached = 1;
-		rw->want_other = 1;
-		return;
-	}
+int cmd_survey(int argc, const char **argv, const char *prefix,
+	       struct repository *repo UNUSED)
+{
+	int verbose = 0;
+	int show_progress = -1;
+	int top_nr = 10;
+	int want_all_refs = -1;
+	int want_branches = -1;
+	int want_tags = -1;
+	int want_remotes = -1;
+	int want_detached = -1;
+	int want_other = -1;
+	struct strvec child_argv = STRVEC_INIT;
+	struct option options[] = {
+		OPT__VERBOSE(&verbose, N_("verbose output (ignored)")),
+		OPT_BOOL(0, "progress", &show_progress, N_("show progress")),
+		OPT_INTEGER('n', "top", &top_nr,
+			    N_("number of entries to include in "
+			       "detail tables")),
+		OPT_BOOL_F(0, "all-refs", &want_all_refs,
+			   N_("include all refs"), PARSE_OPT_NONEG),
+		OPT_BOOL_F(0, "branches", &want_branches,
+			   N_("include branches"), PARSE_OPT_NONEG),
+		OPT_BOOL_F(0, "tags", &want_tags,
+			   N_("include tags"), PARSE_OPT_NONEG),
+		OPT_BOOL_F(0, "remotes", &want_remotes,
+			   N_("include remote refs"), PARSE_OPT_NONEG),
+		OPT_BOOL_F(0, "detached", &want_detached,
+			   N_("include detached HEAD (ignored)"),
+			   PARSE_OPT_NONEG),
+		OPT_BOOL_F(0, "other", &want_other,
+			   N_("include notes and stashes"), PARSE_OPT_NONEG),
+		OPT_END(),
+	};
 
-	/*
-	 * If none of the `--<ref-type>` were given, we assume all
-	 * of the builtin unspecified values.
-	 */
-	if (rw->want_branches == -1 &&
-	    rw->want_tags == -1 &&
-	    rw->want_remotes == -1 &&
-	    rw->want_detached == -1 &&
-	    rw->want_other == -1) {
-		*rw = default_ref_options;
-		return;
-	}
+	argc = parse_options(argc, argv, prefix, options, survey_usage, 0);
+	if (top_nr < 0)
+		die(_("--top=<n> must be non-negative"));
+	if (argc)
+		usage(_("'git survey' takes no positional arguments"));
+
+	warning(_("'git survey' is deprecated; "
+		  "use 'git repo structure' instead"));
+	if (verbose)
+		warning(_("--verbose is ignored by 'git repo structure'"));
+	if (want_detached != -1)
+		warning(_("--detached is ignored by 'git repo structure'"));
+
+	strvec_pushl(&child_argv, "repo", "structure", NULL);
+	if (show_progress == 1)
+		strvec_push(&child_argv, "--progress");
+	else if (show_progress == 0)
+		strvec_push(&child_argv, "--no-progress");
+	strvec_pushf(&child_argv, "--top=%d", top_nr);
 
 	/*
-	 * Since we only allow positive boolean values on the command
-	 * line, we will only have true values where they specified
-	 * a `--<ref-type>`.
-	 *
-	 * So anything that still has an unspecified value should be
-	 * set to false.
+	 * Survey's default ref scope is branches+tags+remotes (not "other").
+	 * `--all-refs` widens to literally everything; the per-kind flags
+	 * select specific subsets. `git repo structure` defaults to all
+	 * refs and accepts a repeatable --ref-filter=<pattern>, so the
+	 * translation is straightforward.
 	 */
-	if (rw->want_branches == -1)
-		rw->want_branches = 0;
-	if (rw->want_tags == -1)
-		rw->want_tags = 0;
-	if (rw->want_remotes == -1)
-		rw->want_remotes = 0;
-	if (rw->want_detached == -1)
-		rw->want_detached = 0;
-	if (rw->want_other == -1)
-		rw->want_other = 0;
-}
-
-static int survey_load_config_cb(const char *var, const char *value,
-				 const struct config_context *cctx, void *pvoid)
-{
-	struct survey_context *ctx = pvoid;
-
-	if (!strcmp(var, "survey.verbose")) {
-		ctx->opts.verbose = git_config_bool(var, value);
-		return 0;
-	}
-	if (!strcmp(var, "survey.progress")) {
-		ctx->opts.show_progress = git_config_bool(var, value);
-		return 0;
-	}
-	if (!strcmp(var, "survey.top")) {
-		ctx->opts.top_nr = git_config_bool(var, value);
-		return 0;
-	}
-
-	return git_default_config(var, value, cctx, pvoid);
-}
-
-static void survey_load_config(struct survey_context *ctx)
-{
-	repo_config(the_repository, survey_load_config_cb, ctx);
-}
-
-static void do_load_refs(struct survey_context *ctx,
-			 struct ref_array *ref_array)
-{
-	struct ref_filter filter = REF_FILTER_INIT;
-	struct ref_sorting *sorting;
-	struct string_list sorting_options = STRING_LIST_INIT_DUP;
-
-	string_list_append(&sorting_options, "objectname");
-	sorting = ref_sorting_options(&sorting_options);
-
-	if (ctx->opts.refs.want_detached)
-		strvec_push(&ctx->refs, "HEAD");
-
-	if (ctx->opts.refs.want_all_refs) {
-		strvec_push(&ctx->refs, "refs/");
-	} else {
-		if (ctx->opts.refs.want_branches)
-			strvec_push(&ctx->refs, "refs/heads/");
-		if (ctx->opts.refs.want_tags)
-			strvec_push(&ctx->refs, "refs/tags/");
-		if (ctx->opts.refs.want_remotes)
-			strvec_push(&ctx->refs, "refs/remotes/");
-		if (ctx->opts.refs.want_other) {
-			strvec_push(&ctx->refs, "refs/notes/");
-			strvec_push(&ctx->refs, "refs/stash/");
-		}
-	}
-
-	filter.name_patterns = ctx->refs.v;
-	filter.ignore_case = 0;
-	filter.match_as_path = 1;
-
-	if (ctx->opts.show_progress) {
-		ctx->progress_total = 0;
-		ctx->progress = start_progress(ctx->repo,
-					       _("Scanning refs..."), 0);
-	}
-
-	filter_refs(ref_array, &filter, FILTER_REFS_KIND_MASK);
-
-	if (ctx->opts.show_progress) {
-		ctx->progress_total = ref_array->nr;
-		display_progress(ctx->progress, ctx->progress_total);
-	}
-
-	ref_array_sort(sorting, ref_array);
-
-	stop_progress(&ctx->progress);
-	ref_filter_clear(&filter);
-	ref_sorting_release(sorting);
-}
-
-/*
- * The REFS phase:
- *
- * Load the set of requested refs and assess them for scalablity problems.
- * Use that set to start a treewalk to all reachable objects and assess
- * them.
- *
- * This data will give us insights into the repository itself (the number
- * of refs, the size and shape of the DAG, the number and size of the
- * objects).
- *
- * Theoretically, this data is independent of the on-disk representation
- * (e.g. independent of packing concerns).
- */
-static void survey_phase_refs(struct survey_context *ctx)
-{
-	trace2_region_enter("survey", "phase/refs", ctx->repo);
-	do_load_refs(ctx, &ctx->ref_array);
-
-	ctx->report.refs.refs_nr = ctx->ref_array.nr;
-	for (int i = 0; i < ctx->ref_array.nr; i++) {
-		size_t size;
-		struct ref_array_item *item = ctx->ref_array.items[i];
-
-		switch (item->kind) {
-		case FILTER_REFS_TAGS:
-			ctx->report.refs.tags_nr++;
-			if (odb_read_object_info(ctx->repo->objects,
-						 &item->objectname,
-						 &size) == OBJ_TAG)
-				ctx->report.refs.tags_annotated_nr++;
-			break;
-
-		case FILTER_REFS_BRANCHES:
-			ctx->report.refs.branches_nr++;
-			break;
-
-		case FILTER_REFS_REMOTES:
-			ctx->report.refs.remote_refs_nr++;
-			break;
-
-		case FILTER_REFS_OTHERS:
-			ctx->report.refs.others_nr++;
-			break;
-
-		default:
-			ctx->report.refs.unknown_nr++;
-			break;
-		}
-	}
-
-	trace2_region_leave("survey", "phase/refs", ctx->repo);
-}
-
-static void increment_object_counts(
-		struct survey_report_object_summary *summary,
-		enum object_type type,
-		size_t nr)
-{
-	switch (type) {
-	case OBJ_COMMIT:
-		summary->commits_nr += nr;
-		break;
-
-	case OBJ_TREE:
-		summary->trees_nr += nr;
-		break;
-
-	case OBJ_BLOB:
-		summary->blobs_nr += nr;
-		break;
-
-	case OBJ_TAG:
-		summary->tags_nr += nr;
-		break;
-
-	default:
-		break;
-	}
-}
-
-static void increment_totals(struct survey_context *ctx,
-			     struct oid_array *oids,
-			     struct survey_report_object_size_summary *summary)
-{
-	for (size_t i = 0; i < oids->nr; i++) {
-		struct object_info oi = OBJECT_INFO_INIT;
-		unsigned oi_flags = OBJECT_INFO_FOR_PREFETCH;
-		size_t object_length = 0;
-		off_t disk_sizep = 0;
-		enum object_type type;
-
-		oi.typep = &type;
-		oi.sizep = &object_length;
-		oi.disk_sizep = &disk_sizep;
-
-		if (odb_read_object_info_extended(ctx->repo->objects,
-						  &oids->oid[i],
-						  &oi, oi_flags) < 0) {
-			summary->num_missing++;
-		} else {
-			summary->nr++;
-			summary->disk_size += disk_sizep;
-			summary->inflated_size += object_length;
+	if (want_all_refs != 1) {
+		int branches = want_branches == 1;
+		int tags = want_tags == 1;
+		int remotes = want_remotes == 1;
+		int other = want_other == 1;
+
+		if (!branches && !tags && !remotes && !other)
+			branches = tags = remotes = 1;
+
+		if (branches)
+			strvec_push(&child_argv,
+				    "--ref-filter=refs/heads/*");
+		if (tags)
+			strvec_push(&child_argv,
+				    "--ref-filter=refs/tags/*");
+		if (remotes)
+			strvec_push(&child_argv,
+				    "--ref-filter=refs/remotes/*");
+		if (other) {
+			strvec_push(&child_argv,
+				    "--ref-filter=refs/notes/*");
+			strvec_push(&child_argv,
+				    "--ref-filter=refs/stash");
 		}
 	}
-}
-
-static void increment_object_totals(struct survey_context *ctx,
-				    struct oid_array *oids,
-				    enum object_type type,
-				    const char *path)
-{
-	struct survey_report_object_size_summary *total;
-	struct survey_report_object_size_summary summary = { 0 };
-
-	increment_totals(ctx, oids, &summary);
-
-	switch (type) {
-	case OBJ_COMMIT:
-		total = &ctx->report.by_type[REPORT_TYPE_COMMIT];
-		break;
-
-	case OBJ_TREE:
-		total = &ctx->report.by_type[REPORT_TYPE_TREE];
-		break;
-
-	case OBJ_BLOB:
-		total = &ctx->report.by_type[REPORT_TYPE_BLOB];
-		break;
-
-	case OBJ_TAG:
-		total = &ctx->report.by_type[REPORT_TYPE_TAG];
-		break;
-
-	default:
-		BUG("No other type allowed");
-	}
-
-	total->nr += summary.nr;
-	total->disk_size += summary.disk_size;
-	total->inflated_size += summary.inflated_size;
-	total->num_missing += summary.num_missing;
-
-	if (type == OBJ_TREE || type == OBJ_BLOB) {
-		int index = type == OBJ_TREE ?
-			    REPORT_TYPE_TREE : REPORT_TYPE_BLOB;
-		struct survey_report_top_table *top;
-
-		/*
-		 * Temporarily store (const char *) here, but it will
-		 * be duped if inserted and will not be freed.
-		 */
-		summary.label = (char *)path;
-
-		top = ctx->report.top_paths_by_count;
-		maybe_insert_into_top_size(&top[index], &summary);
-
-		top = ctx->report.top_paths_by_disk;
-		maybe_insert_into_top_size(&top[index], &summary);
-
-		top = ctx->report.top_paths_by_inflate;
-		maybe_insert_into_top_size(&top[index], &summary);
-	}
-}
-
-static int survey_objects_path_walk_fn(const char *path,
-				       struct oid_array *oids,
-				       enum object_type type,
-				       void *data)
-{
-	struct survey_context *ctx = data;
-
-	increment_object_counts(&ctx->report.reachable_objects,
-				type, oids->nr);
-	increment_object_totals(ctx, oids, type, path);
-
-	ctx->progress_nr += oids->nr;
-	display_progress(ctx->progress, ctx->progress_nr);
-
-	return 0;
-}
-
-static void initialize_report(struct survey_context *ctx)
-{
-	CALLOC_ARRAY(ctx->report.by_type, REPORT_TYPE_COUNT);
-	ctx->report.by_type[REPORT_TYPE_COMMIT].label = xstrdup(_("Commits"));
-	ctx->report.by_type[REPORT_TYPE_TREE].label = xstrdup(_("Trees"));
-	ctx->report.by_type[REPORT_TYPE_BLOB].label = xstrdup(_("Blobs"));
-	ctx->report.by_type[REPORT_TYPE_TAG].label = xstrdup(_("Tags"));
-
-	CALLOC_ARRAY(ctx->report.top_paths_by_count, REPORT_TYPE_COUNT);
-	init_top_sizes(&ctx->report.top_paths_by_count[REPORT_TYPE_TREE],
-		       ctx->opts.top_nr, _("TOP DIRECTORIES BY COUNT"), cmp_by_nr);
-	init_top_sizes(&ctx->report.top_paths_by_count[REPORT_TYPE_BLOB],
-		       ctx->opts.top_nr, _("TOP FILES BY COUNT"), cmp_by_nr);
-
-	CALLOC_ARRAY(ctx->report.top_paths_by_disk, REPORT_TYPE_COUNT);
-	init_top_sizes(&ctx->report.top_paths_by_disk[REPORT_TYPE_TREE],
-		       ctx->opts.top_nr, _("TOP DIRECTORIES BY DISK SIZE"), cmp_by_disk_size);
-	init_top_sizes(&ctx->report.top_paths_by_disk[REPORT_TYPE_BLOB],
-		       ctx->opts.top_nr, _("TOP FILES BY DISK SIZE"), cmp_by_disk_size);
-
-	CALLOC_ARRAY(ctx->report.top_paths_by_inflate, REPORT_TYPE_COUNT);
-	init_top_sizes(&ctx->report.top_paths_by_inflate[REPORT_TYPE_TREE],
-		       ctx->opts.top_nr, _("TOP DIRECTORIES BY INFLATED SIZE"), cmp_by_inflated_size);
-	init_top_sizes(&ctx->report.top_paths_by_inflate[REPORT_TYPE_BLOB],
-		       ctx->opts.top_nr, _("TOP FILES BY INFLATED SIZE"), cmp_by_inflated_size);
-}
-
-static void survey_phase_objects(struct survey_context *ctx)
-{
-	struct rev_info revs = REV_INFO_INIT;
-	struct path_walk_info info = PATH_WALK_INFO_INIT;
-	unsigned int add_flags = 0;
-
-	trace2_region_enter("survey", "phase/objects", ctx->repo);
-
-	info.revs = &revs;
-	info.path_fn = survey_objects_path_walk_fn;
-	info.path_fn_data = ctx;
-
-	initialize_report(ctx);
-
-	repo_init_revisions(ctx->repo, &revs, "");
-	revs.tag_objects = 1;
-
-	ctx->progress_nr = 0;
-	ctx->progress_total = ctx->ref_array.nr;
-	if (ctx->opts.show_progress)
-		ctx->progress = start_progress(ctx->repo,
-					       _("Preparing object walk"),
-					       ctx->progress_total);
-	for (int i = 0; i < ctx->ref_array.nr; i++) {
-		struct ref_array_item *item = ctx->ref_array.items[i];
-		add_pending_oid(&revs, NULL, &item->objectname, add_flags);
-		display_progress(ctx->progress, ++(ctx->progress_nr));
-	}
-	stop_progress(&ctx->progress);
-
-	ctx->progress_nr = 0;
-	ctx->progress_total = 0;
-	if (ctx->opts.show_progress)
-		ctx->progress = start_progress(ctx->repo,
-					       _("Walking objects"), 0);
-	walk_objects_by_path(&info);
-	stop_progress(&ctx->progress);
-
-	release_revisions(&revs);
-	trace2_region_leave("survey", "phase/objects", ctx->repo);
-}
-
-int cmd_survey(int argc, const char **argv, const char *prefix, struct repository *repo)
-{
-	static struct survey_context ctx = {
-		.opts = {
-			.verbose = 0,
-			.show_progress = -1, /* defaults to isatty(2) */
-			.top_nr = 10,
-
-			.refs.want_all_refs = -1,
-
-			.refs.want_branches = -1, /* default these to undefined */
-			.refs.want_tags = -1,
-			.refs.want_remotes = -1,
-			.refs.want_detached = -1,
-			.refs.want_other = -1,
-		},
-		.refs = STRVEC_INIT,
-	};
-
-	static struct option survey_options[] = {
-		OPT__VERBOSE(&ctx.opts.verbose, N_("verbose output")),
-		OPT_BOOL(0, "progress", &ctx.opts.show_progress, N_("show progress")),
-		OPT_INTEGER('n', "top", &ctx.opts.top_nr,
-			    N_("number of entries to include in detail tables")),
-
-		OPT_BOOL_F(0, "all-refs", &ctx.opts.refs.want_all_refs, N_("include all refs"),          PARSE_OPT_NONEG),
-
-		OPT_BOOL_F(0, "branches", &ctx.opts.refs.want_branches, N_("include branches"),          PARSE_OPT_NONEG),
-		OPT_BOOL_F(0, "tags",     &ctx.opts.refs.want_tags,     N_("include tags"),              PARSE_OPT_NONEG),
-		OPT_BOOL_F(0, "remotes",  &ctx.opts.refs.want_remotes,  N_("include all remotes refs"),  PARSE_OPT_NONEG),
-		OPT_BOOL_F(0, "detached", &ctx.opts.refs.want_detached, N_("include detached HEAD"),     PARSE_OPT_NONEG),
-		OPT_BOOL_F(0, "other",    &ctx.opts.refs.want_other,    N_("include notes and stashes"), PARSE_OPT_NONEG),
-
-		OPT_END(),
-	};
-
-	show_usage_with_options_if_asked(argc, argv,
-					 survey_usage, survey_options);
-
-	if (isatty(2))
-		color_fprintf_ln(stderr,
-				 want_color_fd(2, GIT_COLOR_AUTO) ? GIT_COLOR_YELLOW : "",
-				 "(THIS IS EXPERIMENTAL, EXPECT THE OUTPUT FORMAT TO CHANGE!)");
-
-	ctx.repo = repo;
-
-	prepare_repo_settings(ctx.repo);
-	survey_load_config(&ctx);
-
-	argc = parse_options(argc, argv, prefix, survey_options, survey_usage, 0);
-
-	if (ctx.opts.show_progress < 0)
-		ctx.opts.show_progress = isatty(2);
-
-	fixup_refs_wanted(&ctx);
-
-	survey_phase_refs(&ctx);
-
-	survey_phase_objects(&ctx);
-
-	survey_report_plaintext(&ctx);
 
-	clear_survey_context(&ctx);
-	return 0;
+	execv_git_cmd(child_argv.v);
+	/* unreachable: execv_git_cmd dies on failure */
+	strvec_clear(&child_argv);
+	return 1;
 }
diff --git a/t/t8100-git-survey.sh b/t/t8100-git-survey.sh
index 703860d22ff4c3..a69d8f26724b9d 100755
--- a/t/t8100-git-survey.sh
+++ b/t/t8100-git-survey.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='git survey'
+test_description='git survey (deprecated shim over `git repo structure`)'
 
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
@@ -10,9 +10,9 @@ export TEST_PASSES_SANITIZE_LEAK
 
 . ./test-lib.sh
 
-test_expect_success 'git survey -h shows experimental warning' '
+test_expect_success 'git survey -h shows the deprecated banner' '
 	test_expect_code 0 git survey -h >usage &&
-	test_grep "EXPERIMENTAL!" usage
+	test_grep "DEPRECATED!" usage
 '
 
 test_expect_success 'create a semi-interesting repo' '
@@ -25,84 +25,28 @@ test_expect_success 'create a semi-interesting repo' '
 	git update-ref -d refs/tags/two
 '
 
-test_expect_success 'git survey --progress' '
-	GIT_PROGRESS_DELAY=0 git survey --all-refs --progress >out 2>err &&
-	grep "Preparing object walk" err
-'
-
-approximate_sizes() {
-	# very simplistic approximate rounding
-	sed -Ee "s/  *(1[0-9][0-9])( |$)/ ~0.1kB\2/g" \
-	  -e "s/  *(4[6-9][0-9]|5[0-6][0-9])( |$)/ ~0.5kB\2/g" \
-	  -e "s/  *(5[6-9][0-9]|6[0-6][0-9])( |$)/ ~0.6kB\2/g" \
-	  -e "s/  *1(4[89][0-9]|5[0-8][0-9])( |$)/ ~1.5kB\2/g" \
-	  -e "s/  *1(69[0-9]|7[0-9][0-9])( |$)/ ~1.7kB\2/g" \
-	  -e "s/  *1(79[0-9]|8[0-9][0-9])( |$)/ ~1.8kB\2/g" \
-	  -e "s/  *2(1[0-9][0-9]|20[0-1])( |$)/ ~2.1kB\2/g" \
-	  -e "s/  *2(3[0-9][0-9]|4[0-1][0-9])( |$)/ ~2.3kB\2/g" \
-	  -e "s/  *2(5[0-9][0-9]|6[0-1][0-9])( |$)/ ~2.5kB\2/g" \
-	 "$@"
-}
-
-test_expect_success 'git survey (default)' '
+test_expect_success 'survey prints a deprecation warning' '
 	git survey --all-refs >out 2>err &&
-	test_line_count = 0 err &&
-
-	test_oid_cache <<-EOF &&
-	commits_sizes sha1:~1.5kB | ~2.1kB
-	commits_sizes sha256:~1.8kB | ~2.5kB
-	trees_sizes sha1:~0.5kB | ~1.7kB
-	trees_sizes sha256:~0.6kB | ~2.3kB
-	blobs_sizes sha1:~0.1kB | ~0.1kB
-	blobs_sizes sha256:~0.1kB | ~0.1kB
-	tags_sizes sha1:~0.5kB | ~0.5kB
-	tags_sizes sha256:~0.5kB | ~0.6kB
-	EOF
-
-	tr , " " >expect <<-EOF &&
-	GIT SURVEY for "$(pwd)"
-	-----------------------------------------------------
-
-	REFERENCES SUMMARY
-	========================
-	,       Ref Type | Count
-	-----------------+------
-	,       Branches |     1
-	     Remote refs |     0
-	      Tags (all) |     2
-	Tags (annotated) |     2
-
-	REACHABLE OBJECT SUMMARY
-	========================
-	Object Type | Count
-	------------+------
-	       Tags |     4
-	    Commits |    10
-	      Trees |    10
-	      Blobs |    10
+	test_grep "is deprecated" err
+'
 
-	TOTAL OBJECT SIZES BY TYPE
-	===============================================
-	Object Type | Count | Disk Size | Inflated Size
-	------------+-------+-----------+--------------
-	    Commits |    10 | $(test_oid commits_sizes)
-	      Trees |    10 | $(test_oid trees_sizes)
-	      Blobs |    10 | $(test_oid blobs_sizes)
-	       Tags |     4 | $(test_oid tags_sizes)
-	EOF
+test_expect_success 'survey forwards to git repo structure' '
+	git survey --all-refs >survey-out 2>survey-err &&
+	git repo structure --top=10 >structure-out 2>structure-err &&
+	test_cmp structure-out survey-out
+'
 
-	approximate_sizes out >out-edited &&
-	lines=$(wc -l <expect) &&
-	head -n "$lines" <out-edited >out-trimmed &&
-	test_cmp expect out-trimmed &&
+test_expect_success 'survey --top is translated' '
+	git survey --top=3 --all-refs >out &&
+	git repo structure --top=3 >expected &&
+	test_cmp expected out
+'
 
-	for type in "DIRECTORIES" "FILES"
-	do
-		for metric in "COUNT" "DISK SIZE" "INFLATED SIZE"
-		do
-			grep "TOP $type BY $metric" out || return 1
-		done || return 1
-	done
+test_expect_success 'survey --branches translates to a refs/heads/* filter' '
+	git survey --branches >out &&
+	git repo structure --top=10 \
+		--ref-filter="refs/heads/*" >expected &&
+	test_cmp expected out
 '
 
 test_done

From b0d39f3dddd01ad7a1c9f03a88221ef183ed3c29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20A=C3=9Fhauer?= <mha1993@live.de>
Date: Sun, 22 Dec 2024 17:24:24 +0100
Subject: [PATCH 131/247] credential-cache: handle ECONNREFUSED gracefully
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In 245670c (credential-cache: check for windows specific errors, 2021-09-14)
we concluded that on Windows we would always encounter ENETDOWN where we
would expect ECONNREFUSED on POSIX systems, when connecting to unix sockets.
As reported in [1], we do encounter ECONNREFUSED on Windows if the
socket file doesn't exist, but the containing directory does and ENETDOWN if
neither exists. We should handle this case like we do on non-windows systems.

[1] https://github.com/git-for-windows/git/pull/4762#issuecomment-2545498245

This fixes https://github.com/git-for-windows/git/issues/5314

Helped-by: M Hickford <mirth.hickford@gmail.com>
Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/credential-cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/credential-cache.c b/builtin/credential-cache.c
index 7f733cb756e03c..3b8130d3d64f9c 100644
--- a/builtin/credential-cache.c
+++ b/builtin/credential-cache.c
@@ -23,7 +23,7 @@ static int connection_closed(int error)
 
 static int connection_fatally_broken(int error)
 {
-	return (error != ENOENT) && (error != ENETDOWN);
+	return (error != ENOENT) && (error != ENETDOWN) && (error != ECONNREFUSED);
 }
 
 #else

From 91071a2ddaacbe8201e214b982d26ed088e84134 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 6 Mar 2025 14:05:03 +0100
Subject: [PATCH 132/247] reftable: do make sure to use custom allocators

The reftable library goes out of its way to use its own set of allocator
functions that can be configured using `reftable_set_alloc()`. However,
Git does not configure this.

That is not typically a problem, except when Git uses a custom allocator
via some definitions in `git-compat-util.h`, as is the case in Git for
Windows (which switched away from the long-unmaintained nedmalloc to
mimalloc).

Then, it is quite possible that Git assigns a `strbuf` (allocated via
the custom allocator) to, say, the `refname` field of a
`reftable_log_record` in `write_transaction_table()`, and later on asks
the reftable library function `reftable_log_record_release()` to release
it, but that function was compiled without using `git-compat-util.h` and
hence calls regular `free()` (i.e. _not_ the custom allocator's own
function).

This has been a problem for a long time and it was a matter of some sort
of "luck" that 1) reftables are not commonly used on Windows, and 2)
mimalloc can often ignore gracefully when it is asked to release memory
that it has not allocated.

However, a recent update to `seen` brought this problem to the
forefront, letting t1460 fail in Git for Windows, with symptoms much in
the same way as the problem I had to address in d02c37c3e6ba
(t-reftable-basics: allow for `malloc` to be `#define`d, 2025-01-08)
where exit code 127 was also produced in lieu of
`STATUS_HEAP_CORRUPTION` (C0000374) because exit codes are only 7 bits
wide.

It was not possible to figure out what change in particular caused these
new failures within a reasonable time frame, as there are too many
changes in `seen` that conflict with Git for Windows' patches, I had to
stop the investigation after spending four hours on it fruitlessly.

To verify that this patch fixes the issue, I avoided using mimalloc and
temporarily patched in a "custom allocator" that would more reliably
point out problems, like this:

  diff --git a/refs/reftable-backend.c b/refs/reftable-backend.c
  index 68f38291f84c..9421d630b9f5 100644
  --- a/refs/reftable-backend.c
  +++ b/refs/reftable-backend.c
  @@ -353,6 +353,69 @@ static int reftable_be_fsync(int fd)
   	return fsync_component(FSYNC_COMPONENT_REFERENCE, fd);
   }

  +#define DEBUG_REFTABLE_ALLOC
  +#ifdef DEBUG_REFTABLE_ALLOC
  +#include "khash.h"
  +
  +static inline khint_t __ac_X31_hash_ptr(void *ptr)
  +{
  +	union {
  +		void *ptr;
  +		char s[sizeof(void *)];
  +	} u;
  +	size_t i;
  +	khint_t h;
  +
  +	u.ptr = ptr;
  +	h = (khint_t)*u.s;
  +	for (i = 0; i < sizeof(void *); i++)
  +		h = (h << 5) - h + (khint_t)u.s[i];
  +	return h;
  +}
  +
  +#define kh_ptr_hash_func(key) __ac_X31_hash_ptr(key)
  +#define kh_ptr_hash_equal(a, b) ((a) == (b))
  +
  +KHASH_INIT(ptr, void *, int, 0, kh_ptr_hash_func, kh_ptr_hash_equal)
  +
  +static kh_ptr_t *my_malloced;
  +
  +static void *my_malloc(size_t sz)
  +{
  +	int dummy;
  +	void *ptr = malloc(sz);
  +	if (ptr)
  +		kh_put_ptr(my_malloced, ptr, &dummy);
  +	return ptr;
  +}
  +
  +static void *my_realloc(void *ptr, size_t sz)
  +{
  +	int dummy;
  +	if (ptr) {
  +		khiter_t pos = kh_get_ptr(my_malloced, ptr);
  +		if (pos >= kh_end(my_malloced))
  +			die("Was not my_malloc()ed: %p", ptr);
  +		kh_del_ptr(my_malloced, pos);
  +	}
  +	ptr = realloc(ptr, sz);
  +	if (ptr)
  +		kh_put_ptr(my_malloced, ptr, &dummy);
  +	return ptr;
  +}
  +
  +static void my_free(void *ptr)
  +{
  +	if (ptr) {
  +		khiter_t pos = kh_get_ptr(my_malloced, ptr);
  +		if (pos >= kh_end(my_malloced))
  +			die("Was not my_malloc()ed: %p", ptr);
  +		kh_del_ptr(my_malloced, pos);
  +	}
  +	free(ptr);
  +}
  +#endif
  +
   static struct ref_store *reftable_be_init(struct repository *repo,
   					  const char *gitdir,
   					  unsigned int store_flags)
  @@ -362,6 +425,11 @@ static struct ref_store *reftable_be_init(struct repository *repo,
   	int is_worktree;
   	mode_t mask;

  +#ifdef DEBUG_REFTABLE_ALLOC
  +	my_malloced = kh_init_ptr();
  +	reftable_set_alloc(my_malloc, my_realloc, my_free);
  +#endif
  +
   	mask = umask(0);
   	umask(mask);

I briefly considered contributing this "custom allocator" patch, too,
but it is unwieldy (for example, it would not work at all when compiling
with mimalloc support) and it would only waste space (or even time, if a
compile flag was introduced and exercised as part of the CI builds).
Given that it is highly unlikely that Git will lose the new
`reftable_set_alloc()` call by mistake, I rejected that idea as simply
too wasteful.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 refs/reftable-backend.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/refs/reftable-backend.c b/refs/reftable-backend.c
index 10db03991e689a..91431c00e56078 100644
--- a/refs/reftable-backend.c
+++ b/refs/reftable-backend.c
@@ -414,6 +414,8 @@ static struct ref_store *reftable_be_init(struct repository *repo,
 	struct strbuf path = STRBUF_INIT;
 	bool is_worktree;
 
+	reftable_set_alloc(malloc, realloc, free);
+
 	refs_compute_filesystem_location(gitdir, payload, &is_worktree, &refdir,
 					 &ref_common_dir);
 

From 355c62d6a2834832c76cec52a47a0d732ec6b7de Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 3 Jun 2025 12:45:39 +0200
Subject: [PATCH 133/247] check-whitespace: avoid alerts about upstream commits

Every once in a while, whitespace errors are introduced in Git for
Windows' rebases to newer Git versions, simply by virtue of integrating
upstream commits that do not follow upstream Git's own whitespace rule.
In Git v2.50.0-rc0, for example, 03f2915541a4 (xdiff: disable
cleanup_records heuristic with --minimal, 2025-04-29) introduced a
trailing space.

Arguably, non-actionable alerts are worse than no alerts at all, so
let's suppress those alerts that we cannot do anything about, anyway.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 ci/check-whitespace.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ci/check-whitespace.sh b/ci/check-whitespace.sh
index c40804394cb079..e590ac0dfd765e 100755
--- a/ci/check-whitespace.sh
+++ b/ci/check-whitespace.sh
@@ -19,6 +19,7 @@ problems=()
 commit=
 commitText=
 commitTextmd=
+committerEmail=
 goodParent=
 
 if ! git rev-parse --quiet --verify "${baseCommit}"
@@ -27,7 +28,7 @@ then
     exit 1
 fi
 
-while read dash sha etc
+while read dash email sha etc
 do
 	case "${dash}" in
 	"---") # Line contains commit information.
@@ -40,10 +41,14 @@ do
 		commit="${sha}"
 		commitText="${sha} ${etc}"
 		commitTextmd="[${sha}](${url}/commit/${sha}) ${etc}"
+		committerEmail="${email}"
 		;;
 	"")
 		;;
 	*) # Line contains whitespace error information for current commit.
+		# Quod licet Iovi non licet bovi
+		test gitster@pobox.com != "$committerEmail" || break
+
 		if test -n "${goodParent}"
 		then
 			problems+=("1) --- ${commitTextmd}")
@@ -64,7 +69,7 @@ do
 		echo "${dash} ${sha} ${etc}"
 		;;
 	esac
-done <<< "$(git log --check --pretty=format:"---% h% s" "${baseCommit}"..)"
+done <<< "$(git log --check --pretty=format:"---% ce% h% s" "${baseCommit}"..)"
 
 if test ${#problems[*]} -gt 0
 then

From 0ceea94649b0ce870f45855b48a2f77af84983bc Mon Sep 17 00:00:00 2001
From: Thomas Braun <thomas.braun@virtuell-zuhause.de>
Date: Mon, 26 Jan 2026 19:02:44 +0100
Subject: [PATCH 134/247] t/t5571-prep-push-hook.sh: Add test with writing to
 stderr

The 2.53.0.rc0.windows release candidate had a regression where
writing to stderr from a pre-push hook would error out.

The regression was fixed in 2.53.0.rc1.windows and the test here ensures
that this stays fixed.

Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de>
---
 t/t5571-pre-push-hook.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/t/t5571-pre-push-hook.sh b/t/t5571-pre-push-hook.sh
index a11b20e378223e..25b8d50c9428a7 100755
--- a/t/t5571-pre-push-hook.sh
+++ b/t/t5571-pre-push-hook.sh
@@ -138,4 +138,16 @@ test_expect_success 'sigpipe does not cause pre-push hook failure' '
 	git push parent1 "refs/heads/b/*:refs/heads/b/*"
 '
 
+test_expect_success 'can write to stderr' '
+	test_hook --clobber pre-push <<-\EOF &&
+	echo foo >/dev/stderr &&
+	exit 0
+	EOF
+
+	test_commit third &&
+	echo foo >expect &&
+	git push --quiet parent1 HEAD 2>actual &&
+	test_cmp expect actual
+'
+
 test_done

From 339bd4ecb379832c0f70424a1828e878ca11e5e8 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 9 Feb 2026 18:21:48 +0100
Subject: [PATCH 135/247] credential: advertise NTLM suppression and allow
 helpers to re-enable

The previous commits disabled NTLM authentication by default due to its
cryptographic weaknesses. Users can re-enable it via the config setting
http.<url>.allowNTLMAuth, but this requires manual intervention.

Credential helpers may have knowledge about which servers are trusted
for NTLM authentication (e.g., known on-prem Azure DevOps instances).
To allow them to signal this trust, introduce a simple negotiation:
when NTLM is suppressed and the server offered it, Git advertises
ntlm=suppressed to the credential helper. The helper can respond with
ntlm=allow to re-enable NTLM for this request.

This happens precisely at the point where we would otherwise warn the
user about NTLM being suppressed, ensuring the capability is only
advertised when relevant.

Helped-by: Matthew John Cheetham <mjcheetham@outlook.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 credential.c                |  5 +++++
 credential.h                |  3 +++
 http.c                      | 17 +++++++++++++++--
 t/t5563-simple-http-auth.sh | 13 ++++++++++++-
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/credential.c b/credential.c
index 2594c0c4229ba0..af964189363b28 100644
--- a/credential.c
+++ b/credential.c
@@ -360,6 +360,9 @@ int credential_read(struct credential *c, FILE *fp,
 				credential_set_capability(&c->capa_authtype, op_type);
 			else if (!strcmp(value, "state"))
 				credential_set_capability(&c->capa_state, op_type);
+		} else if (!strcmp(key, "ntlm")) {
+			if (!strcmp(value, "allow"))
+				c->ntlm_allow = 1;
 		} else if (!strcmp(key, "continue")) {
 			c->multistage = !!git_config_bool("continue", value);
 		} else if (!strcmp(key, "password_expiry_utc")) {
@@ -420,6 +423,8 @@ void credential_write(const struct credential *c, FILE *fp,
 		if (c->ephemeral)
 			credential_write_item(c, fp, "ephemeral", "1", 0);
 	}
+	if (c->ntlm_suppressed)
+		credential_write_item(c, fp, "ntlm", "suppressed", 0);
 	credential_write_item(c, fp, "protocol", c->protocol, 1);
 	credential_write_item(c, fp, "host", c->host, 1);
 	credential_write_item(c, fp, "path", c->path, 0);
diff --git a/credential.h b/credential.h
index c78b72d110eaac..95244d5375dfe9 100644
--- a/credential.h
+++ b/credential.h
@@ -177,6 +177,9 @@ struct credential {
 	struct credential_capability capa_authtype;
 	struct credential_capability capa_state;
 
+	unsigned ntlm_suppressed:1,
+		 ntlm_allow:1;
+
 	char *username;
 	char *password;
 	char *credential;
diff --git a/http.c b/http.c
index 23476fd3244039..8de30a131e944d 100644
--- a/http.c
+++ b/http.c
@@ -661,6 +661,11 @@ static void init_curl_http_auth(CURL *result)
 
 	credential_fill(the_repository, &http_auth, 1);
 
+	if (http_auth.ntlm_allow && !(http_auth_methods & CURLAUTH_NTLM)) {
+		http_auth_methods |= CURLAUTH_NTLM;
+		curl_easy_setopt(result, CURLOPT_HTTPAUTH, http_auth_methods);
+	}
+
 	if (http_auth.password) {
 		if (always_auth_proactively()) {
 			/*
@@ -1955,6 +1960,8 @@ static int handle_curl_result(struct slot_results *results)
 	} else if (missing_target(results))
 		return HTTP_MISSING_TARGET;
 	else if (results->http_code == 401) {
+		http_auth.ntlm_suppressed = (results->auth_avail & CURLAUTH_NTLM) &&
+					    !(http_auth_any & CURLAUTH_NTLM);
 		if ((http_auth.username && http_auth.password) ||\
 		    (http_auth.authtype && http_auth.credential)) {
 			if (http_auth.multistage) {
@@ -1964,8 +1971,7 @@ static int handle_curl_result(struct slot_results *results)
 			credential_reject(the_repository, &http_auth);
 			if (always_auth_proactively())
 				http_proactive_auth = PROACTIVE_AUTH_NONE;
-			if ((results->auth_avail & CURLAUTH_NTLM) &&
-			    !(http_auth_any & CURLAUTH_NTLM)) {
+			if (http_auth.ntlm_suppressed) {
 				warning(_("Due to its cryptographic weaknesses, "
 					  "NTLM authentication has been\n"
 					  "disabled in Git by default. You can "
@@ -2499,6 +2505,13 @@ static int http_request_recoverable(const char *url,
 			http_reauth_prepare(1);
 		}
 
+		/*
+		 * Re-enable NTLM auth if the helper allows it and we would
+		 * otherwise suppress authentication via NTLM.
+		 */
+		if (http_auth.ntlm_suppressed && http_auth.ntlm_allow)
+			http_auth_methods |= CURLAUTH_NTLM;
+
 		ret = http_request(url, result, target, options);
 	}
 	if (ret == HTTP_RATE_LIMITED) {
diff --git a/t/t5563-simple-http-auth.sh b/t/t5563-simple-http-auth.sh
index 303f8589640aa2..35e6f4b397da7c 100755
--- a/t/t5563-simple-http-auth.sh
+++ b/t/t5563-simple-http-auth.sh
@@ -733,8 +733,19 @@ test_expect_success NTLM 'access using NTLM auth' '
 	test_must_fail env GIT_TRACE_CURL=1 git \
 		ls-remote "$HTTPD_URL/ntlm_auth/repo.git" 2>err &&
 	test_grep "allowNTLMAuth" err &&
+
+	# Can be enabled via config
 	GIT_TRACE_CURL=1 git -c http.$HTTPD_URL.allowNTLMAuth=true \
-		ls-remote "$HTTPD_URL/ntlm_auth/repo.git"
+		ls-remote "$HTTPD_URL/ntlm_auth/repo.git" &&
+
+	# Or via credential helper responding with ntlm=allow
+	set_credential_reply get <<-EOF &&
+	username=user
+	password=pwd
+	ntlm=allow
+	EOF
+
+	git ls-remote "$HTTPD_URL/ntlm_auth/repo.git"
 '
 
 test_done

From 80652429001b35a86dffdaf5af5c800dab1d1067 Mon Sep 17 00:00:00 2001
From: Maks Kuznia <makskuznia244@gmail.com>
Date: Mon, 30 Mar 2026 23:18:31 +0200
Subject: [PATCH 136/247] dir: do not traverse mount points

It was already decided in ef22148 (clean: do not traverse mount points,
2018-12-07) that we shouldn't traverse NTFS junctions/bind mounts when
using `git clean`, partly because they're sometimes used in worktrees.
But the same check wasn't applied to `remove_dir_recurse()` in `dir.c`,
which `git worktree remove` uses. So removing a worktree suffers the
same problem we had previously with `git clean`.

Let's add the same guard from ef22148.

Signed-off-by: Maks Kuznia <makskuznia244@gmail.com>
---
 dir.c                    | 7 +++++++
 t/t2403-worktree-move.sh | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/dir.c b/dir.c
index d896e7be4b1fd2..5528b2b74c37d7 100644
--- a/dir.c
+++ b/dir.c
@@ -3416,6 +3416,13 @@ static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up)
 		return 0;
 	}
 
+	if (is_mount_point(path)) {
+		/* Do not descend and nuke a mount point or junction. */
+		if (kept_up)
+			*kept_up = 1;
+		return 0;
+	}
+
 	flag &= ~REMOVE_DIR_KEEP_TOPLEVEL;
 	dir = opendir(path->buf);
 	if (!dir) {
diff --git a/t/t2403-worktree-move.sh b/t/t2403-worktree-move.sh
index 69768c120773f4..05a38ecba00b86 100755
--- a/t/t2403-worktree-move.sh
+++ b/t/t2403-worktree-move.sh
@@ -271,4 +271,13 @@ test_expect_success 'move worktree with relative path to absolute path' '
 	test_cmp expect .git/worktrees/absolute/gitdir
 '
 
+test_expect_success MINGW 'worktree remove does not traverse mount points' '
+	mkdir target &&
+	>target/dont-remove-me &&
+	git worktree add --detach wt-junction &&
+	cmd //c "mklink /j wt-junction\\mnt target" &&
+	git worktree remove --force wt-junction &&
+	test_path_is_file target/dont-remove-me
+'
+
 test_done

From 2107042183fe77d2eab8b5c57de8ac62cb43560f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20A=C3=9Fhauer?= <mha1993@live.de>
Date: Sat, 21 Feb 2026 12:11:02 +0100
Subject: [PATCH 137/247] win32: thread-utils: handle multi-socket systems
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

While the currently used way to detect the number of CPU cores on
Windows is nice and straight-forward, GetSystemInfo() only gives us
access to the number of processors within the current group. [1]

While that is usually fine for systems with a single physical CPU,
separate physical sockets are typically separate groups.

Switch to using GetLogicalProcessorInformationEx() to handle multi-socket
systems better.

[1] https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/ns-sysinfoapi-system_info#members

This fixes https://github.com/git-for-windows/git/issues/4766

Co-Authored-by: Herman Semenov <GermanAizek@yandex.ru>
Signed-off-by: Matthias Aßhauer <mha1993@live.de>
---
 thread-utils.c | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/thread-utils.c b/thread-utils.c
index 374890e6b05b69..00e7e9192b3e0b 100644
--- a/thread-utils.c
+++ b/thread-utils.c
@@ -28,11 +28,28 @@ int online_cpus(void)
 #endif
 
 #ifdef GIT_WINDOWS_NATIVE
-	SYSTEM_INFO info;
-	GetSystemInfo(&info);
-
-	if ((int)info.dwNumberOfProcessors > 0)
-		return (int)info.dwNumberOfProcessors;
+	DWORD len = 0;
+	if (!GetLogicalProcessorInformationEx(RelationProcessorCore, NULL, &len) && GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
+		uint8_t *buf = malloc(len);
+		if (buf) {
+			if (GetLogicalProcessorInformationEx(RelationProcessorCore, (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX) buf, &len)) {
+				DWORD offset = 0;
+				int n_cores = 0;
+				while (offset < len) {
+					PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX info = (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX) (buf + offset);
+					offset += info->Size;
+					/* The threads within a core always share a single group. We need to count the bits in the mask to get a thread count. */
+					for (KAFFINITY mask = info->Processor.GroupMask[0].Mask; mask; mask >>= 1)
+						n_cores += mask &1;
+				}
+				if (n_cores) {
+					free(buf);
+					return n_cores;
+				}
+			}
+			free(buf);
+		}
+	}
 #elif defined(hpux) || defined(__hpux) || defined(_hpux)
 	struct pst_dynamic psd;
 

From fcd763691af0d39f99e87e8d456f083303a977c1 Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Mon, 13 Apr 2026 12:57:12 +0100
Subject: [PATCH 138/247] t5563: add tests for http.emptyAuth with Negotiate

Add tests exercising the interaction between http.emptyAuth and
servers that advertise Negotiate (SPNEGO) authentication.

Verify that auto mode gives Negotiate a chance via empty auth
(resulting in two 401 responses before falling through to
credential_fill with Basic credentials), and that false mode
strips Negotiate immediately (only one 401 response).

Signed-off-by: Matthew John Cheetham <mjcheetham@outlook.com>
---
 t/t5563-simple-http-auth.sh | 74 +++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/t/t5563-simple-http-auth.sh b/t/t5563-simple-http-auth.sh
index 35e6f4b397da7c..911c716aaff2f4 100755
--- a/t/t5563-simple-http-auth.sh
+++ b/t/t5563-simple-http-auth.sh
@@ -748,4 +748,78 @@ test_expect_success NTLM 'access using NTLM auth' '
 	git ls-remote "$HTTPD_URL/ntlm_auth/repo.git"
 '
 
+test_lazy_prereq SPNEGO 'curl --version | grep -qi "SPNEGO\|GSS-API\|Kerberos\|negotiate"'
+
+test_expect_success SPNEGO 'http.emptyAuth=auto attempts Negotiate before credential_fill' '
+	test_when_finished "per_test_cleanup" &&
+
+	set_credential_reply get <<-EOF &&
+	username=alice
+	password=secret-passwd
+	EOF
+
+	# Basic base64(alice:secret-passwd)
+	cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF &&
+	id=1 creds=Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA==
+	EOF
+
+	cat >"$HTTPD_ROOT_PATH/custom-auth.challenge" <<-EOF &&
+	id=1 status=200
+	id=default response=WWW-Authenticate: Negotiate
+	id=default response=WWW-Authenticate: Basic realm="example.com"
+	EOF
+
+	test_config_global credential.helper test-helper &&
+	GIT_TRACE_CURL="$TRASH_DIRECTORY/trace-auto" \
+		git -c http.emptyAuth=auto \
+		ls-remote "$HTTPD_URL/custom_auth/repo.git" &&
+
+	# In auto mode with a Negotiate+Basic server, there should be
+	# three 401 responses: (1) initial no-auth request, (2) empty-auth
+	# retry where Negotiate fails (no Kerberos ticket), (3) libcurl
+	# internal Negotiate retry. The fourth attempt uses Basic
+	# credentials from credential_fill and succeeds.
+	grep "HTTP/[0-9.]* 401" "$TRASH_DIRECTORY/trace-auto" >actual_401s &&
+	test_line_count = 3 actual_401s &&
+
+	expect_credential_query get <<-EOF
+	capability[]=authtype
+	capability[]=state
+	protocol=http
+	host=$HTTPD_DEST
+	wwwauth[]=Negotiate
+	wwwauth[]=Basic realm="example.com"
+	EOF
+'
+
+test_expect_success SPNEGO 'http.emptyAuth=false skips Negotiate' '
+	test_when_finished "per_test_cleanup" &&
+
+	set_credential_reply get <<-EOF &&
+	username=alice
+	password=secret-passwd
+	EOF
+
+	# Basic base64(alice:secret-passwd)
+	cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF &&
+	id=1 creds=Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA==
+	EOF
+
+	cat >"$HTTPD_ROOT_PATH/custom-auth.challenge" <<-EOF &&
+	id=1 status=200
+	id=default response=WWW-Authenticate: Negotiate
+	id=default response=WWW-Authenticate: Basic realm="example.com"
+	EOF
+
+	test_config_global credential.helper test-helper &&
+	GIT_TRACE_CURL="$TRASH_DIRECTORY/trace-false" \
+		git -c http.emptyAuth=false \
+		ls-remote "$HTTPD_URL/custom_auth/repo.git" &&
+
+	# With emptyAuth=false, Negotiate is stripped immediately and
+	# credential_fill is called right away. Only one 401 response.
+	grep "HTTP/[0-9.]* 401" "$TRASH_DIRECTORY/trace-false" >actual_401s &&
+	test_line_count = 1 actual_401s
+'
+
 test_done

From 373d334333873e2834947c92fd75e75eaf7e739f Mon Sep 17 00:00:00 2001
From: Tyrie Vella <tyrielv@gmail.com>
Date: Mon, 18 May 2026 09:50:39 -0700
Subject: [PATCH 139/247] entry: flush fscache after creating directories and
 writing files

When checkout.workers > 1 and core.fscache is enabled on Windows,
'git checkout <tree> -- <pathspec>' fails when restoring files into
directories that do not yet exist on disk. Two failure modes occur:

1. create_directories(): the fscache returns a stale directory listing
   that does not include a just-created directory. has_dirs_only_path()
   reports it as non-existent, triggering the unlink+mkdir recovery
   path which fails with 'cannot create directory: Directory not empty'.

2. write_pc_item(): after writing and closing a file, lstat() cannot
   see it through the stale fscache, failing with 'unable to stat
   just-written file'.

With workers=1, write_entry() calls flush_fscache() after each file,
keeping the cache in sync. With workers>1, enqueue_checkout() defers
the write (and the flush), leaving the cache stale for subsequent
entries.

Fix both by adding flush_fscache() calls after mkdir() in
create_directories() and before lstat() in write_pc_item(). On
non-Windows platforms flush_fscache() is a no-op.

Assisted-by: Claude Opus 4.6
Signed-off-by: Tyrie Vella <tyrielv@gmail.com>
---
 entry.c                             | 15 +++++++++-
 parallel-checkout.c                 |  7 +++++
 t/t2080-parallel-checkout-basics.sh | 46 +++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/entry.c b/entry.c
index 1c4f0f44070ea3..064e13437235b4 100644
--- a/entry.c
+++ b/entry.c
@@ -49,10 +49,23 @@ static void create_directories(const char *path, int path_len,
 		 */
 		if (mkdir(buf, 0777)) {
 			if (errno == EEXIST && state->force &&
-			    !unlink_or_warn(buf) && !mkdir(buf, 0777))
+			    !unlink_or_warn(buf) && !mkdir(buf, 0777)) {
+				flush_fscache();
 				continue;
+			}
 			die_errno("cannot create directory at '%s'", buf);
 		}
+
+		/*
+		 * Flush the lstat cache of directory listings so that
+		 * subsequent has_dirs_only_path() calls see the
+		 * just-created directory. Without this, the Windows
+		 * fscache returns stale ENOENT for the new directory,
+		 * causing the next entry sharing this parent to
+		 * incorrectly hit the mkdir/unlink recovery path
+		 * above, which then fails with "Directory not empty".
+		 */
+		flush_fscache();
 	}
 	free(buf);
 }
diff --git a/parallel-checkout.c b/parallel-checkout.c
index 0bf4bd6d4abd8c..a6d07dcb1805b9 100644
--- a/parallel-checkout.c
+++ b/parallel-checkout.c
@@ -395,6 +395,13 @@ void write_pc_item(struct parallel_checkout_item *pc_item,
 		goto out;
 	}
 
+	/*
+	 * Flush the Windows fscache so that the lstat() below sees the
+	 * file we just wrote. Without this, the cached parent directory
+	 * listing may not yet include the new file entry.
+	 */
+	flush_fscache();
+
 	if (state->refresh_cache && !fstat_done && lstat(path.buf, &pc_item->st) < 0) {
 		error_errno("unable to stat just-written file '%s'",  path.buf);
 		pc_item->status = PC_ITEM_FAILED;
diff --git a/t/t2080-parallel-checkout-basics.sh b/t/t2080-parallel-checkout-basics.sh
index 88a6ec1826224e..322d26708e0bfd 100755
--- a/t/t2080-parallel-checkout-basics.sh
+++ b/t/t2080-parallel-checkout-basics.sh
@@ -274,4 +274,50 @@ test_expect_success '"git checkout ." report should not include failed entries'
 	)
 '
 
+# Regression test: parallel checkout + fscache stale directory listing.
+#
+# When checkout.workers > 1, checkout_entry_ca() enqueues files for deferred
+# writing instead of writing them inline. The inline write_entry() path calls
+# flush_fscache() after each file, keeping the Windows fscache in sync with
+# newly-created directories. The deferred path skips this flush, so
+# has_dirs_only_path() sees stale ENOENT for directories that mkdir() just
+# created. The recovery path in create_directories() then tries to unlink+
+# recreate the directory, which fails because it already has children.
+#
+# The trigger is: two files sharing a parent directory that does not yet exist
+# on disk when `git checkout <tree> -- <pathspec>` runs.
+test_expect_success MINGW 'parallel checkout with fscache does not fail on new directories' '
+	git init fscache-pc &&
+	(
+		cd fscache-pc &&
+		git config core.fscache true &&
+
+		# Commit B1: files in a nested directory
+		mkdir -p sub/deep/dir &&
+		echo one >sub/deep/dir/file1.txt &&
+		echo two >sub/deep/dir/file2.txt &&
+		git add sub &&
+		git commit -m "B1: with sub/deep/dir" &&
+		git tag B1 &&
+
+		# Commit B2: the directory is gone
+		git rm -rf sub &&
+		git commit -m "B2: without sub" &&
+
+		# Now restore both files from B1 with parallel checkout.
+		# This is the pathspec checkout path (checkout_worktree in
+		# builtin/checkout.c), which defers writes via enqueue_checkout
+		# when workers > 1 and does not flush fscache between entries.
+		git -c checkout.workers=2 \
+		    -c checkout.thresholdForParallelism=0 \
+		    checkout B1 -- sub/deep/dir/file1.txt sub/deep/dir/file2.txt &&
+
+		# Verify both files are correctly restored
+		echo one >expect1 &&
+		echo two >expect2 &&
+		test_cmp expect1 sub/deep/dir/file1.txt &&
+		test_cmp expect2 sub/deep/dir/file2.txt
+	)
+'
+
 test_done

From 94582b340c441365463fc41b0a17b10b0bfc5fe3 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 13 Nov 2025 11:23:29 +0100
Subject: [PATCH 140/247] ci(macos): skip the `git p4` tests

Historically, the macOS jobs have always been among the longest-running
ones, and recently the `git p4` tests became another liability: They
started to fail much more often (maybe as of the switch away from the
`macos-13` pool?), requiring re-runs of the jobs that already were
responsible for long CI build times.

Of the 35 test scripts that exercise `git p4`, 32 are actually run on
macOS (3 are skipped for reasons like case-sensitivee filesystem), and
they take an accumulated runtime of over half an hour.

Furthermore, the `git p4` command is not really affected by Git for
Windows' patches, at least not as far as macOS is concerned, therefore
it is not only causing developer friction to have these long-running,
frequently failing tests, it is also quite wasteful: There has not been
a single instance so far where any `git p4` test failure in Git for
Windows had demonstrated an actionable bug.

While upstream Git is confident to have addressed the flakiness of the
`git p4` tests via ffff0bb0dac1 (Use Perforce arm64 binary on macOS CI
jobs, 2025-11-16) (which got slipped in at the 11th hour into the
v2.52.0 release, fast-tracked without ever hitting `seen` even after
-rc2 was released), I am not quite so confident, and besides, the
runtime penalty of running those tests in Git for Windows' CI runs is
still a worrisome burden.

So let's just disable those tests in the CI runs, at least on macOS.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 ci/install-dependencies.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index d57dce56630173..8606e30779b7fe 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -119,11 +119,12 @@ macos-*)
 	# brew install gnu-time
 	brew link --force gettext
 
-	mkdir -p "$CUSTOM_PATH"
-	wget -q "$P4WHENCE/bin.macosx12arm64/helix-core-server.tgz" &&
-	tar -xf helix-core-server.tgz -C "$CUSTOM_PATH" p4 p4d &&
-	sudo xattr -d com.apple.quarantine "$CUSTOM_PATH/p4" "$CUSTOM_PATH/p4d" 2>/dev/null || true
-	rm helix-core-server.tgz
+	# Uncomment this block if you want to run `git p4` tests:
+	# mkdir -p "$CUSTOM_PATH"
+	# wget -q "$P4WHENCE/bin.macosx12arm64/helix-core-server.tgz" &&
+	# tar -xf helix-core-server.tgz -C "$CUSTOM_PATH" p4 p4d &&
+	# sudo xattr -d com.apple.quarantine "$CUSTOM_PATH/p4" "$CUSTOM_PATH/p4d" 2>/dev/null || true
+	# rm helix-core-server.tgz
 
 	case "$jobname" in
 	osx-meson)

From 03c5a21007b78e05528240e8247355d60c56be31 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 23 Feb 2018 02:50:03 +0100
Subject: [PATCH 141/247] mingw (git_terminal_prompt): do fall back to
 CONIN$/CONOUT$ method

To support Git Bash running in a MinTTY, we use a dirty trick to access
the MSYS2 pseudo terminal: we execute a Bash snippet that accesses
/dev/tty.

The idea was to fall back to writing to/reading from CONOUT$/CONIN$ if
that Bash call failed because Bash was not found.

However, we should fall back even in other error conditions, because we
have not successfully read the user input. Let's make it so.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/terminal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compat/terminal.c b/compat/terminal.c
index a89c5cd9ccf604..882b027e41e52b 100644
--- a/compat/terminal.c
+++ b/compat/terminal.c
@@ -483,7 +483,7 @@ char *git_terminal_prompt(const char *prompt, int echo)
 
 	/* try shell_prompt first, fall back to CONIN/OUT if bash is missing */
 	char *result = shell_prompt(prompt, echo);
-	if (result || errno != ENOENT)
+	if (result)
 		return result;
 
 #endif

From 3578b5c599793a0e8b89cccf2a95930549080a4e Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 23 Apr 2018 23:20:00 +0200
Subject: [PATCH 142/247] mingw: Windows Docker volumes are *not* symbolic
 links

... even if they may look like them.

As looking up the target of the "symbolic link" (just to see whether it
starts with `/ContainerMappedDirectories/`) is pretty expensive, we
do it when we can be *really* sure that there is a possibility that this
might be the case.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: JiSeop Moon <zcube@zcube.kr>
---
 compat/mingw.c | 25 +++++++++++++++++++------
 compat/win32.h |  2 +-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 9b6ad28b05243d..9aa5c96ed1aa73 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1269,7 +1269,7 @@ int mingw_lstat(const char *file_name, struct stat *buf)
 		buf->st_uid = 0;
 		buf->st_nlink = 1;
 		buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes,
-				reparse_tag);
+				reparse_tag, file_name);
 		buf->st_size = S_ISLNK(buf->st_mode) ? link_len :
 			fdata.nFileSizeLow | (((off_t) fdata.nFileSizeHigh) << 32);
 		buf->st_dev = buf->st_rdev = 0; /* not used by Git */
@@ -1318,7 +1318,7 @@ static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
 	buf->st_gid = 0;
 	buf->st_uid = 0;
 	buf->st_nlink = 1;
-	buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes, 0);
+	buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes, 0, NULL);
 	buf->st_size = fdata.nFileSizeLow |
 		(((off_t)fdata.nFileSizeHigh)<<32);
 	buf->st_dev = buf->st_rdev = 0; /* not used by Git */
@@ -3893,12 +3893,25 @@ int is_inside_windows_container(void)
 	return inside_container;
 }
 
-int file_attr_to_st_mode (DWORD attr, DWORD tag)
+int file_attr_to_st_mode (DWORD attr, DWORD tag, const char *path)
 {
 	int fMode = S_IREAD;
-	if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) && tag == IO_REPARSE_TAG_SYMLINK)
-		fMode |= S_IFLNK;
-	else if (attr & FILE_ATTRIBUTE_DIRECTORY)
+	if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) &&
+	    tag == IO_REPARSE_TAG_SYMLINK) {
+		int flag = S_IFLNK;
+		char buf[MAX_LONG_PATH];
+
+		/*
+		 * Windows containers' mapped volumes are marked as reparse
+		 * points and look like symbolic links, but they are not.
+		 */
+		if (path && is_inside_windows_container() &&
+		    readlink(path, buf, sizeof(buf)) > 27 &&
+		    starts_with(buf, "/ContainerMappedDirectories/"))
+			flag = S_IFDIR;
+
+		fMode |= flag;
+	} else if (attr & FILE_ATTRIBUTE_DIRECTORY)
 		fMode |= S_IFDIR;
 	else
 		fMode |= S_IFREG;
diff --git a/compat/win32.h b/compat/win32.h
index 52169ae19f4371..299f01bdf0f5a4 100644
--- a/compat/win32.h
+++ b/compat/win32.h
@@ -6,7 +6,7 @@
 #include <windows.h>
 #endif
 
-extern int file_attr_to_st_mode (DWORD attr, DWORD tag);
+extern int file_attr_to_st_mode (DWORD attr, DWORD tag, const char *path);
 
 static inline int get_file_attr(const char *fname, WIN32_FILE_ATTRIBUTE_DATA *fdata)
 {

From 847ea637dea760ff156f68c1b99bb68a03ec870d Mon Sep 17 00:00:00 2001
From: David Lomas <dl3@pale-eds.co.uk>
Date: Fri, 28 Jul 2023 15:20:43 +0100
Subject: [PATCH 143/247] mingw: work around rename() failing on a read-only
 file

At least on _some_ APFS network shares, Git fails to rename the object
files because they are marked as read-only, because that has the effect
of setting the uchg flag on APFS, which then means the file can't be
renamed or deleted.

To work around that, when a rename failed, and the read-only flag is
set, try to turn it off and on again.

This fixes https://github.com/git-for-windows/git/issues/4482

Signed-off-by: David Lomas <dl3@pale-eds.co.uk>
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---
 compat/mingw.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 9aa5c96ed1aa73..680302d47372ce 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -2527,7 +2527,7 @@ int mingw_accept(int sockfd1, struct sockaddr *sa, socklen_t *sz)
 int mingw_rename(const char *pold, const char *pnew)
 {
 	static int supports_file_rename_info_ex = 1;
-	DWORD attrs = INVALID_FILE_ATTRIBUTES, gle;
+	DWORD attrs = INVALID_FILE_ATTRIBUTES, gle, attrsold;
 	int tries = 0;
 	wchar_t wpold[MAX_PATH], wpnew[MAX_PATH];
 	int wpnew_len;
@@ -2619,11 +2619,24 @@ int mingw_rename(const char *pold, const char *pnew)
 		gle = GetLastError();
 	}
 
-	if (gle == ERROR_ACCESS_DENIED && is_inside_windows_container()) {
-		/* Fall back to copy to destination & remove source */
-		if (CopyFileW(wpold, wpnew, FALSE) && !mingw_unlink(pold, 1))
-			return 0;
-		gle = GetLastError();
+	if (gle == ERROR_ACCESS_DENIED) {
+		if (is_inside_windows_container()) {
+			/* Fall back to copy to destination & remove source */
+			if (CopyFileW(wpold, wpnew, FALSE) && !mingw_unlink(pold, 1))
+				return 0;
+			gle = GetLastError();
+		} else if ((attrsold = GetFileAttributesW(wpold)) & FILE_ATTRIBUTE_READONLY) {
+			/* if file is read-only, change and retry */
+			SetFileAttributesW(wpold, attrsold & ~FILE_ATTRIBUTE_READONLY);
+			if (MoveFileExW(wpold, wpnew,
+					MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED)) {
+				SetFileAttributesW(wpnew, attrsold);
+				return 0;
+			}
+			gle = GetLastError();
+			/* revert attribute change on failure */
+			SetFileAttributesW(wpold, attrsold);
+		}
 	}
 
 	/* revert file attributes on failure */

From 9853de158b7043741bf16fe7fd4eb998a0a8c6ab Mon Sep 17 00:00:00 2001
From: Bert Belder <bertbelder@gmail.com>
Date: Fri, 26 Oct 2018 23:42:09 +0200
Subject: [PATCH 144/247] Win32: symlink: add test for `symlink` attribute

To verify that the symlink is resolved correctly, we use the fact that
`git.exe` is a native Win32 program, and that `git.exe config -f <path>`
therefore uses the native symlink resolution.

Signed-off-by: Bert Belder <bertbelder@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/meson.build                    |  1 +
 t/t2040-checkout-symlink-attr.sh | 46 ++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100755 t/t2040-checkout-symlink-attr.sh

diff --git a/t/meson.build b/t/meson.build
index 3ca7b271040a62..ce94999c6dd5c3 100644
--- a/t/meson.build
+++ b/t/meson.build
@@ -281,6 +281,7 @@ integration_tests = [
   't2026-checkout-pathspec-file.sh',
   't2027-checkout-track.sh',
   't2030-unresolve-info.sh',
+  't2040-checkout-symlink-attr.sh',
   't2050-git-dir-relative.sh',
   't2060-switch.sh',
   't2070-restore.sh',
diff --git a/t/t2040-checkout-symlink-attr.sh b/t/t2040-checkout-symlink-attr.sh
new file mode 100755
index 00000000000000..e00c31d096ce88
--- /dev/null
+++ b/t/t2040-checkout-symlink-attr.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+test_description='checkout symlinks with `symlink` attribute on Windows
+
+Ensures that Git for Windows creates symlinks of the right type,
+as specified by the `symlink` attribute in `.gitattributes`.'
+
+# Tell MSYS to create native symlinks. Without this flag test-lib's
+# prerequisite detection for SYMLINKS doesn't detect the right thing.
+MSYS=winsymlinks:nativestrict && export MSYS
+
+. ./test-lib.sh
+
+if ! test_have_prereq MINGW,SYMLINKS
+then
+	skip_all='skipping $0: MinGW-only test, which requires symlink support.'
+	test_done
+fi
+
+# Adds a symlink to the index without clobbering the work tree.
+cache_symlink () {
+	sha=$(printf '%s' "$1" | git hash-object --stdin -w) &&
+	git update-index --add --cacheinfo 120000,$sha,"$2"
+}
+
+test_expect_success 'checkout symlinks with attr' '
+	cache_symlink file1 file-link &&
+	cache_symlink dir dir-link &&
+
+	printf "file-link symlink=file\ndir-link symlink=dir\n" >.gitattributes &&
+	git add .gitattributes &&
+
+	git checkout . &&
+
+	mkdir dir &&
+	echo "[a]b=c" >file1 &&
+	echo "[x]y=z" >dir/file2 &&
+
+	# MSYS2 is very forgiving, it will resolve symlinks even if the
+	# symlink type is incorrect. To make this test meaningful, try
+	# them with a native, non-MSYS executable, such as `git config`.
+	test "$(git config -f file-link a.b)" = "c" &&
+	test "$(git config -f dir-link/file2 x.y)" = "z"
+'
+
+test_done

From 3978bca8c314c92c7f0d02ec25b902476813ae59 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 11 Dec 2018 12:55:26 +0100
Subject: [PATCH 145/247] clean: remove mount points when possible

Windows' equivalent to "bind mounts", NTFS junction points, can be
unlinked without affecting the mount target. This is clearly what users
expect to happen when they call `git clean -dfx` in a worktree that
contains NTFS junction points: the junction should be removed, and the
target directory of said junction should be left alone (unless it is
inside the worktree).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/clean.c  | 13 +++++++++++++
 compat/mingw.h   |  1 +
 t/t7300-clean.sh |  1 +
 3 files changed, 15 insertions(+)

diff --git a/builtin/clean.c b/builtin/clean.c
index e4f2d56d3210ba..6ed555000f9a41 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -41,8 +41,10 @@ static const char *msg_remove = N_("Removing %s\n");
 static const char *msg_would_remove = N_("Would remove %s\n");
 static const char *msg_skip_git_dir = N_("Skipping repository %s\n");
 static const char *msg_would_skip_git_dir = N_("Would skip repository %s\n");
+#ifndef CAN_UNLINK_MOUNT_POINTS
 static const char *msg_skip_mount_point = N_("Skipping mount point %s\n");
 static const char *msg_would_skip_mount_point = N_("Would skip mount point %s\n");
+#endif
 static const char *msg_warn_remove_failed = N_("failed to remove %s");
 static const char *msg_warn_lstat_failed = N_("could not lstat %s\n");
 static const char *msg_skip_cwd = N_("Refusing to remove current working directory\n");
@@ -188,6 +190,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 	}
 
 	if (is_mount_point(path)) {
+#ifndef CAN_UNLINK_MOUNT_POINTS
 		if (!quiet) {
 			quote_path(path->buf, prefix, &quoted, 0);
 			printf(dry_run ?
@@ -195,6 +198,16 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 			       _(msg_skip_mount_point), quoted.buf);
 		}
 		*dir_gone = 0;
+#else
+		if (!dry_run && unlink(path->buf)) {
+			int saved_errno = errno;
+			quote_path(path->buf, prefix, &quoted, 0);
+			errno = saved_errno;
+			warning_errno(_(msg_warn_remove_failed), quoted.buf);
+			*dir_gone = 0;
+			ret = -1;
+		}
+#endif
 
 		goto out;
 	}
diff --git a/compat/mingw.h b/compat/mingw.h
index 92237e14c4a87c..4466cf092af263 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -39,6 +39,7 @@ static inline void convert_slashes(char *path)
 struct strbuf;
 int mingw_is_mount_point(struct strbuf *path);
 #define is_mount_point mingw_is_mount_point
+#define CAN_UNLINK_MOUNT_POINTS 1
 #define PATH_SEP ';'
 char *mingw_query_user_email(void);
 #define query_user_email mingw_query_user_email
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index af9c05255ca040..f93c95adb8607a 100755
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -806,6 +806,7 @@ test_expect_success MINGW 'clean does not traverse mount points' '
 	git init with-mountpoint &&
 	cmd //c "mklink /j with-mountpoint\\mountpoint target" &&
 	git -C with-mountpoint clean -dfx &&
+	test_path_is_missing with-mountpoint/mountpoint &&
 	test_path_is_file target/dont-clean-me
 '
 

From df36504d325c860d60389ed2110411a65bcb088e Mon Sep 17 00:00:00 2001
From: xungeng li <xungeng@gmail.com>
Date: Wed, 7 Jun 2023 20:26:33 +0800
Subject: [PATCH 146/247] mingw: optionally enable wsl compability file mode
 bits

The Windows Subsystem for Linux (WSL) version 2 allows to use `chmod` on
NTFS volumes provided that they are mounted with metadata enabled (see
https://devblogs.microsoft.com/commandline/chmod-chown-wsl-improvements/
for details), for example:

	$ chmod 0755 /mnt/d/test/a.sh

In order to facilitate better collaboration between the Windows
version of Git and the WSL version of Git, we can make the Windows
version of Git also support reading and writing NTFS file modes
in a manner compatible with WSL.

Since this slightly slows down operations where lots of files are
created (such as an initial checkout), this feature is only enabled when
`core.WSLCompat` is set to true. Note that you also have to set
`core.fileMode=true` in repositories that have been initialized without
enabling WSL compatibility.

There are several ways to enable metadata loading for NTFS volumes
in WSL, one of which is to modify `/etc/wsl.conf` by adding:

```
[automount]
enabled = true
options = "metadata,umask=027,fmask=117"
```

And reboot WSL.

It can also be enabled temporarily by this incantation:

	$ sudo umount /mnt/c &&
	  sudo mount -t drvfs C: /mnt/c -o metadata,uid=1000,gid=1000,umask=22,fmask=111

It's important to note that this modification is compatible with, but
does not depend on WSL. The helper functions in this commit can operate
independently and functions normally on devices where WSL is not
installed or properly configured.

Signed-off-by: xungeng li <xungeng@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 Documentation/config/core.adoc      |   6 ++
 compat/mingw.c                      |  13 +++
 compat/win32/wsl.c                  | 142 ++++++++++++++++++++++++++++
 compat/win32/wsl.h                  |  12 +++
 config.mak.uname                    |   4 +-
 contrib/buildsystems/CMakeLists.txt |   1 +
 meson.build                         |   1 +
 7 files changed, 177 insertions(+), 2 deletions(-)
 create mode 100644 compat/win32/wsl.c
 create mode 100644 compat/win32/wsl.h

diff --git a/Documentation/config/core.adoc b/Documentation/config/core.adoc
index 340329edc38143..3794b4ecd6fc36 100644
--- a/Documentation/config/core.adoc
+++ b/Documentation/config/core.adoc
@@ -796,3 +796,9 @@ core.maxTreeDepth::
 	to allow Git to abort cleanly, and should not generally need to
 	be adjusted. When Git is compiled with MSVC, the default is 512.
 	Otherwise, the default is 2048.
+
+core.WSLCompat::
+	Tells Git whether to enable wsl compatibility mode.
+	The default value is false. When set to true, Git will set the mode
+	bits of the file in the way of wsl, so that the executable flag of
+	files can be set or read correctly.
diff --git a/compat/mingw.c b/compat/mingw.c
index 93eb3509544092..ab82fadca5aefc 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -16,6 +16,7 @@
 #include "win32.h"
 #include "win32/exit-process.h"
 #include "win32/lazyload.h"
+#include "win32/wsl.h"
 #include "wrapper.h"
 #include <aclapi.h>
 #include <conio.h>
@@ -895,6 +896,11 @@ int mingw_open (const char *filename, int oflags, ...)
 	if (fd < 0 && create && GetLastError() == ERROR_ACCESS_DENIED &&
 	    INIT_PROC_ADDR(RtlGetLastNtStatus) && RtlGetLastNtStatus() == STATUS_DELETE_PENDING)
 		errno = EEXIST;
+	else if ((oflags & O_CREAT) && fd >= 0 && are_wsl_compatible_mode_bits_enabled()) {
+		_mode_t wsl_mode = S_IFREG | (mode&0777);
+		set_wsl_mode_bits_by_handle((HANDLE)_get_osfhandle(fd), wsl_mode);
+	}
+
 	if (fd < 0 && (oflags & O_ACCMODE) != O_RDONLY && errno == EACCES) {
 		DWORD attrs = GetFileAttributesW(wfilename);
 		if (attrs != INVALID_FILE_ATTRIBUTES && (attrs & FILE_ATTRIBUTE_DIRECTORY))
@@ -1276,6 +1282,11 @@ int mingw_lstat(const char *file_name, struct stat *buf)
 		filetime_to_timespec(&(fdata.ftLastAccessTime), &(buf->st_atim));
 		filetime_to_timespec(&(fdata.ftLastWriteTime), &(buf->st_mtim));
 		filetime_to_timespec(&(fdata.ftCreationTime), &(buf->st_ctim));
+		if (S_ISREG(buf->st_mode) &&
+		    are_wsl_compatible_mode_bits_enabled()) {
+			copy_wsl_mode_bits_from_disk(wfilename, -1,
+						     &buf->st_mode);
+		}
 		return 0;
 	}
 
@@ -1325,6 +1336,8 @@ static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
 	filetime_to_timespec(&(fdata.ftLastAccessTime), &(buf->st_atim));
 	filetime_to_timespec(&(fdata.ftLastWriteTime), &(buf->st_mtim));
 	filetime_to_timespec(&(fdata.ftCreationTime), &(buf->st_ctim));
+	if (are_wsl_compatible_mode_bits_enabled())
+	    get_wsl_mode_bits_by_handle(hnd, &buf->st_mode);
 	return 0;
 }
 
diff --git a/compat/win32/wsl.c b/compat/win32/wsl.c
new file mode 100644
index 00000000000000..ab599770138b4e
--- /dev/null
+++ b/compat/win32/wsl.c
@@ -0,0 +1,142 @@
+#define USE_THE_REPOSITORY_VARIABLE
+#include "../../git-compat-util.h"
+#include "../win32.h"
+#include "../../repository.h"
+#include "config.h"
+#include "ntifs.h"
+#include "wsl.h"
+
+int are_wsl_compatible_mode_bits_enabled(void)
+{
+	/* default to `false` during initialization */
+	static const int fallback = 0;
+	static int enabled = -1;
+
+	if (enabled < 0) {
+		/* avoid infinite recursion */
+		if (!the_repository)
+			return fallback;
+
+		if (the_repository->config &&
+		    the_repository->config->hash_initialized &&
+		    repo_config_get_bool(the_repository, "core.wslcompat", &enabled) < 0)
+			enabled = 0;
+	}
+
+	return enabled < 0 ? fallback : enabled;
+}
+
+int copy_wsl_mode_bits_from_disk(const wchar_t *wpath, ssize_t wpathlen,
+				 _mode_t *mode)
+{
+	int ret = -1;
+	HANDLE h;
+	if (wpathlen >= 0) {
+		/*
+		 * It's caller's duty to make sure wpathlen is reasonable so
+		 * it does not overflow.
+		 */
+		wchar_t *fn2 = (wchar_t*)alloca((wpathlen + 1) * sizeof(wchar_t));
+		memcpy(fn2, wpath, wpathlen * sizeof(wchar_t));
+		fn2[wpathlen] = 0;
+		wpath = fn2;
+	}
+	h = CreateFileW(wpath, FILE_READ_EA | SYNCHRONIZE,
+			FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+			NULL, OPEN_EXISTING,
+			FILE_FLAG_BACKUP_SEMANTICS |
+				FILE_FLAG_OPEN_REPARSE_POINT,
+			NULL);
+	if (h != INVALID_HANDLE_VALUE) {
+		ret = get_wsl_mode_bits_by_handle(h, mode);
+		CloseHandle(h);
+	}
+	return ret;
+}
+
+#ifndef LX_FILE_METADATA_HAS_UID
+#define LX_FILE_METADATA_HAS_UID 0x1
+#define LX_FILE_METADATA_HAS_GID 0x2
+#define LX_FILE_METADATA_HAS_MODE 0x4
+#define LX_FILE_METADATA_HAS_DEVICE_ID 0x8
+#define LX_FILE_CASE_SENSITIVE_DIR 0x10
+typedef struct _FILE_STAT_LX_INFORMATION {
+	LARGE_INTEGER FileId;
+	LARGE_INTEGER CreationTime;
+	LARGE_INTEGER LastAccessTime;
+	LARGE_INTEGER LastWriteTime;
+	LARGE_INTEGER ChangeTime;
+	LARGE_INTEGER AllocationSize;
+	LARGE_INTEGER EndOfFile;
+	uint32_t FileAttributes;
+	uint32_t ReparseTag;
+	uint32_t NumberOfLinks;
+	ACCESS_MASK EffectiveAccess;
+	uint32_t LxFlags;
+	uint32_t LxUid;
+	uint32_t LxGid;
+	uint32_t LxMode;
+	uint32_t LxDeviceIdMajor;
+	uint32_t LxDeviceIdMinor;
+} FILE_STAT_LX_INFORMATION, *PFILE_STAT_LX_INFORMATION;
+#endif
+
+/*
+ * This struct is extended from the original FILE_FULL_EA_INFORMATION of
+ * Microsoft Windows.
+ */
+struct wsl_full_ea_info_t {
+	uint32_t NextEntryOffset;
+	uint8_t Flags;
+	uint8_t EaNameLength;
+	uint16_t EaValueLength;
+	char EaName[7];
+	char EaValue[4];
+	char Padding[1];
+};
+
+enum {
+	FileStatLxInformation = 70,
+};
+__declspec(dllimport) NTSTATUS WINAPI
+	NtQueryInformationFile(HANDLE FileHandle,
+			       PIO_STATUS_BLOCK IoStatusBlock,
+			       PVOID FileInformation, ULONG Length,
+			       uint32_t FileInformationClass);
+__declspec(dllimport) NTSTATUS WINAPI
+	NtSetInformationFile(HANDLE FileHandle, PIO_STATUS_BLOCK IoStatusBlock,
+			     PVOID FileInformation, ULONG Length,
+			     uint32_t FileInformationClass);
+__declspec(dllimport) NTSTATUS WINAPI
+	NtSetEaFile(HANDLE FileHandle, PIO_STATUS_BLOCK IoStatusBlock,
+		    PVOID EaBuffer, ULONG EaBufferSize);
+
+int set_wsl_mode_bits_by_handle(HANDLE h, _mode_t mode)
+{
+	uint32_t value = mode;
+	struct wsl_full_ea_info_t ea_info;
+	IO_STATUS_BLOCK iob;
+	/* mode should be valid to make WSL happy */
+	assert(S_ISREG(mode) || S_ISDIR(mode));
+	ea_info.NextEntryOffset = 0;
+	ea_info.Flags = 0;
+	ea_info.EaNameLength = 6;
+	ea_info.EaValueLength = sizeof(value); /* 4 */
+	strlcpy(ea_info.EaName, "$LXMOD", sizeof(ea_info.EaName));
+	memcpy(ea_info.EaValue, &value, sizeof(value));
+	ea_info.Padding[0] = 0;
+	return NtSetEaFile(h, &iob, &ea_info, sizeof(ea_info));
+}
+
+int get_wsl_mode_bits_by_handle(HANDLE h, _mode_t *mode)
+{
+	FILE_STAT_LX_INFORMATION fxi;
+	IO_STATUS_BLOCK iob;
+	if (NtQueryInformationFile(h, &iob, &fxi, sizeof(fxi),
+				   FileStatLxInformation) == 0) {
+		if (fxi.LxFlags & LX_FILE_METADATA_HAS_MODE)
+			*mode = (_mode_t)fxi.LxMode;
+		return 0;
+	}
+	return -1;
+}
diff --git a/compat/win32/wsl.h b/compat/win32/wsl.h
new file mode 100644
index 00000000000000..1f5ad7e67a4fc2
--- /dev/null
+++ b/compat/win32/wsl.h
@@ -0,0 +1,12 @@
+#ifndef COMPAT_WIN32_WSL_H
+#define COMPAT_WIN32_WSL_H
+
+int are_wsl_compatible_mode_bits_enabled(void);
+
+int copy_wsl_mode_bits_from_disk(const wchar_t *wpath, ssize_t wpathlen,
+				 _mode_t *mode);
+
+int get_wsl_mode_bits_by_handle(HANDLE h, _mode_t *mode);
+int set_wsl_mode_bits_by_handle(HANDLE h, _mode_t mode);
+
+#endif
diff --git a/config.mak.uname b/config.mak.uname
index a85a842deba8d2..d4655c9df88f33 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -535,7 +535,7 @@ endif
 		compat/win32/path-utils.o \
 		compat/win32/pthread.o compat/win32/syslog.o \
 		compat/win32/trace2_win32_process_info.o \
-		compat/win32/dirent.o
+		compat/win32/dirent.o compat/win32/wsl.o
 	COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DDETECT_MSYS_TTY \
 		-DENSURE_MSYSTEM_IS_SET="\"$(MSYSTEM)\"" -DMINGW_PREFIX="\"$(patsubst /%,%,$(MINGW_PREFIX))\"" \
 		-DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
@@ -740,7 +740,7 @@ ifeq ($(uname_S),MINGW)
 		compat/win32/flush.o \
 		compat/win32/path-utils.o \
 		compat/win32/pthread.o compat/win32/syslog.o \
-		compat/win32/dirent.o
+		compat/win32/dirent.o compat/win32/wsl.o
 	BASIC_CFLAGS += -DWIN32
 	EXTLIBS += -lws2_32
 	GITLIBS += git.res
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 3bcccc0b9e0a7b..4187bb7c801298 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -274,6 +274,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 		compat/win32/syslog.c
 		compat/win32/trace2_win32_process_info.c
 		compat/win32/dirent.c
+		compat/win32/wsl.c
 		compat/strdup.c)
 	set(NO_UNIX_SOCKETS 1)
 
diff --git a/meson.build b/meson.build
index 0a95d90d211fd6..58da960a674cbb 100644
--- a/meson.build
+++ b/meson.build
@@ -1313,6 +1313,7 @@ elif host_machine.system() == 'windows'
     'compat/win32/path-utils.c',
     'compat/win32/pthread.c',
     'compat/win32/syslog.c',
+    'compat/win32/wsl.c',
     'compat/win32mmap.c',
   ]
 

From f9871cb53284e21edaea7189bac4ee9b609afa4c Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Thu, 28 May 2026 19:04:50 +0200
Subject: [PATCH 147/247] Refuse to follow invalid paths in `.git` files

This corresponds to the fixes in TortoiseGit v2.19 that were announced
in https://groups.google.com/g/tortoisegit-announce/c/31zdmOBi4vY.

The threat surface in Git for Windows is a lot smaller than in
TortoiseGit because Git is not integrated directly into the Windows
Explorer and hence does not run automatically on any extracted archive.
A Git user would have to run Git operations on an extracted archive of
dubious origin, which is never a good idea. In all other circumstances,
the `.git` files Git would see would always be written by Git for
Windows itself, which will never write `.git` files containing invalid
paths (or paths pointing to other servers). For this reason, it was
deemed okay to integrate this change as a regular patch.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/mingw.c       | 33 +++++++++++++++++++++++++++++++++
 compat/mingw.h       |  1 +
 setup.c              | 39 +++++++++++++++++++++++++++++++++++++++
 t/t5580-unc-paths.sh |  2 ++
 4 files changed, 75 insertions(+)

diff --git a/compat/mingw.c b/compat/mingw.c
index 0c8179f3458bb8..37c3e17ab0a0b1 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -3374,6 +3374,30 @@ static int acls_supported(const char *path)
 	return 0;
 }
 
+int is_valid_windows_path_element(wchar_t ch)
+{
+	// cf. https://learn.microsoft.com/en-us/windows/win32/fileio/naming-a-file
+	// Windows disallows ASCII control characters 0x00–0x1F
+	if (ch < 0x1F)
+		return false;
+
+	// Windows reserved path characters
+	switch (ch) {
+	case L'<':
+	case L'>':
+	case L':':
+	case L'"':
+	case L'/':
+	case L'\\':
+	case L'|':
+	case L'?':
+	case L'*':
+		return 0;
+	default:
+		return 1;
+	}
+}
+
 int is_path_owned_by_current_sid(const char *path, struct strbuf *report)
 {
 	WCHAR wpath[MAX_PATH];
@@ -3402,6 +3426,15 @@ int is_path_owned_by_current_sid(const char *path, struct strbuf *report)
 	if (!wcsicmp(wpath, home))
 		return 1;
 
+	/* Do not leak NTLM hashes, UNC paths etc. are generally problematic */
+	if (wpath[0] == L'\\' && !is_valid_windows_path_element(wpath[1])) {
+		if (report)
+			strbuf_addf(report,
+				    "'%s' may refer to a non-local directory",
+				    path);
+		return 0;
+	}
+
 	/* Get the owner SID */
 	err = GetNamedSecurityInfoW(wpath, SE_FILE_OBJECT,
 				    OWNER_SECURITY_INFORMATION |
diff --git a/compat/mingw.h b/compat/mingw.h
index df02aeb632d8c3..aac1148be3e619 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -46,6 +46,7 @@ char *mingw_query_user_email(void);
  */
 int is_path_owned_by_current_sid(const char *path, struct strbuf *report);
 #define is_path_owned_by_current_user is_path_owned_by_current_sid
+int is_valid_windows_path_element(wchar_t ch);
 
 /**
  * Verifies that the given path is a valid one on Windows.
diff --git a/setup.c b/setup.c
index 0d157ac2548f00..8d24cb8d3ba0d6 100644
--- a/setup.c
+++ b/setup.c
@@ -951,6 +951,35 @@ void read_gitfile_error_die(int error_code, const char *path)
 	}
 }
 
+#if (defined _WIN32 || defined __WIN32__)
+static int ensure_valid_ownership(const char *gitfile,
+				  const char *worktree, const char *gitdir,
+				  struct strbuf *report);
+
+static int is_invalid_dotgit_path(const char *gitfile, const char *potential_gitdir)
+{
+	WCHAR wpath[MAX_PATH];
+	struct strbuf dir = STRBUF_INIT;
+	int ret;
+
+	if (xutftowcs_path(wpath, potential_gitdir) < 0)
+		return 1;
+
+	/* Do not leak NTLM hashes, UNC paths etc. are generally problematic */
+	if (wpath[0] != L'\\' || is_valid_windows_path_element(wpath[1]))
+		return 0;
+
+	strbuf_addstr(&dir, gitfile);
+	strbuf_strip_file_from_path(&dir);
+
+	ret = ensure_valid_ownership(gitfile, dir.buf, potential_gitdir, NULL) ? 0 : 1;
+
+	strbuf_release(&dir);
+
+	return ret;
+}
+#endif
+
 /*
  * Try to read the location of the git directory from the .git file,
  * return path to git directory if found. The return value comes from
@@ -979,11 +1008,21 @@ const char *read_gitfile_gently(const char *path, int *return_error_code)
 		strbuf_addstr(&contents, dir);
 		free(dir);
 	}
+#if (defined _WIN32 || defined __WIN32__)
+	if (is_dir_sep(contents.buf[0]) &&
+	    is_invalid_dotgit_path(path, contents.buf)) {
+		strbuf_reset(&realpath);
+		strbuf_add(&realpath, contents.buf, contents.len);
+		path = realpath.buf;
+		goto cleanup_return;
+	}
+#endif
 	if (!is_git_directory(contents.buf)) {
 		error_code = READ_GITFILE_ERR_NOT_A_REPO;
 		goto cleanup_return;
 	}
 
+	strbuf_reset(&realpath);
 	strbuf_realpath(&realpath, contents.buf, 1);
 
 cleanup_return:
diff --git a/t/t5580-unc-paths.sh b/t/t5580-unc-paths.sh
index 65ef1a3628ee94..a2c7f9853ac833 100755
--- a/t/t5580-unc-paths.sh
+++ b/t/t5580-unc-paths.sh
@@ -44,6 +44,8 @@ test_expect_success clone '
 '
 
 test_expect_success 'clone without file://' '
+	test_must_fail git clone "$UNCPATH" clone-without-file &&
+	git config set --global --append safe.directory "$UNCPATH/.git" &&
 	git clone "$UNCPATH" clone-without-file
 '
 

From 9dc71f72331ec848245928e215c0462f85684d11 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 19:46:47 +0200
Subject: [PATCH 148/247] tree-walk: drop link_len cast in
 get_tree_entry_follow_symlinks()

Smallest piece of the tree topic. link_len is only used as
strbuf_splice()'s size_t length and as an array index; widening it
outright removes the cast_size_t_to_ulong() shim and the bridge
local that fed it. odb_read_object() now writes straight into
link_len.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 tree-walk.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tree-walk.c b/tree-walk.c
index a67f06b9ebd790..a7bbe3163ac9f3 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -777,8 +777,7 @@ enum get_oid_result get_tree_entry_follow_symlinks(struct repository *r,
 			goto done;
 		} else if (S_ISLNK(*mode)) {
 			/* Follow a symlink */
-			unsigned long link_len;
-			size_t link_len_st = 0;
+			size_t link_len;
 			size_t len;
 			char *contents, *contents_start;
 			struct dir_state *parent;
@@ -798,8 +797,7 @@ enum get_oid_result get_tree_entry_follow_symlinks(struct repository *r,
 
 			contents = odb_read_object(r->objects,
 						   &current_tree_oid, &type,
-						   &link_len_st);
-			link_len = cast_size_t_to_ulong(link_len_st);
+						   &link_len);
 
 			if (!contents)
 				goto done;

From 08eaa1738514a8704cb7fb62940282daafbc47bd Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 20:11:56 +0200
Subject: [PATCH 149/247] tree-walk: widen init_tree_desc() and
 init_tree_desc_gently() to size_t

Prep for dropping the cast_size_t_to_ulong() shim in
add_preferred_base() (pack-objects.c), and aligns the public API
with the size_t shape the rest of the tree topic is moving toward.

struct tree_desc.size stays unsigned int -- the on-disk tree format
hard-caps each tree at 4 GiB, so the field is intentionally narrow
and the assignment in init_tree_desc_internal() already truncated
unsigned long inputs the same way it now truncates size_t inputs.
The widening is purely about the call-side type-correctness; the
internal cap is unchanged.

All 30+ callers pass values that promote cleanly (unsigned long,
size_t, or smaller integer types).

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 tree-walk.c | 6 +++---
 tree-walk.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tree-walk.c b/tree-walk.c
index a7bbe3163ac9f3..e2cea5d8834afc 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -49,7 +49,7 @@ static int decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned l
 
 static int init_tree_desc_internal(struct tree_desc *desc,
 				   const struct object_id *oid,
-				   const void *buffer, unsigned long size,
+				   const void *buffer, size_t size,
 				   struct strbuf *err,
 				   enum tree_desc_flags flags)
 {
@@ -63,7 +63,7 @@ static int init_tree_desc_internal(struct tree_desc *desc,
 }
 
 void init_tree_desc(struct tree_desc *desc, const struct object_id *tree_oid,
-		    const void *buffer, unsigned long size)
+		    const void *buffer, size_t size)
 {
 	struct strbuf err = STRBUF_INIT;
 	if (init_tree_desc_internal(desc, tree_oid, buffer, size, &err, 0))
@@ -72,7 +72,7 @@ void init_tree_desc(struct tree_desc *desc, const struct object_id *tree_oid,
 }
 
 int init_tree_desc_gently(struct tree_desc *desc, const struct object_id *oid,
-			  const void *buffer, unsigned long size,
+			  const void *buffer, size_t size,
 			  enum tree_desc_flags flags)
 {
 	struct strbuf err = STRBUF_INIT;
diff --git a/tree-walk.h b/tree-walk.h
index 9646c47ac5bce5..af6e82fd3f01ba 100644
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -85,10 +85,10 @@ int update_tree_entry_gently(struct tree_desc *);
  * members of `struct tree`.
  */
 void init_tree_desc(struct tree_desc *desc, const struct object_id *tree_oid,
-		    const void *buf, unsigned long size);
+		    const void *buf, size_t size);
 
 int init_tree_desc_gently(struct tree_desc *desc, const struct object_id *oid,
-			  const void *buf, unsigned long size,
+			  const void *buf, size_t size,
 			  enum tree_desc_flags flags);
 
 /*

From 67b5dd7d251fef00a70f7a1dd43992b01c2702cf Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 19:26:00 +0200
Subject: [PATCH 150/247] diff: widen textconv_object() size out-param to
 size_t

Continue the size_t evacuation. textconv_object() fills its
out-parameter from fill_textconv()'s size_t return through an
unsigned long*; widen the API to match, then take advantage of the
new shape where callers can.

cat-file's 'c' and batch-mode 'c' branches lose their size_ul
bridge variables (one site becomes a direct call, the other
collapses an if/else into a single negated condition that reads as
"try textconv, fall back to a raw read").

blame.c likewise drops the file_size_st bridge in fill_origin_blob()
and hoists final_buf_size_st to bracket both branches in
setup_scoreboard(). The latter keeps a cast_size_t_to_ulong() shim
because struct blame_scoreboard.final_buf_size is still unsigned
long; that field is its own topic.

log.c just widens its local from unsigned long to size_t.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 blame.c            | 21 ++++++++-------------
 builtin/cat-file.c | 13 ++++---------
 builtin/log.c      |  2 +-
 diff.c             |  2 +-
 diff.h             |  2 +-
 5 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/blame.c b/blame.c
index 126e2324162353..6cdeabd63365be 100644
--- a/blame.c
+++ b/blame.c
@@ -238,7 +238,7 @@ static struct commit *fake_working_tree_commit(struct repository *r,
 		struct stat st;
 		const char *read_from;
 		char *buf_ptr;
-		unsigned long buf_len;
+		size_t buf_len;
 
 		if (contents_from) {
 			if (stat(contents_from, &st) < 0)
@@ -1034,20 +1034,17 @@ static void fill_origin_blob(struct diff_options *opt,
 {
 	if (!o->file.ptr) {
 		enum object_type type;
-		unsigned long file_size;
+		size_t file_size;
 
 		(*num_read_blob)++;
 		if (opt->flags.allow_textconv &&
 		    textconv_object(opt->repo, o->path, o->mode,
 				    &o->blob_oid, 1, &file->ptr, &file_size))
 			;
-		else {
-			size_t file_size_st = 0;
+		else
 			file->ptr = odb_read_object(the_repository->objects,
 						    &o->blob_oid, &type,
-						    &file_size_st);
-			file_size = cast_size_t_to_ulong(file_size_st);
-		}
+						    &file_size);
 		file->size = file_size;
 
 		if (!file->ptr)
@@ -2864,22 +2861,20 @@ void setup_scoreboard(struct blame_scoreboard *sb,
 		sb->final_buf_size = o->file.size;
 	}
 	else {
+		size_t final_buf_size_st = 0;
 		o = get_origin(sb->final, sb->path);
 		if (fill_blob_sha1_and_mode(sb->repo, o))
 			die(_("no such path %s in %s"), sb->path, final_commit_name);
 
 		if (sb->revs->diffopt.flags.allow_textconv &&
 		    textconv_object(sb->repo, sb->path, o->mode, &o->blob_oid, 1, (char **) &sb->final_buf,
-				    &sb->final_buf_size))
+				    &final_buf_size_st))
 			;
-		else {
-			size_t final_buf_size_st = 0;
+		else
 			sb->final_buf = odb_read_object(the_repository->objects,
 							&o->blob_oid, &type,
 							&final_buf_size_st);
-			sb->final_buf_size =
-				cast_size_t_to_ulong(final_buf_size_st);
-		}
+		sb->final_buf_size = cast_size_t_to_ulong(final_buf_size_st);
 
 		if (!sb->final_buf)
 			die(_("cannot read blob %s for path %s"),
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 8870a210ec2e94..e8fdf1a51f5caf 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -202,11 +202,9 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
 
 	case 'c':
 	{
-		unsigned long size_ul = 0;
 		int textconv_ret = textconv_object(the_repository, path,
 						   obj_context.mode, &oid, 1,
-						   &buf, &size_ul);
-		size = size_ul;
+						   &buf, &size);
 		if (textconv_ret)
 			break;
 	}
@@ -457,12 +455,9 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
 					    oid_to_hex(oid), data->rest);
 			} else if (opt->transform_mode == 'c') {
 				enum object_type type;
-				unsigned long size_ul = 0;
-				if (textconv_object(the_repository,
-						    data->rest, 0100644, oid,
-						    1, &contents, &size_ul))
-					size = size_ul;
-				else
+				if (!textconv_object(the_repository,
+						     data->rest, 0100644, oid,
+						     1, &contents, &size))
 					contents = odb_read_object(the_repository->objects,
 								   oid, &type, &size);
 				if (!contents)
diff --git a/builtin/log.c b/builtin/log.c
index 350b35c556362d..667b80f6ccdb79 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -584,7 +584,7 @@ static int show_blob_object(const struct object_id *oid, struct rev_info *rev, c
 	struct object_id oidc;
 	struct object_context obj_context = {0};
 	char *buf;
-	unsigned long size;
+	size_t size;
 
 	fflush(rev->diffopt.file);
 	if (!rev->diffopt.flags.textconv_set_via_cmdline ||
diff --git a/diff.c b/diff.c
index 5380a255dfb29a..6e6ec58e00172a 100644
--- a/diff.c
+++ b/diff.c
@@ -7823,7 +7823,7 @@ int textconv_object(struct repository *r,
 		    const struct object_id *oid,
 		    int oid_valid,
 		    char **buf,
-		    unsigned long *buf_size)
+		    size_t *buf_size)
 {
 	struct diff_filespec *df;
 	struct userdiff_driver *textconv;
diff --git a/diff.h b/diff.h
index bb5cddaf3499e9..ab52ca80c33857 100644
--- a/diff.h
+++ b/diff.h
@@ -757,7 +757,7 @@ int textconv_object(struct repository *repo,
 		    const char *path,
 		    unsigned mode,
 		    const struct object_id *oid, int oid_valid,
-		    char **buf, unsigned long *buf_size);
+		    char **buf, size_t *buf_size);
 
 int parse_rename_score(const char **cp_p);
 

From 175bcce484f19b0dda0421854ca98ec328aadb91 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 20:23:53 +0200
Subject: [PATCH 151/247] pack-objects: drop the two tree-walk casts in the
 preferred-base path

With init_tree_desc() widened in the prior commit, the
size_t-returning odb_read_object_peeled() call in
add_preferred_base() and odb_read_object() call in pbase_tree_get()
can both flow straight through to init_tree_desc() and into the
pbase_tree_cache. Widen pbase_tree_cache.tree_size and the two
local size variables to size_t, drop the size_st bridges, and drop
the two cast_size_t_to_ulong() shims.

This was the last pair of cast_size_t_to_ulong() call sites in
builtin/pack-objects.c, completing the >4 GiB-objects work in that
file that this branch and its predecessors have been pursuing.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/pack-objects.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index af9390a46b9a69..460468cf811511 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -1921,7 +1921,7 @@ struct pbase_tree_cache {
 	int ref;
 	int temporary;
 	void *tree_data;
-	unsigned long tree_size;
+	size_t tree_size;
 };
 
 static struct pbase_tree_cache *(pbase_tree_cache[256]);
@@ -1948,8 +1948,7 @@ static struct pbase_tree_cache *pbase_tree_get(const struct object_id *oid)
 {
 	struct pbase_tree_cache *ent, *nent;
 	void *data;
-	unsigned long size;
-	size_t size_st = 0;
+	size_t size;
 	enum object_type type;
 	int neigh;
 	int my_ix = pbase_tree_cache_ix(oid);
@@ -1977,8 +1976,7 @@ static struct pbase_tree_cache *pbase_tree_get(const struct object_id *oid)
 	/* Did not find one.  Either we got a bogus request or
 	 * we need to read and perhaps cache.
 	 */
-	data = odb_read_object(the_repository->objects, oid, &type, &size_st);
-	size = cast_size_t_to_ulong(size_st);
+	data = odb_read_object(the_repository->objects, oid, &type, &size);
 	if (!data)
 		return NULL;
 	if (type != OBJ_TREE) {
@@ -2132,16 +2130,14 @@ static void add_preferred_base(struct object_id *oid)
 {
 	struct pbase_tree *it;
 	void *data;
-	unsigned long size;
-	size_t size_st = 0;
+	size_t size;
 	struct object_id tree_oid;
 
 	if (window <= num_preferred_base++)
 		return;
 
 	data = odb_read_object_peeled(the_repository->objects, oid,
-				      OBJ_TREE, &size_st, &tree_oid);
-	size = cast_size_t_to_ulong(size_st);
+				      OBJ_TREE, &size, &tree_oid);
 	if (!data)
 		return;
 

From 9473dfeea0bd350002037d6e55e59a74d7859fe2 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 19:38:13 +0200
Subject: [PATCH 152/247] diffcore: widen struct diff_filespec.size to size_t

Continue the size_t evacuation. The struct field already receives
its writes from a size_t-shaped source (xsize_t(st.st_size),
strbuf.len, fill_textconv()'s return, odb_read_object_info_extended()
via oi.sizep), so on Windows it was already truncating anything
past 4 GiB silently on the strbuf and textconv paths and loudly
through cast_size_t_to_ulong() on the odb path. Switch the field
to size_t.

In diff_populate_filespec(), point oi.sizep at the field directly
and drop both cast_size_t_to_ulong() shims and the size_st bridge
they fed.

Downstream consumers that still read .size into unsigned long
locals will now silently narrow on Windows where the field exceeds
4 GiB. Each of those is its own follow-up; the writer side is the
prerequisite for ever putting a >4 GiB value in the field in the
first place.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 diff.c     | 5 +----
 diffcore.h | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/diff.c b/diff.c
index 6e6ec58e00172a..ab56851b36d658 100644
--- a/diff.c
+++ b/diff.c
@@ -4572,9 +4572,8 @@ int diff_populate_filespec(struct repository *r,
 		}
 	}
 	else {
-		size_t size_st = 0;
 		struct object_info info = {
-			.sizep = &size_st
+			.sizep = &s->size
 		};
 
 		if (!(size_only || check_binary))
@@ -4596,7 +4595,6 @@ int diff_populate_filespec(struct repository *r,
 			die("unable to read %s", oid_to_hex(&s->oid));
 
 object_read:
-		s->size = cast_size_t_to_ulong(size_st);
 		if (size_only || check_binary) {
 			if (size_only)
 				return 0;
@@ -4611,7 +4609,6 @@ int diff_populate_filespec(struct repository *r,
 			if (odb_read_object_info_extended(r->objects, &s->oid, &info,
 							  OBJECT_INFO_LOOKUP_REPLACE))
 				die("unable to read %s", oid_to_hex(&s->oid));
-			s->size = cast_size_t_to_ulong(size_st);
 		}
 		s->should_free = 1;
 	}
diff --git a/diffcore.h b/diffcore.h
index d75038d1b3a1b2..85fc94e2a5d603 100644
--- a/diffcore.h
+++ b/diffcore.h
@@ -54,7 +54,7 @@ struct diff_filespec {
 	char *path;
 	void *data;
 	void *cnt_data;
-	unsigned long size;
+	size_t size;
 	int count;               /* Reference count */
 	int rename_used;         /* Count of rename users */
 	unsigned short mode;	 /* file mode */

From f0267743d8063b0bc7ce49e2d70985f112e8daf6 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 21:27:35 +0200
Subject: [PATCH 153/247] tree: widen struct tree.size and parse_tree_buffer()
 to size_t

Final piece of the tree topic. struct tree.size already receives
its values from size_t-shaped sources (odb_read_object() in
repo_parse_tree_gently() and in reflog.c::tree_is_complete()),
so on Windows it was already silently truncating anything past
4 GiB. Switch the field and parse_tree_buffer()'s size parameter
to size_t.

All readers feed tree->size into init_tree_desc(), which was
widened earlier in this topic; the existing parse_object_buffer()
caller in object.c keeps its unsigned long parameter, which
promotes cleanly.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 tree.c | 2 +-
 tree.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tree.c b/tree.c
index 53f7395e9fea09..d37b9bc7b197dd 100644
--- a/tree.c
+++ b/tree.c
@@ -172,7 +172,7 @@ struct tree *lookup_tree(struct repository *r, const struct object_id *oid)
 	return object_as_type(obj, OBJ_TREE, 0);
 }
 
-int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
+int parse_tree_buffer(struct tree *item, void *buffer, size_t size)
 {
 	if (item->object.parsed)
 		return 0;
diff --git a/tree.h b/tree.h
index 677382eed86c59..50f0b15af45326 100644
--- a/tree.h
+++ b/tree.h
@@ -10,14 +10,14 @@ struct strbuf;
 struct tree {
 	struct object object;
 	void *buffer;
-	unsigned long size;
+	size_t size;
 };
 
 extern const char *tree_type;
 
 struct tree *lookup_tree(struct repository *r, const struct object_id *oid);
 
-int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);
+int parse_tree_buffer(struct tree *item, void *buffer, size_t size);
 
 #define parse_tree_gently(t, q) repo_parse_tree_gently(the_repository, t, q)
 int repo_parse_tree_gently(struct repository *r, struct tree *item,

From c902319b1782c6213fb70e3e3289357db94c78a7 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 22:12:59 +0200
Subject: [PATCH 154/247] commit: widen the commit-buffer API to size_t

Continue the migration from `unsigned long` to `size_t`. The `size`
attribute of `struct commit_buffer` is fed either from
`odb_read_object()`'s return value (`size_t`, handled with
`cast_size_t_to_ulong()`) or from `strbuf.len` in
`fake_working_tree_commit()` (silently narrowed today). Widen the field
and a couple of function signatures together, drop the shim in
`repo_get_commit_buffer()`, and move the matching `unsigned long` locals
at the in-tree callers in commit.c (three sites), builtin/replace.c, and
builtin/stash.c (two sites). The remaining callers pass NULL or already
pass a size_t-compatible variable.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/replace.c |  2 +-
 builtin/stash.c   |  4 ++--
 commit.c          | 19 +++++++++++--------
 commit.h          |  8 +++++---
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/builtin/replace.c b/builtin/replace.c
index aed6b2c8debf86..b85681080dc1d9 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -459,7 +459,7 @@ static int create_graft(int argc, const char **argv, int force, int gentle)
 	struct commit *commit;
 	struct strbuf buf = STRBUF_INIT;
 	const char *buffer;
-	unsigned long size;
+	size_t size;
 
 	if (repo_get_oid(the_repository, old_ref, &old_oid) < 0)
 		return error(_("not a valid object name: '%s'"), old_ref);
diff --git a/builtin/stash.c b/builtin/stash.c
index 7a9843413b11e2..6e246a64bd323a 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -2086,7 +2086,7 @@ static int write_commit_with_parents(struct repository *r,
 	const char *orig_author, *orig_committer;
 	char *author = NULL, *committer = NULL;
 	const char *buffer;
-	unsigned long bufsize;
+	size_t bufsize;
 	const char *p;
 	struct strbuf msg = STRBUF_INIT;
 	int ret = 0;
@@ -2138,7 +2138,7 @@ static int do_import_stash(struct repository *r, const char *rev)
 	struct object_id chain;
 	int res = 0;
 	const char *buffer = NULL;
-	unsigned long bufsize;
+	size_t bufsize;
 	struct commit *this = NULL;
 	struct commit_list *items = NULL, *cur;
 	char *msg = NULL;
diff --git a/commit.c b/commit.c
index ad26f0b40a9c64..9ba5af99eae693 100644
--- a/commit.c
+++ b/commit.c
@@ -349,7 +349,7 @@ int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)
 
 struct commit_buffer {
 	void *buffer;
-	unsigned long size;
+	size_t size;
 };
 define_commit_slab(buffer_slab, struct commit_buffer);
 
@@ -366,7 +366,8 @@ void free_commit_buffer_slab(struct buffer_slab *bs)
 	free(bs);
 }
 
-void set_commit_buffer(struct repository *r, struct commit *commit, void *buffer, unsigned long size)
+void set_commit_buffer(struct repository *r, struct commit *commit,
+		       void *buffer, size_t size)
 {
 	struct commit_buffer *v = buffer_slab_at(
 		r->parsed_objects->buffer_slab, commit);
@@ -374,7 +375,9 @@ void set_commit_buffer(struct repository *r, struct commit *commit, void *buffer
 	v->size = size;
 }
 
-const void *get_cached_commit_buffer(struct repository *r, const struct commit *commit, unsigned long *sizep)
+const void *get_cached_commit_buffer(struct repository *r,
+				     const struct commit *commit,
+				     size_t *sizep)
 {
 	struct commit_buffer *v = buffer_slab_peek(
 		r->parsed_objects->buffer_slab, commit);
@@ -390,7 +393,7 @@ const void *get_cached_commit_buffer(struct repository *r, const struct commit *
 
 const void *repo_get_commit_buffer(struct repository *r,
 				   const struct commit *commit,
-				   unsigned long *sizep)
+				   size_t *sizep)
 {
 	const void *ret = get_cached_commit_buffer(r, commit, sizep);
 	if (!ret) {
@@ -404,7 +407,7 @@ const void *repo_get_commit_buffer(struct repository *r,
 			die("expected commit for %s, got %s",
 			    oid_to_hex(&commit->object.oid), type_name(type));
 		if (sizep)
-			*sizep = cast_size_t_to_ulong(size);
+			*sizep = size;
 	}
 	return ret;
 }
@@ -1185,7 +1188,7 @@ int parse_signed_commit(const struct commit *commit,
 			struct strbuf *payload, struct strbuf *signature,
 			const struct git_hash_algo *algop)
 {
-	unsigned long size;
+	size_t size;
 	const char *buffer = repo_get_commit_buffer(the_repository, commit,
 						    &size);
 	int ret = parse_buffer_signed_by_header(buffer, size, payload, signature, algop);
@@ -1358,7 +1361,7 @@ int verify_commit_buffer(const char *buffer, size_t size,
 
 int check_commit_signature(const struct commit *commit, struct signature_check *sigc)
 {
-	unsigned long size;
+	size_t size;
 	const char *buffer = repo_get_commit_buffer(the_repository, commit, &size);
 	int ret = verify_commit_buffer(buffer, size, sigc);
 
@@ -1455,7 +1458,7 @@ struct commit_extra_header *read_commit_extra_headers(struct commit *commit,
 						      const char **exclude)
 {
 	struct commit_extra_header *extra = NULL;
-	unsigned long size;
+	size_t size;
 	const char *buffer = repo_get_commit_buffer(the_repository, commit,
 						    &size);
 	extra = read_commit_extra_header_lines(buffer, size, exclude);
diff --git a/commit.h b/commit.h
index 1061ed791bcad6..97779ec943809f 100644
--- a/commit.h
+++ b/commit.h
@@ -131,13 +131,15 @@ void free_commit_buffer_slab(struct buffer_slab *bs);
  * Associate an object buffer with the commit. The ownership of the
  * memory is handed over to the commit, and must be free()-able.
  */
-void set_commit_buffer(struct repository *r, struct commit *, void *buffer, unsigned long size);
+void set_commit_buffer(struct repository *r, struct commit *,
+		       void *buffer, size_t size);
 
 /*
  * Get any cached object buffer associated with the commit. Returns NULL
  * if none. The resulting memory should not be freed.
  */
-const void *get_cached_commit_buffer(struct repository *, const struct commit *, unsigned long *size);
+const void *get_cached_commit_buffer(struct repository *,
+				     const struct commit *, size_t *size);
 
 /*
  * Get the commit's object contents, either from cache or by reading the object
@@ -146,7 +148,7 @@ const void *get_cached_commit_buffer(struct repository *, const struct commit *,
  */
 const void *repo_get_commit_buffer(struct repository *r,
 				   const struct commit *,
-				   unsigned long *size);
+				   size_t *size);
 
 /*
  * Tell the commit subsystem that we are done with a particular commit buffer.

From e1d2644aee673b76e4e87f935e82a355498e4b4d Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 09:50:48 +0200
Subject: [PATCH 155/247] pack-objects: drop cast_size_t_to_ulong shims in
 get_delta()

The two shims that 606c192380 (odb, packfile: use size_t for
streaming object sizes, 2026-05-08) and the subsequent
odb_read_object() widening introduced as scaffolding around
get_delta()'s reads can now disappear: the previous commit widened
diff_delta() to size_t, which was the last narrow consumer in this
function.

Widen size and base_size to size_t outright, drop the size_st /
base_size_st bridging temporaries, and drop the two
cast_size_t_to_ulong() calls. Net change is 4 lines smaller and one
read-then-cast indirection gone from each odb read.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/pack-objects.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 460468cf811511..91185e80964501 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -354,21 +354,17 @@ static void index_commit_for_bitmap(struct commit *commit)
 
 static void *get_delta(struct object_entry *entry)
 {
-	unsigned long size, base_size;
-	size_t delta_size;
+	size_t size, base_size, delta_size;
 	void *buf, *base_buf, *delta_buf;
 	enum object_type type;
-	size_t size_st = 0, base_size_st = 0;
 
 	buf = odb_read_object(the_repository->objects, &entry->idx.oid,
-			      &type, &size_st);
-	size = cast_size_t_to_ulong(size_st);
+			      &type, &size);
 	if (!buf)
 		die(_("unable to read %s"), oid_to_hex(&entry->idx.oid));
 	base_buf = odb_read_object(the_repository->objects,
 				   &DELTA(entry)->idx.oid, &type,
-				   &base_size_st);
-	base_size = cast_size_t_to_ulong(base_size_st);
+				   &base_size);
 	if (!base_buf)
 		die("unable to read %s",
 		    oid_to_hex(&DELTA(entry)->idx.oid));

From 85084ea4ac979b3fac2839346a7c60f0ec9aaade Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 22:19:32 +0200
Subject: [PATCH 156/247] blame: widen find_line_starts() len parameter to
 size_t

Prep for the upcoming blame_scoreboard.final_buf_size widening:
prepare_lines() will pass a size_t through to find_line_starts(),
and the other caller (fill_origin_blob() via o->file.size) already
goes through long->size_t promotion. The function is file-static
and only uses len as a loop bound.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 blame.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blame.c b/blame.c
index 126e2324162353..fe393e45ed94bf 100644
--- a/blame.c
+++ b/blame.c
@@ -335,7 +335,7 @@ static const char *get_next_line(const char *start, const char *end)
 }
 
 static int find_line_starts(int **line_starts, const char *buf,
-			    unsigned long len)
+			    size_t len)
 {
 	const char *end = buf + len;
 	const char *p;

From ee2e8d761f6dfa9f2d8ebd6dda4658cb95b9ceed Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 10:49:54 +0200
Subject: [PATCH 157/247] pack-objects: drop cast_size_t_to_ulong shims in
 try_delta()

Companion to the prior get_delta() cleanup, and the last try_delta()
piece of the >4 GiB delta-path topic. Every consumer that the
function's locals fed has now been widened: SIZE() / DELTA_SIZE() to
size_t (prior topic), the mem_usage out-parameter and delta_cacheable()
earlier in this series, and create_delta() / create_delta_index() in
the immediately preceding commits.

Widen the declaration of trg_size, src_size, sizediff, max_size and
sz to size_t (delta_size joins them on the same line, removing the
size_t delta_size line that the create_delta() widening commit added
as a stop-gap), and drop the two sz_st bridge variables together with
the surrounding cast_size_t_to_ulong() calls. The result is just
"odb_read_object(&sz)" on both reads.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/pack-objects.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 91185e80964501..cb1587490ae44f 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2802,8 +2802,7 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
 {
 	struct object_entry *trg_entry = trg->entry;
 	struct object_entry *src_entry = src->entry;
-	unsigned long trg_size, src_size, sizediff, max_size, sz;
-	size_t delta_size;
+	size_t trg_size, src_size, delta_size, sizediff, max_size, sz;
 	unsigned ref_depth;
 	enum object_type type;
 	void *delta_buf;
@@ -2856,12 +2855,10 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
 
 	/* Load data if not already done */
 	if (!trg->data) {
-		size_t sz_st = 0;
 		packing_data_lock(&to_pack);
 		trg->data = odb_read_object(the_repository->objects,
 					    &trg_entry->idx.oid, &type,
-					    &sz_st);
-		sz = cast_size_t_to_ulong(sz_st);
+					    &sz);
 		packing_data_unlock(&to_pack);
 		if (!trg->data)
 			die(_("object %s cannot be read"),
@@ -2873,12 +2870,10 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
 		*mem_usage += sz;
 	}
 	if (!src->data) {
-		size_t sz_st = 0;
 		packing_data_lock(&to_pack);
 		src->data = odb_read_object(the_repository->objects,
 					    &src_entry->idx.oid, &type,
-					    &sz_st);
-		sz = cast_size_t_to_ulong(sz_st);
+					    &sz);
 		packing_data_unlock(&to_pack);
 		if (!src->data) {
 			if (src_entry->preferred_base) {

From edfa7e11b5504680da6e90e86cfca1cb3d279300 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 22:30:31 +0200
Subject: [PATCH 158/247] grep: widen struct grep_source.size and grep_buffer()
 to size_t

This commit continue the migration from `unsigned long` to `size_t`,
converting `grep_buffer()` and helpers. The callers are already prepared
for this change.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 grep.c | 18 ++++++++----------
 grep.h |  4 ++--
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/grep.c b/grep.c
index 1d75d314211aa8..d75fbcef449f7e 100644
--- a/grep.c
+++ b/grep.c
@@ -864,9 +864,9 @@ void free_grep_patterns(struct grep_opt *opt)
 		free_pattern_expr(opt->pattern_expression);
 }
 
-static const char *end_of_line(const char *cp, unsigned long *left)
+static const char *end_of_line(const char *cp, size_t *left)
 {
-	unsigned long l = *left;
+	size_t l = *left;
 	while (l && *cp != '\n') {
 		l--;
 		cp++;
@@ -1454,7 +1454,7 @@ static int should_lookahead(struct grep_opt *opt)
 }
 
 static int look_ahead(struct grep_opt *opt,
-		      unsigned long *left_p,
+		      size_t *left_p,
 		      unsigned *lno_p,
 		      const char **bol_p)
 {
@@ -1567,7 +1567,7 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
 {
 	const char *bol;
 	const char *peek_bol = NULL;
-	unsigned long left;
+	size_t left;
 	unsigned lno = 1;
 	unsigned last_hit = 0;
 	int binary_match_only = 0;
@@ -1735,7 +1735,7 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
 			goto next_line;
 		}
 		if (show_function && (!peek_bol || peek_bol < bol)) {
-			unsigned long peek_left = left;
+			size_t peek_left = left;
 			const char *peek_eol = eol;
 
 			/*
@@ -1854,7 +1854,7 @@ int grep_source(struct grep_opt *opt, struct grep_source *gs)
 
 static void grep_source_init_buf(struct grep_source *gs,
 				 const char *buf,
-				 unsigned long size)
+				 size_t size)
 {
 	gs->type = GREP_SOURCE_BUF;
 	gs->name = NULL;
@@ -1865,7 +1865,7 @@ static void grep_source_init_buf(struct grep_source *gs,
 	gs->identifier = NULL;
 }
 
-int grep_buffer(struct grep_opt *opt, const char *buf, unsigned long size)
+int grep_buffer(struct grep_opt *opt, const char *buf, size_t size)
 {
 	struct grep_source gs;
 	int r;
@@ -1931,11 +1931,9 @@ void grep_source_clear_data(struct grep_source *gs)
 static int grep_source_load_oid(struct grep_source *gs)
 {
 	enum object_type type;
-	size_t size_st = 0;
 
 	gs->buf = odb_read_object(gs->repo->objects, gs->identifier,
-				  &type, &size_st);
-	gs->size = cast_size_t_to_ulong(size_st);
+				  &type, &gs->size);
 	if (!gs->buf)
 		return error(_("'%s': unable to read %s"),
 			     gs->name,
diff --git a/grep.h b/grep.h
index 13e26a93189c3b..0bd705dfc0b82b 100644
--- a/grep.h
+++ b/grep.h
@@ -212,7 +212,7 @@ void append_grep_pattern(struct grep_opt *opt, const char *pat, const char *orig
 void append_header_grep_pattern(struct grep_opt *, enum grep_header_field, const char *);
 void compile_grep_patterns(struct grep_opt *opt);
 void free_grep_patterns(struct grep_opt *opt);
-int grep_buffer(struct grep_opt *opt, const char *buf, unsigned long size);
+int grep_buffer(struct grep_opt *opt, const char *buf, size_t size);
 
 /* The field parameter is only used to filter header patterns
  * (where appropriate). If filtering isn't desirable
@@ -235,7 +235,7 @@ struct grep_source {
 	struct repository *repo; /* if GREP_SOURCE_OID */
 
 	const char *buf;
-	unsigned long size;
+	size_t size;
 
 	char *path; /* for attribute lookups */
 	struct userdiff_driver *driver;

From 7b2fb9e36f8d28f34cb8492dde03540ef2b327bb Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 14:39:26 +0200
Subject: [PATCH 159/247] pack-objects: drop the last size shim in
 write_no_reuse_object()

Continue the size_t evacuation that this series and the merged
js/objects-larger-than-4gb-on-windows topic are advancing for
>4 GiB objects on Windows: with the odb readers and the zlib
helpers reached from do_compress() now widened end-to-end, the
last cast_size_t_to_ulong() shim in this function can be removed,
and do_compress() itself can carry the new size type through.

Two cast_size_t_to_ulong() shims remain in this file; they feed
the tree-walk API, which is still narrow and is a separate
widening topic.

write_no_reuse_object()'s return type and the hashfile API are
still narrow but unchanged in observable behaviour: on 64-bit
Linux ulong coincides with size_t, and on Windows these were the
narrow fenceposts the prior topics deliberately left in place.
Their widening is left to follow-ups touching the hashfile API
and the write_object() caller chain.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/pack-objects.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index cb1587490ae44f..438bdb359bdddf 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -382,11 +382,11 @@ static void *get_delta(struct object_entry *entry)
 	return delta_buf;
 }
 
-static unsigned long do_compress(void **pptr, unsigned long size)
+static size_t do_compress(void **pptr, size_t size)
 {
 	git_zstream stream;
 	void *in, *out;
-	unsigned long maxsize;
+	size_t maxsize;
 	struct repo_config_values *cfg = repo_config_values(the_repository);
 
 	git_deflate_init(&stream, cfg->pack_compression_level);
@@ -512,7 +512,7 @@ static inline int oe_size_greater_than(struct packing_data *pack,
 static unsigned long write_no_reuse_object(struct hashfile *f, struct object_entry *entry,
 					   unsigned long limit, int usable_delta)
 {
-	unsigned long size, datalen;
+	size_t size, datalen;
 	unsigned char header[MAX_PACK_OBJECT_HEADER],
 		      dheader[MAX_PACK_OBJECT_HEADER];
 	unsigned hdrlen;
@@ -531,11 +531,9 @@ static unsigned long write_no_reuse_object(struct hashfile *f, struct object_ent
 			type = st->type;
 			size = st->size;
 		} else {
-			size_t size_st = 0;
 			buf = odb_read_object(the_repository->objects,
 					      &entry->idx.oid, &type,
-					      &size_st);
-			size = cast_size_t_to_ulong(size_st);
+					      &size);
 			if (!buf)
 				die(_("unable to read %s"),
 				    oid_to_hex(&entry->idx.oid));

From 756e4f56d62f0d55680a2291d5ece7e7502ece09 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 22:41:07 +0200
Subject: [PATCH 160/247] fast-export: drop the export_blob() size cast and
 widen anonymize_blob()

Mirror of the preceding fast-import sweep. anonymize_blob() writes
strbuf.len (size_t) into its out-parameter, and export_blob()'s
non-anonymize branch reads odb_read_object()'s size_t out-parameter
through a size_st + cast_size_t_to_ulong() bridge into an unsigned
long local; both have been silent on Windows past 4 GiB. Widen the
helper signature and the local, and drop the bridge.

check_object_signature() and parse_object_buffer() still take
unsigned long, so the silent narrowing on Windows just moves from
the local assignment to those call sites; both are separate topics.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/fast-export.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 50278bef7a6a4d..cd7705c2fb8588 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -285,7 +285,7 @@ static void show_progress(void)
  * There's no need to cache this result with anonymize_mem, since
  * we already handle blob content caching with marks.
  */
-static char *anonymize_blob(unsigned long *size)
+static char *anonymize_blob(size_t *size)
 {
 	static int counter;
 	struct strbuf out = STRBUF_INIT;
@@ -296,7 +296,7 @@ static char *anonymize_blob(unsigned long *size)
 
 static void export_blob(const struct object_id *oid)
 {
-	unsigned long size;
+	size_t size;
 	enum object_type type;
 	char *buf;
 	struct object *object;
@@ -317,10 +317,8 @@ static void export_blob(const struct object_id *oid)
 		object = (struct object *)lookup_blob(the_repository, oid);
 		eaten = 0;
 	} else {
-		size_t size_st = 0;
 		buf = odb_read_object(the_repository->objects, oid, &type,
-				      &size_st);
-		size = cast_size_t_to_ulong(size_st);
+				      &size);
 		if (!buf)
 			die(_("could not read blob %s"), oid_to_hex(oid));
 		if (check_object_signature(the_repository, oid, buf, size,

From 45f465b21f24245e4ba90c6727aad4051db3d9ac Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 22:23:09 +0200
Subject: [PATCH 161/247] blame: widen struct blame_scoreboard.final_buf_size
 to size_t

Continue the size_t evacuation. final_buf_size is fed either from
textconv_object()'s now-size_t out-parameter, from
odb_read_object()'s size_t out-parameter (both bridged today
through a final_buf_size_st local + cast_size_t_to_ulong()), or
from o->file.size (mmfile_t, long). Widen the struct field, point
both producers straight at it, and drop the bridge variable along
with the cast.

builtin/blame.c only reads the field for pointer arithmetic and
comparisons, which promote cleanly.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 blame.c | 6 ++----
 blame.h | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/blame.c b/blame.c
index 888dec1a384be2..34380a6fb8436f 100644
--- a/blame.c
+++ b/blame.c
@@ -2861,20 +2861,18 @@ void setup_scoreboard(struct blame_scoreboard *sb,
 		sb->final_buf_size = o->file.size;
 	}
 	else {
-		size_t final_buf_size_st = 0;
 		o = get_origin(sb->final, sb->path);
 		if (fill_blob_sha1_and_mode(sb->repo, o))
 			die(_("no such path %s in %s"), sb->path, final_commit_name);
 
 		if (sb->revs->diffopt.flags.allow_textconv &&
 		    textconv_object(sb->repo, sb->path, o->mode, &o->blob_oid, 1, (char **) &sb->final_buf,
-				    &final_buf_size_st))
+				    &sb->final_buf_size))
 			;
 		else
 			sb->final_buf = odb_read_object(the_repository->objects,
 							&o->blob_oid, &type,
-							&final_buf_size_st);
-		sb->final_buf_size = cast_size_t_to_ulong(final_buf_size_st);
+							&sb->final_buf_size);
 
 		if (!sb->final_buf)
 			die(_("cannot read blob %s for path %s"),
diff --git a/blame.h b/blame.h
index 3b34be0e5c6932..1b66084a8d687a 100644
--- a/blame.h
+++ b/blame.h
@@ -117,7 +117,7 @@ struct blame_scoreboard {
 	 * indexed with scoreboard.lineno[blame_entry.lno].
 	 */
 	char *final_buf;
-	unsigned long final_buf_size;
+	size_t final_buf_size;
 
 	/* linked list of blames */
 	struct blame_entry *ent;

From 512e60e1c2240764c1d3f9235fdec7134e27ebaf Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 22:46:50 +0200
Subject: [PATCH 162/247] repo: drop the inflated-size cast in count_objects()

Continue the size_t evacuation. count_objects() feeds the inflated
size from odb_read_object_info_extended()'s size_t out-parameter
into struct object_values (size_t) and check_largest() (size_t)
through an unsigned long bridge with a cast_size_t_to_ulong()
shim. The bridge was the only narrow link in the chain. Widen the
local, point oi.sizep at it directly, and drop the cast.

parse_object_buffer() still takes unsigned long, so a Windows
narrowing remains at that one call; that is its own follow-up
topic.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/repo.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/builtin/repo.c b/builtin/repo.c
index 84e012f83f65ae..1a2a00763626ce 100644
--- a/builtin/repo.c
+++ b/builtin/repo.c
@@ -833,15 +833,14 @@ static int count_objects(const char *path UNUSED, struct oid_array *oids,
 
 	for (size_t i = 0; i < oids->nr; i++) {
 		struct object_info oi = OBJECT_INFO_INIT;
-		unsigned long inflated;
-		size_t inflated_st = 0;
+		size_t inflated;
 		struct commit *commit;
 		struct object *obj;
 		void *content;
 		off_t disk;
 		int eaten;
 
-		oi.sizep = &inflated_st;
+		oi.sizep = &inflated;
 		oi.disk_sizep = &disk;
 		oi.contentp = &content;
 
@@ -849,7 +848,6 @@ static int count_objects(const char *path UNUSED, struct oid_array *oids,
 						  OBJECT_INFO_SKIP_FETCH_OBJECT |
 						  OBJECT_INFO_QUICK) < 0)
 			continue;
-		inflated = cast_size_t_to_ulong(inflated_st);
 
 		obj = parse_object_buffer(the_repository, &oids->oid[i], type,
 					  inflated, content, &eaten);

From 8e9a0d4c98933130ac3a6c41f643c081244679ef Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 22:37:32 +0200
Subject: [PATCH 163/247] fast-import: drop the six size casts in the
 object-read paths

Continue the size_t evacuation. fast-import's helper
gfi_unpack_entry() and the five size-handling sites that feed off
it (store_object()'s deltalen, load_tree(), parse_from_existing(),
the inline gfi_unpack_entry() caller in parse_objectish(),
cat_blob(), and dereference()) all carry size_t-shaped values from
the odb / unpack_entry() APIs through cast_size_t_to_ulong()
bridges into unsigned long locals.

With the producers (odb_read_object(), odb_read_object_peeled(),
unpack_entry()) and the consumers it feeds (the zlib avail_in
field from a prior commit, encode_in_pack_object_header()'s
uintmax_t parameter, parse_from_commit()'s widened size parameter)
all size_t-ready, the bridges and casts go away in one pass.
gfi_unpack_entry() now writes into the caller's size_t directly,
and the six locals collapse to plain size_t declarations.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/fast-import.c | 42 ++++++++++++++----------------------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index fbd919982c956a..921f9a6a6c2865 100644
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -980,7 +980,7 @@ static int store_object(
 	struct object_entry *e;
 	unsigned char hdr[96];
 	struct object_id oid;
-	unsigned long hdrlen, deltalen = 0;
+	size_t hdrlen, deltalen = 0;
 	struct git_hash_ctx c;
 	git_zstream s;
 	struct repo_config_values *cfg = repo_config_values(the_repository);
@@ -1016,13 +1016,10 @@ static int store_object(
 
 	if (last && last->data.len && last->data.buf && last->depth < max_depth
 		&& dat->len > the_hash_algo->rawsz) {
-		size_t deltalen_st;
-
 		delta_count_attempts_by_type[type]++;
 		delta = diff_delta(last->data.buf, last->data.len,
 			dat->buf, dat->len,
-			&deltalen_st, dat->len - the_hash_algo->rawsz);
-		deltalen = cast_size_t_to_ulong(deltalen_st);
+			&deltalen, dat->len - the_hash_algo->rawsz);
 	} else
 		delta = NULL;
 
@@ -1259,10 +1256,9 @@ static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark)
  */
 static void *gfi_unpack_entry(
 	struct object_entry *oe,
-	unsigned long *sizep)
+	size_t *sizep)
 {
 	enum object_type type;
-	size_t size_st = 0;
 	void *data;
 	struct packed_git *p = all_packs[oe->pack_id];
 	if (p == pack_data && p->pack_size < (pack_size + the_hash_algo->rawsz)) {
@@ -1285,9 +1281,7 @@ static void *gfi_unpack_entry(
 		 */
 		p->pack_size = pack_size + the_hash_algo->rawsz;
 	}
-	data = unpack_entry(the_repository, p, oe->idx.offset, &type, &size_st);
-	if (sizep)
-		*sizep = cast_size_t_to_ulong(size_st);
+	data = unpack_entry(the_repository, p, oe->idx.offset, &type, sizep);
 	return data;
 }
 
@@ -1296,7 +1290,7 @@ static void load_tree(struct tree_entry *root)
 	struct object_id *oid = &root->versions[1].oid;
 	struct object_entry *myoe;
 	struct tree_content *t;
-	unsigned long size;
+	size_t size;
 	char *buf;
 	const char *c;
 
@@ -1314,10 +1308,8 @@ static void load_tree(struct tree_entry *root)
 			die(_("can't load tree %s"), oid_to_hex(oid));
 	} else {
 		enum object_type type;
-		size_t size_st = 0;
 		buf = odb_read_object(the_repository->objects, oid, &type,
-				      &size_st);
-		size = cast_size_t_to_ulong(size_st);
+				      &size);
 		if (!buf || type != OBJ_TREE)
 			die(_("can't load tree %s"), oid_to_hex(oid));
 	}
@@ -2640,7 +2632,7 @@ static void file_change_deleteall(struct branch *b)
 	b->num_notes = 0;
 }
 
-static void parse_from_commit(struct branch *b, char *buf, unsigned long size)
+static void parse_from_commit(struct branch *b, char *buf, size_t size)
 {
 	if (!buf || size < the_hash_algo->hexsz + 6)
 		die(_("not a valid commit: %s"), oid_to_hex(&b->oid));
@@ -2657,13 +2649,11 @@ static void parse_from_existing(struct branch *b)
 		oidclr(&b->branch_tree.versions[0].oid, the_repository->hash_algo);
 		oidclr(&b->branch_tree.versions[1].oid, the_repository->hash_algo);
 	} else {
-		unsigned long size;
-		size_t size_st = 0;
+		size_t size;
 		char *buf;
 
 		buf = odb_read_object_peeled(the_repository->objects, &b->oid,
-					     OBJ_COMMIT, &size_st, &b->oid);
-		size = cast_size_t_to_ulong(size_st);
+					     OBJ_COMMIT, &size, &b->oid);
 		parse_from_commit(b, buf, size);
 		free(buf);
 	}
@@ -2694,7 +2684,7 @@ static int parse_objectish(struct fast_import_state *state,
 		if (!oideq(&b->oid, &oe->idx.oid)) {
 			oidcpy(&b->oid, &oe->idx.oid);
 			if (oe->pack_id != MAX_PACK_ID) {
-				unsigned long size;
+				size_t size;
 				char *buf = gfi_unpack_entry(oe, &size);
 				parse_from_commit(b, buf, size);
 				free(buf);
@@ -3367,15 +3357,13 @@ static void cat_blob(struct object_entry *oe, struct object_id *oid)
 {
 	struct strbuf line = STRBUF_INIT;
 	struct iovec iov[3];
-	unsigned long size;
+	size_t size;
 	enum object_type type = 0;
 	char *buf;
 
 	if (!oe || oe->pack_id == MAX_PACK_ID) {
-		size_t size_st = 0;
 		buf = odb_read_object(the_repository->objects, oid, &type,
-				      &size_st);
-		size = cast_size_t_to_ulong(size_st);
+				      &size);
 	} else {
 		type = oe->type;
 		buf = gfi_unpack_entry(oe, &size);
@@ -3467,7 +3455,7 @@ static void parse_cat_blob(struct fast_import_state *state UNUSED,
 static struct object_entry *dereference(struct object_entry *oe,
 					struct object_id *oid)
 {
-	unsigned long size;
+	size_t size;
 	char *buf = NULL;
 	const unsigned hexsz = the_hash_algo->hexsz;
 
@@ -3496,10 +3484,8 @@ static struct object_entry *dereference(struct object_entry *oe,
 		buf = gfi_unpack_entry(oe, &size);
 	} else {
 		enum object_type unused;
-		size_t size_st = 0;
 		buf = odb_read_object(the_repository->objects, oid,
-				      &unused, &size_st);
-		size = cast_size_t_to_ulong(size_st);
+				      &unused, &size);
 	}
 	if (!buf)
 		die(_("can't load object %s"), oid_to_hex(oid));

From ad10cd7c48f1012affb943981c99988fac73943b Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 23:05:52 +0200
Subject: [PATCH 164/247] unpack-objects: widen the size-passing infrastructure
 to size_t

Drop the last cast_size_t_to_ulong() in builtin/unpack-objects.c.
With size_t-typed object sizes already coming in via odb_read_object()
and the per-byte varint decode in unpack_one() (widened by
f2063855fb), the rest of the file was the only thing left that still
threaded sizes through unsigned long: struct obj_buffer.size and
struct delta_info.size, get_data() and add_object_buffer(),
add_delta_to_list(), resolve_delta(), resolve_against_held(),
added_object(), write_object(), unpack_non_delta_entry(),
unpack_delta_entry(), and stream_blob().

Widen all of them together. None of those types had a downstream
narrow consumer once odb_write_object() and patch_delta() were
widened earlier, so the change is mechanical: parameter and field
types change, the base_size_st bridge in unpack_delta_entry() and
its cast go away, and odb_read_object() now writes into base_size
directly.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/unpack-objects.c | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 351948724ab703..e0183b7a73e820 100644
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -40,7 +40,7 @@ static struct progress *progress;
  */
 struct obj_buffer {
 	char *buffer;
-	unsigned long size;
+	size_t size;
 };
 
 static struct decoration obj_decorate;
@@ -50,7 +50,7 @@ static struct obj_buffer *lookup_object_buffer(struct object *base)
 	return lookup_decoration(&obj_decorate, base);
 }
 
-static void add_object_buffer(struct object *object, char *buffer, unsigned long size)
+static void add_object_buffer(struct object *object, char *buffer, size_t size)
 {
 	struct obj_buffer *obj;
 	CALLOC_ARRAY(obj, 1);
@@ -114,10 +114,10 @@ static void use(int bytes)
  * allocated buffer which is reused to hold temporary zstream output
  * and return NULL instead of returning garbage data.
  */
-static void *get_data(unsigned long size)
+static void *get_data(size_t size)
 {
 	git_zstream stream;
-	unsigned long bufsize = dry_run && size > 8192 ? 8192 : size;
+	size_t bufsize = dry_run && size > 8192 ? 8192 : size;
 	void *buf = xmallocz(bufsize);
 
 	memset(&stream, 0, sizeof(stream));
@@ -161,7 +161,7 @@ struct delta_info {
 	struct object_id base_oid;
 	unsigned nr;
 	off_t base_offset;
-	unsigned long size;
+	size_t size;
 	void *delta;
 	struct delta_info *next;
 };
@@ -170,7 +170,7 @@ static struct delta_info *delta_list;
 
 static void add_delta_to_list(unsigned nr, const struct object_id *base_oid,
 			      off_t base_offset,
-			      void *delta, unsigned long size)
+			      void *delta, size_t size)
 {
 	struct delta_info *info = xmalloc(sizeof(*info));
 
@@ -261,7 +261,7 @@ static void write_rest(void)
 }
 
 static void added_object(unsigned nr, enum object_type type,
-			 void *data, unsigned long size);
+			 void *data, size_t size);
 
 /*
  * Write out nr-th object from the list, now we know the contents
@@ -269,7 +269,7 @@ static void added_object(unsigned nr, enum object_type type,
  * to be checked at the end.
  */
 static void write_object(unsigned nr, enum object_type type,
-			 void *buf, unsigned long size)
+			 void *buf, size_t size)
 {
 	if (!strict) {
 		if (odb_write_object(the_repository->objects, buf, size, type,
@@ -310,8 +310,8 @@ static void write_object(unsigned nr, enum object_type type,
 }
 
 static void resolve_delta(unsigned nr, enum object_type type,
-			  void *base, unsigned long base_size,
-			  void *delta, unsigned long delta_size)
+			  void *base, size_t base_size,
+			  void *delta, size_t delta_size)
 {
 	void *result;
 	size_t result_size;
@@ -330,7 +330,7 @@ static void resolve_delta(unsigned nr, enum object_type type,
  * resolve all the deltified objects that are based on it.
  */
 static void added_object(unsigned nr, enum object_type type,
-			 void *data, unsigned long size)
+			 void *data, size_t size)
 {
 	struct delta_info **p = &delta_list;
 	struct delta_info *info;
@@ -349,7 +349,7 @@ static void added_object(unsigned nr, enum object_type type,
 	}
 }
 
-static void unpack_non_delta_entry(enum object_type type, unsigned long size,
+static void unpack_non_delta_entry(enum object_type type, size_t size,
 				   unsigned nr)
 {
 	void *buf = get_data(size);
@@ -386,7 +386,7 @@ static ssize_t zlib_stream_read(struct odb_stream *in_stream,
 	return buf_len - zstream->avail_out;
 }
 
-static void stream_blob(unsigned long size, unsigned nr)
+static void stream_blob(size_t size, unsigned nr)
 {
 	git_zstream zstream = { 0 };
 	struct zlib_stream in_stream = {
@@ -420,7 +420,7 @@ static void stream_blob(unsigned long size, unsigned nr)
 }
 
 static int resolve_against_held(unsigned nr, const struct object_id *base,
-				void *delta_data, unsigned long delta_size)
+				void *delta_data, size_t delta_size)
 {
 	struct object *obj;
 	struct obj_buffer *obj_buffer;
@@ -435,12 +435,11 @@ static int resolve_against_held(unsigned nr, const struct object_id *base,
 	return 1;
 }
 
-static void unpack_delta_entry(enum object_type type, unsigned long delta_size,
+static void unpack_delta_entry(enum object_type type, size_t delta_size,
 			       unsigned nr)
 {
 	void *delta_data, *base;
-	unsigned long base_size;
-	size_t base_size_st = 0;
+	size_t base_size;
 	struct object_id base_oid;
 
 	if (type == OBJ_REF_DELTA) {
@@ -517,8 +516,7 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size,
 		return;
 
 	base = odb_read_object(the_repository->objects, &base_oid,
-			       &type, &base_size_st);
-	base_size = cast_size_t_to_ulong(base_size_st);
+			       &type, &base_size);
 	if (!base) {
 		error("failed to read delta-pack base object %s",
 		      oid_to_hex(&base_oid));

From 791e1ad910c33852a9e51954fa88efba80c629f9 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 5 Jun 2026 22:50:00 +0200
Subject: [PATCH 165/247] t/helper/test-pack-deltas: drop the delta_size cast
 in write_ref_delta()

Tidies up the bridge variable introduced in the create_delta() /
diff_delta() widening commit earlier in this series. With the test
helper's local do_compress() also widened to size_t in pass, the
narrowing into the unsigned long delta_size local that compress
expected is gone, the size_st bridge is unnecessary, and the cast
goes away. encode_in_pack_object_header() takes uintmax_t and
hashwrite() takes uint32_t, both unchanged.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/helper/test-pack-deltas.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/t/helper/test-pack-deltas.c b/t/helper/test-pack-deltas.c
index 959705fecaf144..8b448485fbf4ca 100644
--- a/t/helper/test-pack-deltas.c
+++ b/t/helper/test-pack-deltas.c
@@ -18,7 +18,7 @@ static const char *usage_str[] = {
 	NULL
 };
 
-static unsigned long do_compress(void **pptr, unsigned long size)
+static size_t do_compress(void **pptr, size_t size)
 {
 	git_zstream stream;
 	void *in, *out;
@@ -48,8 +48,8 @@ static void write_ref_delta(struct hashfile *f,
 			    struct object_id *base)
 {
 	unsigned char header[MAX_PACK_OBJECT_HEADER];
-	unsigned long delta_size, compressed_size, hdrlen;
-	size_t size, base_size, delta_size_st = 0;
+	unsigned long compressed_size, hdrlen;
+	size_t size, base_size, delta_size;
 	enum object_type type;
 	void *base_buf, *delta_buf;
 	void *buf = odb_read_object(the_repository->objects,
@@ -65,8 +65,7 @@ static void write_ref_delta(struct hashfile *f,
 		die("unable to read %s", oid_to_hex(base));
 
 	delta_buf = diff_delta(base_buf, base_size,
-			       buf, size, &delta_size_st, 0);
-	delta_size = cast_size_t_to_ulong(delta_size_st);
+			       buf, size, &delta_size, 0);
 
 	compressed_size = do_compress(&delta_buf, delta_size);
 

From 2af2f1502a7b6861071a4953cfb4ea3e61f82ef4 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 22 Jun 2026 11:01:41 +0200
Subject: [PATCH 166/247] Drop the `cast_size_t_to_ulong()` helper

Now that all of the call sites of this helper (which I used as a kind of
"NEEDSWORK" marker) are eliminated, we can drop that helper altogether.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 git-compat-util.h | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/git-compat-util.h b/git-compat-util.h
index a0f901ce793ed6..682fa26475303a 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -670,15 +670,6 @@ static inline size_t st_left_shift(size_t a, unsigned shift)
 	return a << shift;
 }
 
-static inline unsigned long cast_size_t_to_ulong(size_t a)
-{
-	if (a != (unsigned long)a)
-		die("object too large to read on this platform: %"
-		    PRIuMAX" is cut off to %lu",
-		    (uintmax_t)a, (unsigned long)a);
-	return (unsigned long)a;
-}
-
 static inline uint32_t cast_size_t_to_uint32_t(size_t a)
 {
 	if (a != (uint32_t)a)

From fecdd9f6b54db7c67cac735af2c2a4d30c2d2ba9 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 30 Jul 2026 14:19:17 +0200
Subject: [PATCH 167/247] mingw: handle staging 4GB+ files correctly

This is yet another set of `unsigned long` declarations that should have
been `size_t` ones.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 odb.c              | 2 +-
 odb.h              | 4 ++--
 odb/source-loose.c | 2 +-
 odb/source.h       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/odb.c b/odb.c
index 32fef219c0dc6a..ac08839bcd361a 100644
--- a/odb.c
+++ b/odb.c
@@ -980,7 +980,7 @@ void odb_assert_oid_type(struct object_database *odb,
 }
 
 int odb_write_object_ext(struct object_database *odb,
-			 const void *buf, unsigned long len,
+			 const void *buf, size_t len,
 			 enum object_type type,
 			 struct object_id *oid,
 			 const struct object_id *compat_oid_in,
diff --git a/odb.h b/odb.h
index 85d45b76488ba2..afe04d5ff8be04 100644
--- a/odb.h
+++ b/odb.h
@@ -683,14 +683,14 @@ enum odb_write_object_flags {
  * Returns 0 on success, a negative error code otherwise.
  */
 int odb_write_object_ext(struct object_database *odb,
-			 const void *buf, unsigned long len,
+			 const void *buf, size_t len,
 			 enum object_type type,
 			 struct object_id *oid,
 			 const struct object_id *compat_oid,
 			 enum odb_write_object_flags flags);
 
 static inline int odb_write_object(struct object_database *odb,
-				   const void *buf, unsigned long len,
+				   const void *buf, size_t len,
 				   enum object_type type,
 				   struct object_id *oid)
 {
diff --git a/odb/source-loose.c b/odb/source-loose.c
index a7e1625c4be731..ff0ec31a8bbb66 100644
--- a/odb/source-loose.c
+++ b/odb/source-loose.c
@@ -770,7 +770,7 @@ static int end_loose_object_common(struct odb_source_loose *loose,
 
 static int write_loose_object(struct odb_source_loose *loose,
 			      const struct object_id *oid, char *hdr,
-			      int hdrlen, const void *buf, unsigned long len,
+			      int hdrlen, const void *buf, size_t len,
 			      const time_t *mtime, unsigned flags)
 {
 	int fd, ret;
diff --git a/odb/source.h b/odb/source.h
index 072e771be581cb..13c7cd61a60013 100644
--- a/odb/source.h
+++ b/odb/source.h
@@ -506,7 +506,7 @@ static inline int odb_source_freshen_object(struct odb_source *source,
  * object ID and the compatibility object ID, if non-NULL.
  */
 static inline int odb_source_write_object(struct odb_source *source,
-					  const void *buf, unsigned long len,
+					  const void *buf, size_t len,
 					  enum object_type type,
 					  const struct object_id *oid,
 					  const struct object_id *compat_oid,

From 267ee3050789fca04c097f09be90224c9858820d Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 30 Jul 2026 14:42:25 +0200
Subject: [PATCH 168/247] mingw: support unpacking loose 4GB+ objects

... and yet another round of `unsigned long` -> `size_t`
transmogrifications.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 object-file.c      | 10 +++++-----
 object-file.h      |  6 +++---
 odb/source-loose.c |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/object-file.c b/object-file.c
index a4cbf8b081df1e..1674a83edd8720 100644
--- a/object-file.c
+++ b/object-file.c
@@ -155,7 +155,7 @@ int stream_object_signature(struct repository *r,
  * Map and close the given loose object fd. The path argument is used for
  * error reporting.
  */
-static void *map_fd(int fd, const char *path, unsigned long *size)
+static void *map_fd(int fd, const char *path, size_t *size)
 {
 	void *map = NULL;
 	struct stat st;
@@ -176,9 +176,9 @@ static void *map_fd(int fd, const char *path, unsigned long *size)
 
 enum unpack_loose_header_result unpack_loose_header(git_zstream *stream,
 						    unsigned char *map,
-						    unsigned long mapsize,
+						    size_t mapsize,
 						    void *buffer,
-						    unsigned long bufsiz)
+						    size_t bufsiz)
 {
 	int status;
 
@@ -209,7 +209,7 @@ enum unpack_loose_header_result unpack_loose_header(git_zstream *stream,
 }
 
 void *unpack_loose_rest(git_zstream *stream,
-			void *buffer, unsigned long size,
+			void *buffer, size_t size,
 			const struct object_id *oid)
 {
 	size_t bytes = strlen(buffer) + 1, n;
@@ -1199,7 +1199,7 @@ int read_loose_object(struct repository *repo,
 	int ret = -1;
 	int fd;
 	void *map = NULL;
-	unsigned long mapsize;
+	size_t mapsize;
 	git_zstream stream;
 	char hdr[MAX_HEADER_LEN];
 	size_t *size = oi->sizep;
diff --git a/object-file.h b/object-file.h
index f44758c4f8ba01..a8da9dcd22f918 100644
--- a/object-file.h
+++ b/object-file.h
@@ -157,11 +157,11 @@ enum unpack_loose_header_result {
  */
 enum unpack_loose_header_result unpack_loose_header(git_zstream *stream,
 						    unsigned char *map,
-						    unsigned long mapsize,
+						    size_t mapsize,
 						    void *buffer,
-						    unsigned long bufsiz);
+						    size_t bufsiz);
 void *unpack_loose_rest(git_zstream *stream,
-			void *buffer, unsigned long size,
+			void *buffer, size_t size,
 			const struct object_id *oid);
 
 int parse_loose_header(const char *hdr, struct object_info *oi);
diff --git a/odb/source-loose.c b/odb/source-loose.c
index ff0ec31a8bbb66..e76efd9e37d54f 100644
--- a/odb/source-loose.c
+++ b/odb/source-loose.c
@@ -73,7 +73,7 @@ static int read_object_info_from_path(struct odb_source_loose *loose,
 {
 	int ret;
 	int fd;
-	unsigned long mapsize;
+	size_t mapsize;
 	void *map = NULL;
 	git_zstream stream, *stream_to_end = NULL;
 	char hdr[MAX_HEADER_LEN];
@@ -260,7 +260,7 @@ static int open_loose_object(struct odb_source_loose *loose,
 
 static void *odb_source_loose_map_object(struct odb_source_loose *loose,
 					 const struct object_id *oid,
-					 unsigned long *size)
+					 size_t *size)
 {
 	const char *p;
 	int fd = open_loose_object(loose, oid, &p);
@@ -295,7 +295,7 @@ struct odb_loose_read_stream {
 		ODB_LOOSE_READ_STREAM_ERROR,
 	} z_state;
 	void *mapped;
-	unsigned long mapsize;
+	size_t mapsize;
 	char hdr[32];
 	int hdr_avail;
 	int hdr_used;
@@ -366,7 +366,7 @@ static int odb_source_loose_read_object_stream(struct odb_stream **out,
 	struct odb_source_loose *loose = odb_source_loose_downcast(source);
 	struct object_info oi = OBJECT_INFO_INIT;
 	struct odb_loose_read_stream *st;
-	unsigned long mapsize;
+	size_t mapsize;
 	void *mapped;
 
 	mapped = odb_source_loose_map_object(loose, oid, &mapsize);

From 0fbd58c2f061bc3cc1bcbc8c29d300a96eb9d890 Mon Sep 17 00:00:00 2001
From: Suhail Hany <suhail9816@gmail.com>
Date: Sat, 19 Sep 2026 14:55:21 +0300
Subject: [PATCH 169/247] difftool: do not crash on a path rejected by
 verify_path()

`git difftool --dir-diff` checks both sides of the diff out into
temporary directories. For every path in the raw diff, checkout_path()
builds a transient cache entry and hands it to checkout_entry():

	ce = make_transient_cache_entry(mode, oid, path, 0, NULL);
	ret = checkout_entry(ce, state, NULL, NULL);

make_transient_cache_entry() runs the path through verify_path() and,
when that fails, reports "invalid path '%s'" and returns NULL.
checkout_path() never checks for that, so checkout_entry_ca()
dereferences a NULL cache entry and Git dies with a segmentation fault
(access violation 0xC0000005 on Windows) immediately after printing the
error.

Any diff whose raw output contains a path verify_path() rejects is
enough to reach it. A tree with a top-level ".git" entry is the
shortest reproducer:

	blob=$(echo content | git hash-object -w --stdin)
	tree=$(printf "100644 blob %s\t.git\n" "$blob" | git mktree)
	commit=$(git commit-tree -m bad "$tree")
	git difftool --dir-diff --no-symlinks --extcmd true "$commit" HEAD

Check for NULL and return an error instead. builtin/checkout.c, the
only other caller of make_transient_cache_entry(), die()s here, but
checkout_path() already returns int and both of its call sites turn a
non-zero return into "could not write '<path>'" before jumping to the
cleanup label, which exits with status 1. Reusing that path keeps the
diagnosis that make_transient_cache_entry() already printed and turns
the crash into an ordinary failure.

Signed-off-by: Suhail Hany <suhail9816@gmail.com>
---
 builtin/difftool.c  | 2 ++
 t/t7800-difftool.sh | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/builtin/difftool.c b/builtin/difftool.c
index bc7b2ea44396bb..8208ade4727074 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -336,6 +336,8 @@ static int checkout_path(unsigned mode, struct object_id *oid,
 	int ret;
 
 	ce = make_transient_cache_entry(mode, oid, path, 0, NULL);
+	if (!ce)
+		return -1;
 	ret = checkout_entry(ce, state, NULL, NULL);
 
 	discard_cache_entry(ce);
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 0079aa9da440cf..40983602b7e9a6 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -668,6 +668,15 @@ run_dir_diff_test 'difftool --dir-diff with no diff' '
 	git difftool -d main main
 '
 
+test_expect_success 'difftool --dir-diff errors out on an invalid path' '
+	blob=$(echo content | git hash-object -w --stdin) &&
+	tree=$(printf "100644 blob %s\t.git\n" "$blob" | git mktree) &&
+	commit=$(git commit-tree -m "tree with a .git entry" "$tree") &&
+	test_must_fail git difftool --dir-diff --no-symlinks \
+		--extcmd true "$commit" HEAD 2>err &&
+	test_grep "invalid path" err
+'
+
 write_script modify-file <<\EOF
 echo "new content" >file
 EOF

From d92a525ce104ecb34a490712f3a923927e17abd9 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 30 Jul 2026 14:57:54 +0200
Subject: [PATCH 170/247] t: add an expensive test to verify that 4GB+ blobs
 can be staged/read

I should have added this test as soon as
https://github.com/git-for-windows/git/issues/6012 was opened.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/meson.build           |  1 +
 t/t3706-add-4gb-file.sh | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100755 t/t3706-add-4gb-file.sh

diff --git a/t/meson.build b/t/meson.build
index 3ca7b271040a62..6ca7c92b4fd5b2 100644
--- a/t/meson.build
+++ b/t/meson.build
@@ -432,6 +432,7 @@ integration_tests = [
   't3703-add-magic-pathspec.sh',
   't3704-add-pathspec-file.sh',
   't3705-add-sparse-checkout.sh',
+  't3706-add-4gb-file.sh',
   't3800-mktag.sh',
   't3900-i18n-commit.sh',
   't3901-i18n-patch.sh',
diff --git a/t/t3706-add-4gb-file.sh b/t/t3706-add-4gb-file.sh
new file mode 100755
index 00000000000000..5978ca3ee24c8a
--- /dev/null
+++ b/t/t3706-add-4gb-file.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# Copyright (c) 2026 Johannes Schindelin
+#
+
+test_description='add 4GB+ objects'
+
+. ./test-lib.sh
+
+if ! test_have_prereq EXPENSIVE,SIZE_T_IS_64BIT
+then
+	skip_all='expensive 4GB blob test; enable on 64-bit with GIT_TEST_LONG=true'
+	test_done
+fi
+
+size_4gb=4294967296
+
+test_expect_success 'set up a 4GB file' '
+	test_atexit "rm -f large" &&
+	# genrandom takes only an unsigned long...
+	test-tool genrandom 123 $(($size_4gb-1)) >large &&
+	printf 1 >>large
+'
+
+test_expect_success 'add 4GB file' '
+	git add large &&
+	git cat-file -s :large >size-staged &&
+	test $size_4gb = $(cat size-staged)
+'
+test_expect_success 'read 4GB loose object' '
+	git -P show :large >read &&
+	test_file_size read >size-read &&
+	test $size_4gb = $(cat size-read)
+'
+
+test_done

From 2a4d52ff519a689020f188eac44cd3c741118d75 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 28 Sep 2026 14:43:54 +0200
Subject: [PATCH 171/247] difftool: avoid memory leak when `run_dir_diff()`
 fails

Some error code paths return before the child process was spawned; In
these instances, the `child_process` struct is still initialized and
still holds allocated data, which would cause the sanitizer (which is
exercised in the `*-leaks` CI jobs) to complain loudly.

The parent commit introduced a test case to verify that invalid paths
won't let `difftool` crash with a segmentation fault; That test case
(inadvertently) exercises the very issue this here patch addresses in
the `-leaks` CI jobs.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/difftool.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/builtin/difftool.c b/builtin/difftool.c
index 8208ade4727074..07e9f4409c2a6f 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -696,6 +696,7 @@ static int run_dir_diff(struct repository *repo,
 	strbuf_release(&wtdir);
 	strbuf_release(&buf);
 	strbuf_release(&tmpdir);
+	child_process_clear(child);
 
 	return (ret < 0) ? 1 : ret;
 }

From 9ba8c50a5a046ab9c918cf56e1b5f362d2a97bcf Mon Sep 17 00:00:00 2001
From: David PRUDHOMME <david7.prudhomme@gmail.com>
Date: Tue, 15 Sep 2026 20:17:00 +0200
Subject: [PATCH 172/247] object-file: use size_t for object size in
 check_object_signature()

Signed-off-by: David PRUDHOMME <david7.prudhomme@gmail.com>
---
 object-file.c | 2 +-
 object-file.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/object-file.c b/object-file.c
index 1674a83edd8720..68751dadc3575d 100644
--- a/object-file.c
+++ b/object-file.c
@@ -111,7 +111,7 @@ int format_object_header(char *str, size_t size, enum object_type type,
 }
 
 int check_object_signature(struct repository *r, const struct object_id *oid,
-			   void *buf, unsigned long size,
+			   void *buf, size_t size,
 			   enum object_type type)
 {
 	const struct git_hash_algo *algo =
diff --git a/object-file.h b/object-file.h
index a8da9dcd22f918..ee3aac7965a527 100644
--- a/object-file.h
+++ b/object-file.h
@@ -92,7 +92,7 @@ int format_object_header(char *str, size_t size, enum object_type type,
  * what we expected, but it might also indicate another error.
  */
 int check_object_signature(struct repository *r, const struct object_id *oid,
-			   void *map, unsigned long size,
+			   void *map, size_t size,
 			   enum object_type type);
 
 /**

From 5be054f6ade6844a32b5916188e8a117a68f87d4 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 23 Jun 2026 14:50:25 +0200
Subject: [PATCH 173/247] coverity: skip building with Rust, for now

CI runs in GitHub Actions runners are ill-equipped to build with Rust,
as the Windows/GCC-compatible toolchain isn't set up.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 .github/workflows/coverity.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index 58a78f1eb3f836..69d00fb9700ac7 100644
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -37,6 +37,7 @@ jobs:
       COVERITY_PROJECT: ${{ vars.COVERITY_PROJECT || 'git' }}
       COVERITY_LANGUAGE: cxx
       COVERITY_PLATFORM: overridden-below
+      NO_RUST: Yup
     steps:
       - uses: actions/checkout@v6
       - name: install minimal Git for Windows SDK

From d21070dd71277bfd49b40ab2439bbbdb6257bd8c Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 28 Sep 2026 20:51:17 +0200
Subject: [PATCH 174/247] difftool: avoid invalid memory access by an atexit
 handler

The atexit handler `cleanup_children()` would happily dereference the
stored `process` of the `child` command, unless `finish_command()` took
that process off the list that this atexit handler processes. Therefore
we need to ensure that `finish_command()` is called.

In case that an invalid path is encountered, this is currently not the
case: the process was started, but `checkout_path()` encountered an
error and `goto finish` ensures an early exit. As running t7800 with
`--valgrind-only=83` demonstrates, there is then an invalid memory
access in the atexit handler that tries to dereference the
`child_process` instance that was on the stack and is now long gone.

Let's use `fp` (the `FILE *` corresponding to the output pipe) as a
tell-tale that the process was started, but `finish_command()` was not
called yet: `fp` is set to non-`NULL` only after a successful
`start_command()`, and it is re-set to `NULL` after a
`finish_command()`. Therefore, also call `finish_command()` in addition
to closing the not-yet-closed output pipe.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/difftool.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/builtin/difftool.c b/builtin/difftool.c
index 07e9f4409c2a6f..991d298584d1be 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -677,8 +677,17 @@ static int run_dir_diff(struct repository *repo,
 	}
 
 finish:
-	if (fp)
+	if (fp) {
 		fclose(fp);
+		/*
+		 * The child process was started, but there was an error before
+		 * it finished; After closing the output pipe, we need to wait
+		 * for the process to finish, otherwise the  atexit handler
+		 * `cleanup_children()` would try to access the stack-allocated
+		 * `child`.
+		*/
+		finish_command(child); /* best effort; ignore result */
+	}
 
 	hashmap_clear_and_free(&working_tree_dups, struct working_tree_entry, entry);
 	hashmap_clear_and_free(&wt_modified, struct path_entry, entry);

From 3ed9e12223461d5564f0ddd1f359efb8d2030f64 Mon Sep 17 00:00:00 2001
From: Karsten Blees <blees@dcon.de>
Date: Sat, 6 Jul 2013 02:09:35 +0200
Subject: [PATCH 175/247] Win32: make FILETIME conversion functions public

We will use them in the upcoming "FSCache" patches (to accelerate
sequential lstat() calls).

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/mingw-posix.h | 18 ++++++++++++++++++
 compat/mingw.c       | 18 ------------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/compat/mingw-posix.h b/compat/mingw-posix.h
index 9dc70e1c49cdf5..96df96f8e49c14 100644
--- a/compat/mingw-posix.h
+++ b/compat/mingw-posix.h
@@ -340,6 +340,17 @@ static inline int getrlimit(int resource, struct rlimit *rlp)
 	return 0;
 }
 
+/*
+ * The unit of FILETIME is 100-nanoseconds since January 1, 1601, UTC.
+ * Returns the 100-nanoseconds ("hekto nanoseconds") since the epoch.
+ */
+static inline long long filetime_to_hnsec(const FILETIME *ft)
+{
+	long long winTime = ((long long)ft->dwHighDateTime << 32) + ft->dwLowDateTime;
+	/* Windows to Unix Epoch conversion */
+	return winTime - 116444736000000000LL;
+}
+
 /*
  * Use mingw specific stat()/lstat()/fstat() implementations on Windows,
  * including our own struct stat with 64 bit st_size and nanosecond-precision
@@ -356,6 +367,13 @@ struct timespec {
 #endif
 #endif
 
+static inline void filetime_to_timespec(const FILETIME *ft, struct timespec *ts)
+{
+	long long hnsec = filetime_to_hnsec(ft);
+	ts->tv_sec = (time_t)(hnsec / 10000000);
+	ts->tv_nsec = (hnsec % 10000000) * 100;
+}
+
 struct mingw_stat {
     _dev_t st_dev;
     _ino_t st_ino;
diff --git a/compat/mingw.c b/compat/mingw.c
index af2806f7519162..adf2d0a16d91ba 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1181,24 +1181,6 @@ int mingw_chmod(const char *filename, int mode)
 	return _wchmod(wfilename, mode);
 }
 
-/*
- * The unit of FILETIME is 100-nanoseconds since January 1, 1601, UTC.
- * Returns the 100-nanoseconds ("hekto nanoseconds") since the epoch.
- */
-static inline long long filetime_to_hnsec(const FILETIME *ft)
-{
-	long long winTime = ((long long)ft->dwHighDateTime << 32) + ft->dwLowDateTime;
-	/* Windows to Unix Epoch conversion */
-	return winTime - 116444736000000000LL;
-}
-
-static inline void filetime_to_timespec(const FILETIME *ft, struct timespec *ts)
-{
-	long long hnsec = filetime_to_hnsec(ft);
-	ts->tv_sec = (time_t)(hnsec / 10000000);
-	ts->tv_nsec = (hnsec % 10000000) * 100;
-}
-
 /**
  * Verifies that safe_create_leading_directories() would succeed.
  */

From 601b270a608428c168a8c1be5c31315f8a064659 Mon Sep 17 00:00:00 2001
From: Karsten Blees <blees@dcon.de>
Date: Sun, 8 Sep 2013 14:17:31 +0200
Subject: [PATCH 176/247] Win32: dirent.c: Move opendir down

Move opendir down in preparation for the next patch.

Signed-off-by: Karsten Blees <blees@dcon.de>
---
 compat/win32/dirent.c | 68 +++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/compat/win32/dirent.c b/compat/win32/dirent.c
index 24ee9b814d6adf..2f7d64369f9eda 100644
--- a/compat/win32/dirent.c
+++ b/compat/win32/dirent.c
@@ -21,40 +21,6 @@ static inline void finddata2dirent(struct dirent *ent, WIN32_FIND_DATAW *fdata)
 		ent->d_type = DT_REG;
 }
 
-DIR *opendir(const char *name)
-{
-	wchar_t pattern[MAX_PATH + 2]; /* + 2 for '/' '*' */
-	WIN32_FIND_DATAW fdata;
-	HANDLE h;
-	int len;
-	DIR *dir;
-
-	/* convert name to UTF-16 and check length < MAX_PATH */
-	if ((len = xutftowcs_path(pattern, name)) < 0)
-		return NULL;
-
-	/* append optional '/' and wildcard '*' */
-	if (len && !is_dir_sep(pattern[len - 1]))
-		pattern[len++] = '/';
-	pattern[len++] = '*';
-	pattern[len] = 0;
-
-	/* open find handle */
-	h = FindFirstFileW(pattern, &fdata);
-	if (h == INVALID_HANDLE_VALUE) {
-		DWORD err = GetLastError();
-		errno = (err == ERROR_DIRECTORY) ? ENOTDIR : err_win_to_posix(err);
-		return NULL;
-	}
-
-	/* initialize DIR structure and copy first dir entry */
-	dir = xmalloc(sizeof(DIR));
-	dir->dd_handle = h;
-	dir->dd_stat = 0;
-	finddata2dirent(&dir->dd_dir, &fdata);
-	return dir;
-}
-
 struct dirent *readdir(DIR *dir)
 {
 	if (!dir) {
@@ -93,3 +59,37 @@ int closedir(DIR *dir)
 	free(dir);
 	return 0;
 }
+
+DIR *opendir(const char *name)
+{
+	wchar_t pattern[MAX_PATH + 2]; /* + 2 for '/' '*' */
+	WIN32_FIND_DATAW fdata;
+	HANDLE h;
+	int len;
+	DIR *dir;
+
+	/* convert name to UTF-16 and check length < MAX_PATH */
+	if ((len = xutftowcs_path(pattern, name)) < 0)
+		return NULL;
+
+	/* append optional '/' and wildcard '*' */
+	if (len && !is_dir_sep(pattern[len - 1]))
+		pattern[len++] = '/';
+	pattern[len++] = '*';
+	pattern[len] = 0;
+
+	/* open find handle */
+	h = FindFirstFileW(pattern, &fdata);
+	if (h == INVALID_HANDLE_VALUE) {
+		DWORD err = GetLastError();
+		errno = (err == ERROR_DIRECTORY) ? ENOTDIR : err_win_to_posix(err);
+		return NULL;
+	}
+
+	/* initialize DIR structure and copy first dir entry */
+	dir = xmalloc(sizeof(DIR));
+	dir->dd_handle = h;
+	dir->dd_stat = 0;
+	finddata2dirent(&dir->dd_dir, &fdata);
+	return dir;
+}

From 83b612e1581c950429e27a468e98f467cc9f1b46 Mon Sep 17 00:00:00 2001
From: Karsten Blees <blees@dcon.de>
Date: Sun, 8 Sep 2013 14:18:40 +0200
Subject: [PATCH 177/247] mingw: make the dirent implementation pluggable

Emulating the POSIX `dirent` API on Windows via
`FindFirstFile()`/`FindNextFile()` is pretty staightforward, however,
most of the information provided in the `WIN32_FIND_DATA` structure is
thrown away in the process. A more sophisticated implementation may
cache this data, e.g. for later reuse in calls to `lstat()`.

Make the `dirent` implementation pluggable so that it can be switched at
runtime, e.g. based on a config option.

Define a base DIR structure with pointers to `readdir()`/`closedir()`
that match the `opendir()` implementation (similar to vtable pointers in
Object-Oriented Programming). Define `readdir()`/`closedir()` so that
they call the function pointers in the `DIR` structure. This allows to
choose the `opendir()` implementation on a call-by-call basis.

Make the fixed-size `dirent.d_name` buffer a flex array, as `d_name` may
be implementation specific (e.g. a caching implementation may allocate a
`struct dirent` with _just_ the size needed to hold the `d_name` in
question).

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/win32/dirent.c | 30 +++++++++++++++++++-----------
 compat/win32/dirent.h | 28 +++++++++++++++++++++-------
 2 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/compat/win32/dirent.c b/compat/win32/dirent.c
index 2f7d64369f9eda..f17e1595468f44 100644
--- a/compat/win32/dirent.c
+++ b/compat/win32/dirent.c
@@ -1,15 +1,21 @@
 #include "../../git-compat-util.h"
 
-struct DIR {
-	struct dirent dd_dir; /* includes d_type */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
+typedef struct dirent_DIR {
+	struct DIR base_dir;  /* extend base struct DIR */
 	HANDLE dd_handle;     /* FindFirstFile handle */
 	int dd_stat;          /* 0-based index */
-};
+	struct dirent dd_dir; /* includes d_type */
+} dirent_DIR;
+#pragma GCC diagnostic pop
+
+DIR *(*opendir)(const char *dirname) = dirent_opendir;
 
 static inline void finddata2dirent(struct dirent *ent, WIN32_FIND_DATAW *fdata)
 {
-	/* convert UTF-16 name to UTF-8 */
-	xwcstoutf(ent->d_name, fdata->cFileName, sizeof(ent->d_name));
+	/* convert UTF-16 name to UTF-8 (d_name points to dirent_DIR.dd_name) */
+	xwcstoutf(ent->d_name, fdata->cFileName, MAX_PATH * 3);
 
 	/* Set file type, based on WIN32_FIND_DATA */
 	if ((fdata->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)
@@ -21,7 +27,7 @@ static inline void finddata2dirent(struct dirent *ent, WIN32_FIND_DATAW *fdata)
 		ent->d_type = DT_REG;
 }
 
-struct dirent *readdir(DIR *dir)
+static struct dirent *dirent_readdir(dirent_DIR *dir)
 {
 	if (!dir) {
 		errno = EBADF; /* No set_errno for mingw */
@@ -48,7 +54,7 @@ struct dirent *readdir(DIR *dir)
 	return &dir->dd_dir;
 }
 
-int closedir(DIR *dir)
+static int dirent_closedir(dirent_DIR *dir)
 {
 	if (!dir) {
 		errno = EBADF;
@@ -60,13 +66,13 @@ int closedir(DIR *dir)
 	return 0;
 }
 
-DIR *opendir(const char *name)
+DIR *dirent_opendir(const char *name)
 {
 	wchar_t pattern[MAX_PATH + 2]; /* + 2 for '/' '*' */
 	WIN32_FIND_DATAW fdata;
 	HANDLE h;
 	int len;
-	DIR *dir;
+	dirent_DIR *dir;
 
 	/* convert name to UTF-16 and check length < MAX_PATH */
 	if ((len = xutftowcs_path(pattern, name)) < 0)
@@ -87,9 +93,11 @@ DIR *opendir(const char *name)
 	}
 
 	/* initialize DIR structure and copy first dir entry */
-	dir = xmalloc(sizeof(DIR));
+	dir = xmalloc(sizeof(dirent_DIR) + MAX_PATH);
+	dir->base_dir.preaddir = (struct dirent *(*)(DIR *dir)) dirent_readdir;
+	dir->base_dir.pclosedir = (int (*)(DIR *dir)) dirent_closedir;
 	dir->dd_handle = h;
 	dir->dd_stat = 0;
 	finddata2dirent(&dir->dd_dir, &fdata);
-	return dir;
+	return (DIR*) dir;
 }
diff --git a/compat/win32/dirent.h b/compat/win32/dirent.h
index 058207e4bfed62..a58a8075fd70e3 100644
--- a/compat/win32/dirent.h
+++ b/compat/win32/dirent.h
@@ -1,20 +1,34 @@
 #ifndef DIRENT_H
 #define DIRENT_H
 
-typedef struct DIR DIR;
-
 #define DT_UNKNOWN 0
 #define DT_DIR     1
 #define DT_REG     2
 #define DT_LNK     3
 
 struct dirent {
-	unsigned char d_type;      /* file type to prevent lstat after readdir */
-	char d_name[MAX_PATH * 3]; /* file name (* 3 for UTF-8 conversion) */
+	unsigned char d_type; /* file type to prevent lstat after readdir */
+	char d_name[/* FLEX_ARRAY */]; /* file name */
 };
 
-DIR *opendir(const char *dirname);
-struct dirent *readdir(DIR *dir);
-int closedir(DIR *dir);
+/*
+ * Base DIR structure, contains pointers to readdir/closedir implementations so
+ * that opendir may choose a concrete implementation on a call-by-call basis.
+ */
+typedef struct DIR {
+	struct dirent *(*preaddir)(struct DIR *dir);
+	int (*pclosedir)(struct DIR *dir);
+} DIR;
+
+/* default dirent implementation */
+extern DIR *dirent_opendir(const char *dirname);
+
+#define opendir git_opendir
+
+/* current dirent implementation */
+extern DIR *(*opendir)(const char *dirname);
+
+#define readdir(dir) (dir->preaddir(dir))
+#define closedir(dir) (dir->pclosedir(dir))
 
 #endif /* DIRENT_H */

From 46b12081f5ceca1f9606e04aab807f1190aab342 Mon Sep 17 00:00:00 2001
From: Karsten Blees <blees@dcon.de>
Date: Sun, 8 Sep 2013 14:21:30 +0200
Subject: [PATCH 178/247] Win32: make the lstat implementation pluggable

Emulating the POSIX lstat API on Windows via GetFileAttributes[Ex] is quite
slow. Windows operating system APIs seem to be much better at scanning the
status of entire directories than checking single files. A caching
implementation may improve performance by bulk-reading entire directories
or reusing data obtained via opendir / readdir.

Make the lstat implementation pluggable so that it can be switched at
runtime, e.g. based on a config option.

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/mingw-posix.h | 2 +-
 compat/mingw.c       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/compat/mingw-posix.h b/compat/mingw-posix.h
index 96df96f8e49c14..9158f89d89d239 100644
--- a/compat/mingw-posix.h
+++ b/compat/mingw-posix.h
@@ -406,7 +406,7 @@ int mingw_fstat(int fd, struct stat *buf);
 #ifdef lstat
 #undef lstat
 #endif
-#define lstat mingw_lstat
+extern int (*lstat)(const char *file_name, struct stat *buf);
 
 
 int mingw_utime(const char *file_name, const struct utimbuf *times);
diff --git a/compat/mingw.c b/compat/mingw.c
index adf2d0a16d91ba..a610dcf1c4853e 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1378,6 +1378,8 @@ int mingw_lstat(const char *file_name, struct stat *buf)
 	return -1;
 }
 
+int (*lstat)(const char *file_name, struct stat *buf) = mingw_lstat;
+
 static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
 {
 	BY_HANDLE_FILE_INFORMATION fdata;

From 28c57dd35e7bf6a7d2ec10dc631521c3acdc376b Mon Sep 17 00:00:00 2001
From: Karsten Blees <blees@dcon.de>
Date: Sun, 8 Sep 2013 14:23:27 +0200
Subject: [PATCH 179/247] mingw: add infrastructure for read-only file system
 level caches

Add a macro to mark code sections that only read from the file system,
along with a config option and documentation.

This facilitates implementation of relatively simple file system level
caches without the need to synchronize with the file system.

Enable read-only sections for 'git status' and preload_index.

Signed-off-by: Karsten Blees <blees@dcon.de>
---
 Documentation/config/core.adoc |  6 ++++++
 builtin/commit.c               |  1 +
 compat/mingw.c                 |  6 ++++++
 compat/mingw.h                 |  2 ++
 git-compat-util.h              | 15 +++++++++++++++
 preload-index.c                |  3 +++
 6 files changed, 33 insertions(+)

diff --git a/Documentation/config/core.adoc b/Documentation/config/core.adoc
index 3794b4ecd6fc36..858c5961c66a94 100644
--- a/Documentation/config/core.adoc
+++ b/Documentation/config/core.adoc
@@ -729,6 +729,12 @@ relatively high IO latencies.  When enabled, Git will do the
 index comparison to the filesystem data in parallel, allowing
 overlapping IO's.  Defaults to true.
 
+core.fscache::
+	Enable additional caching of file system data for some operations.
++
+Git for Windows uses this to bulk-read and cache lstat data of entire
+directories (instead of doing lstat file by file).
+
 core.unsetenvvars::
 	Windows-only: comma-separated list of environment variables'
 	names that need to be unset before spawning any other process.
diff --git a/builtin/commit.c b/builtin/commit.c
index 840b6b4083b945..666f4a37329036 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1623,6 +1623,7 @@ struct repository *repo UNUSED)
 		       PATHSPEC_PREFER_FULL,
 		       prefix, argv);
 
+	enable_fscache(1);
 	if (status_format != STATUS_FORMAT_PORCELAIN &&
 	    status_format != STATUS_FORMAT_PORCELAIN_V2)
 		progress_flag = REFRESH_PROGRESS;
diff --git a/compat/mingw.c b/compat/mingw.c
index a610dcf1c4853e..76fa68348fcf6d 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -278,6 +278,7 @@ enum hide_dotfiles_type {
 
 static enum hide_dotfiles_type hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
 static char *unset_environment_variables;
+int core_fscache;
 
 int mingw_core_config(const char *var, const char *value,
 		      const struct config_context *ctx UNUSED,
@@ -291,6 +292,11 @@ int mingw_core_config(const char *var, const char *value,
 		return 0;
 	}
 
+	if (!strcmp(var, "core.fscache")) {
+		core_fscache = git_config_bool(var, value);
+		return 0;
+	}
+
 	if (!strcmp(var, "core.unsetenvvars")) {
 		if (!value)
 			return config_error_nonbool(var);
diff --git a/compat/mingw.h b/compat/mingw.h
index c9512194b7fff3..bae25483cf7ce0 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -1,5 +1,7 @@
 #include "mingw-posix.h"
 
+extern int core_fscache;
+
 struct config_context;
 int mingw_core_config(const char *var, const char *value,
 		      const struct config_context *ctx, void *cb);
diff --git a/git-compat-util.h b/git-compat-util.h
index b849cb1b40fdb6..0637c399e52fb8 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1083,6 +1083,21 @@ static inline int is_missing_file_error(int errno_)
 	return (errno_ == ENOENT || errno_ == ENOTDIR);
 }
 
+/*
+ * Enable/disable a read-only cache for file system data on platforms that
+ * support it.
+ *
+ * Implementing a live-cache is complicated and requires special platform
+ * support (inotify, ReadDirectoryChangesW...). enable_fscache shall be used
+ * to mark sections of git code that extensively read from the file system
+ * without modifying anything. Implementations can use this to cache e.g. stat
+ * data or even file content without the need to synchronize with the file
+ * system.
+ */
+#ifndef enable_fscache
+#define enable_fscache(x) /* noop */
+#endif
+
 int cmd_main(int, const char **);
 
 /*
diff --git a/preload-index.c b/preload-index.c
index b222821b448526..61e8f3a1f6ec84 100644
--- a/preload-index.c
+++ b/preload-index.c
@@ -141,6 +141,7 @@ void preload_index(struct index_state *index,
 		pthread_mutex_init(&pd.mutex, NULL);
 	}
 
+	enable_fscache(1);
 	for (i = 0; i < threads; i++) {
 		struct thread_data *p = data+i;
 		int err;
@@ -176,6 +177,8 @@ void preload_index(struct index_state *index,
 
 	trace2_data_intmax("index", NULL, "preload/sum_lstat", t2_sum_lstat);
 	trace2_region_leave("index", "preload", NULL);
+
+	enable_fscache(0);
 }
 
 int repo_read_index_preload(struct repository *repo,

From b1fe55eed3263369170a32b2847621cc26243bc6 Mon Sep 17 00:00:00 2001
From: Karsten Blees <blees@dcon.de>
Date: Tue, 1 Oct 2013 12:51:54 +0200
Subject: [PATCH 180/247] mingw: add a cache below mingw's lstat and dirent
 implementations

Checking the work tree status is quite slow on Windows, due to slow
`lstat()` emulation (git calls `lstat()` once for each file in the
index). Windows operating system APIs seem to be much better at scanning
the status of entire directories than checking single files.

Add an `lstat()` implementation that uses a cache for lstat data. Cache
misses read the entire parent directory and add it to the cache.
Subsequent `lstat()` calls for the same directory are served directly
from the cache.

Also implement `opendir()`/`readdir()`/`closedir()` so that they create
and use directory listings in the cache.

The cache doesn't track file system changes and doesn't plug into any
modifying file APIs, so it has to be explicitly enabled for git functions
that don't modify the working copy.

Note: in an earlier version of this patch, the cache was always active and
tracked file system changes via ReadDirectoryChangesW. However, this was
much more complex and had negative impact on the performance of modifying
git commands such as 'git checkout'.

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/win32/fscache.c              | 487 ++++++++++++++++++++++++++++
 compat/win32/fscache.h              |  10 +
 config.mak.uname                    |   4 +-
 contrib/buildsystems/CMakeLists.txt |   3 +-
 git-compat-util.h                   |   2 +
 meson.build                         |   1 +
 6 files changed, 504 insertions(+), 3 deletions(-)
 create mode 100644 compat/win32/fscache.c
 create mode 100644 compat/win32/fscache.h

diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
new file mode 100644
index 00000000000000..4305514a8bf763
--- /dev/null
+++ b/compat/win32/fscache.c
@@ -0,0 +1,487 @@
+#include "../../git-compat-util.h"
+#include "../../hashmap.h"
+#include "../win32.h"
+#include "fscache.h"
+#include "../../dir.h"
+#include "../../abspath.h"
+
+static int initialized;
+static volatile long enabled;
+static struct hashmap map;
+static CRITICAL_SECTION mutex;
+
+/*
+ * An entry in the file system cache. Used for both entire directory listings
+ * and file entries.
+ */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
+struct fsentry {
+	struct hashmap_entry ent;
+	mode_t st_mode;
+	/* Pointer to the directory listing, or NULL for the listing itself. */
+	struct fsentry *list;
+	/* Pointer to the next file entry of the list. */
+	struct fsentry *next;
+
+	union {
+		/* Reference count of the directory listing. */
+		volatile long refcnt;
+		struct {
+			/* More stat members (only used for file entries). */
+			off64_t st_size;
+			struct timespec st_atim;
+			struct timespec st_mtim;
+			struct timespec st_ctim;
+		} s;
+	} u;
+
+	/* Length of name. */
+	unsigned short len;
+	/*
+	 * Name of the entry. For directory listings: relative path of the
+	 * directory, without trailing '/' (empty for cwd()). For file entries:
+	 * name of the file. Typically points to the end of the structure if
+	 * the fsentry is allocated on the heap (see fsentry_alloc), or to a
+	 * local variable if on the stack (see fsentry_init).
+	 */
+	struct dirent dirent;
+};
+#pragma GCC diagnostic pop
+
+#pragma GCC diagnostic push
+#ifdef __clang__
+#pragma GCC diagnostic ignored "-Wflexible-array-extensions"
+#endif
+struct heap_fsentry {
+	union {
+		struct fsentry ent;
+		char dummy[sizeof(struct fsentry) + MAX_PATH];
+	} u;
+};
+#pragma GCC diagnostic pop
+
+/*
+ * Compares the paths of two fsentry structures for equality.
+ */
+static int fsentry_cmp(void *cmp_data UNUSED,
+		       const struct fsentry *fse1, const struct fsentry *fse2,
+		       void *keydata UNUSED)
+{
+	int res;
+	if (fse1 == fse2)
+		return 0;
+
+	/* compare the list parts first */
+	if (fse1->list != fse2->list &&
+	    (res = fsentry_cmp(NULL, fse1->list ? fse1->list : fse1,
+			       fse2->list ? fse2->list	: fse2, NULL)))
+		return res;
+
+	/* if list parts are equal, compare len and name */
+	if (fse1->len != fse2->len)
+		return fse1->len - fse2->len;
+	return fspathncmp(fse1->dirent.d_name, fse2->dirent.d_name, fse1->len);
+}
+
+/*
+ * Calculates the hash code of an fsentry structure's path.
+ */
+static unsigned int fsentry_hash(const struct fsentry *fse)
+{
+	unsigned int hash = fse->list ? fse->list->ent.hash : 0;
+	return hash ^ memihash(fse->dirent.d_name, fse->len);
+}
+
+/*
+ * Initialize an fsentry structure for use by fsentry_hash and fsentry_cmp.
+ */
+static void fsentry_init(struct fsentry *fse, struct fsentry *list,
+			 const char *name, size_t len)
+{
+	fse->list = list;
+	if (len > MAX_PATH)
+		BUG("Trying to allocate fsentry for long path '%.*s'",
+		    (int)len, name);
+	memcpy(fse->dirent.d_name, name, len);
+	fse->dirent.d_name[len] = 0;
+	fse->len = len;
+	hashmap_entry_init(&fse->ent, fsentry_hash(fse));
+}
+
+/*
+ * Allocate an fsentry structure on the heap.
+ */
+static struct fsentry *fsentry_alloc(struct fsentry *list, const char *name,
+		size_t len)
+{
+	/* overallocate fsentry and copy the name to the end */
+	struct fsentry *fse = xmalloc(sizeof(struct fsentry) + len + 1);
+	/* init the rest of the structure */
+	fsentry_init(fse, list, name, len);
+	fse->next = NULL;
+	fse->u.refcnt = 1;
+	return fse;
+}
+
+/*
+ * Add a reference to an fsentry.
+ */
+inline static void fsentry_addref(struct fsentry *fse)
+{
+	if (fse->list)
+		fse = fse->list;
+
+	InterlockedIncrement(&(fse->u.refcnt));
+}
+
+/*
+ * Release the reference to an fsentry, frees the memory if its the last ref.
+ */
+static void fsentry_release(struct fsentry *fse)
+{
+	if (fse->list)
+		fse = fse->list;
+
+	if (InterlockedDecrement(&(fse->u.refcnt)))
+		return;
+
+	while (fse) {
+		struct fsentry *next = fse->next;
+		free(fse);
+		fse = next;
+	}
+}
+
+/*
+ * Allocate and initialize an fsentry from a WIN32_FIND_DATA structure.
+ */
+static struct fsentry *fseentry_create_entry(struct fsentry *list,
+					     const WIN32_FIND_DATAW *fdata)
+{
+	char buf[MAX_PATH * 3];
+	int len;
+	struct fsentry *fse;
+	len = xwcstoutf(buf, fdata->cFileName, ARRAY_SIZE(buf));
+
+	fse = fsentry_alloc(list, buf, len);
+
+	fse->st_mode = file_attr_to_st_mode(fdata->dwFileAttributes,
+					    IO_REPARSE_TAG_SYMLINK);
+	fse->dirent.d_type = S_ISREG(fse->st_mode) ? DT_REG :
+			S_ISDIR(fse->st_mode) ? DT_DIR : DT_LNK;
+	fse->u.s.st_size = (((off64_t) (fdata->nFileSizeHigh)) << 32)
+			| fdata->nFileSizeLow;
+	filetime_to_timespec(&(fdata->ftLastAccessTime), &(fse->u.s.st_atim));
+	filetime_to_timespec(&(fdata->ftLastWriteTime), &(fse->u.s.st_mtim));
+	filetime_to_timespec(&(fdata->ftCreationTime), &(fse->u.s.st_ctim));
+
+	return fse;
+}
+
+/*
+ * Create an fsentry-based directory listing (similar to opendir / readdir).
+ * Dir should not contain trailing '/'. Use an empty string for the current
+ * directory (not "."!).
+ */
+static struct fsentry *fsentry_create_list(const struct fsentry *dir)
+{
+	wchar_t pattern[MAX_PATH + 2]; /* + 2 for '/' '*' */
+	WIN32_FIND_DATAW fdata;
+	HANDLE h;
+	int wlen;
+	struct fsentry *list, **phead;
+	DWORD err;
+
+	/* convert name to UTF-16 and check length < MAX_PATH */
+	if ((wlen = xutftowcsn(pattern, dir->dirent.d_name, MAX_PATH,
+			       dir->len)) < 0) {
+		if (errno == ERANGE)
+			errno = ENAMETOOLONG;
+		return NULL;
+	}
+
+	/* append optional '/' and wildcard '*' */
+	if (wlen)
+		pattern[wlen++] = '/';
+	pattern[wlen++] = '*';
+	pattern[wlen] = 0;
+
+	/* open find handle */
+	h = FindFirstFileW(pattern, &fdata);
+	if (h == INVALID_HANDLE_VALUE) {
+		err = GetLastError();
+		errno = (err == ERROR_DIRECTORY) ? ENOTDIR : err_win_to_posix(err);
+		return NULL;
+	}
+
+	/* allocate object to hold directory listing */
+	list = fsentry_alloc(NULL, dir->dirent.d_name, dir->len);
+
+	/* walk directory and build linked list of fsentry structures */
+	phead = &list->next;
+	do {
+		*phead = fseentry_create_entry(list, &fdata);
+		phead = &(*phead)->next;
+	} while (FindNextFileW(h, &fdata));
+
+	/* remember result of last FindNextFile, then close find handle */
+	err = GetLastError();
+	FindClose(h);
+
+	/* return the list if we've got all the files */
+	if (err == ERROR_NO_MORE_FILES)
+		return list;
+
+	/* otherwise free the list and return error */
+	fsentry_release(list);
+	errno = err_win_to_posix(err);
+	return NULL;
+}
+
+/*
+ * Adds a directory listing to the cache.
+ */
+static void fscache_add(struct fsentry *fse)
+{
+	if (fse->list)
+		fse = fse->list;
+
+	for (; fse; fse = fse->next)
+		hashmap_add(&map, &fse->ent);
+}
+
+/*
+ * Clears the cache.
+ */
+static void fscache_clear(void)
+{
+	hashmap_clear_and_free(&map, struct fsentry, ent);
+	hashmap_init(&map, (hashmap_cmp_fn)fsentry_cmp, NULL, 0);
+}
+
+/*
+ * Checks if the cache is enabled for the given path.
+ */
+static inline int fscache_enabled(const char *path)
+{
+	return enabled > 0 && !is_absolute_path(path);
+}
+
+/*
+ * Looks up or creates a cache entry for the specified key.
+ */
+static struct fsentry *fscache_get(struct fsentry *key)
+{
+	struct fsentry *fse;
+
+	EnterCriticalSection(&mutex);
+	/* check if entry is in cache */
+	fse = hashmap_get_entry(&map, key, ent, NULL);
+	if (fse) {
+		fsentry_addref(fse);
+		LeaveCriticalSection(&mutex);
+		return fse;
+	}
+	/* if looking for a file, check if directory listing is in cache */
+	if (!fse && key->list) {
+		fse = hashmap_get_entry(&map, key->list, ent, NULL);
+		if (fse) {
+			LeaveCriticalSection(&mutex);
+			/* dir entry without file entry -> file doesn't exist */
+			errno = ENOENT;
+			return NULL;
+		}
+	}
+
+	/* create the directory listing (outside mutex!) */
+	LeaveCriticalSection(&mutex);
+	fse = fsentry_create_list(key->list ? key->list : key);
+	if (!fse)
+		return NULL;
+
+	EnterCriticalSection(&mutex);
+	/* add directory listing if it hasn't been added by some other thread */
+	if (!hashmap_get_entry(&map, key, ent, NULL))
+		fscache_add(fse);
+
+	/* lookup file entry if requested (fse already points to directory) */
+	if (key->list)
+		fse = hashmap_get_entry(&map, key, ent, NULL);
+
+	/* return entry or ENOENT */
+	if (fse)
+		fsentry_addref(fse);
+	else
+		errno = ENOENT;
+
+	LeaveCriticalSection(&mutex);
+	return fse;
+}
+
+/*
+ * Enables or disables the cache. Note that the cache is read-only, changes to
+ * the working directory are NOT reflected in the cache while enabled.
+ */
+int fscache_enable(int enable)
+{
+	int result;
+
+	if (!initialized) {
+		/* allow the cache to be disabled entirely */
+		if (!core_fscache)
+			return 0;
+
+		InitializeCriticalSection(&mutex);
+		hashmap_init(&map, (hashmap_cmp_fn) fsentry_cmp, NULL, 0);
+		initialized = 1;
+	}
+
+	result = enable ? InterlockedIncrement(&enabled)
+			: InterlockedDecrement(&enabled);
+
+	if (enable && result == 1) {
+		/* redirect opendir and lstat to the fscache implementations */
+		opendir = fscache_opendir;
+		lstat = fscache_lstat;
+	} else if (!enable && !result) {
+		/* reset opendir and lstat to the original implementations */
+		opendir = dirent_opendir;
+		lstat = mingw_lstat;
+		EnterCriticalSection(&mutex);
+		fscache_clear();
+		LeaveCriticalSection(&mutex);
+	}
+	return result;
+}
+
+/*
+ * Lstat replacement, uses the cache if enabled, otherwise redirects to
+ * mingw_lstat.
+ */
+int fscache_lstat(const char *filename, struct stat *st)
+{
+	int dirlen, base, len;
+#pragma GCC diagnostic push
+#ifdef __clang__
+#pragma GCC diagnostic ignored "-Wflexible-array-extensions"
+#endif
+	struct heap_fsentry key[2];
+#pragma GCC diagnostic pop
+	struct fsentry *fse;
+
+	if (!fscache_enabled(filename))
+		return mingw_lstat(filename, st);
+
+	/* split filename into path + name */
+	len = strlen(filename);
+	if (len && is_dir_sep(filename[len - 1]))
+		len--;
+	base = len;
+	while (base && !is_dir_sep(filename[base - 1]))
+		base--;
+	dirlen = base ? base - 1 : 0;
+
+	/* lookup entry for path + name in cache */
+	fsentry_init(&key[0].u.ent, NULL, filename, dirlen);
+	fsentry_init(&key[1].u.ent, &key[0].u.ent, filename + base, len - base);
+	fse = fscache_get(&key[1].u.ent);
+	if (!fse) {
+		errno = ENOENT;
+		return -1;
+	}
+
+	/*
+	 * Special case symbolic links: FindFirstFile()/FindNextFile() did not
+	 * provide us with the length of the target path.
+	 */
+	if (fse->u.s.st_size == MAX_PATH && S_ISLNK(fse->st_mode)) {
+		char buf[MAX_PATH];
+		int len = readlink(filename, buf, sizeof(buf) - 1);
+
+		if (len > 0)
+			fse->u.s.st_size = len;
+	}
+
+	/* copy stat data */
+	st->st_ino = 0;
+	st->st_gid = 0;
+	st->st_uid = 0;
+	st->st_dev = 0;
+	st->st_rdev = 0;
+	st->st_nlink = 1;
+	st->st_mode = fse->st_mode;
+	st->st_size = fse->u.s.st_size;
+	st->st_atim = fse->u.s.st_atim;
+	st->st_mtim = fse->u.s.st_mtim;
+	st->st_ctim = fse->u.s.st_ctim;
+
+	/* don't forget to release fsentry */
+	fsentry_release(fse);
+	return 0;
+}
+
+typedef struct fscache_DIR {
+	struct DIR base_dir; /* extend base struct DIR */
+	struct fsentry *pfsentry;
+	struct dirent *dirent;
+} fscache_DIR;
+
+/*
+ * Readdir replacement.
+ */
+static struct dirent *fscache_readdir(DIR *base_dir)
+{
+	fscache_DIR *dir = (fscache_DIR*) base_dir;
+	struct fsentry *next = dir->pfsentry->next;
+	if (!next)
+		return NULL;
+	dir->pfsentry = next;
+	dir->dirent = &next->dirent;
+	return dir->dirent;
+}
+
+/*
+ * Closedir replacement.
+ */
+static int fscache_closedir(DIR *base_dir)
+{
+	fscache_DIR *dir = (fscache_DIR*) base_dir;
+	fsentry_release(dir->pfsentry);
+	free(dir);
+	return 0;
+}
+
+/*
+ * Opendir replacement, uses a directory listing from the cache if enabled,
+ * otherwise calls original dirent implementation.
+ */
+DIR *fscache_opendir(const char *dirname)
+{
+	struct heap_fsentry key;
+	struct fsentry *list;
+	fscache_DIR *dir;
+	int len;
+
+	if (!fscache_enabled(dirname))
+		return dirent_opendir(dirname);
+
+	/* prepare name (strip trailing '/', replace '.') */
+	len = strlen(dirname);
+	if ((len == 1 && dirname[0] == '.') ||
+	    (len && is_dir_sep(dirname[len - 1])))
+		len--;
+
+	/* get directory listing from cache */
+	fsentry_init(&key.u.ent, NULL, dirname, len);
+	list = fscache_get(&key.u.ent);
+	if (!list)
+		return NULL;
+
+	/* alloc and return DIR structure */
+	dir = (fscache_DIR*) xmalloc(sizeof(fscache_DIR));
+	dir->base_dir.preaddir = fscache_readdir;
+	dir->base_dir.pclosedir = fscache_closedir;
+	dir->pfsentry = list;
+	return (DIR*) dir;
+}
diff --git a/compat/win32/fscache.h b/compat/win32/fscache.h
new file mode 100644
index 00000000000000..ed518b422d705e
--- /dev/null
+++ b/compat/win32/fscache.h
@@ -0,0 +1,10 @@
+#ifndef FSCACHE_H
+#define FSCACHE_H
+
+int fscache_enable(int enable);
+#define enable_fscache(x) fscache_enable(x)
+
+DIR *fscache_opendir(const char *dir);
+int fscache_lstat(const char *file_name, struct stat *buf);
+
+#endif
diff --git a/config.mak.uname b/config.mak.uname
index f3e5e8b7566e82..ca7ea840e44741 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -535,7 +535,7 @@ endif
 		compat/win32/path-utils.o \
 		compat/win32/pthread.o compat/win32/syslog.o \
 		compat/win32/trace2_win32_process_info.o \
-		compat/win32/dirent.o compat/win32/wsl.o
+		compat/win32/dirent.o compat/win32/fscache.o compat/win32/wsl.o
 	COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DDETECT_MSYS_TTY \
 		-DENSURE_MSYSTEM_IS_SET="\"$(MSYSTEM)\"" -DMINGW_PREFIX="\"$(patsubst /%,%,$(MINGW_PREFIX))\"" \
 		-DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
@@ -741,7 +741,7 @@ ifeq ($(uname_S),MINGW)
 		compat/win32/flush.o \
 		compat/win32/path-utils.o \
 		compat/win32/pthread.o compat/win32/syslog.o \
-		compat/win32/dirent.o compat/win32/wsl.o
+		compat/win32/dirent.o compat/win32/fscache.o compat/win32/wsl.o
 	BASIC_CFLAGS += -DWIN32
 	EXTLIBS += -lws2_32
 	GITLIBS += git.res
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 826b53a07125fc..524b3aad9247d3 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -301,7 +301,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 		compat/win32/trace2_win32_process_info.c
 		compat/win32/dirent.c
 		compat/win32/wsl.c
-		compat/strdup.c)
+		compat/strdup.c
+		compat/win32/fscache.c)
 	set(NO_UNIX_SOCKETS 1)
 
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/git-compat-util.h b/git-compat-util.h
index 0637c399e52fb8..c093e5971805a8 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -158,9 +158,11 @@ static inline int is_xplatform_dir_sep(int c)
 /* pull in Windows compatibility stuff */
 #include "compat/win32/path-utils.h"
 #include "compat/mingw.h"
+#include "compat/win32/fscache.h"
 #elif defined(_MSC_VER)
 #include "compat/win32/path-utils.h"
 #include "compat/msvc.h"
+#include "compat/win32/fscache.h"
 #endif
 
 /* used on Mac OS X */
diff --git a/meson.build b/meson.build
index 0b3f8ecb0e0b78..79b6af6eaf9641 100644
--- a/meson.build
+++ b/meson.build
@@ -1311,6 +1311,7 @@ elif host_machine.system() == 'windows'
     'compat/winansi.c',
     'compat/win32/dirent.c',
     'compat/win32/flush.c',
+    'compat/win32/fscache.c',
     'compat/win32/path-utils.c',
     'compat/win32/pthread.c',
     'compat/win32/syslog.c',

From 33adcb5e7f649b1d224087168679bbe7de9134ab Mon Sep 17 00:00:00 2001
From: Karsten Blees <blees@dcon.de>
Date: Tue, 24 Jun 2014 13:22:35 +0200
Subject: [PATCH 181/247] fscache: load directories only once

If multiple threads access a directory that is not yet in the cache, the
directory will be loaded by each thread. Only one of the results is added
to the cache, all others are leaked. This wastes performance and memory.

On cache miss, add a future object to the cache to indicate that the
directory is currently being loaded. Subsequent threads register themselves
with the future object and wait. When the first thread has loaded the
directory, it replaces the future object with the result and notifies
waiting threads.

Signed-off-by: Karsten Blees <blees@dcon.de>
---
 compat/win32/fscache.c | 65 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 56 insertions(+), 9 deletions(-)

diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
index 4305514a8bf763..b87e19f287f566 100644
--- a/compat/win32/fscache.c
+++ b/compat/win32/fscache.c
@@ -27,6 +27,8 @@ struct fsentry {
 	union {
 		/* Reference count of the directory listing. */
 		volatile long refcnt;
+		/* Handle to wait on the loading thread. */
+		HANDLE hwait;
 		struct {
 			/* More stat members (only used for file entries). */
 			off64_t st_size;
@@ -268,16 +270,43 @@ static inline int fscache_enabled(const char *path)
 	return enabled > 0 && !is_absolute_path(path);
 }
 
+/*
+ * Looks up a cache entry, waits if its being loaded by another thread.
+ * The mutex must be owned by the calling thread.
+ */
+static struct fsentry *fscache_get_wait(struct fsentry *key)
+{
+	struct fsentry *fse = hashmap_get_entry(&map, key, ent, NULL);
+
+	/* return if its a 'real' entry (future entries have refcnt == 0) */
+	if (!fse || fse->list || fse->u.refcnt)
+		return fse;
+
+	/* create an event and link our key to the future entry */
+	key->u.hwait = CreateEvent(NULL, TRUE, FALSE, NULL);
+	key->next = fse->next;
+	fse->next = key;
+
+	/* wait for the loading thread to signal us */
+	LeaveCriticalSection(&mutex);
+	WaitForSingleObject(key->u.hwait, INFINITE);
+	CloseHandle(key->u.hwait);
+	EnterCriticalSection(&mutex);
+
+	/* repeat cache lookup */
+	return hashmap_get_entry(&map, key, ent, NULL);
+}
+
 /*
  * Looks up or creates a cache entry for the specified key.
  */
 static struct fsentry *fscache_get(struct fsentry *key)
 {
-	struct fsentry *fse;
+	struct fsentry *fse, *future, *waiter;
 
 	EnterCriticalSection(&mutex);
 	/* check if entry is in cache */
-	fse = hashmap_get_entry(&map, key, ent, NULL);
+	fse = fscache_get_wait(key);
 	if (fse) {
 		fsentry_addref(fse);
 		LeaveCriticalSection(&mutex);
@@ -285,7 +314,7 @@ static struct fsentry *fscache_get(struct fsentry *key)
 	}
 	/* if looking for a file, check if directory listing is in cache */
 	if (!fse && key->list) {
-		fse = hashmap_get_entry(&map, key->list, ent, NULL);
+		fse = fscache_get_wait(key->list);
 		if (fse) {
 			LeaveCriticalSection(&mutex);
 			/* dir entry without file entry -> file doesn't exist */
@@ -294,16 +323,34 @@ static struct fsentry *fscache_get(struct fsentry *key)
 		}
 	}
 
+	/* add future entry to indicate that we're loading it */
+	future = key->list ? key->list : key;
+	future->next = NULL;
+	future->u.refcnt = 0;
+	hashmap_add(&map, &future->ent);
+
 	/* create the directory listing (outside mutex!) */
 	LeaveCriticalSection(&mutex);
-	fse = fsentry_create_list(key->list ? key->list : key);
-	if (!fse)
+	fse = fsentry_create_list(future);
+	EnterCriticalSection(&mutex);
+
+	/* remove future entry and signal waiting threads */
+	hashmap_remove(&map, &future->ent, NULL);
+	waiter = future->next;
+	while (waiter) {
+		HANDLE h = waiter->u.hwait;
+		waiter = waiter->next;
+		SetEvent(h);
+	}
+
+	/* leave on error (errno set by fsentry_create_list) */
+	if (!fse) {
+		LeaveCriticalSection(&mutex);
 		return NULL;
+	}
 
-	EnterCriticalSection(&mutex);
-	/* add directory listing if it hasn't been added by some other thread */
-	if (!hashmap_get_entry(&map, key, ent, NULL))
-		fscache_add(fse);
+	/* add directory listing to the cache */
+	fscache_add(fse);
 
 	/* lookup file entry if requested (fse already points to directory) */
 	if (key->list)

From 3ab6e323294169ccfbb83551c247396fe0e64d2c Mon Sep 17 00:00:00 2001
From: Jeff Hostetler <jeffhost@microsoft.com>
Date: Tue, 24 Jan 2017 15:12:13 -0500
Subject: [PATCH 182/247] fscache: add key for GIT_TRACE_FSCACHE

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/win32/fscache.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
index b87e19f287f566..a4095c17c9417a 100644
--- a/compat/win32/fscache.c
+++ b/compat/win32/fscache.c
@@ -4,11 +4,13 @@
 #include "fscache.h"
 #include "../../dir.h"
 #include "../../abspath.h"
+#include "../../trace.h"
 
 static int initialized;
 static volatile long enabled;
 static struct hashmap map;
 static CRITICAL_SECTION mutex;
+static struct trace_key trace_fscache = TRACE_KEY_INIT(FSCACHE);
 
 /*
  * An entry in the file system cache. Used for both entire directory listings
@@ -214,6 +216,8 @@ static struct fsentry *fsentry_create_list(const struct fsentry *dir)
 	if (h == INVALID_HANDLE_VALUE) {
 		err = GetLastError();
 		errno = (err == ERROR_DIRECTORY) ? ENOTDIR : err_win_to_posix(err);
+		trace_printf_key(&trace_fscache, "fscache: error(%d) '%s'\n",
+						 errno, dir->dirent.d_name);
 		return NULL;
 	}
 
@@ -399,6 +403,7 @@ int fscache_enable(int enable)
 		fscache_clear();
 		LeaveCriticalSection(&mutex);
 	}
+	trace_printf_key(&trace_fscache, "fscache: enable(%d)\n", enable);
 	return result;
 }
 

From 6083c94c0d02b0b5d246cded2422cf0077007a32 Mon Sep 17 00:00:00 2001
From: Jeff Hostetler <jeffhost@microsoft.com>
Date: Tue, 13 Dec 2016 14:05:32 -0500
Subject: [PATCH 183/247] fscache: remember not-found directories

Teach FSCACHE to remember "not found" directories.

This is a performance optimization.

FSCACHE is a performance optimization available for Windows.  It
intercepts Posix-style lstat() calls into an in-memory directory
using FindFirst/FindNext.  It improves performance on Windows by
catching the first lstat() call in a directory, using FindFirst/
FindNext to read the list of files (and attribute data) for the
entire directory into the cache, and short-cut subsequent lstat()
calls in the same directory.  This gives a major performance
boost on Windows.

However, it does not remember "not found" directories.  When STATUS
runs and there are missing directories, the lstat() interception
fails to find the parent directory and simply return ENOENT for the
file -- it does not remember that the FindFirst on the directory
failed. Thus subsequent lstat() calls in the same directory, each
re-attempt the FindFirst.  This completely defeats any performance
gains.

This can be seen by doing a sparse-checkout on a large repo and
then doing a read-tree to reset the skip-worktree bits and then
running status.

This change reduced status times for my very large repo by 60%.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/win32/fscache.c | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
index a4095c17c9417a..f16a6fb07e360d 100644
--- a/compat/win32/fscache.c
+++ b/compat/win32/fscache.c
@@ -188,7 +188,8 @@ static struct fsentry *fseentry_create_entry(struct fsentry *list,
  * Dir should not contain trailing '/'. Use an empty string for the current
  * directory (not "."!).
  */
-static struct fsentry *fsentry_create_list(const struct fsentry *dir)
+static struct fsentry *fsentry_create_list(const struct fsentry *dir,
+					   int *dir_not_found)
 {
 	wchar_t pattern[MAX_PATH + 2]; /* + 2 for '/' '*' */
 	WIN32_FIND_DATAW fdata;
@@ -197,6 +198,8 @@ static struct fsentry *fsentry_create_list(const struct fsentry *dir)
 	struct fsentry *list, **phead;
 	DWORD err;
 
+	*dir_not_found = 0;
+
 	/* convert name to UTF-16 and check length < MAX_PATH */
 	if ((wlen = xutftowcsn(pattern, dir->dirent.d_name, MAX_PATH,
 			       dir->len)) < 0) {
@@ -215,6 +218,7 @@ static struct fsentry *fsentry_create_list(const struct fsentry *dir)
 	h = FindFirstFileW(pattern, &fdata);
 	if (h == INVALID_HANDLE_VALUE) {
 		err = GetLastError();
+		*dir_not_found = 1; /* or empty directory */
 		errno = (err == ERROR_DIRECTORY) ? ENOTDIR : err_win_to_posix(err);
 		trace_printf_key(&trace_fscache, "fscache: error(%d) '%s'\n",
 						 errno, dir->dirent.d_name);
@@ -223,6 +227,8 @@ static struct fsentry *fsentry_create_list(const struct fsentry *dir)
 
 	/* allocate object to hold directory listing */
 	list = fsentry_alloc(NULL, dir->dirent.d_name, dir->len);
+	list->st_mode = S_IFDIR;
+	list->dirent.d_type = DT_DIR;
 
 	/* walk directory and build linked list of fsentry structures */
 	phead = &list->next;
@@ -307,12 +313,16 @@ static struct fsentry *fscache_get_wait(struct fsentry *key)
 static struct fsentry *fscache_get(struct fsentry *key)
 {
 	struct fsentry *fse, *future, *waiter;
+	int dir_not_found;
 
 	EnterCriticalSection(&mutex);
 	/* check if entry is in cache */
 	fse = fscache_get_wait(key);
 	if (fse) {
-		fsentry_addref(fse);
+		if (fse->st_mode)
+			fsentry_addref(fse);
+		else
+			fse = NULL; /* non-existing directory */
 		LeaveCriticalSection(&mutex);
 		return fse;
 	}
@@ -321,7 +331,10 @@ static struct fsentry *fscache_get(struct fsentry *key)
 		fse = fscache_get_wait(key->list);
 		if (fse) {
 			LeaveCriticalSection(&mutex);
-			/* dir entry without file entry -> file doesn't exist */
+			/*
+			 * dir entry without file entry, or dir does not
+			 * exist -> file doesn't exist
+			 */
 			errno = ENOENT;
 			return NULL;
 		}
@@ -335,7 +348,7 @@ static struct fsentry *fscache_get(struct fsentry *key)
 
 	/* create the directory listing (outside mutex!) */
 	LeaveCriticalSection(&mutex);
-	fse = fsentry_create_list(future);
+	fse = fsentry_create_list(future, &dir_not_found);
 	EnterCriticalSection(&mutex);
 
 	/* remove future entry and signal waiting threads */
@@ -349,6 +362,18 @@ static struct fsentry *fscache_get(struct fsentry *key)
 
 	/* leave on error (errno set by fsentry_create_list) */
 	if (!fse) {
+		if (dir_not_found && key->list) {
+			/*
+			 * Record that the directory does not exist (or is
+			 * empty, which for all practical matters is the same
+			 * thing as far as fscache is concerned).
+			 */
+			fse = fsentry_alloc(key->list->list,
+					    key->list->dirent.d_name,
+					    key->list->len);
+			fse->st_mode = 0;
+			hashmap_add(&map, &fse->ent);
+		}
 		LeaveCriticalSection(&mutex);
 		return NULL;
 	}
@@ -360,6 +385,9 @@ static struct fsentry *fscache_get(struct fsentry *key)
 	if (key->list)
 		fse = hashmap_get_entry(&map, key, ent, NULL);
 
+	if (fse && !fse->st_mode)
+		fse = NULL; /* non-existing directory */
+
 	/* return entry or ENOENT */
 	if (fse)
 		fsentry_addref(fse);

From b7a805c470202d138f59433901358e22a85445d3 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 20 Sep 2017 21:52:28 +0200
Subject: [PATCH 184/247] git-gui--askyesno: fix funny text wrapping

The text wrapping seems to be aligned to the right side of the Yes
button, leaving an awful lot of empty space.

Let's try to counter this by using pixel units.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 git-gui/git-gui--askyesno.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-gui/git-gui--askyesno.sh b/git-gui/git-gui--askyesno.sh
index 142d1bc3de229b..837281fe337b6f 100755
--- a/git-gui/git-gui--askyesno.sh
+++ b/git-gui/git-gui--askyesno.sh
@@ -29,8 +29,8 @@ if {$argc < 1} {
 }
 
 ${NS}::frame .t
-${NS}::label .t.m -text $prompt -justify center -width 40
-.t.m configure -wraplength 400
+${NS}::label .t.m -text $prompt -justify center -width 400px
+.t.m configure -wraplength 400px
 pack .t.m -side top -fill x -padx 20 -pady 20 -expand 1
 pack .t -side top -fill x -ipadx 20 -ipady 20 -expand 1
 

From ac3c7775caee3c9be70ad0c8174ead27599dc7cf Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 25 Jan 2017 18:39:16 +0100
Subject: [PATCH 185/247] fscache: add a test for the dir-not-found
 optimization

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t1090-sparse-checkout-scope.sh | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/t/t1090-sparse-checkout-scope.sh b/t/t1090-sparse-checkout-scope.sh
index 3a14218b245d4c..529844e2862c74 100755
--- a/t/t1090-sparse-checkout-scope.sh
+++ b/t/t1090-sparse-checkout-scope.sh
@@ -106,4 +106,24 @@ test_expect_success 'in partial clone, sparse checkout only fetches needed blobs
 	test_cmp expect actual
 '
 
+test_expect_success MINGW 'no unnecessary opendir() with fscache' '
+	git clone . fscache-test &&
+	(
+		cd fscache-test &&
+		git config core.fscache 1 &&
+		echo "/excluded/*" >.git/info/sparse-checkout &&
+		for f in $(test_seq 10)
+		do
+			sha1=$(echo $f | git hash-object -w --stdin) &&
+			git update-index --add \
+				--cacheinfo 100644,$sha1,excluded/$f || exit 1
+		done &&
+		test_tick &&
+		git commit -m excluded &&
+		GIT_TRACE_FSCACHE=1 git status >out 2>err &&
+		grep excluded err >grep.out &&
+		test_line_count = 1 grep.out
+	)
+'
+
 test_done

From a85e947e797e6db4183e5358926fd87ef3aa3f89 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 20 Sep 2017 21:55:45 +0200
Subject: [PATCH 186/247] git-gui--askyesno (mingw): use Git for Windows' icon,
 if available

For additional GUI goodness.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 git-gui/git-gui--askyesno.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/git-gui/git-gui--askyesno.sh b/git-gui/git-gui--askyesno.sh
index 837281fe337b6f..e431f86a8e16ae 100755
--- a/git-gui/git-gui--askyesno.sh
+++ b/git-gui/git-gui--askyesno.sh
@@ -59,5 +59,17 @@ if {$::tcl_platform(platform) eq {windows}} {
 	}
 }
 
+if {$::tcl_platform(platform) eq {windows}} {
+	set icopath [file dirname [file normalize $argv0]]
+	if {[file tail $icopath] eq {git-core}} {
+		set icopath [file dirname $icopath]
+	}
+	set icopath [file dirname $icopath]
+	set icopath [file join $icopath share git git-for-windows.ico]
+	if {[file exists $icopath]} {
+		wm iconbitmap . -default $icopath
+	}
+}
+
 wm title . $title
 tk::PlaceWindow .

From 7150ee06eb440d34ec814122657e33cff9dcf2af Mon Sep 17 00:00:00 2001
From: Jeff Hostetler <jeffhost@microsoft.com>
Date: Tue, 22 Nov 2016 11:26:38 -0500
Subject: [PATCH 187/247] add: use preload-index and fscache for performance

Teach "add" to use preload-index and fscache features
to improve performance on very large repositories.

During an "add", a call is made to run_diff_files()
which calls check_remove() for each index-entry.  This
calls lstat().  On Windows, the fscache code intercepts
the lstat() calls and builds a private cache using the
FindFirst/FindNext routines, which are much faster.

Somewhat independent of this, is the preload-index code
which distributes some of the start-up costs across
multiple threads.

We need to keep the call to read_cache() before parsing the
pathspecs (and hence cannot use the pathspecs to limit any preload)
because parse_pathspec() is using the index to determine whether a
pathspec is, in fact, in a submodule. If we would not read the index
first, parse_pathspec() would not error out on a path that is inside
a submodule, and t7400-submodule-basic.sh would fail with

	not ok 47 - do not add files from a submodule

We still want the nice preload performance boost, though, so we simply
call read_cache_preload(&pathspecs) after parsing the pathspecs.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/add.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/builtin/add.c b/builtin/add.c
index f565d4d0bc46d2..9798e968711706 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -575,12 +575,16 @@ int cmd_add(int argc,
 		 (!(addremove || take_worktree_changes)
 		  ? ADD_CACHE_IGNORE_REMOVAL : 0));
 
+	enable_fscache(1);
 	if (repo_read_index_preload(repo, &pathspec, 0) < 0)
 		die(_("index file corrupt"));
 
 	die_in_unpopulated_submodule(repo->index, prefix);
 	die_path_inside_submodule(repo->index, &pathspec);
 
+	/* We do not really re-read the index but update the up-to-date flags */
+	preload_index(repo->index, &pathspec, 0);
+
 	if (add_new_files) {
 		int baselen;
 
@@ -695,5 +699,6 @@ int cmd_add(int argc,
 	free(ps_matched);
 	dir_clear(&dir);
 	clear_pathspec(&pathspec);
+	enable_fscache(0);
 	return exit_status;
 }

From 08bf12b642af1e1f3feb734cf12e173ebb87d464 Mon Sep 17 00:00:00 2001
From: Jeff Hostetler <jeffhost@microsoft.com>
Date: Wed, 1 Nov 2017 15:05:44 -0400
Subject: [PATCH 188/247] dir.c: make add_excludes aware of fscache during
 status

Teach read_directory_recursive() and add_excludes() to
be aware of optional fscache and avoid trying to open()
and fstat() non-existant ".gitignore" files in every
directory in the worktree.

The current code in add_excludes() calls open() and then
fstat() for a ".gitignore" file in each directory present
in the worktree.  Change that when fscache is enabled to
call lstat() first and if present, call open().

This seems backwards because both lstat needs to do more
work than fstat.  But when fscache is enabled, fscache will
already know if the .gitignore file exists and can completely
avoid the IO calls.  This works because of the lstat diversion
to mingw_lstat when fscache is enabled.

This reduced status times on a 350K file enlistment of the
Windows repo on a NVMe SSD by 0.25 seconds.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
---
 compat/win32/fscache.c |  5 +++++
 compat/win32/fscache.h |  3 +++
 dir.c                  | 39 ++++++++++++++++++++++++++++++---------
 git-compat-util.h      |  4 ++++
 4 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
index f16a6fb07e360d..7d7699d3322471 100644
--- a/compat/win32/fscache.c
+++ b/compat/win32/fscache.c
@@ -12,6 +12,11 @@ static struct hashmap map;
 static CRITICAL_SECTION mutex;
 static struct trace_key trace_fscache = TRACE_KEY_INIT(FSCACHE);
 
+int fscache_is_enabled(void)
+{
+	return enabled;
+}
+
 /*
  * An entry in the file system cache. Used for both entire directory listings
  * and file entries.
diff --git a/compat/win32/fscache.h b/compat/win32/fscache.h
index ed518b422d705e..9a21fd5709c5bc 100644
--- a/compat/win32/fscache.h
+++ b/compat/win32/fscache.h
@@ -4,6 +4,9 @@
 int fscache_enable(int enable);
 #define enable_fscache(x) fscache_enable(x)
 
+int fscache_is_enabled(void);
+#define is_fscache_enabled() (fscache_is_enabled())
+
 DIR *fscache_opendir(const char *dir);
 int fscache_lstat(const char *file_name, struct stat *buf);
 
diff --git a/dir.c b/dir.c
index 5528b2b74c37d7..40bae3ed6ae3f3 100644
--- a/dir.c
+++ b/dir.c
@@ -1161,16 +1161,37 @@ static int add_patterns(const char *fname, const char *base, int baselen,
 	size_t size = 0;
 	char *buf;
 
-	if (flags & PATTERN_NOFOLLOW)
-		fd = open_nofollow(fname, O_RDONLY);
-	else
-		fd = open(fname, O_RDONLY);
-
-	if (fd < 0 || fstat(fd, &st) < 0) {
-		if (fd < 0)
-			warn_on_fopen_errors(fname);
+	/*
+	 * Since `clang`'s `-Wunreachable-code` mode is clever, it would figure
+	 * out that on non-Windows platforms, this `lstat()` is unreachable.
+	 * We do want to keep the conditional block for the sake of Windows,
+	 * though, so let's use the `NOT_CONSTANT()` trick to suppress that error.
+	 */
+	if (NOT_CONSTANT(is_fscache_enabled())) {
+		if (lstat(fname, &st) < 0) {
+			fd = -1;
+		} else {
+			fd = open(fname, O_RDONLY);
+			if (fd < 0)
+				warn_on_fopen_errors(fname);
+		}
+	} else {
+		if (flags & PATTERN_NOFOLLOW)
+			fd = open_nofollow(fname, O_RDONLY);
 		else
-			close(fd);
+			fd = open(fname, O_RDONLY);
+
+		if (fd < 0 || fstat(fd, &st) < 0) {
+			if (fd < 0)
+				warn_on_fopen_errors(fname);
+			else {
+				close(fd);
+				fd = -1;
+			}
+		}
+	}
+
+	if (fd < 0) {
 		if (!istate)
 			return -1;
 		r = read_skip_worktree_file_from_index(istate, fname,
diff --git a/git-compat-util.h b/git-compat-util.h
index c093e5971805a8..2f3fa81e3dd1bb 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1100,6 +1100,10 @@ static inline int is_missing_file_error(int errno_)
 #define enable_fscache(x) /* noop */
 #endif
 
+#ifndef is_fscache_enabled
+#define is_fscache_enabled() (0)
+#endif
+
 int cmd_main(int, const char **);
 
 /*

From ab872d7c286d903a16404e24a74c00586adabdd6 Mon Sep 17 00:00:00 2001
From: Jeff Hostetler <jeffhost@microsoft.com>
Date: Wed, 20 Dec 2017 10:43:41 -0500
Subject: [PATCH 189/247] fscache: make fscache_enabled() public

Make fscache_enabled() function public rather than static.
Remove unneeded fscache_is_enabled() function.
Change is_fscache_enabled() macro to call fscache_enabled().

is_fscache_enabled() now takes a pathname so that the answer
is more precise and mean "is fscache enabled for this pathname",
since fscache only stores repo-relative paths and not absolute
paths, we can avoid attempting lookups for absolute paths.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
---
 compat/win32/fscache.c | 7 +------
 compat/win32/fscache.h | 4 ++--
 dir.c                  | 2 +-
 git-compat-util.h      | 2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
index 7d7699d3322471..ef0a2686a66fb9 100644
--- a/compat/win32/fscache.c
+++ b/compat/win32/fscache.c
@@ -12,11 +12,6 @@ static struct hashmap map;
 static CRITICAL_SECTION mutex;
 static struct trace_key trace_fscache = TRACE_KEY_INIT(FSCACHE);
 
-int fscache_is_enabled(void)
-{
-	return enabled;
-}
-
 /*
  * An entry in the file system cache. Used for both entire directory listings
  * and file entries.
@@ -280,7 +275,7 @@ static void fscache_clear(void)
 /*
  * Checks if the cache is enabled for the given path.
  */
-static inline int fscache_enabled(const char *path)
+int fscache_enabled(const char *path)
 {
 	return enabled > 0 && !is_absolute_path(path);
 }
diff --git a/compat/win32/fscache.h b/compat/win32/fscache.h
index 9a21fd5709c5bc..660ada053b4309 100644
--- a/compat/win32/fscache.h
+++ b/compat/win32/fscache.h
@@ -4,8 +4,8 @@
 int fscache_enable(int enable);
 #define enable_fscache(x) fscache_enable(x)
 
-int fscache_is_enabled(void);
-#define is_fscache_enabled() (fscache_is_enabled())
+int fscache_enabled(const char *path);
+#define is_fscache_enabled(path) fscache_enabled(path)
 
 DIR *fscache_opendir(const char *dir);
 int fscache_lstat(const char *file_name, struct stat *buf);
diff --git a/dir.c b/dir.c
index 40bae3ed6ae3f3..d7b109e7e5d761 100644
--- a/dir.c
+++ b/dir.c
@@ -1167,7 +1167,7 @@ static int add_patterns(const char *fname, const char *base, int baselen,
 	 * We do want to keep the conditional block for the sake of Windows,
 	 * though, so let's use the `NOT_CONSTANT()` trick to suppress that error.
 	 */
-	if (NOT_CONSTANT(is_fscache_enabled())) {
+	if (NOT_CONSTANT(is_fscache_enabled(fname))) {
 		if (lstat(fname, &st) < 0) {
 			fd = -1;
 		} else {
diff --git a/git-compat-util.h b/git-compat-util.h
index 2f3fa81e3dd1bb..2aa8e8a731e254 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1101,7 +1101,7 @@ static inline int is_missing_file_error(int errno_)
 #endif
 
 #ifndef is_fscache_enabled
-#define is_fscache_enabled() (0)
+#define is_fscache_enabled(path) (0)
 #endif
 
 int cmd_main(int, const char **);

From 1b91abe9121c2638a62dc83a9eeae13a8cbd83ac Mon Sep 17 00:00:00 2001
From: Jeff Hostetler <jeffhost@microsoft.com>
Date: Wed, 20 Dec 2017 11:19:27 -0500
Subject: [PATCH 190/247] dir.c: regression fix for add_excludes with fscache

Fix regression described in:
https://github.com/git-for-windows/git/issues/1392

which was introduced in:
https://github.com/git-for-windows/git/commit/b2353379bba414e6c00dde913497cc9c827366f2

Problem Symptoms
================
When the user has a .gitignore file that is a symlink, the fscache
optimization introduced above caused the stat-data from the symlink,
rather that of the target file, to be returned.  Later when the ignore
file was read, the buffer length did not match the stat.st_size field
and we called die("cannot use <path> as an exclude file")

Optimization Rationale
======================
The above optimization calls lstat() before open() primarily to ask
fscache if the file exists.  It gets the current stat-data as a side
effect essentially for free (since we already have it in memory).
If the file does not exist, it does not need to call open().  And
since very few directories have .gitignore files, we can greatly
reduce time spent in the filesystem.

Discussion of Fix
=================
The above optimization calls lstat() rather than stat() because the
fscache only intercepts lstat() calls.  Calls to stat() stay directed
to the mingw_stat() completly bypassing fscache.  Furthermore, calls
to mingw_stat() always call {open, fstat, close} so that symlinks are
properly dereferenced, which adds *additional* open/close calls on top
of what the original code in dir.c is doing.

Since the problem only manifests for symlinks, we add code to overwrite
the stat-data when the path is a symlink.  This preserves the effect of
the performance gains provided by the fscache in the normal case.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
---
 dir.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/dir.c b/dir.c
index d7b109e7e5d761..2a171080a87ba5 100644
--- a/dir.c
+++ b/dir.c
@@ -1162,6 +1162,28 @@ static int add_patterns(const char *fname, const char *base, int baselen,
 	char *buf;
 
 	/*
+	 * A performance optimization for status.
+	 *
+	 * During a status scan, git looks in each directory for a .gitignore
+	 * file before scanning the directory.  Since .gitignore files are not
+	 * that common, we can waste a lot of time looking for files that are
+	 * not there.  Fortunately, the fscache already knows if the directory
+	 * contains a .gitignore file, since it has already read the directory
+	 * and it already has the stat-data.
+	 *
+	 * If the fscache is enabled, use the fscache-lstat() interlude to see
+	 * if the file exists (in the fscache hash maps) before trying to open()
+	 * it.
+	 *
+	 * This causes problem when the .gitignore file is a symlink, because
+	 * we call lstat() rather than stat() on the symlnk and the resulting
+	 * stat-data is for the symlink itself rather than the target file.
+	 * We CANNOT use stat() here because the fscache DOES NOT install an
+	 * interlude for stat() and mingw_stat() always calls "open-fstat-close"
+	 * on the file and defeats the purpose of the optimization here.  Since
+	 * symlinks are even more rare than .gitignore files, we force a fstat()
+	 * after our open() to get stat-data for the target file.
+	 *
 	 * Since `clang`'s `-Wunreachable-code` mode is clever, it would figure
 	 * out that on non-Windows platforms, this `lstat()` is unreachable.
 	 * We do want to keep the conditional block for the sake of Windows,
@@ -1174,6 +1196,11 @@ static int add_patterns(const char *fname, const char *base, int baselen,
 			fd = open(fname, O_RDONLY);
 			if (fd < 0)
 				warn_on_fopen_errors(fname);
+			else if (S_ISLNK(st.st_mode) && fstat(fd, &st) < 0) {
+				warn_on_fopen_errors(fname);
+				close(fd);
+				fd = -1;
+			}
 		}
 	} else {
 		if (flags & PATTERN_NOFOLLOW)

From fba1a2c6233191a41f613ee1282c3c996c98dba4 Mon Sep 17 00:00:00 2001
From: Takuto Ikuta <tikuta@chromium.org>
Date: Wed, 22 Nov 2017 20:39:38 +0900
Subject: [PATCH 191/247] fetch-pack.c: enable fscache for stats under
 .git/objects

When I do git fetch, git call file stats under .git/objects for each
refs. This takes time when there are many refs.

By enabling fscache, git takes file stats by directory traversing and that
improved the speed of fetch-pack for repository having large number of
refs.

In my windows workstation, this improves the time of `git fetch` for
chromium repository like below. I took stats 3 times.

* With this patch
TotalSeconds: 9.9825165
TotalSeconds: 9.1862075
TotalSeconds: 10.1956256
Avg: 9.78811653333333

* Without this patch
TotalSeconds: 15.8406702
TotalSeconds: 15.6248053
TotalSeconds: 15.2085938
Avg: 15.5580231

Signed-off-by: Takuto Ikuta <tikuta@chromium.org>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 fetch-pack.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fetch-pack.c b/fetch-pack.c
index aad07b1153ac35..907fbcdedaa587 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -804,6 +804,7 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator,
 	save_commit_buffer = 0;
 
 	trace2_region_enter("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL);
+	enable_fscache(1);
 	for (ref = *refs; ref; ref = ref->next) {
 		struct commit *commit;
 
@@ -828,6 +829,7 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator,
 		if (!cutoff || cutoff < commit->date)
 			cutoff = commit->date;
 	}
+	enable_fscache(0);
 	trace2_region_leave("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL);
 
 	/*

From 6b4047f5137b470a2ebbd5bc3e8543a4bf2ae72a Mon Sep 17 00:00:00 2001
From: Takuto Ikuta <tikuta@chromium.org>
Date: Tue, 30 Jan 2018 22:42:58 +0900
Subject: [PATCH 192/247] checkout.c: enable fscache for checkout again

This is retry of #1419.

I added flush_fscache macro to flush cached stats after disk writing
with tests for regression reported in #1438 and #1442.

git checkout checks each file path in sorted order, so cache flushing does not
make performance worse unless we have large number of modified files in
a directory containing many files.

Using chromium repository, I tested `git checkout .` performance when I
delete 10 files in different directories.
With this patch:
TotalSeconds: 4.307272
TotalSeconds: 4.4863595
TotalSeconds: 4.2975562
Avg: 4.36372923333333

Without this patch:
TotalSeconds: 20.9705431
TotalSeconds: 22.4867685
TotalSeconds: 18.8968292
Avg: 20.7847136

I confirmed this patch passed all tests in t/ with core_fscache=1.

Signed-off-by: Takuto Ikuta <tikuta@chromium.org>
---
 builtin/checkout.c     |  2 ++
 compat/win32/fscache.c | 12 ++++++++++++
 compat/win32/fscache.h |  3 +++
 entry.c                |  3 +++
 git-compat-util.h      |  4 ++++
 parallel-checkout.c    |  1 +
 t/t7201-co.sh          | 36 ++++++++++++++++++++++++++++++++++++
 7 files changed, 61 insertions(+)

diff --git a/builtin/checkout.c b/builtin/checkout.c
index c0f0d2c700c447..c96813b235e29c 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -462,6 +462,7 @@ static int checkout_worktree(const struct checkout_opts *opts,
 	if (pc_workers > 1)
 		init_parallel_checkout();
 
+	enable_fscache(1);
 	for (pos = 0; pos < the_repository->index->cache_nr; pos++) {
 		struct cache_entry *ce = the_repository->index->cache[pos];
 		if (ce->ce_flags & CE_MATCHED) {
@@ -487,6 +488,7 @@ static int checkout_worktree(const struct checkout_opts *opts,
 		errs |= run_parallel_checkout(&state, pc_workers, pc_threshold,
 					      NULL, NULL);
 	mem_pool_discard(&ce_mem_pool, should_validate_cache_entries());
+	enable_fscache(0);
 	remove_marked_cache_entries(the_repository->index, 1);
 	remove_scheduled_dirs();
 	errs |= finish_delayed_checkout(&state, opts->show_progress);
diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
index ef0a2686a66fb9..a91482d19cb1a4 100644
--- a/compat/win32/fscache.c
+++ b/compat/win32/fscache.c
@@ -435,6 +435,18 @@ int fscache_enable(int enable)
 	return result;
 }
 
+/*
+ * Flush cached stats result when fscache is enabled.
+ */
+void fscache_flush(void)
+{
+	if (enabled) {
+		EnterCriticalSection(&mutex);
+		fscache_clear();
+		LeaveCriticalSection(&mutex);
+	}
+}
+
 /*
  * Lstat replacement, uses the cache if enabled, otherwise redirects to
  * mingw_lstat.
diff --git a/compat/win32/fscache.h b/compat/win32/fscache.h
index 660ada053b4309..2f06f8df97dcd0 100644
--- a/compat/win32/fscache.h
+++ b/compat/win32/fscache.h
@@ -7,6 +7,9 @@ int fscache_enable(int enable);
 int fscache_enabled(const char *path);
 #define is_fscache_enabled(path) fscache_enabled(path)
 
+void fscache_flush(void);
+#define flush_fscache() fscache_flush()
+
 DIR *fscache_opendir(const char *dir);
 int fscache_lstat(const char *file_name, struct stat *buf);
 
diff --git a/entry.c b/entry.c
index b9313b6964daea..5fd4b08991c6ed 100644
--- a/entry.c
+++ b/entry.c
@@ -423,6 +423,9 @@ static int write_entry(struct cache_entry *ce, char *path, struct conv_attrs *ca
 	}
 
 finish:
+	/* Flush cached lstat in fscache after writing to disk. */
+	flush_fscache();
+
 	if (state->refresh_cache) {
 		if (!fstat_done && lstat(ce->name, &st) < 0)
 			return error_errno("unable to stat just-written file %s",
diff --git a/git-compat-util.h b/git-compat-util.h
index 2aa8e8a731e254..e7c350dabdc499 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1104,6 +1104,10 @@ static inline int is_missing_file_error(int errno_)
 #define is_fscache_enabled(path) (0)
 #endif
 
+#ifndef flush_fscache
+#define flush_fscache() /* noop */
+#endif
+
 int cmd_main(int, const char **);
 
 /*
diff --git a/parallel-checkout.c b/parallel-checkout.c
index a6d07dcb1805b9..1eb277a0fc0a55 100644
--- a/parallel-checkout.c
+++ b/parallel-checkout.c
@@ -647,6 +647,7 @@ static void write_items_sequentially(struct checkout *state)
 {
 	size_t i;
 
+	flush_fscache();
 	for (i = 0; i < parallel_checkout.nr; i++) {
 		struct parallel_checkout_item *pc_item = &parallel_checkout.items[i];
 		write_pc_item(pc_item, state);
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 9ea9462914f74b..6a828a5702bbbe 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -35,6 +35,42 @@ fill () {
 }
 
 
+test_expect_success MINGW 'fscache flush cache' '
+
+	git init fscache-test &&
+	cd fscache-test &&
+	git config core.fscache 1 &&
+	echo A > test.txt &&
+	git add test.txt &&
+	git commit -m A &&
+	echo B >> test.txt &&
+	git checkout . &&
+	test -z "$(git status -s)" &&
+	echo A > expect.txt &&
+	test_cmp expect.txt test.txt &&
+	cd .. &&
+	rm -rf fscache-test
+'
+
+test_expect_success MINGW 'fscache flush cache dir' '
+
+	git init fscache-test &&
+	cd fscache-test &&
+	git config core.fscache 1 &&
+	echo A > test.txt &&
+	git add test.txt &&
+	git commit -m A &&
+	rm test.txt &&
+	mkdir test.txt &&
+	touch test.txt/test.txt &&
+	git checkout . &&
+	test -z "$(git status -s)" &&
+	echo A > expect.txt &&
+	test_cmp expect.txt test.txt &&
+	cd .. &&
+	rm -rf fscache-test
+'
+
 test_expect_success setup '
 	fill x y z >same &&
 	fill 1 2 3 4 5 6 7 8 >one &&

From 15d9702af9f3ae0d176dcb75b094e6d2505d75f0 Mon Sep 17 00:00:00 2001
From: Ben Peart <benpeart@microsoft.com>
Date: Fri, 7 Sep 2018 11:39:57 -0400
Subject: [PATCH 193/247] Enable the filesystem cache (fscache) in
 refresh_index().

On file systems that support it, this can dramatically speed up operations
like add, commit, describe, rebase, reset, rm that would otherwise have to
lstat() every file to "re-match" the stat information in the index to that
of the file system.

On a synthetic repo with 1M files, "git reset" dropped from 52.02 seconds to
14.42 seconds for a savings of 72%.

Signed-off-by: Ben Peart <benpeart@microsoft.com>
---
 read-cache.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/read-cache.c b/read-cache.c
index 7a1e04c4c686d0..bfa7d6868050a8 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1530,6 +1530,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,
 	typechange_fmt = in_porcelain ? "T\t%s\n" : "%s: needs update\n";
 	added_fmt      = in_porcelain ? "A\t%s\n" : "%s: needs update\n";
 	unmerged_fmt   = in_porcelain ? "U\t%s\n" : "%s: needs merge\n";
+	enable_fscache(1);
 	/*
 	 * Use the multi-threaded preload_index() to refresh most of the
 	 * cache entries quickly then in the single threaded loop below,
@@ -1624,6 +1625,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,
 	display_progress(progress, istate->cache_nr);
 	stop_progress(&progress);
 	trace_performance_leave("refresh index");
+	enable_fscache(0);
 	return has_errors;
 }
 

From 6d8fad102cecbc36bddc48c789b42a1ee87cf487 Mon Sep 17 00:00:00 2001
From: Ben Peart <benpeart@microsoft.com>
Date: Thu, 4 Oct 2018 18:10:21 -0400
Subject: [PATCH 194/247] mem_pool: add GIT_TRACE_MEMPOOL support

Add tracing around initializing and discarding mempools. In discard report
on the amount of memory unused in the current block to help tune setting
the initial_size.

Signed-off-by: Ben Peart <benpeart@microsoft.com>
---
 mem-pool.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/mem-pool.c b/mem-pool.c
index 8bc77cb0e80a35..89bca70f713692 100644
--- a/mem-pool.c
+++ b/mem-pool.c
@@ -7,7 +7,9 @@
 #include "git-compat-util.h"
 #include "mem-pool.h"
 #include "gettext.h"
+#include "trace.h"
 
+static struct trace_key trace_mem_pool = TRACE_KEY_INIT(MEMPOOL);
 #define BLOCK_GROWTH_SIZE (1024 * 1024 - sizeof(struct mp_block))
 
 /*
@@ -65,12 +67,20 @@ void mem_pool_init(struct mem_pool *pool, size_t initial_size)
 
 	if (initial_size > 0)
 		mem_pool_alloc_block(pool, initial_size, NULL);
+
+	trace_printf_key(&trace_mem_pool,
+		"mem_pool (%p): init (%"PRIuMAX") initial size\n",
+		(void *)pool, (uintmax_t)initial_size);
 }
 
 void mem_pool_discard(struct mem_pool *pool, int invalidate_memory)
 {
 	struct mp_block *block, *block_to_free;
 
+	trace_printf_key(&trace_mem_pool,
+		"mem_pool (%p): discard (%"PRIuMAX") unused\n",
+		(void *)pool,
+		(uintmax_t)(pool->mp_block->end - pool->mp_block->next_free));
 	block = pool->mp_block;
 	while (block)
 	{

From 009a927e28bc973996ef239aa765c123296d84e3 Mon Sep 17 00:00:00 2001
From: Ben Peart <benpeart@microsoft.com>
Date: Tue, 23 Oct 2018 11:42:06 -0400
Subject: [PATCH 195/247] fscache: use FindFirstFileExW to avoid retrieving the
 short name

Use FindFirstFileExW with FindExInfoBasic to avoid forcing NTFS to look up
the short name.  Also switch to a larger (64K vs 4K) buffer using
FIND_FIRST_EX_LARGE_FETCH to minimize round trips to the kernel.

In a repo with ~200K files, this drops warm cache status times from 3.19
seconds to 2.67 seconds for a 16% savings.

Signed-off-by: Ben Peart <benpeart@microsoft.com>
---
 compat/win32/fscache.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
index a91482d19cb1a4..a414794ea6a275 100644
--- a/compat/win32/fscache.c
+++ b/compat/win32/fscache.c
@@ -215,7 +215,8 @@ static struct fsentry *fsentry_create_list(const struct fsentry *dir,
 	pattern[wlen] = 0;
 
 	/* open find handle */
-	h = FindFirstFileW(pattern, &fdata);
+	h = FindFirstFileExW(pattern, FindExInfoBasic, &fdata, FindExSearchNameMatch,
+		NULL, FIND_FIRST_EX_LARGE_FETCH);
 	if (h == INVALID_HANDLE_VALUE) {
 		err = GetLastError();
 		*dir_not_found = 1; /* or empty directory */

From 618d3ad384b2be23069e4b16c077b986ce7c65ff Mon Sep 17 00:00:00 2001
From: Ben Peart <benpeart@microsoft.com>
Date: Fri, 2 Nov 2018 11:19:10 -0400
Subject: [PATCH 196/247] fscache: fscache takes an initial size

Update enable_fscache() to take an optional initial size parameter which is
used to initialize the hashmap so that it can avoid having to rehash as
additional entries are added.

Add a separate disable_fscache() macro to make the code clearer and easier
to read.

Signed-off-by: Ben Peart <benpeart@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/add.c          | 4 ++--
 builtin/checkout.c     | 4 ++--
 builtin/commit.c       | 4 ++--
 compat/win32/fscache.c | 8 ++++++--
 compat/win32/fscache.h | 5 +++--
 fetch-pack.c           | 4 ++--
 git-compat-util.h      | 4 ++++
 preload-index.c        | 4 ++--
 read-cache.c           | 4 ++--
 unpack-trees.c         | 2 +-
 10 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/builtin/add.c b/builtin/add.c
index 9798e968711706..31cf7daaa4c155 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -575,7 +575,7 @@ int cmd_add(int argc,
 		 (!(addremove || take_worktree_changes)
 		  ? ADD_CACHE_IGNORE_REMOVAL : 0));
 
-	enable_fscache(1);
+	enable_fscache(0);
 	if (repo_read_index_preload(repo, &pathspec, 0) < 0)
 		die(_("index file corrupt"));
 
@@ -699,6 +699,6 @@ int cmd_add(int argc,
 	free(ps_matched);
 	dir_clear(&dir);
 	clear_pathspec(&pathspec);
-	enable_fscache(0);
+	disable_fscache();
 	return exit_status;
 }
diff --git a/builtin/checkout.c b/builtin/checkout.c
index c96813b235e29c..f2e5a3308e37f7 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -462,7 +462,7 @@ static int checkout_worktree(const struct checkout_opts *opts,
 	if (pc_workers > 1)
 		init_parallel_checkout();
 
-	enable_fscache(1);
+	enable_fscache(the_repository->index->cache_nr);
 	for (pos = 0; pos < the_repository->index->cache_nr; pos++) {
 		struct cache_entry *ce = the_repository->index->cache[pos];
 		if (ce->ce_flags & CE_MATCHED) {
@@ -488,7 +488,7 @@ static int checkout_worktree(const struct checkout_opts *opts,
 		errs |= run_parallel_checkout(&state, pc_workers, pc_threshold,
 					      NULL, NULL);
 	mem_pool_discard(&ce_mem_pool, should_validate_cache_entries());
-	enable_fscache(0);
+	disable_fscache();
 	remove_marked_cache_entries(the_repository->index, 1);
 	remove_scheduled_dirs();
 	errs |= finish_delayed_checkout(&state, opts->show_progress);
diff --git a/builtin/commit.c b/builtin/commit.c
index fb2e6e20a39fff..d16eceef68d2a2 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1623,7 +1623,7 @@ struct repository *repo UNUSED)
 		       PATHSPEC_PREFER_FULL,
 		       prefix, argv);
 
-	enable_fscache(1);
+	enable_fscache(0);
 	if (status_format != STATUS_FORMAT_PORCELAIN &&
 	    status_format != STATUS_FORMAT_PORCELAIN_V2)
 		progress_flag = REFRESH_PROGRESS;
@@ -1664,7 +1664,7 @@ struct repository *repo UNUSED)
 	wt_status_print(&s);
 	wt_status_collect_free_buffers(&s);
 
-	enable_fscache(0);
+	disable_fscache();
 	return 0;
 }
 
diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
index ad9fdd36964d93..db37cc930a7ab6 100644
--- a/compat/win32/fscache.c
+++ b/compat/win32/fscache.c
@@ -412,7 +412,7 @@ static struct fsentry *fscache_get(struct fsentry *key)
  * Enables or disables the cache. Note that the cache is read-only, changes to
  * the working directory are NOT reflected in the cache while enabled.
  */
-int fscache_enable(int enable)
+int fscache_enable(int enable, size_t initial_size)
 {
 	int result;
 
@@ -428,7 +428,11 @@ int fscache_enable(int enable)
 		InitializeCriticalSection(&mutex);
 		lstat_requests = opendir_requests = 0;
 		fscache_misses = fscache_requests = 0;
-		hashmap_init(&map, (hashmap_cmp_fn) fsentry_cmp, NULL, 0);
+		/*
+		 * avoid having to rehash by leaving room for the parent dirs.
+		 * '4' was determined empirically by testing several repos
+		 */
+		hashmap_init(&map, (hashmap_cmp_fn) fsentry_cmp, NULL, initial_size * 4);
 		initialized = 1;
 	}
 
diff --git a/compat/win32/fscache.h b/compat/win32/fscache.h
index 2f06f8df97dcd0..d49c9381114da6 100644
--- a/compat/win32/fscache.h
+++ b/compat/win32/fscache.h
@@ -1,8 +1,9 @@
 #ifndef FSCACHE_H
 #define FSCACHE_H
 
-int fscache_enable(int enable);
-#define enable_fscache(x) fscache_enable(x)
+int fscache_enable(int enable, size_t initial_size);
+#define enable_fscache(initial_size) fscache_enable(1, initial_size)
+#define disable_fscache() fscache_enable(0, 0)
 
 int fscache_enabled(const char *path);
 #define is_fscache_enabled(path) fscache_enabled(path)
diff --git a/fetch-pack.c b/fetch-pack.c
index 907fbcdedaa587..b0af6684a6a6a5 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -804,7 +804,7 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator,
 	save_commit_buffer = 0;
 
 	trace2_region_enter("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL);
-	enable_fscache(1);
+	enable_fscache(0);
 	for (ref = *refs; ref; ref = ref->next) {
 		struct commit *commit;
 
@@ -829,7 +829,7 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator,
 		if (!cutoff || cutoff < commit->date)
 			cutoff = commit->date;
 	}
-	enable_fscache(0);
+	disable_fscache();
 	trace2_region_leave("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL);
 
 	/*
diff --git a/git-compat-util.h b/git-compat-util.h
index e7c350dabdc499..0a1dc60210a4ae 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1100,6 +1100,10 @@ static inline int is_missing_file_error(int errno_)
 #define enable_fscache(x) /* noop */
 #endif
 
+#ifndef disable_fscache
+#define disable_fscache() /* noop */
+#endif
+
 #ifndef is_fscache_enabled
 #define is_fscache_enabled(path) (0)
 #endif
diff --git a/preload-index.c b/preload-index.c
index 61e8f3a1f6ec84..e466fef15bcd79 100644
--- a/preload-index.c
+++ b/preload-index.c
@@ -141,7 +141,7 @@ void preload_index(struct index_state *index,
 		pthread_mutex_init(&pd.mutex, NULL);
 	}
 
-	enable_fscache(1);
+	enable_fscache(index->cache_nr);
 	for (i = 0; i < threads; i++) {
 		struct thread_data *p = data+i;
 		int err;
@@ -178,7 +178,7 @@ void preload_index(struct index_state *index,
 	trace2_data_intmax("index", NULL, "preload/sum_lstat", t2_sum_lstat);
 	trace2_region_leave("index", "preload", NULL);
 
-	enable_fscache(0);
+	disable_fscache();
 }
 
 int repo_read_index_preload(struct repository *repo,
diff --git a/read-cache.c b/read-cache.c
index bfa7d6868050a8..4cf60d6776e5a2 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1530,7 +1530,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,
 	typechange_fmt = in_porcelain ? "T\t%s\n" : "%s: needs update\n";
 	added_fmt      = in_porcelain ? "A\t%s\n" : "%s: needs update\n";
 	unmerged_fmt   = in_porcelain ? "U\t%s\n" : "%s: needs merge\n";
-	enable_fscache(1);
+	enable_fscache(0);
 	/*
 	 * Use the multi-threaded preload_index() to refresh most of the
 	 * cache entries quickly then in the single threaded loop below,
@@ -1625,7 +1625,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,
 	display_progress(progress, istate->cache_nr);
 	stop_progress(&progress);
 	trace_performance_leave("refresh index");
-	enable_fscache(0);
+	disable_fscache();
 	return has_errors;
 }
 
diff --git a/unpack-trees.c b/unpack-trees.c
index 949b2a4869ea99..7958e1f25848cc 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1828,7 +1828,7 @@ static void mark_new_skip_worktree(struct pattern_list *pl,
 	 */
 	enable_fscache(istate->cache_nr);
 	clear_ce_flags(istate, select_flag, skip_wt_flag, pl, show_progress);
-	enable_fscache(0);
+	disable_fscache();
 }
 
 static void populate_from_existing_patterns(struct unpack_trees_options *o,

From bedf5762ed20e682242bae70518719a6493a315a Mon Sep 17 00:00:00 2001
From: Ben Peart <benpeart@microsoft.com>
Date: Thu, 4 Oct 2018 18:10:21 -0400
Subject: [PATCH 197/247] fscache: add GIT_TEST_FSCACHE support

Add support to fscache to enable running the entire test suite with the
fscache enabled.

Signed-off-by: Ben Peart <benpeart@microsoft.com>
---
 compat/win32/fscache.c | 5 +++++
 t/README               | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
index a414794ea6a275..935e36e5955c98 100644
--- a/compat/win32/fscache.c
+++ b/compat/win32/fscache.c
@@ -5,6 +5,7 @@
 #include "../../dir.h"
 #include "../../abspath.h"
 #include "../../trace.h"
+#include "config.h"
 
 static int initialized;
 static volatile long enabled;
@@ -408,7 +409,11 @@ int fscache_enable(int enable)
 	int result;
 
 	if (!initialized) {
+		int fscache = git_env_bool("GIT_TEST_FSCACHE", -1);
+
 		/* allow the cache to be disabled entirely */
+		if (fscache != -1)
+			core_fscache = fscache;
 		if (!core_fscache)
 			return 0;
 
diff --git a/t/README b/t/README
index f831c5355b4530..56f64912023bb8 100644
--- a/t/README
+++ b/t/README
@@ -472,6 +472,9 @@ GIT_TEST_NAME_HASH_VERSION=<int>, when set, causes 'git pack-objects' to
 assume '--name-hash-version=<n>'.
 
 
+GIT_TEST_FSCACHE=<boolean> exercises the uncommon fscache code path
+which adds a cache below mingw's lstat and dirent implementations.
+
 Naming Tests
 ------------
 

From 60b729cce8b53afa533c74fc23a159bbba82023a Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 11 Dec 2018 12:59:29 +0100
Subject: [PATCH 198/247] fscache: remember the reparse tag for each entry

We will use this in the next commit to implement an FSCache-aware
version of is_mount_point().

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/win32/fscache.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
index 973ae7efb246c9..46dca7a5635faf 100644
--- a/compat/win32/fscache.c
+++ b/compat/win32/fscache.c
@@ -46,6 +46,7 @@ static struct trace_key trace_fscache = TRACE_KEY_INIT(FSCACHE);
 struct fsentry {
 	struct hashmap_entry ent;
 	mode_t st_mode;
+	ULONG reparse_tag;
 	/* Pointer to the directory listing, or NULL for the listing itself. */
 	struct fsentry *list;
 	/* Pointer to the next file entry of the list. */
@@ -202,6 +203,10 @@ static struct fsentry *fseentry_create_entry(struct fscache *cache,
 
 	fse = fsentry_alloc(cache, list, buf, len);
 
+	fse->reparse_tag =
+		fdata->FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT ?
+		fdata->EaSize : 0;
+
 	fse->st_mode = file_attr_to_st_mode(fdata->FileAttributes,
 					    fdata->EaSize);
 	fse->dirent.d_type = S_ISREG(fse->st_mode) ? DT_REG :

From b0f63448b373f4acc1237f48380972c4eda417d7 Mon Sep 17 00:00:00 2001
From: Ben Peart <benpeart@microsoft.com>
Date: Thu, 4 Oct 2018 15:38:08 -0400
Subject: [PATCH 199/247] fscache: update fscache to be thread specific instead
 of global

The threading model for fscache has been to have a single, global cache.
This puts requirements on it to be thread safe so that callers like
preload-index can call it from multiple threads.  This was implemented
with a single mutex and completion events which introduces contention
between the calling threads.

Simplify the threading model by making fscache thread specific.  This allows
us to remove the global mutex and synchronization events entirely and instead
associate a fscache with every thread that requests one. This works well with
the current multi-threading which divides the cache entries into blocks with
a separate thread processing each block.

At the end of each worker thread, if there is a fscache on the primary
thread, merge the cached results from the worker into the primary thread
cache. This enables us to reuse the cache later especially when scanning for
untracked files.

In testing, this reduced the time spent in preload_index() by about 25% and
also reduced the CPU utilization significantly.  On a repo with ~200K files,
it reduced overall status times by ~12%.

Signed-off-by: Ben Peart <benpeart@microsoft.com>
---
 compat/win32/fscache.c | 294 +++++++++++++++++++++++++----------------
 compat/win32/fscache.h |  22 ++-
 git-compat-util.h      |  12 ++
 preload-index.c        |   8 +-
 4 files changed, 215 insertions(+), 121 deletions(-)

diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
index db37cc930a7ab6..cd57901aaf67b4 100644
--- a/compat/win32/fscache.c
+++ b/compat/win32/fscache.c
@@ -7,14 +7,24 @@
 #include "../../trace.h"
 #include "config.h"
 
-static int initialized;
-static volatile long enabled;
-static struct hashmap map;
+static volatile long initialized;
+static DWORD dwTlsIndex;
 static CRITICAL_SECTION mutex;
-static unsigned int lstat_requests;
-static unsigned int opendir_requests;
-static unsigned int fscache_requests;
-static unsigned int fscache_misses;
+
+/*
+ * Store one fscache per thread to avoid thread contention and locking.
+ * This is ok because multi-threaded access is 1) uncommon and 2) always
+ * splitting up the cache entries across multiple threads so there isn't
+ * any overlap between threads anyway.
+ */
+struct fscache {
+	volatile long enabled;
+	struct hashmap map;
+	unsigned int lstat_requests;
+	unsigned int opendir_requests;
+	unsigned int fscache_requests;
+	unsigned int fscache_misses;
+};
 static struct trace_key trace_fscache = TRACE_KEY_INIT(FSCACHE);
 
 /*
@@ -34,8 +44,6 @@ struct fsentry {
 	union {
 		/* Reference count of the directory listing. */
 		volatile long refcnt;
-		/* Handle to wait on the loading thread. */
-		HANDLE hwait;
 		struct {
 			/* More stat members (only used for file entries). */
 			off64_t st_size;
@@ -260,86 +268,63 @@ static struct fsentry *fsentry_create_list(const struct fsentry *dir,
 /*
  * Adds a directory listing to the cache.
  */
-static void fscache_add(struct fsentry *fse)
+static void fscache_add(struct fscache *cache, struct fsentry *fse)
 {
 	if (fse->list)
 		fse = fse->list;
 
 	for (; fse; fse = fse->next)
-		hashmap_add(&map, &fse->ent);
+		hashmap_add(&cache->map, &fse->ent);
 }
 
 /*
  * Clears the cache.
  */
-static void fscache_clear(void)
+static void fscache_clear(struct fscache *cache)
 {
-	hashmap_clear_and_free(&map, struct fsentry, ent);
-	hashmap_init(&map, (hashmap_cmp_fn)fsentry_cmp, NULL, 0);
-	lstat_requests = opendir_requests = 0;
-	fscache_misses = fscache_requests = 0;
+	hashmap_clear_and_free(&cache->map, struct fsentry, ent);
+	hashmap_init(&cache->map, (hashmap_cmp_fn)fsentry_cmp, NULL, 0);
+	cache->lstat_requests = cache->opendir_requests = 0;
+	cache->fscache_misses = cache->fscache_requests = 0;
 }
 
 /*
  * Checks if the cache is enabled for the given path.
  */
-int fscache_enabled(const char *path)
+static int do_fscache_enabled(struct fscache *cache, const char *path)
 {
-	return enabled > 0 && !is_absolute_path(path);
+	return cache->enabled > 0 && !is_absolute_path(path);
 }
 
-/*
- * Looks up a cache entry, waits if its being loaded by another thread.
- * The mutex must be owned by the calling thread.
- */
-static struct fsentry *fscache_get_wait(struct fsentry *key)
+int fscache_enabled(const char *path)
 {
-	struct fsentry *fse = hashmap_get_entry(&map, key, ent, NULL);
-
-	/* return if its a 'real' entry (future entries have refcnt == 0) */
-	if (!fse || fse->list || fse->u.refcnt)
-		return fse;
-
-	/* create an event and link our key to the future entry */
-	key->u.hwait = CreateEvent(NULL, TRUE, FALSE, NULL);
-	key->next = fse->next;
-	fse->next = key;
-
-	/* wait for the loading thread to signal us */
-	LeaveCriticalSection(&mutex);
-	WaitForSingleObject(key->u.hwait, INFINITE);
-	CloseHandle(key->u.hwait);
-	EnterCriticalSection(&mutex);
+	struct fscache *cache = fscache_getcache();
 
-	/* repeat cache lookup */
-	return hashmap_get_entry(&map, key, ent, NULL);
+	return cache ? do_fscache_enabled(cache, path) : 0;
 }
 
 /*
  * Looks up or creates a cache entry for the specified key.
  */
-static struct fsentry *fscache_get(struct fsentry *key)
+static struct fsentry *fscache_get(struct fscache *cache, struct fsentry *key)
 {
-	struct fsentry *fse, *future, *waiter;
+	struct fsentry *fse;
 	int dir_not_found;
 
-	EnterCriticalSection(&mutex);
-	fscache_requests++;
+	cache->fscache_requests++;
 	/* check if entry is in cache */
-	fse = fscache_get_wait(key);
+	fse = hashmap_get_entry(&cache->map, key, ent, NULL);
 	if (fse) {
 		if (fse->st_mode)
 			fsentry_addref(fse);
 		else
 			fse = NULL; /* non-existing directory */
-		LeaveCriticalSection(&mutex);
 		return fse;
 	}
 	/* if looking for a file, check if directory listing is in cache */
 	if (!fse && key->list) {
-		fse = fscache_get_wait(key->list);
+		fse = hashmap_get_entry(&cache->map, key->list, ent, NULL);
 		if (fse) {
-			LeaveCriticalSection(&mutex);
 			/*
 			 * dir entry without file entry, or dir does not
 			 * exist -> file doesn't exist
@@ -349,25 +334,8 @@ static struct fsentry *fscache_get(struct fsentry *key)
 		}
 	}
 
-	/* add future entry to indicate that we're loading it */
-	future = key->list ? key->list : key;
-	future->next = NULL;
-	future->u.refcnt = 0;
-	hashmap_add(&map, &future->ent);
-
-	/* create the directory listing (outside mutex!) */
-	LeaveCriticalSection(&mutex);
-	fse = fsentry_create_list(future, &dir_not_found);
-	EnterCriticalSection(&mutex);
-
-	/* remove future entry and signal waiting threads */
-	hashmap_remove(&map, &future->ent, NULL);
-	waiter = future->next;
-	while (waiter) {
-		HANDLE h = waiter->u.hwait;
-		waiter = waiter->next;
-		SetEvent(h);
-	}
+	/* create the directory listing */
+	fse = fsentry_create_list(key->list ? key->list : key, &dir_not_found);
 
 	/* leave on error (errno set by fsentry_create_list) */
 	if (!fse) {
@@ -381,19 +349,18 @@ static struct fsentry *fscache_get(struct fsentry *key)
 					    key->list->dirent.d_name,
 					    key->list->len);
 			fse->st_mode = 0;
-			hashmap_add(&map, &fse->ent);
+			hashmap_add(&cache->map, &fse->ent);
 		}
-		LeaveCriticalSection(&mutex);
 		return NULL;
 	}
 
 	/* add directory listing to the cache */
-	fscache_misses++;
-	fscache_add(fse);
+	cache->fscache_misses++;
+	fscache_add(cache, fse);
 
 	/* lookup file entry if requested (fse already points to directory) */
 	if (key->list)
-		fse = hashmap_get_entry(&map, key, ent, NULL);
+		fse = hashmap_get_entry(&cache->map, key, ent, NULL);
 
 	if (fse && !fse->st_mode)
 		fse = NULL; /* non-existing directory */
@@ -404,59 +371,104 @@ static struct fsentry *fscache_get(struct fsentry *key)
 	else
 		errno = ENOENT;
 
-	LeaveCriticalSection(&mutex);
 	return fse;
 }
 
 /*
- * Enables or disables the cache. Note that the cache is read-only, changes to
+ * Enables the cache. Note that the cache is read-only, changes to
  * the working directory are NOT reflected in the cache while enabled.
  */
-int fscache_enable(int enable, size_t initial_size)
+int fscache_enable(size_t initial_size)
 {
-	int result;
+	int fscache;
+	struct fscache *cache;
+	int result = 0;
+
+	/* allow the cache to be disabled entirely */
+	fscache = git_env_bool("GIT_TEST_FSCACHE", -1);
+	if (fscache != -1)
+		core_fscache = fscache;
+	if (!core_fscache)
+		return 0;
 
+	/*
+	 * refcount the global fscache initialization so that the
+	 * opendir and lstat function pointers are redirected if
+	 * any threads are using the fscache.
+	 */
 	if (!initialized) {
-		int fscache = git_env_bool("GIT_TEST_FSCACHE", -1);
-
-		/* allow the cache to be disabled entirely */
-		if (fscache != -1)
-			core_fscache = fscache;
-		if (!core_fscache)
-			return 0;
-
 		InitializeCriticalSection(&mutex);
-		lstat_requests = opendir_requests = 0;
-		fscache_misses = fscache_requests = 0;
+		if (!dwTlsIndex) {
+			dwTlsIndex = TlsAlloc();
+			if (dwTlsIndex == TLS_OUT_OF_INDEXES) {
+				LeaveCriticalSection(&mutex);
+				return 0;
+			}
+		}
+
+		/* redirect opendir and lstat to the fscache implementations */
+		opendir = fscache_opendir;
+		lstat = fscache_lstat;
+	}
+	InterlockedIncrement(&initialized);
+
+	/* refcount the thread specific initialization */
+	cache = fscache_getcache();
+	if (cache) {
+		InterlockedIncrement(&cache->enabled);
+	} else {
+		cache = (struct fscache *)xcalloc(1, sizeof(*cache));
+		cache->enabled = 1;
 		/*
 		 * avoid having to rehash by leaving room for the parent dirs.
 		 * '4' was determined empirically by testing several repos
 		 */
-		hashmap_init(&map, (hashmap_cmp_fn) fsentry_cmp, NULL, initial_size * 4);
-		initialized = 1;
+		hashmap_init(&cache->map, (hashmap_cmp_fn)fsentry_cmp, NULL, initial_size * 4);
+		if (!TlsSetValue(dwTlsIndex, cache))
+			BUG("TlsSetValue error");
 	}
 
-	result = enable ? InterlockedIncrement(&enabled)
-			: InterlockedDecrement(&enabled);
+	trace_printf_key(&trace_fscache, "fscache: enable\n");
+	return result;
+}
 
-	if (enable && result == 1) {
-		/* redirect opendir and lstat to the fscache implementations */
-		opendir = fscache_opendir;
-		lstat = fscache_lstat;
-	} else if (!enable && !result) {
+/*
+ * Disables the cache.
+ */
+void fscache_disable(void)
+{
+	struct fscache *cache;
+
+	if (!core_fscache)
+		return;
+
+	/* update the thread specific fscache initialization */
+	cache = fscache_getcache();
+	if (!cache)
+		BUG("fscache_disable() called on a thread where fscache has not been initialized");
+	if (!cache->enabled)
+		BUG("fscache_disable() called on an fscache that is already disabled");
+	InterlockedDecrement(&cache->enabled);
+	if (!cache->enabled) {
+		TlsSetValue(dwTlsIndex, NULL);
+		trace_printf_key(&trace_fscache, "fscache_disable: lstat %u, opendir %u, "
+			"total requests/misses %u/%u\n",
+			cache->lstat_requests, cache->opendir_requests,
+			cache->fscache_requests, cache->fscache_misses);
+		fscache_clear(cache);
+		free(cache);
+	}
+
+	/* update the global fscache initialization */
+	InterlockedDecrement(&initialized);
+	if (!initialized) {
 		/* reset opendir and lstat to the original implementations */
 		opendir = dirent_opendir;
 		lstat = mingw_lstat;
-		EnterCriticalSection(&mutex);
-		trace_printf_key(&trace_fscache, "fscache: lstat %u, opendir %u, "
-						 "total requests/misses %u/%u\n",
-				lstat_requests, opendir_requests,
-				fscache_requests, fscache_misses);
-		fscache_clear();
-		LeaveCriticalSection(&mutex);
 	}
-	trace_printf_key(&trace_fscache, "fscache: enable(%d)\n", enable);
-	return result;
+
+	trace_printf_key(&trace_fscache, "fscache: disable\n");
+	return;
 }
 
 /*
@@ -464,10 +476,10 @@ int fscache_enable(int enable, size_t initial_size)
  */
 void fscache_flush(void)
 {
-	if (enabled) {
-		EnterCriticalSection(&mutex);
-		fscache_clear();
-		LeaveCriticalSection(&mutex);
+	struct fscache *cache = fscache_getcache();
+
+	if (cache && cache->enabled) {
+		fscache_clear(cache);
 	}
 }
 
@@ -485,11 +497,12 @@ int fscache_lstat(const char *filename, struct stat *st)
 	struct heap_fsentry key[2];
 #pragma GCC diagnostic pop
 	struct fsentry *fse;
+	struct fscache *cache = fscache_getcache();
 
-	if (!fscache_enabled(filename))
+	if (!cache || !do_fscache_enabled(cache, filename))
 		return mingw_lstat(filename, st);
 
-	lstat_requests++;
+	cache->lstat_requests++;
 	/* split filename into path + name */
 	len = strlen(filename);
 	if (len && is_dir_sep(filename[len - 1]))
@@ -502,7 +515,7 @@ int fscache_lstat(const char *filename, struct stat *st)
 	/* lookup entry for path + name in cache */
 	fsentry_init(&key[0].u.ent, NULL, filename, dirlen);
 	fsentry_init(&key[1].u.ent, &key[0].u.ent, filename + base, len - base);
-	fse = fscache_get(&key[1].u.ent);
+	fse = fscache_get(cache, &key[1].u.ent);
 	if (!fse) {
 		errno = ENOENT;
 		return -1;
@@ -579,11 +592,12 @@ DIR *fscache_opendir(const char *dirname)
 	struct fsentry *list;
 	fscache_DIR *dir;
 	int len;
+	struct fscache *cache = fscache_getcache();
 
-	if (!fscache_enabled(dirname))
+	if (!cache || !do_fscache_enabled(cache, dirname))
 		return dirent_opendir(dirname);
 
-	opendir_requests++;
+	cache->opendir_requests++;
 	/* prepare name (strip trailing '/', replace '.') */
 	len = strlen(dirname);
 	if ((len == 1 && dirname[0] == '.') ||
@@ -592,7 +606,7 @@ DIR *fscache_opendir(const char *dirname)
 
 	/* get directory listing from cache */
 	fsentry_init(&key.u.ent, NULL, dirname, len);
-	list = fscache_get(&key.u.ent);
+	list = fscache_get(cache, &key.u.ent);
 	if (!list)
 		return NULL;
 
@@ -603,3 +617,53 @@ DIR *fscache_opendir(const char *dirname)
 	dir->pfsentry = list;
 	return (DIR*) dir;
 }
+
+struct fscache *fscache_getcache(void)
+{
+	return (struct fscache *)TlsGetValue(dwTlsIndex);
+}
+
+void fscache_merge(struct fscache *dest)
+{
+	struct hashmap_iter iter;
+	struct hashmap_entry *e;
+	struct fscache *cache = fscache_getcache();
+
+	/*
+	 * Only do the merge if fscache was enabled and we have a dest
+	 * cache to merge into.
+	 */
+	if (!dest) {
+		fscache_enable(0);
+		return;
+	}
+	if (!cache)
+		BUG("fscache_merge() called on a thread where fscache has not been initialized");
+
+	TlsSetValue(dwTlsIndex, NULL);
+	trace_printf_key(&trace_fscache, "fscache_merge: lstat %u, opendir %u, "
+		"total requests/misses %u/%u\n",
+		cache->lstat_requests, cache->opendir_requests,
+		cache->fscache_requests, cache->fscache_misses);
+
+	/*
+	 * This is only safe because the primary thread we're merging into
+	 * isn't being used so the critical section only needs to prevent
+	 * the the child threads from stomping on each other.
+	 */
+	EnterCriticalSection(&mutex);
+
+	hashmap_iter_init(&cache->map, &iter);
+	while ((e = hashmap_iter_next(&iter)))
+		hashmap_add(&dest->map, e);
+
+	dest->lstat_requests += cache->lstat_requests;
+	dest->opendir_requests += cache->opendir_requests;
+	dest->fscache_requests += cache->fscache_requests;
+	dest->fscache_misses += cache->fscache_misses;
+	LeaveCriticalSection(&mutex);
+
+	free(cache);
+
+	InterlockedDecrement(&initialized);
+}
diff --git a/compat/win32/fscache.h b/compat/win32/fscache.h
index d49c9381114da6..2eb8bf3f5cfee8 100644
--- a/compat/win32/fscache.h
+++ b/compat/win32/fscache.h
@@ -1,9 +1,16 @@
 #ifndef FSCACHE_H
 #define FSCACHE_H
 
-int fscache_enable(int enable, size_t initial_size);
-#define enable_fscache(initial_size) fscache_enable(1, initial_size)
-#define disable_fscache() fscache_enable(0, 0)
+/*
+ * The fscache is thread specific. enable_fscache() must be called
+ * for each thread where caching is desired.
+ */
+
+int fscache_enable(size_t initial_size);
+#define enable_fscache(initial_size) fscache_enable(initial_size)
+
+void fscache_disable(void);
+#define disable_fscache() fscache_disable()
 
 int fscache_enabled(const char *path);
 #define is_fscache_enabled(path) fscache_enabled(path)
@@ -14,4 +21,13 @@ void fscache_flush(void);
 DIR *fscache_opendir(const char *dir);
 int fscache_lstat(const char *file_name, struct stat *buf);
 
+/* opaque fscache structure */
+struct fscache;
+
+struct fscache *fscache_getcache(void);
+#define getcache_fscache() fscache_getcache()
+
+void fscache_merge(struct fscache *dest);
+#define merge_fscache(dest) fscache_merge(dest)
+
 #endif
diff --git a/git-compat-util.h b/git-compat-util.h
index 0a1dc60210a4ae..10d3eec3c74ba5 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1096,6 +1096,10 @@ static inline int is_missing_file_error(int errno_)
  * data or even file content without the need to synchronize with the file
  * system.
  */
+
+ /* opaque fscache structure */
+struct fscache;
+
 #ifndef enable_fscache
 #define enable_fscache(x) /* noop */
 #endif
@@ -1112,6 +1116,14 @@ static inline int is_missing_file_error(int errno_)
 #define flush_fscache() /* noop */
 #endif
 
+#ifndef getcache_fscache
+#define getcache_fscache() (NULL) /* noop */
+#endif
+
+#ifndef merge_fscache
+#define merge_fscache(dest) /* noop */
+#endif
+
 int cmd_main(int, const char **);
 
 /*
diff --git a/preload-index.c b/preload-index.c
index e466fef15bcd79..ac0310008754a3 100644
--- a/preload-index.c
+++ b/preload-index.c
@@ -20,6 +20,8 @@
 #include "trace2.h"
 #include "config.h"
 
+static struct fscache *fscache;
+
 /*
  * Mostly randomly chosen maximum thread counts: we
  * cap the parallelism to 20 threads, and we want
@@ -57,6 +59,7 @@ static void *preload_thread(void *_data)
 		nr = index->cache_nr - p->offset;
 	last_nr = nr;
 
+	enable_fscache(nr);
 	do {
 		struct cache_entry *ce = *cep++;
 		struct stat st;
@@ -100,6 +103,7 @@ static void *preload_thread(void *_data)
 		pthread_mutex_unlock(&pd->mutex);
 	}
 	cache_def_clear(&cache);
+	merge_fscache(fscache);
 	return NULL;
 }
 
@@ -118,6 +122,7 @@ void preload_index(struct index_state *index,
 	if (!HAVE_THREADS || !core_preload_index)
 		return;
 
+	fscache = getcache_fscache();
 	threads = index->cache_nr / THREAD_COST;
 	if ((index->cache_nr > 1) && (threads < 2) && git_env_bool("GIT_TEST_PRELOAD_INDEX", 0))
 		threads = 2;
@@ -141,7 +146,6 @@ void preload_index(struct index_state *index,
 		pthread_mutex_init(&pd.mutex, NULL);
 	}
 
-	enable_fscache(index->cache_nr);
 	for (i = 0; i < threads; i++) {
 		struct thread_data *p = data+i;
 		int err;
@@ -177,8 +181,6 @@ void preload_index(struct index_state *index,
 
 	trace2_data_intmax("index", NULL, "preload/sum_lstat", t2_sum_lstat);
 	trace2_region_leave("index", "preload", NULL);
-
-	disable_fscache();
 }
 
 int repo_read_index_preload(struct repository *repo,

From 707933cc2a503f331ef75e0f3c8e51d6cf7a108a Mon Sep 17 00:00:00 2001
From: Ben Peart <benpeart@microsoft.com>
Date: Tue, 25 Sep 2018 16:28:16 -0400
Subject: [PATCH 200/247] fscache: add fscache hit statistics

Track fscache hits and misses for lstat and opendir requests.  Reporting of
statistics is done when the cache is disabled for the last time and freed
and is only reported if GIT_TRACE_FSCACHE is set.

Sample output is:

11:33:11.836428 compat/win32/fscache.c:433 fscache: lstat 3775, opendir 263, total requests/misses 4052/269

Signed-off-by: Ben Peart <benpeart@microsoft.com>
---
 compat/win32/fscache.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
index 935e36e5955c98..ad9fdd36964d93 100644
--- a/compat/win32/fscache.c
+++ b/compat/win32/fscache.c
@@ -11,6 +11,10 @@ static int initialized;
 static volatile long enabled;
 static struct hashmap map;
 static CRITICAL_SECTION mutex;
+static unsigned int lstat_requests;
+static unsigned int opendir_requests;
+static unsigned int fscache_requests;
+static unsigned int fscache_misses;
 static struct trace_key trace_fscache = TRACE_KEY_INIT(FSCACHE);
 
 /*
@@ -272,6 +276,8 @@ static void fscache_clear(void)
 {
 	hashmap_clear_and_free(&map, struct fsentry, ent);
 	hashmap_init(&map, (hashmap_cmp_fn)fsentry_cmp, NULL, 0);
+	lstat_requests = opendir_requests = 0;
+	fscache_misses = fscache_requests = 0;
 }
 
 /*
@@ -318,6 +324,7 @@ static struct fsentry *fscache_get(struct fsentry *key)
 	int dir_not_found;
 
 	EnterCriticalSection(&mutex);
+	fscache_requests++;
 	/* check if entry is in cache */
 	fse = fscache_get_wait(key);
 	if (fse) {
@@ -381,6 +388,7 @@ static struct fsentry *fscache_get(struct fsentry *key)
 	}
 
 	/* add directory listing to the cache */
+	fscache_misses++;
 	fscache_add(fse);
 
 	/* lookup file entry if requested (fse already points to directory) */
@@ -418,6 +426,8 @@ int fscache_enable(int enable)
 			return 0;
 
 		InitializeCriticalSection(&mutex);
+		lstat_requests = opendir_requests = 0;
+		fscache_misses = fscache_requests = 0;
 		hashmap_init(&map, (hashmap_cmp_fn) fsentry_cmp, NULL, 0);
 		initialized = 1;
 	}
@@ -434,6 +444,10 @@ int fscache_enable(int enable)
 		opendir = dirent_opendir;
 		lstat = mingw_lstat;
 		EnterCriticalSection(&mutex);
+		trace_printf_key(&trace_fscache, "fscache: lstat %u, opendir %u, "
+						 "total requests/misses %u/%u\n",
+				lstat_requests, opendir_requests,
+				fscache_requests, fscache_misses);
 		fscache_clear();
 		LeaveCriticalSection(&mutex);
 	}
@@ -471,6 +485,7 @@ int fscache_lstat(const char *filename, struct stat *st)
 	if (!fscache_enabled(filename))
 		return mingw_lstat(filename, st);
 
+	lstat_requests++;
 	/* split filename into path + name */
 	len = strlen(filename);
 	if (len && is_dir_sep(filename[len - 1]))
@@ -564,6 +579,7 @@ DIR *fscache_opendir(const char *dirname)
 	if (!fscache_enabled(dirname))
 		return dirent_opendir(dirname);
 
+	opendir_requests++;
 	/* prepare name (strip trailing '/', replace '.') */
 	len = strlen(dirname);
 	if ((len == 1 && dirname[0] == '.') ||

From 68d3576e4a28a34b435bc4fac26e955d3ef287b4 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 23 Apr 2018 23:20:00 +0200
Subject: [PATCH 201/247] fscache: Windows Docker volumes are *not* symbolic
 links

... even if they may look like them.

As looking up the target of the "symbolic link" (just to see whether it
starts with `/ContainerMappedDirectories/`) is pretty expensive, we
do it when we can be *really* sure that there is a possibility that this
might be the case.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: JiSeop Moon <zcube@zcube.kr>
---
 compat/win32/fscache.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
index 46dca7a5635faf..efe6be7e5ef0a5 100644
--- a/compat/win32/fscache.c
+++ b/compat/win32/fscache.c
@@ -207,8 +207,30 @@ static struct fsentry *fseentry_create_entry(struct fscache *cache,
 		fdata->FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT ?
 		fdata->EaSize : 0;
 
+	/*
+	 * On certain Windows versions, host directories mapped into
+	 * Windows Containers ("Volumes", see https://docs.docker.com/storage/volumes/)
+	 * look like symbolic links, but their targets are paths that
+	 * are valid only in kernel mode.
+	 *
+	 * Let's work around this by detecting that situation and
+	 * telling Git that these are *not* symbolic links.
+	 */
+	if (fse->reparse_tag == IO_REPARSE_TAG_SYMLINK &&
+	    sizeof(buf) > (size_t)(list ? list->len + 1 : 0) + fse->len + 1 &&
+	    is_inside_windows_container()) {
+		size_t off = 0;
+		if (list) {
+			memcpy(buf, list->dirent.d_name, list->len);
+			buf[list->len] = '/';
+			off = list->len + 1;
+		}
+		memcpy(buf + off, fse->dirent.d_name, fse->len);
+		buf[off + fse->len] = '\0';
+	}
+
 	fse->st_mode = file_attr_to_st_mode(fdata->FileAttributes,
-					    fdata->EaSize);
+					    fdata->EaSize, buf);
 	fse->dirent.d_type = S_ISREG(fse->st_mode) ? DT_REG :
 			S_ISDIR(fse->st_mode) ? DT_DIR : DT_LNK;
 	fse->u.s.st_size = S_ISLNK(fse->st_mode) ? MAX_PATH :

From 33d244c92c36585f0f8bd80d99d82dd34e00b967 Mon Sep 17 00:00:00 2001
From: Ben Peart <benpeart@microsoft.com>
Date: Fri, 2 Nov 2018 11:19:10 -0400
Subject: [PATCH 202/247] fscache: teach fscache to use mempool

Now that the fscache is single threaded, take advantage of the mem_pool as
the allocator to significantly reduce the cost of allocations and frees.

With the reduced cost of free, in future patches, we can start freeing the
fscache at the end of commands instead of just leaking it.

Signed-off-by: Ben Peart <benpeart@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/win32/fscache.c | 45 ++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
index cd57901aaf67b4..6da112e4f90382 100644
--- a/compat/win32/fscache.c
+++ b/compat/win32/fscache.c
@@ -6,6 +6,7 @@
 #include "../../abspath.h"
 #include "../../trace.h"
 #include "config.h"
+#include "../../mem-pool.h"
 
 static volatile long initialized;
 static DWORD dwTlsIndex;
@@ -20,6 +21,7 @@ static CRITICAL_SECTION mutex;
 struct fscache {
 	volatile long enabled;
 	struct hashmap map;
+	struct mem_pool mem_pool;
 	unsigned int lstat_requests;
 	unsigned int opendir_requests;
 	unsigned int fscache_requests;
@@ -129,11 +131,12 @@ static void fsentry_init(struct fsentry *fse, struct fsentry *list,
 /*
  * Allocate an fsentry structure on the heap.
  */
-static struct fsentry *fsentry_alloc(struct fsentry *list, const char *name,
+static struct fsentry *fsentry_alloc(struct fscache *cache, struct fsentry *list, const char *name,
 		size_t len)
 {
 	/* overallocate fsentry and copy the name to the end */
-	struct fsentry *fse = xmalloc(sizeof(struct fsentry) + len + 1);
+	struct fsentry *fse =
+		mem_pool_alloc(&cache->mem_pool, sizeof(*fse) + len + 1);
 	/* init the rest of the structure */
 	fsentry_init(fse, list, name, len);
 	fse->next = NULL;
@@ -153,27 +156,21 @@ inline static void fsentry_addref(struct fsentry *fse)
 }
 
 /*
- * Release the reference to an fsentry, frees the memory if its the last ref.
+ * Release the reference to an fsentry.
  */
 static void fsentry_release(struct fsentry *fse)
 {
 	if (fse->list)
 		fse = fse->list;
 
-	if (InterlockedDecrement(&(fse->u.refcnt)))
-		return;
-
-	while (fse) {
-		struct fsentry *next = fse->next;
-		free(fse);
-		fse = next;
-	}
+	InterlockedDecrement(&(fse->u.refcnt));
 }
 
 /*
  * Allocate and initialize an fsentry from a WIN32_FIND_DATA structure.
  */
-static struct fsentry *fseentry_create_entry(struct fsentry *list,
+static struct fsentry *fseentry_create_entry(struct fscache *cache,
+					     struct fsentry *list,
 					     const WIN32_FIND_DATAW *fdata)
 {
 	char buf[MAX_PATH * 3];
@@ -181,7 +178,7 @@ static struct fsentry *fseentry_create_entry(struct fsentry *list,
 	struct fsentry *fse;
 	len = xwcstoutf(buf, fdata->cFileName, ARRAY_SIZE(buf));
 
-	fse = fsentry_alloc(list, buf, len);
+	fse = fsentry_alloc(cache, list, buf, len);
 
 	fse->st_mode = file_attr_to_st_mode(fdata->dwFileAttributes,
 					    IO_REPARSE_TAG_SYMLINK);
@@ -201,7 +198,7 @@ static struct fsentry *fseentry_create_entry(struct fsentry *list,
  * Dir should not contain trailing '/'. Use an empty string for the current
  * directory (not "."!).
  */
-static struct fsentry *fsentry_create_list(const struct fsentry *dir,
+static struct fsentry *fsentry_create_list(struct fscache *cache, const struct fsentry *dir,
 					   int *dir_not_found)
 {
 	wchar_t pattern[MAX_PATH + 2]; /* + 2 for '/' '*' */
@@ -240,14 +237,14 @@ static struct fsentry *fsentry_create_list(const struct fsentry *dir,
 	}
 
 	/* allocate object to hold directory listing */
-	list = fsentry_alloc(NULL, dir->dirent.d_name, dir->len);
+	list = fsentry_alloc(cache, NULL, dir->dirent.d_name, dir->len);
 	list->st_mode = S_IFDIR;
 	list->dirent.d_type = DT_DIR;
 
 	/* walk directory and build linked list of fsentry structures */
 	phead = &list->next;
 	do {
-		*phead = fseentry_create_entry(list, &fdata);
+		*phead = fseentry_create_entry(cache, list, &fdata);
 		phead = &(*phead)->next;
 	} while (FindNextFileW(h, &fdata));
 
@@ -259,7 +256,7 @@ static struct fsentry *fsentry_create_list(const struct fsentry *dir,
 	if (err == ERROR_NO_MORE_FILES)
 		return list;
 
-	/* otherwise free the list and return error */
+	/* otherwise release the list and return error */
 	fsentry_release(list);
 	errno = err_win_to_posix(err);
 	return NULL;
@@ -282,7 +279,9 @@ static void fscache_add(struct fscache *cache, struct fsentry *fse)
  */
 static void fscache_clear(struct fscache *cache)
 {
-	hashmap_clear_and_free(&cache->map, struct fsentry, ent);
+	mem_pool_discard(&cache->mem_pool, 0);
+	mem_pool_init(&cache->mem_pool, 0);
+	hashmap_clear(&cache->map);
 	hashmap_init(&cache->map, (hashmap_cmp_fn)fsentry_cmp, NULL, 0);
 	cache->lstat_requests = cache->opendir_requests = 0;
 	cache->fscache_misses = cache->fscache_requests = 0;
@@ -335,7 +334,7 @@ static struct fsentry *fscache_get(struct fscache *cache, struct fsentry *key)
 	}
 
 	/* create the directory listing */
-	fse = fsentry_create_list(key->list ? key->list : key, &dir_not_found);
+	fse = fsentry_create_list(cache, key->list ? key->list : key, &dir_not_found);
 
 	/* leave on error (errno set by fsentry_create_list) */
 	if (!fse) {
@@ -345,7 +344,7 @@ static struct fsentry *fscache_get(struct fscache *cache, struct fsentry *key)
 			 * empty, which for all practical matters is the same
 			 * thing as far as fscache is concerned).
 			 */
-			fse = fsentry_alloc(key->list->list,
+			fse = fsentry_alloc(cache, key->list->list,
 					    key->list->dirent.d_name,
 					    key->list->len);
 			fse->st_mode = 0;
@@ -424,6 +423,7 @@ int fscache_enable(size_t initial_size)
 		 * '4' was determined empirically by testing several repos
 		 */
 		hashmap_init(&cache->map, (hashmap_cmp_fn)fsentry_cmp, NULL, initial_size * 4);
+		mem_pool_init(&cache->mem_pool, 0);
 		if (!TlsSetValue(dwTlsIndex, cache))
 			BUG("TlsSetValue error");
 	}
@@ -455,7 +455,8 @@ void fscache_disable(void)
 			"total requests/misses %u/%u\n",
 			cache->lstat_requests, cache->opendir_requests,
 			cache->fscache_requests, cache->fscache_misses);
-		fscache_clear(cache);
+		mem_pool_discard(&cache->mem_pool, 0);
+		hashmap_clear(&cache->map);
 		free(cache);
 	}
 
@@ -657,6 +658,8 @@ void fscache_merge(struct fscache *dest)
 	while ((e = hashmap_iter_next(&iter)))
 		hashmap_add(&dest->map, e);
 
+	mem_pool_combine(&dest->mem_pool, &cache->mem_pool);
+
 	dest->lstat_requests += cache->lstat_requests;
 	dest->opendir_requests += cache->opendir_requests;
 	dest->fscache_requests += cache->fscache_requests;

From 210237317b20ddf95643a674f791208c6b6e4e62 Mon Sep 17 00:00:00 2001
From: Derrick Stolee <dstolee@microsoft.com>
Date: Wed, 12 Jun 2019 00:58:49 +0000
Subject: [PATCH 203/247] unpack-trees: enable fscache for sparse-checkout

When updating the skip-worktree bits in the index to align with new
values in a sparse-checkout file, Git scans the entire working
directory with lstat() calls. In a sparse-checkout, many of these
lstat() calls are for paths that do not exist.

Enable the fscache feature during this scan. Since enable_fscache()
calls nest, the disable_fscache() method decrements a counter and
would only clear the cache if that counter reaches zero.

In a local test of a repo with ~2.2 million paths, updating the index
with git read-tree -m -u HEAD with a sparse-checkout file containing
only /.gitattributes improved from 2-3 minutes to ~6 seconds.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 unpack-trees.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/unpack-trees.c b/unpack-trees.c
index 1802809ad3c50a..949b2a4869ea99 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1826,7 +1826,9 @@ static void mark_new_skip_worktree(struct pattern_list *pl,
 	 * 2. Widen worktree according to sparse-checkout file.
 	 * Matched entries will have skip_wt_flag cleared (i.e. "in")
 	 */
+	enable_fscache(istate->cache_nr);
 	clear_ce_flags(istate, select_flag, skip_wt_flag, pl, show_progress);
+	enable_fscache(0);
 }
 
 static void populate_from_existing_patterns(struct unpack_trees_options *o,

From 8dda5fdb2ce4fa9eb7557891701c65cf5ed06768 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 20 Jul 2017 22:45:01 +0200
Subject: [PATCH 204/247] mingw: explicitly specify with which cmd to prefix
 the cmdline

The main idea of this patch is that even if we have to look up the
absolute path of the script, if only the basename was specified as
argv[0], then we should use that basename on the command line, too, not
the absolute path.

This patch will also help with the upcoming patch where we automatically
substitute "sh ..." by "busybox sh ..." if "sh" is not in the PATH but
"busybox" is: we will do that by substituting the actual executable, but
still keep prepending "sh" to the command line.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/mingw.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 672171ee8698f0..c380cf89984449 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -2158,8 +2158,8 @@ static int is_msys2_sh(const char *cmd)
 }
 
 static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaenv,
-			      const char *dir,
-			      int prepend_cmd, int fhin, int fhout, int fherr)
+			      const char *dir, const char *prepend_cmd,
+			      int fhin, int fhout, int fherr)
 {
 	STARTUPINFOEXW si;
 	PROCESS_INFORMATION pi;
@@ -2239,9 +2239,9 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
 	/* concatenate argv, quoting args as we go */
 	strbuf_init(&args, 0);
 	if (prepend_cmd) {
-		char *quoted = (char *)quote_arg(cmd);
+		char *quoted = (char *)quote_arg(prepend_cmd);
 		strbuf_addstr(&args, quoted);
-		if (quoted != cmd)
+		if (quoted != prepend_cmd)
 			free(quoted);
 	}
 	for (; *argv; argv++) {
@@ -2361,7 +2361,8 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
 	return (pid_t)pi.dwProcessId;
 }
 
-static pid_t mingw_spawnv(const char *cmd, const char **argv, int prepend_cmd)
+static pid_t mingw_spawnv(const char *cmd, const char **argv,
+			  const char *prepend_cmd)
 {
 	return mingw_spawnve_fd(cmd, argv, NULL, NULL, prepend_cmd, 0, 1, 2);
 }
@@ -2389,14 +2390,14 @@ pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **deltaenv,
 				pid = -1;
 			}
 			else {
-				pid = mingw_spawnve_fd(iprog, argv, deltaenv, dir, 1,
+				pid = mingw_spawnve_fd(iprog, argv, deltaenv, dir, interpr,
 						       fhin, fhout, fherr);
 				free(iprog);
 			}
 			argv[0] = argv0;
 		}
 		else
-			pid = mingw_spawnve_fd(prog, argv, deltaenv, dir, 0,
+			pid = mingw_spawnve_fd(prog, argv, deltaenv, dir, NULL,
 					       fhin, fhout, fherr);
 		free(prog);
 	}
@@ -2421,7 +2422,7 @@ static int try_shell_exec(const char *cmd, char *const *argv)
 		argv2[0] = (char *)cmd;	/* full path to the script file */
 		COPY_ARRAY(&argv2[1], &argv[1], argc);
 		exec_id = trace2_exec(prog, (const char **)argv2);
-		pid = mingw_spawnv(prog, (const char **)argv2, 1);
+		pid = mingw_spawnv(prog, (const char **)argv2, interpr);
 		if (pid >= 0) {
 			int status;
 			if (waitpid(pid, &status, 0) < 0)
@@ -2445,7 +2446,7 @@ int mingw_execv(const char *cmd, char *const *argv)
 		int exec_id;
 
 		exec_id = trace2_exec(cmd, (const char **)argv);
-		pid = mingw_spawnv(cmd, (const char **)argv, 0);
+		pid = mingw_spawnv(cmd, (const char **)argv, NULL);
 		if (pid < 0) {
 			trace2_exec_result(exec_id, -1);
 			return -1;

From e097ae3566380982168eb4715359e4dbc0ad1eb5 Mon Sep 17 00:00:00 2001
From: xungeng li <xungeng@gmail.com>
Date: Wed, 7 Jun 2023 20:26:33 +0800
Subject: [PATCH 205/247] fscache: optionally enable wsl compability file mode
 bits

The Windows Subsystem for Linux (WSL) version 2 allows to use `chmod` on
NTFS volumes provided that they are mounted with metadata enabled (see
https://devblogs.microsoft.com/commandline/chmod-chown-wsl-improvements/
for details), for example:

	$ chmod 0755 /mnt/d/test/a.sh

In order to facilitate better collaboration between the Windows
version of Git and the WSL version of Git, we can make the Windows
version of Git also support reading and writing NTFS file modes
in a manner compatible with WSL.

Since this slightly slows down operations where lots of files are
created (such as an initial checkout), this feature is only enabled when
`core.WSLCompat` is set to true. Note that you also have to set
`core.fileMode=true` in repositories that have been initialized without
enabling WSL compatibility.

There are several ways to enable metadata loading for NTFS volumes
in WSL, one of which is to modify `/etc/wsl.conf` by adding:

```
[automount]
enabled = true
options = "metadata,umask=027,fmask=117"
```

And reboot WSL.

It can also be enabled temporarily by this incantation:

	$ sudo umount /mnt/c &&
	  sudo mount -t drvfs C: /mnt/c -o metadata,uid=1000,gid=1000,umask=22,fmask=111

It's important to note that this modification is compatible with, but
does not depend on WSL. The helper functions in this commit can operate
independently and functions normally on devices where WSL is not
installed or properly configured.

Signed-off-by: xungeng li <xungeng@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/win32/fscache.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
index efe6be7e5ef0a5..e247e9a6663131 100644
--- a/compat/win32/fscache.c
+++ b/compat/win32/fscache.c
@@ -8,6 +8,7 @@
 #include "config.h"
 #include "../../mem-pool.h"
 #include "ntifs.h"
+#include "wsl.h"
 
 static volatile long initialized;
 static DWORD dwTlsIndex;
@@ -242,6 +243,21 @@ static struct fsentry *fseentry_create_entry(struct fscache *cache,
 			     &(fse->u.s.st_mtim));
 	filetime_to_timespec((FILETIME *)&(fdata->CreationTime),
 			     &(fse->u.s.st_ctim));
+	if (fdata->EaSize > 0 &&
+	    sizeof(buf) >= (size_t)(list ? list->len+1 : 0) + fse->len+1 &&
+	    are_wsl_compatible_mode_bits_enabled()) {
+		size_t off = 0;
+		wchar_t wpath[MAX_LONG_PATH];
+		if (list && list->len) {
+			memcpy(buf, list->dirent.d_name, list->len);
+			buf[list->len] = '/';
+			off = list->len + 1;
+		}
+		memcpy(buf + off, fse->dirent.d_name, fse->len);
+		buf[off + fse->len] = '\0';
+		if (xutftowcs_long_path(wpath, buf) >= 0)
+			copy_wsl_mode_bits_from_disk(wpath, -1, &fse->st_mode);
+	}
 
 	return fse;
 }

From 2ddd3a1f1cb9aaf818502bcf3c0b0c1ff4830d54 Mon Sep 17 00:00:00 2001
From: Ben Peart <benpeart@microsoft.com>
Date: Fri, 16 Nov 2018 10:59:18 -0500
Subject: [PATCH 206/247] fscache: make fscache_enable() thread safe

The recent change to make fscache thread specific relied on fscache_enable()
being called first from the primary thread before being called in parallel
from worker threads.  Make that more robust and protect it with a critical
section to avoid any issues.

Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Ben Peart <benpeart@microsoft.com>
---
 compat/mingw.c         |  4 ++++
 compat/win32/fscache.c | 23 +++++++++++++----------
 compat/win32/fscache.h |  2 ++
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 76fa68348fcf6d..8d667655244372 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -17,6 +17,7 @@
 #include "trace2.h"
 #include "win32.h"
 #include "win32/exit-process.h"
+#include "win32/fscache.h"
 #include "win32/lazyload.h"
 #include "win32/wsl.h"
 #include "wrapper.h"
@@ -4289,6 +4290,9 @@ int wmain(int argc, const wchar_t **wargv)
 	InitializeCriticalSection(&pinfo_cs);
 	InitializeCriticalSection(&phantom_symlinks_cs);
 
+	/* initialize critical section for fscache */
+	InitializeCriticalSection(&fscache_cs);
+
 	/* set up default file mode and file modes for stdin/out/err */
 	_fmode = _O_BINARY;
 	_setmode(_fileno(stdin), _O_BINARY);
diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
index 6da112e4f90382..335c46dd36c544 100644
--- a/compat/win32/fscache.c
+++ b/compat/win32/fscache.c
@@ -10,7 +10,7 @@
 
 static volatile long initialized;
 static DWORD dwTlsIndex;
-static CRITICAL_SECTION mutex;
+CRITICAL_SECTION fscache_cs;
 
 /*
  * Store one fscache per thread to avoid thread contention and locking.
@@ -395,12 +395,12 @@ int fscache_enable(size_t initial_size)
 	 * opendir and lstat function pointers are redirected if
 	 * any threads are using the fscache.
 	 */
+	EnterCriticalSection(&fscache_cs);
 	if (!initialized) {
-		InitializeCriticalSection(&mutex);
 		if (!dwTlsIndex) {
 			dwTlsIndex = TlsAlloc();
 			if (dwTlsIndex == TLS_OUT_OF_INDEXES) {
-				LeaveCriticalSection(&mutex);
+				LeaveCriticalSection(&fscache_cs);
 				return 0;
 			}
 		}
@@ -409,12 +409,13 @@ int fscache_enable(size_t initial_size)
 		opendir = fscache_opendir;
 		lstat = fscache_lstat;
 	}
-	InterlockedIncrement(&initialized);
+	initialized++;
+	LeaveCriticalSection(&fscache_cs);
 
 	/* refcount the thread specific initialization */
 	cache = fscache_getcache();
 	if (cache) {
-		InterlockedIncrement(&cache->enabled);
+		cache->enabled++;
 	} else {
 		cache = (struct fscache *)xcalloc(1, sizeof(*cache));
 		cache->enabled = 1;
@@ -448,7 +449,7 @@ void fscache_disable(void)
 		BUG("fscache_disable() called on a thread where fscache has not been initialized");
 	if (!cache->enabled)
 		BUG("fscache_disable() called on an fscache that is already disabled");
-	InterlockedDecrement(&cache->enabled);
+	cache->enabled--;
 	if (!cache->enabled) {
 		TlsSetValue(dwTlsIndex, NULL);
 		trace_printf_key(&trace_fscache, "fscache_disable: lstat %u, opendir %u, "
@@ -461,12 +462,14 @@ void fscache_disable(void)
 	}
 
 	/* update the global fscache initialization */
-	InterlockedDecrement(&initialized);
+	EnterCriticalSection(&fscache_cs);
+	initialized--;
 	if (!initialized) {
 		/* reset opendir and lstat to the original implementations */
 		opendir = dirent_opendir;
 		lstat = mingw_lstat;
 	}
+	LeaveCriticalSection(&fscache_cs);
 
 	trace_printf_key(&trace_fscache, "fscache: disable\n");
 	return;
@@ -652,7 +655,7 @@ void fscache_merge(struct fscache *dest)
 	 * isn't being used so the critical section only needs to prevent
 	 * the the child threads from stomping on each other.
 	 */
-	EnterCriticalSection(&mutex);
+	EnterCriticalSection(&fscache_cs);
 
 	hashmap_iter_init(&cache->map, &iter);
 	while ((e = hashmap_iter_next(&iter)))
@@ -664,9 +667,9 @@ void fscache_merge(struct fscache *dest)
 	dest->opendir_requests += cache->opendir_requests;
 	dest->fscache_requests += cache->fscache_requests;
 	dest->fscache_misses += cache->fscache_misses;
-	LeaveCriticalSection(&mutex);
+	initialized--;
+	LeaveCriticalSection(&fscache_cs);
 
 	free(cache);
 
-	InterlockedDecrement(&initialized);
 }
diff --git a/compat/win32/fscache.h b/compat/win32/fscache.h
index 2eb8bf3f5cfee8..042b247a542554 100644
--- a/compat/win32/fscache.h
+++ b/compat/win32/fscache.h
@@ -6,6 +6,8 @@
  * for each thread where caching is desired.
  */
 
+extern CRITICAL_SECTION fscache_cs;
+
 int fscache_enable(size_t initial_size);
 #define enable_fscache(initial_size) fscache_enable(initial_size)
 

From 871a056631e409dab0180e779e078d5ec8321bf3 Mon Sep 17 00:00:00 2001
From: Ben Peart <benpeart@microsoft.com>
Date: Thu, 1 Nov 2018 11:40:51 -0400
Subject: [PATCH 207/247] status: disable and free fscache at the end of the
 status command

At the end of the status command, disable and free the fscache so that we
don't leak the memory and so that we can dump the fscache statistics.

Signed-off-by: Ben Peart <benpeart@microsoft.com>
---
 builtin/commit.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/builtin/commit.c b/builtin/commit.c
index 666f4a37329036..fb2e6e20a39fff 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1664,6 +1664,7 @@ struct repository *repo UNUSED)
 	wt_status_print(&s);
 	wt_status_collect_free_buffers(&s);
 
+	enable_fscache(0);
 	return 0;
 }
 

From 8408feb7fe742a672c24d1a4c741b48631044458 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 20 Jul 2017 20:41:29 +0200
Subject: [PATCH 208/247] mingw: when path_lookup() failed, try BusyBox

BusyBox comes with a ton of applets ("applet" being the identical
concept to Git's "builtins"). And similar to Git's builtins, the applets
can be called via `busybox <command>`, or the BusyBox executable can be
copied/hard-linked to the command name.

The similarities do not end here. Just as with Git's builtins, it is
problematic that BusyBox' hard-linked applets cannot easily be put into
a .zip file: .zip archives have no concept of hard-links and therefore
would store identical copies (and also extract identical copies,
"inflating" the archive unnecessarily).

To counteract that issue, MinGit already ships without hard-linked
copies of the builtins, and the plan is to do the same with BusyBox'
applets: simply ship busybox.exe as single executable, without
hard-linked applets.

To accommodate that, Git is being taught by this commit a very special
trick, exploiting the fact that it is possible to call an executable
with a command-line whose argv[0] is different from the executable's
name: when `sh` is to be spawned, and no `sh` is found in the PATH, but
busybox.exe is, use that executable (with unchanged argv).

Likewise, if any executable to be spawned is not on the PATH, but
busybox.exe is found, parse the output of `busybox.exe --help` to find
out what applets are included, and if the command matches an included
applet name, use busybox.exe to execute it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/mingw.c   | 63 ++++++++++++++++++++++++++++++++++++++++++++++++
 t/t0014-alias.sh |  2 +-
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index c380cf89984449..fd014eef498e55 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -13,6 +13,7 @@
 #include "repository.h"
 #include "run-command.h"
 #include "strbuf.h"
+#include "string-list.h"
 #include "symlinks.h"
 #include "trace2.h"
 #include "win32.h"
@@ -1927,6 +1928,65 @@ static char *lookup_prog(const char *dir, int dirlen, const char *cmd,
 	return NULL;
 }
 
+static char *path_lookup(const char *cmd, int exe_only);
+
+static char *is_busybox_applet(const char *cmd)
+{
+	static struct string_list applets = STRING_LIST_INIT_DUP;
+	static char *busybox_path;
+	static int busybox_path_initialized;
+
+	/* Avoid infinite loop */
+	if (!strncasecmp(cmd, "busybox", 7) &&
+	    (!cmd[7] || !strcasecmp(cmd + 7, ".exe")))
+		return NULL;
+
+	if (!busybox_path_initialized) {
+		busybox_path = path_lookup("busybox.exe", 1);
+		busybox_path_initialized = 1;
+	}
+
+	/* Assume that sh is compiled in... */
+	if (!busybox_path || !strcasecmp(cmd, "sh"))
+		return xstrdup_or_null(busybox_path);
+
+	if (!applets.nr) {
+		struct child_process cp = CHILD_PROCESS_INIT;
+		struct strbuf buf = STRBUF_INIT;
+		char *p;
+
+		strvec_pushl(&cp.args, busybox_path, "--help", NULL);
+
+		if (capture_command(&cp, &buf, 2048)) {
+			string_list_append(&applets, "");
+			return NULL;
+		}
+
+		/* parse output */
+		p = strstr(buf.buf, "Currently defined functions:\n");
+		if (!p) {
+			warning("Could not parse output of busybox --help");
+			string_list_append(&applets, "");
+			return NULL;
+		}
+		p = strchrnul(p, '\n');
+		for (;;) {
+			size_t len;
+
+			p += strspn(p, "\n\t ,");
+			len = strcspn(p, "\n\t ,");
+			if (!len)
+				break;
+			p[len] = '\0';
+			string_list_insert(&applets, p);
+			p = p + len + 1;
+		}
+	}
+
+	return string_list_has_string(&applets, cmd) ?
+		xstrdup(busybox_path) : NULL;
+}
+
 /*
  * Determines the absolute path of cmd using the split path in path.
  * If cmd contains a slash or backslash, no lookup is performed.
@@ -1955,6 +2015,9 @@ static char *path_lookup(const char *cmd, int exe_only)
 		path = sep + 1;
 	}
 
+	if (!prog && !isexe)
+		prog = is_busybox_applet(cmd);
+
 	return prog;
 }
 
diff --git a/t/t0014-alias.sh b/t/t0014-alias.sh
index d2501fc8d643b7..891c874bad1ba4 100755
--- a/t/t0014-alias.sh
+++ b/t/t0014-alias.sh
@@ -61,7 +61,7 @@ test_expect_success HAVE_DEPRECATED 'looping aliases - deprecated builtins' '
 
 test_expect_success 'run-command formats empty args properly' '
 	test_must_fail env GIT_TRACE=1 git frotz a "" b " " c 2>actual.raw &&
-	sed -ne "/run_command:/s/.*trace: run_command: //p" actual.raw >actual &&
+	sed -ne "/run_command: git-frotz/s/.*trace: run_command: //p" actual.raw >actual &&
 	echo "git-frotz a '\'''\'' b '\'' '\'' c" >expect &&
 	test_cmp expect actual
 '

From cf53679c659edf43d82584b7d8b27394cd778e01 Mon Sep 17 00:00:00 2001
From: Tyrie Vella <tyrielv@gmail.com>
Date: Tue, 1 Sep 2026 11:38:25 -0700
Subject: [PATCH 209/247] compat/poll: do not collect more handles than the
 wait supports

The Windows implementation of poll() collects one wait handle per polled
descriptor in

    HANDLE h, handle_array[FD_SETSIZE + 2];

and appends to it without a bounds check. It then writes a NULL sentinel
at handle_array[nhandles]. A caller with enough live descriptors
therefore writes past the end of the array and corrupts the stack. The
corruption is silent, and when it reaches the stack cookie the process
aborts with STATUS_STACK_BUFFER_OVERRUN.

The array is not the only limit. The collected handles are passed to

    MsgWaitForMultipleObjects (nhandles, handle_array, FALSE,
                               wait_timeout, QS_ALLINPUT);

which waits on at most MAXIMUM_WAIT_OBJECTS objects, and QS_ALLINPUT adds
the thread message queue as one more object beyond the handles. The code
shows this, because it reports the message queue as
WAIT_OBJECT_0 + nhandles. One further handle is poll()'s own event
object. So at most MAXIMUM_WAIT_OBJECTS - 2 descriptors can be waited on,
which is the tighter of the two bounds and is well inside the array.

Define that limit as POLL_MAX_DESCRIPTORS next to the poll() declaration,
and refuse to collect beyond it, returning EINVAL. Two preprocessor
checks tie the constant to MAXIMUM_WAIT_OBJECTS and to the size of
handle_array, so the two cannot drift apart. poll() is now memory-safe
for every input, and a case that previously smashed the stack fails
cleanly.

Undo the WSAEventSelect() registrations before returning. The loop that
normally does this runs after the wait, and the new error path skips it,
which would otherwise leave those sockets associated with poll()'s static
event object and let later socket activity disturb an unrelated poll().

Note that the limit is on the number of handles actually collected, not
on nfd. Those are different: a descriptor only takes a handle when it is
non-negative, is not a socket, and has no events pending yet. Sockets are
all multiplexed onto the one event object. Callers routinely pass sparse
arrays, for example run_processes_parallel(), which sizes its pollfd
array to the configured job count and leaves the unused slots at fd = -1.
Rejecting a large nfd would break such callers even though they never
come close to the wait limit.

For platforms with a native poll(), which has no such limit, define
POLL_MAX_DESCRIPTORS to INT_MAX so that callers can clamp against it
unconditionally.

Signed-off-by: Tyrie Vella <tyrielv@gmail.com>
---
 Makefile              |   1 +
 compat/poll/poll.c    |  48 ++++++++++++-
 compat/poll/poll.h    |  16 +++++
 compat/posix.h        |  10 +++
 t/meson.build         |   1 +
 t/unit-tests/u-poll.c | 163 ++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 238 insertions(+), 1 deletion(-)
 create mode 100644 t/unit-tests/u-poll.c

diff --git a/Makefile b/Makefile
index f98af2b91aaa96..f72922a2c79aee 100644
--- a/Makefile
+++ b/Makefile
@@ -1553,6 +1553,7 @@ CLAR_TEST_SUITES += u-odb-inmemory
 CLAR_TEST_SUITES += u-oid-array
 CLAR_TEST_SUITES += u-oidmap
 CLAR_TEST_SUITES += u-oidtree
+CLAR_TEST_SUITES += u-poll
 CLAR_TEST_SUITES += u-prio-queue
 CLAR_TEST_SUITES += u-reftable-basics
 CLAR_TEST_SUITES += u-reftable-block
diff --git a/compat/poll/poll.c b/compat/poll/poll.c
index ea362b4a8e2340..1205f09ce9fbc8 100644
--- a/compat/poll/poll.c
+++ b/compat/poll/poll.c
@@ -303,6 +303,43 @@ compute_revents (int fd, int sought, fd_set *rfds, fd_set *wfds, fd_set *efds)
 }
 #endif /* !MinGW */
 
+#ifdef WIN32_NATIVE
+/* POLL_MAX_DESCRIPTORS descriptors, plus hEvent and the QS_ALLINPUT message
+   queue, must fit in one MsgWaitForMultipleObjects call, and the collected
+   handles plus the NULL sentinel must fit in handle_array.  */
+#if POLL_MAX_DESCRIPTORS + 2 > MAXIMUM_WAIT_OBJECTS
+#error POLL_MAX_DESCRIPTORS exceeds MAXIMUM_WAIT_OBJECTS
+#endif
+#if POLL_MAX_DESCRIPTORS + 2 > FD_SETSIZE + 2
+#error POLL_MAX_DESCRIPTORS does not fit in handle_array
+#endif
+
+/* Undo the WSAEventSelect() calls made for the first NFD descriptors.  */
+static void
+reset_socket_events (struct pollfd *pfd, nfds_t nfd)
+{
+  nfds_t i;
+
+  for (i = 0; i < nfd; i++)
+    {
+      HANDLE h;
+
+      if (pfd[i].fd < 0)
+	continue;
+      if (!(pfd[i].events & (POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM |
+			     POLLWRBAND | POLLPRI | POLLRDBAND)))
+	continue;
+
+      h = (HANDLE) _get_osfhandle (pfd[i].fd);
+      if (h == NULL || h == INVALID_HANDLE_VALUE)
+	continue;
+
+      if (IsSocketHandle (h))
+	WSAEventSelect ((SOCKET) h, NULL, 0);
+    }
+}
+#endif
+
 int
 poll (struct pollfd *pfd, nfds_t nfd, int timeout)
 {
@@ -504,7 +541,16 @@ poll (struct pollfd *pfd, nfds_t nfd, int timeout)
 	     bits for the "wrong" direction. */
 	  pfd[i].revents = win32_compute_revents (h, &sought);
 	  if (sought)
-	    handle_array[nhandles++] = h;
+	    {
+	      /* hEvent occupies handle_array[0].  See POLL_MAX_DESCRIPTORS.  */
+	      if (nhandles > POLL_MAX_DESCRIPTORS)
+		{
+		  reset_socket_events (pfd, i);
+		  errno = EINVAL;
+		  return -1;
+		}
+	      handle_array[nhandles++] = h;
+	    }
 	  if (pfd[i].revents)
 	    timeout = 0;
 	}
diff --git a/compat/poll/poll.h b/compat/poll/poll.h
index 1e1597360f4485..5c1169acc2c003 100644
--- a/compat/poll/poll.h
+++ b/compat/poll/poll.h
@@ -59,6 +59,22 @@ typedef unsigned long nfds_t;
 
 extern int poll (struct pollfd *pfd, nfds_t nfd, int timeout);
 
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+/*
+ * This poll() is emulated with MsgWaitForMultipleObjects(), which waits on at
+ * most MAXIMUM_WAIT_OBJECTS (64) objects. Two of those are never available for
+ * polled descriptors: poll() waits on its own event object, and QS_ALLINPUT
+ * adds the thread message queue. Sockets do not count, because they are all
+ * multiplexed onto that one event object; every other descriptor takes a wait
+ * slot of its own.
+ *
+ * Callers that poll one or more descriptors per child must keep the number of
+ * simultaneously live descriptors within this limit. Exceeding it fails with
+ * EINVAL.
+ */
+#define POLL_MAX_DESCRIPTORS 62
+#endif
+
 /* Define INFTIM only if doing so conforms to POSIX.  */
 #if !defined (_POSIX_C_SOURCE) && !defined (_XOPEN_SOURCE)
 #define INFTIM (-1)
diff --git a/compat/posix.h b/compat/posix.h
index 71cc7316204187..e7c4be2c155c13 100644
--- a/compat/posix.h
+++ b/compat/posix.h
@@ -133,6 +133,16 @@
 /* Pull the compat stuff */
 #include <poll.h>
 #endif
+
+/*
+ * compat/poll defines POLL_MAX_DESCRIPTORS to the largest number of
+ * descriptors its poll() emulation can wait on. A native poll() has no such
+ * limit, so callers that fan out one descriptor per child can clamp against
+ * this unconditionally.
+ */
+#ifndef POLL_MAX_DESCRIPTORS
+#define POLL_MAX_DESCRIPTORS INT_MAX
+#endif
 #ifdef HAVE_BSD_SYSCTL
 #include <sys/sysctl.h>
 #endif
diff --git a/t/meson.build b/t/meson.build
index d6c03278343375..787acb3df324c6 100644
--- a/t/meson.build
+++ b/t/meson.build
@@ -11,6 +11,7 @@ clar_test_suites = [
   'unit-tests/u-oid-array.c',
   'unit-tests/u-oidmap.c',
   'unit-tests/u-oidtree.c',
+  'unit-tests/u-poll.c',
   'unit-tests/u-prio-queue.c',
   'unit-tests/u-reftable-basics.c',
   'unit-tests/u-reftable-block.c',
diff --git a/t/unit-tests/u-poll.c b/t/unit-tests/u-poll.c
new file mode 100644
index 00000000000000..bc72135da28451
--- /dev/null
+++ b/t/unit-tests/u-poll.c
@@ -0,0 +1,163 @@
+#include "unit-test.h"
+
+#ifdef GIT_WINDOWS_NATIVE
+static struct {
+	int pipes[POLL_MAX_DESCRIPTORS + 1][2];
+	size_t nr_pipes;
+	int listener;
+	int sockets[2];
+	WSAEVENT event;
+	int event_selected;
+} poll_test;
+
+static void open_pipes(struct pollfd *fds, size_t nr)
+{
+	size_t i;
+
+	cl_assert(nr <= ARRAY_SIZE(poll_test.pipes));
+	for (i = 0; i < nr; i++) {
+		int *pipefd = poll_test.pipes[poll_test.nr_pipes];
+
+		cl_assert_equal_i(pipe(pipefd), 0);
+		poll_test.nr_pipes++;
+		fds[i].fd = pipefd[0];
+		fds[i].events = POLLIN;
+	}
+}
+
+static void create_socket_pair(void)
+{
+	struct sockaddr_in address = {
+		.sin_family = AF_INET,
+		.sin_addr.s_addr = htonl(INADDR_LOOPBACK),
+	};
+	socklen_t address_length = sizeof(address);
+
+	poll_test.listener = socket(AF_INET, SOCK_STREAM, 0);
+	cl_assert(poll_test.listener >= 0);
+	cl_assert_equal_i(bind(poll_test.listener,
+			       (struct sockaddr *)&address,
+			       sizeof(address)), 0);
+	cl_assert_equal_i(getsockname(
+				  (SOCKET)_get_osfhandle(poll_test.listener),
+				  (struct sockaddr *)&address,
+				  &address_length), 0);
+	cl_assert_equal_i(listen(poll_test.listener, 1), 0);
+
+	poll_test.sockets[0] = socket(AF_INET, SOCK_STREAM, 0);
+	cl_assert(poll_test.sockets[0] >= 0);
+	cl_assert_equal_i(connect(poll_test.sockets[0],
+				  (struct sockaddr *)&address,
+				  sizeof(address)), 0);
+
+	poll_test.sockets[1] = accept(poll_test.listener, NULL, NULL);
+	cl_assert(poll_test.sockets[1] >= 0);
+	close(poll_test.listener);
+	poll_test.listener = -1;
+}
+#endif
+
+void test_poll__initialize(void)
+{
+#ifdef GIT_WINDOWS_NATIVE
+	memset(&poll_test, 0, sizeof(poll_test));
+	poll_test.listener = -1;
+	poll_test.sockets[0] = -1;
+	poll_test.sockets[1] = -1;
+	poll_test.event = WSA_INVALID_EVENT;
+#endif
+}
+
+void test_poll__cleanup(void)
+{
+#ifdef GIT_WINDOWS_NATIVE
+	size_t i;
+
+	if (poll_test.event_selected && poll_test.sockets[0] >= 0)
+		WSAEventSelect(
+			(SOCKET)_get_osfhandle(poll_test.sockets[0]), NULL, 0);
+	if (poll_test.event != WSA_INVALID_EVENT)
+		WSACloseEvent(poll_test.event);
+	if (poll_test.listener >= 0)
+		close(poll_test.listener);
+	for (i = 0; i < ARRAY_SIZE(poll_test.sockets); i++)
+		if (poll_test.sockets[i] >= 0)
+			close(poll_test.sockets[i]);
+	for (i = 0; i < poll_test.nr_pipes; i++) {
+		close(poll_test.pipes[i][0]);
+		close(poll_test.pipes[i][1]);
+	}
+#endif
+}
+
+void test_poll__limit(void)
+{
+#ifdef GIT_WINDOWS_NATIVE
+	struct pollfd fds[POLL_MAX_DESCRIPTORS + 1] = { 0 };
+
+	open_pipes(fds, ARRAY_SIZE(fds));
+	cl_assert_equal_i(poll(fds, POLL_MAX_DESCRIPTORS, 0), 0);
+
+	errno = 0;
+	cl_assert_equal_i(poll(fds, ARRAY_SIZE(fds), 0), -1);
+	cl_assert_equal_i(errno, EINVAL);
+#else
+	cl_skip();
+#endif
+}
+
+void test_poll__sparse(void)
+{
+#ifdef GIT_WINDOWS_NATIVE
+	struct pollfd fds[2 * POLL_MAX_DESCRIPTORS + 1] = { 0 };
+	size_t i;
+
+	open_pipes(fds, POLL_MAX_DESCRIPTORS);
+	create_socket_pair();
+
+	for (i = POLL_MAX_DESCRIPTORS; i > 0; i--) {
+		fds[2 * i - 1] = fds[i - 1];
+		fds[2 * i - 2].fd = -1;
+	}
+	fds[2 * POLL_MAX_DESCRIPTORS].fd = poll_test.sockets[0];
+	fds[2 * POLL_MAX_DESCRIPTORS].events = POLLIN;
+
+	cl_assert_equal_i(poll(fds, ARRAY_SIZE(fds), 0), 0);
+#else
+	cl_skip();
+#endif
+}
+
+void test_poll__socket_cleanup(void)
+{
+#ifdef GIT_WINDOWS_NATIVE
+	struct pollfd fds[POLL_MAX_DESCRIPTORS + 2] = { 0 };
+	WSANETWORKEVENTS events;
+	SOCKET socket_handle;
+
+	create_socket_pair();
+	socket_handle = (SOCKET)_get_osfhandle(poll_test.sockets[0]);
+	poll_test.event = WSACreateEvent();
+	cl_assert(poll_test.event != WSA_INVALID_EVENT);
+	cl_assert_equal_i(WSAEventSelect(socket_handle, poll_test.event,
+					FD_READ), 0);
+	poll_test.event_selected = 1;
+
+	fds[0].fd = poll_test.sockets[0];
+	open_pipes(fds + 1, POLL_MAX_DESCRIPTORS + 1);
+
+	errno = 0;
+	cl_assert_equal_i(poll(fds, ARRAY_SIZE(fds), 0), -1);
+	cl_assert_equal_i(errno, EINVAL);
+
+	cl_assert_equal_i(send(
+				  (SOCKET)_get_osfhandle(poll_test.sockets[1]),
+				  "x", 1, 0), 1);
+	cl_assert_equal_i(WaitForSingleObject(poll_test.event, 1000),
+			  WAIT_OBJECT_0);
+	cl_assert_equal_i(WSAEnumNetworkEvents(socket_handle, poll_test.event,
+					      &events), 0);
+#else
+	cl_skip();
+#endif
+}

From b90454ad2790b5471defe34079fe16f93a5dcf64 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 11 Dec 2018 12:17:49 +0100
Subject: [PATCH 210/247] fscache: implement an FSCache-aware is_mount_point()

When FSCache is active, we can cache the reparse tag and use it directly
to determine whether a path refers to an NTFS junction, without any
additional, costly I/O.

Note: this change only makes a difference with the next commit, which
will make use of the FSCache in `git clean` (contingent on
`core.fscache` set, of course).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/mingw.c         |  2 ++
 compat/mingw.h         |  3 ++-
 compat/win32/fscache.c | 40 ++++++++++++++++++++++++++++++++++++++++
 compat/win32/fscache.h |  1 +
 4 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 8d667655244372..69896770fc7a8f 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -3484,6 +3484,8 @@ pid_t waitpid(pid_t pid, int *status, int options)
 	return -1;
 }
 
+int (*win32_is_mount_point)(struct strbuf *path) = mingw_is_mount_point;
+
 int mingw_is_mount_point(struct strbuf *path)
 {
 	WIN32_FIND_DATAW findbuf = { 0 };
diff --git a/compat/mingw.h b/compat/mingw.h
index bae25483cf7ce0..4bbc6c5ce78759 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -40,7 +40,8 @@ static inline void convert_slashes(char *path)
 }
 struct strbuf;
 int mingw_is_mount_point(struct strbuf *path);
-#define is_mount_point mingw_is_mount_point
+extern int (*win32_is_mount_point)(struct strbuf *path);
+#define is_mount_point win32_is_mount_point
 #define CAN_UNLINK_MOUNT_POINTS 1
 #define PATH_SEP ';'
 char *mingw_query_user_email(void);
diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
index e247e9a6663131..26ae9ab1c1a464 100644
--- a/compat/win32/fscache.c
+++ b/compat/win32/fscache.c
@@ -515,6 +515,7 @@ int fscache_enable(size_t initial_size)
 		/* redirect opendir and lstat to the fscache implementations */
 		opendir = fscache_opendir;
 		lstat = fscache_lstat;
+		win32_is_mount_point = fscache_is_mount_point;
 	}
 	initialized++;
 	LeaveCriticalSection(&fscache_cs);
@@ -575,6 +576,7 @@ void fscache_disable(void)
 		/* reset opendir and lstat to the original implementations */
 		opendir = dirent_opendir;
 		lstat = mingw_lstat;
+		win32_is_mount_point = mingw_is_mount_point;
 	}
 	LeaveCriticalSection(&fscache_cs);
 
@@ -662,6 +664,44 @@ int fscache_lstat(const char *filename, struct stat *st)
 	return 0;
 }
 
+/*
+ * is_mount_point() replacement, uses cache if enabled, otherwise falls
+ * back to mingw_is_mount_point().
+ */
+int fscache_is_mount_point(struct strbuf *path)
+{
+	int dirlen, base, len;
+#pragma GCC diagnostic push
+#ifdef __clang__
+#pragma GCC diagnostic ignored "-Wflexible-array-extensions"
+#endif
+	struct heap_fsentry key[2];
+#pragma GCC diagnostic pop
+	struct fsentry *fse;
+	struct fscache *cache = fscache_getcache();
+
+	if (!cache || !do_fscache_enabled(cache, path->buf))
+		return mingw_is_mount_point(path);
+
+	cache->lstat_requests++;
+	/* split path into path + name */
+	len = path->len;
+	if (len && is_dir_sep(path->buf[len - 1]))
+		len--;
+	base = len;
+	while (base && !is_dir_sep(path->buf[base - 1]))
+		base--;
+	dirlen = base ? base - 1 : 0;
+
+	/* lookup entry for path + name in cache */
+	fsentry_init(&key[0].u.ent, NULL, path->buf, dirlen);
+	fsentry_init(&key[1].u.ent, &key[0].u.ent, path->buf + base, len - base);
+	fse = fscache_get(cache, &key[1].u.ent);
+	if (!fse)
+		return mingw_is_mount_point(path);
+	return fse->reparse_tag == IO_REPARSE_TAG_MOUNT_POINT;
+}
+
 typedef struct fscache_DIR {
 	struct DIR base_dir; /* extend base struct DIR */
 	struct fsentry *pfsentry;
diff --git a/compat/win32/fscache.h b/compat/win32/fscache.h
index 042b247a542554..386c770a85d321 100644
--- a/compat/win32/fscache.h
+++ b/compat/win32/fscache.h
@@ -22,6 +22,7 @@ void fscache_flush(void);
 
 DIR *fscache_opendir(const char *dir);
 int fscache_lstat(const char *file_name, struct stat *buf);
+int fscache_is_mount_point(struct strbuf *path);
 
 /* opaque fscache structure */
 struct fscache;

From edc99676761977512a3c066832ed5e605d6e51e5 Mon Sep 17 00:00:00 2001
From: Ben Peart <benpeart@microsoft.com>
Date: Thu, 15 Nov 2018 14:15:40 -0500
Subject: [PATCH 211/247] fscache: teach fscache to use NtQueryDirectoryFile

Using FindFirstFileExW() requires the OS to allocate a 64K buffer for each
directory and then free it when we call FindClose().  Update fscache to call
the underlying kernel API NtQueryDirectoryFile so that we can do the buffer
management ourselves.  That allows us to allocate a single buffer for the
lifetime of the cache and reuse it for each directory.

This change improves performance of 'git status' by 18% in a repo with ~200K
files and 30k folders.

Documentation for NtQueryDirectoryFile can be found at:

https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/content/ntifs/nf-ntifs-ntquerydirectoryfile
https://docs.microsoft.com/en-us/windows/desktop/FileIO/file-attribute-constants
https://docs.microsoft.com/en-us/windows/desktop/fileio/reparse-point-tags

To determine if the specified directory is a symbolic link, inspect the
FileAttributes member to see if the FILE_ATTRIBUTE_REPARSE_POINT flag is
set. If so, EaSize will contain the reparse tag (this is a so far
undocumented feature, but confirmed by the NTFS developers). To
determine if the reparse point is a symbolic link (and not some other
form of reparse point), test whether the tag value equals the value
IO_REPARSE_TAG_SYMLINK.

The NtQueryDirectoryFile() call works best (and on Windows 8.1 and
earlier, it works *only*) with buffer sizes up to 64kB. Which is 32k
wide characters, so let's use that as our buffer size.

Signed-off-by: Ben Peart <benpeart@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/win32/fscache.c | 126 +++++++++++++++++++++++++++++----------
 compat/win32/ntifs.h   | 131 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 226 insertions(+), 31 deletions(-)
 create mode 100644 compat/win32/ntifs.h

diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
index 335c46dd36c544..973ae7efb246c9 100644
--- a/compat/win32/fscache.c
+++ b/compat/win32/fscache.c
@@ -7,6 +7,7 @@
 #include "../../trace.h"
 #include "config.h"
 #include "../../mem-pool.h"
+#include "ntifs.h"
 
 static volatile long initialized;
 static DWORD dwTlsIndex;
@@ -26,6 +27,13 @@ struct fscache {
 	unsigned int opendir_requests;
 	unsigned int fscache_requests;
 	unsigned int fscache_misses;
+	/*
+	 * 32k wide characters translates to 64kB, which is the maximum that
+	 * Windows 8.1 and earlier can handle. On network drives, not only
+	 * the client's Windows version matters, but also the server's,
+	 * therefore we need to keep this to 64kB.
+	 */
+	WCHAR buffer[32 * 1024];
 };
 static struct trace_key trace_fscache = TRACE_KEY_INIT(FSCACHE);
 
@@ -166,29 +174,47 @@ static void fsentry_release(struct fsentry *fse)
 	InterlockedDecrement(&(fse->u.refcnt));
 }
 
+static int xwcstoutfn(char *utf, int utflen, const wchar_t *wcs, int wcslen)
+{
+	if (!wcs || !utf || utflen < 1) {
+		errno = EINVAL;
+		return -1;
+	}
+	utflen = WideCharToMultiByte(CP_UTF8, 0, wcs, wcslen, utf, utflen, NULL, NULL);
+	if (utflen)
+		return utflen;
+	errno = ERANGE;
+	return -1;
+}
+
 /*
- * Allocate and initialize an fsentry from a WIN32_FIND_DATA structure.
+ * Allocate and initialize an fsentry from a FILE_FULL_DIR_INFORMATION structure.
  */
 static struct fsentry *fseentry_create_entry(struct fscache *cache,
 					     struct fsentry *list,
-					     const WIN32_FIND_DATAW *fdata)
+					     PFILE_FULL_DIR_INFORMATION fdata)
 {
 	char buf[MAX_PATH * 3];
 	int len;
 	struct fsentry *fse;
-	len = xwcstoutf(buf, fdata->cFileName, ARRAY_SIZE(buf));
+
+	len = xwcstoutfn(buf, ARRAY_SIZE(buf), fdata->FileName, fdata->FileNameLength / sizeof(wchar_t));
 
 	fse = fsentry_alloc(cache, list, buf, len);
 
-	fse->st_mode = file_attr_to_st_mode(fdata->dwFileAttributes,
-					    IO_REPARSE_TAG_SYMLINK);
+	fse->st_mode = file_attr_to_st_mode(fdata->FileAttributes,
+					    fdata->EaSize);
 	fse->dirent.d_type = S_ISREG(fse->st_mode) ? DT_REG :
 			S_ISDIR(fse->st_mode) ? DT_DIR : DT_LNK;
-	fse->u.s.st_size = (((off64_t) (fdata->nFileSizeHigh)) << 32)
-			| fdata->nFileSizeLow;
-	filetime_to_timespec(&(fdata->ftLastAccessTime), &(fse->u.s.st_atim));
-	filetime_to_timespec(&(fdata->ftLastWriteTime), &(fse->u.s.st_mtim));
-	filetime_to_timespec(&(fdata->ftCreationTime), &(fse->u.s.st_ctim));
+	fse->u.s.st_size = S_ISLNK(fse->st_mode) ? MAX_PATH :
+			fdata->EndOfFile.LowPart |
+			(((off_t)fdata->EndOfFile.HighPart) << 32);
+	filetime_to_timespec((FILETIME *)&(fdata->LastAccessTime),
+			     &(fse->u.s.st_atim));
+	filetime_to_timespec((FILETIME *)&(fdata->LastWriteTime),
+			     &(fse->u.s.st_mtim));
+	filetime_to_timespec((FILETIME *)&(fdata->CreationTime),
+			     &(fse->u.s.st_ctim));
 
 	return fse;
 }
@@ -201,8 +227,10 @@ static struct fsentry *fseentry_create_entry(struct fscache *cache,
 static struct fsentry *fsentry_create_list(struct fscache *cache, const struct fsentry *dir,
 					   int *dir_not_found)
 {
-	wchar_t pattern[MAX_PATH + 2]; /* + 2 for '/' '*' */
-	WIN32_FIND_DATAW fdata;
+	wchar_t pattern[MAX_PATH];
+	NTSTATUS status;
+	IO_STATUS_BLOCK iosb;
+	PFILE_FULL_DIR_INFORMATION di;
 	HANDLE h;
 	int wlen;
 	struct fsentry *list, **phead;
@@ -218,15 +246,18 @@ static struct fsentry *fsentry_create_list(struct fscache *cache, const struct f
 		return NULL;
 	}
 
-	/* append optional '/' and wildcard '*' */
-	if (wlen)
-		pattern[wlen++] = '/';
-	pattern[wlen++] = '*';
-	pattern[wlen] = 0;
+	/* handle CWD */
+	if (!wlen) {
+		wlen = GetCurrentDirectoryW(ARRAY_SIZE(pattern), pattern);
+		if (!wlen || wlen >= (ssize_t)ARRAY_SIZE(pattern)) {
+			errno = wlen ? ENAMETOOLONG : err_win_to_posix(GetLastError());
+			return NULL;
+		}
+	}
 
-	/* open find handle */
-	h = FindFirstFileExW(pattern, FindExInfoBasic, &fdata, FindExSearchNameMatch,
-		NULL, FIND_FIRST_EX_LARGE_FETCH);
+	h = CreateFileW(pattern, FILE_LIST_DIRECTORY,
+		FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+		NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
 	if (h == INVALID_HANDLE_VALUE) {
 		err = GetLastError();
 		*dir_not_found = 1; /* or empty directory */
@@ -243,22 +274,55 @@ static struct fsentry *fsentry_create_list(struct fscache *cache, const struct f
 
 	/* walk directory and build linked list of fsentry structures */
 	phead = &list->next;
-	do {
-		*phead = fseentry_create_entry(cache, list, &fdata);
+	status = NtQueryDirectoryFile(h, NULL, 0, 0, &iosb, cache->buffer,
+		sizeof(cache->buffer), FileFullDirectoryInformation, FALSE, NULL, FALSE);
+	if (!NT_SUCCESS(status)) {
+		/*
+		 * NtQueryDirectoryFile returns STATUS_INVALID_PARAMETER when
+		 * asked to enumerate an invalid directory (ie it is a file
+		 * instead of a directory).  Verify that is the actual cause
+		 * of the error.
+		*/
+		if (status == (NTSTATUS)STATUS_INVALID_PARAMETER) {
+			DWORD attributes = GetFileAttributesW(pattern);
+			if (!(attributes & FILE_ATTRIBUTE_DIRECTORY))
+				status = ERROR_DIRECTORY;
+		}
+		goto Error;
+	}
+	di = (PFILE_FULL_DIR_INFORMATION)(cache->buffer);
+	for (;;) {
+
+		*phead = fseentry_create_entry(cache, list, di);
 		phead = &(*phead)->next;
-	} while (FindNextFileW(h, &fdata));
 
-	/* remember result of last FindNextFile, then close find handle */
-	err = GetLastError();
-	FindClose(h);
+		/* If there is no offset in the entry, the buffer has been exhausted. */
+		if (di->NextEntryOffset == 0) {
+			status = NtQueryDirectoryFile(h, NULL, 0, 0, &iosb, cache->buffer,
+				sizeof(cache->buffer), FileFullDirectoryInformation, FALSE, NULL, FALSE);
+			if (!NT_SUCCESS(status)) {
+				if (status == STATUS_NO_MORE_FILES)
+					break;
+				goto Error;
+			}
+
+			di = (PFILE_FULL_DIR_INFORMATION)(cache->buffer);
+			continue;
+		}
+
+		/* Advance to the next entry. */
+		di = (PFILE_FULL_DIR_INFORMATION)(((PUCHAR)di) + di->NextEntryOffset);
+	}
 
-	/* return the list if we've got all the files */
-	if (err == ERROR_NO_MORE_FILES)
-		return list;
+	CloseHandle(h);
+	return list;
 
-	/* otherwise release the list and return error */
+Error:
+	trace_printf_key(&trace_fscache,
+			 "fscache: status(%ld) unable to query directory "
+			 "contents '%s'\n", status, dir->dirent.d_name);
+	CloseHandle(h);
 	fsentry_release(list);
-	errno = err_win_to_posix(err);
 	return NULL;
 }
 
diff --git a/compat/win32/ntifs.h b/compat/win32/ntifs.h
new file mode 100644
index 00000000000000..64ed792c52f352
--- /dev/null
+++ b/compat/win32/ntifs.h
@@ -0,0 +1,131 @@
+#ifndef _NTIFS_
+#define _NTIFS_
+
+/*
+ * Copy necessary structures and definitions out of the Windows DDK
+ * to enable calling NtQueryDirectoryFile()
+ */
+
+typedef _Return_type_success_(return >= 0) LONG NTSTATUS;
+#define NT_SUCCESS(Status)  (((NTSTATUS)(Status)) >= 0)
+
+#if !defined(_NTSECAPI_) && !defined(_WINTERNL_) && \
+	!defined(__UNICODE_STRING_DEFINED)
+#define __UNICODE_STRING_DEFINED
+typedef struct _UNICODE_STRING {
+	USHORT Length;
+	USHORT MaximumLength;
+	PWSTR Buffer;
+} UNICODE_STRING;
+typedef UNICODE_STRING *PUNICODE_STRING;
+typedef const UNICODE_STRING *PCUNICODE_STRING;
+#endif /* !_NTSECAPI_ && !_WINTERNL_ && !__UNICODE_STRING_DEFINED */
+
+typedef enum _FILE_INFORMATION_CLASS {
+	FileDirectoryInformation = 1,
+	FileFullDirectoryInformation,
+	FileBothDirectoryInformation,
+	FileBasicInformation,
+	FileStandardInformation,
+	FileInternalInformation,
+	FileEaInformation,
+	FileAccessInformation,
+	FileNameInformation,
+	FileRenameInformation,
+	FileLinkInformation,
+	FileNamesInformation,
+	FileDispositionInformation,
+	FilePositionInformation,
+	FileFullEaInformation,
+	FileModeInformation,
+	FileAlignmentInformation,
+	FileAllInformation,
+	FileAllocationInformation,
+	FileEndOfFileInformation,
+	FileAlternateNameInformation,
+	FileStreamInformation,
+	FilePipeInformation,
+	FilePipeLocalInformation,
+	FilePipeRemoteInformation,
+	FileMailslotQueryInformation,
+	FileMailslotSetInformation,
+	FileCompressionInformation,
+	FileObjectIdInformation,
+	FileCompletionInformation,
+	FileMoveClusterInformation,
+	FileQuotaInformation,
+	FileReparsePointInformation,
+	FileNetworkOpenInformation,
+	FileAttributeTagInformation,
+	FileTrackingInformation,
+	FileIdBothDirectoryInformation,
+	FileIdFullDirectoryInformation,
+	FileValidDataLengthInformation,
+	FileShortNameInformation,
+	FileIoCompletionNotificationInformation,
+	FileIoStatusBlockRangeInformation,
+	FileIoPriorityHintInformation,
+	FileSfioReserveInformation,
+	FileSfioVolumeInformation,
+	FileHardLinkInformation,
+	FileProcessIdsUsingFileInformation,
+	FileNormalizedNameInformation,
+	FileNetworkPhysicalNameInformation,
+	FileIdGlobalTxDirectoryInformation,
+	FileIsRemoteDeviceInformation,
+	FileAttributeCacheInformation,
+	FileNumaNodeInformation,
+	FileStandardLinkInformation,
+	FileRemoteProtocolInformation,
+	FileMaximumInformation
+} FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS;
+
+typedef struct _FILE_FULL_DIR_INFORMATION {
+	ULONG NextEntryOffset;
+	ULONG FileIndex;
+	LARGE_INTEGER CreationTime;
+	LARGE_INTEGER LastAccessTime;
+	LARGE_INTEGER LastWriteTime;
+	LARGE_INTEGER ChangeTime;
+	LARGE_INTEGER EndOfFile;
+	LARGE_INTEGER AllocationSize;
+	ULONG FileAttributes;
+	ULONG FileNameLength;
+	ULONG EaSize;
+	WCHAR FileName[1];
+} FILE_FULL_DIR_INFORMATION, *PFILE_FULL_DIR_INFORMATION;
+
+typedef struct _IO_STATUS_BLOCK {
+	union {
+		NTSTATUS Status;
+		PVOID Pointer;
+	} u;
+	ULONG_PTR Information;
+} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK;
+
+typedef VOID
+(NTAPI *PIO_APC_ROUTINE)(
+	IN PVOID ApcContext,
+	IN PIO_STATUS_BLOCK IoStatusBlock,
+	IN ULONG Reserved);
+
+NTSYSCALLAPI
+NTSTATUS
+NTAPI
+NtQueryDirectoryFile(
+	_In_ HANDLE FileHandle,
+	_In_opt_ HANDLE Event,
+	_In_opt_ PIO_APC_ROUTINE ApcRoutine,
+	_In_opt_ PVOID ApcContext,
+	_Out_ PIO_STATUS_BLOCK IoStatusBlock,
+	_Out_writes_bytes_(Length) PVOID FileInformation,
+	_In_ ULONG Length,
+	_In_ FILE_INFORMATION_CLASS FileInformationClass,
+	_In_ BOOLEAN ReturnSingleEntry,
+	_In_opt_ PUNICODE_STRING FileName,
+	_In_ BOOLEAN RestartScan
+);
+
+#define STATUS_NO_MORE_FILES             ((NTSTATUS)0x80000006L)
+
+#endif

From b7d95f37cf8e62d521d9f8798183b782705fb07a Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 20 Jul 2017 22:18:56 +0200
Subject: [PATCH 212/247] test-tool: learn to act as a drop-in replacement for
 `iconv`

It is convenient to assume that everybody who wants to build & test Git
has access to a working `iconv` executable (after all, we already pretty
much require libiconv).

However, that limits esoteric test scenarios such as Git for Windows',
where an end user installation has to ship with `iconv` for the sole
purpose of being testable. That payload serves no other purpose.

So let's just have a test helper (to be able to test Git, the test
helpers have to be available, after all) to act as `iconv` replacement.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 Makefile              |  1 +
 t/helper/meson.build  |  1 +
 t/helper/test-iconv.c | 47 +++++++++++++++++++++++++++++++++++++++++++
 t/helper/test-tool.c  |  1 +
 t/helper/test-tool.h  |  1 +
 5 files changed, 51 insertions(+)
 create mode 100644 t/helper/test-iconv.c

diff --git a/Makefile b/Makefile
index f72922a2c79aee..c98be9155c54ae 100644
--- a/Makefile
+++ b/Makefile
@@ -841,6 +841,7 @@ TEST_BUILTINS_OBJS += test-hash-speed.o
 TEST_BUILTINS_OBJS += test-hash.o
 TEST_BUILTINS_OBJS += test-hashmap.o
 TEST_BUILTINS_OBJS += test-hexdump.o
+TEST_BUILTINS_OBJS += test-iconv.o
 TEST_BUILTINS_OBJS += test-json-writer.o
 TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o
 TEST_BUILTINS_OBJS += test-match-trees.o
diff --git a/t/helper/meson.build b/t/helper/meson.build
index 3235f10ab8aae1..d4499d26a9af1f 100644
--- a/t/helper/meson.build
+++ b/t/helper/meson.build
@@ -29,6 +29,7 @@ test_tool_sources = [
   'test-hash.c',
   'test-hashmap.c',
   'test-hexdump.c',
+  'test-iconv.c',
   'test-json-writer.c',
   'test-lazy-init-name-hash.c',
   'test-match-trees.c',
diff --git a/t/helper/test-iconv.c b/t/helper/test-iconv.c
new file mode 100644
index 00000000000000..d3c772fddf990b
--- /dev/null
+++ b/t/helper/test-iconv.c
@@ -0,0 +1,47 @@
+#include "test-tool.h"
+#include "git-compat-util.h"
+#include "strbuf.h"
+#include "gettext.h"
+#include "parse-options.h"
+#include "utf8.h"
+
+int cmd__iconv(int argc, const char **argv)
+{
+	struct strbuf buf = STRBUF_INIT;
+	char *from = NULL, *to = NULL, *p;
+	size_t len;
+	int ret = 0;
+	const char * const iconv_usage[] = {
+		N_("test-helper --iconv [<options>]"),
+		NULL
+	};
+	struct option options[] = {
+		OPT_STRING('f', "from-code", &from, "encoding", "from"),
+		OPT_STRING('t', "to-code", &to, "encoding", "to"),
+		OPT_END()
+	};
+
+	argc = parse_options(argc, argv, NULL, options,
+			iconv_usage, 0);
+
+	if (argc > 1 || !from || !to)
+		usage_with_options(iconv_usage, options);
+
+	if (!argc) {
+		if (strbuf_read(&buf, 0, 2048) < 0)
+			die_errno("Could not read from stdin");
+	} else if (strbuf_read_file(&buf, argv[0], 2048) < 0)
+		die_errno("Could not read from '%s'", argv[0]);
+
+	p = reencode_string_len(buf.buf, buf.len, to, from, &len);
+	if (!p)
+		die_errno("Could not reencode");
+	if (write(1, p, len) < 0)
+		ret = !!error_errno("Could not write %"PRIuMAX" bytes",
+				    (uintmax_t)len);
+
+	strbuf_release(&buf);
+	free(p);
+
+	return ret;
+}
diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c
index b71a22b43bbc9e..ee16b2cb23719e 100644
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c
@@ -39,6 +39,7 @@ static struct test_cmd cmds[] = {
 	{ "hashmap", cmd__hashmap },
 	{ "hash-speed", cmd__hash_speed },
 	{ "hexdump", cmd__hexdump },
+	{ "iconv", cmd__iconv },
 	{ "json-writer", cmd__json_writer },
 	{ "lazy-init-name-hash", cmd__lazy_init_name_hash },
 	{ "match-trees", cmd__match_trees },
diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
index f2885b33d58aa8..4cf9f935a4cdfa 100644
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@ -32,6 +32,7 @@ int cmd__getcwd(int argc, const char **argv);
 int cmd__hashmap(int argc, const char **argv);
 int cmd__hash_speed(int argc, const char **argv);
 int cmd__hexdump(int argc, const char **argv);
+int cmd__iconv(int argc, const char **argv);
 int cmd__json_writer(int argc, const char **argv);
 int cmd__lazy_init_name_hash(int argc, const char **argv);
 int cmd__match_trees(int argc, const char **argv);

From d7b8fabe043443160fbe0831e02e05a2cea82211 Mon Sep 17 00:00:00 2001
From: Tyrie Vella <tyrielv@gmail.com>
Date: Tue, 1 Sep 2026 11:38:35 -0700
Subject: [PATCH 213/247] parallel-checkout: limit worker count to what poll()
 can wait on

On Windows, `git checkout` and `git reset --hard` can abort with

    *** stack smashing detected ***: terminated

and exit code 0xC0000409 (STATUS_STACK_BUFFER_OVERRUN) when
checkout.workers is large, or when it is set to 0 on a machine with many
logical processors.

gather_results_from_workers() polls one pipe per checkout worker. Windows
has no native poll(), so compat/poll emulates it with
MsgWaitForMultipleObjects(), which cannot wait on more than
POLL_MAX_DESCRIPTORS descriptors at once. compat/poll collects one handle
per polled descriptor in a fixed stack array, so a higher worker count
writes past the end of that array and corrupts the stack.

run_parallel_checkout() clamped num_workers only by the number of files.
Clamp it to POLL_MAX_DESCRIPTORS as well. That function is the single
choke point before the workers start and the poll() loop runs. Clamp
silently: fewer workers is correct behaviour, and a warning would fire on
every checkout on a large machine. A single poll() loop cannot usefully
drive more readers than this anyway. On platforms with a native poll()
the limit is INT_MAX, so the clamp is a no-op.

The problem became reachable in 2.54. Before that, online_cpus() used
GetSystemInfo(), which reports only the processors in the current
processor group, and a group holds at most 64. That accidental ceiling
kept the array in bounds. The move to
GetLogicalProcessorInformationEx() is correct and reports the true
system-wide count, which exposed the latent bug.

Document the cap, because checkout.workers is otherwise described as
using one worker per logical core with no upper bound.

Add a test that asserts the clamp. test_checkout_workers() counts the
workers that were actually spawned, so the test can check the effective
count rather than only that the checkout succeeded. The test is limited
to Windows, because that is the only platform where the cap applies.

Signed-off-by: Tyrie Vella <tyrielv@gmail.com>
---
 Documentation/config/checkout.adoc  |  5 ++++
 parallel-checkout.c                 |  7 ++++++
 t/t2080-parallel-checkout-basics.sh | 36 +++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+)

diff --git a/Documentation/config/checkout.adoc b/Documentation/config/checkout.adoc
index e35d21296978fe..45951bf38a5e3c 100644
--- a/Documentation/config/checkout.adoc
+++ b/Documentation/config/checkout.adoc
@@ -30,6 +30,11 @@ commands or functionality in the future.
 	all commands that perform checkout. E.g. checkout, clone, reset,
 	sparse-checkout, etc.
 +
+On Windows the number of workers is capped at 62, because the `poll()`
+emulation cannot wait on more worker pipes than that. A higher configured
+value, including the logical core count on a machine with many cores, is
+silently reduced to the cap.
++
 NOTE: Parallel checkout usually delivers better performance for repositories
 located on SSDs or over NFS. For repositories on spinning disks and/or machines
 with a small number of cores, the default sequential checkout often performs
diff --git a/parallel-checkout.c b/parallel-checkout.c
index 1eb277a0fc0a55..4595cf4e8d9250 100644
--- a/parallel-checkout.c
+++ b/parallel-checkout.c
@@ -671,6 +671,13 @@ int run_parallel_checkout(struct checkout *state, int num_workers, int threshold
 	if (parallel_checkout.nr < num_workers)
 		num_workers = parallel_checkout.nr;
 
+	/*
+	 * gather_results_from_workers() polls one pipe per worker, so the
+	 * worker count must stay within what poll() can wait on.
+	 */
+	if (num_workers > POLL_MAX_DESCRIPTORS)
+		num_workers = POLL_MAX_DESCRIPTORS;
+
 	if (num_workers <= 1 || parallel_checkout.nr < threshold) {
 		write_items_sequentially(state);
 	} else {
diff --git a/t/t2080-parallel-checkout-basics.sh b/t/t2080-parallel-checkout-basics.sh
index 322d26708e0bfd..51d4e1db4d9cbb 100755
--- a/t/t2080-parallel-checkout-basics.sh
+++ b/t/t2080-parallel-checkout-basics.sh
@@ -319,5 +319,41 @@ test_expect_success MINGW 'parallel checkout with fscache does not fail on new d
 		test_cmp expect2 sub/deep/dir/file2.txt
 	)
 '
+# Windows has no native poll(). compat/poll emulates it with
+# MsgWaitForMultipleObjects(), which cannot wait on more than
+# MAXIMUM_WAIT_OBJECTS objects, so run_parallel_checkout() caps the worker
+# count at MAXIMUM_WAIT_OBJECTS - 2. Without that cap, compat/poll collected
+# one wait handle per polled worker pipe in a fixed-size stack array and
+# smashed the stack.
+#
+# MAXIMUM_WAIT_OBJECTS is 64, hence the expected 62 below. The test is
+# MINGW-only because the cap only exists there; on other platforms the
+# requested 200 workers are used as-is.
+test_expect_success MINGW 'checkout caps workers at the poll limit' '
+	test_when_finished "rm -rf many-workers" &&
+	git init many-workers &&
+	(
+		cd many-workers &&
+		mkdir dir &&
+		for i in $(test_seq 1 200)
+		do
+			echo "content $i" >dir/file$i || return 1
+		done &&
+		git add -A &&
+		git commit -q -m base &&
+
+		git checkout -q -b other &&
+		for i in $(test_seq 1 200)
+		do
+			echo "changed $i" >dir/file$i || return 1
+		done &&
+		git commit -q -a -m changed &&
+		git checkout -q -
+	) &&
+
+	set_checkout_config 200 1 &&
+	test_checkout_workers 62 git -C many-workers checkout other &&
+	verify_checkout many-workers
+'
 
 test_done

From 9f376c26ba1385ab30ed4c9aac52842bffa0763f Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 11 Dec 2018 12:17:49 +0100
Subject: [PATCH 214/247] clean: make use of FSCache

The `git clean` command needs to enumerate plenty of files and
directories, and can therefore benefit from the FSCache.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/clean.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/builtin/clean.c b/builtin/clean.c
index 6ed555000f9a41..e15d595c3dc7cc 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -1042,6 +1042,7 @@ int cmd_clean(int argc,
 
 	if (repo_read_index(the_repository) < 0)
 		die(_("index file corrupt"));
+	enable_fscache(the_repository->index->cache_nr);
 
 	pl = add_pattern_list(&dir, EXC_CMDL, "--exclude option");
 	for (i = 0; i < exclude_list.nr; i++)
@@ -1116,6 +1117,7 @@ int cmd_clean(int argc,
 		}
 	}
 
+	disable_fscache();
 	strbuf_release(&abs_path);
 	strbuf_release(&buf);
 	string_list_clear(&del_list, 0);

From f3c24a8b430b4c43c48cce70686eec5f5a8bcf89 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 20 Jul 2017 22:25:21 +0200
Subject: [PATCH 215/247] tests(mingw): if `iconv` is unavailable, use
 `test-helper --iconv`

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/test-lib.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 1f0505e412d8ff..968c8240abf0f7 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1728,6 +1728,12 @@ Darwin)
 	test_set_prereq GREP_STRIPS_CR
 	test_set_prereq WINDOWS
 	GIT_TEST_CMP="GIT_DIR=/dev/null git diff --no-index --ignore-cr-at-eol --"
+	if ! type iconv >/dev/null 2>&1
+	then
+		iconv () {
+			test-tool iconv "$@"
+		}
+	fi
 	;;
 *CYGWIN*)
 	test_set_prereq POSIXPERM

From dff4912b42d235dcfdcdeb6350428b2f9d0d8f8f Mon Sep 17 00:00:00 2001
From: Tyrie Vella <tyrielv@gmail.com>
Date: Tue, 1 Sep 2026 11:38:36 -0700
Subject: [PATCH 216/247] run-command: limit concurrent children to what poll()
 can wait on

pp_buffer_io() polls one pipe for each child that is sending output, and a
second one for each child that is being fed on stdin. On Windows poll() is
emulated with MsgWaitForMultipleObjects(), which cannot wait on more than
POLL_MAX_DESCRIPTORS descriptors at once.

A job count above that limit is reachable in practice. fetch.parallel,
submodule.fetchJobs and hook.jobs all accept an explicit value, and a value
of 0 means "use online_cpus()", which on a machine with many cores is well
above the limit. Before the previous commit such a run corrupted the stack.
Now poll() returns EINVAL, and pp_buffer_io() turns that into
die_errno("poll"), so the operation fails outright.

Limit how many children run at the same time, so that a large job count
degrades into less concurrency instead of an error. Only concurrency is
limited. The configured maximum is still used for the size of the child and
pollfd arrays, and is still reported by the trace, so the number of tasks
that are run in total does not change. Unused pollfd slots hold -1 and are
skipped by poll(), so the larger array costs nothing.

Divide the limit by two, because a child can hold two descriptors: one for
its output and one for its input. Callers that group output are the only ones
affected; with opts.ungroup set the caller does its own I/O and poll() is not
involved.

On platforms with a native poll() there is no such limit,
POLL_MAX_DESCRIPTORS is INT_MAX, and this is a no-op.

Signed-off-by: Tyrie Vella <tyrielv@gmail.com>
---
 builtin/fetch.c             |  1 +
 builtin/submodule--helper.c |  1 +
 hook.c                      |  1 +
 run-command.c               | 20 ++++++++++-
 run-command.h               |  6 ++++
 submodule.c                 |  1 +
 t/helper/test-run-command.c | 25 ++++++++++++-
 t/t0061-run-command.sh      | 71 +++++++++++++++++++++++++++++++++++++
 8 files changed, 124 insertions(+), 2 deletions(-)

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 533fdfe7d80e9d..ab7d58fe02c755 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -2351,6 +2351,7 @@ static int fetch_multiple(struct string_list *list, int max_children,
 			.tr2_label = "parallel/fetch",
 
 			.processes = max_children,
+			.no_stdin_pipe = 1,
 
 			.get_next_task = &fetch_next_remote,
 			.start_failure = &fetch_failed_to_start,
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 5d3bcda334e819..ebb9ff4477e154 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -2919,6 +2919,7 @@ static int update_submodules(struct update_data *update_data)
 		.tr2_label = "parallel/update",
 
 		.processes = update_data->max_jobs,
+		.no_stdin_pipe = 1,
 
 		.get_next_task = update_clone_get_next_task,
 		.start_failure = update_clone_start_failure,
diff --git a/hook.c b/hook.c
index d10eef4763c679..5bd0935bae307a 100644
--- a/hook.c
+++ b/hook.c
@@ -798,6 +798,7 @@ int run_hooks_opt(struct repository *r, const char *hook_name,
 
 		.processes = jobs,
 		.ungroup = jobs == 1,
+		.no_stdin_pipe = !options->feed_pipe,
 
 		.get_next_task = pick_next_hook,
 		.start_failure = notify_start_failure,
diff --git a/run-command.c b/run-command.c
index ce84db87824262..27c31af8b0bb41 100644
--- a/run-command.c
+++ b/run-command.c
@@ -1658,6 +1658,9 @@ static int pp_start_one(struct parallel_processes *pp,
 		}
 		return 1;
 	}
+	if (opts->no_stdin_pipe && pp->children[i].process.in < 0)
+		BUG("get_next_task requested a stdin pipe despite "
+		    "no_stdin_pipe");
 	if (!opts->ungroup) {
 		pp->children[i].process.err = -1;
 		pp->children[i].process.stdout_to_stderr = 1;
@@ -1893,6 +1896,7 @@ void run_processes_parallel(const struct run_process_parallel_opts *opts)
 	int i, code;
 	int timeout = 100;
 	int spawn_cap = 4;
+	size_t max_live;
 	struct parallel_processes_for_signal pp_sig;
 	struct parallel_processes pp = {
 		.buffered_output = STRBUF_INIT,
@@ -1902,6 +1906,20 @@ void run_processes_parallel(const struct run_process_parallel_opts *opts)
 	const char *tr2_label = opts->tr2_label;
 	const int do_trace2 = tr2_category && tr2_label;
 
+	/*
+	 * Unless the caller handles its own output, pp_buffer_io() polls one
+	 * output pipe per child and, unless excluded by no_stdin_pipe, may also
+	 * poll an input pipe. Limit the number of live children so that all of
+	 * their descriptors fit in one poll() call.
+	 */
+	max_live = opts->processes;
+	if (!opts->ungroup) {
+		size_t fds_per_process = opts->no_stdin_pipe ? 1 : 2;
+
+		if (max_live > POLL_MAX_DESCRIPTORS / fds_per_process)
+			max_live = POLL_MAX_DESCRIPTORS / fds_per_process;
+	}
+
 	if (do_trace2)
 		trace2_region_enter_printf(tr2_category, tr2_label, NULL,
 					   "max:%"PRIuMAX,
@@ -1923,7 +1941,7 @@ void run_processes_parallel(const struct run_process_parallel_opts *opts)
 	while (1) {
 		for (i = 0;
 		    i < spawn_cap && !pp.shutdown &&
-		    pp.nr_processes < opts->processes;
+		    pp.nr_processes < max_live;
 		    i++) {
 			code = pp_start_one(&pp, opts);
 			if (!code)
diff --git a/run-command.h b/run-command.h
index c2fad4f0f8380c..331c9391e8e2d5 100644
--- a/run-command.h
+++ b/run-command.h
@@ -488,6 +488,12 @@ struct run_process_parallel_opts
 	 */
 	unsigned int ungroup:1;
 
+	/**
+	 * no_stdin_pipe: set if get_next_task will never request a pipe by
+	 * setting child_process.in to -1.
+	 */
+	unsigned int no_stdin_pipe:1;
+
 	/**
 	 * get_next_task: See get_next_task_fn() above. This must be
 	 * specified.
diff --git a/submodule.c b/submodule.c
index 6fcb606f7ee837..bbd86f82a9ccbb 100644
--- a/submodule.c
+++ b/submodule.c
@@ -1835,6 +1835,7 @@ int fetch_submodules(struct repository *r,
 		.tr2_label = "parallel/fetch",
 
 		.processes = max_parallel_jobs,
+		.no_stdin_pipe = 1,
 
 		.get_next_task = get_next_submodule,
 		.start_failure = fetch_start_failure,
diff --git a/t/helper/test-run-command.c b/t/helper/test-run-command.c
index 4a56456894ccff..f943c8214d4dec 100644
--- a/t/helper/test-run-command.c
+++ b/t/helper/test-run-command.c
@@ -20,13 +20,14 @@
 #include "wildmatch.h"
 
 static int number_callbacks;
+static int max_callbacks = 4;
 static int parallel_next(struct child_process *cp,
 			 struct strbuf *err,
 			 void *cb,
 			 void **task_cb)
 {
 	struct child_process *d = cb;
-	if (number_callbacks >= 4)
+	if (number_callbacks >= max_callbacks)
 		return 0;
 
 	strvec_pushv(&cp->args, d->args.v);
@@ -195,6 +196,7 @@ static int testsuite(int argc, const char **argv)
 		OPT_END()
 	};
 	struct run_process_parallel_opts opts = {
+		.no_stdin_pipe = 1,
 		.get_next_task = next_test,
 		.start_failure = test_failed,
 		.feed_pipe = test_stdin_pipe_feed,
@@ -442,6 +444,16 @@ static int inherit_handle_child(void)
 int cmd__run_command(int argc, const char **argv)
 {
 	struct child_process proc = CHILD_PROCESS_INIT;
+	const char * const parallel_usage[] = {
+		"test-tool run-command <parallel-mode> [<options>] "
+		"<jobs> <command> [<args>...]",
+		NULL
+	};
+	struct option parallel_options[] = {
+		OPT_INTEGER_F(0, "tasks", &max_callbacks,
+			      "number of tasks to generate", PARSE_OPT_NONEG),
+		OPT_END()
+	};
 	int jobs;
 	int ret;
 	struct run_process_parallel_opts opts = {
@@ -495,17 +507,28 @@ int cmd__run_command(int argc, const char **argv)
 		opts.ungroup = 1;
 	}
 
+	argc = parse_options(argc - 1, argv + 1, NULL, parallel_options,
+			     parallel_usage, PARSE_OPT_STOP_AT_NON_OPTION |
+			     PARSE_OPT_KEEP_ARGV0);
+	if (argc < 3)
+		usage_with_options(parallel_usage, parallel_options);
+	if (max_callbacks < 0)
+		die("--tasks cannot be negative");
+
 	jobs = atoi(argv[2]);
 	strvec_clear(&proc.args);
 	strvec_pushv(&proc.args, (const char **)argv + 3);
 
 	if (!strcmp(argv[1], "run-command-parallel")) {
+		opts.no_stdin_pipe = 1;
 		opts.get_next_task = parallel_next;
 		opts.task_finished = task_finished_quiet;
 	} else if (!strcmp(argv[1], "run-command-abort")) {
+		opts.no_stdin_pipe = 1;
 		opts.get_next_task = parallel_next;
 		opts.task_finished = task_finished;
 	} else if (!strcmp(argv[1], "run-command-no-jobs")) {
+		opts.no_stdin_pipe = 1;
 		opts.get_next_task = no_job;
 		opts.task_finished = task_finished;
 	} else if (!strcmp(argv[1], "run-command-stdin")) {
diff --git a/t/t0061-run-command.sh b/t/t0061-run-command.sh
index dc9d77b0e14ab4..c74deaee1ac8fb 100755
--- a/t/t0061-run-command.sh
+++ b/t/t0061-run-command.sh
@@ -164,6 +164,77 @@ test_expect_success 'run_command runs ungrouped in parallel with more tasks than
 	test_line_count = 4 err
 '
 
+wait_for_line_count () {
+	expected=$1 &&
+	file=$2 &&
+
+	for i in $(test_seq 1 100)
+	do
+		if test "$(wc -l <"$file")" -eq "$expected"
+		then
+			return 0
+		fi &&
+		sleep 0.1
+	done &&
+	return 1
+}
+
+cleanup_parallel () {
+	touch release
+	if test -n "$parallel_pid"
+	then
+		wait "$parallel_pid"
+	fi
+}
+
+test_expect_success MINGW 'setup poll descriptor limit test' '
+	write_script wait-for-release <<-\EOF
+	echo started >>"$1"
+	if test "$3" = stdin
+	then
+		while read line
+		do
+			:
+		done
+	fi
+	while ! test -e "$2"
+	do
+		sleep 0.1
+	done
+	EOF
+'
+
+test_expect_success MINGW 'run_command uses full poll limit without stdin' '
+	: >started &&
+	rm -f release &&
+	test-tool run-command run-command-parallel --tasks=40 40 \
+		./wait-for-release "$PWD/started" "$PWD/release" \
+		>out 2>err &
+	parallel_pid=$! &&
+	test_when_finished cleanup_parallel &&
+	wait_for_line_count 40 started &&
+	touch release &&
+	wait "$parallel_pid" &&
+	parallel_pid=
+'
+
+test_expect_success MINGW 'run_command limits children with stdin pipes' '
+	: >started &&
+	rm -f release &&
+	test-tool run-command run-command-stdin --tasks=40 40 \
+		./wait-for-release "$PWD/started" "$PWD/release" stdin \
+		>out 2>err &
+	parallel_pid=$! &&
+	test_when_finished cleanup_parallel &&
+	wait_for_line_count 31 started &&
+	sleep 1 &&
+	test_line_count = 31 started &&
+	touch release &&
+	wait "$parallel_pid" &&
+	parallel_pid= &&
+	test_line_count = 40 started
+'
+
 test_expect_success 'run_command listens to stdin' '
 	cat >expect <<-\EOF &&
 	preloaded output of a child

From a3b3d39fc7729119ad68cd14b351f7d59dbcef43 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 11 Oct 2018 23:55:44 +0200
Subject: [PATCH 217/247] gitattributes: mark .png files as binary

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index 26490ad60a74d0..9d6e484d1ec0c4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,6 +6,7 @@
 *.pm text eol=lf diff=perl
 *.py text eol=lf diff=python
 *.bat text eol=crlf
+*.png binary
 CODE_OF_CONDUCT.md -whitespace
 /Documentation/**/*.adoc text eol=lf whitespace=trail,space,incomplete
 /command-list.txt text eol=lf

From fa182b9d550719f0fae682e1be85868cf7abc019 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 5 Aug 2017 20:28:37 +0200
Subject: [PATCH 218/247] tests: move test PNGs into t/lib-diff/

We already have a directory where we store files intended for use by
multiple test scripts. The same directory is a better home for the
test-binary-*.png files than t/.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/{ => lib-diff}/test-binary-1.png | Bin
 t/{ => lib-diff}/test-binary-2.png | Bin
 t/t3307-notes-man.sh               |   2 +-
 t/t3903-stash.sh                   |   2 +-
 t/t4012-diff-binary.sh             |   2 +-
 t/t4049-diff-stat-count.sh         |   2 +-
 t/t4108-apply-threeway.sh          |  12 ++++++------
 t/t6403-merge-file.sh              |   4 ++--
 t/t6407-merge-binary.sh            |   2 +-
 t/t9200-git-cvsexportcommit.sh     |  14 +++++++-------
 10 files changed, 20 insertions(+), 20 deletions(-)
 rename t/{ => lib-diff}/test-binary-1.png (100%)
 rename t/{ => lib-diff}/test-binary-2.png (100%)

diff --git a/t/test-binary-1.png b/t/lib-diff/test-binary-1.png
similarity index 100%
rename from t/test-binary-1.png
rename to t/lib-diff/test-binary-1.png
diff --git a/t/test-binary-2.png b/t/lib-diff/test-binary-2.png
similarity index 100%
rename from t/test-binary-2.png
rename to t/lib-diff/test-binary-2.png
diff --git a/t/t3307-notes-man.sh b/t/t3307-notes-man.sh
index 1aa366a410e9a3..7e5c06e6615d7a 100755
--- a/t/t3307-notes-man.sh
+++ b/t/t3307-notes-man.sh
@@ -26,7 +26,7 @@ test_expect_success 'example 1: notes to add an Acked-by line' '
 '
 
 test_expect_success 'example 2: binary notes' '
-	cp "$TEST_DIRECTORY"/test-binary-1.png . &&
+	cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png . &&
 	git checkout B &&
 	blob=$(git hash-object -w test-binary-1.png) &&
 	git notes --ref=logo add -C "$blob" &&
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 721158606f25eb..4b306010053bcd 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -1395,7 +1395,7 @@ test_expect_success 'stash -- <subdir> works with binary files' '
 	mkdir -p subdir &&
 	>subdir/untracked &&
 	>subdir/tracked &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png subdir/tracked-binary &&
+	cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png subdir/tracked-binary &&
 	git add subdir/tracked* &&
 	git stash -- subdir/ &&
 	test_path_is_missing subdir/tracked &&
diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index 97b5ac04071d36..0fb50d2ffc91d9 100755
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -19,7 +19,7 @@ test_expect_success 'prepare repository' '
 	echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
 	git update-index --add a b c d &&
 	echo git >a &&
-	cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
+	cat "$TEST_DIRECTORY"/lib-diff/test-binary-1.png >b &&
 	echo git >c &&
 	cat b b >d
 '
diff --git a/t/t4049-diff-stat-count.sh b/t/t4049-diff-stat-count.sh
index eceb47c8594416..2161a1e8cf5ba6 100755
--- a/t/t4049-diff-stat-count.sh
+++ b/t/t4049-diff-stat-count.sh
@@ -33,7 +33,7 @@ test_expect_success 'binary changes do not count in lines' '
 	git reset --hard &&
 	echo a >a &&
 	echo c >c &&
-	cat "$TEST_DIRECTORY"/test-binary-1.png >d &&
+	cat "$TEST_DIRECTORY"/lib-diff/test-binary-1.png >d &&
 	cat >expect <<-\EOF &&
 	 a | 1 +
 	 c | 1 +
diff --git a/t/t4108-apply-threeway.sh b/t/t4108-apply-threeway.sh
index f30e85659dbb87..7f84edd9653a7d 100755
--- a/t/t4108-apply-threeway.sh
+++ b/t/t4108-apply-threeway.sh
@@ -272,11 +272,11 @@ test_expect_success 'apply with --3way --cached and conflicts' '
 
 test_expect_success 'apply binary file patch' '
 	git reset --hard main &&
-	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
+	cp "$TEST_DIRECTORY/lib-diff/test-binary-1.png" bin.png &&
 	git add bin.png &&
 	git commit -m "add binary file" &&
 
-	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
+	cp "$TEST_DIRECTORY/lib-diff/test-binary-2.png" bin.png &&
 
 	git diff --binary >bin.diff &&
 	git reset --hard &&
@@ -287,11 +287,11 @@ test_expect_success 'apply binary file patch' '
 
 test_expect_success 'apply binary file patch with 3way' '
 	git reset --hard main &&
-	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
+	cp "$TEST_DIRECTORY/lib-diff/test-binary-1.png" bin.png &&
 	git add bin.png &&
 	git commit -m "add binary file" &&
 
-	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
+	cp "$TEST_DIRECTORY/lib-diff/test-binary-2.png" bin.png &&
 
 	git diff --binary >bin.diff &&
 	git reset --hard &&
@@ -302,11 +302,11 @@ test_expect_success 'apply binary file patch with 3way' '
 
 test_expect_success 'apply full-index patch with 3way' '
 	git reset --hard main &&
-	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
+	cp "$TEST_DIRECTORY/lib-diff/test-binary-1.png" bin.png &&
 	git add bin.png &&
 	git commit -m "add binary file" &&
 
-	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
+	cp "$TEST_DIRECTORY/lib-diff/test-binary-2.png" bin.png &&
 
 	git diff --full-index >bin.diff &&
 	git reset --hard &&
diff --git a/t/t6403-merge-file.sh b/t/t6403-merge-file.sh
index dcc5c2ac99e7f1..bd58e471bc724a 100755
--- a/t/t6403-merge-file.sh
+++ b/t/t6403-merge-file.sh
@@ -355,12 +355,12 @@ test_expect_success "expected conflict markers" '
 
 test_expect_success 'binary files cannot be merged' '
 	test_must_fail git merge-file -p \
-		orig.txt "$TEST_DIRECTORY"/test-binary-1.png new1.txt 2> merge.err &&
+		orig.txt "$TEST_DIRECTORY"/lib-diff/test-binary-1.png new1.txt 2> merge.err &&
 	test_grep "Cannot merge binary files" merge.err
 '
 
 test_expect_success 'binary files cannot be merged with --object-id' '
-	cp "$TEST_DIRECTORY"/test-binary-1.png . &&
+	cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png . &&
 	git add orig.txt new1.txt test-binary-1.png &&
 	test_must_fail git merge-file --object-id \
 		:orig.txt :test-binary-1.png :new1.txt 2> merge.err &&
diff --git a/t/t6407-merge-binary.sh b/t/t6407-merge-binary.sh
index e8a28717cece32..2547f1d504a2c5 100755
--- a/t/t6407-merge-binary.sh
+++ b/t/t6407-merge-binary.sh
@@ -9,7 +9,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 test_expect_success setup '
 
-	cat "$TEST_DIRECTORY"/test-binary-1.png >m &&
+	cat "$TEST_DIRECTORY"/lib-diff/test-binary-1.png >m &&
 	git add m &&
 	git ls-files -s | sed -e "s/ 0	/ 1	/" >E1 &&
 	test_tick &&
diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
index 8e0272df20fd2a..c42e69ee70ee23 100755
--- a/t/t9200-git-cvsexportcommit.sh
+++ b/t/t9200-git-cvsexportcommit.sh
@@ -57,8 +57,8 @@ test_expect_success 'New file' '
 	mkdir A B C D E F &&
 	echo hello1 >A/newfile1.txt &&
 	echo hello2 >B/newfile2.txt &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png C/newfile3.png &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png D/newfile4.png &&
+	cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png C/newfile3.png &&
+	cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png D/newfile4.png &&
 	git add A/newfile1.txt &&
 	git add B/newfile2.txt &&
 	git add C/newfile3.png &&
@@ -83,8 +83,8 @@ test_expect_success 'Remove two files, add two and update two' '
 	rm -f B/newfile2.txt &&
 	rm -f C/newfile3.png &&
 	echo Hello5  >E/newfile5.txt &&
-	cp "$TEST_DIRECTORY"/test-binary-2.png D/newfile4.png &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png F/newfile6.png &&
+	cp "$TEST_DIRECTORY"/lib-diff/test-binary-2.png D/newfile4.png &&
+	cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png F/newfile6.png &&
 	git add E/newfile5.txt &&
 	git add F/newfile6.png &&
 	git commit -a -m "Test: Remove, add and update" &&
@@ -172,7 +172,7 @@ test_expect_success 'New file with spaces in file name' '
 	mkdir "G g" &&
 	echo ok then >"G g/with spaces.txt" &&
 	git add "G g/with spaces.txt" && \
-	cp "$TEST_DIRECTORY"/test-binary-1.png "G g/with spaces.png" && \
+	cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png "G g/with spaces.png" && \
 	git add "G g/with spaces.png" &&
 	git commit -a -m "With spaces" &&
 	id=$(git rev-list --max-count=1 HEAD) &&
@@ -184,7 +184,7 @@ test_expect_success 'New file with spaces in file name' '
 
 test_expect_success 'Update file with spaces in file name' '
 	echo Ok then >>"G g/with spaces.txt" &&
-	cat "$TEST_DIRECTORY"/test-binary-1.png >>"G g/with spaces.png" && \
+	cat "$TEST_DIRECTORY"/lib-diff/test-binary-1.png >>"G g/with spaces.png" && \
 	git add "G g/with spaces.png" &&
 	git commit -a -m "Update with spaces" &&
 	id=$(git rev-list --max-count=1 HEAD) &&
@@ -209,7 +209,7 @@ test_expect_success !MINGW 'File with non-ascii file name' '
 	mkdir -p Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö &&
 	echo Foo >Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&
 	git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
+	cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
 	git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
 	git commit -a -m "Går det så går det" && \
 	id=$(git rev-list --max-count=1 HEAD) &&

From 534000ebf4a607abfce84e8752c0974b6b4c1159 Mon Sep 17 00:00:00 2001
From: Doug Kelly <dougk.ff7@gmail.com>
Date: Wed, 8 Jan 2014 20:28:15 -0600
Subject: [PATCH 219/247] pack-objects (mingw): demonstrate a segmentation
 fault with large deltas

There is a problem in the way 9ac3f0e5b3e4 (pack-objects: fix
performance issues on packing large deltas, 2018-07-22) initializes that
mutex in the `packing_data` struct. The problem manifests in a
segmentation fault on Windows, when a mutex (AKA critical section) is
accessed without being initialized. (With pthreads, you apparently do
not really have to initialize them?)

This was reported in https://github.com/git-for-windows/git/issues/1839.

Signed-off-by: Doug Kelly <dougk.ff7@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/meson.build                  |   1 +
 t/t7429-submodule-long-path.sh | 106 +++++++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+)
 create mode 100755 t/t7429-submodule-long-path.sh

diff --git a/t/meson.build b/t/meson.build
index 787acb3df324c6..2793bdae3f2d99 100644
--- a/t/meson.build
+++ b/t/meson.build
@@ -922,6 +922,7 @@ integration_tests = [
   't7424-submodule-mixed-ref-formats.sh',
   't7425-submodule-gitdir-path-extension.sh',
   't7426-submodule-get-default-remote.sh',
+  't7429-submodule-long-path.sh',
   't7450-bad-git-dotfiles.sh',
   't7500-commit-template-squash-signoff.sh',
   't7501-commit-basic-functionality.sh',
diff --git a/t/t7429-submodule-long-path.sh b/t/t7429-submodule-long-path.sh
new file mode 100755
index 00000000000000..f692cedbff7ff8
--- /dev/null
+++ b/t/t7429-submodule-long-path.sh
@@ -0,0 +1,106 @@
+#!/bin/sh
+#
+# Copyright (c) 2013 Doug Kelly
+#
+
+test_description='Test submodules with a path near PATH_MAX
+
+This test verifies that "git submodule" initialization, update and clones work, including with recursive submodules and paths approaching PATH_MAX (260 characters on Windows)
+'
+
+TEST_NO_CREATE_REPO=1
+. ./test-lib.sh
+
+longpath=""
+for (( i=0; i<4; i++ )); do
+	longpath="0123456789abcdefghijklmnopqrstuvwxyz$longpath"
+done
+# Pick a substring maximum of 90 characters
+# This should be good, since we'll add on a lot for temp directories
+longpath=${longpath:0:90}; export longpath
+
+test_expect_failure 'submodule with a long path' '
+	git config --global protocol.file.allow always &&
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=long init --bare remote &&
+	test_create_repo bundle1 &&
+	(
+		cd bundle1 &&
+		test_commit "shoot" &&
+		git rev-parse --verify HEAD >../expect
+	) &&
+	mkdir home &&
+	(
+		cd home &&
+		git clone ../remote test &&
+		cd test &&
+		git checkout -B long &&
+		git submodule add ../bundle1 $longpath &&
+		test_commit "sogood" &&
+		(
+			cd $longpath &&
+			git rev-parse --verify HEAD >actual &&
+			test_cmp ../../../expect actual
+		) &&
+		git push origin long
+	) &&
+	mkdir home2 &&
+	(
+		cd home2 &&
+		git clone ../remote test &&
+		cd test &&
+		git checkout long &&
+		git submodule update --init &&
+		(
+			cd $longpath &&
+			git rev-parse --verify HEAD >actual &&
+			test_cmp ../../../expect actual
+		)
+	)
+'
+
+test_expect_failure 'recursive submodule with a long path' '
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=long init --bare super &&
+	test_create_repo child &&
+	(
+		cd child &&
+		test_commit "shoot" &&
+		git rev-parse --verify HEAD >../expect
+	) &&
+	test_create_repo parent &&
+	(
+		cd parent &&
+		git submodule add ../child $longpath &&
+		test_commit "aim"
+	) &&
+	mkdir home3 &&
+	(
+		cd home3 &&
+		git clone ../super test &&
+		cd test &&
+		git checkout -B long &&
+		git submodule add ../parent foo &&
+		git submodule update --init --recursive &&
+		test_commit "sogood" &&
+		(
+			cd foo/$longpath &&
+			git rev-parse --verify HEAD >actual &&
+			test_cmp ../../../../expect actual
+		) &&
+		git push origin long
+	) &&
+	mkdir home4 &&
+	(
+		cd home4 &&
+		git clone ../super test --recursive &&
+		(
+			cd test/foo/$longpath &&
+			git rev-parse --verify HEAD >actual &&
+			test_cmp ../../../../expect actual
+		)
+	)
+'
+unset longpath
+
+test_done

From 2e14143fb8e57c4f524307fdb8e050d17da20c5f Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 18 Jul 2017 01:15:40 +0200
Subject: [PATCH 220/247] tests: only override sort & find if there are usable
 ones in /usr/bin/

The idea is to allow running the test suite on MinGit with BusyBox
installed in /mingw64/bin/sh.exe. In that case, we will want to exclude
sort & find (and other Unix utilities) from being bundled.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 git-sh-setup.sh | 21 ++++++++++++++-------
 t/test-lib.sh   | 21 ++++++++++++++-------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 19aef72ec25530..fad4f9df94e143 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -292,13 +292,20 @@ create_virtual_base() {
 # Platform specific tweaks to work around some commands
 case $(uname -s) in
 *MINGW*)
-	# Windows has its own (incompatible) sort and find
-	sort () {
-		/usr/bin/sort "$@"
-	}
-	find () {
-		/usr/bin/find "$@"
-	}
+	if test -x /usr/bin/sort
+	then
+		# Windows has its own (incompatible) sort; override
+		sort () {
+			/usr/bin/sort "$@"
+		}
+	fi
+	if test -x /usr/bin/find
+	then
+		# Windows has its own (incompatible) find; override
+		find () {
+			/usr/bin/find "$@"
+		}
+	fi
 	# git sees Windows-style pwd
 	pwd () {
 		builtin pwd -W
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 968c8240abf0f7..d1a40ea90295d3 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1708,13 +1708,20 @@ Darwin)
 	test_set_prereq EXECKEEPSPID
 	;;
 *MINGW*)
-	# Windows has its own (incompatible) sort and find
-	sort () {
-		/usr/bin/sort "$@"
-	}
-	find () {
-		/usr/bin/find "$@"
-	}
+	if test -x /usr/bin/sort
+	then
+		# Windows has its own (incompatible) sort; override
+		sort () {
+			/usr/bin/sort "$@"
+		}
+	fi
+	if test -x /usr/bin/find
+	then
+		# Windows has its own (incompatible) find; override
+		find () {
+			/usr/bin/find "$@"
+		}
+	fi
 	# git sees Windows-style pwd
 	pwd () {
 		builtin pwd -W

From b0d74819d9983a583841216843dfc93d86493381 Mon Sep 17 00:00:00 2001
From: Karsten Blees <blees@dcon.de>
Date: Tue, 28 Jul 2015 21:07:41 +0200
Subject: [PATCH 221/247] mingw: support long paths

Windows paths are typically limited to MAX_PATH = 260 characters, even
though the underlying NTFS file system supports paths up to 32,767 chars.
This limitation is also evident in Windows Explorer, cmd.exe and many
other applications (including IDEs).

Particularly annoying is that most Windows APIs return bogus error codes
if a relative path only barely exceeds MAX_PATH in conjunction with the
current directory, e.g. ERROR_PATH_NOT_FOUND / ENOENT instead of the
infinitely more helpful ERROR_FILENAME_EXCED_RANGE / ENAMETOOLONG.

Many Windows wide char APIs support longer than MAX_PATH paths through the
file namespace prefix ('\\?\' or '\\?\UNC\') followed by an absolute path.
Notable exceptions include functions dealing with executables and the
current directory (CreateProcess, LoadLibrary, Get/SetCurrentDirectory) as
well as the entire shell API (ShellExecute, SHGetSpecialFolderPath...).

Introduce a handle_long_path function to check the length of a specified
path properly (and fail with ENAMETOOLONG), and to optionally expand long
paths using the '\\?\' file namespace prefix. Short paths will not be
modified, so we don't need to worry about device names (NUL, CON, AUX).

Contrary to MSDN docs, the GetFullPathNameW function doesn't seem to be
limited to MAX_PATH (at least not on Win7), so we can use it to do the
heavy lifting of the conversion (translate '/' to '\', eliminate '.' and
'..', and make an absolute path).

Add long path error checking to xutftowcs_path for APIs with hard MAX_PATH
limit.

Add a new MAX_LONG_PATH constant and xutftowcs_long_path function for APIs
that support long paths.

While improved error checking is always active, long paths support must be
explicitly enabled via 'core.longpaths' option. This is to prevent end
users from shooting themselves in the foot by checking out files that Windows
Explorer, cmd/bash or their favorite IDE cannot handle.

Test suite:
Test the case is when the full pathname length of a dir is close
to 260 (MAX_PATH).
Bug report and an original reproducer by Andrey Rogozhnikov:
https://github.com/msysgit/git/pull/122#issuecomment-43604199

[jes: adjusted test number to avoid conflicts, added support for
chdir(), etc]

Thanks-to: Martin W. Kirst <maki@bitkings.de>
Thanks-to: Doug Kelly <dougk.ff7@gmail.com>
Original-test-by: Andrey Rogozhnikov <rogozhnikov.andrey@gmail.com>
Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Stepan Kasal <kasal@ucw.cz>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Josh Soref <jsoref@gmail.com>
---
 Documentation/config/core.adoc |   7 ++
 compat/mingw.c                 | 204 ++++++++++++++++++++++++---------
 compat/mingw.h                 |  75 +++++++++++-
 compat/win32/dirent.c          |  17 ++-
 compat/win32/fscache.c         |  22 ++--
 setup.c                        |   4 +-
 t/meson.build                  |   1 +
 t/t2031-checkout-long-paths.sh | 102 +++++++++++++++++
 t/t7429-submodule-long-path.sh |  24 ++--
 9 files changed, 368 insertions(+), 88 deletions(-)
 create mode 100755 t/t2031-checkout-long-paths.sh

diff --git a/Documentation/config/core.adoc b/Documentation/config/core.adoc
index 858c5961c66a94..4d40c16ede9cfe 100644
--- a/Documentation/config/core.adoc
+++ b/Documentation/config/core.adoc
@@ -735,6 +735,13 @@ core.fscache::
 Git for Windows uses this to bulk-read and cache lstat data of entire
 directories (instead of doing lstat file by file).
 
+core.longpaths::
+	Enable long path (> 260) support for builtin commands in Git for
+	Windows. This is disabled by default, as long paths are not supported
+	by Windows Explorer, cmd.exe and the Git for Windows tool chain
+	(msys, bash, tcl, perl...). Only enable this if you know what you're
+	doing and are prepared to live with a few quirks.
+
 core.unsetenvvars::
 	Windows-only: comma-separated list of environment variables'
 	names that need to be unset before spawning any other process.
diff --git a/compat/mingw.c b/compat/mingw.c
index 69896770fc7a8f..2a12bb90fc467a 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -281,6 +281,27 @@ static enum hide_dotfiles_type hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
 static char *unset_environment_variables;
 int core_fscache;
 
+int are_long_paths_enabled(void)
+{
+	/* default to `false` during initialization */
+	static const int fallback = 0;
+
+	static int enabled = -1;
+
+	if (enabled < 0) {
+		/* avoid infinite recursion */
+		if (!the_repository)
+			return fallback;
+
+		if (the_repository->config &&
+		    the_repository->config->hash_initialized &&
+		    repo_config_get_bool(the_repository, "core.longpaths", &enabled) < 0)
+			enabled = 0;
+	}
+
+	return enabled < 0 ? fallback : enabled;
+}
+
 int mingw_core_config(const char *var, const char *value,
 		      const struct config_context *ctx UNUSED,
 		      void *cb UNUSED)
@@ -361,7 +382,7 @@ process_phantom_symlink(const wchar_t *wtarget, const wchar_t *wlink)
 {
 	HANDLE hnd;
 	BY_HANDLE_FILE_INFORMATION fdata;
-	wchar_t relative[MAX_PATH];
+	wchar_t relative[MAX_LONG_PATH];
 	const wchar_t *rel;
 
 	/*
@@ -576,8 +597,8 @@ int mingw_unlink(const char *pathname, int handle_in_use_error)
 {
 	static int use_legacy_delete = -1;
 	int tries = 0;
-	wchar_t wpathname[MAX_PATH];
-	if (xutftowcs_path(wpathname, pathname) < 0)
+	wchar_t wpathname[MAX_LONG_PATH];
+	if (xutftowcs_long_path(wpathname, pathname) < 0)
 		return -1;
 
 	if (use_legacy_delete < 0)
@@ -612,7 +633,7 @@ static int is_dir_empty(const wchar_t *wpath)
 {
 	WIN32_FIND_DATAW findbuf;
 	HANDLE handle;
-	wchar_t wbuf[MAX_PATH + 2];
+	wchar_t wbuf[MAX_LONG_PATH + 2];
 	wcscpy(wbuf, wpath);
 	wcscat(wbuf, L"\\*");
 	handle = FindFirstFileW(wbuf, &findbuf);
@@ -633,7 +654,7 @@ static int is_dir_empty(const wchar_t *wpath)
 int mingw_rmdir(const char *pathname)
 {
 	int tries = 0;
-	wchar_t wpathname[MAX_PATH];
+	wchar_t wpathname[MAX_LONG_PATH];
 	struct stat st;
 
 	/*
@@ -655,7 +676,7 @@ int mingw_rmdir(const char *pathname)
 		return -1;
 	}
 
-	if (xutftowcs_path(wpathname, pathname) < 0)
+	if (xutftowcs_long_path(wpathname, pathname) < 0)
 		return -1;
 
 	do {
@@ -724,15 +745,18 @@ static int set_hidden_flag(const wchar_t *path, int set)
 int mingw_mkdir(const char *path, int mode UNUSED)
 {
 	int ret;
-	wchar_t wpath[MAX_PATH];
+	wchar_t wpath[MAX_LONG_PATH];
 
 	if (!is_valid_win32_path(path, 0)) {
 		errno = EINVAL;
 		return -1;
 	}
 
-	if (xutftowcs_path(wpath, path) < 0)
+	/* CreateDirectoryW path limit is 248 (MAX_PATH - 8.3 file name) */
+	if (xutftowcs_path_ex(wpath, path, MAX_LONG_PATH, -1, 248,
+			      are_long_paths_enabled()) < 0)
 		return -1;
+
 	ret = _wmkdir(wpath);
 	if (!ret)
 		process_phantom_symlinks();
@@ -898,7 +922,7 @@ int mingw_open (const char *filename, int oflags, ...)
 	va_list args;
 	unsigned mode;
 	int fd, create = (oflags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL);
-	wchar_t wfilename[MAX_PATH];
+	wchar_t wfilename[MAX_LONG_PATH];
 	open_fn_t open_fn;
 	WIN32_FILE_ATTRIBUTE_DATA fdata;
 
@@ -931,7 +955,7 @@ int mingw_open (const char *filename, int oflags, ...)
 
 	if (filename && !strcmp(filename, "/dev/null"))
 		wcscpy(wfilename, L"nul");
-	else if (xutftowcs_path(wfilename, filename) < 0)
+	else if (xutftowcs_long_path(wfilename, filename) < 0)
 		return -1;
 
 	/*
@@ -1022,14 +1046,14 @@ FILE *mingw_fopen (const char *filename, const char *otype)
 {
 	int hide = needs_hiding(filename);
 	FILE *file;
-	wchar_t wfilename[MAX_PATH], wotype[4];
+	wchar_t wfilename[MAX_LONG_PATH], wotype[4];
 	if (filename && !strcmp(filename, "/dev/null"))
 		wcscpy(wfilename, L"nul");
 	else if (!is_valid_win32_path(filename, 1)) {
 		int create = otype && strchr(otype, 'w');
 		errno = create ? EINVAL : ENOENT;
 		return NULL;
-	} else if (xutftowcs_path(wfilename, filename) < 0)
+	} else if (xutftowcs_long_path(wfilename, filename) < 0)
 		return NULL;
 
 	if (xutftowcs(wotype, otype, ARRAY_SIZE(wotype)) < 0)
@@ -1051,14 +1075,14 @@ FILE *mingw_freopen (const char *filename, const char *otype, FILE *stream)
 {
 	int hide = needs_hiding(filename);
 	FILE *file;
-	wchar_t wfilename[MAX_PATH], wotype[4];
+	wchar_t wfilename[MAX_LONG_PATH], wotype[4];
 	if (filename && !strcmp(filename, "/dev/null"))
 		wcscpy(wfilename, L"nul");
 	else if (!is_valid_win32_path(filename, 1)) {
 		int create = otype && strchr(otype, 'w');
 		errno = create ? EINVAL : ENOENT;
 		return NULL;
-	} else if (xutftowcs_path(wfilename, filename) < 0)
+	} else if (xutftowcs_long_path(wfilename, filename) < 0)
 		return NULL;
 
 	if (xutftowcs(wotype, otype, ARRAY_SIZE(wotype)) < 0)
@@ -1108,7 +1132,7 @@ ssize_t mingw_write(int fd, const void *buf, size_t len)
 		HANDLE h = (HANDLE) _get_osfhandle(fd);
 		if (GetFileType(h) != FILE_TYPE_PIPE) {
 			if (orig == EINVAL) {
-				wchar_t path[MAX_PATH];
+				wchar_t path[MAX_LONG_PATH];
 				DWORD ret = GetFinalPathNameByHandleW(h, path,
 								ARRAY_SIZE(path), 0);
 				UINT drive_type = ret > 0 && ret < ARRAY_SIZE(path) ?
@@ -1145,20 +1169,23 @@ ssize_t mingw_write(int fd, const void *buf, size_t len)
 
 int mingw_access(const char *filename, int mode)
 {
-	wchar_t wfilename[MAX_PATH];
+	wchar_t wfilename[MAX_LONG_PATH];
 	if (!strcmp("nul", filename) || !strcmp("/dev/null", filename))
 		return 0;
-	if (xutftowcs_path(wfilename, filename) < 0)
+	if (xutftowcs_long_path(wfilename, filename) < 0)
 		return -1;
 	/* X_OK is not supported by the MSVCRT version */
 	return _waccess(wfilename, mode & ~X_OK);
 }
 
+/* cached length of current directory for handle_long_path */
+static int current_directory_len = 0;
+
 int mingw_chdir(const char *dirname)
 {
-	wchar_t wdirname[MAX_PATH];
-
-	if (xutftowcs_path(wdirname, dirname) < 0)
+	int result;
+	wchar_t wdirname[MAX_LONG_PATH];
+	if (xutftowcs_long_path(wdirname, dirname) < 0)
 		return -1;
 
 	if (repo_has_symlinks(the_repository)) {
@@ -1177,13 +1204,15 @@ int mingw_chdir(const char *dirname)
 		CloseHandle(hnd);
 	}
 
-	return _wchdir(normalize_ntpath(wdirname));
+	result = _wchdir(normalize_ntpath(wdirname));
+	current_directory_len = GetCurrentDirectoryW(0, NULL);
+	return result;
 }
 
 int mingw_chmod(const char *filename, int mode)
 {
-	wchar_t wfilename[MAX_PATH];
-	if (xutftowcs_path(wfilename, filename) < 0)
+	wchar_t wfilename[MAX_LONG_PATH];
+	if (xutftowcs_long_path(wfilename, filename) < 0)
 		return -1;
 	return _wchmod(wfilename, mode);
 }
@@ -1317,8 +1346,8 @@ int mingw_lstat(const char *file_name, struct stat *buf)
 	WIN32_FILE_ATTRIBUTE_DATA fdata;
 	DWORD reparse_tag = 0;
 	int link_len = 0;
-	wchar_t wfilename[MAX_PATH];
-	int wlen = xutftowcs_path(wfilename, file_name);
+	wchar_t wfilename[MAX_LONG_PATH];
+	int wlen = xutftowcs_long_path(wfilename, file_name);
 	if (wlen < 0)
 		return -1;
 
@@ -1333,7 +1362,7 @@ int mingw_lstat(const char *file_name, struct stat *buf)
 	if (GetFileAttributesExW(wfilename, GetFileExInfoStandard, &fdata)) {
 		/* for reparse points, get the link tag and length */
 		if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
-			char tmpbuf[MAX_PATH];
+			char tmpbuf[MAX_LONG_PATH];
 
 			if (read_reparse_point(wfilename, FALSE, tmpbuf,
 					       &link_len, &reparse_tag) < 0)
@@ -1414,12 +1443,12 @@ static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
 
 int mingw_stat(const char *file_name, struct stat *buf)
 {
-	wchar_t wfile_name[MAX_PATH];
+	wchar_t wfile_name[MAX_LONG_PATH];
 	HANDLE hnd;
 	int result;
 
 	/* open the file and let Windows resolve the links */
-	if (xutftowcs_path(wfile_name, file_name) < 0)
+	if (xutftowcs_long_path(wfile_name, file_name) < 0)
 		return -1;
 	hnd = CreateFileW(wfile_name, 0,
 			FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL,
@@ -1487,10 +1516,10 @@ int mingw_utime (const char *file_name, const struct utimbuf *times)
 	FILETIME mft, aft;
 	int rc;
 	DWORD attrs;
-	wchar_t wfilename[MAX_PATH];
+	wchar_t wfilename[MAX_LONG_PATH];
 	HANDLE osfilehandle;
 
-	if (xutftowcs_path(wfilename, file_name) < 0)
+	if (xutftowcs_long_path(wfilename, file_name) < 0)
 		return -1;
 
 	/* must have write permission */
@@ -1631,14 +1660,14 @@ struct tm *localtime_r(const time_t *timep, struct tm *result)
 
 char *mingw_strbuf_realpath(struct strbuf *resolved, const char *path)
 {
-	wchar_t wpath[MAX_PATH];
+	wchar_t wpath[MAX_LONG_PATH];
 	HANDLE h;
 	DWORD ret;
 	int len;
 	const char *last_component = NULL;
 	char *append = NULL;
 
-	if (xutftowcs_path(wpath, path) < 0)
+	if (xutftowcs_long_path(wpath, path) < 0)
 		return NULL;
 
 	h = CreateFileW(wpath, 0,
@@ -2198,6 +2227,10 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
 
 	if (*argv && !strcmp(cmd, *argv))
 		wcmd[0] = L'\0';
+	/*
+	 * Paths to executables and to the current directory do not support
+	 * long paths, therefore we cannot use xutftowcs_long_path() here.
+	 */
 	else if (xutftowcs_path(wcmd, cmd) < 0)
 		return -1;
 	if (dir && xutftowcs_path(wdir, dir) < 0)
@@ -2907,12 +2940,12 @@ int mingw_rename(const char *pold, const char *pnew)
 	static int supports_file_rename_info_ex = 1;
 	DWORD attrs = INVALID_FILE_ATTRIBUTES, gle, attrsold;
 	int tries = 0;
-	wchar_t wpold[MAX_PATH], wpnew[MAX_PATH];
+	wchar_t wpold[MAX_LONG_PATH], wpnew[MAX_LONG_PATH];
 	int wpnew_len;
 
-	if (xutftowcs_path(wpold, pold) < 0)
+	if (xutftowcs_long_path(wpold, pold) < 0)
 		return -1;
-	wpnew_len = xutftowcs_path(wpnew, pnew);
+	wpnew_len = xutftowcs_long_path(wpnew, pnew);
 	if (wpnew_len < 0)
 		return -1;
 
@@ -2942,9 +2975,9 @@ int mingw_rename(const char *pold, const char *pnew)
 			 * flex array so that the structure has to be allocated on
 			 * the heap. As we declare this structure ourselves though
 			 * we can avoid the allocation and define FileName to have
-			 * MAX_PATH bytes.
+			 * MAX_LONG_PATH bytes.
 			 */
-			WCHAR FileName[MAX_PATH];
+			WCHAR FileName[MAX_LONG_PATH];
 		} rename_info = { 0 };
 		HANDLE old_handle = INVALID_HANDLE_VALUE;
 		BOOL success;
@@ -3318,9 +3351,9 @@ int mingw_raise(int sig)
 
 int link(const char *oldpath, const char *newpath)
 {
-	wchar_t woldpath[MAX_PATH], wnewpath[MAX_PATH];
-	if (xutftowcs_path(woldpath, oldpath) < 0 ||
-		xutftowcs_path(wnewpath, newpath) < 0)
+	wchar_t woldpath[MAX_LONG_PATH], wnewpath[MAX_LONG_PATH];
+	if (xutftowcs_long_path(woldpath, oldpath) < 0 ||
+	    xutftowcs_long_path(wnewpath, newpath) < 0)
 		return -1;
 
 	if (!CreateHardLinkW(wnewpath, woldpath, NULL)) {
@@ -3363,7 +3396,7 @@ static enum symlink_type check_symlink_attr(struct index_state *index, const cha
 
 int mingw_create_symlink(struct index_state *index, const char *target, const char *link)
 {
-	wchar_t wtarget[MAX_PATH], wlink[MAX_PATH];
+	wchar_t wtarget[MAX_LONG_PATH], wlink[MAX_LONG_PATH];
 	int len;
 
 	/* fail if symlinks are disabled or API is not supported (WinXP) */
@@ -3372,8 +3405,8 @@ int mingw_create_symlink(struct index_state *index, const char *target, const ch
 		return -1;
 	}
 
-	if ((len = xutftowcs_path(wtarget, target)) < 0
-			|| xutftowcs_path(wlink, link) < 0)
+	if ((len = xutftowcs_long_path(wtarget, target)) < 0
+			|| xutftowcs_long_path(wlink, link) < 0)
 		return -1;
 
 	/* convert target dir separators to backslashes */
@@ -3410,12 +3443,12 @@ int mingw_create_symlink(struct index_state *index, const char *target, const ch
 
 int readlink(const char *path, char *buf, size_t bufsiz)
 {
-	WCHAR wpath[MAX_PATH];
-	char tmpbuf[MAX_PATH];
+	WCHAR wpath[MAX_LONG_PATH];
+	char tmpbuf[MAX_LONG_PATH];
 	int len;
 	DWORD tag;
 
-	if (xutftowcs_path(wpath, path) < 0)
+	if (xutftowcs_long_path(wpath, path) < 0)
 		return -1;
 
 	if (read_reparse_point(wpath, TRUE, tmpbuf, &len, &tag) < 0)
@@ -3490,8 +3523,8 @@ int mingw_is_mount_point(struct strbuf *path)
 {
 	WIN32_FIND_DATAW findbuf = { 0 };
 	HANDLE handle;
-	wchar_t wfilename[MAX_PATH];
-	int wlen = xutftowcs_path(wfilename, path->buf);
+	wchar_t wfilename[MAX_LONG_PATH];
+	int wlen = xutftowcs_long_path(wfilename, path->buf);
 	if (wlen < 0)
 		die(_("could not get long path for '%s'"), path->buf);
 
@@ -3634,9 +3667,9 @@ static size_t append_system_bin_dirs(char *path, size_t size)
 
 static int is_system32_path(const char *path)
 {
-	WCHAR system32[MAX_PATH], wpath[MAX_PATH];
+	WCHAR system32[MAX_LONG_PATH], wpath[MAX_LONG_PATH];
 
-	if (xutftowcs_path(wpath, path) < 0 ||
+	if (xutftowcs_long_path(wpath, path) < 0 ||
 	    !GetSystemDirectoryW(system32, ARRAY_SIZE(system32)) ||
 	    _wcsicmp(system32, wpath))
 		return 0;
@@ -3860,16 +3893,16 @@ int is_valid_windows_path_element(wchar_t ch)
 
 int is_path_owned_by_current_sid(const char *path, struct strbuf *report)
 {
-	WCHAR wpath[MAX_PATH];
+	WCHAR wpath[MAX_LONG_PATH];
 	PSID sid = NULL;
 	PSECURITY_DESCRIPTOR descriptor = NULL;
 	DWORD err;
 
-	static wchar_t home[MAX_PATH];
+	static wchar_t home[MAX_LONG_PATH];
 
 	int result = 0;
 
-	if (xutftowcs_path(wpath, path) < 0)
+	if (xutftowcs_long_path(wpath, path) < 0)
 		return 0;
 
 	/*
@@ -4113,6 +4146,68 @@ int is_valid_win32_path(const char *path, int allow_literal_nul)
 	}
 }
 
+int handle_long_path(wchar_t *path, int len, int max_path, int expand)
+{
+	int result;
+	wchar_t buf[MAX_LONG_PATH];
+
+	/*
+	 * we don't need special handling if path is relative to the current
+	 * directory, and current directory + path don't exceed the desired
+	 * max_path limit. This should cover > 99 % of cases with minimal
+	 * performance impact (git almost always uses relative paths).
+	 */
+	if ((len < 2 || (!is_dir_sep(path[0]) && path[1] != ':')) &&
+	    (current_directory_len + len < max_path))
+		return len;
+
+	/*
+	 * handle everything else:
+	 * - absolute paths: "C:\dir\file"
+	 * - absolute UNC paths: "\\server\share\dir\file"
+	 * - absolute paths on current drive: "\dir\file"
+	 * - relative paths on other drive: "X:file"
+	 * - prefixed paths: "\\?\...", "\\.\..."
+	 */
+
+	/* convert to absolute path using GetFullPathNameW */
+	result = GetFullPathNameW(path, MAX_LONG_PATH, buf, NULL);
+	if (!result) {
+		errno = err_win_to_posix(GetLastError());
+		return -1;
+	}
+
+	/*
+	 * return absolute path if it fits within max_path (even if
+	 * "cwd + path" doesn't due to '..' components)
+	 */
+	if (result < max_path) {
+		wcscpy(path, buf);
+		return result;
+	}
+
+	/* error out if we shouldn't expand the path or buf is too small */
+	if (!expand || result >= MAX_LONG_PATH - 6) {
+		errno = ENAMETOOLONG;
+		return -1;
+	}
+
+	/* prefix full path with "\\?\" or "\\?\UNC\" */
+	if (buf[0] == '\\') {
+		/* ...unless already prefixed */
+		if (buf[1] == '\\' && (buf[2] == '?' || buf[2] == '.'))
+			return len;
+
+		wcscpy(path, L"\\\\?\\UNC\\");
+		wcscpy(path + 8, buf + 2);
+		return result + 6;
+	} else {
+		wcscpy(path, L"\\\\?\\");
+		wcscpy(path + 4, buf);
+		return result + 4;
+	}
+}
+
 #if !defined(_MSC_VER)
 /*
  * Disable MSVCRT command line wildcard expansion (__getmainargs called from
@@ -4304,6 +4399,9 @@ int wmain(int argc, const wchar_t **wargv)
 	/* initialize Unicode console */
 	winansi_init();
 
+	/* init length of current directory for handle_long_path */
+	current_directory_len = GetCurrentDirectoryW(0, NULL);
+
 	/* invoke the real main() using our utf8 version of argv. */
 	exit_status = main(argc, argv);
 
diff --git a/compat/mingw.h b/compat/mingw.h
index 4bbc6c5ce78759..379d7f5d079165 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -1,6 +1,7 @@
 #include "mingw-posix.h"
 
 extern int core_fscache;
+int are_long_paths_enabled(void);
 
 struct config_context;
 int mingw_core_config(const char *var, const char *value,
@@ -79,6 +80,42 @@ int is_valid_windows_path_element(wchar_t ch);
 int is_valid_win32_path(const char *path, int allow_literal_nul);
 #define is_valid_path(path) is_valid_win32_path(path, 0)
 
+/**
+ * Max length of long paths (exceeding MAX_PATH). The actual maximum supported
+ * by NTFS is 32,767 (* sizeof(wchar_t)), but we choose an arbitrary smaller
+ * value to limit required stack memory.
+ */
+#define MAX_LONG_PATH 4096
+
+/**
+ * Handles paths that would exceed the MAX_PATH limit of Windows Unicode APIs.
+ *
+ * With expand == false, the function checks for over-long paths and fails
+ * with ENAMETOOLONG. The path parameter is not modified, except if cwd + path
+ * exceeds max_path, but the resulting absolute path doesn't (e.g. due to
+ * eliminating '..' components). The path parameter must point to a buffer
+ * of max_path wide characters.
+ *
+ * With expand == true, an over-long path is automatically converted in place
+ * to an absolute path prefixed with '\\?\', and the new length is returned.
+ * The path parameter must point to a buffer of MAX_LONG_PATH wide characters.
+ *
+ * Parameters:
+ * path: path to check and / or convert
+ * len: size of path on input (number of wide chars without \0)
+ * max_path: max short path length to check (usually MAX_PATH = 260, but just
+ * 248 for CreateDirectoryW)
+ * expand: false to only check the length, true to expand the path to a
+ * '\\?\'-prefixed absolute path
+ *
+ * Return:
+ * length of the resulting path, or -1 on failure
+ *
+ * Errors:
+ * ENAMETOOLONG if path is too long
+ */
+int handle_long_path(wchar_t *path, int len, int max_path, int expand);
+
 /**
  * Converts UTF-8 encoded string to UTF-16LE.
  *
@@ -137,18 +174,46 @@ static inline int xutftowcs(wchar_t *wcs, const char *utf, size_t wcslen)
 }
 
 /**
- * Simplified file system specific variant of xutftowcsn, assumes output
- * buffer size is MAX_PATH wide chars and input string is \0-terminated,
- * fails with ENAMETOOLONG if input string is too long.
+ * Simplified file system specific wrapper of xutftowcsn and handle_long_path.
+ * Converts ERANGE to ENAMETOOLONG. If expand is true, wcs must be at least
+ * MAX_LONG_PATH wide chars (see handle_long_path).
  */
-static inline int xutftowcs_path(wchar_t *wcs, const char *utf)
+static inline int xutftowcs_path_ex(wchar_t *wcs, const char *utf,
+		size_t wcslen, int utflen, int max_path, int expand)
 {
-	int result = xutftowcsn(wcs, utf, MAX_PATH, -1);
+	int result = xutftowcsn(wcs, utf, wcslen, utflen);
 	if (result < 0 && errno == ERANGE)
 		errno = ENAMETOOLONG;
+	if (result >= 0)
+		result = handle_long_path(wcs, result, max_path, expand);
 	return result;
 }
 
+/**
+ * Simplified file system specific variant of xutftowcsn, assumes output
+ * buffer size is MAX_PATH wide chars and input string is \0-terminated,
+ * fails with ENAMETOOLONG if input string is too long. Typically used for
+ * Windows APIs that don't support long paths, e.g. SetCurrentDirectory,
+ * LoadLibrary, CreateProcess...
+ */
+static inline int xutftowcs_path(wchar_t *wcs, const char *utf)
+{
+	return xutftowcs_path_ex(wcs, utf, MAX_PATH, -1, MAX_PATH, 0);
+}
+
+/**
+ * Simplified file system specific variant of xutftowcsn for Windows APIs
+ * that support long paths via '\\?\'-prefix, assumes output buffer size is
+ * MAX_LONG_PATH wide chars, fails with ENAMETOOLONG if input string is too
+ * long. The 'core.longpaths' git-config option controls whether the path
+ * is only checked or expanded to a long path.
+ */
+static inline int xutftowcs_long_path(wchar_t *wcs, const char *utf)
+{
+	return xutftowcs_path_ex(wcs, utf, MAX_LONG_PATH, -1, MAX_PATH,
+				 are_long_paths_enabled());
+}
+
 /**
  * Converts UTF-16LE encoded string to UTF-8.
  *
diff --git a/compat/win32/dirent.c b/compat/win32/dirent.c
index f17e1595468f44..87063101f57202 100644
--- a/compat/win32/dirent.c
+++ b/compat/win32/dirent.c
@@ -68,19 +68,24 @@ static int dirent_closedir(dirent_DIR *dir)
 
 DIR *dirent_opendir(const char *name)
 {
-	wchar_t pattern[MAX_PATH + 2]; /* + 2 for '/' '*' */
+	wchar_t pattern[MAX_LONG_PATH + 2]; /* + 2 for "\*" */
 	WIN32_FIND_DATAW fdata;
 	HANDLE h;
 	int len;
 	dirent_DIR *dir;
 
-	/* convert name to UTF-16 and check length < MAX_PATH */
-	if ((len = xutftowcs_path(pattern, name)) < 0)
+	/* convert name to UTF-16 and check length */
+	if ((len = xutftowcs_path_ex(pattern, name, MAX_LONG_PATH, -1,
+				     MAX_PATH - 2,
+				     are_long_paths_enabled())) < 0)
 		return NULL;
 
-	/* append optional '/' and wildcard '*' */
+	/*
+	 * append optional '\' and wildcard '*'. Note: we need to use '\' as
+	 * Windows doesn't translate '/' to '\' for "\\?\"-prefixed paths.
+	 */
 	if (len && !is_dir_sep(pattern[len - 1]))
-		pattern[len++] = '/';
+		pattern[len++] = '\\';
 	pattern[len++] = '*';
 	pattern[len] = 0;
 
@@ -93,7 +98,7 @@ DIR *dirent_opendir(const char *name)
 	}
 
 	/* initialize DIR structure and copy first dir entry */
-	dir = xmalloc(sizeof(dirent_DIR) + MAX_PATH);
+	dir = xmalloc(sizeof(dirent_DIR) + MAX_LONG_PATH);
 	dir->base_dir.preaddir = (struct dirent *(*)(DIR *dir)) dirent_readdir;
 	dir->base_dir.pclosedir = (int (*)(DIR *dir)) dirent_closedir;
 	dir->dd_handle = h;
diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
index 26ae9ab1c1a464..cbd90ececf6b37 100644
--- a/compat/win32/fscache.c
+++ b/compat/win32/fscache.c
@@ -85,7 +85,7 @@ struct fsentry {
 struct heap_fsentry {
 	union {
 		struct fsentry ent;
-		char dummy[sizeof(struct fsentry) + MAX_PATH];
+		char dummy[sizeof(struct fsentry) + MAX_LONG_PATH];
 	} u;
 };
 #pragma GCC diagnostic pop
@@ -129,7 +129,7 @@ static void fsentry_init(struct fsentry *fse, struct fsentry *list,
 			 const char *name, size_t len)
 {
 	fse->list = list;
-	if (len > MAX_PATH)
+	if (len > MAX_LONG_PATH)
 		BUG("Trying to allocate fsentry for long path '%.*s'",
 		    (int)len, name);
 	memcpy(fse->dirent.d_name, name, len);
@@ -234,7 +234,7 @@ static struct fsentry *fseentry_create_entry(struct fscache *cache,
 					    fdata->EaSize, buf);
 	fse->dirent.d_type = S_ISREG(fse->st_mode) ? DT_REG :
 			S_ISDIR(fse->st_mode) ? DT_DIR : DT_LNK;
-	fse->u.s.st_size = S_ISLNK(fse->st_mode) ? MAX_PATH :
+	fse->u.s.st_size = S_ISLNK(fse->st_mode) ? MAX_LONG_PATH :
 			fdata->EndOfFile.LowPart |
 			(((off_t)fdata->EndOfFile.HighPart) << 32);
 	filetime_to_timespec((FILETIME *)&(fdata->LastAccessTime),
@@ -270,7 +270,7 @@ static struct fsentry *fseentry_create_entry(struct fscache *cache,
 static struct fsentry *fsentry_create_list(struct fscache *cache, const struct fsentry *dir,
 					   int *dir_not_found)
 {
-	wchar_t pattern[MAX_PATH];
+	wchar_t pattern[MAX_LONG_PATH];
 	NTSTATUS status;
 	IO_STATUS_BLOCK iosb;
 	PFILE_FULL_DIR_INFORMATION di;
@@ -281,13 +281,11 @@ static struct fsentry *fsentry_create_list(struct fscache *cache, const struct f
 
 	*dir_not_found = 0;
 
-	/* convert name to UTF-16 and check length < MAX_PATH */
-	if ((wlen = xutftowcsn(pattern, dir->dirent.d_name, MAX_PATH,
-			       dir->len)) < 0) {
-		if (errno == ERANGE)
-			errno = ENAMETOOLONG;
+	/* convert name to UTF-16 and check length */
+	if ((wlen = xutftowcs_path_ex(pattern, dir->dirent.d_name,
+				      MAX_LONG_PATH, dir->len, MAX_PATH - 2,
+				      are_long_paths_enabled())) < 0)
 		return NULL;
-	}
 
 	/* handle CWD */
 	if (!wlen) {
@@ -638,8 +636,8 @@ int fscache_lstat(const char *filename, struct stat *st)
 	 * Special case symbolic links: FindFirstFile()/FindNextFile() did not
 	 * provide us with the length of the target path.
 	 */
-	if (fse->u.s.st_size == MAX_PATH && S_ISLNK(fse->st_mode)) {
-		char buf[MAX_PATH];
+	if (fse->u.s.st_size == MAX_LONG_PATH && S_ISLNK(fse->st_mode)) {
+		char buf[MAX_LONG_PATH];
 		int len = readlink(filename, buf, sizeof(buf) - 1);
 
 		if (len > 0)
diff --git a/setup.c b/setup.c
index 1d2bf09730d2c8..a8ac9495b32cff 100644
--- a/setup.c
+++ b/setup.c
@@ -958,11 +958,11 @@ static int ensure_valid_ownership(const char *gitfile,
 
 static int is_invalid_dotgit_path(const char *gitfile, const char *potential_gitdir)
 {
-	WCHAR wpath[MAX_PATH];
+	WCHAR wpath[MAX_LONG_PATH];
 	struct strbuf dir = STRBUF_INIT;
 	int ret;
 
-	if (xutftowcs_path(wpath, potential_gitdir) < 0)
+	if (xutftowcs_long_path(wpath, potential_gitdir) < 0)
 		return 1;
 
 	/* Do not leak NTLM hashes, UNC paths etc. are generally problematic */
diff --git a/t/meson.build b/t/meson.build
index 2793bdae3f2d99..b2d650a3a7643a 100644
--- a/t/meson.build
+++ b/t/meson.build
@@ -283,6 +283,7 @@ integration_tests = [
   't2026-checkout-pathspec-file.sh',
   't2027-checkout-track.sh',
   't2030-unresolve-info.sh',
+  't2031-checkout-long-paths.sh',
   't2040-checkout-symlink-attr.sh',
   't2050-git-dir-relative.sh',
   't2060-switch.sh',
diff --git a/t/t2031-checkout-long-paths.sh b/t/t2031-checkout-long-paths.sh
new file mode 100755
index 00000000000000..bc2be4d5677660
--- /dev/null
+++ b/t/t2031-checkout-long-paths.sh
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+test_description='checkout long paths on Windows
+
+Ensures that Git for Windows can deal with long paths (>260) enabled via core.longpaths'
+
+. ./test-lib.sh
+
+if test_have_prereq !MINGW
+then
+	skip_all='skipping MINGW specific long paths test'
+	test_done
+fi
+
+test_expect_success setup '
+	p=longpathxx && # -> 10
+	p=$p$p$p$p$p && # -> 50
+	p=$p$p$p$p$p && # -> 250
+
+	path=${p}/longtestfile && # -> 263 (MAX_PATH = 260)
+
+	blob=$(echo foobar | git hash-object -w --stdin) &&
+
+	printf "100644 %s 0\t%s\n" "$blob" "$path" |
+	git update-index --add --index-info &&
+	git commit -m initial -q
+'
+
+test_expect_success 'checkout of long paths without core.longpaths fails' '
+	git config core.longpaths false &&
+	test_must_fail git checkout -f 2>error &&
+	test_grep -q "Filename too long" error &&
+	test ! -d longpa*
+'
+
+test_expect_success 'checkout of long paths with core.longpaths works' '
+	git config core.longpaths true &&
+	git checkout -f &&
+	test_path_is_file longpa*/longtestfile
+'
+
+test_expect_success 'update of long paths' '
+	echo frotz >>$(ls longpa*/longtestfile) &&
+	echo $path > expect &&
+	git ls-files -m > actual &&
+	test_cmp expect actual &&
+	git add $path &&
+	git commit -m second &&
+	git grep "frotz" HEAD -- $path
+'
+
+test_expect_success cleanup '
+	# bash cannot delete the trash dir if it contains a long path
+	# lets help cleaning up (unless in debug mode)
+	if test -z "$debug"
+	then
+		rm -rf longpa~1
+	fi
+'
+
+# check that the template used in the test won't be too long:
+abspath="$(pwd)"/testdir
+test ${#abspath} -gt 230 ||
+test_set_prereq SHORTABSPATH
+
+test_expect_success SHORTABSPATH 'clean up path close to MAX_PATH' '
+	p=/123456789abcdef/123456789abcdef/123456789abcdef/123456789abc/ef &&
+	p=y$p$p$p$p &&
+	subdir="x$(echo "$p" | tail -c $((253 - ${#abspath})) - )" &&
+	# Now, $abspath/$subdir has exactly 254 characters, and is inside CWD
+	p2="$abspath/$subdir" &&
+	test 254 = ${#p2} &&
+
+	# Be careful to overcome path limitations of the MSys tools and split
+	# the $subdir into two parts. ($subdir2 has to contain 16 chars and a
+	# slash somewhere following; that is why we asked for abspath <= 230 and
+	# why we placed a slash near the end of the $subdir template.)
+	subdir2=${subdir#????????????????*/} &&
+	subdir1=testdir/${subdir%/$subdir2} &&
+	mkdir -p "$subdir1" &&
+	i=0 &&
+	# The most important case is when absolute path is 258 characters long,
+	# and that will be when i == 4.
+	while test $i -le 7
+	do
+		mkdir -p $subdir2 &&
+		touch $subdir2/one-file &&
+		mv ${subdir2%%/*} "$subdir1/" &&
+		subdir2=z${subdir2} &&
+		i=$(($i+1)) ||
+		exit 1
+	done &&
+
+	# now check that git is able to clear the tree:
+	(cd testdir &&
+	 git init &&
+	 git config core.longpaths yes &&
+	 git clean -fdx) &&
+	test ! -d "$subdir1"
+'
+
+test_done
diff --git a/t/t7429-submodule-long-path.sh b/t/t7429-submodule-long-path.sh
index f692cedbff7ff8..458519eafd6f03 100755
--- a/t/t7429-submodule-long-path.sh
+++ b/t/t7429-submodule-long-path.sh
@@ -11,15 +11,20 @@ This test verifies that "git submodule" initialization, update and clones work,
 TEST_NO_CREATE_REPO=1
 . ./test-lib.sh
 
-longpath=""
-for (( i=0; i<4; i++ )); do
-	longpath="0123456789abcdefghijklmnopqrstuvwxyz$longpath"
-done
-# Pick a substring maximum of 90 characters
-# This should be good, since we'll add on a lot for temp directories
-longpath=${longpath:0:90}; export longpath
+# cloning a submodule calls is_git_directory("$path/../.git/modules/$path"),
+# which effectively limits the maximum length to PATH_MAX / 2 minus some
+# overhead; start with 3 * 36 = 108 chars (test 2 fails if >= 110)
+longpath36=0123456789abcdefghijklmnopqrstuvwxyz
+longpath180=$longpath36$longpath36$longpath36$longpath36$longpath36
 
-test_expect_failure 'submodule with a long path' '
+# the git database must fit within PATH_MAX, which limits the submodule name
+# to PATH_MAX - len(pwd) - ~90 (= len("/objects//") + 40-byte sha1 + some
+# overhead from the test case)
+pwd=$(pwd)
+pwdlen=$(echo "$pwd" | wc -c)
+longpath=$(echo $longpath180 | cut -c 1-$((170-$pwdlen)))
+
+test_expect_success 'submodule with a long path' '
 	git config --global protocol.file.allow always &&
 	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
 	git -c init.defaultBranch=long init --bare remote &&
@@ -59,7 +64,7 @@ test_expect_failure 'submodule with a long path' '
 	)
 '
 
-test_expect_failure 'recursive submodule with a long path' '
+test_expect_success 'recursive submodule with a long path' '
 	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
 	git -c init.defaultBranch=long init --bare super &&
 	test_create_repo child &&
@@ -101,6 +106,5 @@ test_expect_failure 'recursive submodule with a long path' '
 		)
 	)
 '
-unset longpath
 
 test_done

From 094ba33c25cb729b42e3420d2b32ceeb5b4a3aea Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 19 Nov 2018 20:34:13 +0100
Subject: [PATCH 222/247] tests: use the correct path separator with BusyBox

BusyBox-w32 is a true Win32 application, i.e. it does not come with a
POSIX emulation layer.

That also means that it does *not* use the Unix convention of separating
the entries in the PATH variable using colons, but semicolons.

However, there are also BusyBox ports to Windows which use a POSIX
emulation layer such as Cygwin's or MSYS2's runtime, i.e. using colons
as PATH separators.

As a tell-tale, let's use the presence of semicolons in the PATH
variable: on Unix, it is highly unlikely that it contains semicolons,
and on Windows (without POSIX emulation), it is virtually guaranteed, as
everybody should have both $SYSTEMROOT and $SYSTEMROOT/system32 in their
PATH.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/interop/interop-lib.sh    |  8 ++++++--
 t/lib-proto-disable.sh      |  2 +-
 t/t0021-conversion.sh       |  2 +-
 t/t0060-path-utils.sh       | 24 ++++++++++++------------
 t/t0061-run-command.sh      |  6 +++---
 t/t0300-credentials.sh      |  2 +-
 t/t1504-ceiling-dirs.sh     | 10 +++++-----
 t/t2300-cd-to-toplevel.sh   |  2 +-
 t/t3418-rebase-continue.sh  |  4 ++--
 t/t5615-alternate-env.sh    |  4 ++--
 t/t5802-connect-helper.sh   |  2 +-
 t/t7006-pager.sh            |  4 ++--
 t/t7606-merge-custom.sh     |  2 +-
 t/t7811-grep-open.sh        |  2 +-
 t/t9003-help-autocorrect.sh |  2 +-
 t/t9800-git-p4-basic.sh     |  2 +-
 t/test-lib.sh               | 17 +++++++++++++----
 17 files changed, 54 insertions(+), 41 deletions(-)

diff --git a/t/interop/interop-lib.sh b/t/interop/interop-lib.sh
index 1b5864d2a7f22c..1facc69d97741a 100644
--- a/t/interop/interop-lib.sh
+++ b/t/interop/interop-lib.sh
@@ -4,6 +4,10 @@
 . ../../GIT-BUILD-OPTIONS
 INTEROP_ROOT=$(pwd)
 BUILD_ROOT=$INTEROP_ROOT/build
+case "$PATH" in
+*\;*) PATH_SEP=\; ;;
+*) PATH_SEP=: ;;
+esac
 
 build_version () {
 	if test -z "$1"
@@ -57,7 +61,7 @@ wrap_git () {
 	write_script "$1" <<-EOF
 	GIT_EXEC_PATH="$2"
 	export GIT_EXEC_PATH
-	PATH="$2:\$PATH"
+	PATH="$2$PATH_SEP\$PATH"
 	export GIT_EXEC_PATH
 	exec git "\$@"
 	EOF
@@ -71,7 +75,7 @@ generate_wrappers () {
 	echo >&2 fatal: test tried to run generic git: $*
 	exit 1
 	EOF
-	PATH=$(pwd)/.bin:$PATH
+	PATH=$(pwd)/.bin$PATH_SEP$PATH
 }
 
 VERSION_A=${GIT_TEST_VERSION_A:-$VERSION_A}
diff --git a/t/lib-proto-disable.sh b/t/lib-proto-disable.sh
index 890622be81642b..9db481e1be15b2 100644
--- a/t/lib-proto-disable.sh
+++ b/t/lib-proto-disable.sh
@@ -214,7 +214,7 @@ setup_ext_wrapper () {
 		cd "$TRASH_DIRECTORY/remote" &&
 		eval "$*"
 		EOF
-		PATH=$TRASH_DIRECTORY:$PATH &&
+		PATH=$TRASH_DIRECTORY$PATH_SEP$PATH &&
 		export TRASH_DIRECTORY
 	'
 }
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index 632915086c521d..a0f093649df625 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -8,7 +8,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
-PATH=$PWD:$PATH
+PATH=$PWD$PATH_SEP$PATH
 TEST_ROOT="$(pwd)"
 
 write_script <<\EOF "$TEST_ROOT/rot13.sh"
diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
index 3cdc4738644dbc..5abfa202c19dca 100755
--- a/t/t0060-path-utils.sh
+++ b/t/t0060-path-utils.sh
@@ -147,25 +147,25 @@ ancestor /foo /fo -1
 ancestor /foo /foo -1
 ancestor /foo /bar -1
 ancestor /foo /foo/bar -1
-ancestor /foo /foo:/bar -1
-ancestor /foo /:/foo:/bar 0
-ancestor /foo /foo:/:/bar 0
-ancestor /foo /:/bar:/foo 0
+ancestor /foo "/foo$PATH_SEP/bar" -1
+ancestor /foo "/$PATH_SEP/foo$PATH_SEP/bar" 0
+ancestor /foo "/foo$PATH_SEP/$PATH_SEP/bar" 0
+ancestor /foo "/$PATH_SEP/bar$PATH_SEP/foo" 0
 ancestor /foo/bar / 0
 ancestor /foo/bar /fo -1
 ancestor /foo/bar /foo 4
 ancestor /foo/bar /foo/ba -1
-ancestor /foo/bar /:/fo 0
-ancestor /foo/bar /foo:/foo/ba 4
+ancestor /foo/bar "/$PATH_SEP/fo" 0
+ancestor /foo/bar "/foo$PATH_SEP/foo/ba" 4
 ancestor /foo/bar /bar -1
 ancestor /foo/bar /fo -1
-ancestor /foo/bar /foo:/bar 4
-ancestor /foo/bar /:/foo:/bar 4
-ancestor /foo/bar /foo:/:/bar 4
-ancestor /foo/bar /:/bar:/fo 0
-ancestor /foo/bar /:/bar 0
+ancestor /foo/bar "/foo$PATH_SEP/bar" 4
+ancestor /foo/bar "/$PATH_SEP/foo$PATH_SEP/bar" 4
+ancestor /foo/bar "/foo$PATH_SEP/$PATH_SEP/bar" 4
+ancestor /foo/bar "/$PATH_SEP/bar$PATH_SEP/fo" 0
+ancestor /foo/bar "/$PATH_SEP/bar" 0
 ancestor /foo/bar /foo 4
-ancestor /foo/bar /foo:/bar 4
+ancestor /foo/bar "/foo$PATH_SEP/bar" 4
 ancestor /foo/bar /bar -1
 
 # Windows-specific: DOS drives, network shares
diff --git a/t/t0061-run-command.sh b/t/t0061-run-command.sh
index c74deaee1ac8fb..967d3f39fe74af 100755
--- a/t/t0061-run-command.sh
+++ b/t/t0061-run-command.sh
@@ -69,7 +69,7 @@ test_expect_success 'run_command does not try to execute a directory' '
 	cat bin2/greet
 	EOF
 
-	PATH=$PWD/bin1:$PWD/bin2:$PATH \
+	PATH=$PWD/bin1$PATH_SEP$PWD/bin2$PATH_SEP$PATH \
 		test-tool run-command run-command greet >actual 2>err &&
 	test_cmp bin2/greet actual &&
 	test_must_be_empty err
@@ -86,7 +86,7 @@ test_expect_success POSIXPERM 'run_command passes over non-executable file' '
 	cat bin2/greet
 	EOF
 
-	PATH=$PWD/bin1:$PWD/bin2:$PATH \
+	PATH=$PWD/bin1$PATH_SEP$PWD/bin2$PATH_SEP$PATH \
 		test-tool run-command run-command greet >actual 2>err &&
 	test_cmp bin2/greet actual &&
 	test_must_be_empty err
@@ -106,7 +106,7 @@ test_expect_success POSIXPERM,SANITY 'unreadable directory in PATH' '
 	git config alias.nitfol "!echo frotz" &&
 	chmod a-rx local-command &&
 	(
-		PATH=./local-command:$PATH &&
+		PATH=./local-command$PATH_SEP$PATH &&
 		git nitfol >actual
 	) &&
 	echo frotz >expect &&
diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh
index ea11cdb4dcd251..e8774485b82c28 100755
--- a/t/t0300-credentials.sh
+++ b/t/t0300-credentials.sh
@@ -80,7 +80,7 @@ test_expect_success 'setup helper scripts' '
 	printf "username=\\007latrix Lestrange\\n"
 	EOF
 
-	PATH="$PWD:$PATH"
+	PATH="$PWD$PATH_SEP$PATH"
 '
 
 test_expect_success 'credential_fill invokes helper' '
diff --git a/t/t1504-ceiling-dirs.sh b/t/t1504-ceiling-dirs.sh
index e04420f4368b93..ff9fb804827b59 100755
--- a/t/t1504-ceiling-dirs.sh
+++ b/t/t1504-ceiling-dirs.sh
@@ -84,9 +84,9 @@ then
 	GIT_CEILING_DIRECTORIES="$TRASH_ROOT/top/"
 	test_fail subdir_ceil_at_top_slash
 
-	GIT_CEILING_DIRECTORIES=":$TRASH_ROOT/top"
+	GIT_CEILING_DIRECTORIES="$PATH_SEP$TRASH_ROOT/top"
 	test_prefix subdir_ceil_at_top_no_resolve "sub/dir/"
-	GIT_CEILING_DIRECTORIES=":$TRASH_ROOT/top/"
+	GIT_CEILING_DIRECTORIES="$PATH_SEP$TRASH_ROOT/top/"
 	test_prefix subdir_ceil_at_top_slash_no_resolve "sub/dir/"
 fi
 
@@ -116,13 +116,13 @@ GIT_CEILING_DIRECTORIES="$TRASH_ROOT/subdi"
 test_prefix subdir_ceil_at_subdi_slash "sub/dir/"
 
 
-GIT_CEILING_DIRECTORIES="/foo:$TRASH_ROOT/sub"
+GIT_CEILING_DIRECTORIES="/foo$PATH_SEP$TRASH_ROOT/sub"
 test_fail second_of_two
 
-GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub:/bar"
+GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub$PATH_SEP/bar"
 test_fail first_of_two
 
-GIT_CEILING_DIRECTORIES="/foo:$TRASH_ROOT/sub:/bar"
+GIT_CEILING_DIRECTORIES="/foo$PATH_SEP$TRASH_ROOT/sub$PATH_SEP/bar"
 test_fail second_of_three
 
 
diff --git a/t/t2300-cd-to-toplevel.sh b/t/t2300-cd-to-toplevel.sh
index c8de6d8a190220..91f523d5198d8d 100755
--- a/t/t2300-cd-to-toplevel.sh
+++ b/t/t2300-cd-to-toplevel.sh
@@ -16,7 +16,7 @@ test_cd_to_toplevel () {
 	test_expect_success $3 "$2" '
 		(
 			cd '"'$1'"' &&
-			PATH="$EXEC_PATH:$PATH" &&
+			PATH="$EXEC_PATH$PATH_SEP$PATH" &&
 			. git-sh-setup &&
 			cd_to_toplevel &&
 			[ "$(pwd -P)" = "$TOPLEVEL" ]
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh
index cb5c3a1cb5bc6f..1795e6575acd7f 100755
--- a/t/t3418-rebase-continue.sh
+++ b/t/t3418-rebase-continue.sh
@@ -82,7 +82,7 @@ test_expect_success 'rebase --continue remembers merge strategy and options' '
 
 	rm -f actual &&
 	(
-		PATH=./test-bin:$PATH &&
+		PATH=./test-bin$PATH_SEP$PATH &&
 		test_must_fail git rebase -s funny -X"option=arg with space" \
 				-Xop\"tion\\ -X"new${LF}line " main topic
 	) &&
@@ -91,7 +91,7 @@ test_expect_success 'rebase --continue remembers merge strategy and options' '
 	echo "Resolved" >F2 &&
 	git add F2 &&
 	(
-		PATH=./test-bin:$PATH &&
+		PATH=./test-bin$PATH_SEP$PATH &&
 		git rebase --continue
 	) &&
 	test_cmp expect actual
diff --git a/t/t5615-alternate-env.sh b/t/t5615-alternate-env.sh
index 9d6aa2187f2aaa..1bfeccdeb49958 100755
--- a/t/t5615-alternate-env.sh
+++ b/t/t5615-alternate-env.sh
@@ -39,7 +39,7 @@ test_expect_success 'access alternate via absolute path' '
 '
 
 test_expect_success 'access multiple alternates' '
-	check_obj "$PWD/one.git/objects:$PWD/two.git/objects" <<-EOF
+	check_obj "$PWD/one.git/objects$PATH_SEP$PWD/two.git/objects" <<-EOF
 	$one blob
 	$two blob
 	EOF
@@ -75,7 +75,7 @@ test_expect_success 'access alternate via relative path (subdir)' '
 quoted='"one.git\057objects"'
 unquoted='two.git/objects'
 test_expect_success 'mix of quoted and unquoted alternates' '
-	check_obj "$quoted:$unquoted" <<-EOF
+	check_obj "$quoted$PATH_SEP$unquoted" <<-EOF
 	$one blob
 	$two blob
 	EOF
diff --git a/t/t5802-connect-helper.sh b/t/t5802-connect-helper.sh
index a7be375bceb8d3..26cbcebf3b2b24 100755
--- a/t/t5802-connect-helper.sh
+++ b/t/t5802-connect-helper.sh
@@ -86,7 +86,7 @@ test_expect_success 'set up fake git-daemon' '
 		"$TRASH_DIRECTORY/remote"
 	EOF
 	export TRASH_DIRECTORY &&
-	PATH=$TRASH_DIRECTORY:$PATH
+	PATH=$TRASH_DIRECTORY$PATH_SEP$PATH
 '
 
 test_expect_success 'ext command can connect to git daemon (no vhost)' '
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 75ca7a25daed91..cb6def62e65424 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -54,7 +54,7 @@ test_expect_success !MINGW,TTY 'LESS and LV envvars set by git-sh-setup' '
 		sane_unset LESS LV &&
 		PAGER="env >pager-env.out; wc" &&
 		export PAGER &&
-		PATH="$(git --exec-path):$PATH" &&
+		PATH="$(git --exec-path)$PATH_SEP$PATH" &&
 		export PATH &&
 		test_terminal sh -c ". git-sh-setup && git_pager"
 	) &&
@@ -388,7 +388,7 @@ test_default_pager() {
 		EOF
 		chmod +x \$less &&
 		(
-			PATH=.:\$PATH &&
+			PATH=.$PATH_SEP\$PATH &&
 			export PATH &&
 			$full_command
 		) &&
diff --git a/t/t7606-merge-custom.sh b/t/t7606-merge-custom.sh
index 0ae2f59b1d8f86..2c306779fe6fd7 100755
--- a/t/t7606-merge-custom.sh
+++ b/t/t7606-merge-custom.sh
@@ -23,7 +23,7 @@ test_expect_success 'set up custom strategy' '
 	EOF
 
 	chmod +x git-merge-theirs &&
-	PATH=.:$PATH &&
+	PATH=.$PATH_SEP$PATH &&
 	export PATH
 '
 
diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh
index 3160be59fd2e26..1a98d733dceb86 100755
--- a/t/t7811-grep-open.sh
+++ b/t/t7811-grep-open.sh
@@ -52,7 +52,7 @@ test_expect_success SIMPLEPAGER 'git grep -O' '
 	EOF
 	echo grep.h >expect.notless &&
 
-	PATH=.:$PATH git grep -O GREP_PATTERN >out &&
+	PATH=.$PATH_SEP$PATH git grep -O GREP_PATTERN >out &&
 	{
 		test_cmp expect.less pager-args ||
 		test_cmp expect.notless pager-args
diff --git a/t/t9003-help-autocorrect.sh b/t/t9003-help-autocorrect.sh
index 87b438fcac7bb9..a6f8aaebeb56d7 100755
--- a/t/t9003-help-autocorrect.sh
+++ b/t/t9003-help-autocorrect.sh
@@ -13,7 +13,7 @@ test_expect_success 'setup' '
 		echo distimdistim was called
 	EOF
 
-	PATH="$PATH:." &&
+	PATH="$PATH$PATH_SEP." &&
 	export PATH &&
 
 	git commit --allow-empty -m "a single log entry" &&
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
index 140a3a7f24b26a..f55f6758d5e8a8 100755
--- a/t/t9800-git-p4-basic.sh
+++ b/t/t9800-git-p4-basic.sh
@@ -286,7 +286,7 @@ test_expect_success 'exit when p4 fails to produce marshaled output' '
 	EOF
 	chmod 755 badp4dir/p4 &&
 	(
-		PATH="$TRASH_DIRECTORY/badp4dir:$PATH" &&
+		PATH="$TRASH_DIRECTORY/badp4dir$PATH_SEP$PATH" &&
 		export PATH &&
 		test_expect_code 1 git p4 clone --dest="$git" //depot >errs 2>&1
 	) &&
diff --git a/t/test-lib.sh b/t/test-lib.sh
index d1a40ea90295d3..3bc2a5cd314a83 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -40,6 +40,15 @@ case "${GIT_TEST_USE_SET_E:-false}" in
 	;;
 esac
 
+# On Unix/Linux, the path separator is the colon, on other systems it
+# may be different, though. On Windows, for example, it is a semicolon.
+# If the PATH variable contains semicolons, it is pretty safe to assume
+# that the path separator is a semicolon.
+case "$PATH" in
+*\;*) PATH_SEP=\; ;;
+*) PATH_SEP=: ;;
+esac
+
 # Test the binaries we have just built.  The tests are kept in
 # t/ subdirectory and are run in 'trash directory' subdirectory.
 if test -z "$TEST_DIRECTORY"
@@ -1419,7 +1428,7 @@ then
 		done
 	done
 	IFS=$OLDIFS
-	PATH=$GIT_VALGRIND/bin:$PATH
+	PATH=$GIT_VALGRIND/bin$PATH_SEP$PATH
 	GIT_EXEC_PATH=$GIT_VALGRIND/bin
 	export GIT_VALGRIND
 	GIT_VALGRIND_MODE="$valgrind"
@@ -1431,7 +1440,7 @@ elif test -n "$GIT_TEST_INSTALLED"
 then
 	GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path)  ||
 	error "Cannot run git from $GIT_TEST_INSTALLED."
-	PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$PATH
+	PATH=$GIT_TEST_INSTALLED$PATH_SEP$GIT_BUILD_DIR/t/helper$PATH_SEP$PATH
 	GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH}
 else # normal case, use ../bin-wrappers only unless $with_dashes:
 	if test -n "$no_bin_wrappers"
@@ -1447,12 +1456,12 @@ else # normal case, use ../bin-wrappers only unless $with_dashes:
 			fi
 			with_dashes=t
 		fi
-		PATH="$git_bin_dir:$PATH"
+		PATH="$git_bin_dir$PATH_SEP$PATH"
 	fi
 	GIT_EXEC_PATH=$GIT_BUILD_DIR
 	if test -n "$with_dashes"
 	then
-		PATH="$GIT_BUILD_DIR:$GIT_BUILD_DIR/t/helper:$PATH"
+		PATH="$GIT_BUILD_DIR$PATH_SEP$GIT_BUILD_DIR/t/helper$PATH_SEP$PATH"
 	fi
 fi
 GIT_TEMPLATE_DIR="$GIT_TEST_TEMPLATE_DIR"

From e891acf8ad29470fb78beed30d044ed0f7602d6f Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 6 Sep 2023 09:14:47 +0200
Subject: [PATCH 223/247] win32(long path support): leave drive-less absolute
 paths intact

When trying to ensure that long paths are handled correctly, we
first normalize absolute paths as we encounter them.

However, if the path is a so-called "drive-less" absolute path, i.e. if
it is relative to the current drive but _does_ start with a directory
separator, we would want the normalized path to be such a drive-less
absolute path, too.

Let's do that, being careful to still include the drive prefix when we
need to go through the `\\?\` dance (because there, the drive prefix is
absolutely required).

This fixes https://github.com/git-for-windows/git/issues/4586.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/mingw.c                 | 7 ++++++-
 t/t2031-checkout-long-paths.sh | 9 +++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 2a12bb90fc467a..672171ee8698f0 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -4182,7 +4182,12 @@ int handle_long_path(wchar_t *path, int len, int max_path, int expand)
 	 * "cwd + path" doesn't due to '..' components)
 	 */
 	if (result < max_path) {
-		wcscpy(path, buf);
+		/* Be careful not to add a drive prefix if there was none */
+		if (is_wdir_sep(path[0]) &&
+		    !is_wdir_sep(buf[0]) && buf[1] == L':' && is_wdir_sep(buf[2]))
+			wcscpy(path, buf + 2);
+		else
+			wcscpy(path, buf);
 		return result;
 	}
 
diff --git a/t/t2031-checkout-long-paths.sh b/t/t2031-checkout-long-paths.sh
index bc2be4d5677660..4278a602cbd09e 100755
--- a/t/t2031-checkout-long-paths.sh
+++ b/t/t2031-checkout-long-paths.sh
@@ -99,4 +99,13 @@ test_expect_success SHORTABSPATH 'clean up path close to MAX_PATH' '
 	test ! -d "$subdir1"
 '
 
+test_expect_success SYMLINKS_WINDOWS 'leave drive-less, short paths intact' '
+	printf "/Program Files" >symlink-target &&
+	symlink_target_oid="$(git hash-object -w --stdin <symlink-target)" &&
+	git update-index --add --cacheinfo 120000,$symlink_target_oid,PF &&
+	git -c core.symlinks=true checkout -- PF &&
+	cmd //c dir >actual &&
+	test_grep "<SYMLINKD\\?> *PF *\\[\\\\Program Files\\]" actual
+'
+
 test_done

From 75574bacb291c0f7aeb97854f7365cd09c162f07 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 30 Jun 2017 00:35:40 +0200
Subject: [PATCH 224/247] mingw: only use Bash-ism `builtin pwd -W` when
 available

Traditionally, Git for Windows' SDK uses Bash as its default shell.
However, other Unix shells are available, too. Most notably, the Win32
port of BusyBox comes with `ash` whose `pwd` command already prints
Windows paths as Git for Windows wants them, while there is not even a
`builtin` command.

Therefore, let's be careful not to override `pwd` unless we know that
the `builtin` command is available.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 git-sh-setup.sh | 14 ++++++++++----
 t/test-lib.sh   | 14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index fad4f9df94e143..c51ad34148ccf3 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -306,10 +306,16 @@ case $(uname -s) in
 			/usr/bin/find "$@"
 		}
 	fi
-	# git sees Windows-style pwd
-	pwd () {
-		builtin pwd -W
-	}
+	# On Windows, Git wants Windows paths. But /usr/bin/pwd spits out
+	# Unix-style paths. At least in Bash, we have a builtin pwd that
+	# understands the -W option to force "mixed" paths, i.e. with drive
+	# prefix but still with forward slashes. Let's use that, if available.
+	if type builtin >/dev/null 2>&1
+	then
+		pwd () {
+			builtin pwd -W
+		}
+	fi
 	is_absolute_path () {
 		case "$1" in
 		[/\\]* | [A-Za-z]:*)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 3bc2a5cd314a83..4fe3be81193d1a 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1731,10 +1731,16 @@ Darwin)
 			/usr/bin/find "$@"
 		}
 	fi
-	# git sees Windows-style pwd
-	pwd () {
-		builtin pwd -W
-	}
+	# On Windows, Git wants Windows paths. But /usr/bin/pwd spits out
+	# Unix-style paths. At least in Bash, we have a builtin pwd that
+	# understands the -W option to force "mixed" paths, i.e. with drive
+	# prefix but still with forward slashes. Let's use that, if available.
+	if type builtin >/dev/null 2>&1
+	then
+		pwd () {
+			builtin pwd -W
+		}
+	fi
 	# no POSIX permissions
 	# backslashes in pathspec are converted to '/'
 	# exec does not inherit the PID

From 563f99edf01565ccd13cd0d42a13a4e1c0de99d3 Mon Sep 17 00:00:00 2001
From: Jeff Hostetler <jeffhost@microsoft.com>
Date: Fri, 25 Mar 2022 16:56:04 -0400
Subject: [PATCH 225/247] compat/fsmonitor/fsm-*-win32: support long paths

Update wchar_t buffers to use MAX_LONG_PATH instead of MAX_PATH and call
xutftowcs_long_path() in the Win32 backend source files.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
---
 compat/fsmonitor/fsm-health-win32.c     |  6 +++---
 compat/fsmonitor/fsm-listen-win32.c     | 18 +++++++++---------
 compat/fsmonitor/fsm-path-utils-win32.c |  8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/compat/fsmonitor/fsm-health-win32.c b/compat/fsmonitor/fsm-health-win32.c
index 2aa8c219acee4d..4b53360d194105 100644
--- a/compat/fsmonitor/fsm-health-win32.c
+++ b/compat/fsmonitor/fsm-health-win32.c
@@ -34,7 +34,7 @@ struct fsm_health_data
 
 	struct wt_moved
 	{
-		wchar_t wpath[MAX_PATH + 1];
+		wchar_t wpath[MAX_LONG_PATH + 1];
 		BY_HANDLE_FILE_INFORMATION bhfi;
 	} wt_moved;
 };
@@ -143,8 +143,8 @@ static int has_worktree_moved(struct fsmonitor_daemon_state *state,
 		return 0;
 
 	case CTX_INIT:
-		if (xutftowcs_path(data->wt_moved.wpath,
-				   state->path_worktree_watch.buf) < 0) {
+		if (xutftowcs_long_path(data->wt_moved.wpath,
+					state->path_worktree_watch.buf) < 0) {
 			error(_("could not convert to wide characters: '%s'"),
 			      state->path_worktree_watch.buf);
 			return -1;
diff --git a/compat/fsmonitor/fsm-listen-win32.c b/compat/fsmonitor/fsm-listen-win32.c
index 9a6efc9bea340b..afcc172750af10 100644
--- a/compat/fsmonitor/fsm-listen-win32.c
+++ b/compat/fsmonitor/fsm-listen-win32.c
@@ -28,7 +28,7 @@ struct one_watch
 	DWORD count;
 
 	struct strbuf path;
-	wchar_t wpath_longname[MAX_PATH + 1];
+	wchar_t wpath_longname[MAX_LONG_PATH + 1];
 	DWORD wpath_longname_len;
 
 	HANDLE hDir;
@@ -131,8 +131,8 @@ static int normalize_path_in_utf8(wchar_t *wpath, DWORD wpath_len,
  */
 static void check_for_shortnames(struct one_watch *watch)
 {
-	wchar_t buf_in[MAX_PATH + 1];
-	wchar_t buf_out[MAX_PATH + 1];
+	wchar_t buf_in[MAX_LONG_PATH + 1];
+	wchar_t buf_out[MAX_LONG_PATH + 1];
 	wchar_t *last;
 	wchar_t *p;
 
@@ -197,8 +197,8 @@ static enum get_relative_result get_relative_longname(
 	const wchar_t *wpath, DWORD wpath_len,
 	wchar_t *wpath_longname, size_t bufsize_wpath_longname)
 {
-	wchar_t buf_in[2 * MAX_PATH + 1];
-	wchar_t buf_out[MAX_PATH + 1];
+	wchar_t buf_in[2 * MAX_LONG_PATH + 1];
+	wchar_t buf_out[MAX_LONG_PATH + 1];
 	DWORD root_len;
 	DWORD out_len;
 
@@ -298,10 +298,10 @@ static struct one_watch *create_watch(const char *path)
 		FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE;
 	HANDLE hDir;
 	DWORD len_longname;
-	wchar_t wpath[MAX_PATH + 1];
-	wchar_t wpath_longname[MAX_PATH + 1];
+	wchar_t wpath[MAX_LONG_PATH + 1];
+	wchar_t wpath_longname[MAX_LONG_PATH + 1];
 
-	if (xutftowcs_path(wpath, path) < 0) {
+	if (xutftowcs_long_path(wpath, path) < 0) {
 		error(_("could not convert to wide characters: '%s'"), path);
 		return NULL;
 	}
@@ -545,7 +545,7 @@ static int process_worktree_events(struct fsmonitor_daemon_state *state)
 	struct string_list cookie_list = STRING_LIST_INIT_DUP;
 	struct fsmonitor_batch *batch = NULL;
 	const char *p = watch->buffer;
-	wchar_t wpath_longname[MAX_PATH + 1];
+	wchar_t wpath_longname[MAX_LONG_PATH + 1];
 
 	/*
 	 * If the kernel gets more events than will fit in the kernel
diff --git a/compat/fsmonitor/fsm-path-utils-win32.c b/compat/fsmonitor/fsm-path-utils-win32.c
index f4f9cc1f336720..c6eb065bde48b4 100644
--- a/compat/fsmonitor/fsm-path-utils-win32.c
+++ b/compat/fsmonitor/fsm-path-utils-win32.c
@@ -69,8 +69,8 @@ static int check_remote_protocol(wchar_t *wpath)
  */
 int fsmonitor__get_fs_info(const char *path, struct fs_info *fs_info)
 {
-	wchar_t wpath[MAX_PATH];
-	wchar_t wfullpath[MAX_PATH];
+	wchar_t wpath[MAX_LONG_PATH];
+	wchar_t wfullpath[MAX_LONG_PATH];
 	size_t wlen;
 	UINT driveType;
 
@@ -78,7 +78,7 @@ int fsmonitor__get_fs_info(const char *path, struct fs_info *fs_info)
 	 * Do everything in wide chars because the drive letter might be
 	 * a multi-byte sequence.  See win32_has_dos_drive_prefix().
 	 */
-	if (xutftowcs_path(wpath, path) < 0) {
+	if (xutftowcs_long_path(wpath, path) < 0) {
 		return -1;
 	}
 
@@ -97,7 +97,7 @@ int fsmonitor__get_fs_info(const char *path, struct fs_info *fs_info)
 	 * slashes to backslashes.  This is essential to get GetDriveTypeW()
 	 * correctly handle some UNC "\\server\share\..." paths.
 	 */
-	if (!GetFullPathNameW(wpath, MAX_PATH, wfullpath, NULL)) {
+	if (!GetFullPathNameW(wpath, MAX_LONG_PATH, wfullpath, NULL)) {
 		return -1;
 	}
 

From 8de4a8f0af81d74492b2556ada7197d090b44eb6 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 30 Jun 2017 22:32:33 +0200
Subject: [PATCH 226/247] tests (mingw): remove Bash-specific pwd option

The -W option is only understood by MSYS2 Bash's pwd command. We already
make sure to override `pwd` by `builtin pwd -W` for MINGW, so let's not
double the effort here.

This will also help when switching the shell to another one (such as
BusyBox' ash) whose pwd does *not* understand the -W option.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t9902-completion.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 38cf22171829a1..e16ca8797636f2 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -139,12 +139,7 @@ invalid_variable_name='${foo.bar}'
 
 actual="$TRASH_DIRECTORY/actual"
 
-if test_have_prereq MINGW
-then
-	ROOT="$(pwd -W)"
-else
-	ROOT="$(pwd)"
-fi
+ROOT="$(pwd)"
 
 test_expect_success 'setup for __git_find_repo_path/__gitdir tests' '
 	mkdir -p subdir/subsubdir &&

From c8ae37507b9be7e4b391744adbdee68aea047e5b Mon Sep 17 00:00:00 2001
From: Ben Boeckel <mathstuf@gmail.com>
Date: Fri, 22 Apr 2022 09:06:23 -0400
Subject: [PATCH 227/247] clean: suggest using `core.longPaths` if paths are
 too long to remove

On Windows, git repositories may have extra files which need cleaned
(e.g., a build directory) that may be arbitrarily deep. Suggest using
`core.longPaths` if such situations are encountered.

Fixes: #2715
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
---
 Documentation/config/advice.adoc |  3 +++
 advice.c                         |  1 +
 advice.h                         |  1 +
 builtin/clean.c                  | 13 +++++++++++++
 4 files changed, 18 insertions(+)

diff --git a/Documentation/config/advice.adoc b/Documentation/config/advice.adoc
index 81f80a92745123..5f33d3d188f391 100644
--- a/Documentation/config/advice.adoc
+++ b/Documentation/config/advice.adoc
@@ -68,6 +68,9 @@ all advice messages.
 		set their identity configuration.
 	mergeConflict::
 		Shown when various commands stop because of conflicts.
+	nameTooLong::
+		Advice shown if a filepath operation is attempted where the
+		path was too long.
 	nestedTag::
 		Shown when a user attempts to recursively tag a tag object.
 	pushAlreadyExists::
diff --git a/advice.c b/advice.c
index 63bf8b0c5f0481..0f42fb2b277c4a 100644
--- a/advice.c
+++ b/advice.c
@@ -61,6 +61,7 @@ static struct {
 	[ADVICE_IGNORED_HOOK]				= { "ignoredHook" },
 	[ADVICE_IMPLICIT_IDENTITY]			= { "implicitIdentity" },
 	[ADVICE_MERGE_CONFLICT]				= { "mergeConflict" },
+	[ADVICE_NAME_TOO_LONG]				= { "nameTooLong" },
 	[ADVICE_NESTED_TAG]				= { "nestedTag" },
 	[ADVICE_OBJECT_NAME_WARNING]			= { "objectNameWarning" },
 	[ADVICE_PUSH_ALREADY_EXISTS]			= { "pushAlreadyExists" },
diff --git a/advice.h b/advice.h
index 66f6cd6a772d8c..3df88592c8eafa 100644
--- a/advice.h
+++ b/advice.h
@@ -28,6 +28,7 @@ enum advice_type {
 	ADVICE_IGNORED_HOOK,
 	ADVICE_IMPLICIT_IDENTITY,
 	ADVICE_MERGE_CONFLICT,
+	ADVICE_NAME_TOO_LONG,
 	ADVICE_NESTED_TAG,
 	ADVICE_OBJECT_NAME_WARNING,
 	ADVICE_PUSH_ALREADY_EXISTS,
diff --git a/builtin/clean.c b/builtin/clean.c
index e15d595c3dc7cc..f8a54a4a47bc7b 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -26,6 +26,7 @@
 #include "pathspec.h"
 #include "help.h"
 #include "prompt.h"
+#include "advice.h"
 
 static int require_force = -1; /* unset */
 static int interactive;
@@ -221,6 +222,9 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 			quote_path(path->buf, prefix, &quoted, 0);
 			errno = saved_errno;
 			warning_errno(_(msg_warn_remove_failed), quoted.buf);
+			if (saved_errno == ENAMETOOLONG) {
+				advise_if_enabled(ADVICE_NAME_TOO_LONG, _("Setting `core.longPaths` may allow the deletion to succeed."));
+			}
 			*dir_gone = 0;
 		}
 		ret = res;
@@ -256,6 +260,9 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 				quote_path(path->buf, prefix, &quoted, 0);
 				errno = saved_errno;
 				warning_errno(_(msg_warn_remove_failed), quoted.buf);
+				if (saved_errno == ENAMETOOLONG) {
+					advise_if_enabled(ADVICE_NAME_TOO_LONG, _("Setting `core.longPaths` may allow the deletion to succeed."));
+				}
 				*dir_gone = 0;
 				ret = 1;
 			}
@@ -299,6 +306,9 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 				quote_path(path->buf, prefix, &quoted, 0);
 				errno = saved_errno;
 				warning_errno(_(msg_warn_remove_failed), quoted.buf);
+				if (saved_errno == ENAMETOOLONG) {
+					advise_if_enabled(ADVICE_NAME_TOO_LONG, _("Setting `core.longPaths` may allow the deletion to succeed."));
+				}
 				*dir_gone = 0;
 				ret = 1;
 			}
@@ -1109,6 +1119,9 @@ int cmd_clean(int argc,
 				qname = quote_path(item->string, NULL, &buf, 0);
 				errno = saved_errno;
 				warning_errno(_(msg_warn_remove_failed), qname);
+				if (saved_errno == ENAMETOOLONG) {
+					advise_if_enabled(ADVICE_NAME_TOO_LONG, _("Setting `core.longPaths` may allow the deletion to succeed."));
+				}
 				errors++;
 			} else if (!quiet) {
 				qname = quote_path(item->string, NULL, &buf, 0);

From b90e22783714db6bbd201221a416550fc3071fab Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 19 Jul 2017 17:07:56 +0200
Subject: [PATCH 228/247] test-lib: add BUSYBOX prerequisite

When running with BusyBox, we will want to avoid calling executables on
the PATH that are implemented in BusyBox itself.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/test-lib.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 4fe3be81193d1a..383e563cf2293c 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1935,6 +1935,10 @@ test_lazy_prereq UNZIP '
 	test $? -ne 127
 '
 
+test_lazy_prereq BUSYBOX '
+	case "$($SHELL --help 2>&1)" in *BusyBox*) true;; *) false;; esac
+'
+
 run_with_limited_cmdline () {
 	(ulimit -s 128 && "$@")
 }

From d046b712fa9cb73fe0efed3e03d5c734a523e1e9 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 5 Aug 2017 21:36:01 +0200
Subject: [PATCH 229/247] t5003: use binary file from t/lib-diff/

At some stage, t5003-archive-zip wants to add a file that is not ASCII.
To that end, it uses /bin/sh. But that file may actually not exist (it
is too easy to forget that not all the world is Unix/Linux...)! Besides,
we already have perfectly fine binary files intended for use solely by
the tests. So let's use one of them instead.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t5003-archive-zip.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh
index c8c1c5c06b6037..8f2a2cbc6b8103 100755
--- a/t/t5003-archive-zip.sh
+++ b/t/t5003-archive-zip.sh
@@ -88,7 +88,7 @@ test_expect_success \
     'mkdir a &&
      echo simple textfile >a/a &&
      mkdir a/bin &&
-     cp /bin/sh a/bin &&
+     cp "$TEST_DIRECTORY/lib-diff/test-binary-1.png" a/bin &&
      printf "text\r"	>a/text.cr &&
      printf "text\r\n"	>a/text.crlf &&
      printf "text\n"	>a/text.lf &&

From 4fbde9abdec79d4df28a50b643ccacd349523cf7 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 13 Feb 2023 13:31:35 +0100
Subject: [PATCH 230/247] Describe Git for Windows' architecture

The Git for Windows project has grown quite complex over the years,
certainly much more complex than during the first years where the
`msysgit.git` repository was abusing Git for package management purposes
and the `git/git` fork was called `4msysgit.git`.

Let's describe the status quo in a thorough way.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 ARCHITECTURE.md | 116 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 ARCHITECTURE.md

diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
new file mode 100644
index 00000000000000..7de4f99bf71ec4
--- /dev/null
+++ b/ARCHITECTURE.md
@@ -0,0 +1,116 @@
+# Architecture of Git for Windows
+
+Git for Windows is a complex project.
+
+## What _is_ Git for Windows?
+
+### A fork of `git/git`
+
+First and foremost, it is a friendly fork of [`git/git`](https://github.com/git/git), aiming to improve Git's Windows support. The [`git-for-windows/git`](https://github.com/git-for-windows/git) repository contains dozens of topics on top of `git/git`, some awaiting to be "upstreamed" (i.e. to be contributed to `git/git`), some still being stabilized, and a few topics are specific to the Git for Windows project and are not intended to be integrated into `git/git` at all.
+
+### Enhancing and maintaining Git's support for Windows
+
+On the source code side, Git's Windows support is made a bit more tricky than strictly necessary by the fact that Git does not have any platform abstraction layer (unlike other version control systems, such as Subversion). It relies on the presence of POSIX features such as the `hstrerror()` function, and on platforms lacking that functionality, Git provides shims. That leads to some challenges e.g. with the `stat()` function which is very slow on Windows because it has to collect much more metadata than what e.g. the very quick `GetFileAttributesExW()` Win32 API function provides, even when Git calls `stat()` merely to test for the presence of a file (for which all that gathered metadata is totally irrelevant).
+
+### Providing more than just source code
+
+In contrast to the Git project, Git for Windows not only publishes tagged source code versions, but full builds of Git. In fact, Git for Windows' primary purpose, as far as most users are concerned, is to provide a convenient installer that end-users can run to have Git on their computer, without ever having to check out `git-for-windows/git` let alone build it. In essence, Git for Windows has to maintain a separate project altogether in addition to the fork of `git/git`, just to build these release artifacts: [`git-for-windows/build-extra`](https://github.com/git-for-windows/build-extra). This repository also contains the definition for a couple of other release artifacts published by Git for Windows, e.g. the "portable" edition of Git for Windows which is a self-extracting 7-Zip archive that does not need to be installed.
+
+### A software distribution, really
+
+Another aspect that contributes to the complexity of Git for Windows is that it is not just building `git.exe` and distributes that. Due to its heritage within the Linux project, Git takes certain things for granted, such as the presence of a Unix shell, or for that matter, a package management system from which dependencies can be fetched and updated independently of Git itself. Things that are distinctly not present in most Windows setups. To accommodate for that, Git for Windows originally relied on the MSys project, a minimal fork of Cygwin providing a Unix shell ("Bash"), a Perl interpreter and similar Unix-like tools, and on the MINGW project, a project to build libraries and executables using a GNU C Compiler that relies only on Win32 API functions. As of Git for Windows v2.x, the project has switched away from [MSys](https://sourceforge.net/projects/mingw/files/MSYS/)/[MinGW](https://osdn.net/projects/mingw/) (due to less-than-active maintenance) to [the MSYS2 project](https://msys2.org). That switch brought along the benefit of a robust package management system based on [Pacman](https://archlinux.org/pacman/) (hailing from Arch Linux). To support Windows users, who are in general unfamiliar with Linux-like package management and the need to update installed packages frequently, Git for Windows bundles a subset of its own fork of MSYS2. To put things in perspective: Git for Windows bundles files from ~170 packages, one of which contains Git, and another one contains Git's help files. In that respect, Git for Windows acts like a distribution more than like a mere single software application.
+
+Most of MSYS2's packages that are bundled in Git for Windows are consumed directly from MSYS2. Others need forks that are maintained by Git for Windows project, to support Git for Windows better. These forks live in the [`git-for-windows/MSYS2-packages`](https://github.com/git-for-windows/MSYS2-packages) and [`git-for-windows/MINGW-packages`](https://github.com/git-for-windows/MINGW-packages) repositories. There are several reasons justifying these forks. For example, the Git for Windows' flavor of the MSYS2 runtime behaves like Git's test suite expects it while MSYS2's flavor does not. Another example: The Bash executable bundled in Git for Windows is code-signed with the same certificate as `git.exe` to help anti-malware programs get out of the users' way. That is why Git for Windows maintains its own `bash` Pacman package. And since MSYS2 dropped 32-bit support already, Git for Windows has to update the 32-bit Pacman packages itself, which is done in the git-for-windows/MSYS2-packages repository. (Side note: the 32-bit issue is a bit more complicated, actually: MSYS2 _still_ builds _MINGW_ packages targeting i686 processors, but no longer any _MSYS_ packages for said processor architecture, and Git for Windows does not keep all of the 32-bit MSYS packages up to date but instead judiciously decides which packages are vital enough as far as Git is concerned to justify the maintenance cost.)
+
+### Supporting third-party applications that use Git's functionality
+
+Since the infrastructure required by Git is non-trivial the installer (or for that matter, the Portable Git) is not exactly light-weight: As of January 2023, both artifacts are over fifty megabytes. This is a problem for third-party applications wishing to bundle a version of Git for Windows, which is often advisable given that applications may depend on features that have been introduced only in recent Git versions and therefore relying on an installed Git for Windows could break things. To help with that, the Git for Windows project also provides MinGit as a release artifact, a zip file that is much smaller than the full installer and that contains only the parts of Git for Windows relevant for third-party applications. It lacks Git GUI, for example, as well as the terminal program MinTTY, or for that matter, the documentation.
+
+### Supporting `git/git`'s GitHub workflows
+
+The Git for Windows project is also responsible for keeping the Windows part of `git/git`'s automated builds up and running. On Windows, there is no canonical and easy way to get a build environment necessary to build Git and run its test suite, therefore this is a non-trivial task that comes with its own maintenance cost. Git for Windows provides two GitHub Actions to help with that: [`git-for-windows/setup-git-for-windows-sdk`](https://github.com/git-for-windows/setup-git-for-windows-sdk) to set up a tiny subset of Git for Windows' full SDK (which would require about 500MB to be cloned, as opposed to the ~75MB of that subset) and [`git-for-windows/get-azure-pipelines-artifact`](https://github.com/git-for-windows/get-azure-pipelines-artifact) e.g. to download some regularly pre-built artifacts (for example, when `git/git`'s automated tests ran on an Ubuntu version that did not provide an up to date [Coccinelle](https://coccinelle.gitlabpages.inria.fr/website/) package, this GitHub Action was used to download a pre-built version of that Debian package).
+
+## Maintaining Git for Windows' components
+
+Git for Windows uses a combination of [a GitHub App called GitForWindowsHelper](https://github.com/git-for-windows/gfw-helper-github-app) (to listen for so-called [slash commands](https://github.com/git-for-windows/gfw-helper-github-app#slash-commands)) combined with workflows in [the `git-for-windows-automation` repository](https://github.com/git-for-windows/git-for-windows-automation/) (for computationally heavy tasks) to support Git for Windows' repetitive tasks.
+
+This heavy automation serves two purposes:
+
+1. Document the knowledge about "how things are done" in the Git for Windows project.
+2. Make Git for Windows' maintenance less tedious by off-loading as many tasks onto machines as possible.
+
+One neat trick of some `git-for-windows-automation` workflows is that they "mirror back" check runs to the targeted PRs in another repository. This essentially allows versioning the source code independently of the workflow definition.
+
+Here is a diagram showing how the bits and pieces fit together.
+
+```mermaid
+graph LR
+  A[`monitor-components`] --> |opens| B
+  B{issues labeled<br />`component-update`} --> |/open pr| C
+  C((GitForWindowsHelper)) --> |triggers| D
+  D[`open-pr`] --> |opens| E
+  E{PR in</br>MINGW-packages<br />MSYS2-packages<br />build-extra} --> |closes| B
+  E --> |/deploy| F
+  F((GitForWindowsHelper)) --> |triggers| G
+  G[`build-and-deploy`] --> |deploys to| H
+  H{Pacman repository}
+  C --> |backed by| I
+  F --> |backed by| I
+  I[[Azure Function]]
+  D --> |running in| J
+  G --> | running in| J
+  J[[git-for-windows-automation]]
+  K[[git-sdk-32<br />git-sdk-64<br />git-sdk-arm64]] --> |syncing from| H
+  B --> |/add release note| L
+  L[`add-release-note`]
+```
+
+For the curious mind, here are [detailed instructions how the Azure Function backing the GitForWindowsHelper GitHub App was set up](https://github.com/git-for-windows/gfw-helper-github-app#how-this-github-app-was-set-up).
+
+### The `monitor-components` workflow
+
+When new versions of components that Git for Windows builds become available, new Pacman packages have to be built. To this end, [the `monitor-components` workflow](https://github.com/git-for-windows/git/blob/main/.github/workflows/monitor-components.yml) monitors a couple of RSS feeds and opens new tickets labeled `component-update` for such new versions.
+
+### Opening Pull Requests to update Git for Windows' components
+
+After determining that such a ticket indeed indicates the need for a new Pacman package build, a Git for Windows maintainer issues the `/open pr` command via an issue comment ([example](https://github.com/git-for-windows/git/issues/4281#issuecomment-1426859787)), which gets picked up by the GitForWindowsHelper GitHub App, which in turn triggers [the `open-pr` workflow](https://github.com/git-for-windows/git-for-windows-automation/blob/main/.github/workflows/open-pr.yml) in the `git-for-windows-automation` repository.
+
+### Deploying the Pacman packages
+
+This will open a Pull Request in one of Git for Windows' repositories, and once the PR build passes, a Git for Windows maintainer issues the `/deploy` command ([example](https://github.com/git-for-windows/MINGW-packages/pull/69#issuecomment-1427591890)), which gets picked up by the GitForWindowsHelper GitHub App, which triggers [the `build-and-deploy` workflow](https://github.com/git-for-windows/git-for-windows-automation/blob/main/.github/workflows/build-and-deploy.yml).
+
+### Adding release notes
+
+Finally, once the packages have been built and deployed to the Pacman repository (which is hosted in Azure Blob Storage), a Git for Windows maintainer will merge the PR(s), which in turn will close the ticket, and the maintainer then issues an `/add release note` command ([example](https://github.com/git-for-windows/MINGW-packages/pull/69#issuecomment-1427782230)), which again gets picked up by the GitForWindowsHelper GitHub App that triggers [the `add-release-note` workflow](https://github.com/git-for-windows/build-extra/blob/main/.github/workflows/add-release-note.yml) that creates and pushes a new commit to the `ReleaseNotes.md` file in `build-extra` ([example](https://github.com/git-for-windows/build-extra/commit/b39c148ff8dc0e987afdb677d17c46a8e99fd0ef)).
+
+## Releasing official Git for Windows versions
+
+A relatively infrequent part of Git for Windows' maintainers' duties, if the most rewarding part, is the task of releasing new versions of Git for Windows.
+
+Most commonly, this is done in response to the "upstream" Git project releasing a new version. When that happens, a Git for Windows maintainer runs [the helper script](https://github.com/git-for-windows/build-extra/blob/main/shears.sh) to perform a "merging rebase" (i.e. a rebase that starts with a fake-merge of the previous tip commit, to maintain both a clean set of commits as well as a [fast-forwarding](https://git-scm.com/docs/git-merge#Documentation/git-merge.txt---ff-only) commit history).
+
+Once that is done, the maintainer will open a Pull Request to benefit from the automated builds and tests ([example](https://github.com/git-for-windows/git/pull/4160)) as well as from reviews of the [`range-diff`](https://git-scm.com/docs/git-range-diff) relative to the current `main` branch.
+
+Once everything looks good, the maintainer will issue the `/git-artifacts` command ([example](https://github.com/git-for-windows/git/pull/4160#issuecomment-1346801735)). This will trigger an automated workflow that builds all of the release artifacts: installers, Portable Git, MinGit, `.tar.xz` archive and a NuGet package. Apart from the NuGet package, two sets of artifacts are built: targeting 32-bit ("x86") and 64-bit ("amd64").
+
+Once these artifacts are built, the maintainer will download the installer and run [the "pre-flight checklist"](https://github.com/git-for-windows/build-extra/blob/main/installer/checklist.txt).
+
+If everything looks good, a `/release` command will be issued, which triggers yet another workflow that will download the just-built-and-verified release artifacts, publish them as a new GitHub release, publish the NuGet packages, deploy the Pacman packages to the Pacman repository, send out an announcement mail, and update the respective repositories including [Git for Windows' website](https://gitforwindows.org/).
+
+As mentioned [before](#architecture-of-git-for-windows), the `/git-artifacts` and `/release` commands are picked up by the GitForWindowsHelper GitHub App which subsequently triggers the respective workflows in the `git-for-windows-automation` repository. Here is a diagram:
+
+```mermaid
+graph LR
+  A{Pull Request<br />updating to<br />new Git version} --> |/git-artifacts| B
+  B((GitForWindowsHelper)) --> |triggers| C
+  C[`tag-git`] --> |upon successful build<br />triggers| D
+  D((GitForWindowsHelper)) --> |triggers| E
+  E[`git-artifacts`]
+  E --> |maintainer verifies artifacts| E
+  A --> |upon verified `git-artifacts`<br />/release| F
+  F[`release-git`]
+  C --> |running in| J
+  E --> | running in| J
+  F --> | running in| J
+  J[[git-for-windows-automation]]
+```
\ No newline at end of file

From bc27abb3a8c1c7923fc3e5e747545d8424d853ee Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 21 Jul 2017 12:48:33 +0200
Subject: [PATCH 231/247] t5532: workaround for BusyBox on Windows

While it may seem super convenient to some old Unix hands to simpy
require Perl to be available when running the test suite, this is a
major hassle on Windows, where we want to verify that Perl is not,
actually, required in a NO_PERL build.

As a super ugly workaround, we "install" a script into /usr/bin/perl
reading like this:

	#!/bin/sh

	# We'd much rather avoid requiring Perl altogether when testing
	# an installed Git. Oh well, that's why we cannot have nice
	# things.
	exec c:/git-sdk-64/usr/bin/perl.exe "$@"

The problem with that is that BusyBox assumes that the #! line in a
script refers to an executable, not to a script. So when it encounters
the line #!/usr/bin/perl in t5532's proxy-get-cmd, it barfs.

Let's help this situation by simply executing the Perl script with the
"interpreter" specified explicitly.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t5532-fetch-proxy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/t5532-fetch-proxy.sh b/t/t5532-fetch-proxy.sh
index ccbca7c2f28e97..23cec503cb9787 100755
--- a/t/t5532-fetch-proxy.sh
+++ b/t/t5532-fetch-proxy.sh
@@ -32,7 +32,7 @@ test_expect_success 'setup proxy script' '
 
 	write_script proxy <<-\EOF
 	echo >&2 "proxying for $*"
-	cmd=$(./proxy-get-cmd)
+	cmd=$("$PERL_PATH" ./proxy-get-cmd)
 	echo >&2 "Running $cmd"
 	exec $cmd
 	EOF

From 3bbe9661d959c45b86157d8ce72780db6ace2ab2 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 26 Jan 2026 19:18:40 +0100
Subject: [PATCH 232/247] Add an AGENTS.md file to help with AI-assisted
 debugging/development
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In this time and age, AI is everywhere. However, it's sometimes not very
easy to use. For green-field projects it works quite a bit better than
for existing legacy projects. And Git's source code is _quite_ as legacy
code as they come... 😁

Now, the only way how AI can be used efficiently with legacy code
is by providing enough information by way of prompt context for the
AI to have a chance to make any sense of the code. The structure and
the architecture is, after all, not designed for AI, but rather the
opposite: By virtue of having grown organically over two decades, there
is no design that AI coding models would readily grasp.

So here is a document that describes all kinds of aspects about this
project. The idea is to help AI by providing information that it does
not have ingrained in its weights. The idea is to provide information
that a human prompter might take for granted, but no coding model will
have been trained on specifically.

Assisted-by: Claude Opus 4.5
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 .gitattributes |    1 +
 AGENTS.md      | 1225 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1226 insertions(+)
 create mode 100644 AGENTS.md

diff --git a/.gitattributes b/.gitattributes
index 9d6e484d1ec0c4..9225e8a16dcc82 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,6 +7,7 @@
 *.py text eol=lf diff=python
 *.bat text eol=crlf
 *.png binary
+/AGENTS.md conflict-marker-size=32
 CODE_OF_CONDUCT.md -whitespace
 /Documentation/**/*.adoc text eol=lf whitespace=trail,space,incomplete
 /command-list.txt text eol=lf
diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 00000000000000..7273095017731a
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,1225 @@
+# Git for Windows - Development Guide
+
+## Background
+
+Git for Windows is a fork of upstream Git that provides the necessary
+adaptations to make Git work well on Windows. While the primary target is
+Windows, the project also maintains working builds on other platforms (Linux,
+macOS) because cross-platform builds often catch mistakes that might be missed
+when testing only on Windows.
+
+There are downstream projects that build on Git for Windows, such as Microsoft
+Git, which adds features for large monorepos hosted on Azure DevOps.
+
+## Overview
+
+This document provides guidance for developing and debugging in
+Git for Windows.
+
+## Repository Structure
+
+### Branch Naming Patterns
+
+Based on actual repository usage:
+
+- `main` - The primary development branch
+- Feature branches use descriptive topic names, targeting the main branch
+
+## Building and Testing
+
+### Build
+
+```bash
+make -j$(nproc)
+```
+
+On Windows (in a Git for Windows SDK shell):
+
+```bash
+make -j15
+```
+
+When driving the build non-interactively (for example from PowerShell, or
+from an automation agent, rather than an interactive SDK shell), do not use
+a login shell. A login shell (`bash -l` / `bash --login`) re-runs the
+profile scripts and is unnecessary once `MSYSTEM` and `PATH` are set
+explicitly. Instead set `MSYSTEM` and prepend the SDK's binary directories
+to `PATH`, then invoke a non-login `bash -c` (replace `C:\git-sdk-64` with
+your SDK root):
+
+```powershell
+$env:MSYSTEM = "MINGW64"
+$env:PATH = "C:\git-sdk-64\mingw64\bin;C:\git-sdk-64\usr\bin;" + $env:PATH
+& C:\git-sdk-64\usr\bin\bash.exe -c "make -j15"
+```
+
+If the link step fails to find `target/release/libgitcore.a` (the optional
+Rust component), pass `NO_RUST=1` to skip the cargo step:
+
+```powershell
+& C:\git-sdk-64\usr\bin\bash.exe -c "make -j15 NO_RUST=1"
+```
+
+### Run Specific Tests
+
+```bash
+cd t && sh t0001-init.sh      # Run normally
+cd t && sh t0001-init.sh -v   # Verbose
+cd t && sh t0001-init.sh -ivx # verbose, trace, fail-fast
+```
+
+Some tests are expensive and skipped by default. When a test exits immediately
+with "skip all", check the test script header for `test_bool_env GIT_TEST_*`
+to find which environment variable enables it.
+
+## Git Source Code Structure
+
+This section provides a bird's eye view of Git's source code layout. For
+more details, see "A birds-eye view of Git's source code" in
+`Documentation/user-manual.adoc`.
+
+### Key Directories
+
+| Directory        | Purpose                                            |
+|------------------|----------------------------------------------------|
+| `builtin/`       | Built-in command implementations (`cmd_<name>()`)  |
+| `xdiff/`         | Low-level diff algorithms (libxdiff)               |
+| `t/`             | Test suite (shell scripts, helpers, libraries)     |
+| `Documentation/` | Man pages, guides, technical docs (AsciiDoc)       |
+| `contrib/`       | Optional extras, not part of core Git              |
+| `compat/`        | Platform compatibility shims                       |
+| `refs/`          | Reference backends (files, reftable)               |
+| `reftable/`      | Reftable format implementation                     |
+
+### Built-in Commands
+
+Built-in commands are implemented in `builtin/<name>.c` with a function
+`cmd_<name>()`. To add a new built-in:
+
+1. Create `builtin/<name>.c` implementing `cmd_<name>()`
+2. Add entry to the `commands[]` array in `git.c`:
+   ```c
+   { "<name>", cmd_<name>, RUN_SETUP },
+   ```
+3. Add to `BUILTIN_OBJS` in `Makefile`
+4. Add to `command-list.txt` with appropriate category
+5. Run `make check-builtins` to verify consistency
+
+### Object Data Model
+
+Git stores four types of objects, defined in `object.h`:
+
+```c
+enum object_type {
+    OBJ_COMMIT = 1,  /* Points to tree, has parent commits, metadata */
+    OBJ_TREE = 2,    /* Directory listing: names -> blob/tree OIDs   */
+    OBJ_BLOB = 3,    /* File contents                                */
+    OBJ_TAG = 4,     /* Annotated tag pointing to another object     */
+};
+```
+
+Objects are addressed by their SHA (OID) and stored in the Object Database.
+
+### Object Database (ODB)
+
+The ODB is defined in `odb.h` and implemented in `odb.c`:
+
+- **`struct object_database`**: Top-level container, owned by a repository
+  - `sources`: Linked list of `odb_source` (primary + alternates)
+  - `replace_map`: Object replacements (see `git-replace(1)`)
+  - `commit_graph`: Commit-graph cache for faster traversal
+
+- **`struct odb_source`**: A single object store location
+  - `path`: Directory (e.g., `.git/objects` or an alternate)
+  - `loose`: Loose object cache
+  - `packfiles`: Packfile store (idx + pack files)
+
+Key functions:
+- `odb_read_object()`: Read an object by OID
+- `odb_write_object()`: Write an object, returns OID
+- `odb_read_object_info()`: Get object type/size without reading content
+
+### Documentation
+
+Documentation lives in `Documentation/` as AsciiDoc (`.adoc`) files:
+
+- `git-<cmd>.adoc` - Man pages for commands
+- `config/<name>.adoc` - Config option documentation (included by others)
+- `technical/` - Technical specifications and internals
+
+To build documentation:
+```bash
+make -C Documentation html   # Build HTML docs
+make -C Documentation man    # Build man pages
+```
+
+To add documentation for a new config option, add it to the appropriate
+file in `Documentation/config/`. These are included by other docs.
+
+To lint documentation:
+```bash
+make -C Documentation lint-docs
+```
+
+## Debugging Techniques
+
+### Debugging Philosophy
+
+Debugging is not about guessing fixes and seeing if they work. It is about
+building a complete understanding of the problem before attempting any fix.
+The goal is not speed to a "fix" but confidence that you understand and have
+addressed the root cause.
+
+**Respect turnaround time.** If seeing the result of an attempted fix takes
+7-10 minutes (e.g., a CI workflow run), you cannot afford to guess. Each
+iteration costs human time and attention. Before pushing any change:
+
+1. Ask: "What information am I missing to competently assess this situation?"
+2. Add diagnostic output that will provide that information if the fix fails.
+3. Consider whether you can reproduce the issue locally where turnaround is
+   seconds, not minutes.
+
+**Understand before acting.** Before attempting any fix:
+
+1. When investigating a regression between two versions, start by examining
+   the code diff. Analyze what actually changed before running any tests.
+   Tests confirm hypotheses; reading the diff gives you the hypothesis.
+2. Trace the code flow completely. Read the relevant Makefiles, scripts, and
+   source files. Understand what each component does and how they interact.
+3. Identify all changes that could have contributed: upstream commits,
+   downstream patches, infrastructure changes (CI runner updates, dependency
+   upgrades).
+4. For each potential cause, find the specific commit, its date, its intent,
+   and how it interacts with other components.
+5. Build a hypothesis. Then ask: "How would I confirm or disprove this?"
+
+**Do not assume root cause from symptoms.** A symptom appearing on one
+platform does not mean the bug is platform-specific. The cause may be in
+shared code that manifests differently across platforms. Similarly, a passing
+test on one platform when it fails on another is data to investigate, not
+grounds to conclude "works for me."
+
+**When a fix does not work, investigate why.** If you expected a fix to work
+and it did not, that is valuable information. Do not abandon that line of
+thinking and try something else. Instead:
+
+1. Ask: "Why didn't that work? What does this tell me about my understanding?"
+2. Add more targeted diagnostics to understand the discrepancy.
+3. Re-examine your assumptions. Something you believed to be true is false.
+
+**Add diagnostics proactively.** Before pushing a fix attempt, add diagnostic
+output that will:
+
+1. Confirm the state you expect to see if the fix works.
+2. Reveal the actual state if it does not.
+3. Provide enough context to understand the next step without another round
+   trip.
+
+For build failures, this might include: library paths, compiler flags,
+architecture information, symbol tables, file existence checks, environment
+variables.
+
+**Build confidence before pushing.** A fix should not be a guess. You should
+be able to explain:
+
+1. What was the root cause?
+2. Why does this fix address it?
+3. What other ways could this problem be solved?
+4. Am I choosing the "most correct" or "most effective" approach?
+5. What evidence confirms your understanding?
+6. What could still go wrong, and how would you detect it?
+
+### Searching the Codebase
+
+In particular when debugging failures that printed error messages, it is often
+a useful thing to search for those error messages; If parts of the message seem
+mutable (e.g. commit OIDs), those will not be hard-coded and the search needs
+to accommodate for that by using regular expressions or prefix matches.
+
+Use `git grep` for fast code searches:
+
+```bash
+git grep -n -i "pattern"            # Case-insensitive search with line numbers
+git grep -n -w "word"                 # Whole-word matches only
+git grep -n -i "pattern" -- "*.c"     # Search only C files
+```
+
+### Trace2
+
+Enable tracing to see command execution patterns:
+```bash
+GIT_TRACE2_EVENT=/path/to/trace.txt git <command>
+```
+
+### Instrumenting Git Internals During Tests
+
+When adding debug output to Git's C code during test investigation,
+`fprintf(stderr, ...)` from git subprocesses spawned by the test framework
+is typically swallowed (redirected or discarded by the test harness). Use
+Trace2 instead:
+
+```c
+trace2_data_intmax("index", NULL, "my_debug/cache_nr", istate->cache_nr);
+trace2_data_string("index", NULL, "my_debug/state", some_string);
+```
+
+Then run the test with `GIT_TRACE2_EVENT` or `GIT_TRACE2_PERF` pointing to
+a file, and grep the output. This integrates with Git's existing tracing
+infrastructure and survives the test framework's output management.
+
+As a last resort (e.g. when Trace2 is not initialized yet at the point you
+need to instrument), write to a fixed file path:
+
+```c
+FILE *f = fopen("/tmp/debug.log", "a");
+if (f) { fprintf(f, "state: %u\n", value); fclose(f); }
+```
+
+### Comparing Branches After Rebase
+
+```bash
+# See what patches exist in a new branch but not old
+git log --oneline old-branch..new-branch
+# or
+git range-diff -s --right-only old-branch...new-branch
+
+# Compare specific files between branches
+git diff old-branch..new-branch -- path/to/file.c
+# or
+git log -p old-branch..new-branch -- path/to/file.c
+# or even
+git log -L start-line,end-line:path/to/file.c old-branch..new-branch --
+
+# Find upstream changes between tags
+git log --oneline --first-parent v2.52.0..v2.53.0
+```
+
+### Test Failure Investigation
+
+1. **Reproduce with tracing**: Run test with `-ivx` flags
+2. **Check timestamps**: Look at `t_abs` in trace to understand ordering
+3. **Compare with working version**: Build and test the previous version
+4. **Bisect if needed**: Use `git bisect` to find the breaking commit
+
+Bisecting failures introduced by upstream commits require some stunts to
+apply the downstream changes for every bisection step. This can be done by
+squashing all downstream changes into one throw-away commit and then
+cherry-picking that (typically, there will be merge conflicts the farther
+away from the original branch point the commit is cherry-picked to, so it
+often makes sense to squash both old and new downstream changes, and then
+to "interpolate" between them when encountering merge conflicts).
+
+### Bisecting Failures in `seen`
+
+When a topic passes on its own but fails after being merged to `seen`, the
+failure is caused by interaction with another in-flight topic. To identify
+the culprit:
+
+1. Fetch the exact `seen` commit from the failing CI run (get the SHA from
+   the workflow run metadata via the GitHub API).
+2. Use a worktree checked out at that `seen` commit.
+3. Bisect the first-parent history between `upstream/master` and `seen~1`
+   (excluding the topic's own merge). At each bisection step, merge the
+   topic in temporarily, build, run the test, then undo the merge.
+4. Write a `git bisect run` script that automates this. Key pitfalls:
+   - The script must `unset` test environment variables (especially
+     `GIT_TEST_SPLIT_INDEX`) before cleanup operations like
+     `git checkout -f`, otherwise the worktree's own index can get
+     corrupted.
+   - Use `git checkout -f "$ORIG"` (not `git reset --hard`) to undo the
+     temporary merge, since `reset --hard` under split-index can corrupt.
+   - Save the current commit OID at the start (`ORIG=$(git rev-parse HEAD)`)
+     because `ORIG_HEAD` is unreliable during bisect.
+   - On merge conflict, return 125 (skip) and `git merge --abort`.
+5. Store the alias for running with the full set of CI test variables as a
+   repository-local alias (to avoid repeating the long export list and to
+   allow the user to approve the tool call once).
+
+### CI/Workflow Failure Investigation
+
+When a CI workflow fails, the debugging process has a high cost per iteration.
+Approach these failures methodically:
+
+**1. Establish what changed.** Before looking at the error, identify:
+
+- What was the last successful run? What version/commit was it based on?
+- What changed between then and now? (upstream commits, downstream patches,
+  runner image updates, dependency changes)
+- Use the GitHub API to retrieve run metadata and compare.
+
+**2. Analyze the error deeply.** Read the full error message and surrounding
+context. Understand:
+
+- What command failed?
+- What were its inputs (flags, environment, paths)?
+- What did it expect vs. what did it get?
+
+**3. Trace the code flow locally.** Before making any CI changes:
+
+- Read the workflow YAML, Makefiles, and scripts involved.
+- Understand how variables flow from one to another.
+- Identify where the failing values come from.
+
+**4. Reproduce locally if possible.** Many CI failures can be reproduced
+locally with faster turnaround:
+
+- For build failures: replicate the build environment and commands.
+- For macOS issues: if you lack a Mac, at least trace the Makefile logic
+  to understand what flags should be set and why.
+- For test failures that only appear in specific CI jobs (like
+  `linux-TEST-vars`): reproduce with the _exact_ set of environment
+  variables that job sets. Check `ci/run-build-and-tests.sh` for the
+  job's variable block. Do not assume a single variable (e.g.
+  `GIT_TEST_SPLIT_INDEX`) is sufficient; other variables may contribute
+  to the failure path.
+- When a test fails in `seen` but not on the topic branch alone, check
+  out the exact `seen` commit from the failing CI run (get the SHA from
+  the workflow run metadata) and reproduce against that. The interaction
+  with other in-flight topics is the likely cause.
+
+**5. Do not assume CI coverage from platform support.** When asking "why
+does platform X not see this bug?", verify whether CI actually tests that
+combination on that platform. For example, `GIT_TEST_SPLIT_INDEX=yes` is
+only set by `linux-TEST-vars`; there is no equivalent `osx-TEST-vars` or
+`windows-TEST-vars` job. A bug that only manifests under split-index
+testing may be present on all platforms but only caught on Linux.
+
+**5. Add comprehensive diagnostics on first attempt.** If you must push to
+CI to test, make that push count:
+
+- Add diagnostic output for every hypothesis you have.
+- Print the values of key variables, paths, flags.
+- Show the state before and after key operations.
+- Design diagnostics to distinguish between your hypotheses.
+
+**6. Do not remove diagnostics until the problem is solved.** Keep them in
+"drop!" commits so they can be easily removed later but provide information
+if subsequent fixes also fail.
+
+**7. When a fix fails, treat it as data.** The failure tells you something.
+Your mental model was wrong. Figure out what before trying again.
+
+## Git Workflow
+
+This repository is a shared development environment, not a sandbox. Exercise
+caution with all Git operations.
+
+### Committing Changes
+
+Never use `git add -A` or `git add .` - these commands will stage untracked
+build artifacts, editor swap files, and other detritus that should not be
+committed. Always specify pathspecs explicitly:
+
+```bash
+# Good: stage and commit specific files
+git commit -sm "your message here" path/to/file.c other/file.h
+
+# Bad: stages everything, including untracked garbage
+git add -A && git commit -m "message"
+```
+
+The `-s` flag adds a Signed-off-by trailer, which is required for this
+project.
+
+When AI assistance is used to author or co-author a commit, add a
+Co-authored-by trailer identifying the model:
+
+```bash
+git commit -s --trailer "Co-authored-by: <model-name>" -m "message" file.c
+```
+
+### Pushing Changes
+
+Never push without explicit user permission. The user controls when and
+where changes are pushed. This is especially critical because:
+
+- The repository has multiple remotes with different purposes
+- Force-pushing to the wrong remote can cause significant damage
+- Tags require special handling (`git push --tags` or explicit tag pushes)
+
+Wait for the user to push, or ask explicitly before pushing.
+
+### Making Code Changes
+
+**Minimal, surgical changes.** Make the smallest possible change to achieve
+the goal. Do not rewrite entire files or functions when a targeted edit
+suffices. When removing functionality:
+
+1. Remove the code paths that invoke the unwanted functionality
+2. Compile to identify what is now unused
+3. Remove the unused functions one at a time
+4. Repeat until clean
+
+**No fly-by changes.** Do not make changes that were not requested, even if
+they seem like improvements (renaming variables, reformatting untouched code,
+"fixing" things not part of the task). If you believe a change would be
+beneficial but it was not requested, ask for permission first.
+
+**The human is the driver.** Execute what is asked. If you think something
+should be done differently, ask---do not just do it.
+
+### Commit Message Quality
+
+Good commit messages use flowing English prose, not bullet points. They
+clearly state:
+
+- **Context**: What situation prompted this change? Include URLs to failing
+  CI runs, issue numbers, or other references that future readers will need.
+- **Intent**: What is this change trying to accomplish?
+- **Justification**: Why is this the right approach? What alternatives were
+  considered? When choosing between approaches based on performance,
+  include measured timings so future readers understand the tradeoffs.
+- **Implementation**: How does the change work? (Only for non-obvious parts;
+  don't describe what's clear from the diff.)
+
+Include exact error messages rather than vague descriptions. If a build
+failed with `Undefined symbols for architecture arm64: "_iconv"`, put that
+in the commit message - don't just say "fixed a linker error."
+
+Wrap commit messages at 76 columns per line.
+
+### Commit Prefixes for Rebase Workflows
+
+This repository uses interactive rebase with autosquash. Commit prefixes
+signal intent:
+
+- **`fixup! <original title>`**: Will be squashed into the referenced commit
+  during rebase. The title after `fixup!` must match the original commit's
+  title exactly.
+- **`drop!`**: Indicates a commit that should be dropped before the final
+  merge. Used for debugging, temporary workarounds, or experiments.
+
+To find the correct title for a fixup commit:
+
+```bash
+git log --oneline path/to/changed/file | head -10
+```
+
+Then use the exact title:
+
+```bash
+git commit -sm "fixup! release: add Mac OSX installer build" path/to/file
+```
+
+## Rebasing Workflow
+
+Rebases are the bread and butter of Git for Windows: topic branches are
+rebased every time upstream Git releases a new version. This section covers
+the workflow for managing downstream patches through repeated rebases.
+
+### Merging-Rebases
+
+Git for Windows uses "merging-rebases" to maintain downstream patches. Unlike
+a flat series of commits, the downstream changes are organized as topic
+branches merged together, preserving the logical grouping of related changes.
+
+Each integration branch (`main`, `shears/next`, `shears/seen`) contains a
+marker commit with the message "Start the merging-rebase to \<version\>". This
+commit separates upstream history from downstream patches. Reference it with:
+
+```bash
+# Find the marker commit
+git log --oneline --grep="Start the merging-rebase" -1
+
+# Reference it using commit message search syntax
+origin/main^{/Start.the.merging-rebase}
+```
+
+When working with merging-rebases:
+
+- **Downstream patches start after the marker**: Use
+  `origin/main^{/Start.the.merging-rebase}..origin/main` to see all
+  downstream commits
+- **Topic branches are merged, not rebased flat**: Each logical feature or
+  fix is a branch merged into the integration branch
+- **Merge commits are preserved**: The rebase recreates the merge structure
+  on top of the new upstream base
+
+To compare downstream patches before and after a rebase:
+
+```bash
+# Compare the old and new downstream patch series
+git range-diff \
+  old-base^{/Start.the.merging-rebase}..old-branch \
+  new-base^{/Start.the.merging-rebase}..new-branch
+```
+
+### Starting a Merging-Rebase
+
+To rebase the downstream patches onto a new upstream version, create a marker
+commit and use it as the base for an interactive rebase:
+
+```bash
+# Variables for the commit message
+tag=v2.53.0
+# The previous marker - this becomes the exclusion point for --onto
+previousMergeOid=$(git rev-parse origin/main^{/Start.the.merging-rebase})
+tagOid=$(git rev-parse "$tag")
+tipOid=$(git rev-parse origin/main)
+
+# Create the marker commit with two parents: the tag and the current tip
+markerOid=$(git commit-tree "$tag^{tree}" -p "$tag" -p "$tipOid" -m "Start the merging-rebase to $tag
+
+This commit starts the rebase of $previousMergeOid to $tagOid")
+
+# Graft the marker to appear as if it has only the tag as parent
+git replace --graft "$markerOid" "$tag"
+
+# Use the marker as the base for rebasing (only commits after previousMergeOid)
+git rebase -r --onto "$markerOid" "$previousMergeOid" origin/main
+
+# After the rebase completes, delete the replace ref
+git replace -d "$markerOid"
+```
+
+The marker commit is created with two parents: the upstream tag and the
+current branch tip. The `git replace --graft` makes Git see only the tag as
+parent during the rebase, allowing the downstream commits to be cleanly
+rebased onto the new upstream. After the rebase completes, the replace ref
+is deleted to clean up.
+
+#### The shears/* Branches
+
+Upstream Git has four integration branches: `seen`, `next`, `master`, and
+`maint`. Git for Windows maintains a corresponding `shears/*` branch for each
+(`shears/seen`, `shears/next`, `shears/master`, `shears/maint`) that
+continuously rebases Git for Windows' `main` onto the respective upstream
+branch.
+
+These branches are updated incrementally rather than from scratch, avoiding
+re-resolution of merge conflicts. The update process leverages reachability:
+
+1. **Integrate new downstream commits**: If `origin/main` has commits not yet
+   in the shears branch, rebase them on top (using `-r` to preserve branch
+   structure). Update the marker commit's message and second parent.
+
+2. **Integrate new upstream commits**: If the upstream branch has commits not
+   yet integrated, rebase onto the new upstream tip. Update the marker commit
+   accordingly.
+
+The marker commit's second parent always points to the current `origin/main`
+tip, making it trivial to identify what downstream commits are included.
+Similarly, the marker's first parent (the upstream base) shows exactly which
+upstream version is integrated.
+
+### When to Skip a Patch
+
+Use `git rebase --skip` when the patch is already in the new base:
+
+- **Upstreamed**: The patch was accepted upstream and is now in `seen`
+- **Backported**: A fix we backported is now included in the upstream base
+- **Superseded**: HEAD already contains evolved code that includes this
+  change
+
+Signs to skip rather than resolve: HEAD has the functionality, the
+conflict would discard the patch entirely, or `git range-diff` shows
+the downstream and upstream patches are equivalent.
+
+To find the corresponding upstream commit for a conflicting patch:
+
+```bash
+git range-diff --left-only REBASE_HEAD^! REBASE_HEAD..
+```
+
+### Resolving Merge Conflicts
+
+When resolving merge conflicts during a rebase (especially when squashing
+fixups), the goal is to **apply the minimal surgical change** that the
+patch intended, not to reconstruct entire functions or add duplicate code.
+
+#### 1. Understand What the Patch Wants
+
+First, examine the patch being applied:
+
+```bash
+git show REBASE_HEAD
+```
+
+Look at the actual changes (lines starting with `-` and `+`):
+- What lines are being removed?
+- What lines are being added?
+- What is the context (function name, nearby code)?
+
+**Key insight**: The patch shows the *intent*---a specific small change to
+make. Focus on this, not on the conflict markers' content.
+
+**Code movement detection**: If the patch shows large changes, check with
+`--ignore-space-change`:
+
+```bash
+git show <conflicted-commit> --ignore-space-change
+```
+
+This reveals whether the commit is primarily **moving code** (lots of
+whitespace changes) or making **logic changes** (actual code modifications).
+When code was moved and re-indented, focus only on the non-whitespace
+changes when resolving the conflict.
+
+#### 2. Understand Where the Code Is Now
+
+The conflict occurred because the code moved or changed since the patch was
+created. Find where that code actually exists now:
+
+```bash
+# If the patch was changing a specific pattern, find all occurrences
+git grep -n "pattern from patch"
+
+# View the conflicted file around those locations
+```
+
+**Common mistake**: Assuming the conflict markers show you what to do. They
+do not---they just show where Git got confused.
+
+#### 3. Apply the Surgical Change
+
+Make **only** the change the patch intended, but in the current location:
+
+- If the patch adds `--abbrev=12` to a range-diff call, find where that
+  range-diff call is NOW and add it there
+- If the patch changes a `.split()` pattern, find where that pattern is NOW
+  and change it
+- Do not copy entire functions from the conflict markers
+- Do not create duplicates
+
+#### 4. Remove ALL Conflict Markers
+
+Conflict markers make the file invalid code:
+```
+<<<<<<< HEAD
+=======
+>>>>>>> commit-hash
+```
+
+**All three types of markers must be completely removed.**
+
+#### 5. Verify the Resolution
+
+**Critical**: After staging your resolution, verify it matches the patch
+intent:
+
+```bash
+# Compare your staged changes to the original patch
+git diff --cached
+git rebase --show-current-patch
+
+# Or more directly, compare to REBASE_HEAD
+git diff --cached
+git show REBASE_HEAD
+
+# For code that was moved/re-indented, ignore whitespace
+git diff --cached --ignore-space-change
+git show REBASE_HEAD --ignore-space-change
+```
+
+**Verify, verify, verify**: The output of `git diff --cached` should
+correspond closely to the diff in `git show REBASE_HEAD`. The line numbers
+and context will differ (because code moved), but the actual changes (the
+`-` and `+` lines) should match the patch intent.
+
+**After completing a rebase**, always verify the final result:
+
+```bash
+# Compare tree before and after rebase
+git diff @{1}
+
+# Shows what changed in each rebased commit
+git range-diff @{1}...
+```
+
+If the rebase was onto the same base commit (e.g., squashing fixups), the
+`git diff @{1}` should be empty---this proves the rebase only reorganized
+commits without changing the end result. If the rebase was onto a new base
+commit (e.g., rebasing onto a new upstream release), the diff should match
+the difference between the old and new base commits, modulo any changes
+from upstreamed or backported patches. The `git range-diff @{1}...` shows
+the intended amendments (like adding `--abbrev=12`) were correctly applied
+to each commit.
+
+### Conflict Resolution Red Flags
+
+These indicate you are doing it wrong:
+
+- Your diff adds hundreds of lines when the patch only changed 3
+- Conflict markers remain in the file
+- Functions appear twice in the file
+- You added `<<<<<<< HEAD` or `=======` to the staged changes
+- Syntax check fails after resolution
+
+### Key Conflict Resolution Lessons
+
+1. **Context changes, intent does not** - The patch's line numbers are
+   wrong, but the change is right
+2. **Conflict markers lie** - They show you where Git got confused, not
+   what you should do
+3. **One change at a time** - If the patch adds one line, your resolution
+   should add one line
+4. **Verify, verify, verify** - `git diff --cached` should match
+   `git show REBASE_HEAD` (modulo context)
+5. **Post-rebase verification** - `git diff @{1}` (empty) and
+   `git range-diff @{1}...` (shows amendments)
+6. **Ignore whitespace for code moves** - Use `--ignore-space-change` to
+   see the actual logic changes when code was moved and re-indented
+7. **When in doubt, look at the range-diff** - `git range-diff` shows if
+   you matched the intent
+
+### Useful Rebase Tools
+
+- `git rebase --show-current-patch` - See what change is being applied
+- `git show REBASE_HEAD` - Alternative to above, works better with
+  `--ignore-space-change`
+- `git show <commit> --ignore-space-change` - See only logic changes, not
+  whitespace/indentation
+- `git grep -n "pattern"` - Find where code moved to
+- `git log -L <start>,<end>:<file> REBASE_HEAD..HEAD` - See how upstream
+  modified a line range since the original patch; invaluable for
+  understanding how conflicting lines changed
+- `git diff --cached` - After staging resolution, verify it matches
+  REBASE_HEAD
+- `git diff @{1}` - After rebase, compare tree before/after
+- `git range-diff @{1}...` - After rebase, verify intended changes were made
+- `git range-diff A^! B^!` - Compare original patch to your resolution
+
+### Leveraging Rerere
+
+Git's "reuse recorded resolution" (`rerere`) feature automatically records
+how you resolve conflicts and replays those resolutions when the same
+conflict recurs. This is invaluable for repeated rebases where the same
+downstream patches conflict with similar upstream changes.
+
+When you see `Staged 'file' using previous resolution`, Git has applied a
+previously recorded resolution. Always verify these auto-resolutions are
+still correct---upstream context may have changed enough that the old
+resolution no longer applies cleanly.
+
+To enable rerere:
+```bash
+git config --global rerere.enabled true
+```
+
+### Automation Tips
+
+When running rebases in automated or scripted contexts, disable the pager
+to avoid hangs:
+
+```bash
+GIT_PAGER=cat git range-diff ...
+# or
+git --no-pager log ...
+```
+
+### Non-interactive "Interactive" Rebases
+
+AI agents cannot drive interactive editors reliably. Instead, insert a
+`break` as the first todo command so the rebase stops immediately, then
+edit the todo file directly:
+
+```bash
+# Start the rebase, stopping before any picks execute
+GIT_SEQUENCE_EDITOR='sed -i 1ib' git rebase -ir <base>
+
+# Find and edit the todo file with the view/edit tools
+git rev-parse --git-path rebase-merge/git-rebase-todo
+
+# After editing the todo, continue (GIT_EDITOR=true suppresses the
+# editor that fixup -C and amend! commands would otherwise open)
+GIT_EDITOR=true git rebase --continue
+```
+
+### Scripted Hunk Staging
+
+`git add -p` is interactive by default, but its prompts follow a
+predictable protocol. To stage the first hunk of a file without
+human interaction:
+
+```bash
+printf '%s\n' s y q | git add -p <file>
+```
+
+The `s` splits a large hunk, `y` stages the first sub-hunk, and `q`
+quits. Adjust the sequence for different hunk selections (e.g.,
+`y y n q` to stage the first two hunks but skip the third).
+
+### Finding Which Commit to Amend
+
+When a working-tree change belongs in an earlier commit (an `hg absorb`
+workflow), use `git log -L` to find which commit last touched the
+relevant lines:
+
+```bash
+git log -L <start>,+<count>:<file>
+```
+
+This shows the full history of a line range, making it easy to identify
+the commit whose title you need for a `fixup!` commit. This is far more
+surgical than grepping through full diffs.
+
+### Fixup Commits
+
+Downstream patches sometimes require adjustment due to changes in the
+environment they operate in. These changes may come from:
+
+- **Upstream code changes**: API modifications, struct field moves,
+  declarations relocating between headers, or semantic changes in functions
+  that downstream code depends on.
+- **External environment changes**: CI runner image updates, toolchain
+  upgrades, dependency version changes, or platform behavior shifts.
+
+In both cases, create a `fixup!` commit that will be squashed into the
+original downstream patch during the next interactive rebase. The commit
+message body must precisely document the change that necessitated the fix:
+
+- For upstream changes: reference the specific upstream commit (by OID or
+  title) and explain what it changed.
+- For external changes: include URLs to failing CI runs, document what
+  changed in the environment (e.g., "GitHub Actions macos-latest runner
+  upgraded from macOS 14 to macOS 15"), and note the exact error message.
+
+This documentation is essential because the fixup will be squashed away,
+and the context will be lost if not recorded in the commit message that
+gets squashed into.
+
+Run affected tests before finalizing.
+
+### `amend!` Commits
+
+A `fixup!` commit keeps the target's commit message and merely combines
+its diff into the target. An `amend!` commit additionally **replaces**
+the target's commit message with its own body. Use `amend!` when the
+fix changes the meaning of the target sufficiently that the original
+subject or body is no longer accurate, or when the goal is to align a
+downstream commit with a specific upstream replacement.
+
+The format is rigid: the first line of an `amend!` commit must be
+exactly `amend! <subject of target>`, followed by a blank line and then
+the **new** commit message that should replace the target's, starting
+with the new subject line:
+
+```
+amend! mingw: use mimalloc
+
+mingw: stop using nedmalloc
+
+The vendored nedmalloc allocator under compat/nedmalloc/ has been
+unmaintained upstream...
+```
+
+After autosquash, the resulting commit has the new subject (`mingw:
+stop using nedmalloc`), the new body, and a diff that is the
+composition of the target's diff and the `amend!`'s diff. Crafting the
+`amend!` diff so that the composition equals a known upstream commit's
+diff is the canonical way to align a downstream branch-thicket commit
+with an in-flight upstream replacement: when the next merging-rebase
+picks up the upstream commit, the byte-identical downstream commit
+collapses into it cleanly.
+
+### PRs Composed Entirely of `fixup!` and `amend!` Commits
+
+Adjusting or removing a feature that lives in the branch thicket is
+often best expressed as a PR that consists *only* of `fixup!` and
+`amend!` commits targeting the existing thicket commits. Each pair
+autosquashes during the next merging-rebase. Pairs whose diffs cancel
+exactly produce empty commits, which the rebase drops with
+`--empty=drop`. The end state is *as if the original commits had been
+edited or removed in place*, while preserving review-friendly atomic
+patches in the PR.
+
+This is the preferred pattern for reverting a multi-commit downstream
+feature. Order the fixups in **reverse** of the originals so each
+revert applies cleanly to the worktree as you build the series.
+
+### Common Adaptation Patterns
+
+**Struct field moves**: When upstream moves fields between structs, update
+all downstream code that accesses those fields.
+
+**API changes**: When upstream changes function signatures, update callers
+and verify semantics are preserved.
+
+**New abstractions**: When upstream introduces new layers, ensure downstream
+code uses the correct instance.
+
+## Coding Conventions
+
+The Git project maintains a charmingly old-school, Unix-greybeard aesthetic
+when it comes to text encoding. In the spirit of the PDP-11 and Bell Labs
+terminal sessions of yore:
+
+- **ASCII only**: Avoid Unicode characters in source code, comments, and
+  documentation. Use `->` instead of `→`, `--` instead of `—`, and so on.
+  To verify your changes contain no non-ASCII characters:
+  ```
+  git diff | LC_ALL=C grep '[^ -~]'
+  ```
+- **80 columns per line**: The mailing list veterans will "kindly" remind you
+  that lines should not exceed 80 characters (they do mean columns, but
+  let's not split beards or hairs about wide glyphs).
+  First, check for whitespace errors (trailing whitespace, mid-line tabs, etc.):
+  ```
+  git diff --check
+  ```
+  Once that passes, you know tabs only appear at line beginnings, so each
+  tab equals exactly 8 columns. To find lines exceeding 80 columns:
+  ```
+  git diff --no-color | grep '^+' | sed 's/\t/        /g' | grep '.\{82\}'
+  ```
+  (We use 82 because diff output prefixes added lines with `+`.)
+- **Tabs for indentation**: The codebase uses tabs, not spaces.
+- **No trailing whitespace**: Clean up your lines.
+
+**Pre-commit checklist.** Run all three checks before every commit:
+
+```bash
+git diff --check &&
+git diff --no-color | LC_ALL=C grep '[^ -~]' &&
+  echo "ERROR: non-ASCII characters found" &&
+git diff --no-color | grep '^+' | sed 's/\t/        /g' |
+  grep '.\{82\}' &&
+  echo "ERROR: lines exceed 80 columns"
+```
+
+The first command catches whitespace errors. If either of the latter
+two produces output, fix the offending lines before committing. Note
+that these checks apply to commit messages as well (wrap at 76 columns
+for messages, 80 for code).
+
+See `Documentation/CodingGuidelines` for the full set of conventions.
+
+### strbuf patterns
+
+Use `strbuf_addf()` with string continuation for multi-line content instead
+of multiple `strbuf_addstr()` calls:
+
+```c
+/* Good */
+strbuf_addf(&buf,
+            "tree %s\n"
+            "author %s\n"
+            "committer %s\n"
+            "\ncommit message\n",
+            tree_hex, author, committer);
+
+/* Avoid */
+strbuf_addstr(&buf, "tree ");
+strbuf_addstr(&buf, tree_hex);
+strbuf_addstr(&buf, "\nauthor ");
+/* ... */
+```
+
+Choose descriptive variable names (`header` for pack headers, not generic
+`buf`; use `buf` for the secondary strbuf if you cannot reuse the first).
+
+## Platform Considerations
+
+### Windows-specific issues
+
+On Windows, `unsigned long` is 32 bits even on 64-bit systems. Use `size_t`
+for sizes that may exceed 4GB. Be careful with format strings: use `PRIuMAX`
+with a cast for `size_t` values.
+
+## Contributing to Git for Windows
+
+The primary contribution path for this fork is a PR against
+`git-for-windows/git`'s `main` branch. The repository is laid out as a
+branch thicket on top of an upstream Git base; see
+[Merging-Rebases](#merging-rebases) and
+[Analyzing Branch Thickets](#analyzing-branch-thickets) for the
+mechanics.
+
+### Opening a PR
+
+Push the topic branch to a personal fork on GitHub, then:
+
+```bash
+gh pr create \
+  --repo git-for-windows/git \
+  --base main \
+  --head <you>:<branch> \
+  --title "<subject>" \
+  --body-file <path/to/body.md>
+```
+
+Unlike upstream contributions, the PR body is rendered as Markdown on
+GitHub, not sent as email. Use the formatting that aids review:
+fenced code blocks, tables, links to workflow runs.
+
+### When the PR Adjusts the Thicket Itself
+
+If the PR's purpose is to edit, remove, or replace existing
+branch-thicket commits, the natural form is a series of `fixup!` or
+`amend!` commits targeting the affected originals. See
+[Fixup Commits](#fixup-commits),
+[`amend!` Commits](#amend-commits), and
+[PRs Composed Entirely of `fixup!` and `amend!` Commits](#prs-composed-entirely-of-fixup-and-amend-commits).
+The merging-rebase that produces the next `main` autosquashes these
+into the thicket; the PR exists for review of the individual
+adjustments.
+
+### When an Upstream Patch Will Replace a Thicket Commit
+
+If an upstream patch is in flight (for instance, on `gitgitgadget/git`
+in `seen` or `next`) that replaces a downstream thicket commit, an
+`amend!` commit whose body is a verbatim copy of the upstream commit
+message and whose diff aligns the autosquashed target with the
+upstream commit's diff is the canonical pattern. The next
+merging-rebase that picks up the upstream commit will recognize the
+two as byte-identical and collapse them.
+
+## Contributing to Upstream Git via GitGitGadget
+
+### Overview
+
+The upstream Git project accepts contributions via the mailing list
+(`git@vger.kernel.org`). [GitGitGadget](https://gitgitgadget.github.io/)
+bridges GitHub PRs to the mailing list: you push a branch to your GitHub
+fork, open a PR against https://github.com/gitgitgadget/git, and
+GitGitGadget formats and sends the patches.
+
+### Workflow
+
+1. Push the topic branch to your personal fork on GitHub (the remote
+   that points at `https://github.com/<you>/git`).
+2. Open a PR from `<you>:<branch>` against `gitgitgadget/git`'s `master`.
+3. The PR title becomes the patch series subject; the PR body becomes the
+   cover letter. Use
+   `gh pr create --repo gitgitgadget/git --head <you>:<branch>`.
+4. Use `/submit` as a PR comment to send patches to the mailing list.
+5. After review feedback, update the branch, force-push, and `/submit` again.
+
+### Branch Naming
+
+Do **not** use an initials prefix (like `ds/` or `js/`). That convention is
+used by the Git maintainer when picking up topics, not by contributors. Use
+descriptive names like `tests-explicit-bare-repo`.
+
+### Cover Letter Style
+
+The PR body is the cover letter. It should be plain text (not Markdown with
+headers or bullet formatting), since it will be sent as email. Structure:
+
+- A brief subject line (the PR title, e.g. "tests: access bare repositories
+  explicitly")
+- Motivation: why is this change needed?
+- Summary: what does the series do? What patterns/techniques does it use?
+- Scope: is this part of a larger effort? If so, link to the tracking PR.
+
+Keep it factual and measured. Avoid framing changes in terms of security
+when contributing to upstream Git; frame them as robustness, correctness,
+or preparation for future defaults.
+
+### Commit Message Conventions (Upstream Git)
+
+Upstream Git commit messages follow stricter conventions than the Microsoft
+Git fork:
+
+- **Subject line**: `<area>: <description>` (lowercase after the colon).
+  The `<area>` is typically a file name without extension (e.g. `t0001`,
+  `setup`, `scalar`) or a subsystem name (e.g. `tests`, `refs`).
+- **Body**: Flowing English prose, no bullet points. Wrap at 76 columns.
+- **ASCII only**: No Unicode characters anywhere in the message.
+- **Trailers**: `Signed-off-by` is mandatory. `Assisted-by` for AI.
+- The subject line must accurately describe the diff content. If a commit
+  adds `--git-dir=.` to one invocation, do not title it "wrap bare repo
+  commands in subshell with `GIT_DIR`".
+
+### Patch Series with Dependencies
+
+When contributing a branch thicket (multiple related patch series with
+dependencies), submit the foundation series first and note the overall
+effort in the cover letter with a link to the tracking PR or `compare`
+URL. Submit dependent series after earlier ones land in `seen`.
+
+Use `git replay --onto <target> <base>..<branch>` to test whether a
+sub-branch applies cleanly to a given base (e.g., `upstream/master` or
+`upstream/seen`) without touching the working tree. By default (since
+the `--ref-action` default changed to `update`), `git replay` updates
+named refs in the range directly, producing no stdout output. Use
+`--ref-action=print` to get the old behavior of printing `update-ref`
+commands to stdout instead. Always verify that `git replay` actually
+did something by checking the reflog of the affected branches.
+
+## Working with Worktrees
+
+### General Principles
+
+Use worktrees to work on multiple topics simultaneously without stashing
+or switching branches. Keep worktrees as subdirectories of the main
+repository and add them to `.git/info/exclude` so they do not show up
+as untracked files.
+
+```bash
+git worktree add <name> <branch>
+echo "<name>" >> .git/info/exclude
+```
+
+### Rewriting Commits with `--update-refs`
+
+When rewriting history in a worktree (e.g., fixing a commit message via
+`amend!` + autosquash), use `--update-refs` so that other local branches
+pointing into the rewritten range are updated automatically:
+
+```bash
+# Create a local branch at the commit to be pushed
+git branch <push-name> <tip>
+
+# Create the amend! commit and autosquash
+git commit --allow-empty -F <message-file>
+GIT_SEQUENCE_EDITOR=true GIT_EDITOR=true \
+  git rebase -i --autosquash --update-refs <base>
+
+# Verify: tree should be identical
+git diff <push-name>@{1}..<push-name>
+
+# Force-push the updated branch
+git push <remote> <push-name> --force-with-lease
+```
+
+The `--update-refs` flag is essential: without it, only the checked-out
+branch is rewritten and other branches become stale, pointing at
+pre-rewrite commits.
+
+### Verifying Rebase Results
+
+After any rebase, verify that the tree content is unchanged (unless you
+intentionally modified it):
+
+```bash
+git diff @{1}              # Should be empty for pure rewording
+git range-diff @{1}...     # Shows per-commit changes
+```
+
+## Analyzing Branch Thickets
+
+When a branch is structured as a sequence of merged sub-branches (a
+"branch thicket"), use the merge structure to extract sub-branches:
+
+```bash
+# List the merge commits (sub-branches)
+git log --oneline --first-parent <branch>...upstream/master | grep 'Merge branch'
+
+# Extract commits for a specific sub-branch (second parent of its merge)
+git log --oneline <merge>^1..<merge>^2
+
+# Find what each sub-branch forks from
+git log -1 --format='%H %s' <first-commit-in-sub-branch>^
+```
+
+Use `git replay` to test whether sub-branches can be rebased onto a new
+base without conflicts. This replaces speculation about "overlapping files"
+with actual evidence:
+
+```bash
+git replay --onto upstream/master <old-base>..<branch>
+```
+
+If the range contains merge commits, `git replay` will fail with "replaying
+merge commits is not supported yet!" In that case, identify the linear
+commit range and replay just those commits.
+
+## Resources
+
+- [Git for Windows](https://gitforwindows.org/)
+- [Git Internals](https://git-scm.com/book/en/v2/Git-Internals-Plumbing-and-Porcelain)
+- [GitGitGadget](https://gitgitgadget.github.io/) - Bridge GitHub PRs to
+  the Git mailing list
+- [Git Mailing List Archive](https://lore.kernel.org/git/) - Searchable
+  archive of all upstream discussion

From d37a4477be259b984604602cc8f51f5c7873fb92 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 21 Jul 2017 13:24:55 +0200
Subject: [PATCH 233/247] t5605: special-case hardlink test for BusyBox-w32

When t5605 tries to verify that files are hardlinked (or that they are
not), it uses the `-links` option of the `find` utility.

BusyBox' implementation does not support that option, and BusyBox-w32's
lstat() does not even report the number of hard links correctly (for
performance reasons).

So let's just switch to a different method that actually works on
Windows.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t5605-clone-local.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/t/t5605-clone-local.sh b/t/t5605-clone-local.sh
index 156362f145b071..a78def3efbca1b 100755
--- a/t/t5605-clone-local.sh
+++ b/t/t5605-clone-local.sh
@@ -11,6 +11,21 @@ repo_is_hardlinked() {
 	test_line_count = 0 output
 }
 
+if test_have_prereq MINGW,BUSYBOX
+then
+	# BusyBox' `find` does not support `-links`. Besides, BusyBox-w32's
+	# lstat() does not report hard links, just like Git's mingw_lstat()
+	# (from where BusyBox-w32 got its initial implementation).
+	repo_is_hardlinked() {
+		for f in $(find "$1/objects" -type f)
+		do
+			"$SYSTEMROOT"/system32/fsutil.exe \
+				hardlink list $f >links &&
+			test_line_count -gt 1 links || return 1
+		done
+	}
+fi
+
 test_expect_success 'preparing origin repository' '
 	: >file && git add . && git commit -m1 &&
 	git clone --bare . a.git &&

From 010f14fe80d5f89fec7a5a81dd4a6c82e0842095 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 11 Oct 2019 13:22:24 +0200
Subject: [PATCH 234/247] Modify the Code of Conduct for Git for Windows

The Git project followed Git for Windows' lead and added their Code of
Conduct, based on the Contributor Covenant v1.4, later updated to v2.0.

We adapt it slightly to Git for Windows.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 CODE_OF_CONDUCT.md | 58 +++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index e58917c50a96dc..4daef7e3ce9196 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,9 +1,9 @@
-# Git Code of Conduct
+# Git for Windows Code of Conduct
 
 This code of conduct outlines our expectations for participants within
-the Git community, as well as steps for reporting unacceptable behavior.
-We are committed to providing a welcoming and inspiring community for
-all and expect our code of conduct to be honored. Anyone who violates
+the **Git for Windows** community, as well as steps for reporting unacceptable
+behavior. We are committed to providing a welcoming and inspiring community
+for all and expect our code of conduct to be honored. Anyone who violates
 this code of conduct may be banned from the community.
 
 ## Our Pledge
@@ -12,8 +12,8 @@ We as members, contributors, and leaders pledge to make participation in our
 community a harassment-free experience for everyone, regardless of age, body
 size, visible or invisible disability, ethnicity, sex characteristics, gender
 identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
-and orientation.
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
 
 We pledge to act and interact in ways that contribute to an open, welcoming,
 diverse, inclusive, and healthy community.
@@ -28,17 +28,17 @@ community include:
 * Giving and gracefully accepting constructive feedback
 * Accepting responsibility and apologizing to those affected by our mistakes,
   and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
 
 Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
 * Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
@@ -58,20 +58,14 @@ decisions when appropriate.
 
 This Code of Conduct applies within all community spaces, and also applies when
 an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
+Examples of representing our community include using an official email address,
 posting via an official social media account, or acting as an appointed
 representative at an online or offline event.
 
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-git@sfconservancy.org, or individually:
-
-  - Ævar Arnfjörð Bjarmason <avarab@gmail.com>
-  - Christian Couder <christian.couder@gmail.com>
-  - Junio C Hamano <gitster@pobox.com>
-  - Taylor Blau <me@ttaylorr.com>
+reported by contacting the Git for Windows maintainer.
 
 All complaints will be reviewed and investigated promptly and fairly.
 
@@ -94,15 +88,15 @@ behavior was inappropriate. A public apology may be requested.
 
 ### 2. Warning
 
-**Community Impact**: A violation through a single incident or series
-of actions.
+**Community Impact**: A violation through a single incident or series of
+actions.
 
 **Consequence**: A warning with consequences for continued behavior. No
 interaction with the people involved, including unsolicited interaction with
 those enforcing the Code of Conduct, for a specified period of time. This
 includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
 
 ### 3. Temporary Ban
 
@@ -118,27 +112,27 @@ Violating these terms may lead to a permanent ban.
 ### 4. Permanent Ban
 
 **Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
+standards, including sustained inappropriate behavior, harassment of an
 individual, or aggression toward or disparagement of classes of individuals.
 
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
 
 ## Attribution
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
 
 Community Impact Guidelines were inspired by
 [Mozilla's code of conduct enforcement ladder][Mozilla CoC].
 
 For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
-at [https://www.contributor-covenant.org/translations][translations].
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
 
 [homepage]: https://www.contributor-covenant.org
-[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
 [Mozilla CoC]: https://github.com/mozilla/diversity
 [FAQ]: https://www.contributor-covenant.org/faq
 [translations]: https://www.contributor-covenant.org/translations

From 149bef947df41fb1f1abbb2095ef44a1814ef489 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 5 Jul 2017 15:14:50 +0200
Subject: [PATCH 235/247] t5813: allow for $PWD to be a Windows path

Git for Windows uses MSYS2's Bash to run the test suite, which comes
with benefits but also at a heavy price: on the plus side, MSYS2's
POSIX emulation layer allows us to continue pretending that we are on a
Unix system, e.g. use Unix paths instead of Windows ones, yet this is
bought at a rather noticeable performance penalty.

There *are* some more native ports of Unix shells out there, though,
most notably BusyBox-w32's ash. These native ports do not use any POSIX
emulation layer (or at most a *very* thin one, choosing to avoid
features such as fork() that are expensive to emulate on Windows), and
they use native Windows paths (usually with forward slashes instead of
backslashes, which is perfectly legal in almost all use cases).

And here comes the problem: with a $PWD looking like, say,
C:/git-sdk-64/usr/src/git/t/trash directory.t5813-proto-disable-ssh
Git's test scripts get quite a bit confused, as their assumptions have
been shattered. Not only does this path contain a colon (oh no!), it
also does not start with a slash.

This is a problem e.g. when constructing a URL as t5813 does it:
ssh://remote$PWD. Not only is it impossible to separate the "host" from
the path with a $PWD as above, even prefixing $PWD by a slash won't
work, as /C:/git-sdk-64/... is not a valid path.

As a workaround, detect when $PWD does not start with a slash on
Windows, and simply strip the drive prefix, using an obscure feature of
Windows paths: if an absolute Windows path starts with a slash, it is
implicitly prefixed by the drive prefix of the current directory. As we
are talking about the current directory here, anyway, that strategy
works.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t5813-proto-disable-ssh.sh | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/t/t5813-proto-disable-ssh.sh b/t/t5813-proto-disable-ssh.sh
index 1800d27f894414..f0f91718a599df 100755
--- a/t/t5813-proto-disable-ssh.sh
+++ b/t/t5813-proto-disable-ssh.sh
@@ -15,8 +15,23 @@ test_expect_success 'setup repository to clone' '
 '
 
 test_proto "host:path" ssh "remote:repo.git"
-test_proto "ssh://" ssh "ssh://remote$PWD/remote/repo.git"
-test_proto "git+ssh://" ssh "git+ssh://remote$PWD/remote/repo.git"
+
+hostdir="$PWD"
+if test_have_prereq MINGW && test "/${PWD#/}" != "$PWD"
+then
+	case "$PWD" in
+	[A-Za-z]:/*)
+		hostdir="${PWD#?:}"
+		;;
+	*)
+		skip_all="Unhandled PWD '$PWD'; skipping rest"
+		test_done
+		;;
+	esac
+fi
+
+test_proto "ssh://" ssh "ssh://remote$hostdir/remote/repo.git"
+test_proto "git+ssh://" ssh "git+ssh://remote$hostdir/remote/repo.git"
 
 # Don't even bother setting up a "-remote" directory, as ssh would generally
 # complain about the bogus option rather than completing our request. Our

From db61eb7b2764129f84bb15526d702833a0646190 Mon Sep 17 00:00:00 2001
From: Derrick Stolee <dstolee@microsoft.com>
Date: Thu, 1 Mar 2018 12:10:14 -0500
Subject: [PATCH 236/247] CONTRIBUTING.md: add guide for first-time
 contributors

Getting started contributing to Git can be difficult on a Windows
machine. CONTRIBUTING.md contains a guide to getting started, including
detailed steps for setting up build tools, running tests, and
submitting patches to upstream.

[includes an example by Pratik Karki how to submit v2, v3, v4, etc.]

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
---
 CONTRIBUTING.md | 417 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 417 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000000000..fbe729e43baf86
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,417 @@
+How to Contribute to Git for Windows
+====================================
+
+Git was originally designed for Unix systems and still today, all the build tools for the Git
+codebase assume you have standard Unix tools available in your path. If you have an open-source
+mindset and want to start contributing to Git, but primarily use a Windows machine, then you may
+have trouble getting started. This guide is for you.
+
+Get the Source
+--------------
+
+Clone the [GitForWindows repository on GitHub](https://github.com/git-for-windows/git).
+It is helpful to create your own fork for storing your development branches.
+
+Windows uses different line endings than Unix systems. See
+[this GitHub article on working with line endings](https://help.github.com/articles/dealing-with-line-endings/#refreshing-a-repository-after-changing-line-endings)
+if you have trouble with line endings.
+
+Build the Source
+----------------
+
+First, download and install the latest [Git for Windows SDK (64-bit)](https://github.com/git-for-windows/build-extra/releases/latest).
+When complete, you can run the Git SDK, which creates a new Git Bash terminal window with
+the additional development commands, such as `make`.
+
+    As of time of writing, the SDK uses a different credential manager, so you may still want to use normal Git
+    Bash for interacting with your remotes.  Alternatively, use SSH rather than HTTPS and
+    avoid credential manager problems.
+
+You should now be ready to type `make` from the root of your `git` source directory.
+Here are some helpful variations:
+
+* `make -j[N] DEVELOPER=1`: Compile new sources using up to N concurrent processes.
+  The `DEVELOPER` flag turns on all warnings; code failing these warnings will not be
+  accepted upstream ("upstream" = "the core Git project").
+* `make clean`: Delete all compiled files.
+
+When running `make`, you can use `-j$(nproc)` to automatically use the number of processors
+on your machine as the number of concurrent build processes.
+
+You can go deeper on the Windows-specific build process by reading the
+[technical overview](https://gitforwindows.org/technical-overview) or the
+[guide to compiling Git with Visual Studio](https://gitforwindows.org/compiling-git-with-visual-studio).
+
+## Building `git` on Windows with Visual Studio
+
+The typical approach to building `git` is to use the standard `Makefile` with GCC, as
+above. Developers working in a Windows environment may want to instead build with the
+[Microsoft Visual C++ compiler and libraries toolset (MSVC)](https://blogs.msdn.microsoft.com/vcblog/2017/03/07/msvc-the-best-choice-for-windows/).
+There are a few benefits to using MSVC over GCC during your development, including creating
+symbols for debugging and [performance tracing](https://github.com/Microsoft/perfview#perfview-overview).
+
+There are two ways to build Git for Windows using MSVC. Each have their own merits.
+
+### Using SDK Command Line
+
+Use one of the following commands from the SDK Bash window to build Git for Windows:
+
+```
+    make MSVC=1 -j12
+    make MSVC=1 DEBUG=1 -j12
+```
+
+The first form produces release-mode binaries; the second produces debug-mode binaries.
+Both forms produce PDB files and can be debugged.  However, the first is best for perf
+tracing and the second is best for single-stepping.
+
+You can then open Visual Studio and select File -> Open -> Project/Solution and select
+the compiled `git.exe` file. This creates a basic solution and you can use the debugging
+and performance tracing tools in Visual Studio to monitor a Git process. Use the Debug
+Properties page to set the working directory and command line arguments.
+
+Be sure to clean up before switching back to GCC (or to switch between debug and
+release MSVC builds):
+
+```
+    make MSVC=1 -j12 clean
+    make MSVC=1 DEBUG=1 -j12 clean
+```
+
+### Using the IDE
+
+If you prefer working in Visual Studio with a solution full of projects, then you can use
+CMake, either by letting Visual Studio configure it automatically (simply open Git's
+top-level directory via `File>Open>Folder...`) or by (downloading and) running
+[CMake](https://cmake.org) manually.
+
+What to Change?
+---------------
+
+Many new contributors ask: What should I start working on?
+
+One way to win big with the open-source community is to look at the
+[issues page](https://github.com/git-for-windows/git/issues) and see if there are any issues that
+you can fix quickly, or if anything catches your eye.
+
+You can also look at [the unofficial Chromium issues page](https://crbug.com/git) for
+multi-platform issues. You can look at recent user questions on
+[the Git mailing list](https://public-inbox.org/git).
+
+Or you can "scratch your own itch", i.e. address an issue you have with Git. The team at Microsoft where the Git for Windows maintainer works, for example, is focused almost entirely on [improving performance](https://blogs.msdn.microsoft.com/devops/2018/01/11/microsofts-performance-contributions-to-git-in-2017/).
+We approach our work by finding something that is slow and try to speed it up. We start our
+investigation by reliably reproducing the slow behavior, then running that example using
+the MSVC build and tracing the results in PerfView.
+
+You could also think of something you wish Git could do, and make it do that thing! The
+only concern I would have with this approach is whether or not that feature is something
+the community also wants. If this excites you though, go for it! Don't be afraid to
+[get involved in the mailing list](http://vger.kernel.org/vger-lists.html#git) early for
+feedback on the idea.
+
+Test Your Changes
+-----------------
+
+After you make your changes, it is important that you test your changes. Manual testing is
+important, but checking and extending the existing test suite is even more important. You
+want to run the functional tests to see if you broke something else during your change, and
+you want to extend the functional tests to be sure no one breaks your feature in the future.
+
+### Functional Tests
+
+Navigate to the `t/` directory and type `make` to run all tests or use `prove` as
+[described on this Git for Windows page](https://gitforwindows.org/building-git):
+
+```
+prove -j12 --state=failed,save ./t[0-9]*.sh
+```
+
+You can also run each test directly by running the corresponding shell script with a name
+like `tNNNN-descriptor.sh`.
+
+If you are adding new functionality, you may need to create unit tests by creating
+helper commands that test a very limited action. These commands are stored in `t/helpers`.
+When adding a helper, be sure to add a line to `t/Makefile` and to the `.gitignore` for the
+binary file you add. The Git community prefers functional tests using the full `git`
+executable, so try to exercise your new code using `git` commands before creating a test
+helper.
+
+To find out why a test failed, repeat the test with the `-x -v -d -i` options and then
+navigate to the appropriate "trash" directory to see the data shape that was used for the
+test failed step.
+
+Read [`t/README`](t/README) for more details.
+
+### Performance Tests
+
+If you are working on improving performance, you will need to be acquainted with the
+performance tests in `t/perf`. There are not too many performance tests yet, but adding one
+as your first commit in a patch series helps to communicate the boost your change provides.
+
+To check the change in performance across multiple versions of `git`, you can use the
+`t/perf/run` script. For example, to compare the performance of `git rev-list` across the
+`core/master` and `core/next` branches compared to a `topic` branch, you can run
+
+```
+cd t/perf
+./run core/master core/next topic -- p0001-rev-list.sh
+```
+
+You can also set certain environment variables to help test the performance on different
+repositories or with more repetitions. The full list is available in
+[the `t/perf/README` file](t/perf/README),
+but here are a few important ones:
+
+```
+GIT_PERF_REPO=/path/to/repo
+GIT_PERF_LARGE_REPO=/path/to/large/repo
+GIT_PERF_REPEAT_COUNT=10
+```
+
+When running the performance tests on Linux, you may see a message "Can't locate JSON.pm in
+@INC" and that means you need to run `sudo cpanm install JSON` to get the JSON perl package.
+
+For running performance tests, it can be helpful to set up a few repositories with strange
+data shapes, such as:
+
+**Many objects:** Clone repos such as [Kotlin](https://github.com/jetbrains/kotlin), [Linux](https://github.com/torvalds/linux), or [Android](https://source.android.com/setup/downloading).
+
+**Many pack-files:** You can split a fresh clone into multiple pack-files of size at most
+16MB by running `git repack -adfF --max-pack-size=16m`. See the
+[`git repack` documentation](https://git-scm.com/docs/git-repack) for more information.
+You can count the number of pack-files using `ls .git/objects/pack/*.pack | wc -l`.
+
+**Many loose objects:** If you already split your repository into multiple pack-files, then
+you can pick one to split into loose objects using `cat .git/objects/pack/[id].pack | git unpack-objects`;
+delete the `[id].pack` and `[id].idx` files after this. You can count the number of loose
+bjects using `ls .git/objects/??/* | wc -l`.
+
+**Deep history:** Usually large repositories also have deep histories, but you can use the
+[test-many-commits-1m repo](https://github.com/cirosantilli/test-many-commits-1m/) to
+target deep histories without the overhead of many objects. One issue with this repository:
+there are no merge commits, so you will need to use a different repository to test a "wide"
+commit history.
+
+**Large Index:** You can generate a large index and repo by using the scripts in
+`t/perf/repos`.  There are two scripts. `many-files.sh` which will generate a repo with
+same tree and blobs but different paths.  Using `many-files.sh -d 5 -w 10 -f 9` will create
+a repo with ~1 million entries in the index. `inflate-repo.sh` will use an existing repo
+and copy the current work tree until it is a specified size.
+
+Test Your Changes on Linux
+--------------------------
+
+It can be important to work directly on the [core Git codebase](https://github.com/git/git),
+such as a recent commit into the `master` or `next` branch that has not been incorporated
+into Git for Windows. Also, it can help to run functional and performance tests on your
+code in Linux before submitting patches to the mailing list, which focuses on many platforms.
+The differences between Windows and Linux are usually enough to catch most cross-platform
+issues.
+
+### Using the Windows Subsystem for Linux
+
+The [Windows Subsystem for Linux (WSL)](https://docs.microsoft.com/en-us/windows/wsl/install-win10)
+allows you to [install Ubuntu Linux as an app](https://www.microsoft.com/en-us/store/p/ubuntu/9nblggh4msv6)
+that can run Linux executables on top of the Windows kernel. Internally,
+Linux syscalls are interpreted by the WSL, everything else is plain Ubuntu.
+
+First, open WSL (either type "Bash" in Cortana, or execute "bash.exe" in a CMD window).
+Then install the prerequisites, and `git` for the initial clone:
+
+```
+sudo apt-get update
+sudo apt-get install git gcc make libssl-dev libcurl4-openssl-dev \
+		     libexpat-dev tcl tk gettext git-email zlib1g-dev
+```
+
+Then, clone and build:
+
+```
+git clone https://github.com/git-for-windows/git
+cd git
+git remote add -f upstream https://github.com/git/git
+make
+```
+
+Be sure to clone into `/home/[user]/` and not into any folder under `/mnt/?/` or your build
+will fail due to colons in file names.
+
+### Using a Linux Virtual Machine with Hyper-V
+
+If you prefer, you can use a virtual machine (VM) to run Linux and test your changes in the
+full environment. The test suite runs a lot faster on Linux than on Windows or with the WSL.
+You can connect to the VM using an SSH terminal like
+[PuTTY](https://www.chiark.greenend.org.uk/~sgtatham/putty/).
+
+The following instructions are for using Hyper-V, which is available in some versions of Windows.
+There are many virtual machine alternatives available, if you do not have such a version installed.
+
+* [Download an Ubuntu Server ISO](https://www.ubuntu.com/download/server).
+* Open [Hyper-V Manager](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/quick-start/enable-hyper-v).
+* [Set up a virtual switch](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/quick-start/connect-to-network)
+  so your VM can reach the network.
+* Select "Quick Create", name your machine, select the ISO as installation source, and un-check
+  "This virtual machine will run Windows."
+* Go through the Ubuntu install process, being sure to select to install OpenSSH Server.
+* When install is complete, log in and check the SSH server status with `sudo service ssh status`.
+    * If the service is not found, install with `sudo apt-get install openssh-server`.
+    * If the service is not running, then use `sudo service ssh start`.
+* Use `shutdown -h now` to shutdown the VM, go to the Hyper-V settings for the VM, expand Network Adapter
+  to select "Advanced Features", and set the MAC address to be static (this can save your VM from losing
+  network if shut down incorrectly).
+* Provide as many cores to your VM as you can (for parallel builds).
+* Restart your VM, but do not connect.
+* Use `ssh` in Git Bash, download [PuTTY](https://www.chiark.greenend.org.uk/~sgtatham/putty/), or use your favorite SSH client to connect to the VM through SSH.
+
+In order to build and use `git`, you will need the following libraries via `apt-get`:
+
+```
+sudo apt-get update
+sudo apt-get install git gcc make libssl-dev libcurl4-openssl-dev \
+                     libexpat-dev tcl tk gettext git-email zlib1g-dev
+```
+
+To get your code from your Windows machine to the Linux VM, it is easiest to push the branch to your fork of Git and clone your fork in the Linux VM.
+
+Don't forget to set your `git` config with your preferred name, email, and editor.
+
+Polish Your Commits
+-------------------
+
+Before submitting your patch, be sure to read the [coding guidelines](https://github.com/git/git/blob/master/Documentation/CodingGuidelines)
+and check your code to match as best you can. This can be a lot of effort, but it saves
+time during review to avoid style issues.
+
+The other possibly major difference between the mailing list submissions and GitHub PR workflows
+is that each commit will be reviewed independently. Even if you are submitting a
+patch series with multiple commits, each commit must stand on it's own and be reviewable
+by itself. Make sure the commit message clearly explain the why of the commit not the how.
+Describe what is wrong with the current code and how your changes have made the code better.
+
+When preparing your patch, it is important to put yourself in the shoes of the Git community.
+Accepting a patch requires more justification than approving a pull request from someone on
+your team. The community has a stable product and is responsible for keeping it stable. If
+you introduce a bug, then they cannot count on you being around to fix it. When you decided
+to start work on a new feature, they were not part of the design discussion and may not
+even believe the feature is worth introducing.
+
+Questions to answer in your patch message (and commit messages) may include:
+* Why is this patch necessary?
+* How does the current behavior cause pain for users?
+* What kinds of repositories are necessary for noticing a difference?
+* What design options did you consider before writing this version? Do you have links to
+  code for those alternate designs?
+* Is this a performance fix? Provide clear performance numbers for various well-known repos.
+
+Here are some other tips that we use when cleaning up our commits:
+
+* Commit messages should be wrapped at 76 columns per line (or less; 72 is also a
+  common choice).
+* Make sure the commits are signed off using `git commit (-s|--signoff)`. See
+  [SubmittingPatches](https://github.com/git/git/blob/v2.8.1/Documentation/SubmittingPatches#L234-L286)
+  for more details about what this sign-off means.
+* Check for whitespace errors using `git diff --check [base]...HEAD` or `git log --check`.
+* Run `git rebase --whitespace=fix` to correct upstream issues with whitespace.
+* Become familiar with interactive rebase (`git rebase -i`) because you will be reordering,
+  squashing, and editing commits as your patch or series of patches is reviewed.
+* Make sure any shell scripts that you add have the executable bit set on them.  This is
+  usually for test files that you add in the `/t` directory.  You can use
+  `git add --chmod=+x [file]` to update it. You can test whether a file is marked as executable
+  using `git ls-files --stage \*.sh`; the first number is 100755 for executable files.
+* Your commit titles should match the "area: change description" format. Rules of thumb:
+    * Choose "<area>: " prefix appropriately.
+    * Keep the description short and to the point.
+    * The word that follows the "<area>: " prefix is not capitalized.
+    * Do not include a full-stop at the end of the title.
+    * Read a few commit messages -- using `git log origin/master`, for instance -- to
+      become acquainted with the preferred commit message style.
+* Build source using  `make DEVELOPER=1` for extra-strict compiler warnings.
+
+Submit Your Patch
+-----------------
+
+Git for Windows [accepts pull requests on GitHub](https://github.com/git-for-windows/git/pulls), but
+these are reserved for Windows-specific improvements. For core Git, submissions are accepted on
+[the Git mailing list](https://public-inbox.org/git).
+
+### Configure Git to Send Emails
+
+There are a bunch of options for configuring the `git send-email` command. These options can
+be found in the documentation for
+[`git config`](https://git-scm.com/docs/git-config) and
+[`git send-email`](https://git-scm.com/docs/git-send-email).
+
+```
+git config --global sendemail.smtpserver <smtp server>
+git config --global sendemail.smtpserverport 587
+git config --global sendemail.smtpencryption tls
+git config --global sendemail.smtpuser <email address>
+```
+
+To avoid storing your password in the config file, store it in the Git credential manager:
+
+```
+$ git credential fill
+protocol=smtp
+host=<stmp server>
+username=<email address>
+password=password
+```
+
+Before submitting a patch, read the [Git documentation on submitting patches](https://github.com/git/git/blob/master/Documentation/SubmittingPatches).
+
+To construct a patch set, use the `git format-patch` command. There are three important options:
+
+* `--cover-letter`: If specified, create a `[v#-]0000-cover-letter.patch` file that can be
+  edited to describe the patch as a whole. If you previously added a branch description using
+  `git branch --edit-description`, you will end up with a 0/N mail with that description and
+  a nice overall diffstat.
+* `--in-reply-to=[Message-ID]`: This will mark your cover letter as replying to the given
+  message (which should correspond to your first iteration). To determine the correct Message-ID,
+  find the message you are replying to on [public-inbox.org/git](https://public-inbox.org/git) and take
+  the ID from between the angle brackets.
+
+* `--subject-prefix=[prefix]`: This defaults to [PATCH]. For subsequent iterations, you will want to
+  override it like `--subject-prefix="[PATCH v2]"`.  You can also use the `-v` option to have it
+  automatically generate the version number in the patches.
+
+If you have multiple commits and use the `--cover-letter` option be sure to open the
+`0000-cover-letter.patch` file to update the subject and add some details about the overall purpose
+of the patch series.
+
+### Examples
+
+To generate a single commit patch file:
+```
+git format-patch -s -o [dir] -1
+```
+To generate four patch files from the last three commits with a cover letter:
+```
+git format-patch --cover-letter -s -o [dir] HEAD~4
+```
+To generate version 3 with four patch files from the last four commits with a cover letter:
+```
+git format-patch --cover-letter -s -o [dir] -v 3 HEAD~4
+```
+
+### Submit the Patch
+
+Run [`git send-email`](https://git-scm.com/docs/git-send-email), starting with a test email:
+
+```
+git send-email --to=yourself@address.com  [dir with patches]/*.patch
+```
+
+After checking the receipt of your test email, you can send to the list and to any
+potentially interested reviewers.
+
+```
+git send-email --to=git@vger.kernel.org --cc=<email1> --cc=<email2> [dir with patches]/*.patch
+```
+
+To submit a nth version patch (say version 3):
+
+```
+git send-email --to=git@vger.kernel.org --cc=<email1> --cc=<email2> \
+    --in-reply-to=<the message id of cover letter of patch v1> [dir with patches]/*.patch
+```

From be43eb66305f91b685c22905c0e5fbc35a8b90f3 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 7 Jul 2017 10:15:36 +0200
Subject: [PATCH 237/247] t9200: skip tests when $PWD contains a colon

On Windows, the current working directory is pretty much guaranteed to
contain a colon. If we feed that path to CVS, it mistakes it for a
separator between host and port, though.

This has not been a problem so far because Git for Windows uses MSYS2's
Bash using a POSIX emulation layer that also pretends that the current
directory is a Unix path (at least as long as we're in a shell script).

However, that is rather limiting, as Git for Windows also explores other
ports of other Unix shells. One of those is BusyBox-w32's ash, which is
a native port (i.e. *not* using any POSIX emulation layer, and certainly
not emulating Unix paths).

So let's just detect if there is a colon in $PWD and punt in that case.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t9200-git-cvsexportcommit.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
index c42e69ee70ee23..1dada9a414a4aa 100755
--- a/t/t9200-git-cvsexportcommit.sh
+++ b/t/t9200-git-cvsexportcommit.sh
@@ -11,6 +11,13 @@ if ! test_have_prereq PERL; then
 	test_done
 fi
 
+case "$PWD" in
+*:*)
+	skip_all='cvs would get confused by the colon in `pwd`; skipping tests'
+	test_done
+	;;
+esac
+
 if ! cvs version >/dev/null 2>&1
 then
     skip_all='skipping git cvsexportcommit tests, cvs not found'

From 764637dbb2554566ddd5306e233537258e12544e Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 10 Jan 2014 16:16:03 -0600
Subject: [PATCH 238/247] README.md: Add a Windows-specific preamble
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Includes touch-ups by 마누엘, Philip Oakley and 孙卓识.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 README.md | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 76 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 46489b0971d04d..026d5d85caef09 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,77 @@
-[![GitHub build status](https://github.com/git/git/workflows/CI/badge.svg)](https://github.com/git/git/actions?query=branch%3Amaster+event%3Apush)
-[![GitLab build status](https://gitlab.com/git-scm/git/badges/master/pipeline.svg)](https://gitlab.com/git-scm/git/-/pipelines?ref=master)
+Git for Windows
+===============
+
+[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md)
+[![Open in Visual Studio Code](https://img.shields.io/static/v1?logo=visualstudiocode&label=&message=Open%20in%20Visual%20Studio%20Code&labelColor=2c2c32&color=007acc&logoColor=007acc)](https://open.vscode.dev/git-for-windows/git)
+[![Build status](https://github.com/git-for-windows/git/workflows/CI/badge.svg)](https://github.com/git-for-windows/git/actions?query=branch%3Amain+event%3Apush)
+[![Join the chat at https://gitter.im/git-for-windows/git](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/git-for-windows/git?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+This is [Git for Windows](http://git-for-windows.github.io/), the Windows port
+of [Git](http://git-scm.com/).
+
+The Git for Windows project is run using a [governance
+model](http://git-for-windows.github.io/governance-model.html). If you
+encounter problems, you can report them as [GitHub
+issues](https://github.com/git-for-windows/git/issues), discuss them in Git
+for Windows' [Discussions](https://github.com/git-for-windows/git/discussions)
+or on the [Git mailing list](mailto:git@vger.kernel.org), and [contribute bug
+fixes](https://gitforwindows.org/how-to-participate).
+
+To build Git for Windows, please either install [Git for Windows'
+SDK](https://gitforwindows.org/#download-sdk), start its `git-bash.exe`, `cd`
+to your Git worktree and run `make`, or open the Git worktree as a folder in
+Visual Studio.
+
+To verify that your build works, use one of the following methods:
+
+- If you want to test the built executables within Git for Windows' SDK,
+  prepend `<worktree>/bin-wrappers` to the `PATH`.
+- Alternatively, run `make install` in the Git worktree.
+- If you need to test this in a full installer, run `sdk build
+  git-and-installer`.
+- You can also "install" Git into an existing portable Git via `make install
+  DESTDIR=<dir>` where `<dir>` refers to the top-level directory of the
+  portable Git. In this instance, you will want to prepend that portable Git's
+  `/cmd` directory to the `PATH`, or test by running that portable Git's
+  `git-bash.exe` or `git-cmd.exe`.
+- If you built using a recent Visual Studio, you can use the menu item
+  `Build>Install git` (you will want to click on `Project>CMake Settings for
+  Git` first, then click on `Edit JSON` and then point `installRoot` to the
+  `mingw64` directory of an already-unpacked portable Git).
+
+  As in the previous  bullet point, you will then prepend `/cmd` to the `PATH`
+  or run using the portable Git's `git-bash.exe` or `git-cmd.exe`.
+- If you want to run the built executables in-place, but in a CMD instead of
+  inside a Bash, you can run a snippet like this in the `git-bash.exe` window
+  where Git was built (ensure that the `EOF` line has no leading spaces), and
+  then paste into the CMD window what was put in the clipboard:
+
+  ```sh
+  clip.exe <<EOF
+  set GIT_EXEC_PATH=$(cygpath -aw .)
+  set PATH=$(cygpath -awp ".:contrib/scalar:/mingw64/bin:/usr/bin:$PATH")
+  set GIT_TEMPLATE_DIR=$(cygpath -aw templates/blt)
+  set GITPERLLIB=$(cygpath -aw perl/build/lib)
+  EOF
+  ```
+- If you want to run the built executables in-place, but outside of Git for
+  Windows' SDK, and without an option to set/override any environment
+  variables (e.g. in Visual Studio's debugger), you can call the Git executable
+  by its absolute path and use the `--exec-path` option, like so:
+
+  ```cmd
+  C:\git-sdk-64\usr\src\git\git.exe --exec-path=C:\git-sdk-64\usr\src\git help
+  ```
+
+  Note: for this to work, you have to hard-link (or copy) the `.dll` files from
+  the `/mingw64/bin` directory to the Git worktree, or add the `/mingw64/bin`
+  directory to the `PATH` somehow or other.
+
+To make sure that you are testing the correct binary, call `./git.exe version`
+in the Git worktree, and then call `git version` in a directory/window where
+you want to test Git, and verify that they refer to the same version (you may
+even want to pass the command-line option `--build-options` to look at the
+exact commit from which the Git version was built).
 
 Git - fast, scalable, distributed revision control system
 =========================================================
@@ -30,7 +102,7 @@ CVS users may also want to read [Documentation/gitcvs-migration.adoc][]
 (`man gitcvs-migration` or `git help cvs-migration` if git is
 installed).
 
-The user discussion and development of Git take place on the Git
+The user discussion and development of core Git take place on the Git
 mailing list -- everyone is welcome to post bug reports, feature
 requests, comments and patches to git@vger.kernel.org (read
 [Documentation/SubmittingPatches][] for instructions on patch submission
@@ -44,6 +116,7 @@ To subscribe to the list, send an email to <git+subscribe@vger.kernel.org>
 (see https://subspace.kernel.org/subscribing.html for details). The mailing
 list archives are available at <https://lore.kernel.org/git/>,
 <https://marc.info/?l=git> and other archival sites.
+The core git mailing list is plain text (no HTML!).
 
 Issues which are security relevant should be disclosed privately to
 the Git Security mailing list <git-security@googlegroups.com>.

From dc3c3b85f9403f9e6fa9bac0aa97393560a28f97 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 25 Nov 2021 11:26:41 +0100
Subject: [PATCH 239/247] Partially un-revert "editor: save and reset terminal
 after calling EDITOR"

In e3f7e01b50be (Revert "editor: save and reset terminal after calling
EDITOR", 2021-11-22), we reverted the commit wholesale where the
terminal state would be saved and restored before/after calling an
editor.

The reverted commit was intended to fix a problem with Windows Terminal
where simply calling `vi` would cause problems afterwards.

To fix the problem addressed by the revert, but _still_ keep the problem
with Windows Terminal fixed, let's revert the revert, with a twist: we
restrict the save/restore _specifically_ to the case where `vi` (or
`vim`) is called, and do not do the same for any other editor.

This should still catch the majority of the cases, and will bridge the
time until the original patch is re-done in a way that addresses all
concerns.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 editor.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/editor.c b/editor.c
index 0d1cb8768db1a0..36a3f1ec49efea 100644
--- a/editor.c
+++ b/editor.c
@@ -13,6 +13,7 @@
 #include "strvec.h"
 #include "run-command.h"
 #include "sigchain.h"
+#include "compat/terminal.h"
 
 #ifndef DEFAULT_EDITOR
 #define DEFAULT_EDITOR "vi"
@@ -64,6 +65,7 @@ static int launch_specified_editor(const char *editor, const char *path,
 		return error("Terminal is dumb, but EDITOR unset");
 
 	if (strcmp(editor, ":")) {
+		int save_and_restore_term = !strcmp(editor, "vi") || !strcmp(editor, "vim");
 		struct strbuf realpath = STRBUF_INIT;
 		struct child_process p = CHILD_PROCESS_INIT;
 		int ret, sig;
@@ -92,7 +94,11 @@ static int launch_specified_editor(const char *editor, const char *path,
 			strvec_pushv(&p.env, (const char **)env);
 		p.use_shell = 1;
 		p.trace2_child_class = "editor";
+		if (save_and_restore_term)
+			save_and_restore_term = !save_term(1);
 		if (start_command(&p) < 0) {
+			if (save_and_restore_term)
+				restore_term();
 			strbuf_release(&realpath);
 			return error("unable to start editor '%s'", editor);
 		}
@@ -100,6 +106,8 @@ static int launch_specified_editor(const char *editor, const char *path,
 		sigchain_push(SIGINT, SIG_IGN);
 		sigchain_push(SIGQUIT, SIG_IGN);
 		ret = finish_command(&p);
+		if (save_and_restore_term)
+			restore_term();
 		strbuf_release(&realpath);
 		sig = ret - 128;
 		sigchain_pop(SIGINT);

From 31a70d7a39ec2494f7621fd75974f98b0cfb437f Mon Sep 17 00:00:00 2001
From: Brendan Forster <brendan@github.com>
Date: Thu, 18 Feb 2016 21:29:50 +1100
Subject: [PATCH 240/247] Add an issue template

With improvements by Clive Chan, Adric Norris, Ben Bodenmiller and
Philip Oakley.

Helped-by: Clive Chan <cc@clive.io>
Helped-by: Adric Norris <landstander668@gmail.com>
Helped-by: Ben Bodenmiller <bbodenmiller@hotmail.com>
Helped-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: Brendan Forster <brendan@github.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 .github/ISSUE_TEMPLATE/bug-report.yml | 105 ++++++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/config.yml     |   1 +
 2 files changed, 106 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug-report.yml
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 00000000000000..b49593339932b2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,105 @@
+name: Bug report
+description: Use this template to report bugs.
+body:
+  - type: checkboxes
+    id: search
+    attributes:
+      label: Existing issues matching what you're seeing
+      description: Please search for [open](https://github.com/git-for-windows/git/issues?q=is%3Aopen) or [closed](https://github.com/git-for-windows/git/issues?q=is%3Aclosed) issue matching what you're seeing before submitting a new issue.
+      options:
+        - label: I was not able to find an open or closed issue matching what I'm seeing
+  - type: textarea
+    id: git-for-windows-version
+    attributes:
+      label: Git for Windows version
+      description: Which version of Git for Windows are you using?
+      placeholder: Please insert the output of `git --version --build-options` here
+      render: shell
+    validations:
+      required: true
+  - type: dropdown
+    id: windows-version
+    attributes:
+      label: Windows version
+      description: Which version of Windows are you running?
+      options:
+        - Windows 8.1
+        - Windows 10
+        - Windows 11
+        - Other
+      default: 2
+    validations:
+      required: true
+  - type: dropdown
+    id: windows-arch
+    attributes:
+      label: Windows CPU architecture
+      description: What CPU Archtitecture does your Windows target?
+      options:
+        - i686 (32-bit)
+        - x86_64 (64-bit)
+        - ARM64
+      default: 1
+    validations:
+      required: true
+  - type: textarea
+    id: windows-version-cmd
+    attributes:
+      label: Additional Windows version information
+      description: This provides us with further information about your Windows such as the build number
+      placeholder: Please insert the output of `cmd.exe /c ver` here
+      render: shell
+  - type: textarea
+    id: options
+    attributes:
+      label: Options set during installation
+      description: What options did you set as part of the installation? Or did you choose the defaults?
+      placeholder: |
+        One of the following:
+        > type "C:\Program Files\Git\etc\install-options.txt"
+        > type "C:\Program Files (x86)\Git\etc\install-options.txt"
+        > type "%USERPROFILE%\AppData\Local\Programs\Git\etc\install-options.txt"
+        > type "$env:USERPROFILE\AppData\Local\Programs\Git\etc\install-options.txt"
+        $ cat /etc/install-options.txt
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    id: other-things
+    attributes:
+      label: Other interesting things
+      description: Any other interesting things about your environment that might be related to the issue you're seeing?
+  - type: input
+    id: terminal
+    attributes:
+      label: Terminal/shell
+      description: Which terminal/shell are you running Git from? e.g Bash/CMD/PowerShell/other
+    validations:
+      required: true
+  - type: textarea
+    id: commands
+    attributes:
+      label: Commands that trigger the issue
+      description: What commands did you run to trigger this issue? If you can provide a [Minimal, Complete, and Verifiable example](http://stackoverflow.com/help/mcve) this will help us understand the issue.
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behaviour
+    attributes:
+      label: Expected behaviour
+      description: What did you expect to occur after running these commands?
+    validations:
+      required: true
+  - type: textarea
+    id: actual-behaviour
+    attributes:
+      label: Actual behaviour
+      description: What actually happened instead?
+    validations:
+      required: true
+  - type: textarea
+    id: repository
+    attributes:
+      label: Repository
+      description: If the problem was occurring with a specific repository, can you provide the URL to that repository to help us with testing?
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000000000..ec4bb386bcf8a4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
\ No newline at end of file

From 68bd30e70efab96346ab048018653cf9e4dfca0e Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 10 Dec 2019 21:41:57 +0100
Subject: [PATCH 241/247] reset: reinstate support for the deprecated --stdin
 option

The `--stdin` option was a well-established paradigm in other commands,
therefore we implemented it in `git reset` for use by Visual Studio.

Unfortunately, upstream Git decided that it is time to introduce
`--pathspec-from-file` instead.

To keep backwards-compatibility for some grace period, we therefore
reinstate the `--stdin` option on top of the `--pathspec-from-file`
option, but mark it firmly as deprecated.

Helped-by: Victoria Dye <vdye@github.com>
Helped-by: Matthew John Cheetham <mjcheetham@outlook.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 Documentation/git-reset.adoc | 11 +++++++++++
 builtin/reset.c              | 16 ++++++++++++++++
 t/meson.build                |  1 +
 t/t7108-reset-stdin.sh       | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 60 insertions(+)
 create mode 100755 t/t7108-reset-stdin.sh

diff --git a/Documentation/git-reset.adoc b/Documentation/git-reset.adoc
index 5023b5069972ca..933e2fac7dd662 100644
--- a/Documentation/git-reset.adoc
+++ b/Documentation/git-reset.adoc
@@ -12,6 +12,7 @@ git reset [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>]
 git reset [-q] [<tree-ish>] [--] <pathspec>...
 git reset [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]
 git reset (--patch | -p) [<tree-ish>] [--] [<pathspec>...]
+DEPRECATED: git reset [-q] [--stdin [-z]] [<tree-ish>]
 
 DESCRIPTION
 -----------
@@ -139,6 +140,16 @@ include::diff-context-options.adoc[]
 +
 For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
 
+`--stdin`::
+	DEPRECATED (use `--pathspec-from-file=-` instead): Instead of taking
+	list of paths from the command line, read list of paths from the
+	standard input. Paths are separated by LF (i.e. one path per line) by
+	default.
+
+`-z`::
+	DEPRECATED (use `--pathspec-file-nul` instead): Only meaningful with
+	`--stdin`; paths are separated with NUL character instead of LF.
+
 EXAMPLES
 --------
 
diff --git a/builtin/reset.c b/builtin/reset.c
index 78e69bd84ba2c3..66c26eab62fc12 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -38,6 +38,8 @@
 #include "trace2.h"
 #include "dir.h"
 #include "add-interactive.h"
+#include "strbuf.h"
+#include "quote.h"
 
 #define REFRESH_INDEX_DELAY_WARNING_IN_MS (2 * 1000)
 
@@ -46,6 +48,7 @@ static const char * const git_reset_usage[] = {
 	N_("git reset [-q] [<tree-ish>] [--] <pathspec>..."),
 	N_("git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"),
 	N_("git reset --patch [<tree-ish>] [--] [<pathspec>...]"),
+	N_("DEPRECATED: git reset [-q] [--stdin [-z]] [<tree-ish>]"),
 	NULL
 };
 
@@ -347,6 +350,7 @@ int cmd_reset(int argc,
 	struct pathspec pathspec;
 	int intent_to_add = 0;
 	struct interactive_options interactive_opts = INTERACTIVE_OPTIONS_INIT;
+	int nul_term_line = 0, read_from_stdin = 0;
 	const struct option options[] = {
 		OPT__QUIET(&quiet, N_("be quiet, only report errors")),
 		OPT_BOOL(0, "no-refresh", &no_refresh,
@@ -379,6 +383,10 @@ int cmd_reset(int argc,
 				N_("record only the fact that removed paths will be added later")),
 		OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
 		OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul),
+		OPT_BOOL('z', NULL, &nul_term_line,
+			N_("DEPRECATED (use --pathspec-file-nul instead): paths are separated with NUL character")),
+		OPT_BOOL(0, "stdin", &read_from_stdin,
+				N_("DEPRECATED (use --pathspec-from-file=- instead): read paths from <stdin>")),
 		OPT_END()
 	};
 
@@ -388,6 +396,14 @@ int cmd_reset(int argc,
 						PARSE_OPT_KEEP_DASHDASH);
 	parse_args(&pathspec, argv, prefix, patch_mode, &rev);
 
+	if (read_from_stdin) {
+		warning(_("--stdin is deprecated, please use --pathspec-from-file=- instead"));
+		free(pathspec_from_file);
+		pathspec_from_file = xstrdup("-");
+		if (nul_term_line)
+			pathspec_file_nul = 1;
+	}
+
 	if (pathspec_from_file) {
 		if (patch_mode)
 			die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--patch");
diff --git a/t/meson.build b/t/meson.build
index d6c03278343375..e1e561181bb048 100644
--- a/t/meson.build
+++ b/t/meson.build
@@ -891,6 +891,7 @@ integration_tests = [
   't7105-reset-patch.sh',
   't7106-reset-unborn-branch.sh',
   't7107-reset-pathspec-file.sh',
+  't7108-reset-stdin.sh',
   't7110-reset-merge.sh',
   't7111-reset-table.sh',
   't7112-reset-submodule.sh',
diff --git a/t/t7108-reset-stdin.sh b/t/t7108-reset-stdin.sh
new file mode 100755
index 00000000000000..b7cbcbf869296c
--- /dev/null
+++ b/t/t7108-reset-stdin.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+test_description='reset --stdin'
+
+. ./test-lib.sh
+
+test_expect_success 'reset --stdin' '
+	test_commit hello &&
+	git rm hello.t &&
+	test -z "$(git ls-files hello.t)" &&
+	echo hello.t | git reset --stdin &&
+	test hello.t = "$(git ls-files hello.t)"
+'
+
+test_expect_success 'reset --stdin -z' '
+	test_commit world &&
+	git rm hello.t world.t &&
+	test -z "$(git ls-files hello.t world.t)" &&
+	printf world.tQworld.tQhello.tQ | q_to_nul | git reset --stdin -z &&
+	printf "hello.t\nworld.t\n" >expect &&
+	git ls-files >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '--stdin requires --mixed' '
+	echo hello.t >list &&
+	test_must_fail git reset --soft --stdin <list &&
+	test_must_fail git reset --hard --stdin <list &&
+	git reset --mixed --stdin <list
+'
+
+test_done

From 750b949e965e162ba26238a1e7979cad49fa4b5e Mon Sep 17 00:00:00 2001
From: Philip Oakley <philipoakley@iee.org>
Date: Fri, 22 Dec 2017 17:15:50 +0000
Subject: [PATCH 242/247] Modify the GitHub Pull Request template (to reflect
 Git for Windows)

Git for Windows accepts pull requests; Core Git does not. Therefore we
need to adjust the template (because it only matches core Git's
project management style, not ours).

Also: direct Git for Windows enhancements to their contributions page,
space out the text for easy reading, and clarify that the mailing list
is plain text, not HTML.

Signed-off-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 .github/PULL_REQUEST_TEMPLATE.md | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 37654cdfd7abcf..7baf31f2c471ec 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,19 @@
-Thanks for taking the time to contribute to Git! Please be advised that the
-Git community does not use github.com for their contributions. Instead, we use
-a mailing list (git@vger.kernel.org) for code submissions, code reviews, and
-bug reports. Nevertheless, you can use GitGitGadget (https://gitgitgadget.github.io/)
+Thanks for taking the time to contribute to Git!
+
+Those seeking to contribute to the Git for Windows fork should see
+http://gitforwindows.org/#contribute on how to contribute Windows specific
+enhancements.
+
+If your contribution is for the core Git functions and documentation
+please be aware that the Git community does not use the github.com issues
+or pull request mechanism for their contributions.
+
+Instead, we use the Git mailing list (git@vger.kernel.org) for code and
+documentation submissions, code reviews, and bug reports. The
+mailing list is plain text only (anything with HTML is sent directly
+to the spam folder).
+
+Nevertheless, you can use GitGitGadget (https://gitgitgadget.github.io/)
 to conveniently send your Pull Requests commits to our mailing list.
 
 For a single-commit pull request, please *leave the pull request description

From e1bea563a57aef1dc6647e2dcea5013fad053290 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 29 Sep 2020 13:50:59 +0200
Subject: [PATCH 243/247] Add a GitHub workflow to monitor component updates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rather than using private IFTTT Applets that send mails to this
maintainer whenever a new version of a Git for Windows component was
released, let's use the power of GitHub workflows to make this process
publicly visible.

This workflow monitors the Atom/RSS feeds, and opens a ticket whenever a
new version was released.

Note: Bash sometimes releases multiple patched versions within a few
minutes of each other (i.e. 5.1p1 through 5.1p4, 5.0p15 and 5.0p16). The
MSYS2 runtime also has a similar system. We can address those patches as
a group, so we shouldn't get multiple issues about them.

Note further: We're not acting on newlib releases, OpenSSL alphas, Perl
release candidates or non-stable Perl releases. There's no need to open
issues about them.

Co-authored-by: Matthias Aßhauer <mha1993@live.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 .github/workflows/monitor-components.yml | 91 ++++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 .github/workflows/monitor-components.yml

diff --git a/.github/workflows/monitor-components.yml b/.github/workflows/monitor-components.yml
new file mode 100644
index 00000000000000..e9f16e58fff87c
--- /dev/null
+++ b/.github/workflows/monitor-components.yml
@@ -0,0 +1,91 @@
+name: Monitor component updates
+
+# Git for Windows is a slightly modified subset of MSYS2. Some of its
+# components are maintained by Git for Windows, others by MSYS2. To help
+# keeping the former up to date, this workflow monitors the Atom/RSS feeds
+# and opens new tickets for each new component version.
+
+on:
+  schedule:
+    - cron: "23 8,11,14,17 * * *"
+  workflow_dispatch:
+
+env:
+  CHARACTER_LIMIT: 5000
+  MAX_AGE: 7d
+
+jobs:
+  job:
+    # Only run this in Git for Windows' fork
+    if: github.event.repository.owner.login == 'git-for-windows'
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    strategy:
+      matrix:
+        component:
+          - label: git
+            feed: https://github.com/git/git/tags.atom
+          - label: git-lfs
+            feed: https://github.com/git-lfs/git-lfs/tags.atom
+          - label: git-credential-manager
+            feed: https://github.com/git-ecosystem/git-credential-manager/tags.atom
+          - label: tig
+            feed: https://github.com/jonas/tig/tags.atom
+          - label: cygwin
+            feed: https://github.com/cygwin/cygwin/releases.atom
+            title-pattern: ^(?!.*newlib)
+          - label: msys2-runtime-package
+            feed: https://github.com/msys2/MSYS2-packages/commits/master/msys2-runtime.atom
+          - label: msys2-runtime
+            feed: https://github.com/msys2/msys2-runtime/commits/HEAD.atom
+            aggregate: true
+          - label: openssh
+            feed: https://github.com/openssh/openssh-portable/tags.atom
+          - label: libfido2
+            feed: https://github.com/Yubico/libfido2/tags.atom
+          - label: libcbor
+            feed: https://github.com/PJK/libcbor/tags.atom
+          - label: openssl
+            feed: https://github.com/openssl/openssl/tags.atom
+            title-pattern: ^(?!.*alpha)
+          - label: gnutls
+            feed: https://gnutls.org/news.atom
+          - label: heimdal
+            feed: https://github.com/heimdal/heimdal/tags.atom
+          - label: git-sizer
+            feed: https://github.com/github/git-sizer/tags.atom
+          - label: gitflow
+            feed: https://github.com/petervanderdoes/gitflow-avh/tags.atom
+          - label: curl
+            feed: https://github.com/curl/curl/tags.atom
+            title-pattern: ^(?!rc-)
+          - label: mintty
+            feed: https://github.com/mintty/mintty/releases.atom
+          - label: 7-zip
+            feed: https://sourceforge.net/projects/sevenzip/rss?path=/7-Zip
+            aggregate: true
+          - label: bash
+            feed: https://git.savannah.gnu.org/cgit/bash.git/atom/?h=master
+            aggregate: true
+          - label: perl
+            feed: https://github.com/Perl/perl5/tags.atom
+            title-pattern: ^(?!.*(5\.[0-9]+[13579]|RC))
+          - label: pcre2
+            feed: https://github.com/PCRE2Project/pcre2/tags.atom
+          - label: mingw-w64-llvm
+            feed: https://github.com/msys2/MINGW-packages/commits/master/mingw-w64-llvm.atom
+          - label: innosetup
+            feed: https://github.com/jrsoftware/issrc/tags.atom
+      fail-fast: false
+    steps:
+      - uses: git-for-windows/rss-to-issues@v0
+        with:
+          feed: ${{matrix.component.feed}}
+          prefix: "[New ${{matrix.component.label}} version]"
+          labels: component-update
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          character-limit: ${{ env.CHARACTER_LIMIT }}
+          max-age: ${{ env.MAX_AGE }}
+          aggregate: ${{matrix.component.aggregate}}
+          title-pattern: ${{matrix.component.title-pattern}}

From d3540873182115ad7c2a381917c58eb4e18edc4f Mon Sep 17 00:00:00 2001
From: Victoria Dye <vdye@github.com>
Date: Mon, 4 Apr 2022 15:38:58 -0700
Subject: [PATCH 244/247] fsmonitor: reintroduce core.useBuiltinFSMonitor

Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added
in 0a756b2a25 (fsmonitor: config settings are repository-specific,
2021-03-05)) after its removal from the upstream version of FSMonitor.

Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by
"overloading" the 'core.fsmonitor' setting to take a boolean value. However,
several applications (e.g., 'scalar') utilize the original config setting,
so it should be preserved for a deprecation period before complete removal:

* if 'core.fsmonitor' is a boolean, the user is correctly using the new
  config syntax; do not use 'core.useBuiltinFSMonitor'.
* if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'.
* if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if
  'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook
  indicated by the path.

Additionally, for this deprecation period, advise users to switch to using
'core.fsmonitor' to specify their use of the builtin FSMonitor.

Signed-off-by: Victoria Dye <vdye@github.com>
---
 Documentation/config/advice.adoc |  4 ++++
 advice.c                         |  1 +
 advice.h                         |  1 +
 fsmonitor-settings.c             | 34 ++++++++++++++++++++++++++++++--
 4 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/Documentation/config/advice.adoc b/Documentation/config/advice.adoc
index 81f80a92745123..9854186048fee4 100644
--- a/Documentation/config/advice.adoc
+++ b/Documentation/config/advice.adoc
@@ -175,4 +175,8 @@ all advice messages.
 		Shown when the user tries to create a worktree from an
 		invalid reference, to tell the user how to create a new unborn
 		branch instead.
+
+	useCoreFSMonitorConfig::
+		Advice shown if the deprecated 'core.useBuiltinFSMonitor' config
+		setting is in use.
 --
diff --git a/advice.c b/advice.c
index 63bf8b0c5f0481..f03b50faa4aaa0 100644
--- a/advice.c
+++ b/advice.c
@@ -90,6 +90,7 @@ static struct {
 	[ADVICE_SUBMODULE_MERGE_CONFLICT]               = { "submoduleMergeConflict" },
 	[ADVICE_SUGGEST_DETACHING_HEAD]			= { "suggestDetachingHead" },
 	[ADVICE_UPDATE_SPARSE_PATH]			= { "updateSparsePath" },
+	[ADVICE_USE_CORE_FSMONITOR_CONFIG]		= { "useCoreFSMonitorConfig" },
 	[ADVICE_WAITING_FOR_EDITOR]			= { "waitingForEditor" },
 	[ADVICE_WORKTREE_ADD_ORPHAN]			= { "worktreeAddOrphan" },
 };
diff --git a/advice.h b/advice.h
index 66f6cd6a772d8c..8a9ad56c0e30a9 100644
--- a/advice.h
+++ b/advice.h
@@ -57,6 +57,7 @@ enum advice_type {
 	ADVICE_SUBMODULE_MERGE_CONFLICT,
 	ADVICE_SUGGEST_DETACHING_HEAD,
 	ADVICE_UPDATE_SPARSE_PATH,
+	ADVICE_USE_CORE_FSMONITOR_CONFIG,
 	ADVICE_WAITING_FOR_EDITOR,
 	ADVICE_WORKTREE_ADD_ORPHAN,
 };
diff --git a/fsmonitor-settings.c b/fsmonitor-settings.c
index a6587a8972b184..b4c29f44a27827 100644
--- a/fsmonitor-settings.c
+++ b/fsmonitor-settings.c
@@ -5,6 +5,7 @@
 #include "fsmonitor-ipc.h"
 #include "fsmonitor-settings.h"
 #include "fsmonitor-path-utils.h"
+#include "advice.h"
 
 /*
  * We keep this structure definition private and have getters
@@ -100,6 +101,31 @@ static struct fsmonitor_settings *alloc_settings(void)
 	return s;
 }
 
+static int check_deprecated_builtin_config(struct repository *r)
+{
+	int core_use_builtin_fsmonitor = 0;
+
+	/*
+	 * If 'core.useBuiltinFSMonitor' is set, print a deprecation warning
+	 * suggesting the use of 'core.fsmonitor' instead. If the config is
+	 * set to true, set the appropriate mode and return 1 indicating that
+	 * the check resulted the config being set by this (deprecated) setting.
+	 */
+	if(!repo_config_get_bool(r, "core.useBuiltinFSMonitor", &core_use_builtin_fsmonitor) &&
+	   core_use_builtin_fsmonitor) {
+		if (!git_env_bool("GIT_SUPPRESS_USEBUILTINFSMONITOR_ADVICE", 0)) {
+			advise_if_enabled(ADVICE_USE_CORE_FSMONITOR_CONFIG,
+					  _("core.useBuiltinFSMonitor=true is deprecated;"
+					    "please set core.fsmonitor=true instead"));
+			setenv("GIT_SUPPRESS_USEBUILTINFSMONITOR_ADVICE", "1", 1);
+		}
+		fsm_settings__set_ipc(r);
+		return 1;
+	}
+
+	return 0;
+}
+
 static void lookup_fsmonitor_settings(struct repository *r)
 {
 	const char *const_str;
@@ -126,12 +152,16 @@ static void lookup_fsmonitor_settings(struct repository *r)
 		return;
 
 	case 1: /* config value was unset */
+		if (check_deprecated_builtin_config(r))
+			return;
+
 		const_str = getenv("GIT_TEST_FSMONITOR");
 		break;
 
 	case -1: /* config value set to an arbitrary string */
-		if (repo_config_get_pathname(r, "core.fsmonitor", &to_free))
-			return; /* should not happen */
+		if (check_deprecated_builtin_config(r) ||
+		    repo_config_get_pathname(r, "core.fsmonitor", &to_free))
+			return;
 		const_str = to_free;
 		break;
 

From 27c7158a0e3b6550b0260b26d6ab46d44552c356 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 23 Aug 2019 14:14:42 +0200
Subject: [PATCH 245/247] SECURITY.md: document Git for Windows' policies

This is the recommended way on GitHub to describe policies revolving around
security issues and about supported versions.

Helped-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 SECURITY.md | 56 +++++++++++++++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index c720c2ae7f9580..42b6d458bfd557 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -28,24 +28,38 @@ Examples for details to include:
 
 ## Supported Versions
 
-There are no official "Long Term Support" versions in Git.
-Instead, the maintenance track (i.e. the versions based on the
-most recently published feature release, also known as ".0"
-version) sees occasional updates with bug fixes.
-
-Fixes to vulnerabilities are made for the maintenance track for
-the latest feature release and merged up to the in-development
-branches. The Git project makes no formal guarantee for any
-older maintenance tracks to receive updates. In practice,
-though, critical vulnerability fixes are applied not only to the
-most recent track, but to at least a couple more maintenance
-tracks.
-
-This is typically done by making the fix on the oldest and still
-relevant maintenance track, and merging it upwards to newer and
-newer maintenance tracks.
-
-For example, v2.24.1 was released to address a couple of
-[CVEs](https://cve.mitre.org/), and at the same time v2.14.6,
-v2.15.4, v2.16.6, v2.17.3, v2.18.2, v2.19.3, v2.20.2, v2.21.1,
-v2.22.2 and v2.23.1 were released.
+Git for Windows is a "friendly fork" of [Git](https://git-scm.com/), i.e. changes in Git for Windows are frequently contributed back, and Git for Windows' release cycle closely following Git's.
+
+While Git maintains several release trains (when v2.19.1 was released, there were updates to v2.14.x-v2.18.x, too, for example), Git for Windows follows only the latest Git release. For example, there is no Git for Windows release corresponding to Git v2.16.5 (which was released after v2.19.0).
+
+One exception is [MinGit for Windows](https://gitforwindows.org/mingit) (a minimal subset of Git for Windows, intended for bundling with third-party applications that do not need any interactive commands nor support for `git svn`): critical security fixes are backported to the v2.11.x, v2.14.x, v2.19.x, v2.21.x and v2.23.x release trains.
+
+## Version number scheme
+
+The Git for Windows versions reflect the Git version on which they are based. For example, Git for Windows v2.21.0 is based on Git v2.21.0.
+
+As Git for Windows bundles more than just Git (such as Bash, OpenSSL, OpenSSH, GNU Privacy Guard), sometimes there are interim releases without corresponding Git releases. In these cases, Git for Windows appends a number in parentheses, starting with the number 2, then 3, etc. For example, both Git for Windows v2.17.1 and v2.17.1(2) were based on Git v2.17.1, but the latter included updates for Git Credential Manager and Git LFS, fixing critical regressions.
+
+## Tag naming scheme
+
+Every Git for Windows version is tagged using a name that starts with the Git version on which it is based, with the suffix `.windows.<patchlevel>` appended. For example, Git for Windows v2.17.1' source code is tagged as [`v2.17.1.windows.1`](https://github.com/git-for-windows/git/releases/tag/v2.17.1.windows.1) (the patch level is always at least 1, given that Git for Windows always has patches on top of Git). Likewise, Git for Windows v2.17.1(2)' source code is tagged as [`v2.17.1.windows.2`](https://github.com/git-for-windows/git/releases/tag/v2.17.1.windows.2).
+
+## Release Candidate (rc) versions
+
+As a friendly fork of Git (the "upstream" project), Git for Windows is closely corelated to that project.
+
+Consequently, Git for Windows publishes versions based on Git's release candidates (for upcoming "`.0`" versions, see [Git's release schedule](https://tinyurl.com/gitCal)). These versions end in `-rc<n>`, starting with `-rc0` for a very early preview of what is to come, and as with regular versions, Git for Windows tries to follow Git's releases as quickly as possible.
+
+Note: there is currently a bug in the "Check daily for updates" code, where it mistakes the final version as a downgrade from release candidates. Example: if you installed Git for Windows v2.23.0-rc3 and enabled the auto-updater, it would ask you whether you want to "downgrade" to v2.23.0 when that version was available.
+
+[All releases](https://github.com/git-for-windows/git/releases/), including release candidates, are listed via a link at the footer of the [Git for Windows](https://gitforwindows.org/) home page.
+
+## Snapshot versions ('nightly builds')
+
+Git for Windows also provides snapshots (these are not releases) of the current development as per git-for-Windows/git's `master` branch at the [Snapshots](https://gitforwindows.org/git-snapshots/) page. This link is also listed in the footer of the [Git for Windows](https://gitforwindows.org/) home page.
+
+Note: even if those builds are not exactly "nightly", they are sometimes referred to as "nightly builds" to keep with other projects' nomenclature.
+
+## Following upstream's developments
+
+The [gitforwindows/git repository](https://github.com/git-for-windows/git) also provides the `shears/*` branches. The `shears/*` branches reflect Git for Windows' patches, rebased onto the upstream integration branches, [updated (mostly) via automated CI builds](https://dev.azure.com/git-for-windows/git/_build?definitionId=25).

From e031d026d9c5dbf4da6bd346293d570e2ab3a0e0 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 6 Feb 2024 18:45:35 +0100
Subject: [PATCH 246/247] dependabot: help keeping GitHub Actions versions up
 to date

See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 .github/dependabot.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000000000..22d5376407abf1
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,13 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+# especially
+# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

From 4c0fc260dc7d58c2aab18f363b98ec217ee7a5f8 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 12 Jun 2026 11:33:40 +0200
Subject: [PATCH 247/247] ci: only run the expensive tests in the Windows tests
 for now

Upstream Git does not test their tags with the expensive set of tests,
so a couple of them seem quite broken for now, even so much as hanging
indefinitely.

It is outside of the responsibility of the Git for Windows project to
fix upstream's own tests for platforms other than Windows, so let's not
exercise them.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 ci/lib.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/lib.sh b/ci/lib.sh
index c6ccbf8c171dd7..cad4802a55defb 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -327,6 +327,7 @@ export SKIP_DASHED_BUILT_INS=YesPlease
 # enable "expensive" tests for PR events.
 # In order to catch bugs introduced at integration time by mismerges,
 # enable the long tests for pushes to the integration branches as well.
+test -z "$MSYSTEM" ||
 case "$CI_EVENT,$CI_BRANCH" in
 pull_request,*|push,*next*|push,*master*|push,*main*|push,*maint*)
 	export GIT_TEST_LONG=${GIT_TEST_LONG:-true}